diff options
Diffstat (limited to 'tcl/configure')
| -rwxr-xr-x | tcl/configure | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/tcl/configure b/tcl/configure index c7b3e661c15..e60aab80775 100755 --- a/tcl/configure +++ b/tcl/configure @@ -28,6 +28,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -142,6 +143,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -312,6 +314,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -477,12 +484,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -548,7 +559,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:552: checking host system type" >&5 +echo "configure:563: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -570,13 +581,7 @@ echo "$ac_t""$host" 1>&6 case "${host}" in -*-*-cygwin*) - CONFIGDIR="win" - - CONFIGDIR2="cygwin" - - ;; -*-*-mingw32*) +*cygwin* | *mingw32* | *windows32*) CONFIGDIR="win" ;; @@ -606,7 +611,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. esac echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:610: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:615: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -632,7 +637,7 @@ else SET_MAKE="MAKE=${MAKE-make}" fi -subdirs="$CONFIGDIR $CONFIGDIR2" +subdirs="$CONFIGDIR" trap '' 1 2 15 cat > confcache <<\EOF @@ -784,7 +789,6 @@ s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g s%@CONFIGDIR@%$CONFIGDIR%g -s%@CONFIGDIR2@%$CONFIGDIR2%g s%@SET_MAKE@%$SET_MAKE%g s%@subdirs@%$subdirs%g @@ -919,7 +923,7 @@ if test "$no_recursion" != yes; then esac done - for ac_config_dir in $CONFIGDIR $CONFIGDIR2; do + for ac_config_dir in $CONFIGDIR; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. |