/[dejagnu]/dejagnu/configure
ViewVC logotype

Diff of /dejagnu/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by rsavoye, Thu Apr 12 05:32:16 2001 UTC revision 1.4 by rsavoye, Sun May 6 16:22:20 2001 UTC
# Line 700  fi Line 700  fi
700    
701  PACKAGE=dejagnu  PACKAGE=dejagnu
702    
703  VERSION=1.4.0  VERSION=1.4.1
704    
705  if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then  if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
706    { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }    { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
# Line 1055  else Line 1055  else
1055    fi    fi
1056  fi  fi
1057    
1058    for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
1059    do
1060    # Extract the first word of "$ac_prog", so it can be a program name with args.
1061    set dummy $ac_prog; ac_word=$2
1062    echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1063    echo "configure:1064: checking for $ac_word" >&5
1064    if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
1065      echo $ac_n "(cached) $ac_c" 1>&6
1066    else
1067      if test -n "$CXX"; then
1068      ac_cv_prog_CXX="$CXX" # Let the user override the test.
1069    else
1070      IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
1071      ac_dummy="$PATH"
1072      for ac_dir in $ac_dummy; do
1073        test -z "$ac_dir" && ac_dir=.
1074        if test -f $ac_dir/$ac_word; then
1075          ac_cv_prog_CXX="$ac_prog"
1076          break
1077        fi
1078      done
1079      IFS="$ac_save_ifs"
1080    fi
1081    fi
1082    CXX="$ac_cv_prog_CXX"
1083    if test -n "$CXX"; then
1084      echo "$ac_t""$CXX" 1>&6
1085    else
1086      echo "$ac_t""no" 1>&6
1087    fi
1088    
1089    test -n "$CXX" && break
1090    done
1091    test -n "$CXX" || CXX="gcc"
1092    
1093    
1094    echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
1095    echo "configure:1096: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
1096    
1097    ac_ext=C
1098    # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1099    ac_cpp='$CXXCPP $CPPFLAGS'
1100    ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
1101    ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
1102    cross_compiling=$ac_cv_prog_cxx_cross
1103    
1104    cat > conftest.$ac_ext << EOF
1105    
1106    #line 1107 "configure"
1107    #include "confdefs.h"
1108    
1109    int main(){return(0);}
1110    EOF
1111    if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1112      ac_cv_prog_cxx_works=yes
1113      # If we can't run a trivial program, we are probably using a cross compiler.
1114      if (./conftest; exit) 2>/dev/null; then
1115        ac_cv_prog_cxx_cross=no
1116      else
1117        ac_cv_prog_cxx_cross=yes
1118      fi
1119    else
1120      echo "configure: failed program was:" >&5
1121      cat conftest.$ac_ext >&5
1122      ac_cv_prog_cxx_works=no
1123    fi
1124    rm -fr conftest*
1125    ac_ext=c
1126    # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
1127    ac_cpp='$CPP $CPPFLAGS'
1128    ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
1129    ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
1130    cross_compiling=$ac_cv_prog_cc_cross
1131    
1132    echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
1133    if test $ac_cv_prog_cxx_works = no; then
1134      { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
1135    fi
1136    echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
1137    echo "configure:1138: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
1138    echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
1139    cross_compiling=$ac_cv_prog_cxx_cross
1140    
1141    echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
1142    echo "configure:1143: checking whether we are using GNU C++" >&5
1143    if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
1144      echo $ac_n "(cached) $ac_c" 1>&6
1145    else
1146      cat > conftest.C <<EOF
1147    #ifdef __GNUC__
1148      yes;
1149    #endif
1150    EOF
1151    if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
1152      ac_cv_prog_gxx=yes
1153    else
1154      ac_cv_prog_gxx=no
1155    fi
1156    fi
1157    
1158    echo "$ac_t""$ac_cv_prog_gxx" 1>&6
1159    
1160    if test $ac_cv_prog_gxx = yes; then
1161      GXX=yes
1162    else
1163      GXX=
1164    fi
1165    
1166    ac_test_CXXFLAGS="${CXXFLAGS+set}"
1167    ac_save_CXXFLAGS="$CXXFLAGS"
1168    CXXFLAGS=
1169    echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
1170    echo "configure:1171: checking whether ${CXX-g++} accepts -g" >&5
1171    if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
1172      echo $ac_n "(cached) $ac_c" 1>&6
1173    else
1174      echo 'void f(){}' > conftest.cc
1175    if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
1176      ac_cv_prog_cxx_g=yes
1177    else
1178      ac_cv_prog_cxx_g=no
1179    fi
1180    rm -f conftest*
1181    
1182    fi
1183    
1184    echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
1185    if test "$ac_test_CXXFLAGS" = set; then
1186      CXXFLAGS="$ac_save_CXXFLAGS"
1187    elif test $ac_cv_prog_cxx_g = yes; then
1188      if test "$GXX" = yes; then
1189        CXXFLAGS="-g -O2"
1190      else
1191        CXXFLAGS="-g"
1192      fi
1193    else
1194      if test "$GXX" = yes; then
1195        CXXFLAGS="-O2"
1196      else
1197        CXXFLAGS=
1198      fi
1199    fi
1200    
1201  # Find a good install program.  We prefer a C program (faster),  # Find a good install program.  We prefer a C program (faster),
1202  # so one script is as good as another.  But avoid the broken or  # so one script is as good as another.  But avoid the broken or
1203  # incompatible versions:  # incompatible versions:
# Line 1067  fi Line 1210  fi
1210  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1211  # ./install, which can be erroneously created by make from ./install.sh.  # ./install, which can be erroneously created by make from ./install.sh.
1212  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
1213  echo "configure:1071: checking for a BSD compatible install" >&5  echo "configure:1214: checking for a BSD compatible install" >&5
1214  if test -z "$INSTALL"; then  if test -z "$INSTALL"; then
1215  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
1216    echo $ac_n "(cached) $ac_c" 1>&6    echo $ac_n "(cached) $ac_c" 1>&6
# Line 1120  test -z "$INSTALL_SCRIPT" && INSTALL_SCR Line 1263  test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1263  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1264    
1265  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
1266  echo "configure:1124: checking for Cygwin environment" >&5  echo "configure:1267: checking for Cygwin environment" >&5
1267  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
1268    echo $ac_n "(cached) $ac_c" 1>&6    echo $ac_n "(cached) $ac_c" 1>&6
1269  else  else
1270    cat > conftest.$ac_ext <<EOF    cat > conftest.$ac_ext <<EOF
1271  #line 1129 "configure"  #line 1272 "configure"
1272  #include "confdefs.h"  #include "confdefs.h"
1273    
1274  int main() {  int main() {
# Line 1136  int main() { Line 1279  int main() {
1279  return __CYGWIN__;  return __CYGWIN__;
1280  ; return 0; }  ; return 0; }
1281  EOF  EOF
1282  if { (eval echo configure:1140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then  if { (eval echo configure:1283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1283    rm -rf conftest*    rm -rf conftest*
1284    ac_cv_cygwin=yes    ac_cv_cygwin=yes
1285  else  else
# Line 1153  echo "$ac_t""$ac_cv_cygwin" 1>&6 Line 1296  echo "$ac_t""$ac_cv_cygwin" 1>&6
1296  CYGWIN=  CYGWIN=
1297  test "$ac_cv_cygwin" = yes && CYGWIN=yes  test "$ac_cv_cygwin" = yes && CYGWIN=yes
1298  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
1299  echo "configure:1157: checking for mingw32 environment" >&5  echo "configure:1300: checking for mingw32 environment" >&5
1300  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
1301    echo $ac_n "(cached) $ac_c" 1>&6    echo $ac_n "(cached) $ac_c" 1>&6
1302  else  else
1303    cat > conftest.$ac_ext <<EOF    cat > conftest.$ac_ext <<EOF
1304  #line 1162 "configure"  #line 1305 "configure"
1305  #include "confdefs.h"  #include "confdefs.h"
1306    
1307  int main() {  int main() {
1308  return __MINGW32__;  return __MINGW32__;
1309  ; return 0; }  ; return 0; }
1310  EOF  EOF
1311  if { (eval echo configure:1169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then  if { (eval echo configure:1312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1312    rm -rf conftest*    rm -rf conftest*
1313    ac_cv_mingw32=yes    ac_cv_mingw32=yes
1314  else  else
# Line 1184  test "$ac_cv_mingw32" = yes && MINGW32=y Line 1327  test "$ac_cv_mingw32" = yes && MINGW32=y
1327    
1328    
1329  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
1330  echo "configure:1188: checking for executable suffix" >&5  echo "configure:1331: checking for executable suffix" >&5
1331  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
1332    echo $ac_n "(cached) $ac_c" 1>&6    echo $ac_n "(cached) $ac_c" 1>&6
1333  else  else
# Line 1194  else Line 1337  else
1337    rm -f conftest*    rm -f conftest*
1338    echo 'int main () { return 0; }' > conftest.$ac_ext    echo 'int main () { return 0; }' > conftest.$ac_ext
1339    ac_cv_exeext=    ac_cv_exeext=
1340    if { (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then    if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
1341      for file in conftest.*; do      for file in conftest.*; do
1342        case $file in        case $file in
1343        *.c | *.o | *.obj) ;;        *.c | *.o | *.obj) ;;
# Line 1218  ac_exeext=$EXEEXT Line 1361  ac_exeext=$EXEEXT
1361    
1362  dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."  dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
1363  echo $ac_n "checking for docbook tools""... $ac_c" 1>&6  echo $ac_n "checking for docbook tools""... $ac_c" 1>&6
1364  echo "configure:1222: checking for docbook tools" >&5  echo "configure:1365: checking for docbook tools" >&5
1365  # Check whether --with-oskith or --without-oskith was given.  # Check whether --with-oskith or --without-oskith was given.
1366  if test "${with_oskith+set}" = set; then  if test "${with_oskith+set}" = set; then
1367    withval="$with_oskith"    withval="$with_oskith"
# Line 1264  dirlist=".. ../../ ../../../ ../../../.. Line 1407  dirlist=".. ../../ ../../../ ../../../..
1407  /../../../../../.."  /../../../../../.."
1408  no_itcl=true  no_itcl=true
1409  echo $ac_n "checking for the tclsh program""... $ac_c" 1>&6  echo $ac_n "checking for the tclsh program""... $ac_c" 1>&6
1410  echo "configure:1268: checking for the tclsh program" >&5  echo "configure:1411: checking for the tclsh program" >&5
1411  # Check whether --with-tclinclude or --without-tclinclude was given.  # Check whether --with-tclinclude or --without-tclinclude was given.
1412  if test "${with_tclinclude+set}" = set; then  if test "${with_tclinclude+set}" = set; then
1413    withval="$with_tclinclude"    withval="$with_tclinclude"
# Line 1309  if test x"${ac_cv_path_tclsh}" = x ; the Line 1452  if test x"${ac_cv_path_tclsh}" = x ; the
1452     # Extract the first word of "tclsh", so it can be a program name with args.     # Extract the first word of "tclsh", so it can be a program name with args.
1453  set dummy tclsh; ac_word=$2  set dummy tclsh; ac_word=$2
1454  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1455  echo "configure:1313: checking for $ac_word" >&5  echo "configure:1456: checking for $ac_word" >&5
1456  if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then  if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
1457    echo $ac_n "(cached) $ac_c" 1>&6    echo $ac_n "(cached) $ac_c" 1>&6
1458  else  else
# Line 1469  done Line 1612  done
1612  ac_given_srcdir=$srcdir  ac_given_srcdir=$srcdir
1613  ac_given_INSTALL="$INSTALL"  ac_given_INSTALL="$INSTALL"
1614    
1615  trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15  trap 'rm -fr `echo "Makefile doc/Makefile testsuite/Makefile example/Makefile
1616    testsuite/libdejagnu/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
1617  EOF  EOF
1618  cat >> $CONFIG_STATUS <<EOF  cat >> $CONFIG_STATUS <<EOF
1619    
# Line 1516  s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MOD Line 1660  s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MOD
1660  s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g  s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
1661  s%@MAINT@%$MAINT%g  s%@MAINT@%$MAINT%g
1662  s%@CC@%$CC%g  s%@CC@%$CC%g
1663    s%@CXX@%$CXX%g
1664  s%@EXEEXT@%$EXEEXT%g  s%@EXEEXT@%$EXEEXT%g
1665  s%@DOCBOOK@%$DOCBOOK%g  s%@DOCBOOK@%$DOCBOOK%g
1666  s%@tclsh@%$tclsh%g  s%@tclsh@%$tclsh%g
# Line 1564  EOF Line 1709  EOF
1709    
1710  cat >> $CONFIG_STATUS <<EOF  cat >> $CONFIG_STATUS <<EOF
1711    
1712  CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile testsuite/Makefile example/Makefile"}  CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile testsuite/Makefile example/Makefile
1713    testsuite/libdejagnu/Makefile"}
1714  EOF  EOF
1715  cat >> $CONFIG_STATUS <<\EOF  cat >> $CONFIG_STATUS <<\EOF
1716  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26