Changeset 774 for trunk/configure.ac

Timestamp:

Feb 1, 2009, 7:02:13 PM (15 years ago)

Author:

Peter Johansson

Message:

fixes #378 and also fixed so -lapr ends up in LIBS and not LDFLAGS

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -96 +96 @@
 # using extension beyond the C++ standard (usage of non C++ standard
 # 'long long' types).
-SD_CXXFLAGS="$SD_CXXFLAGS-Wall -pedantic -Wno-long-long"
+YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-pedantic -Wno-long-long])
 AC_TYPE_LONG_LONG_INT
 
 AC_ARG_ENABLE(debug,
   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
-  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"],
-  [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
+  [YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-g -O])],
+  [YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[-DNDEBUG])
+   YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-O3])])
 
 # enable svn-support
@@ -121 +122 @@
 if test "$apr_found" = "yes" ; then
     SD_LIBS="`$apr_config --libs` $SD_LIBS"
-    SD_LDFLAGS="`$apr_config --link-ld` $SD_LDFLAGS"
-    SD_CPPFLAGS="`$apr_config --includes --cppflags` $SD_CPPFLAGS"
+    apr_link_ld=`$apr_config --link-ld`
+    for i in $apr_link_ld; do
+      AS_IF([test ${i:0:2} = "-l"],[SD_LIBS="$i $SD_LIBS"],
+            [YAT_LD_ADD_FLAG([SD_LDFLAGS], [$i])])
+    done
+    YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[`$apr_config --includes --cppflags`])
 fi
 
@@ -130 +135 @@
   [AS_HELP_STRING([--with-svn=DIR],[prefix for svn developer files [[PREFIX]]])],
   [ DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
-    SD_LDFLAGS="-L$withval/lib $SD_LDFLAGS" 
-    SD_CPPFLAGS="-I$withval/include $SD_CPPFLAGS"])
+    YAT_LD_ADD_FLAG([SD_LDFLAGS], [-L$withval/lib])
+    YAT_CPP_ADD_FLAG([SD_CPPFLAGS], [-L$withval/include])
+  ])
+