Changeset 1348 for trunk

Timestamp:

Jun 21, 2008, 6:49:12 AM (13 years ago)

Author:

Peter

Message:

adding a yat-config script (fixes #353)
also fixes ticket #376 by using some magic from apr

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• build_support/apr_common.m4 (added)
• build_support/yat-config.in (added)
• build_support/yat.am (modified) (1 diff)
• configure.ac (modified) (7 diffs)

trunk/Makefile.am

@@ -28 +28 @@
 SUBDIRS = yat test doc
 
+install-exec-hook: build_support/yat-config
+  $(INSTALL_SCRIPT) build_support/yat-config $(bindir)/yat-config
+
 .PHONY: doc
 doc:; @(cd doc; $(MAKE) $@)

trunk/build_support/yat.am

@@ -25 +25 @@
 ##
 
-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
+AM_CPPFLAGS = -I$(top_srcdir) $(EXTRA_CPPFLAGS)
+AM_CXXFLAGS = $(EXTRA_CXXFLAGS)
+AM_LDFLAGS = $(EXTRA_LDFLAGS)

trunk/configure.ac

@@ -62 +62 @@
 
 AM_CONDITIONAL(HAVE_DOXYGEN, test "$HAVE_DOXYGEN" = "true")
+
+m4_sinclude(./build_support/apr_common.m4)
+# Save user-defined environment settings for later restoration
+APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
+APR_SAVE_THE_ENVIRONMENT(CXXFLAGS)
+APR_SAVE_THE_ENVIRONMENT(LDFLAGS)
 
 # Checks for libraries.
@@ -90 +96 @@
 if test "$gsl_found" = "yes"; then
    LIBS="-lgsl $LIBS"
-   GSL_PREFIX=`$GSL_CONFIG --prefix`
-   AC_SUBST(GSL_PREFIX)
+   # grep words starting with '-L' in other words LDFLAGS
+   for i in $GSL_LIBS; do
+     if test ${i:0:2} = "-L"; then
+       LDFLAGS="$LDFLAGS $i"
+     fi
+   done
 fi
 
@@ -97 +107 @@
 m4_sinclude(./build_support/ax_boost.m4)
 AX_BOOST("1.33")
+CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 
 # Checks for header files.
@@ -161 +172 @@
 
 # yat specific settings
+YAT_LIBNAME="yat"
 YAT_LIB="libyat.la"
 YAT_LIB_LOCATION="yat"
+AC_SUBST(YAT_LIBNAME)
 AC_SUBST(YAT_LIB)
 AC_SUBST(YAT_LIB_LOCATION)
@@ -187 +200 @@
      yat/utility/Makefile])
 
+AC_CONFIG_FILES([build_support/yat-config],
+                [chmod +x build_support/yat-config])
+
 # warning about missing doxygen
 if (test "$HAVE_DOXYGEN" != "true") ; then
@@ -258 +274 @@
 fi
 
+# Reset flags 
+APR_RESTORE_THE_ENVIRONMENT(CPPFLAGS, EXTRA_)
+APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, EXTRA_)
+APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, EXTRA_)
+
 # Create output.
 AC_OUTPUT
@@ -267 +288 @@
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([  CPPFLAGS=\"$CPPFLAGS\"])
+AC_MSG_NOTICE([  EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"])
 AC_MSG_NOTICE([  CXXFLAGS=\"$CXXFLAGS\"])
+AC_MSG_NOTICE([  EXTRA_CXXFLAGS=\"$EXTRA_CXXFLAGS\"])
+AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
+AC_MSG_NOTICE([  EXTRA_LDFLAGS=\"$EXTRA_LDFLAGS\"])
 AC_MSG_NOTICE([  LIBS=\"$LIBS\"])
-AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([])