Merged revisions 259847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259847 | qwell | 2010-04-28 15:30:21 -0500 (Wed, 28 Apr 2010) | 1 line Add AC_CONFIG_AUX_DIR to configure script, so systems without install can use install-sh from our source dir. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@259848 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
d2c5e58186
commit
3ef5627157
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 259353 .
|
||||
# From configure.ac Revision: 259760 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65 for asterisk 1.6.
|
||||
#
|
||||
|
@ -3303,6 +3303,30 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|||
# check existence of the package
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in `pwd` "$srcdir"/`pwd`; do
|
||||
for ac_t in install-sh install.sh shtool; do
|
||||
if test -f "$ac_dir/$ac_t"; then
|
||||
ac_aux_dir=$ac_dir
|
||||
ac_install_sh="$ac_aux_dir/$ac_t -c"
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
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
|
||||
fi
|
||||
|
||||
# These three variables are undocumented and unsupported,
|
||||
# and are intended to be withdrawn in a future Autoconf release.
|
||||
# They can cause serious problems if a builder's source tree is in a directory
|
||||
# whose full name contains unusual characters.
|
||||
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.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -17,6 +17,8 @@ AC_CANONICAL_HOST
|
|||
# check existence of the package
|
||||
AC_CONFIG_SRCDIR([main/asterisk.c])
|
||||
|
||||
AC_CONFIG_AUX_DIR(`pwd`)
|
||||
|
||||
AC_COPYRIGHT("Asterisk")
|
||||
AC_REVISION($Revision$)
|
||||
|
||||
|
|
Reference in New Issue