Changeset 640 for trunk/configure.ac

Timestamp:

May 31, 2008, 6:06:33 AM (15 years ago)

Author:

Peter Johansson

Message:

fixes #333

File:

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

trunk/configure.ac

@@ -76 +76 @@
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
 
+# Save FLAGS
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_CXXFLAGS="$CXXFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+SAVE_LIBS="$LIBS"
+
 # -Wno-long-long is needed to suppress compiler diagnostics regarding
 # using extension beyond the C++ standard (usage of non C++ standard
 # 'long long' types).
-CXXFLAGS="$CXXFLAGS -Wall -pedantic -Wno-long-long"
+SD_CXXFLAGS="$SD_CXXFLAGS-Wall -pedantic -Wno-long-long"
 AC_TYPE_LONG_LONG_INT()
 
 AC_ARG_ENABLE(debug,
   [AS_HELP_STRING([--enable-debug],[turn on debug options and code])],
-  [CXXFLAGS="$CXXFLAGS -g -O"], 
-  [CPPFLAGS="$CPPFLAGS -DNDEBUG" CXXFLAGS="$CXXFLAGS -O3"])
+  [SD_CXXFLAGS="$SD_CXXFLAGS -g -O"], 
+  [SD_CPPFLAGS="-DNDEBUG" SD_CXXFLAGS="$SD_CXXFLAGS -O3"])
 
 # optionally prepare for building static libraries.
@@ -98 +104 @@
     # Keychain on Mac OSX. In consequence the below
     # frameworks are needed for succesful static builds.
-    LIBS="$LIBS -framework Security"
-    LIBS="$LIBS -framework CoreFoundation"
-    LIBS="$LIBS -framework CoreServices"
+    SD_LIBS="$SD_LIBS -framework Security"
+    SD_LIBS="$SD_LIBS -framework CoreFoundation"
+    SD_LIBS="$SD_LIBS -framework CoreServices"
     ;;
   esac
@@ -118 +124 @@
 # AC_SEARCH_LIBS([apr_allocator_create],[apr-0],,apr_found="no") but
 # apr-0 must be prior knowledge.
-sinclude(./build_support/find_apr.m4)
+m4_sinclude(./build_support/find_apr.m4)
 APR_FIND_APR(,,1,[1 0])
 if test "$apr_found" = "yes" ; then
-    LDFLAGS="`$apr_config --link-ld` $LDFLAGS"
-    CPPFLAGS="`$apr_config --includes` $CPPFLAGS"
-    AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
+    SD_LDFLAGS="`$apr_config --link-ld` $SD_LDFLAGS"
+    SD_CPPFLAGS="`$apr_config --includes` $SD_CPPFLAGS"
 fi
 
@@ -130 +135 @@
 AC_ARG_WITH(svn,
   [AS_HELP_STRING([--with-svn=DIR],[prefix for svn developer files [[PREFIX]]])],
-  [ LDFLAGS="-L$withval/lib $LDFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS"])
+  [ SD_LDFLAGS="-L$withval/lib $SD_LDFLAGS" 
+    SD_CPPFLAGS="-I$withval/include $SD_CPPFLAGS"])
+
+
+# Use SD_*FLAGS in tests
+CPPFLAGS="$SD_CPPFLAGS $CPPFLAGS"
+CXXFLAGS="$SD_CXXFLAGS $CXXFLAGS"
+LDFLAGS="$SD_LDFLAGS $LDFLAGS"
+LIBS="$SD_LIBS $LIBS"
+
+AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
 AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
 # The library checks below may match shared libs even when
@@ -136 +151 @@
 # pose any problems since in a properly installed system the shared
 # and static libraries should be the same.
-AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],,svn_found="no")
-AC_SEARCH_LIBS([svn_ra_initialize],[svn_ra-1],,svn_found="no")
-AC_SEARCH_LIBS([svn_wc_adm_open3],[svn_wc-1],,svn_found="no")
-AC_SEARCH_LIBS([svn_diff_file_options_create],[svn_diff-1],,svn_found="no")
-AC_SEARCH_LIBS([svn_client_log3],[svn_client-1],,svn_found="no")
-
+AC_SEARCH_LIBS([svn_cmdline_setup_auth_baton],[svn_subr-1],
+               [SD_LIBS="-lsvn_subr-1 $SD_LIBS"],svn_found="no")
+AC_SEARCH_LIBS([svn_ra_initialize],[svn_ra-1],
+               [SD_LIBS="-lsvn_ra-1 $SD_LIBS"],svn_found="no")
+AC_SEARCH_LIBS([svn_wc_adm_open3],[svn_wc-1],
+               [SD_LIBS="-lsvn_wc-1 $SD_LIBS"],svn_found="no")
+AC_SEARCH_LIBS([svn_diff_file_options_create],[svn_diff-1],
+               [SD_LIBS="-lsvn_diff-1 $SD_LIBS"],svn_found="no")
+AC_SEARCH_LIBS([svn_client_log3],[svn_client-1],
+               [SD_LIBS="-lsvn_client-1 $SD_LIBS"],svn_found="no")
+
+# Export flags
+AC_SUBST([SVNDIGEST_CPPFLAGS], $SD_CPPFLAGS)
+AC_SUBST([SVNDIGEST_CXXFLAGS], $SD_CXXFLAGS)
+AC_SUBST([SVNDIGEST_LDFLAGS], $SD_LDFLAGS)
+AC_SUBST([SVNDIGEST_LIBS], $SD_LIBS)
+
+# Reset FLAGS
+CPPFLAGS="$SAVE_CPPFLAGS"
+CXXFLAGS="$SAVE_CXXFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+LIBS="$SAVE_LIBS"
 
 # check if svnversion is installed
@@ -252 +283 @@
 AC_MSG_NOTICE([   The following flags and libs will be used:])
 AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
-AC_MSG_NOTICE([    Compiler:           CXX=\"$CXX\"])
-AC_MSG_NOTICE([    Preprocessor flags: CPPFLAGS=\"$CPPFLAGS\"])
-AC_MSG_NOTICE([    C++ flags:          CXXFLAGS=\"$CXXFLAGS\"])
-AC_MSG_NOTICE([    Linker flags:       LDFLAGS=\"$LDFLAGS\"])
-AC_MSG_NOTICE([    LIBS:               LIBS=\"$LIBS\"])
+AC_MSG_NOTICE([    Compiler:           $CXX])
+AC_MSG_NOTICE([    Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS])
+AC_MSG_NOTICE([    C++ flags:          $SD_CXXFLAGS $CXXFLAGS])
+AC_MSG_NOTICE([    Linker flags:       $SD_LDFLAGS $LDFLAGS])
+AC_MSG_NOTICE([    LIBS:               $SD_LIBS $LIBS])
 AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([])