Handle autoconfiscated directories by running the correct configure script.

diff --git a/ChangeLog b/ChangeLog
index 98d7d237238f47da2277031a1065adfb482c5208..b399a93f838ed74d8f6892d995ef129e86b7265d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Wed Jun 21 16:50:29 1995  Ken Raeburn  <[email protected]>
+
+       * configure: If per-host line isn't found, but AC_OUTPUT is found
+       and a configure script exists, run it instead.
+
+Thu Jun 15 21:09:24 1995  Per Bothner  <[email protected]>
+
+       * config.guess:  Update from FSF, for alpha-dec-winnt3.5 and  Crays.
+
+Mon Jun  5 18:26:36 1995  Jason Merrill  <[email protected]>
+
+       * Makefile.in (PICFLAG, PICFLAG_FOR_TARGET): New macros.
+       (FLAGS_TO_PASS): Pass them.
+       (EXTRA_TARGET_FLAGS): Ditto.
+
+       * config/m?-*pic: Define PICFLAG* instead of LIB*FLAGS*.
+
+Wed May 31 22:27:42 1995  Jim Wilson  <[email protected]>
+
+       * Makefile.in (all-libg++): Depend on all-libstdc++.
+
+Thu May 25 22:40:59 1995  J.T. Conklin  <[email protected]>
+
+       * configure.in (noconfigdirs): Enable all packages for
+         i386-unknown-netbsd.
+
+Sat May 20 13:22:31 1995  Angela Marie Thomas  <[email protected]>
+
+       * configure.in (noconfigdirs): Don't configure tk for i386-go32
+       hosted builds (DOS builds)
+
 Thu May 18 18:08:49 1995  Ken Raeburn  <[email protected]>
 
        Changes for ARM based on patches from Richard Earnshaw:

diff --git a/configure b/configure
index e7087c1440545c854d6542b6a9ea143394d2715a..ccfcdc9fe44d1b2aafa691ae8a9a83129253d5cb 100755 (executable)
--- a/configure
+++ b/configure
@@ -53,6 +53,8 @@ Makefile=Makefile
 Makefile_in=Makefile.in
 arguments=$*
 build_alias=
+cache_file=
+cache_file_option=
 configdirs=
 exec_prefix=
 exec_prefixoption=
@@ -162,10 +164,7 @@ do
                esac
                ;;
        --cache*)
-               case "$option" in
-               *=*) other_options="${other_options} ${option}" ;;
-               *) other_options="${other_options} ${option}=${optarg}" ;;
-               esac
+               cache_file=$optarg
                ;;
        --disable-*)
                enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
@@ -471,6 +470,34 @@ esac
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
         echo '***' ${srcdir}/configure.in has no \"per-host:\" line. 1>&2
+       # Check for a directory that's been converted to use autoconf since
+       # it was last configured.
+       if grep AC_OUTPUT ${srcdir}/configure.in >/dev/null ; then
+         echo '***' Hmm, looks like this directory has been autoconfiscated. 1>&2
+         if [ -r ${srcdir}/configure ] ; then
+           echo '***' Running the local configure script. 1>&2
+           case "${cache_file}" in
+           "") cache_file_option= ;;
+           *)  cache_file_option="--cache-file=${cache_file}" ;;
+           esac
+           srcdiroption="--srcdir=${srcdir}"
+           case "${build_alias}" in
+           "") buildopt= ;;
+           *)  buildopt="--build=${build_alias}" ;;
+           esac
+           eval exec ${config_shell} ${srcdir}/configure ${verbose} \
+               ${buildopt} --host=${host_alias} --target=${target_alias} \
+               ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+               ${srcdiroption} \
+               ${program_prefixoption} ${program_suffixoption} \
+               ${program_transform_nameoption} ${site_option} \
+               ${withoptions} ${withoutoptions} \
+               ${enableoptions} ${disableoptions} \
+               ${cache_file_option} ${removing} ${other_options} ${redirect}
+         else
+           echo '***' There is no configure script present though. 1>&2
+         fi
+       fi
         exit 1
         ;;
 *) ;;
@@ -974,6 +1001,18 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                                 ;;
                         esac
 
+                       # Handle --cache-file=../XXX
+                       case "${cache_file}" in
+                       "") # empty
+                               ;;
+                       /*) # absolute path
+                               cache_file_option="--cache-file=${cache_file}"
+                               ;;
+                       *) # relative path
+                               cache_file_option="--cache-file=../${cache_file}"
+                               ;;
+                       esac
+
 ### check for guested configure, otherwise fix possibly relative progname
                         if [ -f ${newsrcdir}/configure ] ; then
                                 recprog=${newsrcdir}/configure
@@ -991,7 +1030,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                        if [ ! -z "${recprog}" ] ; then
                                if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
                                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${removing} ${other_options} ${redirect} ; then
+                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
                                        true
                                else
                                        echo Configure in `pwd` failed, exiting. 1>&2