From e63710da863c0b88fb854c0b6c95fd58ade106a0 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Thu, 15 Aug 1996 23:16:47 +0000 Subject: [PATCH] Rebuilt from configure.in by autoconf. --- configure | 160 +++++++++++++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 73 deletions(-) diff --git a/configure b/configure index a51cb34ed..b95afa08f 100755 --- a/configure +++ b/configure @@ -521,6 +521,69 @@ all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | x req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo` opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo` +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +subdirs="$all_subdirs" + +existingdirs= +for d in $all_subdirs; do + if test -d $srcdir/$d ; then + existingdirs="$existingdirs $d" + if test "x$verbose" = xyes; then + if test -f $srcdir/$d/PLUGIN/greet ; then + cat $srcdir/$d/PLUGIN/greet + else + echo === + echo === Configuring plug-in component $d + echo === + fi + fi + fi +done + +for d in $req_subdirs; do + if test ! -d $srcdir/$d ; then + echo "*******" + echo "*******" + echo "**\+/**" + echo "**=*=**" ERROR: Missing required package: $d + echo "**/+\**" + echo "*******" + echo "*******" + exit 1 + fi +done + +if test "x$verbose" = xyes; then + for d in $opt_subdirs; do + if test ! -d $srcdir/$d ; then + echo "*****" + echo "*===*" + echo "*=*=*" WARNING: Missing suggested package: $d + echo "*===*" + echo "*****" + fi + done +fi + + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 @@ -607,7 +670,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -645,14 +708,22 @@ else fi -build_subdirs="$all_subdirs" +### build_subdirs is the list of directories we actually want to +### build. It's not equivalent to existingdirs: if we can't find the +### Tcl libraries, then we don't want to build in gtcltk-lib. +### +### So why can't we just forget about gtcltk-lib altogether, and +### delete it from existingdirs, in that case? Well, in order for +### 'make dist' to work, we still need to configure gtcltk-lib, and +### the top-level Makefile needs to know it exists, +build_subdirs="${existingdirs}" + +### Decide which directories to build; remove the ones we don't want +### from build_subdirs. ### Use gtcltk-lib only if we seem to have Tcl installed on the -### system. This way of doing this doesn't really fit into the PLUGIN -### approach, but I'm not sure how to do it more gracefully within -### that approach. We really should check for Tk as well, but that -### involves finding all the X libraries that we need to do a complete -### link. +### system. We really should check for Tk as well, but that involves +### finding all the X libraries that we need to do a complete link. echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6 ac_lib_var=`echo tcl7.5'_'Tcl_CreateInterp | tr './+\055' '__p_'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then @@ -661,7 +732,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltcl7.5 -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -697,73 +768,16 @@ if $have_tcl; then :; else req_subdirs="`echo $req_subdirs | sed s:gtcltk-lib::`" fi -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - -subdirs="$all_subdirs" - -existingdirs= -for d in $all_subdirs; do - if test -d $srcdir/$d ; then - existingdirs="$existingdirs $d" - if test "x$verbose" = xyes; then - if test -f $srcdir/$d/PLUGIN/greet ; then - cat $srcdir/$d/PLUGIN/greet - else - echo === - echo === Configuring plug-in component $d - echo === - fi - fi - fi -done - -for d in $req_subdirs; do - if test ! -d $srcdir/$d ; then - echo "*******" - echo "*******" - echo "**\+/**" - echo "**=*=**" ERROR: Missing required package: $d - echo "**/+\**" - echo "*******" - echo "*******" - exit 1 - fi -done - -if test "x$verbose" = xyes; then - for d in $opt_subdirs; do - if test ! -d $srcdir/$d ; then - echo "*****" - echo "*===*" - echo "*=*=*" WARNING: Missing suggested package: $d - echo "*===*" - echo "*****" - fi - done -fi - - +### Write the list of survivors, the directories we do want to build, +### to a file in the top level, so the subdirectories' configuration +### scripts can find it. We don't want to pass the list in the +### environment, because the subdirectory configuration scripts can be +### run on their own. echo "${build_subdirs}" > config.build-subdirs + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -892,8 +906,8 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g -s%@CC@%$CC%g s%@subdirs@%$subdirs%g +s%@CC@%$CC%g s%@existingdirs@%$existingdirs%g s%@build_subdirs@%$build_subdirs%g s%@GUILE_VERSION@%$GUILE_VERSION%g