Changeset 3aea08 in git

Timestamp:

Sep 13, 2011, 8:56:25 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

86b7aca42daec7197ed82f8a2fe137fe4c04bc18

Parents:

7fbb01c98614caf3b33d1a020c7835fa4a986cf3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-13 20:56:25+02:00

git-committer:

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

Message:

ADD: automake support for kernel/ (Makefile.am)
ADD: libtool is going to be used for building kernel tests
ADD: main configure.ac now provides the needed flags for building kernel tests

Files:

• configure.ac (modified) (2 diffs)
• for_Hans_with_love.sh (modified) (2 diffs)
• kernel/Makefile.am (added)
• kernel/Makefile.in.SAVE (moved) (moved from kernel/Makefile.in)
• kernel/makefile.SAVE (moved) (moved from kernel/makefile) (1 diff)

configure.ac

@@ -1 +1 @@
 AC_INIT([singular], [3.1.2.sw])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([.])
+
+AC_CONFIG_SRCDIR([Singular/tesths.cc])
+
+AC_CONFIG_HEADER([config.h])
 
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE
+
+
+dnl Check if build env is sane
+AM_SANITY_CHECK
+
+LT_INIT(dlopen disable-static)
+
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
-AC_PROG_RANLIB
+AC_PROG_LN_S
+AC_PROG_INSTALL
+# AC_PROG_RANLIB
 
-SING_CHECK_FACTORY
 # Checks for libraries.
 LB_CHECK_GMP(3.1.1,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 LB_CHECK_NTL(5.0,,AC_MSG_WARN([Unable to find NTL (which is strongly recommended) on your machine: please use --with-ntl=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_MALLOC
+
+SING_CHECK_PIPE
+
+# check for cpu properties
+AC_CHECK_SIZEOF(long,4)
+SING_CHECK_CPU
+
+#check for host:
+AC_CANONICAL_HOST
+case $host_os in
+  *cygwin* ) LIBPREFIX="-Xlinker -Bdynamic";;
+  * ) LIBPREFIX="";;
+esac
+
+
+SING_CHECK_P_PROCS
+SING_CHECK_FACTORY
 
 ### the following is needed due to the use of om_sing_opt_show_mem in misc_ip.cc...
@@ -28 +60 @@
 
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([kernel/Makefile])
 AC_CONFIG_FILES([numeric/Makefile])
 

for_Hans_with_love.sh

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

kernel/makefile.SAVE

@@ -85 +85 @@
     linearAlgebra.cc nc.cc preimage.cc
     
-CXXSOURCES2     = SingularBuilder.cpp
+# CXXSOURCES2   = SingularBuilder.cpp
 
 #    numbers.cc polys.cc p_polys.cc polys0.cc polys1.cc polys-impl.cc \