From af968c6a1a74eefa1cb8d3f83ddfc43053a338d3 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Wed, 28 Apr 2010 20:30:21 +0000 Subject: [PATCH] Add AC_CONFIG_AUX_DIR to configure script, so systems without install can use install-sh from our source dir. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@259847 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configure | 26 +++++++++++++++++++++++++- configure.ac | 2 ++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ecb269cefc..efa46e6f50 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 259352 . +# From configure.ac Revision: 259748 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for asterisk 1.4. # @@ -3081,6 +3081,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. + + + # specify output header file ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h" diff --git a/configure.ac b/configure.ac index 30cf48960f..61880c22ae 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,8 @@ AC_CANONICAL_HOST # check existence of the package AC_CONFIG_SRCDIR([main/asterisk.c]) +AC_CONFIG_AUX_DIR(`pwd`) + # specify output header file AC_CONFIG_HEADER(include/asterisk/autoconfig.h) -- 2.47.2