Changeset 162

Timestamp:

Aug 20, 2006, 1:01:59 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #33. 'configure' now checks for APR libraries.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• README (modified) (3 diffs)
• build_support (added)
• build_support/apache_LICENSE-2.0.txt (added)
• build_support/find_apr.m4 (added)
• configure.ac (modified) (3 diffs)

trunk/ChangeLog

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

trunk/README

@@ -25 +25 @@
 1  Prerequisites
 
-i) Subversion development files, i.e., header files and program
+ia) Subversion development files, i.e., header files and program
    libraries, version 1.4 or later.
+
+ib) This item should not be an issue if item ia) is fulfilled; the
+   Apache Portable Runtime (APR) should be available if the subversion
+   API was succesfully compiled. Subversion depends on APR and in
+   consequence, the dependency is inherited by svndigest.
 
 ii) Gnuplot.
@@ -33 +38 @@
    must be compiled with a C++ compiler that supports 'long long'
    types - GCC does this. This is due to the fact that one of the
-   underlying libraries, apr, is using 'long long'. apr is written in
+   underlying libraries, APR, is using 'long long'. APR is written in
    C and the C standard allows 'long long'.
 
@@ -54 +59 @@
 interfaces in ANSI C" written by Nicolas Devillard. The C implemention
 is available through http://ndevilla.free.fr/ .
+
+svndigest build system uses an M4 macro (build_support/find_apr.m4)
+created within the Apache project (The Apache Software Foundation). No
+changes is made to the M4 script. The apache license text is available
+as buid_support/apache_LICENSE-2.0.txt.

trunk/configure.ac

@@ -56 +56 @@
 fi
 
+# Apache Portable Runtime (APR) checks
 AC_ARG_WITH(apr,
   [  --with-apr=DIR          prefix for installed APR or path to APR build
@@ -62 +63 @@
   [ APR_PATH=$prefix ])
 AC_SUBST(APR_PATH)
+# Include macros distributed within the APR project
+sinclude(./build_support/find_apr.m4)
+APR_FIND_APR(,,1)
 
 AC_ARG_WITH(svn,
@@ -92 +96 @@
      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'.])
+fi
+
 echo ""
-echo "      Now type 'make ; make check'."
+echo "If no warnings appear above it is safe to type 'make ; make check'."
 echo ""