Changeset 50b5d9 in git

Timestamp:

Nov 5, 2013, 7:32:48 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

6008fe44cedc7793187b6229700bf1202ed3b6b0

Parents:

fccea5bb683a48f35f88ab4b9807547d6ea3a220

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-05 19:32:48+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-06 15:37:35+01:00

Message:

Show MPIR version whenever available with a fallback to GMP

File:

• Singular/misc_ip.cc (modified) (2 diffs)

Singular/misc_ip.cc

@@ -789 +789 @@
   StringAppendS("\nwith\n\t");
 
-#if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
-              StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
+#if defined(mpir_version)
+              StringAppend("MPIR(%s)~GMP(%s),", mpir_version, gmp_version);
+#elif defined(gmp_version)
+              // #if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
+              //              StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
+              StringAppend("GMP(%s),", gmp_version);
 #endif
 #ifdef HAVE_NTL
@@ -798 +802 @@
 
 #ifdef HAVE_FLINT
-              StringAppend("FLINT(%s){'%s','%s'},",version, FLINT_CFLAGS, FLINT_LIBS);
+              StringAppend("FLINT(%s),",version);
 #endif