Changeset 1327 for trunk

Timestamp:

May 24, 2008, 7:53:19 AM (13 years ago)

Author:

Peter

Message:

fixes #352

Location:

trunk

Files:

• build_support/yat.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/build_support/yat.am

@@ -25 +25 @@
 ##
 
-AM_CPPFLAGS = -I$(top_srcdir) $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) $(GSL_CFLAGS) $(BOOST_CPPFLAGS)
+
+# this assumes that gsl has been installed with default 
+# libdir = ${exec_prefix}/lib = ${prefix}/lib
+AM_LDFLAGS = -L$(GSL_PREFIX)/lib

trunk/configure.ac

@@ -83 +83 @@
 
 # GNU Scientific Library, GSL http://www.gnu.org/software/gsl/, checks
-# Including AM_PATH_GSL macro from gsl.m4 distributed by GSL
+# Including AX_PATH_GSL macro from gsl.m4 distributed by GSL
 gsl_found="no"
 gsl_version="1.8"
@@ -90 +90 @@
 if test "$gsl_found" = "yes"; then
    LIBS="-lgsl $LIBS"
+   GSL_PREFIX=`$GSL_CONFIG --prefix`
+   AC_SUBST(GSL_PREFIX)
 fi
 
 # Boost http://www.boost.org
 m4_sinclude(./build_support/ax_boost.m4)
-AX_BOOST("1.33",[boost_found="yes"], [echo AHA])
+AX_BOOST("1.33")
 
 # Checks for header files.