Changeset 0e277f2 in mod_gnutls


Ignore:
Timestamp:
Mar 5, 2008, 4:45:58 PM (12 years ago)
Author:
Nokis Mavrogiannopoulos <nmav@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
1897a1c
Parents:
b71edd5
git-author:
Nikos Mavrogiannopoulos <nmav@…> (03/05/08 16:45:58)
git-committer:
Nokis Mavrogiannopoulos <nmav@…> (03/05/08 16:45:58)
Message:

added new apr_memcache.m4 from Guillaume Rousse

File:
1 edited

Legend:

Unmodified
Added
Removed
  • m4/apr_memcache.m4

    rb71edd5 r0e277f2  
    1010    [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
    1111    apr_memcache_prefix="$withval",
    12     apr_memcache_prefix="/usr",
    1312    :)
    1413AC_ARG_WITH(
     
    1615    [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
    1716    apr_memcache_libs="$withval",
    18     apr_memcache_libs="$apr_memcache_prefix/lib"
    1917    :)
    2018AC_ARG_WITH(
     
    2220    [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
    2321    apr_memcache_includes="$withval",
    24     apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
    2522    :)
    2623
     
    3128save_CFLAGS=$CFLAGS
    3229save_LDFLAGS=$LDFLAGS
    33 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
    34 LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
     30
     31if test -n "$apr_memcache_libs"; then
     32    apr_memcache_libdir=$apr_memcache_libs
     33elif test -n "$apr_memcache_prefix"; then
     34    apr_memcache_libdir=$apr_memcache_prefix/lib
     35fi
     36if test -n "$apr_memcache_libdir"; then
     37    LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
     38fi
     39
     40if test -n "$apr_memcache_includes"; then
     41    apr_memcache_includedir=$apr_memcache_includes
     42elif test -n "$apr_memcache_prefix"; then
     43    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
     44else
     45    apr_memcache_includedir=$includedir/apr_memcache-0
     46fi
     47CFLAGS="-I$apr_memcache_includedir $CFLAGS"
     48
    3549AC_CHECK_LIB(
    3650    apr_memcache,
    3751    apr_memcache_create,
    3852    [
    39         APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache"
    40         APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes"
     53        APR_MEMCACHE_LIBS="-lapr_memcache"
     54        if test -n "$apr_memcache_libdir"; then
     55            APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
     56        fi
     57        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
    4158    ]
    4259)
Note: See TracChangeset for help on using the changeset viewer.