Changeset 461f40 in git for configure.ac

Timestamp:

Jan 30, 2012, 6:59:18 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

41d31d33c92e8a93df58457734616fabacdcb346

Parents:

429497fb0084f0e2cc1130d07779709b94af3a27

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-30 18:59:18+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-03 17:53:50+01:00

Message:

fix the enabling of omalloc for factory

CHG: top level configure should enable omalloc by default
FIX: "make check" in factory/ needs omalloc library, thus: LDFLAGS, LDADD
CHG: prettier configure output with AS_HELP_STRING
CHG: further minor improvements to the patch

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -98 +98 @@
 #ac_configure_args="$ac_configure_args --with-external-config_h=../Singular/omSingularConfig.h"
 
-AC_ARG_ENABLE(omalloc, AS_HELP_STRING([--enable-omalloc], [use omalloc for the factory]),
-[if test "x$enableval"  = "xyes"; then
-  enable_omalloc=yes
-fi], enable_omalloc=no)
+AC_ARG_ENABLE(omalloc, AS_HELP_STRING([--disable-omalloc], [do NOT use omalloc within the factory]),
+ [if test "x$enableval"  = "xyes"; then
+   ENABLE_OMALLOC=yes
+ fi], ENABLE_OMALLOC=add)
 
-AC_MSG_CHECKING(whether to use omalloc in factory)
-if test "$enable_omalloc" = yes; then
+ENABLE_OMALLOC_ARG="--with-omalloc-dir=$ac_abs_top_srcdir --with-omalloc-extra-dir=$ac_abs_top_builddir --enable-omalloc-trust"
 
-  AC_MSG_RESULT(yes)
-  ac_configure_args="$ac_configure_args --with-omalloc-dir=$ac_abs_top_srcdir --with-omalloc-extra-dir=$ac_abs_top_builddir --enable-omalloc-trust"
-else
-  AC_MSG_RESULT(no)
+if test "x$ENABLE_OMALLOC" = xadd; then
+   ENABLE_OMALLOC=yes
+   ENABLE_OMALLOC_ARG="--enable-omalloc $ENABLE_OMALLOC_ARG"
 fi
 
-AC_CONFIG_SUBDIRS(omalloc)
 
-if test x$ENABLE_FACTORY = xyes; then
-  AC_CONFIG_SUBDIRS(factory)
+
+
+if test "x$ENABLE_FACTORY" = xyes; then
+ AC_MSG_CHECKING(whether to use omalloc in factory)
+ if test "x$ENABLE_OMALLOC" = xyes; then
+  AC_MSG_RESULT(yes)
+  ac_configure_args="$ac_configure_args $ENABLE_OMALLOC_ARG"
+ else
+  AC_MSG_RESULT(no)
+ fi
 fi
 
-AC_CONFIG_SUBDIRS(libpolys)
+AC_CONFIG_SUBDIRS([omalloc])
+
+if test "x$ENABLE_FACTORY" = xyes; then
+ AC_CONFIG_SUBDIRS([factory])
+fi
+
+AC_CONFIG_SUBDIRS([libpolys])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([findexec/Makefile])