Changeset 9af8a63 in git for factory

Timestamp:

May 10, 2011, 12:38:31 PM (13 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

7d73857bd54e9bc8480c720d2a0c39dae20a94ed

Parents:

a1176850d8bc3768dff97fab8beb14e098171bf7

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-10 12:38:31+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:40+01:00

Message:

invoke the macros to check for gmp and ntl in factory/configure.in
- do not require a minimum version number in gmp-check.m4 and ntl-check.m4
- require minimum version 3.1.1 in invocation of gmp-check in libpolys
- ntl-check.m4 now checks even without --with-ntl passed to ./configure
- ntl-check.m4 now uses C++ to compile test programs

Location:

factory

Files:

• GNUmakefile.in (modified) (1 diff)
• configure.in (modified) (7 diffs)

factory/GNUmakefile.in

@@ -67 +67 @@
 #
 CFLAGS =        @CFLAGS@
-CPPFLAGS =      @CPPFLAGS@
+CPPFLAGS =      @CPPFLAGS@ @GMP_CFLAGS@ @NTL_CFLAGS@
 CXXFLAGS =      @CXXFLAGS@
 DEFS =          @DEFS@
 LDFLAGS =       @LDFLAGS@
-LIBS =          @LIBS@
+LIBS =          @LIBS@ @GMP_LIBS@ @NTL_LIBS@
 
 ARFLAGS =       @ARFLAGS@

factory/configure.in

@@ -15 +15 @@
 AC_REVISION($Id$)
 AC_INIT(canonicalform.cc)
+AC_CONFIG_MACRO_DIR([../m4])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(bin)
@@ -47 +48 @@
   omalloc,
   [  --with-omalloc           build for use with omalloc])
-AC_ARG_WITH(
-  gmp,
-  [  --with-gmp(=<gmp_path>)
-                          specify where to find gmp library.])
 
 AC_ARG_WITH(
@@ -57 +54 @@
   ,
   with_Singular=no)
-
-AC_ARG_WITH(
-  NTL,
-  [  --with-NTL              build for use with NTL.],
-  with_NTL=yes,
-  )
-
-AC_ARG_ENABLE(
-  NTL,
-  [  --enable-NTL              build for use with NTL.],
-  with_NTL=yes,
-  )
 
 AC_ARG_ENABLE(
@@ -112 +97 @@
   ,
   enable_debugoutput=no)
-
-# a tribute to Singular
-AC_ARG_ENABLE(
-  gmp,
-  [  --enable-gmp            together with \`--with-Singular' means: installation
-                          in process, be graceful when there is no \`gmp.h'],
-  [ if test "x$with_Singular" = xyes && test "x$enable_gmp" != xno; then
-      with_gmp='$(prefix)'
-    fi ])
-
-#
-# - check the results of --with-gmp.
-#
-case "$with_gmp" in
-  yes|no|"")
-    gmp_in_installation=no ;;
-  *)
-    CPPFLAGS="-I$with_gmp/include $CPPFLAGS"
-    LDFLAGS="-L$with_gmp/lib $LDFLAGS"
-    gmp_in_installation=no ;;
-esac
 
 #
@@ -226 +190 @@
 AC_CHECK_LIB(m, atof, , [ AC_MSG_ERROR(libm.a not found) ])
 
-if test "x$gmp_in_installation" != xyes; then
-  AC_CHECK_LIB(gmp, main, ,
-    [
-      # 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_main
-      LDFLAGS="-L$explicit_libdir $LDFLAGS"
-      AC_CHECK_LIB(gmp, main, ,
-        [ AC_MSG_ERROR(libgmp.a not found.  Use option --with-gmp to specify path) ])
-      unset ac_cv_lib_gmp_main
-    ])
-fi
+LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
+
+LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 
 # arithmetic shift
@@ -256 +211 @@
 #
 AC_LANG_CPLUSPLUS
-
-if test "x$gmp_in_installation" != xyes; then
-  AC_CHECK_HEADERS(gmp.h, ,
-    [
-      # 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
 
 AC_CHECK_HEADERS(stdio.h stdlib.h string.h time.h math.h, ,
@@ -409 +351 @@
 fi
 
-# NTL
-if test "x$with_NTL" = xyes; then
-  AC_DEFINE(HAVE_NTL)
-fi
-
 # arithmetic shift
 #if test "x$ac_cv_shift" = xyes; then   
 #  AC_DEFINE(HAS_ARITHMETIC_SHIFT)
 #fi
-
-# gmp-stuff.  we must not set these flags before the tests
-# are finished!
-if test "x$gmp_in_installation" = xyes; then
-  CPPFLAGS="-I\$(includedir) $CPPFLAGS"
-  if test "x$with_Singular" = xyes; then
-    LDFLAGS="-L\$(libdir) -lgmp $LDFLAGS"
-  fi
-fi
 
 AC_MSG_CHECKING(whether to use omalloc)