-dnl Copyright © 2014 Nick Bowler
+dnl Copyright © 2014, 2019 Nick Bowler
+dnl
+dnl Helper macros for implementing library tests.
dnl
dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
dnl This is free software: you are free to do what the fuck you want to.
dnl and FOO_LIBS, where FOO is replaced with env-base in uppercase. The
dnl human-name is the name of the library used in help text, by default the
dnl same as env-base.
-AC_DEFUN([DX_LIB_SETUP], [m4_do(
- [AC_ARG_VAR(m4_toupper([$1])[_CFLAGS],
- [C compiler flags for ]m4_default([$2], [$1]))],
- [AC_ARG_VAR(m4_toupper([$1])[_LIBS],
- [linker flags for ]m4_default([$2], [$1]))])])
+AC_DEFUN([DX_LIB_SETUP],
+ [m4_do([AC_ARG_VAR(AS_TR_SH([m4_toupper([$1])])[_CFLAGS],
+ [C compiler flags for ]m4_default([$2], [$1]))],
+ [AC_ARG_VAR(AS_TR_SH([m4_toupper([$1])])[_LIBS],
+ [linker flags for ]m4_default([$2], [$1]))])])
dnl DX_LIB_PKGCONFIG_FLAGS(env-base, [library-name])
dnl
dnl env-base in lowercase. If not specified, the library name defaults to
dnl env-base.
AC_DEFUN([DX_LIB_PKGCONFIG_FLAGS],
- [_DX_LIB_PKGCONFIG_FLAGS(m4_tolower([$1]),
- [m4_default([$2], [$1])])])
+ [_DX_LIB_PKGCONFIG_FLAGS(AS_TR_SH([m4_tolower([$1])]),
+ [m4_default([$2], [$1])])])
dnl Internal helper macro for the above.
AC_DEFUN([_DX_LIB_PKGCONFIG_FLAGS], [AS_IF([test x"$PKG_CONFIG" != x""],
dnl by a call to AC_MSG_CHECKING.
AC_DEFUN([DX_LIB_SEARCH], [m4_divert_push([KILL])
-m4_pushdef([_DX_CVNAME], m4_tolower([dx_cv_$1_lib_])[$][1])
-m4_pushdef([_DX_FNNAME], m4_tolower([dx_fn_$1_lib_])[$][1])
+m4_pushdef([_DX_CVNAME], AS_TR_SH([m4_tolower([dx_cv_$1_lib_])])[$][1])
+m4_pushdef([_DX_FNNAME], AS_TR_SH([m4_tolower([dx_fn_$1_lib_])])[$][1])
m4_divert([INIT_PREPARE])dnl
# Helper function to test whether $1 works.
_dx_save_cflags=$CFLAGS
_dx_save_libs=$LIBS
m4_map_sep([_DX_LIB_TEST], [m4_newline], [$3])
+DX_VAR_NORMALIZE_SPACE([_DX_CVNAME([cflags])])
+DX_VAR_NORMALIZE_SPACE([_DX_CVNAME([libs])])
CFLAGS=$_dx_save_cflags
LIBS=$_dx_save_libs])dnl
AC_MSG_RESULT([$_DX_CVNAME([found])])
-AS_IF([test x"$_DX_CVNAME([found])" = x"yes"], [dnl
- AC_SUBST(m4_toupper([$1_CFLAGS]), [$_DX_CVNAME([cflags])])dnl
- AC_SUBST(m4_toupper([$1_LIBS]), [$_DX_CVNAME([libs])])])
+AS_IF([test x"$_DX_CVNAME([found])" = x"yes"],
+ [m4_do([AC_SUBST(AS_TR_SH([m4_toupper([$1_CFLAGS])]),
+ [$_DX_CVNAME([cflags])])],
+ [AC_SUBST(AS_TR_SH([m4_toupper([$1_LIBS])]),
+ [$_DX_CVNAME([libs])])])])
m4_popdef([_DX_CVNAME], [_DX_FNNAME])])
dnl Internal helper macro for the above.