Changeset 769f28 in git

Timestamp:

May 4, 2011, 5:50:13 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

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

Children:

daa55674a51a8126e258528bc2337f3cf5370b6d

Parents:

6d0563e99698a63b26dc8a73020ec11b7a1f07e0

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-04 17:50:13+02:00

git-committer:

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

Message:

- fixed --with-gmp in factory/configure.in to be compatible with gmp macro
- added factory to the build process
- include cf_factory.h in cf_gcd.cc
- do not generate cf_gmp.h but replace with a wrapper around gmp.h

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• factory/GNUmakefile.in (modified) (1 diff)
• factory/cf_gmp.h (added)
• factory/configure (deleted)
• factory/configure.in (modified) (3 diffs)
• factory/gen_cf_gmp.cc (deleted)
• factory/gen_cf_gmp.template (deleted)
• for_Hans_with_love.sh (modified) (1 diff)
• singular.dot (modified) (previous)

.gitignore

@@ -88 +88 @@
 omalloc/omlimits.h
 doc/NTL
-factory/cf_gmp.h
 factory/factory.h
 factory/factoryconf.h
-factory/gen_cf_gmp.sh
 ntl/include/NTL/gmp_aux.h
 ntl/include/NTL/mach_desc.h

Makefile.am

@@ -1 +1 @@
 ALLOC=omalloc
 
-PACKAGES=$(ALLOC) libpolys
+PACKAGES=$(ALLOC) factory libpolys
 
 SUBDIRS=$(PACKAGES)

configure.ac

@@ -5 +5 @@
 AC_PROG_CXX
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_SUBDIRS([omalloc libpolys])
+AC_CONFIG_SUBDIRS([omalloc factory libpolys])
 AC_OUTPUT

factory/GNUmakefile.in

@@ -796 +796 @@
 config.status:  configure
                 ./config.status --recheck
-
-# create cf_gmp.h
-cf_gmp.h: GNUmakefile gen_cf_gmp.template
-        echo "#!/bin/sh" >gen_cf_gmp.sh 
-        echo "GMP_H_T=\"`g++ $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh 
-        cat gen_cf_gmp.template >>gen_cf_gmp.sh
-        $(SHELL) gen_cf_gmp.sh

factory/configure.in

@@ -49 +49 @@
 AC_ARG_WITH(
   gmp,
-  [  --with-gmp(=<gmp_inc_path>(,<gmp_lib_path>))
+  [  --with-gmp(=<gmp_path>)
                           specify where to find gmp library.])
 
@@ -119 +119 @@
                           in process, be graceful when there is no \`gmp.h'],
   [ if test "x$with_Singular" = xyes && test "x$enable_gmp" != xno; then
-      with_gmp='$(includedir)'
+      with_gmp='$(prefix)'
     fi ])
 
@@ -128 +128 @@
   yes|no|"")
     gmp_in_installation=no ;;
-  '$(includedir)'|'${includedir}')
-    gmp_in_installation=yes ;;
-  *,*)
-    saveIFS="$IFS"; IFS="${IFS},"
-    set dummy $with_gmp
-    IFS="$saveIFS"
-    CPPFLAGS="-I$2 $CPPFLAGS"
-    LDFLAGS="-L$3 $LDFLAGS"
-    gmp_in_installation=no ;;
   *)
-    CPPFLAGS="-I$with_gmp $CPPFLAGS" 
-    LDFLAGS="-L$with_gmp/../lib $LDFLAGS"
+    CPPFLAGS="-I$with_gmp/include $CPPFLAGS"
+    LDFLAGS="-L$with_gmp/lib $LDFLAGS"
     gmp_in_installation=no ;;
 esac

for_Hans_with_love.sh

@@ -32 +32 @@
 done
 
+for d in factory; do
+  echo "==============="
+  echo "run aclocal -I $TOP_DIR/m4, autoconf in $d"
+  echo "---------------"
+  cd $d;
+  aclocal -I $TOP_DIR/m4
+  autoconf
+  cd $TOP_DIR
+  echo
+done
+
 for d in libpolys; do
   echo "==============="