Changeset 70509f8 in mod_gnutls for m4

Timestamp:

May 15, 2015, 4:00:25 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

03295a9

Parents:

e765670

git-author:

Thomas Klute <thomas2.klute@…> (05/15/15 11:00:41)

git-committer:

Thomas Klute <thomas2.klute@…> (05/15/15 16:00:25)

Message:

configure: Try apr-util if apr_memcache library was not found

Fedora doesn't provide libapr_memcache, but apr-util contains the
necessary functions as well. With this commit ./configure checks for
apr_memcache first, and then for apr-util if it was not found.

This commit is inspired by a patch added to the Fedora package of
mod_gnutls by Jiri Kastner <jkastner@…> in version 0.5.10-1.
The original patch just replaces apr_memcache with apr-util.

File:

• m4/apr_memcache.m4 (modified) (2 diffs)

m4/apr_memcache.m4

@@ -45 +45 @@
     apr_memcache_includedir=$includedir/apr_memcache-0
 fi
+
 CFLAGS="-I$apr_memcache_includedir $CFLAGS"
+
 
 AC_CHECK_LIB(
@@ -58 +60 @@
     ]
 )
+
+
+dnl # if the apr_memcache was not found, try apr-util
+if test -z "${APR_MEMCACHE_LIBS}"; then
+    if test -n "$apr_memcache_includes"; then
+        apr_memcache_includedir=$apr_memcache_includes
+    elif test -n "$apr_memcache_prefix"; then
+        apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
+    else
+        apr_memcache_includedir=$includedir/aprutil-1
+    fi
+    AC_CHECK_LIB(
+        aprutil-1,
+        apr_memcache_create,
+        [
+            APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
+            APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
+        ]
+    )
+fi
+
+
 CFLAGS=$save_CFLAGS
 LDFLAGS=$save_LDFLAGS