Changeset 41 for sources/configure.ac

Timestamp:

Aug 24, 2009, 1:11:00 PM (15 years ago)

Author:

buchmann

Message:

Add:

• openmp support:
  • add flags to test_regression makefile
  • configure.ac now checks for openmp
  • Makefile.am add openmp flags
  • a new testbench to check benefits due to openmp

File:

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

sources/configure.ac

@@ -2 +2 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.60)
-AC_INIT(SystemCASS, 1.0.0)
+AC_PREREQ(2.63)
+AC_INIT([SystemCASS],[1.0.0])
 AC_CANONICAL_TARGET
 
@@ -18 +18 @@
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
+
+AC_CHECK_PROG(has_latex, latex, yes)
+AC_CHECK_PROG(has_bibtex, bibtex, yes)
+AC_CHECK_PROG(has_fig2dev, fig2dev, yes)
+AC_CHECK_PROG(has_ps2pdf, ps2pdf, yes)
+AC_CHECK_PROG(has_dvips, dvips, yes)
+
 
 # User choices
@@ -39 +46 @@
 # Also set -DNDEBUG when not debugging, this disables assert()s
 AS_IF([test "x$do_debug"  = "xyes"], [CXXFLAGS="-g"         ],
-      [test "x$do_debug" != "xyes"], [CXXFLAGS="-O2 -NDEBUG"])
+      [test "x$do_debug" != "xyes"], [CXXFLAGS="-O2 -DNDEBUG"])
 
 case $target_os in
@@ -63 +70 @@
 # Checks for libraries.
 AS_IF([test "x$with_pat" != "xno"],
-          saved_CFLAGS="$CFLAGS"
-          saved_LIBS="$LIBS"
-          LIBS="$LIBS -L$with_pat/lib"
-          CFLAGS="$CFLAGS -I$with_pat/include"
+          ALLIANCE_CFLAGS="-I$with_pat/include"
           [AC_CHECK_HEADER([pat.h],,
                    [AC_MSG_ERROR([You asked for PAT trace format but no pat.h dnl
@@ -75 +79 @@
 can be found. Try --with-pat=/search/dir/]),
                    [-lMut -lPpt -lPgn])]
-          ALLIANCE_CFLAGS="$CFLAGS"
-          CFLAGS="$saved_CFLAGS"
-          LIBS="$saved_LIBS"
           AC_SUBST(ALLIANCE_PATH, $withval)
           AC_SUBST(ALLIANCE_CFLAGS)
@@ -91 +92 @@
 AM_CONDITIONAL(HAS_SOCLIB, test x$with_soclib != xno)
 
-AC_CHECK_PROG(has_latex, latex, yes)
-AC_CHECK_PROG(has_bibtex, bibtex, yes)
-AC_CHECK_PROG(has_fig2dev, fig2dev, yes)
-AC_CHECK_PROG(has_ps2pdf, ps2pdf, yes)
-AC_CHECK_PROG(has_dvips, dvips, yes)
+# OpenMP
+AC_OPENMP([C])
 
 AM_CONDITIONAL(BUILD_DOCS,