ext/zip: Replace calls to PHP_ADD_LIBRARY_WITH_PATH

Author: hughmcmaster

ext/zip/config.m4

@@ -5,26 +5,21 @@ PHP_ARG_WITH([zip],
 
 if test "$PHP_ZIP" != "no"; then
   PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.1])
-  LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
+
+  PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)
 
   AC_DEFINE(HAVE_LIBZIP, 1, [ ])
 
   PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
   [
-    PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
     AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
   ], [
     AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
-  ], [
-    -L$LIBZIP_LIBDIR
   ])
 
   PHP_CHECK_LIBRARY(zip, zip_libzip_version,
   [
     AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
-  ], [
-  ], [
-    -L$LIBZIP_LIBDIR
   ])
 
   AC_DEFINE(HAVE_ZIP,1,[ ])