diff options
| author | Corey Farrell <git@cfware.com> | 2017-11-17 10:15:17 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2017-11-28 10:40:03 -0500 |
| commit | ada498a025974162cf53d13e335e47141b14e147 (patch) | |
| tree | b437891036570231bf8c37464f5c0b2f805335fd | |
| parent | f78360b37159d9432aae655a37033adb5f4d0f74 (diff) | |
autoconf: Fix call to AC_CONFIG_AUX_DIR.
The `pwd` parameter to AC_CONFIG_AUX_DIR is unnecessary, the default
value is $srcdir.
Additionally remove the AC_REVISION call. It only added a comment and
is pointless without SVN tag replacements.
Change-Id: I99299a3217f095bddcb2edefb3b9af0ab147bc29
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 3 insertions, 6 deletions
@@ -1,5 +1,4 @@ #! /bin/sh -# From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for asterisk trunk. # @@ -3706,7 +3705,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_aux_dir= -for ac_dir in `pwd` "$srcdir"/`pwd`; do +for ac_dir in "$srcdir"/; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -3722,7 +3721,7 @@ for ac_dir in `pwd` "$srcdir"/`pwd`; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \`pwd\` \"$srcdir\"/\`pwd\`" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\"/" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3737,7 +3736,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # preserve any CFLAGS or LDFLAGS that may be set # NOTE: This must be done before calling any macros that end up # calling AC_PROG_CC or the like, since they will set a default diff --git a/configure.ac b/configure.ac index 9b1ce7917..414cfa4d7 100644 --- a/configure.ac +++ b/configure.ac @@ -17,10 +17,9 @@ AC_CANONICAL_HOST # check existence of the package AC_CONFIG_SRCDIR([main/asterisk.c]) -AC_CONFIG_AUX_DIR(`pwd`) +AC_CONFIG_AUX_DIR() AC_COPYRIGHT("Asterisk") -AC_REVISION($Revision$) # preserve any CFLAGS or LDFLAGS that may be set # NOTE: This must be done before calling any macros that end up |