[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 4f7a3b774136ffffbaf9b05d90bd568347bc5461
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri Nov 16 02:39:26 2012 +0200

    fix AC_OPENMP regression

diff --git a/configure.ac b/configure.ac
index 23cd0c8..e7c4dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,8 @@ AM_DISABLE_STATIC()
 LT_INIT()
 
 AC_PROG_CXX([$CXX])
+AC_LANG([C++])
+AC_OPENMP()
 
 dnl Check for c++0x features
 AC_DEFUN([AC_CXX_STDCPP0X_FEATURES],
@@ -47,7 +49,6 @@ test $ac_cv_cxx_cpp0x_features = no && \
    AC_MSG_ERROR([g++ >= 4.6 is required to build $PACKAGE as we must use -std=c++0x your C++ compiler doesn't seem to support], 1)
 
 dnl AC_CXX_HAVE_STL # redundant: we check for STL implicitly in AC_CXX_STDCPP0X_FEATURES
-AC_OPENMP()
 
 dnl Check for some functions
 AC_CHECK_FUNC( [mremap], [], AC_MSG_ERROR([Function mremap not available]))
@@ -227,6 +228,7 @@ AC_MSG_RESULT([
    CXX:			$CXX
    CXXFLAGS:            $CXXFLAGS
    LDFLAGS:             $LDFLAGS
+   OPENMP_CXXFLAGS:     $OPENMP_CXXFLAGS
 
    main fp type:	${main_fp_type}
    fftw3 omp-enabled:	${omp_enabled_fftw3}
diff --git a/src/Makefile.am b/src/Makefile.am
index 35fad5b..9aff71e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,15 +23,15 @@ aghermann_LDADD := \
 	ui/mf/liba.a \
 	ui/liba.a \
 	model/liba.a \
-	expdesign/liba.a \
 	metrics/liba.a \
 	libsigfile/libsigfile.a \
 	sigproc/liba.a \
 	common/liba.a \
+	expdesign/liba.a \
 	$(FFTW3_LIBS) $(ITPP_LIBS) $(SAMPLERATE_LIBS) $(GSL_LIBS) \
 	$(GTK_LIBS) $(CAIRO_LIBS) $(UNIQUE_LIBS) $(VTE_LIBS) \
 	$(LIBCONFIGXX_LIBS) \
-	$(OPENMP_LDADD) $(LIBFFTW3_LDADD)
+	$(LIBFFTW3_LDADD) $(OPENMP_CXXFLAGS)
 
 CLEANFILES := \
 	*/*.la */*.gch

-- 
Sleep experiment manager