Changeset d6a575c in mod_gnutls


Ignore:
Timestamp:
Nov 12, 2015, 6:46:48 PM (2 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
master, debian, jessie-backports, 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.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • README

    r9a4d250 rd6a575c  
    2525 * Apache HTTPD    >= 2.2 <http://httpd.apache.org/> (2.4.* preferred)
    2626 * autotools, GNU make, & gcc
    27  * APR Memcache    >= 0.7.0 (Optional)
    2827 * libmsv          >= 0.1 (Optional, enable with ./configure --enable-msva)
    2928 * pandoc   (for documentation, optional)
  • m4/apr_memcache.m4

    r70509f8 rd6a575c  
    33dnl Sets:
    44dnl  APR_MEMCACHE_LIBS
     5dnl  APR_MEMCACHE_CFLAGS
    56AC_DEFUN([CHECK_APR_MEMCACHE],
    67[dnl
    78
    89AC_ARG_WITH(
    9     apr-memcache-prefix,
    10     [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
    11     apr_memcache_prefix="$withval",
    12     :)
    13 AC_ARG_WITH(
    14     apr-memcache-libs,
    15     [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
    16     apr_memcache_libs="$withval",
    17     :)
    18 AC_ARG_WITH(
    19     apr-memcache-includes,
    20     [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
    21     apr_memcache_includes="$withval",
    22     :)
    23 
     10        [apu-config],
     11        [AC_HELP_STRING([--with-apu-config=PATH],[Path to APR Utility Library config tool (apu-1-config)])],
     12        [apr_util_config="$withval"],
     13        [])
    2414
    2515AC_LIBTOOL_SYS_DYNAMIC_LINKER
    2616
    27 dnl # Determine memcache lib directory
    2817save_CFLAGS=$CFLAGS
    2918save_LDFLAGS=$LDFLAGS
    3019
    31 if test -n "$apr_memcache_libs"; then
    32     apr_memcache_libdir=$apr_memcache_libs
    33 elif test -n "$apr_memcache_prefix"; then
    34     apr_memcache_libdir=$apr_memcache_prefix/lib
    35 fi
    36 if test -n "$apr_memcache_libdir"; then
    37     LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
     20dnl # If path to apu-1-config hasn't been set explicitly, try to find it
     21if test -z "$apr_util_config"; then
     22        AC_PATH_PROGS([APR_UTIL_CONF], [apu-1-config], [no], [$PATH:/usr/sbin])
     23else
     24        AC_MSG_NOTICE([using apu-1-config path set by user: $apr_util_config])
     25        APR_UTIL_CONF="$apr_util_config"
    3826fi
    3927
    40 if test -n "$apr_memcache_includes"; then
    41     apr_memcache_includedir=$apr_memcache_includes
    42 elif test -n "$apr_memcache_prefix"; then
    43     apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
    44 else
    45     apr_memcache_includedir=$includedir/apr_memcache-0
    46 fi
    47 
    48 CFLAGS="-I$apr_memcache_includedir $CFLAGS"
    49 
     28CFLAGS="`$APR_UTIL_CONF --includes` $CFLAGS"
     29LDFLAGS="`$APR_UTIL_CONF --link-ld` $LDFLAGS"
    5030
    5131AC_CHECK_LIB(
    52     apr_memcache,
    53     apr_memcache_create,
    54     [
    55         APR_MEMCACHE_LIBS="-lapr_memcache"
    56         if test -n "$apr_memcache_libdir"; then
    57             APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
    58         fi
    59         APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
    60     ]
    61 )
    62 
    63 
    64 dnl # if the apr_memcache was not found, try apr-util
    65 if test -z "${APR_MEMCACHE_LIBS}"; then
    66     if test -n "$apr_memcache_includes"; then
    67         apr_memcache_includedir=$apr_memcache_includes
    68     elif test -n "$apr_memcache_prefix"; then
    69         apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
    70     else
    71         apr_memcache_includedir=$includedir/aprutil-1
    72     fi
    73     AC_CHECK_LIB(
    7432        aprutil-1,
    7533        apr_memcache_create,
    7634        [
    77             APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
    78             APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
     35                APR_MEMCACHE_LIBS="`$APR_UTIL_CONF --link-ld`"
     36                APR_MEMCACHE_CFLAGS="`$APR_UTIL_CONF --includes`"
    7937        ]
    80     )
    81 fi
    82 
     38)
    8339
    8440CFLAGS=$save_CFLAGS
Note: See TracChangeset for help on using the changeset viewer.