Changeset efe877 in git

Timestamp:

Mar 6, 2014, 5:05:10 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9bb56c19a835494d592e023dcce31c901eceefc5

Parents:

c28babd374c936b4453a17a240589e57257e80dd

git-author:

Martin Lee <martinlee84@web.de>2014-03-06 17:05:10+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-10 11:29:12+01:00

Message:

chg: separate omalloc and resources flags

Location:

factory

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)

factory/Makefile.am

@@ -8 +8 @@
 
 libfactory_la_LIBADD     = ${builddir}/libfac/libfac.la \
-$(OMALLOC_LDFLAGS) $(OMALLOC_R_LDADD) $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
+$(RESOURCES_LDFLAGS) $(OMALLOC_LDFLAGS) $(OMALLOC_R_LDADD) $(FLINT_LIBS) $(GMP_LIBS) $(NTL_LIBS)
 
 libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}

factory/configure.ac

@@ -350 +350 @@
     OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
     OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc"
-    if test "x$with_Singular" = xyes; then
-      OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/resources"
-    fi 
   fi
   
@@ -367 +364 @@
 #  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
   OMALLOC_R_LDADD="-lomalloc"
-  if test "x$with_Singular" = xyes; then
-    OMALLOC_R_LDADD="$OMALLOC_R_LDADD -lresources"
-  fi
 
   AC_DEFINE(HAVE_OMALLOC, 1, [omalloc support])
@@ -381 +375 @@
   AC_MSG_RESULT(no)
 fi
+
+if test "x$ENABLE_OMALLOC" = xyes && test "x$with_Singular" = xyes; then
+  RESOURCES_LDFLAGS="$RESOURCES_LDFLAGS -L${with_omalloc_dir}/resources -L${with_omalloc_extra_dir}/resources -lresources "
+  AC_SUBST(RESOURCES_LDFLAGS)
+fi 
 
 AM_CONDITIONAL([ENABLE_OMALLOC],[test "x$ENABLE_OMALLOC" = xyes])