Changeset daa13f in git for factory/configure.ac

Timestamp:

Mar 10, 2014, 2:16:22 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

91dd8a5ef5bb06f9f51df16f59786c2ff90de8ca

Parents:

70d976d3bfd86a066c9e62325769fb948f8735249bb56c19a835494d592e023dcce31c901eceefc5

Message:

Merge pull request #536 from mmklee/factory_noPP

Factory no pp

File:

• factory/configure.ac (modified) (4 diffs)

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])
@@ -440 +439 @@
 #AC_SUBST(uninstalltargets)
 
-factory_version="3.1.3"
+factory_version="4.0.0"
 factory_configuration="'$ac_configure_args' in `pwd`"
 AC_SUBST(factory_version)