summaryrefslogtreecommitdiffstats
path: root/mod_auth_xradius-0.4.6-memcache.patch
blob: 0a93dd9ca34ad3aae55e0dec5c5ec44cf2474aa5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff -Naur mod_auth_xradius-0.4.6.old/configure mod_auth_xradius-0.4.6.memcache/configure
--- mod_auth_xradius-0.4.6.old/configure	2012-05-30 10:27:39.230465050 +0200
+++ mod_auth_xradius-0.4.6.memcache/configure	2012-05-30 11:06:40.236546705 +0200
@@ -4476,8 +4476,8 @@
 echo "${ECHO_T}$ac_cv_lib_apr_memcache_apr_memcache_create" >&6
 if test $ac_cv_lib_apr_memcache_apr_memcache_create = yes; then
 
-            APR_MEMCACHE_LIBS="-R$x/lib -L$x/lib -lapr_memcache"
-            APR_MEMCACHE_CFLAGS="-I$x/include/apr_memcache-0"
+            APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
+            APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
 
 fi
 
diff -Naur mod_auth_xradius-0.4.6.old/m4/apr_memcache.m4 mod_auth_xradius-0.4.6.memcache/m4/apr_memcache.m4
--- mod_auth_xradius-0.4.6.old/m4/apr_memcache.m4	2012-05-30 10:27:39.228465017 +0200
+++ mod_auth_xradius-0.4.6.memcache/m4/apr_memcache.m4	2012-05-30 11:11:30.271831333 +0200
@@ -20,23 +20,19 @@
     test_paths="${mc_path}"
 fi
 
-if test -n ${AP_PREFIX}; then
-    test_paths="${AP_PREFIX} ${test_paths}"
-fi
-
 for x in $test_paths ; do
-    amc_shlib="${x}/libapr_memcache${shrext_cmds}"
-    AC_MSG_CHECKING([for apr_memcache library in ${x}/lib])
+    amc_shlib="${x}/libaprutil-1${shrext_cmds}"
+    AC_MSG_CHECKING([for apr_memcache library in ${libdir}])
     if test -f ${amc_shlib}; then
         AC_MSG_RESULT([yes])
         save_CFLAGS=$CFLAGS
         save_LDFLAGS=$LDFLAGS
         CFLAGS="$CFLAGS"
-        LDFLAGS="-L$x/lib $LDFLAGS"
-        AC_CHECK_LIB(apr_memcache, apr_memcache_create,
+        LDFLAGS="-L${libdir} $LDFLAGS"
+        AC_CHECK_LIB(aprutil-1, apr_memcache_create,
             [
-            APR_MEMCACHE_LIBS="-R$x/lib -L$x/lib -lapr_memcache"
-            APR_MEMCACHE_CFLAGS="-I$x/include/apr_memcache-0"
+            APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
+            APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
             ])
         CFLAGS=$save_CFLAGS
         LDFLAGS=$save_LDFLAGS