Changeset 2870a4 in git for factory/configure.ac

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

31bb7ae2c801c87834b44c6005072547758c3278

Parents:

2dcd2472263aa4dc28eef2ff6149980cf8c3bc88

git-author:

Martin Lee <martinlee84@web.de>2014-03-05 13:41:05+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-03-06 11:04:14+01:00

Message:

fix: standalone build of factory

File:

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

factory/configure.ac

@@ -340 +340 @@
 AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
 
-if test "x$with_Singular" = xyes; then
-
 AC_MSG_CHECKING([whether to use omalloc/omalloc.h])
 if test "x$ENABLE_OMALLOC" = xyes; then
@@ -351 +349 @@
   if test "x$with_omalloc_extra_dir" != "x"; then
     OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
-    OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/resources"
+    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
   
@@ -365 +366 @@
 
 #  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
-  OMALLOC_R_LDADD="-lresources -lomalloc"
-  
+  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])
  
@@ -376 +380 @@
 else
   AC_MSG_RESULT(no)
-fi
-
 fi