Changeset 4addf74 in mod_gnutls for m4


Ignore:
Timestamp:
Aug 22, 2015, 3:30:24 PM (5 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
71e9a5c, 89f863f
Parents:
ae29683 (diff), a1c4c2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.7

Location:
m4
Files:
5 added
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • m4/apr_memcache.m4

    rae29683 r4addf74  
    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.