diff options
| author | Corey Farrell <git@cfware.com> | 2017-11-17 11:38:48 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-11-28 10:40:54 -0500 |
| commit | ce5cfc8ffb66b84998a5b1f283fdb40e695783a6 (patch) | |
| tree | bd1bee17526252e772705272e9f5d5b6956ec396 /autoconf/ast_ext_tool_check.m4 | |
| parent | 87a57e8d46a513016a909b53b29acf0aacd06a9b (diff) | |
autoconf: Use m4 conditionals where possible.
Change-Id: I530c0a72f965437acef6a9a4fbfe5c487f078b65
Diffstat (limited to 'autoconf/ast_ext_tool_check.m4')
| -rw-r--r-- | autoconf/ast_ext_tool_check.m4 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/autoconf/ast_ext_tool_check.m4 b/autoconf/ast_ext_tool_check.m4 index 758720d24..ef762eb87 100644 --- a/autoconf/ast_ext_tool_check.m4 +++ b/autoconf/ast_ext_tool_check.m4 @@ -10,15 +10,13 @@ AC_DEFUN([AST_EXT_TOOL_CHECK], PBX_$1=0 AC_PATH_TOOL(CONFIG_$1, $2, No, [${$1_DIR}/bin:$PATH]) if test ! "x${CONFIG_$1}" = xNo; then - if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi - $1_INCLUDE=$(${CONFIG_$1} $A) + $1_INCLUDE=$(${CONFIG_$1} m4_default([$3],[--cflags])) $1_INCLUDE=$(echo ${$1_INCLUDE} | $SED -e "s|-I|-I${$1_DIR}|g") - if test x"$4" = x ; then A=--libs ; else A="$4" ; fi - $1_LIB=$(${CONFIG_$1} $A) + $1_LIB=$(${CONFIG_$1} m4_default([$4],[--libs])) $1_LIB=$(echo ${$1_LIB} | $SED -e "s|-L|-L${$1_DIR}|g") - if test x"$5" != x ; then + m4_ifval([$5], [ saved_cppflags="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}" @@ -28,15 +26,15 @@ AC_DEFUN([AST_EXT_TOOL_CHECK], AC_LINK_IFELSE( [ AC_LANG_PROGRAM( [ $5 ], [ $6; ])], [ PBX_$1=1 AC_DEFINE([HAVE_$1], 1, - [Define if your system has the $1 headers.])], + [Define if your system has the $1 libraries.])], [] ) CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - else + ], [ PBX_$1=1 AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.]) - fi + ]) fi fi ]) |