- use system libzip in zip extension

[packages/php.git] / system-libzip.patch

https://bugzilla.redhat.com/show_bug.cgi?id=551513
https://bugs.php.net/bug.php?id=39388
http://spot.fedorapeople.org/php-5.3.6-libzip.patch

diff -up php-5.3.6/ext/zip/config.m4.libzip php-5.3.6/ext/zip/config.m4
--- php-5.3.6/ext/zip/config.m4.libzip	2008-08-08 05:47:15.000000000 -0400
+++ php-5.3.6/ext/zip/config.m4	2011-07-20 15:21:05.759490602 -0400
@@ -15,6 +15,9 @@ PHP_ARG_WITH(pcre-dir, pcre install pref
 
 if test "$PHP_ZIP" != "no"; then
 
+  PHP_ARG_WITH(libzip, libzip,
+  [  --with-libzip[=DIR]     Use libzip], no, no)
+
   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"
@@ -71,7 +74,43 @@ yes
   ])
   CPPFLAGS=$old_CPPFLAGS
 
-  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
+  if test "$PHP_LIBZIP" != "no"; then
+    if test -r $PHP_LIBZIP/include/zip.h; then
+      LIBZIP_DIR=$PHP_LIBZIP
+    else
+      AC_MSG_CHECKING(for libzip in default path)
+      for i in /usr/local /usr; do
+        if test -r $i/include/zip.h; then
+          LIBZIP_DIR=$i
+          AC_MSG_RESULT(found in $i)
+          break
+        fi
+      done
+    fi
+
+    if test -z "$LIBZIP_DIR"; then
+      AC_MSG_RESULT(not found)
+      AC_MSG_ERROR(Please reinstall the libzip distribution)
+    fi
+
+    dnl Could not think of a simple way to check libzip for overwrite support
+    PHP_CHECK_LIBRARY(zip, zip_open,
+    [
+      PHP_ADD_INCLUDE($LIBZIP_DIR/include)
+      PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_DIR/$PHP_LIBDIR, LIBZIP_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBZIP,1,[ ])
+    ], [
+      AC_MSG_ERROR(could not find usable libzip)
+    ], [
+      -L$LIBZIP_DIR/$PHP_LIBDIR
+    ])
+
+    AC_DEFINE(HAVE_ZIP,1,[ ])
+    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared)
+    PHP_SUBST(LIBZIP_SHARED_LIBADD)
+    PHP_SUBST(ZIP_SHARED_LIBADD)
+  else
+    PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
                          lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c  \
                          lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
                          lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
@@ -91,10 +130,11 @@ yes
                          lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
                          lib/zip_error_clear.c lib/zip_file_error_clear.c"
 
-  AC_DEFINE(HAVE_ZIP,1,[ ])
-  PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
-  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
-  PHP_SUBST(ZIP_SHARED_LIBADD)
+    AC_DEFINE(HAVE_ZIP,1,[ ])
+    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
+    PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
+    PHP_SUBST(ZIP_SHARED_LIBADD)
+  fi
 
   dnl so we always include the known-good working hack.
   PHP_ADD_MAKEFILE_FRAGMENT