summaryrefslogtreecommitdiff
blob: 5ce9eff569b6bd9ff1f34f60d149d0073fb8c58b (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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
--- config.m4	2005-11-27 12:05:10.000000000 +0100
+++ config.m4	2006-01-06 18:30:46.000000000 +0100
@@ -1,49 +1,51 @@
-dnl
-dnl $Id: config.m4,v 1.4 2005/11/26 17:53:18 tony2001 Exp $
-dnl
-
-PHP_ARG_ENABLE(memcache, whether to enable memcache support,
-[  --enable-memcache       Enable memcache support])
-
-if test -z "$PHP_ZLIB_DIR"; then
-PHP_ARG_WITH(zlib-dir, for the location of libz,
-[  --with-zlib-dir[=DIR]   memcache: Set the path to libz install prefix.], no, no)
-fi
-
-if test "$PHP_MEMCACHE" != "no"; then
-
-  if test "$PHP_ZLIB_DIR" != "no"; then
-    if test -f $PHP_ZLIB_DIR/include/zlib/zlib.h; then
-      PHP_ZLIB_DIR=$PHP_ZLIB_DIR
-      PHP_ZLIB_INCDIR=$PHP_ZLIB_DIR/include/zlib
-    elif test -f $PHP_ZLIB_DIR/include/zlib.h; then
-      PHP_ZLIB_DIR=$PHP_ZLIB_DIR
-      PHP_ZLIB_INCDIR=$PHP_ZLIB_DIR/include
-    fi
-  else
-    for i in /usr/local /usr; do
-      if test -f $i/include/zlib/zlib.h; then
-        PHP_ZLIB_DIR=$i
-        PHP_ZLIB_INCDIR=$i/include/zlib
-      elif test -f $i/include/zlib.h; then
-        PHP_ZLIB_DIR=$i
-        PHP_ZLIB_INCDIR=$i/include
-      fi
-    done
-  fi
-
-  dnl # zlib
-  AC_MSG_CHECKING([for the location of zlib])
-  if test "$PHP_ZLIB_DIR" = "no"; then
-    AC_MSG_ERROR([memcache support requires ZLIB. Use --with-zlib-dir=<DIR>])
-  else
-    AC_MSG_RESULT([$PHP_ZLIB_DIR])
-    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, MEMCACHE_SHARED_LIBADD)
-    PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
-  fi
-
-  AC_DEFINE(HAVE_MEMCACHE,1,[Whether you want memcache support])
-  PHP_NEW_EXTENSION(memcache, memcache.c, $ext_shared)
-fi
-
-
+dnl
+dnl $Id: config.m4,v 1.5 2005/12/29 15:27:57 tony2001 Exp $
+dnl
+
+PHP_ARG_ENABLE(memcache, whether to enable memcache support,
+[  --enable-memcache       Enable memcache support])
+
+if test -z "$PHP_ZLIB_DIR"; then
+PHP_ARG_WITH(zlib-dir, for the location of libz,
+[  --with-zlib-dir[=DIR]   memcache: Set the path to libz install prefix.], no, no)
+fi
+
+if test "$PHP_MEMCACHE" != "no"; then
+
+  if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+	else
+      AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
+    fi
+  else
+    for i in /usr/local /usr; do
+      if test -f "$i/include/zlib/zlib.h"; then
+        PHP_ZLIB_DIR="$i"
+        PHP_ZLIB_INCDIR="$i/include/zlib"
+      elif test -f "$i/include/zlib.h"; then
+        PHP_ZLIB_DIR="$i"
+        PHP_ZLIB_INCDIR="$i/include"
+      fi
+    done
+  fi
+
+  dnl # zlib
+  AC_MSG_CHECKING([for the location of zlib])
+  if test "$PHP_ZLIB_DIR" = "no"; then
+    AC_MSG_ERROR([memcache support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
+  else
+    AC_MSG_RESULT([$PHP_ZLIB_DIR])
+    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, MEMCACHE_SHARED_LIBADD)
+    PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
+  fi
+
+  AC_DEFINE(HAVE_MEMCACHE,1,[Whether you want memcache support])
+  PHP_NEW_EXTENSION(memcache, memcache.c, $ext_shared)
+fi
+
+