Changeset 1479

Timestamp:

Sep 9, 2008, 1:11:27 PM (15 years ago)

Author:

Peter

Message:

fixes #405

Setting AM_*FLAGS in configure. There are two paths to end up in
AM_*FLAGS. 1) you are set through corresponding *FLAGS, then swapped
into EXTRA_*FLAGS, and finally concatenated into AM_*FLAGS. These
flags are also stored in EXTRA_*FLAGS and are used in yat-config to
let the user of yat know which flags are important when using
yat. Flags that are not important for using yat, but mostly useful
when building yat, are set directly to AM_*FLAGS.

It is, of course, an open question which flags should be propagated to
a user, but for now I chose to propagate, on top of those that are
essential, gsl flags -DHAVE_INLINE and -DGSL_RANGE_CHECK_OFF.

This probably makes yat.am obsolete, but I keep it for now.

Location:

trunk

Files:

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

trunk/build_support/yat.am

@@ -25 +25 @@
 ##
 
-AM_CPPFLAGS = -I$(top_srcdir) $(EXTRA_CPPFLAGS)
-AM_CXXFLAGS = $(EXTRA_CXXFLAGS)
-AM_LDFLAGS = $(EXTRA_LDFLAGS)
+#AM_CPPFLAGS = -I$(top_srcdir) $(EXTRA_CPPFLAGS)
+#AM_CXXFLAGS = $(EXTRA_CXXFLAGS)
+#AM_LDFLAGS = $(EXTRA_LDFLAGS)

trunk/configure.ac

@@ -167 +167 @@
 fi
 
-CXXFLAGS="$CXXFLAGS -Wall -pedantic"
+# we use AM_* for variables that are solely needed for building yat,
+# i.e., they are not needed for a user of yat and are not propagated
+# to yat-config or yat.m4.
+AM_CXXFLAGS="$AM_CXXFLAGS -Wall -pedantic"
 CPPFLAGS="$CPPFLAGS -DHAVE_INLINE=1"
 AC_ARG_ENABLE(debug,
   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])])
 if test "${enable_debug}" = "yes" ; then
-  CXXFLAGS="$CXXFLAGS -g -O"
-  CPPFLAGS="$CPPFLAGS -DYAT_DEBUG=1"
+  AM_CXXFLAGS="$AM_CXXFLAGS -g -O"
+  AM_CPPFLAGS="$AM_CPPFLAGS -DYAT_DEBUG=1"
 else
-  CXXFLAGS="$CXXFLAGS -O3"
-  CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"
+  AM_CXXFLAGS="$CXXFLAGS -O3"
+  CPPFLAGS="$CPPFLAGS -DGSL_RANGE_CHECK_OFF"
+  AM_CPPFLAGS="$CPPFLAGS -DNDEBUG"
 fi
 
@@ -347 +351 @@
 APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, EXTRA_)
 
+AM_CPPFLAGS="-I\$(top_srcdir) $AM_CPPFLAGS $EXTRA_CPPFLAGS"
+AM_CXXFLAGS="$AM_CXXFLAGS $EXTRA_CXXFLAGS"
+AM_LDFLAGS="$AM_LDFLAGS $EXTRA_LDFLAGS"
+
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_LDFLAGS)
+
 # Create output.
 AC_OUTPUT
@@ -356 +368 @@
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([  CPPFLAGS=\"$CPPFLAGS\"])
-AC_MSG_NOTICE([  EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"])
+AC_MSG_NOTICE([  AM_CPPFLAGS=\"$AM_CPPFLAGS\"])
 AC_MSG_NOTICE([  CXXFLAGS=\"$CXXFLAGS\"])
-AC_MSG_NOTICE([  EXTRA_CXXFLAGS=\"$EXTRA_CXXFLAGS\"])
+AC_MSG_NOTICE([  AM_CXXFLAGS=\"$AM_CXXFLAGS\"])
 AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
-AC_MSG_NOTICE([  EXTRA_LDFLAGS=\"$EXTRA_LDFLAGS\"])
+AC_MSG_NOTICE([  AM_LDFLAGS=\"$AM_LDFLAGS\"])
 AC_MSG_NOTICE([  LIBS=\"$LIBS\"])
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])