sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "autoconf: Fix call to AC_CONFIG_AUX_DIR."

This commit is contained in:
Jenkins2 2017-11-30 08:42:24 -06:00 committed by Gerrit Code Review
parent f98dad52d2 87a57e8d46
commit 4066f853b1
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -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 @@ 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"
@ -3728,7 +3727,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,
@ -3743,7 +3742,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

3
configure.ac
View File

@ -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