CVS update: php31/ext/zlib
| From: | cschneid | Date: | Thu, 05 Nov 1998 15:21:45 +0000 |
| Subject: | CVS update: php31/ext/zlib | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2223@lists.php.net to get a copy of this message | ||
Date: Thursday November 5, 1998 @ 10:21
Author: cschneid
Update of /repository/php31/ext/zlib
In directory asf:/u2/tmp/cvs-serv23352/ext/zlib
Modified Files:
configure.in.stub zlib.c
Log Message:
Fixed various configuration and header files to build php31 with mysql and
zlib support on unix/cc.
Index: php31/ext/zlib/configure.in.stub
diff -c php31/ext/zlib/configure.in.stub:1.4 php31/ext/zlib/configure.in.stub:1.5
*** php31/ext/zlib/configure.in.stub:1.4 Tue Sep 15 09:02:11 1998
--- php31/ext/zlib/configure.in.stub Thu Nov 5 10:21:43 1998
***************
*** 1,4 ****
! dnl $Id: configure.in.stub,v 1.4 1998/09/15 13:02:11 ssb Exp $ -*- sh -*-
AC_MSG_CHECKING(whether to include zlib support)
AC_ARG_WITH(zlib,
--- 1,4 ----
! dnl $Id: configure.in.stub,v 1.5 1998/11/05 15:21:43 cschneid Exp $ -*- sh -*-
AC_MSG_CHECKING(whether to include zlib support)
AC_ARG_WITH(zlib,
***************
*** 25,30 ****
--- 25,32 ----
ZLIB_INCLUDE="-I$withval/include"
if test -n "$ZLIB_INCLUDE" ; then
AC_MSG_RESULT(yes)
+ old_LIBS=$LIBS
+ LIBS="$LIBS -L$withval/lib"
AC_CHECK_LIB(z, gzgets, [
AC_DEFINE(HAVE_ZLIB)
ZLIB_LIBS="-lz"
***************
*** 32,37 ****
--- 34,40 ----
],[
AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)
])
+ old_LIBS=$LIBS
else
AC_MSG_RESULT(no)
fi ;;
Index: php31/ext/zlib/zlib.c
diff -c php31/ext/zlib/zlib.c:2.5 php31/ext/zlib/zlib.c:2.6
*** php31/ext/zlib/zlib.c:2.5 Wed Sep 16 15:15:22 1998
--- php31/ext/zlib/zlib.c Thu Nov 5 10:21:44 1998
***************
*** 22,28 ****
| Stefan Röhrich <sr@linux.de> |
+----------------------------------------------------------------------+
*/
! /* $Id: zlib.c,v 2.5 1998/09/16 19:15:22 shane Exp $ */
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
#endif
--- 22,28 ----
| Stefan Röhrich <sr@linux.de> |
+----------------------------------------------------------------------+
*/
! /* $Id: zlib.c,v 2.6 1998/11/05 15:21:44 cschneid Exp $ */
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
#endif
***************
*** 78,89 ****
#include <zlib.h>
! #if COMPILE_DL
! #if PHP_31
! #include "ext/phpdl.h"
#else
! #include "dl/phpdl.h"
#endif
#ifndef PUTS
#define PUTS(a) php3_printf("%s",a)
#endif
--- 78,90 ----
#include <zlib.h>
! #if defined(COMPILE_DL) && !defined(PHP_31)
! # include "dl/phpdl.h"
#else
! # include "../phpdl.h"
#endif
+
+ #if COMPILE_DL
#ifndef PUTS
#define PUTS(a) php3_printf("%s",a)
#endif
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net