attached fixes should enable the zip extension to a) build, b) build as
a module
want to give me Karma (or patch it in)
Regards
Alan
? .libs
? Makefile
? Makefile.fragments
? Makefile.global
? Makefile.objects
? acinclude.m4
? aclocal.m4
? autom4te.cache
? build
? config.cache
? config.guess
? config.h
? config.h.in
? config.log
? config.nice
? config.status
? config.sub
? configure
? configure.in
? include
? install-sh
? libtool
? ltmain.sh
? missing
? mkinstalldirs
? modules
? scan_makefile_in.awk
? zipfix.diff
Index: config.m4
===================================================================
RCS file: /repository/php4/ext/zip/config.m4,v
retrieving revision 1.4
diff -u -r1.4 config.m4
--- config.m4 12 Mar 2002 16:39:16 -0000 1.4
+++ config.m4 17 Oct 2002 04:20:04 -0000
@@ -6,8 +6,7 @@
[ --with-zip[=DIR] Include ZIP support (requires zziplib >= 0.10.6).])
if test "$PHP_ZIP" != "no"; then
- PHP_NEW_EXTENSION(zip, zip.c, $ext_shared)
- for i in $PHP_ZIP /usr/local /usr ; do
+ for i in $PHP_ZIP /usr/local /usr ; do
if test -f $i/include/zzlib/zziplib.h; then
ZZIPLIB_DIR=$i
ZZIPLIB_INCDIR=$i/include/zzlib
@@ -23,15 +22,13 @@
ZZIPLIB_LIBDIR=$ZZIPLIB_DIR/lib
- PHP_TEMP_LDFLAGS(-L$ZZIPLIB_LIBDIR,[
- AC_CHECK_LIB(zzip, zzip_open, [AC_DEFINE(HAVE_ZZIPLIB,1,[ ])],
- [AC_MSG_ERROR(zziplib module requires zzlib >= 0.10.6.)])
- ])
+
+ PHP_ADD_INCLUDE($ZZIPLIB_INCDIR)
PHP_SUBST(ZIP_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(zzip, $ZZIPLIB_LIBDIR, ZIP_SHARED_LIBADD)
-
- PHP_ADD_INCLUDE($ZZIPLIB_INCDIR)
+ AC_CHECK_LIB(zzip, zzip_open, [AC_DEFINE(HAVE_ZZIPLIB,1,[ ])],
+[AC_MSG_ERROR(zziplib module requires zzlib >= 0.10.6.)],)
- PHP_FOPENCOOKIE
+ PHP_NEW_EXTENSION(zip, zip.c, $ext_shared)
+
fi
Index: php_zip.h
===================================================================
RCS file: /repository/php4/ext/zip/php_zip.h,v
retrieving revision 1.7
diff -u -r1.7 php_zip.h
--- php_zip.h 11 May 2002 02:12:44 -0000 1.7
+++ php_zip.h 17 Oct 2002 04:20:05 -0000
@@ -27,15 +27,23 @@
#define phpext_zip_ptr &zip_module_entry
#define PHP_ZZIPLIB_API
+
+
#ifdef PHP_WIN32
+
#undef PHP_ZZIPLIB_API
#ifdef ZIP_EXPORTS
#define PHP_ZZIPLIB_API __declspec(dllexport)
#else
#define PHP_ZZIPLIB_API __declspec(dllimport)
#endif
+
#endif
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
PHP_MINIT_FUNCTION(zip);
PHP_MINFO_FUNCTION(zip);
@@ -59,7 +67,7 @@
#define phpext_zziplib_ptr NULL
#endif
-#endif /* PHP_ZZIPLIB_H */
+#endif /* PHP_ZLIB_H */
/*
Index: zip.c
===================================================================
RCS file: /repository/php4/ext/zip/zip.c,v
retrieving revision 1.32
diff -u -r1.32 zip.c
--- zip.c 20 May 2002 18:33:08 -0000 1.32
+++ zip.c 17 Oct 2002 04:20:05 -0000
@@ -17,11 +17,13 @@
*/
/* $Id: zip.c,v 1.32 2002/05/20 18:33:08 mfischer Exp $ */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "php.h"
#include "php_ini.h"
#include "php_zip.h"
-
+
#if HAVE_ZZIPLIB
#include "ext/standard/info.h"
@@ -56,15 +58,15 @@
/* {{{ zip_module_entry
*/
zend_module_entry zip_module_entry = {
- STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
"zip",
zip_functions,
PHP_MINIT(zip),
NULL,
NULL,
- NULL,
+ NULL,
PHP_MINFO(zip),
- NO_VERSION_YET,
+ NO_VERSION_YET,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
--
PHP Development Mailing List <http://www.php.net/>
To unsubscribe, visit: http://www.php.net/unsub.php
