Changeset 887 for trunk/configure.ac

Timestamp:

Nov 25, 2009, 4:20:36 AM (11 years ago)

Author:

Peter Johansson

Message:

refs #401

splitting LIBS *FLAGS into prefixes APR_ SVN_ and DEFAULT_
and modified configure end output to use these flags.

File:

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

trunk/configure.ac

@@ -86 +86 @@
 
 # Save FLAGS
-SAVE_CPPFLAGS="$CPPFLAGS"
-SAVE_CXXFLAGS="$CXXFLAGS"
-SAVE_LDFLAGS="$LDFLAGS"
-SAVE_LIBS="$LIBS"
+APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
+APR_SAVE_THE_ENVIRONMENT(CXXFLAGS)
 
 # -Wno-long-long is needed to suppress compiler diagnostics regarding
 # using extension beyond the C++ standard (usage of non C++ standard
 # 'long long' types).
-YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-pedantic -Wno-long-long])
+YAT_CXX_ADD_FLAG([CXXFLAGS],[-pedantic -Wno-long-long])
 AC_TYPE_LONG_LONG_INT
 AS_IF([test x$ac_cv_type_long_long_int = xno],
@@ -104 +102 @@
 
 AS_IF([test x$enable_debug = xyes], 
-  [YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-g -O])],
-  [YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[-DNDEBUG])
-   YAT_CXX_ADD_FLAG([SD_CXXFLAGS],[-O3])])
+  [YAT_CXX_ADD_FLAG([CXXFLAGS],[-g -O])],
+  [YAT_CPP_ADD_FLAG([CPPFLAGS],[-DNDEBUG])
+   YAT_CXX_ADD_FLAG([CXXFLAGS],[-O3])])
 
 # Apache Portable Runtime (APR) API checks
-APR_FIND_APR(,,1,[1 0])
+APR_FIND_APR(,,[1],[1 0])
 AS_IF([test "${with_apr+set}" = set],
     [DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-apr=$with_apr"]
 )
 if test "$apr_found" = "yes" ; then
-    SD_LIBS="`$apr_config --libs` $SD_LIBS"
-    apr_link_ld=`$apr_config --link-ld`
+    APR_LIBS="`$apr_config --libs`"
+    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])])
+      AS_IF([test ${i:0:2} = "-l"],[APR_LIBS="$i $APR_LIBS"],
+            [YAT_LD_ADD_FLAG([APR_LDFLAGS], [$i])])
     done
-    YAT_CPP_ADD_FLAG([SD_CPPFLAGS],[`$apr_config --includes --cppflags`])
-fi
+    YAT_CPP_ADD_FLAG([APR_CPPFLAGS],[`$apr_config --includes --cppflags`])
+    save_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$APR_CPPFLAGS $CPPFLAGS"
+    AC_CHECK_HEADER([apr_allocator.h],,[apr_found="no"])
+    CPPFLAGS=$save_CPPFLAGS
+fi
+AC_SUBST([APR_CPPFLAGS])
+AC_SUBST([APR_LDFLAGS])
+AC_SUBST([APR_LIBS])
 
 # Subversion API checks
 svn_found="yes"
-AC_ARG_WITH(svn,
+AC_ARG_WITH([svn],
   [AS_HELP_STRING([--with-svn=DIR],[prefix for svn developer files [[PREFIX]]])],
   [ DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-svn=$withval"
-    YAT_LD_ADD_FLAG([SD_LDFLAGS], [-L$withval/lib])
-    YAT_CPP_ADD_FLAG([SD_CPPFLAGS], [-I$withval/include])
+    YAT_LD_ADD_FLAG([SVN_LDFLAGS], [-L$withval/lib])
+    YAT_CPP_ADD_FLAG([SVN_CPPFLAGS], [-I$withval/include])
   ])
-
-
-
-# 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")
+# svn needs needs apr headers
+save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS $CPPFLAGS"
+AC_CHECK_HEADER([subversion-1/svn_types.h],,[svn_found="no"])
+CPPFLAGS=$save_CPPFLAGS
+
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+tmp_LIBS="$APR_LIBS $save_LIBS"
+LIBS=""
+LDFLAGS="$SVN_LDFLAGS $APR_LDFLAGS"
 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"
+               [], [svn_found="no"], [$tmp_LIBS])
+AC_SEARCH_LIBS([svn_ra_initialize],[svn_ra-1], [], [svn_found="no"],[$tmp_LIBS])
+AC_SEARCH_LIBS([svn_wc_adm_open3],[svn_wc-1], [], [svn_found="no"], [$tmp_LIBS])
+AC_SEARCH_LIBS([svn_diff_file_options_create],[svn_diff-1],[], 
+               [svn_found="no"], [$tmp_LIBS])
+AC_SEARCH_LIBS([svn_client_log3],[svn_client-1],,[svn_found="no"], [$tmp_LIBS])
+SVN_LIBS=$LIBS
+LIBS=$save_LIBS
+LDFLAGS=$save_LDFLAGS
+AC_SUBST([SVN_CPPFLAGS])
+AC_SUBST([SVN_LDFLAGS])
+AC_SUBST([SVN_LIBS])
+
 
 # check if svnversion is installed
@@ -184 +181 @@
 AM_CONDITIONAL([HAVE_SVN_WC], [test "$wc_found" = "yes"])
 AC_SUBST([wc_found])
+
+# Reset FLAGS
+APR_RESTORE_THE_ENVIRONMENT([CPPFLAGS], [DEFAULT_])
+APR_RESTORE_THE_ENVIRONMENT([CXXFLAGS], [DEFAULT_])
 
 # checking if we have test repo
@@ -299 +300 @@
 
 # Some more messages.
-AC_MSG_NOTICE([])
-AC_MSG_NOTICE([   Ready to compile the executables of svndigest $VERSION])
-AC_MSG_NOTICE([   The following flags and libs will be used:])
-AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
-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([    PLPLOT_LDFLAGS:     $PLPLOT_LDFLAGS])
-AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
-AC_MSG_NOTICE([])
+AC_MSG_NOTICE([
+Ready to compile the executables of svndigest $VERSION
+The following flags and libs will be used:
++++++++++++++++++++++++++++++++++++++++++++++++
+  Compiler:           $CXX
+  Preprocessor flags: $SD_CPPFLAGS $CPPFLAGS
+    CPPFLAGS:         $CPPFLAGS
+    DEFAULT_CPPFLAGS: $DEFAULT_CPPFLAGS
+    APR_CPPFLAGS:     $APR_CPPFLAGS
+    SVN_CPPFLAGS:     $SVN_CPPFLAGS
+  C++ flags:
+    CXXFLAGS:         $CXXFLAGS
+    DEFAULT_CXXFLAGS: $DEFAULT_CXXFLAGS
+  Linker flags:
+    LDFLAGS:          $LDFLAGS
+    APR_LDFLAGS:      $APR_LDFLAGS
+    SVN_LDFLAGS:      $SVN_LDFLAGS
+    PLPLOT_LDFLAGS:   $PLPLOT_LDFLAGS
+  Libraries:          
+    LIBS              $LIBS
+    APR_LIBS          $APR_LIBS
+    SVN_LIBS          $SVN_LIBS
++++++++++++++++++++++++++++++++++++++++++++++++]dnl
+)
 
 AC_MSG_NOTICE([Now type 'make all check'.])