Changeset d6a575c in mod_gnutls for m4

Timestamp:

Nov 12, 2015, 6:46:48 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

401a0de

Parents:

a63301f

Message:

Use apr_memcache from APR Utility Library only

apr_memcache has been included (and maintained) in the APR Utility
Library for years. Even Apache 2.2 requires a newer version than the
first one to include apr_memcache. Remove support for the separate
apr_memcache library and rely on APR Util only.

File:

• m4/apr_memcache.m4 (modified) (1 diff)

m4/apr_memcache.m4

@@ -3 +3 @@
 dnl Sets:
 dnl  APR_MEMCACHE_LIBS
+dnl  APR_MEMCACHE_CFLAGS
 AC_DEFUN([CHECK_APR_MEMCACHE],
 [dnl
 
 AC_ARG_WITH(
-    apr-memcache-prefix,
-    [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
-    apr_memcache_prefix="$withval",
-    :)
-AC_ARG_WITH(
-    apr-memcache-libs,
-    [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
-    apr_memcache_libs="$withval",
-    :)
-AC_ARG_WITH(
-    apr-memcache-includes,
-    [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
-    apr_memcache_includes="$withval",
-    :)
-
+        [apu-config],
+        [AC_HELP_STRING([--with-apu-config=PATH],[Path to APR Utility Library config tool (apu-1-config)])],
+        [apr_util_config="$withval"],
+        [])
 
 AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
-dnl # Determine memcache lib directory
 save_CFLAGS=$CFLAGS
 save_LDFLAGS=$LDFLAGS
 
-if test -n "$apr_memcache_libs"; then
-    apr_memcache_libdir=$apr_memcache_libs
-elif test -n "$apr_memcache_prefix"; then
-    apr_memcache_libdir=$apr_memcache_prefix/lib
-fi
-if test -n "$apr_memcache_libdir"; then
-    LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
+dnl # If path to apu-1-config hasn't been set explicitly, try to find it
+if test -z "$apr_util_config"; then
+        AC_PATH_PROGS([APR_UTIL_CONF], [apu-1-config], [no], [$PATH:/usr/sbin])
+else
+        AC_MSG_NOTICE([using apu-1-config path set by user: $apr_util_config])
+        APR_UTIL_CONF="$apr_util_config"
 fi
 
-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/apr_memcache-0
-else
-    apr_memcache_includedir=$includedir/apr_memcache-0
-fi
-
-CFLAGS="-I$apr_memcache_includedir $CFLAGS"
-
+CFLAGS="`$APR_UTIL_CONF --includes` $CFLAGS"
+LDFLAGS="`$APR_UTIL_CONF --link-ld` $LDFLAGS"
 
 AC_CHECK_LIB(
-    apr_memcache,
-    apr_memcache_create,
-    [
-        APR_MEMCACHE_LIBS="-lapr_memcache"
-        if test -n "$apr_memcache_libdir"; then
-            APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
-        fi
-        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
-    ]
-)
-
-
-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`"
+                APR_MEMCACHE_LIBS="`$APR_UTIL_CONF --link-ld`"
+                APR_MEMCACHE_CFLAGS="`$APR_UTIL_CONF --includes`"
         ]
-    )
-fi
-
+)
 
 CFLAGS=$save_CFLAGS