Changeset 246bbb in git

Timestamp:

Sep 2, 2013, 9:00:15 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ba5e9e013e5f2dc73f8cdb4219c1f1e8a19266d3

Parents:

3cadd014f1310674ce369c4fc549699d470edbfc

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-09-02 21:00:15+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-09-02 21:00:33+02:00

Message:

Better FLINT-discover fix

File:

• m4/flint-check.m4 (modified) (1 diff)

m4/flint-check.m4

@@ -50 +50 @@
 ## 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_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr -lmpir"
-#       else
-#               FLINT_CFLAGS=""
-#               FLINT_LIBS="-lflint"            
-#       fi      
+                FLINT_LIBS="-L${FLINT_HOME}/lib"
+        else
+                FLINT_CFLAGS=""
+                FLINT_LIBS=""           
+        fi
+        
+        # we suppose that mpfr and mpir to be in the same place or available by default
+        FLINT_LIBS="$FLINT_LIBS -lflint -lmpfr -lmpir"
+        
         CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS}" 
         LIBS="${BACKUP_LIBS} ${FLINT_LIBS}"