Changeset ce9bfe in git

Timestamp:

Jul 12, 2013, 3:08:42 AM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8f26a44e663826673c749e35258d72a4adec7c8f

Parents:

32a5f7cbaed7a5ea97ad30c9863f455d9cc4cef2

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-07-12 03:08:42+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-08-12 12:19:32+02:00

Message:

Added FLAGS,LIBS output for debugging

Show (due to '-v') more _CFLAGS/_LIBS for factory, ntl, gmp, flint

Files:

• Singular/misc_ip.cc (modified) (5 diffs)
• configure.ac (modified) (1 diff)
• m4/flags.m4 (modified) (1 diff)
• m4/p-procs.m4 (modified) (2 diffs)

Singular/misc_ip.cc

@@ -12 +12 @@
 
 // include header files
-#include <misc/auxiliary.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
+
+#include <misc/auxiliary.h>
 #include <kernel/mod2.h>
 #include <Singular/si_signals.h>
@@ -776 +777 @@
   StringAppendS("\t");
 #ifdef HAVE_FACTORY
-  StringAppend("factory(%s)", factoryVersion);
+  StringAppend("factory(%s){'%s','%s'}", factoryVersion, FACTORY_CFLAGS, FACTORY_LIBS);
 #ifdef HAVE_LIBFAC
   // libfac:
@@ -787 +788 @@
 
 #if defined (__GNU_MP_VERSION) && defined (__GNU_MP_VERSION_MINOR)
-              StringAppend("GMP(%d.%d),",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR);
+              StringAppend("GMP(%d.%d){'%s','%s'},",__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR, GMP_CFLAGS, GMP_LIBS);
 #else
               StringAppendS("GMP(1.3),");
@@ -793 +794 @@
 #ifdef HAVE_NTL
 #include <NTL/version.h>
-              StringAppend("NTL(%s),",NTL_VERSION);
-#endif
+              StringAppend("NTL(%s){'%s','%s'},",NTL_VERSION, NTL_CFLAGS, NTL_LIBS);
+#endif
+
+#ifdef HAVE_FLINT
+// #include <NTL/version.h>
+              StringAppend("FLINT(??){'%s','%s'},", FLINT_CFLAGS, FLINT_LIBS);
+#endif
+   
+
 #if SIZEOF_VOIDP == 8
               StringAppendS("64bit,");
@@ -876 +884 @@
 #endif
               StringAppend("random=%d\n",siRandomStart);
-              StringAppend("\tCC=%s %s,\n\tCXX=%s %s"
+              StringAppend("\tAC_CONFIGURE_ARGS=%s,\n"
+                           "\tCC=%s,FLAGS:%s,\n"
+                           "\tCXX=%s,FLAGS:%s,\n"
+                           "\tDEFS:%s,CPPFLAGS:%s,\n"
+                           "\tLDFLAGS:%s,LIBS:%s "
 #ifdef __GNUC__
-              "(" __VERSION__ ")"
-#endif
-              "\n",CC,CFLAGS,CXX,CXXFLAGS);
+              "(ver: " __VERSION__ ")"
+#endif
+              "\n",AC_CONFIGURE_ARGS, CC,CFLAGS, CXX,CXXFLAGS,  DEFS,CPPFLAGS,  LDFLAGS,LIBS);
               feStringAppendResources(0);
               feStringAppendBrowsers(0);

configure.ac

@@ -146 +146 @@
 AC_DEFINE_UNQUOTED([LDFLAGS],"$LDFLAGS",[LDFLAGS])
 AC_DEFINE_UNQUOTED([LIBS],"$LIBS",[LIBS])
+AC_DEFINE_UNQUOTED([AC_CONFIGURE_ARGS],"$ac_configure_args",[ac_configure_args])
+# AC_DEFINE_UNQUOTED([AC_CT_CC], "$ac_ct_CC",[ac_ct_CC])
+
+AC_DEFINE_UNQUOTED([FACTORY_CFLAGS],"$FACTORY_CFLAGS",[FACTORY_CFLAGS])
+AC_DEFINE_UNQUOTED([FACTORY_LIBS],"$FACTORY_LIBS",[FACTORY_LIBS])
+
+AC_DEFINE_UNQUOTED([NTL_CFLAGS],"$NTL_CFLAGS",[NTL_CFLAGS])
+AC_DEFINE_UNQUOTED([NTL_LIBS],"$NTL_LIBS",[NTL_LIBS])
+
+AC_DEFINE_UNQUOTED([GMP_CFLAGS],"$GMP_CFLAGS",[GMP_CFLAGS])
+AC_DEFINE_UNQUOTED([GMP_LIBS],"$GMP_LIBS",[GMP_LIBS])
+
+AC_DEFINE_UNQUOTED([FLINT_CFLAGS],"$FLINT_CFLAGS",[FLINT_CFLAGS])
+AC_DEFINE_UNQUOTED([FLINT_LIBS],"$FLINT_LIBS",[FLINT_LIBS])
 
 

m4/flags.m4

@@ -117 +117 @@
   AX_APPEND_LINK_FLAGS([-fno-exceptions -fno-rtti -fpermissive])
 #  AX_APPEND_LINK_FLAGS([-fno-implicit-templates]) # see above :(
-  AX_APPEND_LINK_FLAGS([-rdynamic]) 
-  AX_APPEND_LINK_FLAGS([-flat_namespace -Wl,-bind_at_load -Wl,-undefined,dynamic_lookup  -fpermissive -fvisibility=default]) 
+  AX_APPEND_LINK_FLAGS([ -fpermissive -fvisibility=default]) 
+#  AX_APPEND_LINK_FLAGS([ ])
  fi
 

m4/p-procs.m4

@@ -62 +62 @@
     ENABLE_P_PROCS_DYNAMIC="yes"
     ENABLE_P_PROCS_STATIC="no"
-    USEPPROCSDYNAMICLDFLAGS="-rdynamic"
+    USEPPROCSDYNAMICLDFLAGS=""
     AC_CHECK_FUNC(dlopen,,[AC_CHECK_LIB(dl,dlopen,USEPPROCSDYNAMICLD="-ldl", [
       AC_MSG_WARN(Could not use dlopen)
@@ -78 +78 @@
   AC_DEFINE(HAVE_DL,1,enable dynamic modules)
   AC_DEFINE(HAVE_DYNAMIC_LOADING,1,enable dynamic modules)
+
+  AX_APPEND_LINK_FLAGS([-rdynamic -flat_namespace -Wl,-bind_at_load -Wl,-undefined,dynamic_lookup])
 fi