Changeset 13f555 in git

Timestamp:

Sep 29, 2014, 8:17:16 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

351717f210df19b5dd8d203ad7fc30592d9516c6

Parents:

a28cd7f9b24e3824abfbcce4660bc1b2375fad12

Message:

Fixing configure test for cddlib

Files:

• Singular/dyn_modules/gfanlib/Makefile.am (modified) (1 diff)
• m4/gfanlib-check.m4 (modified) (3 diffs)

Singular/dyn_modules/gfanlib/Makefile.am

@@ -23 +23 @@
 gfanlib_la_SOURCES  = $(SOURCES)
 
-gfanlib_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON}
+gfanlib_la_CPPFLAGS = ${MY_CPPFLAGS} ${P_PROCS_CPPFLAGS_COMMON} ${CDDGMPCPPFLAGS}
 gfanlib_la_LDFLAGS  = ${P_PROCS_MODULE_LDFLAGS}
 

m4/gfanlib-check.m4

@@ -25 +25 @@
  BACKUP_LIBS=$LIBS
 
- LIBS="-lcddgmp $GMP_LIBS $LIBS"
+ LIBS="$LIBS -lcddgmp $GMP_LIBS "
 
- AC_LANG_PUSH(C++)
+ AC_LANG_PUSH(C)
  AC_LINK_IFELSE(
   [
    AC_LANG_PROGRAM(
     [
+    #define GMPRATIONAL
      #ifdef HAVE_SETOPER_H
      # include <setoper.h>
@@ -44 +45 @@
      # include <cddlib/cdd.h>
      #endif
-    ], [dd_set_global_constants()]    )
+    ], [dd_set_global_constants(); dd_log=dd_FALSE; ] 
+    )
   ],
-  [PASSED_ALL_TESTS_FOR_GFANLIB="1"] [CDDGMPLDFLAGS="-lcddgmp"],
+  [PASSED_ALL_TESTS_FOR_GFANLIB="1"] [CDDGMPLDFLAGS="-lcddgmp $GMP_LIBS"]  [CDDGMPCPPFLAGS="-DGMPRATIONAL"],
   [PASSED_ALL_TESTS_FOR_GFANLIB="0"]
  )
@@ -53 +55 @@
  LIBS=$BACKUP_LIBS
 
- AC_MSG_RESULT(no)
-
- AC_SUBST(CDDGMPLDFLAGS) 
 else
- AC_MSG_RESULT(no)
  PASSED_ALL_TESTS_FOR_GFANLIB="0"
 fi
 
+ if test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1; then  
+  AC_MSG_RESULT(yes)
+  AC_SUBST(CDDGMPLDFLAGS) 
+  AC_SUBST(CDDGMPCPPFLAGS) 
+ else
+  AC_MSG_RESULT(no) 
+ fi
 
 AM_CONDITIONAL(HAVE_GFANLIB, test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1)