Changeset 841 for plugins/base1/se.lu.thep.wenni/trunk/configure.ac

Timestamp:

Nov 30, 2008, 12:46:12 AM (13 years ago)

Author:

Peter Johansson

Message:

avoid setting CPPFLAGS and friends in configure.ac
and updating Makefile.ams accordingly

File:

• plugins/base1/se.lu.thep.wenni/trunk/configure.ac (modified) (4 diffs)

plugins/base1/se.lu.thep.wenni/trunk/configure.ac

@@ -41 +41 @@
 # Set default programming language
 AC_LANG(C++)
+
+# Let user overide default CXXFLAGS
+if test "${CXXFLAGS+set}" != set; then
+  CXXFLAGS=""  # Setting CXXFLAGS here to prevent expansion in AC_PROG_CXX
+fi
 
 # Checks for programs.
@@ -50 +55 @@
 AC_PROG_SED
 
-CXXFLAGS="-Wall -pedantic"
-CPPFLAGS="-DHAVE_INLINE=1"
+AM_CXXFLAGS="-Wall -pedantic"
+AM_CPPFLAGS="-DHAVE_INLINE=1"
 AC_ARG_ENABLE(debug,
               [ AS_HELP_STRING([--enable-debug],
                                [turn on debug options and code]) ],
-              [ CXXFLAGS="$CXXFLAGS -g -O" ],
-              [ CXXFLAGS="$CXXFLAGS -O3"
-                CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF" ])
+              [AM_CXXFLAGS="$AM_CXXFLAGS -g -O"],
+              [AM_CXXFLAGS="$AM_CXXFLAGS -O3"
+               AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"])
 
 AC_ARG_ENABLE(state,
@@ -95 +100 @@
   OLD_CPPFLAGS=$CPPFLAGS;
   OLD_LDFLAGS=$LDFLAGS;
-  LDFLAGS="-L$BASEDIR/lib"
-  AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib -lbase"],
+  LDFLAGS="$LDFLAGS -L$BASEDIR/lib"
+  AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib"],
                [AC_MSG_FAILURE([cannot find base library])])
   CPPFLAGS="-I$BASEDIR/include/cxx $CPPFLAGS"
@@ -120 +125 @@
 fi
 
-AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])],
-            [CPPFLAGS="-I$withval/include $CPPFLAGS" 
-             LDFLAGS="-L$withval/lib $LDFLAGS"], [])
-
 AC_SEARCH_LIBS([sqrt], [m],, AC_MSG_FAILURE([cannot find math library]))
 AC_SEARCH_LIBS([ATL_ctrsv], [atlas],,
                AC_SEARCH_LIBS(cblas_sdsdot, gslcblas,,
                         AC_MSG_FAILURE([cannot find cblas library])))
+
+save_LDFLAGS="$LDFLAGS"
+AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])],
+            [GSL_CPPFLAGS="-I$withval/include"; GSL_LDFLAGS="-L$withval/lib"])
+LDFLAGS="$LDFLAGS $GSL_LDFLAGS"
 AC_SEARCH_LIBS([gsl_vector_alloc], [gsl],,
                AC_MSG_FAILURE([cannot find library GSL]))
+LDFLAGS="$save_LDFLAGS"
+
+AC_SUBST(GSL_LDFLAGS)
+AM_CPPFLAGS="-I\$(top_srcdir)/lib $GSL_CPPFLAGS $AM_CPPFLAGS"
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CXXFLAGS)
 
 CPP_TOOLS_LIBPATH="lib/c++_tools"