Changeset 089d1f in git

Timestamp:

Oct 11, 2011, 7:53:52 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ab788d2fa2a3a3cfadef40aeb1619e81ac889f17

Parents:

d2f9df5893fb5df92c3c6b562dd3d8d4ecdcf24a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-10-11 19:53:52+02:00

git-committer:

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

Message:

ADD: better use of AH_TEMPLATE in factory/configure.ac

File:

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

factory/configure.ac

@@ -113 +113 @@
 AC_C_CONST
 AC_C_INLINE
-AH_TEMPLATE([INT64], [])
-AC_DEFINE([INT64], [long long int])
+
+AH_TEMPLATE([INT64], [Defenition for INT64])
+# Always long long int???!
+AC_DEFINE([INT64], [long long int]) 
+
 DX_INIT_DOXYGEN($PACKAGE_NAME, MYDOXYGENCONFIG)
 
@@ -327 +330 @@
 test "${M4FLAGS+set}" = set || M4FLAGS=
 
+AH_TEMPLATE([SINGULAR], [define if linked to Singular])
+AH_TEMPLATE([DISABLE_GMP_CPP],[DISABLE_GMP_CPP])
+AH_TEMPLATE([NOSTREAMIO],[DISABLE_GMP_CPP])
+
 # 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])
-  AC_DEFINE([NOSTREAMIO],[1],[DISABLE_GMP_CPP])
+  AC_DEFINE([SINGULAR],[1])  
+  AC_DEFINE([DISABLE_GMP_CPP],[1])
+  AC_DEFINE([NOSTREAMIO],[1])
 fi
 
@@ -362 +368 @@
   fi
 fi
+
+AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
 if test "$with_omalloc" = yes; then
-  AH_TEMPLATE([HAVE_OMALLOC], [define if build with OMALLOC])
-  AC_DEFINE([HAVE_OMALLOC],[1],[HAVE_OMALLOC])
+  AC_DEFINE([HAVE_OMALLOC],[1])
 fi
 AC_MSG_RESULT($with_omalloc)
@@ -372 +379 @@
 
 
+AH_TEMPLATE([CF_USE_INLINE], [define to use "configurable inline methods" (see cf_inline.cc)])
 # "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
-
+  AC_DEFINE([CF_USE_INLINE],[1])
+fi
+
+AH_TEMPLATE([NOSTREAMIO], [define to build factory without stream IO])
 # iostream
 if test "x$enable_streamio" = xno; then
-  AH_TEMPLATE([NOSTREAMIO], [define to build factory without stream IO])
-  AC_DEFINE([NOSTREAMIO],[1],[NOSTREAMIO])
+  AC_DEFINE([NOSTREAMIO],[1])
 else
   factorysrc="$factorysrc \$(useiofactorysrc)"
@@ -387 +394 @@
 fi
 
+AH_TEMPLATE([NOASSERT], [define if you do not want to activate assertions])
 # 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
-
+  AC_DEFINE([NOASSERT],[1])
+fi
+
+AH_TEMPLATE([TIMING], [define if you want to activate the timing stuff])
 # 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])
+  AC_DEFINE([TIMING],[1])
 fi
 
 # debugoutput
+AH_TEMPLATE([DEBUGOUTPUT], [define if you want to have debugging output])
 if test "x$enable_debugoutput" != xno; then
-  AH_TEMPLATE([DEBUGOUTPUT], [define if you want to have debugging output])
-  AC_DEFINE([DEBUGOUTPUT],[1],[DEBUGOUTPUT])
+  AC_DEFINE([DEBUGOUTPUT],[1]) 
 fi
 
@@ -427 +434 @@
 
 AH_TEMPLATE([FACTORYVERSION], [factory version])
-AC_DEFINE_UNQUOTED([FACTORYVERSION], "$factory_version", [FACTORYVERSION])
+AC_DEFINE_UNQUOTED([FACTORYVERSION], "$factory_version")
+
 AH_TEMPLATE([FACTORYCONFIGURATION], [factory configuration])
-AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration", [FACTORYCONFIGURATION])
+AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration")
+
 AH_TEMPLATE([GFTABLEDIR], [where the gftables live])
-AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir", [GFTABLEDIR])
+AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir")
 
 AM_CONDITIONAL(