Changeset 429497 in git

Timestamp:

Jan 31, 2012, 9:49:02 PM (11 years ago)

Author:

Julien Puydt <julien.puydt@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

461f404f27ec9987b968899b7005d7a2558ad4b3

Parents:

c2e8c5044ea364ea7100d35065206c3d3258f96a

git-author:

Julien Puydt <julien.puydt@laposte.net>2012-01-31 21:49:02+01:00

git-committer:

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

Message:

Modified the omalloc configuration for factory/ and made toplevel use it

The factory/ configure now has four options for omalloc:
 --enable-omalloc
 --with-omalloc-dir=<path> (to point to omalloc's main install)
 --with-omalloc-extra-dir=<path> (in case there needs a second
                                  -- think out-of-tree builds)
 --enable-omalloc-trust (to trust omalloc will be found at build-time
                         but don't check at configure-time)

That last is especially useful to build factory/ inside singular,
because in that case, omalloc.h includes omTables.h... which will exist
only during the build!

Finally, the toplevel Makefile.am and configure.ac are modified, so
that the correct options are passed to factory/configure.

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• factory/Makefile.am (modified) (1 diff)
• factory/configure.ac (modified) (4 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
-
-ALLOC=omalloc
 
 if ENABLE_FACTORY
@@ -9 +7 @@
 endif
  
-PACKAGES=findexec $(ALLOC) $(USE_FACTORY) libpolys kernel numeric Singular IntegerProgramming
+PACKAGES=findexec omalloc $(USE_FACTORY) libpolys kernel numeric Singular IntegerProgramming
 
 SUBDIRS=$(PACKAGES)

configure.ac

@@ -1 +1 @@
 AC_INIT([singular],[3.1.3.sw])
+
+_AC_SRCDIRS(["$ac_dir"])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -96 +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_MSG_CHECKING(whether to use omalloc in factory)
+if test "$enable_omalloc" = yes; then
+
+  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)
+fi
+
 AC_CONFIG_SUBDIRS(omalloc)
 

factory/Makefile.am

@@ -7 +7 @@
 ## -fno-implicit-templates
 
-AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
+AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS}
 
 AM_LDFLAGS =  -L${builddir} -L${builddir}/libfac

factory/configure.ac

@@ +1 @@
+
 dnl # emacs edit mode for this file is -*- sh -*-
 dnl # $Id$
@@ -48 +49 @@
   [with_Singular=yes])
 
-
-AC_ARG_WITH(
-  omalloc,
-  [AS_HELP_STRING([--with-omalloc],[build for use with omalloc])])
-
+AC_ARG_ENABLE(omalloc, AS_HELP_STRING([--enable-omalloc],[build for use with omalloc]),
+[if test "x$enableval" = "xyes"; then
+  enable_omalloc=yes
+fi], enable_omalloc=no)
+
+AC_ARG_ENABLE(omalloc_trust, AS_HELP_STRING([--enable-omalloc-trust],[do not check the omalloc header]),
+[if test "x$enableval" = "xyes"; then
+  omalloc_trust=yes
+fi], omalloc_trust=no)
+
+AC_ARG_WITH(omalloc_dir,[AS_HELP_STRING([--with-omalloc-dir=PTH],[location of omalloc])], with_omalloc_dir="$withval", with_omalloc_dir="")
+
+AC_ARG_WITH(omalloc_extra_dir,[AS_HELP_STRING([--with-omalloc-extra-dir=PTH],[optional extra location of omalloc])], with_omalloc_extra_dir="$withval", with_omalloc_extra_dir="")
 
 AC_ARG_ENABLE(
@@ -228 +237 @@
 fi
 
-AC_CHECK_HEADERS(omalloc.h,,)
-
 # font-lock-trick: '
 
@@ -352 +359 @@
 #fi
 
+AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
 AC_MSG_CHECKING(whether to use omalloc)
-
-if test "$with_omalloc" = yes; then
-  if test "$ac_cv_header_omalloc_h" != yes; then
-    if test "$enable_omalloc" = yes; then
-       warn_omalloc=yes
-    else
-       with_omalloc=no
+if test "$enable_omalloc" = yes; then
+
+  AC_MSG_RESULT(yes)
+  CPPFLAGS_save="$CPPFLAGS"
+  if test "x$with_omalloc_dir" != "x"; then
+    OMALLOC_CFLAGS="-I${with_omalloc_dir}"
+  fi
+  if test "x$with_omalloc_extra_dir" != "x"; then
+    OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
+  fi
+  if test $omalloc_trust = no; then
+    AC_CHECK_HEADERS(omalloc/omalloc.h)
+    if test "$ac_cv_header_omalloc_omalloc_h" != yes; then
+      AC_MSG_ERROR([You asked for omalloc, but it was not found])
     fi
+  else
+    AC_MSG_NOTICE(trusting the omalloc locations given)
+    AC_MSG_RESULT()
   fi
+  AC_DEFINE(HAVE_OMALLOC,1, [omalloc support])
+  AC_SUBST(OMALLOC_CFLAGS)
 else
-  if test "$with_omalloc" != no; then
-    if test "$enable_omalloc" = yes; then
-      if test "$ac_cv_header_omalloc_h" != yes; then
-        warn_omalloc=yes
-      fi
-      with_omalloc=yes
-    else
-      with_omalloc=no
-    fi
-  fi
-fi
-
-AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
-if test "$with_omalloc" = yes; then
-  AC_DEFINE([HAVE_OMALLOC],[1])
-fi
-AC_MSG_RESULT($with_omalloc)
-if test "$warn_omalloc" = yes; then
-  AC_MSG_WARN(did not find omalloc.h -- install before compiling)
+  AC_MSG_RESULT(no)
 fi