Changeset 70509f8 in mod_gnutls for m4


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • m4/apr_memcache.m4

    re765670 r70509f8  
    4545    apr_memcache_includedir=$includedir/apr_memcache-0
    4646fi
     47
    4748CFLAGS="-I$apr_memcache_includedir $CFLAGS"
     49
    4850
    4951AC_CHECK_LIB(
     
    5860    ]
    5961)
     62
     63
     64dnl # if the apr_memcache was not found, try apr-util
     65if 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(
     74        aprutil-1,
     75        apr_memcache_create,
     76        [
     77            APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
     78            APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
     79        ]
     80    )
     81fi
     82
     83
    6084CFLAGS=$save_CFLAGS
    6185LDFLAGS=$save_LDFLAGS
Note: See TracChangeset for help on using the changeset viewer.