Changeset a38e457 in git for factory/configure.ac

Timestamp:

Jun 17, 2013, 4:37:32 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0d25fceffdb240786e6a256e3597a5d1d0a655b0

Parents:

ee15d5cb70cb664ca762eaa09d3a38eaeabc2ed8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-06-17 16:37:32+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-06-18 12:44:31+02:00

Message:

Factory BS : cleanup of configure.ac

File:

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

factory/configure.ac

@@ -26 +26 @@
 # Add pre'prefixed config
 AX_PREFIX_CONFIG_H([config.h],[],[config.h])
-
-dnl #
-dnl # Change version here, do not believe the comment in the
-dnl # preceding lines.
-dnl #
-factory_version="3.1.3"
-factory_configuration="'$ac_configure_args' in `pwd`"
 
 #
@@ -123 +116 @@
 # `config.cache'.  Furthermore, we do not use cache at all to
 # avoid some nasty problems with our own development environment.
-unset ac_cv_path_FACTORY_MKINSTALLDIRS
-unset ac_cv_path_FACTORY_MAKEHEADER
-save_path="$PATH"
-PATH="$PATH:$srcdir/bin"
-AC_PATH_PROG(FACTORY_MKINSTALLDIRS, mkinstalldirs, -mkdir)
-PATH="$srcdir/bin:$save_path"
-AC_PATH_PROG(FACTORY_MAKEHEADER, makeheader)
-PATH="$save_path"
+#unset ac_cv_path_FACTORY_MKINSTALLDIRS
+#unset ac_cv_path_FACTORY_MAKEHEADER
+#save_path="$PATH"
+#PATH="$PATH:$srcdir/bin"
+#AC_PATH_PROG(FACTORY_MKINSTALLDIRS, mkinstalldirs, -mkdir)
+#PATH="$srcdir/bin:$save_path"
+#AC_PATH_PROG(FACTORY_MAKEHEADER, makeheader)
+#PATH="$save_path"
 
 #
@@ -136 +129 @@
 #
 
-AC_MSG_CHECKING(and generating explicit install paths)
-
-# generate Makefile
-save_prefix="$prefix"
-save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-for dir in prefix exec_prefix bindir sbindir libexecdir \
-           datadir sysconfdir sharedstatedir localstatedir libdir \
-           includedir oldincludedir infodir mandir; do
-  eval "dir_value=\$$dir"
-  cat >> ./conftest.mk << EXPLPATHEOT
-$dir=$dir_value
-explicit_$dir:
-        @ echo \$($dir)
-        @ if echo \$($dir) | grep '^/'; \\
-        then echo \$($dir) > ./conftest.dir; \\
-        else echo \`pwd\`/\$($dir) > ./conftest.dir; fi
-EXPLPATHEOT
-done
-prefix="$save_prefix"
-exec_prefix="$save_exec_prefix"
+#AC_MSG_CHECKING(and generating explicit install paths)
+
+## generate Makefile
+#save_prefix="$prefix"
+#save_exec_prefix="$exec_prefix"
+#test "x$prefix" = xNONE && prefix=$ac_default_prefix
+#test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+#for dir in prefix exec_prefix bindir sbindir libexecdir \
+#          datadir sysconfdir sharedstatedir localstatedir libdir \
+#          includedir oldincludedir infodir mandir; do
+#  eval "dir_value=\$$dir"
+#  cat >> ./conftest.mk << EXPLPATHEOT
+#$dir=$dir_value
+#explicit_$dir:
+#       @ echo \$($dir)
+#       @ if echo \$($dir) | grep '^/'; \\
+#       then echo \$($dir) > ./conftest.dir; \\
+#       else echo \`pwd\`/\$($dir) > ./conftest.dir; fi
+#EXPLPATHEOT
+#done
+#prefix="$save_prefix"
+#exec_prefix="$save_exec_prefix"
 
 # generate the explicit paths
-make >&5 2>&1 -f ./conftest.mk explicit_datadir
-explicit_datadir=`cat ./conftest.dir`
-make >&5 2>&1 -f ./conftest.mk explicit_libdir
-explicit_libdir=`cat ./conftest.dir`
-make >&5 2>&1 -f ./conftest.mk explicit_includedir
-explicit_includedir=`cat ./conftest.dir`
+#make >&5 2>&1 -f ./conftest.mk explicit_datadir
+#explicit_datadir=`cat ./conftest.dir`
+#make >&5 2>&1 -f ./conftest.mk explicit_libdir
+#explicit_libdir=`cat ./conftest.dir`
+#make >&5 2>&1 -f ./conftest.mk explicit_includedir
+#explicit_includedir=`cat ./conftest.dir`
 
 # clean up
-rm -f ./conftest.mk ./conftest.dir
-
-AC_MSG_RESULT(done)
+#rm -f ./conftest.mk ./conftest.dir
+
+#AC_MSG_RESULT(done)
 
 #
@@ -231 +224 @@
 # use C to check compiler characteristics instead of C++.  On
 # nextstep, checking with C++ may fail.
-AC_LANG_C
+# AC_LANG_C
 
 # cross-compiling ?!
@@ -251 +244 @@
 # note that Singular has its own mechanism to search the tables,
 # hence we do not need to mind it here
-gftabledir='${datadir}/factory/gftables'
-explicit_gftabledir="$explicit_datadir/gftables"
+#gftabledir='${datadir}/factory/gftables'
+#explicit_gftabledir="$explicit_datadir/gftables"
 
 # for installation of the templates
-templatedir='${includedir}/templates'
+#templatedir='${includedir}/templates'
 
 #
 # - the name of the game and the targets to create.
 #
-if test "x$with_Singular" = xyes; then
-  libfactory=libfactory.a
-
-  factorysrc='$(basefactorysrc) $(singfactorysrc)'
-  factoryincl='$(basefactoryincl) $(singfactoryincl)'
-
-  alltargets=cf
-  installtargets=installcf
-  uninstalltargets=uninstallcf
-else
-  libfactory=libcf.a
-
-  factorysrc='$(basefactorysrc)'
-  factoryincl='$(basefactoryincl)'
-
-  alltargets=cf
-  installtargets=installcf
-  uninstalltargets=uninstallcf
-fi
+#if test "x$with_Singular" = xyes; then
+#  libfactory=libfactory.a
+#
+#  factorysrc='$(basefactorysrc) $(singfactorysrc)'
+#  factoryincl='$(basefactoryincl) $(singfactoryincl)'
+#
+#  alltargets=cf
+#  installtargets=installcf
+#  uninstalltargets=uninstallcf
+#else
+#  libfactory=libcf.a
+#
+#  factorysrc='$(basefactorysrc)'
+#  factoryincl='$(basefactoryincl)'
+#
+#  alltargets=cf
+#  installtargets=installcf
+#  uninstalltargets=uninstallcf
+#fi
 
 #
@@ -284 +277 @@
 #
 
-# CFLAGS
-if test "x$GCC" = xyes && test "x$cflags_expl_set" = xno; then
-  CFLAGS=""
-fi
+## CFLAGS
+#if test "x$GCC" = xyes && test "x$cflags_expl_set" = xno; then
+#  CFLAGS=""
+#fi
 
 # CXXFLAGS
-if test "x$GXX" = xyes && test "x$cxxflags_expl_set" = xno; then
-  CXXFLAGS=""
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+#if test "x$GXX" = xyes && test "x$cxxflags_expl_set" = xno; then
+#  CXXFLAGS=""
+#
+#AC_LANG_SAVE
+#AC_LANG_CPLUSPLUS
 # check whether CXX accepts -fno-rtti
-AC_MSG_CHECKING(whether gcc accepts -fno-rtti)
-tmp_flags=${CXXFLAGS}
-CXXFLAGS="${CXXFLAGS}"
-AC_CACHE_VAL(ac_cv_cxx_have_rtti,
-AC_TRY_COMPILE(,,ac_cv_cxx_have_rtti=yes,ac_cv_cxx_have_rtti=no)
-)
-AC_MSG_RESULT(${ac_cv_cxx_have_rtti})
-CXXFLAGS=$tmp_flags
-if test "${ac_cv_cxx_have_rtti}" = yes; then
-CXXFLAGS="$CXXFLAGS"
-fi
-
-AC_MSG_CHECKING(whether gcc accepts -fno-exceptions)
-tmp_flags=${CXXFLAGS}
-CXXFLAGS="${CXXFLAGS} -fno-exceptions"
-AC_CACHE_VAL(ac_cv_cxx_have_exceptions,
-AC_TRY_LINK(,,ac_cv_cxx_have_exceptions=yes,ac_cv_cxx_have_exceptions=no)
-)
-AC_MSG_RESULT(${ac_cv_cxx_have_exceptions})
-CXXFLAGS=$tmp_flags
-if test "${ac_cv_cxx_have_exceptions}" = yes; then
-CXXFLAGS="$CXXFLAGS -fno-exceptions"
-fi
-AC_LANG_RESTORE
-
-fi
+#AC_MSG_CHECKING(whether gcc accepts -fno-rtti)
+#tmp_flags=${CXXFLAGS}
+#CXXFLAGS="${CXXFLAGS}"
+#AC_CACHE_VAL(ac_cv_cxx_have_rtti,
+#AC_TRY_COMPILE(,,ac_cv_cxx_have_rtti=yes,ac_cv_cxx_have_rtti=no)
+#)
+#AC_MSG_RESULT(${ac_cv_cxx_have_rtti})
+#CXXFLAGS=$tmp_flags
+#if test "${ac_cv_cxx_have_rtti}" = yes; then
+#CXXFLAGS="$CXXFLAGS"
+#fi
+#AC_MSG_CHECKING(whether gcc accepts -fno-exceptions)
+#tmp_flags=${CXXFLAGS}
+#CXXFLAGS="${CXXFLAGS} -fno-exceptions"
+#AC_CACHE_VAL(ac_cv_cxx_have_exceptions,
+#AC_TRY_LINK(,,ac_cv_cxx_have_exceptions=yes,ac_cv_cxx_have_exceptions=no)
+#)
+#AC_MSG_RESULT(${ac_cv_cxx_have_exceptions})
+#CXXFLAGS=$tmp_flags
+#if test "${ac_cv_cxx_have_exceptions}" = yes; then
+#CXXFLAGS="$CXXFLAGS -fno-exceptions"
+#fi
+#AC_LANG_RESTORE
+#
+#fi
 
 # ARFLAGS
-test "${ARFLAGS+set}" = set || ARFLAGS=cr
+#test "${ARFLAGS+set}" = set || ARFLAGS=cr
 
 # M4FLAGS
-test "${M4FLAGS+set}" = set || M4FLAGS=
+#test "${M4FLAGS+set}" = set || M4FLAGS=
 
 AH_TEMPLATE([SINGULAR], [define if linked to Singular])
@@ -371 +363 @@
   CPPFLAGS="$CPPFLAGS_save"
 
-  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
+#  OMALLOC_G_LDADD="-lresources_g -lomalloc_g"
   OMALLOC_R_LDADD="-lresources -lomalloc"
   
@@ -379 +371 @@
   AC_SUBST(OMALLOC_LDFLAGS)
 
-  AC_SUBST(OMALLOC_G_LDADD)
+#  AC_SUBST(OMALLOC_G_LDADD)
   AC_SUBST(OMALLOC_R_LDADD)
 else
@@ -400 +392 @@
 if test "x$enable_streamio" = xno; then
   AC_DEFINE([NOSTREAMIO],[1])
-else
-  factorysrc="$factorysrc \$(useiofactorysrc)"
-  factoryincl="$factoryincl \$(useiofactoryincl)"
+#else
+#  factorysrc="$factorysrc \$(useiofactorysrc)"
+#  factoryincl="$factoryincl \$(useiofactoryincl)"
 fi
 
@@ -426 +418 @@
 # - complete and substitute variables, defines.
 #
-AC_SUBST(gftabledir)
-AC_SUBST(templatedir)
-
+#AC_SUBST(gftabledir)
+#AC_SUBST(templatedir)
+
+
+
+# AC_SUBST(libfactory)
+
+#AC_SUBST(ARFLAGS)
+#AC_SUBST(M4FLAGS)
+
+AC_SUBST(MAKEHEADERFLAGS)
+
+#AC_SUBST(factorysrc)
+#AC_SUBST(factoryincl)
+
+#AC_SUBST(alltargets)
+#AC_SUBST(installtargets)
+#AC_SUBST(uninstalltargets)
+
+factory_version="3.1.3"
+factory_configuration="'$ac_configure_args' in `pwd`"
 AC_SUBST(factory_version)
-
-AC_SUBST(libfactory)
-
-AC_SUBST(ARFLAGS)
-AC_SUBST(M4FLAGS)
-AC_SUBST(MAKEHEADERFLAGS)
-
-AC_SUBST(factorysrc)
-AC_SUBST(factoryincl)
-
-AC_SUBST(alltargets)
-AC_SUBST(installtargets)
-AC_SUBST(uninstalltargets)
 
 AH_TEMPLATE([FACTORYVERSION], [factory version])
@@ -453 +450 @@
 AC_DEFINE_UNQUOTED([FACTORYCONFIGURATION], "$factory_configuration")
 
-AH_TEMPLATE([GFTABLEDIR], [where the gftables live])
-AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir")
+#AH_TEMPLATE([GFTABLEDIR], [where the gftables live])
+#AC_DEFINE_UNQUOTED([GFTABLEDIR], "$explicit_gftabledir")
+
+
 
 AM_CONDITIONAL(