OSDN Git Service

* Makefile.in (local-distclean): Also remove fastjar.
[pf3gnuchains/gcc-fork.git] / configure
index ed54ced..55c5ca4 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,7 +3,7 @@
 ### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
 
 # Configuration script
-# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 1997
+# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -51,11 +51,18 @@ build_alias=
 cache_file=config.cache
 cache_file_option=
 configdirs=
+extraconfigdirs=
+diroptions=
+enable_threads=no
+enable_shared=no
+enable_libstdcxx_v3=yes
 exec_prefix=
 exec_prefixoption=
 fatal=
 floating_point=default
 gas=default
+gcc_version=
+gcc_version_trigger=
 host_alias=NOHOST
 host_makefile_frag=
 moveifchange=
@@ -71,7 +78,7 @@ program_suffix=
 program_suffixoption=
 program_transform_name=
 program_transform_nameoption=
-redirect=">/dev/null"
+redirect=
 removing=
 site=
 site_makefile_frag=
@@ -82,8 +89,20 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.22 $"
+version="$Revision: 1.31 $"
 x11=default
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
 
 ### we might need to use some other shell than /bin/sh for running subshells
 
@@ -143,6 +162,10 @@ case "${progname}" in
         ;;
 esac
 
+# Export original configure arguments for use by sub-configures.
+TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@"
+export TOPLEVEL_CONFIGURE_ARGUMENTS
+
 # Loop over all args
 
 while :
@@ -190,6 +213,10 @@ do
 # Now, process the options
        case $option in
 
+       --bi*)
+               bindir=$optarg
+               diroptions="$diroptions --bindir=$optarg"
+               ;;
        --build* | --bu*)
                case "$build_alias" in
                "") build_alias=$optarg ;;
@@ -201,6 +228,10 @@ do
        --cache*)
                cache_file=$optarg
                ;;
+       --da*)
+               datadir=$optarg
+               diroptions="$diroptions --datadir=$optarg"
+               ;;
        --disable-*)
                enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
                eval $enableopt=no
@@ -213,7 +244,7 @@ do
                esac
 
                enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-               eval "$enableopt='$optarg'"
+               eval "$enableopt=\$optarg"
                enableoptions="$enableoptions '$option'"
                ;;
        --exec-prefix* | --ex*)
@@ -234,6 +265,30 @@ do
                   ;;
                esac
                ;;
+       --inc*)
+               includedir=$optarg
+               diroptions="$diroptions --includedir=$optarg"
+               ;;
+       --inf*)
+               infodir=$optarg
+               diroptions="$diroptions --infodir=$optarg"
+               ;;
+       --libd*)
+               libdir=$optarg
+               diroptions="$diroptions --libdir=$optarg"
+               ;;
+       --libe*)
+               libexecdir=$optarg
+               diroptions="$diroptions --libexecdir=$optarg"
+               ;;
+       --lo*)
+               localstatedir=$optarg
+               diroptions="$diroptions --localstatedir=$optarg"
+               ;;
+       --ma*)
+               mandir=$optarg
+               diroptions="$diroptions --mandir=$optarg"
+               ;;
        --nfp | --nf*)
                floating_point=no
                floating_pointoption="--nfp"
@@ -241,6 +296,10 @@ do
        --norecursion | --no*)
                norecursion=yes
                ;;
+       --ol*)
+               oldincludedir=$optarg
+               diroptions="$diroptions --oldincludedir=$optarg"
+               ;;
        --prefix* | --pre*)
                prefix=$optarg
                prefixoption="--prefix=$optarg"
@@ -261,6 +320,14 @@ do
        --rm)
                removing=--rm
                ;;
+       --sb*)
+               sbindir=$optarg
+               diroptions="$diroptions --sbindir=$optarg"
+               ;;
+       --sh*)
+               sharedstatedir=$optarg
+               diroptions="$diroptions --sharedstatedir=$optarg"
+               ;;
        --silent | --sil* | --quiet | --q*)
                redirect=">/dev/null"
                verbose=--silent
@@ -279,6 +346,10 @@ do
        --srcdir* | --sr*)
                srcdir=$optarg
                ;;
+       --sy*)
+               sysconfdir=$optarg
+               diroptions="$diroptions --sysconfdir=$optarg"
+               ;;
        --target* | --ta*)
                case $target_alias in
                NOTARGET) target_alias=$optarg ;;
@@ -306,7 +377,7 @@ do
                esac
 
                withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-               eval $withopt="$optarg"
+               eval $withopt="\$optarg"
                withoptions="$withoptions $option"
                ;;
        --without-*)
@@ -319,9 +390,6 @@ do
                ;;
        --x-i* | --x-l*) other_options="$other_options $orig_option"
                ;;
-       --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
-               # These options were added to autoconf for emacs.
-               ;;
        --*)
                echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
                exit 1
@@ -457,6 +525,9 @@ fi
 
 configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
 moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'`
+## the sed command below emulates the dirname command
+topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; pwd`
+
 
 # this is a hack.  sun4 must always be a valid host alias or this will fail.
 if ${config_shell} ${configsub} sun4 >/dev/null 2>&1 ; then
@@ -519,6 +590,28 @@ case "${exec_prefixoption}" in
 *) ;;
 esac
 
+# Define the trigger file to make sure configure will re-run whenever
+# the gcc version number changes.
+if [ "${with_gcc_version_trigger+set}" = set ]; then
+    gcc_version_trigger="$with_gcc_version_trigger"
+    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+else
+    # If gcc's sources are available, define the trigger file.
+    if [ -f ${topsrcdir}/gcc/version.c ] ; then
+       gcc_version_trigger=${topsrcdir}/gcc/version.c
+       gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+       case "$arguments" in
+         *--with-gcc-version-trigger=$gcc_version_trigger* )
+           ;;
+         * )
+           # Make sure configure.in knows about this.
+           arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
+           ;;
+       esac
+       withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
+    fi
+fi
+
 ### break up ${srcdir}/configure.in.
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
@@ -541,7 +634,7 @@ case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
            eval exec ${config_shell} ${srcdir}/configure ${verbose} \
                ${buildopt} --host=${host_alias} --target=${target_alias} \
                ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-               ${srcdiroption} \
+               ${srcdiroption} ${diroptions} \
                ${program_prefixoption} ${program_suffixoption} \
                ${program_transform_nameoption} ${site_option} \
                ${withoptions} ${withoutoptions} \
@@ -569,8 +662,8 @@ case "${TMPDIR}" in
 *) ;;
 esac
 
-# keep this filename short for &%*%$*# 14 char file names
-tmpfile=${TMPDIR}/cONf$$
+# keep this filename short for &%*%$*# 14 char file names and 8+3 file names
+tmpfile=${TMPDIR}/cNf$$
 # Note that under many versions of sh a trap handler for 0 will *override* any
 # exit status you explicitly specify!  At this point, the only non-error exit
 # is at the end of the script; these actions are duplicated there, minus
@@ -592,8 +685,24 @@ fi
 
 ### do common part of configure.in
 
+# If the language specific compiler does not exist, but the "gcc" directory does,
+# we will skip this directory; in this case the sub-directory's common part
+# of configure.in will create a small shell script "skip-this-dir" containing
+# commands to completely clean up any temporary or created files.
+
 . ${tmpfile}.com
 
+if test -f skip-this-dir; then
+       # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
+       # and reset the trap handler.
+       trap 0
+       rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
+       # Execute the final clean-up actions
+       ${config_shell} skip-this-dir
+       # and stop configuring this directory.
+       exit 0
+fi
+
 # some sanity checks on configure.in
 case "${srctrigger}" in
 "")
@@ -703,7 +812,7 @@ fi
 # If CC and CXX are not set in the environment, and the Makefile
 # exists, try to extract them from it.  This is to handle running
 # ./config.status by hand.
-if [ -z "${CC}" -a -r Makefile ]; then
+if [ -z "${CC}" ] && [ -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
 s/\\\n//g
@@ -713,7 +822,7 @@ t loop
   rm -f Makefile.cc
 fi
 
-if [ -z "${CFLAGS}" -a -r Makefile ]; then
+if [ -z "${CFLAGS}" ] && [ -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
 s/\\\n//g
@@ -723,7 +832,7 @@ t loop
   rm -f Makefile.cc
 fi
 
-if [ -z "${CXX}" -a -r Makefile ]; then
+if [ -z "${CXX}" ] && [ -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
 s/\\\n//g
@@ -733,7 +842,7 @@ t loop
   rm -f Makefile.cc
 fi
 
-if [ -z "${CXXFLAGS}" -a -r Makefile ]; then
+if [ -z "${CXXFLAGS}" ] && [ -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
 s/\\\n//g
@@ -762,6 +871,25 @@ do
   test -n "$DEFAULT_YACC" && break
 done
 
+# Generate a default definition for M4.  This is used if the makefile can't
+# locate m4 in objdir.
+
+for prog in gm4 gnum4 m4
+do
+  set dummy $prog; tmp=$2
+  IFS="${IFS=   }"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/$tmp; then
+      DEFAULT_M4="$prog"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  test -n "$DEFAULT_M4" && break
+done
+
 # Generate a default definition for LEX.  This is used if the makefile can't
 # locate flex in objdir.
 
@@ -791,9 +919,10 @@ if [ "${build}" != "${host}" ]; then
   tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
   tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
   tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
+  tools="${tools} OBJCOPY OBJDUMP"
 
   for var in ${tools}; do
-    if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
+    if eval [ -z \"\$${var}\" ] && [ -r Makefile ]; then
       sed -n -e ':loop
 /\\$/ N
 s/\\\n//g
@@ -802,7 +931,7 @@ t loop
        < Makefile > Makefile.v
       t=`tail -1 Makefile.v`
       if [ -n "${t}" ]; then
-       eval "${var}='${t}'"
+       eval "${var}=\${t}"
       fi
       rm -f Makefile.v
     fi
@@ -834,6 +963,8 @@ t loop
   RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET-${target_alias}-ranlib}
   WINDRES=${WINDRES-${host_alias}-windres}
   WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres}
+  OBJCOPY=${OBJCOPY-${host_alias}-objcopy}
+  OBJDUMP=${OBJDUMP-${host_alias}-objdump}
 
   if [ -z "${YACC}" ]; then
     IFS="${IFS=        }"; save_ifs="$IFS"; IFS="${IFS}:"
@@ -884,6 +1015,8 @@ t loop
   export NM
   export RANLIB
   export WINDRES
+  export OBJCOPY
+  export OBJDUMP
 else
   # If CC is still not set, try to get gcc.
   if [ -z "${CC}" ]; then
@@ -895,10 +1028,10 @@ else
        echo 'void f(){}' > conftest.c
        if test -z "`${CC} -g -c conftest.c 2>&1`"; then
          CFLAGS=${CFLAGS-"-g -O2"}
-         CXXFLAGS=${CFLAGS-"-g -O2"}
+         CXXFLAGS=${CXXFLAGS-"-g -O2"}
        else
          CFLAGS=${CFLAGS-"-O2"}
-         CXXFLAGS=${CFLAGS-"-O2"}
+         CXXFLAGS=${CXXFLAGS-"-O2"}
        fi
        rm -f conftest*
        break
@@ -906,6 +1039,24 @@ else
     done
     IFS="$save_ifs"
     CC=${CC-cc}
+  else
+    if test -z "${CFLAGS}"; then
+      # Here CC is set but CFLAGS is not.  Use a quick hack to use -O2 if CC
+      # is set to a version of gcc.
+      case "${CC}" in
+      *gcc)
+       echo 'void f(){}' > conftest.c
+       if test -z "`${CC} -g -c conftest.c 2>&1`"; then
+         CFLAGS=${CFLAGS-"-g -O2"}
+         CXXFLAGS=${CXXFLAGS-"-g -O2"}
+       else
+         CFLAGS=${CFLAGS-"-O2"}
+         CXXFLAGS=${CXXFLAGS-"-O2"}
+       fi
+       rm -f conftest*
+       ;;
+      esac
+    fi
   fi
 
   CXX=${CXX-"c++"}
@@ -924,14 +1075,12 @@ case "$host" in
            enable_gdbtk=no ;;
        *msdosdjgpp*)
            enable_gdbtk=no ;;
-       *cygwin32*)
-           enable_gdbtk=no ;;
 esac
 
 # FIXME: This should be in configure.in, not configure
 # Determine whether gdb needs tk/tcl or not.
 if [ "$enable_gdbtk" != "no" ]; then
-       GDB_TK="all-tcl all-tk all-itcl all-tix"
+       GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"
 else
        GDB_TK=""
 fi
@@ -1193,21 +1342,20 @@ EOF
                 echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
             fi 
 
-           # provide a proper gxx_include_dir to all subdirs.
-           # Note, if you change the default, make sure to fix both here
-           # and in the gcc subdirectory.
-           if test -z "${with_gxx_include_dir}"; then
-               echo gxx_include_dir = '${prefix}/include/g++' >> ${Makefile}
+           echo enable_shared = ${enable_shared} >> ${Makefile}
+           echo enable_threads = ${enable_threads} >> ${Makefile}
+           # record if we want to rumtime library stuff installed in libsubdir.
+           if test -z "${enable_version_specific_runtime_libs}"; then
+               echo enable_version_specific_runtime_libs = no >> ${Makefile}
            else
-               echo gxx_include_dir = ${with_gxx_include_dir} >> ${Makefile}
+               echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
            fi
 
-           # record if we want to build shared libs.
-           if test -z "${enable_shared}"; then
-               echo enable_shared = no >> ${Makefile}
-           else
-               echo enable_shared = ${enable_shared} >> ${Makefile}
-           fi
+           # Emit a macro which describes the file containing gcc's
+           # version number.
+           echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile}
+           # And emit a macro defining gcc's version number.
+           echo gcc_version = ${gcc_version} >> ${Makefile}
 
             # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
             # remove any form feeds.
@@ -1221,6 +1369,18 @@ EOF
            fi
            sed     -e "s|^prefix[      ]*=.*$|prefix = ${prefix}|" \
                     -e "s|^exec_prefix[        ]*=.*$|exec_prefix = ${exec_prefix}|" \
+                    -e "s|^bindir[     ]*=.*$|bindir = ${bindir}|" \
+                    -e "s|^sbindir[    ]*=.*$|sbindir = ${sbindir}|" \
+                    -e "s|^libexecdir[         ]*=.*$|libexecdir = ${libexecdir}|" \
+                    -e "s|^datadir[    ]*=.*$|datadir = ${datadir}|" \
+                    -e "s|^sysconfdir[         ]*=.*$|sysconfdir = ${sysconfdir}|" \
+                    -e "s|^sharedstatedir[     ]*=.*$|sharedstatedir = ${sharedstatedir}|" \
+                    -e "s|^localstatedir[      ]*=.*$|localstatedir = ${localstatedir}|" \
+                    -e "s|^libdir[     ]*=.*$|libdir = ${libdir}|" \
+                    -e "s|^includedir[         ]*=.*$|includedir = ${includedir}|" \
+                    -e "s|^oldincludedir[      ]*=.*$|oldincludedir = ${oldincludedir}|" \
+                    -e "s|^infodir[    ]*=.*$|infodir = ${infodir}|" \
+                    -e "s|^mandir[     ]*=.*$|mandir = ${mandir}|" \
                    -e "/^CC[   ]*=/{
                        :loop1
                        /\\\\$/ N
@@ -1250,22 +1410,26 @@ EOF
                        s%^CXXFLAGS[    ]*=.*$%CXXFLAGS = ${CXXFLAGS}%
                        }" \
                    -e "s|^SHELL[        ]*=.*$|SHELL = ${config_shell}|" \
-                   -e "s:^GDB_TK[       ]*=.*$:GDB_TK = ${GDB_TK}:" \
                     -e "s|^srcdir[     ]*=.*$|srcdir = ${makesrcdir}|" \
                     -e "s/\f//" \
                     -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
                     -e "s:^program_suffix[     ]*=.*$:program_suffix = ${program_suffix}:" \
                     -e "s:^program_transform_name[     ]*=.*$:program_transform_name = ${program_transform_name}:" \
                     -e "s|^tooldir[    ]*=.*$|tooldir = ${tooldir}|" \
+                    -e "s|^build_tooldir[      ]*=.*$|build_tooldir = ${tooldir}|" \
                    -e "s:^DEFAULT_YACC[         ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \
                    -e "s:^DEFAULT_LEX[  ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \
+                   -e "s:^DEFAULT_M4[  ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \
                     ${subdir}/Makefile.tem >> ${Makefile}
+  
+           sed -e "s:^GDB_TK[   ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem
+           mv -f ${Makefile}.tem ${Makefile}
 
            # If this is a Canadian Cross, preset the values of many more
            # tools.
            if [ "${build}" != "${host}" ]; then
                for var in ${tools}; do
-                   val=`eval 'echo $'"${var}"`
+                   eval val=\$${var}
                    sed -e "/^${var}[   ]*=/{
                           :loop1
                           /\\\\$/ N
@@ -1342,19 +1506,33 @@ ${progname}" ${arguments}  "
 done
 
 # If there are subdirectories, then recur.
-if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then 
-        for configdir in ${configdirs} ; do
+if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then 
+        for configdir in ${configdirs} ${extraconfigdirs} ; do
+
+               # If configdir contains ',' it is
+               # srcdir,builddir,target_alias
+               # These come from extraconfigdirs.
+               case ${configdir} in
+               *,*)
+                   eval `echo ${configdir} | sed -e 's/\([^,]*\),\([^,]*\),\(.*\)/cfg_dir=\1 bld_dir=\2 tgt_alias=\3/'`
+                   ;;
+               *)
+                   cfg_dir=${configdir}
+                   bld_dir=${configdir}
+                   tgt_alias=${target_alias}
+                   ;;
+               esac
 
-                if [ -d ${srcdir}/${configdir} ] ; then
+                if [ -d ${srcdir}/${cfg_dir} ] ; then
                         eval echo Configuring ${configdir}... ${redirect}
                         case "${srcdir}" in
                         ".") ;;
                         *)
-                                if [ ! -d ./${configdir} ] ; then
-                                        if mkdir ./${configdir} ; then
+                                if [ ! -d ./${bld_dir} ] ; then
+                                        if mkdir ./${bld_dir} ; then
                                                 true
                                         else
-                                                echo '***' "${progname}: could not make ${PWD=`pwd`}/${configdir}" 1>&2
+                                                echo '***' "${progname}: could not make ${PWD=`pwd`}/${bld_dir}" 1>&2
                                                 exit 1
                                         fi
                                 fi
@@ -1362,21 +1540,21 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                         esac
 
                         POPDIR=${PWD=`pwd`}
-                        cd ${configdir} 
+                        cd ${bld_dir} 
 
 ### figure out what to do with srcdir
                         case "${srcdir}" in
                         ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
                         /*) # absolute path
-                                newsrcdir=${srcdir}/${configdir}
+                                newsrcdir=${srcdir}/${cfg_dir}
                                 srcdiroption="--srcdir=${newsrcdir}"
                                 ;;
                         ?:*) # absolute path on win32
-                                newsrcdir=${srcdir}/${configdir}
+                                newsrcdir=${srcdir}/${cfg_dir}
                                 srcdiroption="--srcdir=${newsrcdir}"
                                 ;;
                         *) # otherwise relative
-                                newsrcdir=../${srcdir}/${configdir}
+                                newsrcdir=../${srcdir}/${cfg_dir}
                                 srcdiroption="--srcdir=${newsrcdir}"
                                 ;;
                         esac
@@ -1406,15 +1584,15 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                                 *)      recprog=../${progname} ;;
                                 esac
                        else
-                               eval echo No configuration information in ${configdir} ${redirect}
+                               eval echo No configuration information in ${cfg_dir} ${redirect}
                                recprog=
                         fi
 
 ### The recursion line is here.
                        if [ ! -z "${recprog}" ] ; then
-                               if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
+                               if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${tgt_alias} \
                                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
+                                       ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
                                        true
                                else
                                        echo Configure in `pwd` failed, exiting. 1>&2