Changeset 84c376 in git

Timestamp:

May 4, 2011, 8:10:55 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

e25a9942ffbe09b3e9cd1348617f1c1886c896bd

Parents:

2271fcf77152d68ee4d4f31ac7125d4183f54bcf

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-04 20:10:55+02:00

git-committer:

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

Message:

ADD: FreeBSD-related fixes in build system (no libdl, $^, $<)

Files:

• libpolys/configure.ac (modified) (3 diffs)
• libpolys/tests/Makefile.am (modified) (2 diffs)
• m4/p-procs.m4 (modified) (4 diffs)

libpolys/configure.ac

@@ -5 +5 @@
 AC_CONFIG_HEADER([config.h misc/auxiliary.h])
 AM_INIT_AUTOMAKE
+
+dnl Check if build env is sane
+AM_SANITY_CHECK
 
 LT_INIT(dlopen disable-static)
@@ -23 +26 @@
 AC_FUNC_VPRINTF
 AC_FUNC_MALLOC
-AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1],
-                               [Define if vsnprintf exists.])])
+AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1], [Define if vsnprintf exists.])])
 
 # Checks for header files.
 AC_HEADER_STDC
+AC_STDC_HEADERS
 AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h limits.h float.h])
 
@@ -49 +52 @@
 esac
 
+dnl INCLUDES=""
+dnl dnl OS specific flags and options
+dnl case "$host" in
+dnl     *-*-freebsd*)
+dnl         LIBS="$LIBS -L/usr/local/lib -lc"
+dnl     CFLAGS="$CFLAGS -I/usr/local/include"
+dnl     INCLUDES="$INCLUDES -I/usr/local/include"
+dnl     ;;
+dnl esac        
+dnl AC_SUBST(INCLUDES)
+
 SING_CHECK_P_PROCS
 

libpolys/tests/Makefile.am

@@ -24 +24 @@
 
 
-if ENABLE_P_PROCS_DYNAMIC
-  ### TODO -> ${LD_LIBS} ??? instead of -ldl, 
-  ### add it to AM_LDFLAGS?
-  # '-ldl' wouldn't work on FreeBSD!!!??? 
-  USEPPROCSDYNAMICLD = -ldl
-  USEPPROCSDYNAMICLDFLAGS =  -rdynamic
-else
-  USEPPROCSDYNAMICLD =
-  USEPPROCSDYNAMICLDFLAGS =
-endif
-
-polys_test_LDFLAGS = ${AM_LDFLAGS} $(USEPPROCSDYNAMICLDFLAGS)
+polys_test_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS}
 rings_test_LDFLAGS = $(polys_test_LDFLAGS)
 
 coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lomalloc_debug
-polys_test_LDADD = -lpolys_g $(USEPPROCSDYNAMICLD) $(coeffs_test_LDADD)
+polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
 rings_test_LDADD = $(polys_test_LDADD)
 
@@ -47 +36 @@
 
 
-# How to generate the test simple_test_runner
-###### $^ needs GNU make : use gmake!
+# How to generate *_runner.cpp 
 simple_test_runner.cpp: simple_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer simple_test.h
 
 coeffs_test_runner.cpp: coeffs_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer coeffs_test.h
 
 polys_test_runner.cpp: polys_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer polys_test.h
 
 rings_test_runner.cpp: rings_test.h
-        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
+        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer rings_test.h

m4/p-procs.m4

@@ -21 +21 @@
 AC_DEFUN([SING_CHECK_P_PROCS],
 [
+USEPPROCSDYNAMICLDFLAGS=""
+USEPPROCSDYNAMICLD=""    
+
 AC_ARG_ENABLE(p-procs-static,
 [  --enable-p-procs-static Enable statically compiled p_Procs-modules
@@ -48 +51 @@
     AC_MSG_ERROR([--enable-pprocs-dynamic requested but your system appears not to support dynamic modules properly])
   fi
+
+  AC_CHECK_FUNC(dlopen,,[AC_CHECK_LIB(dl,dlopen,USEPPROCSDYNAMICLD="-ldl", [
+   AC_MSG_WARN(Could not use dlopen)
+  ]) ])  
+  
 elif test x$NO_P_PROCS_DYNAMIC_GIVEN = xyes -a x$NO_P_PROCS_STATIC_GIVEN = xyes; then
   SING_SYSTEM_SUPPORTS_DYNAMIC_MODULES
@@ -54 +62 @@
     ENABLE_P_PROCS_DYNAMIC="yes"
     ENABLE_P_PROCS_STATIC="no"
+    USEPPROCSDYNAMICLDFLAGS="-rdynamic"
+    AC_CHECK_FUNC(dlopen,,[AC_CHECK_LIB(dl,dlopen,USEPPROCSDYNAMICLD="-ldl", [
+      AC_MSG_WARN(Could not use dlopen)
+    ]) ])  
   elif test $SUPPORTS_DYNAMIC_MODULES = no; then
     AC_MSG_NOTICE([Enabling static modules and disabling dynamic modules])
@@ -67 +79 @@
 fi
 
+AC_SUBST(USEPPROCSDYNAMICLDFLAGS)
+AC_SUBST(USEPPROCSDYNAMICLD)
+
 AM_CONDITIONAL([ENABLE_P_PROCS_DYNAMIC],[test x$ENABLE_P_PROCS_DYNAMIC = xyes])
 AM_CONDITIONAL([ENABLE_P_PROCS_STATIC],[test x$ENABLE_P_PROCS_STATIC = xyes])