Changeset 2e9262 in git for factory

Timestamp:

Apr 20, 1998, 6:01:40 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

142b7b541ca90ee57fa4fdbb939c0550b008661c

Parents:

53a2286dcf84c26398946a9e15b8e7ae21d6f144

Message:

	* configure: configure.in changed


git-svn-id: file:///usr/local/Singular/svn/trunk@1402 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/configure (modified) (29 diffs)

factory/configure

@@ -3 +3 @@
 # From configure.in Id: configure.in
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.9 
+# Generated automatically using autoconf version 2.10 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
@@ -355 +355 @@
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.9"
+    echo "configure generated by autoconf version 2.10"
     exit 0 ;;
 
@@ -1214 +1214 @@
 
 
-# get absolute path of srcdir to avoid some funny problems when
-# feeding our results to other peoples configure via cache
-if echo "$srcdir" | grep '^/' > /dev/null 2> /dev/null; then
-  abssrcdir="$srcdir"
-else
-  abssrcdir="`pwd`/$srcdir"
-fi
+# do not use `MKINSTALLDIRS' and `MAKEHEADER' since there may be
+# name clashes with other peoples configure scripts via
+# `config.cache'.  Furthermore, we do not use cache at all to
+# avoid some nasty problems with our own development environment.
+unset ac_cv_path_FACTORY_MKINSTALLDIRS
+unset ac_cv_path_FACTORY_MAKEHEADER
 # Extract the first word of "mkinstalldirs", so it can be a program name with args.
 set dummy mkinstalldirs; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_MKINSTALLDIRS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MKINSTALLDIRS" in
+if eval "test \"`echo '$''{'ac_cv_path_FACTORY_MKINSTALLDIRS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$FACTORY_MKINSTALLDIRS" in
   /*)
-  ac_cv_path_MKINSTALLDIRS="$MKINSTALLDIRS" # Let the user override the test with a path.
+  ac_cv_path_FACTORY_MKINSTALLDIRS="$FACTORY_MKINSTALLDIRS" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH:$abssrcdir/bin; do
+  for ac_dir in $PATH:$srcdir/bin; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MKINSTALLDIRS="$ac_dir/$ac_word"
+      ac_cv_path_FACTORY_MKINSTALLDIRS="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MKINSTALLDIRS" && ac_cv_path_MKINSTALLDIRS="-mkdir"
+  test -z "$ac_cv_path_FACTORY_MKINSTALLDIRS" && ac_cv_path_FACTORY_MKINSTALLDIRS="-mkdir"
   ;;
 esac
 fi
-MKINSTALLDIRS="$ac_cv_path_MKINSTALLDIRS"
-if test -n "$MKINSTALLDIRS"; then
-  echo "$ac_t""$MKINSTALLDIRS" 1>&6
+FACTORY_MKINSTALLDIRS="$ac_cv_path_FACTORY_MKINSTALLDIRS"
+if test -n "$FACTORY_MKINSTALLDIRS"; then
+  echo "$ac_t""$FACTORY_MKINSTALLDIRS" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -1255 +1254 @@
 set dummy makeheader; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_MAKEHEADER'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MAKEHEADER" in
+if eval "test \"`echo '$''{'ac_cv_path_FACTORY_MAKEHEADER'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$FACTORY_MAKEHEADER" in
   /*)
-  ac_cv_path_MAKEHEADER="$MAKEHEADER" # Let the user override the test with a path.
+  ac_cv_path_FACTORY_MAKEHEADER="$FACTORY_MAKEHEADER" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $abssrcdir/bin:$PATH; do
+  for ac_dir in $srcdir/bin:$PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_MAKEHEADER="$ac_dir/$ac_word"
+      ac_cv_path_FACTORY_MAKEHEADER="$ac_dir/$ac_word"
       break
     fi
@@ -1275 +1274 @@
 esac
 fi
-MAKEHEADER="$ac_cv_path_MAKEHEADER"
-if test -n "$MAKEHEADER"; then
-  echo "$ac_t""$MAKEHEADER" 1>&6
+FACTORY_MAKEHEADER="$ac_cv_path_FACTORY_MAKEHEADER"
+if test -n "$FACTORY_MAKEHEADER"; then
+  echo "$ac_t""$FACTORY_MAKEHEADER" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -1287 +1286 @@
 #
 echo $ac_n "checking for -lm""... $ac_c" 1>&6
-ac_lib_var=`echo m_atof | tr '.-/+' '___p'`
+ac_lib_var=`echo m'_'atof | tr './+\055' '__p_'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1294 +1293 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1297 "configure"
+#line 1296 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
 char atof();
 
@@ -1304 +1305 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1332 +1333 @@
 if test "x$gmp_in_installation" != xyes; then
   echo $ac_n "checking for -lgmp""... $ac_c" 1>&6
-ac_lib_var=`echo gmp_mpz_init | tr '.-/+' '___p'`
+ac_lib_var=`echo gmp'_'mpz_init | tr './+\055' '__p_'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1339 +1340 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1342 "configure"
+#line 1343 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
 char mpz_init();
 
@@ -1349 +1352 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1395 +1398 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1398 "configure"
+#line 1401 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1435 +1438 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1438 "configure"
+#line 1441 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1475 +1478 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1478 "configure"
+#line 1481 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1513 +1516 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1516 "configure"
+#line 1519 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1554 +1557 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1557 "configure"
+#line 1560 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1597 +1600 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1600 "configure"
+#line 1603 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
@@ -1655 +1658 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1658 "configure"
+#line 1661 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-{ (eval echo configure:1662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_cross=no
@@ -1687 +1690 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1693 "configure"
 #include "confdefs.h"
 
@@ -1737 +1740 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -1763 +1766 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1766 "configure"
+#line 1769 "configure"
 #include "confdefs.h"
 
@@ -1771 +1774 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -1804 +1807 @@
 else
 cat > conftest.$ac_ext <<EOF
-#line 1807 "configure"
+#line 1810 "configure"
 #include "confdefs.h"
  int main() { if (-2 >> 1 == -1) exit(0); else exit(1); } 
 EOF
-{ (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
 if test -s conftest && (./conftest; exit) 2>/dev/null; then
   ac_cv_shift=yes
@@ -1972 +1975 @@
 fi
 
-#
-# - debugoutput and timing magic.
-#
-# For those who do not like this: As long as you do not specify
-# --enable-timing or --enable-debugoutput the following code will
-# not be executed.
-#
-timingtargets=/dev/null
-debouttargets=/dev/null
-debtimingtargets=/dev/null
-enhanceddebtime=no
-
 # timing
 if test "x$enable_timing" != xno; then
-  if test "x$enable_timing" = xyes; then
-    cat >> confdefs.h <<\EOF
+  cat >> confdefs.h <<\EOF
 #define TIMING 1
 EOF
 
-  else
-    echo "$enable_timing" | tr ',' '\n' | sed 's/\..*$//' | sort > conftest.time
-    timingtargets=conftest.time
-    enhanceddebtime=yes
-  fi
 fi
 
 # debugoutput
 if test "x$enable_debugoutput" != xno; then
-  if test "x$enable_debugoutput" = xyes; then
-    cat >> confdefs.h <<\EOF
+  cat >> confdefs.h <<\EOF
 #define DEBUGOUTPUT 1
 EOF
 
-  else
-    echo "$enable_debugoutput" | tr ',' '\n' | sed 's/\..*$//' | sort > conftest.debout
-    debouttargets=conftest.debout
-    enhanceddebtime=yes
-  fi
-fi
-
-# create makefile fragments
-if test "x$enhanceddebtime" = xyes; then
-  # get the intersection of timingtargets and debouttargets
-  sort "$timingtargets" "$debouttargets" | uniq -d > conftest.debtime
-  if test -s conftest.debtime; then
-    debtimingtargets=conftest.debtime
-  fi
-  if test "x$timingtargets" != x/dev/null; then
-    # get difference of timingtargets and debtimingtargets
-    sort "$timingtargets" "$debtimingtargets" | uniq -u |
-      while read line; do
-        echo "$line.o: $line.cc config.h;" '$(CXX) -c $< -DTIMING $(LIBCXXFLAGS) -o $@'
-      done > conftest.tmp
-    mv conftest.tmp "$timingtargets"
-  fi
-  if test "x$debouttargets" != x/dev/null; then
-    # get difference of debouttargets and debtimingtargets
-    sort "$debouttargets" "$debtimingtargets" | uniq -u |
-      while read line; do
-        echo "$line.o: $line.cc config.h;" '$(CXX) -c $< -DDEBUGOUTPUT $(LIBCXXFLAGS) -o $@'
-      done > conftest.tmp
-    mv conftest.tmp "$debouttargets"
-  fi
-  if test "x$debtimingtargets" != x/dev/null; then
-    while read line; do
-      echo "$line.o: $line.cc config.h;" '$(CXX) -c $< -DTIMING -DDEBUGOUTPUT $(LIBCXXFLAGS) -o $@'
-    done < "$debtimingtargets" > conftest.tmp
-    mv conftest.tmp "$debtimingtargets"
-  fi
 fi
 
@@ -2046 +1994 @@
 # - complete and substitute variables, defines.
 #
-
-
-
-
 
 
@@ -2159 +2103 @@
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.9"
+    echo "$CONFIG_STATUS generated by autoconf version 2.10"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
@@ -2212 +2156 @@
 s%@M4@%$M4%g
 s%@BISON@%$BISON%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@MAKEHEADER@%$MAKEHEADER%g
+s%@FACTORY_MKINSTALLDIRS@%$FACTORY_MKINSTALLDIRS%g
+s%@FACTORY_MAKEHEADER@%$FACTORY_MAKEHEADER%g
 s%@gftabledir@%$gftabledir%g
 s%@templatedir@%$templatedir%g
@@ -2228 +2172 @@
 s%@installtargets@%$installtargets%g
 s%@uninstalltargets@%$uninstalltargets%g
-/@timingtargets@/r $timingtargets
-s%@timingtargets@%%g
-/@debouttargets@/r $debouttargets
-s%@debouttargets@%%g
-/@debtimingtargets@/r $debtimingtargets
-s%@debtimingtargets@%%g
 
 CEOF
@@ -2386 +2324 @@
     rm -f conftest.h
   else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
     rm -f $ac_file
     mv conftest.h $ac_file