Changeset f30df9 in git

Timestamp:

Aug 22, 2013, 7:15:54 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

0635d513a4904575a4a7bacb750e17cd54a02089fa601bae3b282a1d9ecb0b4cd31ebb37b467e9a4

Parents:

1dbfb4a46972767ca8f476540e393e0f2f779abb

Message:

More fixes/improvements to BS (m4/*.m4)

Location:

m4

Files:

• flags.m4 (modified) (1 diff)
• flint-check.m4 (modified) (3 diffs)
• gmp-check.m4 (modified) (3 diffs)
• mathic-check.m4 (modified) (1 diff)

m4/flags.m4

@@ -104 +104 @@
  
  if test "x${ENABLE_OPTIMIZATION}" != xno; then 
-  OPTFLAGS="-DOM_NDEBUG -DNDEBUG -O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space"
+  OPTFLAGS="-DOM_NDEBUG -DNDEBUG -O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops"
   #  -O3 - crashes gcc???!!!  
   # -fpermissive 

m4/flint-check.m4

@@ -40 +40 @@
 BACKUP_LIBS=${LIBS}
 
-AC_LANG_PUSH(C)
-
 if test -n "$FLINT_HOME_PATH"; then
 AC_MSG_CHECKING(for FLINT >= $min_flint_version)
 fi
 
+AC_LANG_PUSH([C])
+
 for FLINT_HOME in ${FLINT_HOME_PATH} 
  do     
-if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
+## if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
 
-        if test "x$FLINT_HOME" != "x/usr"; then
+#       if test "x$FLINT_HOME" != "x/usr"; then
                 FLINT_CFLAGS="-I${FLINT_HOME}/include/flint"
                 FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
-        else
-                FLINT_CFLAGS=
-                FLINT_LIBS="-lflint"            
-        fi      
+#       else
+#               FLINT_CFLAGS=""
+#               FLINT_LIBS="-lflint"            
+#       fi      
         CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS}" 
         LIBS="${BACKUP_LIBS} ${FLINT_LIBS}"
@@ -86 +86 @@
         unset FLINT_LIBS        
         ])
-else
-        flint_found="no"
-fi
+#else
+#       flint_found="no"
+#fi
 done
+AC_LANG_POP([C])
+
+CFLAGS=${BACKUP_CFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
 
 if test "x$flint_found" = "xyes" ; then         
@@ -114 +120 @@
 fi      
 
-AC_LANG_POP
-
 AM_CONDITIONAL(SING_HAVE_FLINT, test "x$HAVE_FLINT" = "xyes")
-
-CFLAGS=${BACKUP_CFLAGS}
-LIBS=${BACKUP_LIBS}
-#unset LD_LIBRARY_PATH
-
 ])
 

m4/gmp-check.m4

@@ -96 +96 @@
                                 AC_SUBST(GMP_CFLAGS)
                                 AC_SUBST(GMP_LIBS)
+                                AC_SUBST(GMP_HOME)
+                                HAVE_GMP=yes
                                 AC_DEFINE(HAVE_GMP,1,[Define if GMP is installed])      
                                 ifelse([$2], , :, [$2])
@@ -112 +114 @@
 AC_LANG_POP([C])
 
+CFLAGS=${BACKUP_CFLAGS}
+LIBS=${BACKUP_LIBS}
+#unset LD_LIBRARY_PATH
+
+
 if test "x$gmp_found" != "xyes"; then
         if test -n "$gmp_problem"; then
@@ -122 +129 @@
 fi
 
-
-CFLAGS=${BACKUP_CFLAGS}
-LIBS=${BACKUP_LIBS}
-#unset LD_LIBRARY_PATH
-
+AM_CONDITIONAL(SING_HAVE_GMP, test "x$HAVE_GMP" = "xyes")
 ])

m4/mathic-check.m4

@@ -26 +26 @@
     [AC_MSG_ERROR([Cannot find the MathicGB library.])], [-lstdc++])
   AC_CHECK_HEADER([mathicgb.h])
-  AH_TEMPLATE([HAVE_MATHICGB], [have mathicgb])
-  AC_DEFINE(HAVE_MATHICGB)
+  AC_DEFINE(HAVE_MATHICGB,1,[Define if mathicgb is to be used])
  ])
  #