Changeset d88aa0 in git

Timestamp:

Dec 11, 2019, 3:37:17 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

bdc8243c2799931f514a94231892eb1bcb332d0e

Parents:

9d9c8d81baed1983130f6363b5957b5b2688f287

Message:

simplified: libpolys/configure gfanlib/confihure (-gmp,ntl)

Files:

• gfanlib/configure.ac (modified) (1 diff)
• libpolys/configure.ac (modified) (1 diff)

gfanlib/configure.ac

@@ -38 +38 @@
 AC_C_INLINE
 
-# Check whether --with-gmp was given.
-if test "${with_gmp+set}" = set; then :
-  if test "$with_gmp" = yes ; then
-        GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
-   elif test "$with_gmp" != no ; then
-        GMP_HOME_PATH="$with_gmp ${DEFAULT_CHECKING_PATH}"
-    fi
-else
-  GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
-fi
-
-BACKUP_CFLAGS=${CFLAGS}
-BACKUP_LIBS=${LIBS}
-
-for GMP_HOME in ${GMP_HOME_PATH}
-do
-  if test "x$GMP_HOME" != "x/usr"; then
-    GMP_CPPFLAGS="-I${GMP_HOME}/include"
-    GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
-  else
-    GMP_CPPFLAGS=""
-    GMP_LIBS="-lgmp"
-  fi
-  CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
-  LIBS="${BACKUP_LIBS} ${GMP_LIBS}"
-done
-AC_SUBST(GMP_CPPFLAGS)
-AC_SUBST(GMP_LIBS)
-
-AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
-
 SING_CHECK_GFANLIB
 

libpolys/configure.ac

@@ -56 +56 @@
 fi
 
-BACKUP_CFLAGS=${CFLAGS}
-BACKUP_LIBS=${LIBS}
-
-for GMP_HOME in ${GMP_HOME_PATH}
-do
-  if test "x$GMP_HOME" != "x/usr"; then
-    GMP_CPPFLAGS="-I${GMP_HOME}/include"
-    GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath -Wl,${GMP_HOME}/lib -lgmp"
-  else
-    GMP_CPPFLAGS=""
-    GMP_LIBS="-lgmp"
-  fi
-  CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
-  LIBS="${BACKUP_LIBS} ${GMP_LIBS}"
-done
-AC_SUBST(GMP_CPPFLAGS)
-AC_SUBST(GMP_LIBS)
-
-AC_CHECK_HEADERS([gmp.h], ,[AC_MSG_ERROR([GNU MP not found])])
-AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
-
-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)]))
+dnl gmp, ntl check in factory
 LB_CHECK_FLINT(2.4,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))