Changeset d2f9df in git

Timestamp:

Oct 7, 2011, 6:49:57 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

089d1fb6ce5d913cc0065ea549d1c444ac577667

Parents:

ab11d3ad2dc558349cd8f3406b9f720f816aa8df

git-author:

Martin Lee <martinlee84@web.de>2011-10-07 18:49:57+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:56+01:00

Message:

configure changes of factory of Jan Engelhardt

Files:

• factory/Makefile.am (modified) (1 diff)
• factory/configure.ac (modified) (9 diffs)
• for_Hans_with_love.sh (modified) (2 diffs)

factory/Makefile.am

@@ +1 @@
+ACLOCAL_AMFLAGS = -I ../m4
+
 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
 

factory/configure.ac

@@ -105 +105 @@
 AC_PROG_LN_S
 AC_PROG_INSTALL
-AC_PROG_RANLIB
+AC_DISABLE_STATIC
+LT_INIT
 AC_PROG_MAKE_SET
 AC_CHECK_PROG(AR, ar, ar, where-is-your-ar)
 AC_CHECK_PROG(M4, m4, m4, where-is-your-m4)
 AC_CHECK_PROG(BISON, bison, bison, where-is-your-bison)
+AC_C_CONST
+AC_C_INLINE
+AH_TEMPLATE([INT64], [])
+AC_DEFINE([INT64], [long long int])
 DX_INIT_DOXYGEN($PACKAGE_NAME, MYDOXYGENCONFIG)
 
@@ -324 +329 @@
 # Singular
 if test "x$with_Singular" = xyes; then
+  AH_TEMPLATE([SINGULAR], [define if linked to Singular])
   AC_DEFINE([SINGULAR],[1],[SINGULAR])
   AC_DEFINE([DISABLE_GMP_CPP],[1],[DISABLE_GMP_CPP])
@@ -357 +363 @@
 fi
 if test "$with_omalloc" = yes; then
+  AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
   AC_DEFINE([HAVE_OMALLOC],[1],[HAVE_OMALLOC])
 fi
@@ -367 +374 @@
 # "configurable inline methods"
 if test "x$enable_cf_inline" != xno; then
+  AH_TEMPLATE([CF_USE_INLINE], [define to use "configurable inline methods" (see cf_inline.cc)])
   AC_DEFINE([CF_USE_INLINE],[1],[CF_USE_INLINE])
 fi
@@ -372 +380 @@
 # iostream
 if test "x$enable_streamio" = xno; then
+  AH_TEMPLATE([NOSTREAMIO], [define to build factory without stream IO])
   AC_DEFINE([NOSTREAMIO],[1],[NOSTREAMIO])
 else
@@ -380 +389 @@
 # assertions
 if test "x$enable_assertions" = xno; then
+  AH_TEMPLATE([NOASSERT], [define if you do not want to activate assertions])
   AC_DEFINE([NOASSERT],[1],[NOASSERT])
 fi
@@ -385 +395 @@
 # timing
 if test "x$enable_timing" != xno; then
+  AH_TEMPLATE([TIMING], [define if you want to activate the timing stuff])
   AC_DEFINE([TIMING],[1],[TIMING])
 fi
@@ -390 +401 @@
 # debugoutput
 if test "x$enable_debugoutput" != xno; then
+  AH_TEMPLATE([DEBUGOUTPUT], [define if you want to have debugging output])
   AC_DEFINE([DEBUGOUTPUT],[1],[DEBUGOUTPUT])
 fi
@@ -414 +426 @@
 AC_SUBST(uninstalltargets)
 
+AH_TEMPLATE([FACTORYVERSION], [factory version])
 AC_DEFINE_UNQUOTED([FACTORYVERSION], "$factory_version", [FACTORYVERSION])
+AH_TEMPLATE([FACTORYCONFIGURATION], [factory configuration])
 AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration", [FACTORYCONFIGURATION])
+AH_TEMPLATE([GFTABLEDIR], [where the gftables live])
 AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
 

for_Hans_with_love.sh

@@ -9 +9 @@
 TOP_DIR=$PWD
 
-for d in . libpolys; do
+for d in . libpolys factory; do
   echo "==============="
   echo "run libtoolize --force, aclocal -I $TOP_DIR/m4, autoconf, automake -a in $d"
@@ -21 +21 @@
 done
 
-for d in omalloc factory; do
+for d in omalloc; do
   echo "==============="
   echo "run aclocal -I $TOP_DIR/m4, autotools in $d"