[Asterisk-code-review] autoconf: Fix call to AC CONFIG AUX DIR. (asterisk[master])
Jenkins2
asteriskteam at digium.com
Thu Nov 30 08:42:24 CST 2017
Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7374 )
Change subject: autoconf: Fix call to AC_CONFIG_AUX_DIR.
......................................................................
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
---
M configure
M configure.ac
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
diff --git a/configure b/configure
index 7411f71..70b042f 100755
--- a/configure
+++ b/configure
@@ -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.
#
@@ -3712,7 +3711,7 @@
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"
@@ -3728,7 +3727,7 @@
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,
@@ -3738,7 +3737,6 @@
ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
diff --git a/configure.ac b/configure.ac
index 170694d..0a4fb47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,10 +17,9 @@
# 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
--
To view, visit https://gerrit.asterisk.org/7374
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I99299a3217f095bddcb2edefb3b9af0ab147bc29
Gerrit-Change-Number: 7374
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171130/1630585d/attachment.html>
More information about the asterisk-code-review
mailing list