aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-28 20:34:07 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-28 20:34:07 +0000
commite607fc272c9160dee344a7436068bfd7094f0a54 (patch)
tree780ff01512db7d967311e543497d1c002d9911db /configure
parent9e4e134b44b5f82457068ade5fb47d8b93f7cb86 (diff)
Merged revisions 259848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r259848 | qwell | 2010-04-28 15:32:14 -0500 (Wed, 28 Apr 2010) | 9 lines 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/branches/1.6.2@259851 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 25 insertions, 1 deletions
diff --git a/configure b/configure
index 155b58c7f..c64c4bd03 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 259356 .
+# From configure.ac Revision: 259781 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for asterisk 1.6.
#
@@ -3231,6 +3231,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.
+
+
+