Changeset 726f4d in git

Timestamp:

Jun 9, 1998, 11:59:30 AM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d370e9aa7dc8770d5d61477811ef73dc9add5b3f

Parents:

f306b384282fadc2da8035dbab764dc244672bc4

Message:

	* configure.in (ac_save_path): renamed to `$save_path'.  All
	  references changed
	  (expl_datadir, expl_gftabledir): renamed to `$explicit_datadir',
	  `$explicit_gftabledir', resp.  All references changed.

	* configure.in: checks for gmp.h and libgmp.a search in
	  `$includedir' and `$libdir', resp.

	* configure.in: new section added to get a safer explicit path
	  expansion

	* configure.in: `$gftabledir' is not longer handled in a special
	  way for Singular


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

File:

• factory/configure.in (modified) (8 diffs)

factory/configure.in

@@ -1 +1 @@
 dnl # emacs edit mode for this file is -*- sh -*-
-dnl # $Id: configure.in,v 1.20 1998-06-03 12:04:33 obachman Exp $
+dnl # $Id: configure.in,v 1.21 1998-06-09 09:59:30 schmidt Exp $
 
 dnl #
@@ -13 +13 @@
 # - initialisation.
 #
-AC_REVISION($Id: configure.in,v 1.20 1998-06-03 12:04:33 obachman Exp $)
+AC_REVISION($Id: configure.in,v 1.21 1998-06-09 09:59:30 schmidt Exp $)
 AC_INIT(canonicalform.cc)
 AC_CONFIG_HEADER(config.h)
@@ -91 +91 @@
   enable_debugoutput=no)
 
-# an ugly tribute to Singular
+# an tribute to Singular
 AC_ARG_ENABLE(
   gmp,
@@ -160 +160 @@
 unset ac_cv_path_FACTORY_MKINSTALLDIRS
 unset ac_cv_path_FACTORY_MAKEHEADER
-ac_save_path="$PATH"
+save_path="$PATH"
 PATH="$PATH:$srcdir/bin"
 AC_PATH_PROG(FACTORY_MKINSTALLDIRS, mkinstalldirs, -mkdir)
-PATH="$srcdir/bin:$ac_save_path"
+PATH="$srcdir/bin:$save_path"
 AC_PATH_PROG(FACTORY_MAKEHEADER, makeheader)
-PATH="$ac_save_path"
+PATH="$save_path"
+
+#
+# - expand paths.
+#
+
+# Attention!  We use file descriptor 9 for our purposes!
+# This may fail with future version of `autoconf'.
+AC_MSG_CHECKING(and generating explicit install paths)
+save_prefix="$prefix"
+save_exec_prefix="$exec_prefix"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+for dir in prefix exec_prefix bindir sbindir libexecdir \
+           datadir sysconfdir sharedstatedir localstatedir libdir \
+           includedir oldincludedir infodir mandir; do
+  eval "dir_value=\$$dir"
+  echo "$dir=$dir_value" >> ./conftest.mk
+  echo "explicit_$dir:" >> ./conftest.mk
+  echo "        echo \$($dir) >&9" >> ./conftest.mk
+done
+prefix="$save_prefix"
+exec_prefix="$save_exec_prefix"
+
+explicit_datadir=`make 9>&1 >&5 2>&1 -f ./conftest.mk explicit_datadir`
+explicit_libdir=`make 9>&1 >&5 2>&1 -f ./conftest.mk explicit_libdir`
+explicit_includedir=`make 9>&1 >&5 2>&1 -f ./conftest.mk explicit_includedir`
+
+rm -f ./conftest.mk
+AC_MSG_RESULT(done)
+
+# make paths absolut
+if echo "$explicit_datadir" | grep -v '^/' > /dev/null 2> /dev/null; then
+  explicit_datadir="`pwd`/$explicit_datadir"
+fi
+if echo "$explicit_libdir" | grep -v '^/' > /dev/null 2> /dev/null; then
+  explicit_libdir="`pwd`/$explicit_libdir"
+fi
+if echo "$explicit_includedir" | grep -v '^/' > /dev/null 2> /dev/null; then
+  explicit_includedir="`pwd`/$explicit_includedir"
+fi
 
 #
@@ -174 +214 @@
 if test "x$gmp_in_installation" != xyes; then
   AC_CHECK_LIB(gmp, mpz_init, ,
-    [ AC_MSG_ERROR(libgmp.a not found.  Use option --with-gmp to specify path) ])
+    [
+      # check a second time in `$(libdir)'.  This is a bit tricky,
+      # but I think its worth avoiding long option values.
+      unset ac_cv_lib_gmp_mpz_init
+      LDFLAGS="-L$explicit_libdir $LDFLAGS"
+      AC_CHECK_LIB(gmp, mpz_init, ,
+        [ AC_MSG_ERROR(libgmp.a not found.  Use option --with-gmp to specify path) ])
+      unset ac_cv_lib_gmp_mpz_init
+    ])
 fi
 
@@ -184 +232 @@
 if test "x$gmp_in_installation" != xyes; then
   AC_CHECK_HEADERS(gmp.h, ,
-    [ AC_MSG_ERROR(gmp.h not found.  Use option --with-gmp to specify path) ])
+    [
+      # check a second time in `$(includedir)'.  This is a bit tricky,
+      # but I think it's worth avoiding long option values.
+      unset ac_cv_header_gmp_h
+      CPPFLAGS="-I$explicit_includedir $CPPFLAGS"
+      AC_CHECK_HEADERS(gmp.h, ,
+        [ AC_MSG_ERROR(gmp.h not found.  Use option --with-gmp to specify path) ])
+      unset ac_cv_header_gmp_h
+    ])
 fi
 
@@ -250 +306 @@
 #
 
-# we have to get datadir explicitely for config.h
-save_prefix="$prefix"
-test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-expl_datadir=`eval echo "$datadir"`
-prefix="$save_prefix"
-# get absolute path of expl_datadir
-if echo "$expl_datadir" | grep -v '^/' > /dev/null 2> /dev/null; then
-  expl_datadir="`pwd`/$expl_datadir"
-fi
-
-if test "x$with_Singular" = xyes; then
-  gftabledir='${datadir}/Singular/gftables'
-  expl_gftabledir="$expl_datadir/Singular/gftables"
-  templatedir='${includedir}/templates'
-else
-  gftabledir='${datadir}/factory/gftables'
-  expl_gftabledir="$expl_datadir/factory/gftables"
-  templatedir='${includedir}/templates'
-fi
+# note that Singular has its own mechanism to search the tables,
+# hence we do not need to mind it here
+gftabledir='${datadir}/factory/gftables'
+explicit_gftabledir="$explicit_datadir/factory/gftables"
+
+# for installation of the templates
+templatedir='${includedir}/templates'
 
 #
@@ -405 +449 @@
 AC_DEFINE_UNQUOTED(FACTORYVERSION, "$factory_version")
 AC_DEFINE_UNQUOTED(FACTORYCONFIGURATION, "$factory_configuration")
-AC_DEFINE_UNQUOTED(GFTABLEDIR, "$expl_gftabledir")
+AC_DEFINE_UNQUOTED(GFTABLEDIR, "$explicit_gftabledir")
 
 AC_OUTPUT(GNUmakefile ftest/GNUmakefile)