Changeset 164

Timestamp:

Aug 24, 2006, 12:51:01 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #33. Added configure checks for APR and subversion APIs.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• bin/Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/SVN.cc (modified) (1 diff)
• lib/SVN.h (modified) (1 diff)
• lib/SVNblame.h (modified) (1 diff)
• lib/SVNinfo.h (modified) (1 diff)
• lib/Stats.h (modified) (1 diff)

trunk/ChangeLog

@@ -24 +24 @@
 
 version pre0.5:
-  - 'configure' now checks for APR libraries.
+  - 'configure' now checks for APR and subversion APIs.
   - Added a --enable-debug option to autoconf. The project is
     compiled without debug code by default. Use './configure

trunk/bin/Makefile.am

@@ -28 +28 @@
 noinst_HEADERS = Parameter.h
 
-LDADD = @top_srcdir@/lib/libsvndigest.a -L$(APR_PATH)/lib -L$(SVN_PATH)/lib \
-  -lsvn_client-1 -lsvn_diff-1 -lsvn_wc-1 -lsvn_ra-1 -lsvn_subr-1 -lapr-0
+LDADD = @top_srcdir@/lib/libsvndigest.a
 
-INCLUDES = -I@top_srcdir@/lib \
-  -I$(SVN_PATH)/include/subversion-1 -I$(APR_PATH)/include/apr-0
+INCLUDES = -I@top_srcdir@/lib
 
 clean-local: 

trunk/configure.ac

@@ -50 +50 @@
 AC_ARG_ENABLE(debug,[  --enable-debug          turn on debug options and code])
 if test "${enable_debug}" = "yes" ; then
-  CXXFLAGS="$CXXFLAGS -g -O"
+    CXXFLAGS="$CXXFLAGS -g -O"
 else
-  CPPFLAGS="$CPPFLAGS -DNDEBUG"
-  CXXFLAGS="$CXXFLAGS -O3"
+    CPPFLAGS="$CPPFLAGS -DNDEBUG"
+    CXXFLAGS="$CXXFLAGS -O3"
 fi
 
-# Apache Portable Runtime (APR) checks
+# Apache Portable Runtime (APR) API checks
 AC_ARG_WITH(apr,
   [  --with-apr=DIR          prefix for installed APR or path to APR build
-                          tree [[PREFIX]]],
-  [ APR_PATH=$withval ],
-  [ APR_PATH=$prefix ])
-AC_SUBST(APR_PATH)
-# Include macros distributed within the APR project
+                          tree [[PREFIX]]])
+# Include APR_FIND_APR macro distributed within the APR project. If
+# the usage of the APR macro is to be omitted then the construct for
+# setting the CXXFLAGS (header file location) and LDFLAGS (linking
+# informaion) for APR must be changed. The latter can be achieved with
+# AC_SEARCH_LIBS([apr_allocator_create],[apr-0],,apr_found="no") but
+# apr-0 must be prior knowledge.
 sinclude(./build_support/find_apr.m4)
 APR_FIND_APR(,,1)
+if test "$apr_found" = "yes" ; then
+    LDFLAGS="$LDFLAGS `$apr_config --link-ld`"
+    CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
+    AC_CHECK_HEADER([apr_allocator.h],,apr_found="no")
+fi
 
+# Subversion API checks
+svn_found="yes"
 AC_ARG_WITH(svn,
   [  --with-svn=DIR          prefix for svn developer files [[PREFIX]]],
-  [ SVN_PATH=$withval ],
-  [ SVN_PATH=$prefix ])
-AC_SUBST(SVN_PATH)
+  [ LDFLAGS="$LDFLAGS -L$withval/lib" CPPFLAGS="$CPPFLAGS -I$withval/include"])
+AC_CHECK_HEADER([subversion-1/svn_types.h],,svn_found="no")
+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_CONFIG_FILES([Makefile
@@ -78 +91 @@
                 test/Makefile])
 
+# Print failure status information about selected items, and exit if
+# fatal errors were encountered. No output will be created if
+# configure is halted prematurely.
+
+# used to trigger exit before creation of output
+all_reqs_ok="true"
+
+# Non-existing APR is fatal -- sub-sequent compilation will fail.
+if (test "$apr_found" = "no") ; then
+    AC_MSG_WARN([APR not found. The Apache Portable Runtime
+    (APR) library cannot be found. Please make sure APR is installed
+    and supply the appropriate --with-apr option to 'configure'.])
+    all_reqs_ok="false"
+fi
+
+# Non-existing subversion API is fatal -- sub-sequent compilation will fail.
+if (test "$svn_found" = "no") ; then
+    AC_MSG_WARN([Subversion API not found. Subversion API libraries
+    cannot be found. Make sure the APIs are installed and supply the
+    appropriate --with-svn option to 'configure'.])
+    all_reqs_ok="false"
+fi
+
+if (test "$all_reqs_ok" = "false") ; then
+    AC_MSG_ERROR([Some pre-requisites were not fulfilled, aborting
+    configure. Please consult the 'README' file for more information
+    about what is needed to compile svndigest and refer to above
+    warning messages. Needed output files were NOT created.])
+fi
+
+# Create output.
 AC_OUTPUT
 
-echo ""
-echo "   Ready to compile the executables of svndiget"
-echo "   The following compilers and flags will be used:"
-echo "   +++++++++++++++++++++++++++++++++++++++++++++++"
-echo "    Preprocessor flags: CPPFLAGS=\"$CPPFLAGS\""
-echo "    C++ flags:          CXXFLAGS=\"$CXXFLAGS\""
-echo "    Linker flags:       LDFLAGS=\"$LDFLAGS\""
-echo "   +++++++++++++++++++++++++++++++++++++++++++++++"
-echo ""
+# Some more messages.
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([   Ready to compile the executables of svndiget])
+AC_MSG_NOTICE([   The following compilers and flags will be used:])
+AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
+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([   +++++++++++++++++++++++++++++++++++++++++++++++])
+AC_MSG_NOTICE([])
 
-test "$GNUPLOT" = "ok" || \
-     AC_MSG_WARN([Gnuplot was not found. svndigest will compile
-     without gnuplot but will throw an exception at runtime. Please
-     install gnuplot (available for a wide range of operating systems
-     at http://www.gnuplot.info).])
-
-if test $apr_found = "no"; then
-    AC_MSG_WARN([APR not found. The Apache Portable Runtime (APR)
-    library cannot be found. Please supply the appropriate --with-apr
-    option to 'configure'.])
+# Failure to locate gnuplot is not considered fatal
+if (test "$GNUPLOT" != "ok") ; then
+    AC_MSG_WARN([Gnuplot was not found. svndigest will compile
+    without gnuplot but will throw an exception at runtime. Please
+    install gnuplot (available for a wide range of operating systems
+    at http://www.gnuplot.info).])
+    AC_MSG_NOTICE([])
 fi
 
-echo ""
-echo "If no warnings appear above it is safe to type 'make ; make check'."
-echo ""
+AC_MSG_NOTICE([Now type 'make ; make check'.])

trunk/lib/Makefile.am

@@ -32 +32 @@
   SVNinfo.cc utility.cc
 
-INCLUDES = -I$(SVN_PATH)/include/subversion-1 -I$(APR_PATH)/include/apr-0
-
 clean-local: 
   rm -rf *~

trunk/lib/SVN.cc

@@ -28 +28 @@
 #include <apr_allocator.h>
 #include <apr_hash.h>
-#include <svn_client.h>
-#include <svn_cmdline.h>
-#include <svn_path.h>
-#include <svn_pools.h>
-#include <svn_wc.h>
+#include <subversion-1/svn_client.h>
+#include <subversion-1/svn_cmdline.h>
+#include <subversion-1/svn_path.h>
+#include <subversion-1/svn_pools.h>
+#include <subversion-1/svn_wc.h>
 
 namespace theplu {

trunk/lib/SVN.h

@@ -29 +29 @@
 #include <vector>
 
-#include <svn_client.h>
-#include <svn_types.h>
+#include <subversion-1/svn_client.h>
+#include <subversion-1/svn_types.h>
 
 namespace theplu {

trunk/lib/SVNblame.h

@@ -28 +28 @@
 #include <vector>
 
-#include <svn_client.h>
+#include <subversion-1/svn_client.h>
 
 namespace theplu {

trunk/lib/SVNinfo.h

@@ -27 +27 @@
 #include <string>
 
-#include <svn_client.h>
+#include <subversion-1/svn_client.h>
 
 namespace theplu {

trunk/lib/Stats.h

@@ -28 +28 @@
 #include "Parser.h"
 
-#include <svn_types.h>
+#include <subversion-1/svn_types.h>
 
 #include <map>