Changeset 69181b3 in git

Timestamp:

May 10, 2011, 4:48:58 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

9c68871c5299532f62e3ee9d88efddebac68ccbd

Parents:

468b57665e41eeb23c67a98dd6a2f85ccce65137

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-10 16:48:58+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:44+01:00

Message:

ADD: initializeGMP is needed when linking against factory
ADD: NTL should be used  when linking against factory

Location:

libpolys/tests

Files:

• Makefile.am (modified) (2 diffs)
• common.h (modified) (1 diff)

libpolys/tests/Makefile.am

@@ -12 +12 @@
 AM_CPPFLAGS = -DHAVE_CONFIG_H
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}
+INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}  ${NTL_CFLAGS}
 
 
@@ -27 +27 @@
 rings_test_LDFLAGS = $(polys_test_LDFLAGS)
 
-coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
+coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
 polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
 rings_test_LDADD = $(polys_test_LDADD)

libpolys/tests/common.h

@@ -18 +18 @@
 #include <resources/feResource.h>
 
+#ifdef HAVE_FACTORY
+int initializeGMP(){ return 1; }
+#endif
 
 // #pragma GCC diagnostic ignored "-Wwrite-strings"