From 5f20be7315b4e8259b2e294554860648443b605d Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Thu, 10 May 2001 00:57:36 +0000
Subject: [PATCH] Moved the zlib configure before other extensions.

---
 configure.in       | 10 +++++----
 ext/zlib/config.m4 | 47 +++---------------------------------------
 ext/zlib/zlib.m4   | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 ext/zlib/zlib.m4

diff --git a/configure.in b/configure.in
index 7a6c0743f25..afe80ccd7f2 100644
--- a/configure.in
+++ b/configure.in
@@ -361,7 +361,6 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
 asctime_r \
 chroot \
-crypt \
 ctime_r \
 cuserid \
 flock \
@@ -469,8 +468,8 @@ else
 fi
 
 PHP_ARG_WITH(layout,[layout of installed files],
-[ --with-layout=TYPE      Sets how installed files will be laid out.  Type is
-                         one of "PHP" (default) or "GNU"], PHP)
+[  --with-layout=TYPE      Sets how installed files will be laid out.  Type is
+                          one of "PHP" (default) or "GNU"], PHP)
 
 PHP_ARG_WITH(config-file-path,[path to configuration file],
 [  --with-config-file-path=PATH  
@@ -626,7 +625,10 @@ AC_CHECK_LIB(crypt, crypt, [
 divert(5)
 
 PHP_CONFIGURE_PART(Configuring extensions)
-	
+
+# zlib checks have to be here
+sinclude(./ext/zlib/zlib.m4)
+
 # reading config stubs
 esyscmd(./scripts/config-stubs ext)
 
diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index f1509ff19fd..eb11400217e 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -1,46 +1,5 @@
+dnl
 dnl $Id$
+dnl
 
-
-
-PHP_ARG_WITH(zlib,whether to include zlib support,
-[  --with-zlib[=DIR]       Include zlib support (requires zlib >= 1.0.9).
-                          DIR is the zlib install directory,
-                          defaults to /usr.])
-
-AC_DEFUN(AC_TEMP_LDFLAGS,[
-  old_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$1 $LDFLAGS"
-  $2
-  LDFLAGS="$old_LDFLAGS"
-])
-
-if test "$PHP_ZLIB" != "no"; then
-  PHP_EXTENSION(zlib, $ext_shared)
-  for i in /usr/local /usr $PHP_ZLIB; do
-    if test -f $i/include/zlib/zlib.h; then
-      ZLIB_DIR=$i
-      ZLIB_INCDIR=$i/include/zlib
-    elif test -f $i/include/zlib.h; then
-      ZLIB_DIR=$i
-      ZLIB_INCDIR=$i/include
-    fi
-  done
-
-  if test -z "$ZLIB_DIR"; then
-    AC_MSG_ERROR(Cannot find libz)
-  fi
-
-  ZLIB_LIBDIR=$ZLIB_DIR/lib
-
-  AC_TEMP_LDFLAGS(-L$ZLIB_LIBDIR,[
-  AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,1,[ ])],
-    [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)])
-  ])
-
-  PHP_SUBST(ZLIB_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD)
-  
-  PHP_ADD_INCLUDE($ZLIB_INCDIR)
-
-  PHP_FOPENCOOKIE
-fi
+dnl This is dummy file..do not remove!
\ No newline at end of file
diff --git a/ext/zlib/zlib.m4 b/ext/zlib/zlib.m4
new file mode 100644
index 00000000000..d7f5120837d
--- /dev/null
+++ b/ext/zlib/zlib.m4
@@ -0,0 +1,51 @@
+dnl
+dnl $Id$
+dnl
+
+PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
+[  --with-zlib-dir=<DIR>]  Define the location of zlib install directory])
+
+PHP_ARG_WITH(zlib,whether to include ZLIB support,
+[  --with-zlib[=DIR]       Include zlib support (requires zlib >= 1.0.9).
+                          DIR is the zlib install directory.])
+
+if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
+  PHP_EXTENSION(zlib, $ext_shared)
+  
+  for i in /usr/local /usr $PHP_ZLIB_DIR $PHP_ZLIB; do
+    if test -f $i/include/zlib/zlib.h; then
+      ZLIB_DIR=$i
+      ZLIB_INCDIR=$i/include/zlib
+    elif test -f $i/include/zlib.h; then
+      ZLIB_DIR=$i
+      ZLIB_INCDIR=$i/include
+    fi
+  done
+
+  if test -z "$ZLIB_DIR"; then
+    AC_MSG_ERROR(Cannot find libz)
+  fi
+
+  ZLIB_LIBDIR=$ZLIB_DIR/lib
+
+  AC_CHECK_LIB(z, gzgets, [
+    AC_DEFINE(HAVE_ZLIB,1,[ ]) 
+  ],[
+    AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9)
+  ])
+
+  PHP_SUBST(ZLIB_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD)
+  PHP_ADD_INCLUDE($ZLIB_INCDIR)
+
+  PHP_FOPENCOOKIE
+
+  if test -z "$PHP_ZLIB_DIR" -o "$PHP_ZLIB_DIR" = "no"; then
+    if test "$PHP_ZLIB" != "yes"; then
+      PHP_ZLIB_DIR=$PHP_ZLIB
+    else 
+      PHP_ZLIB_DIR="/usr/local"
+    fi
+  fi
+
+fi