Skip to content

Commit c9830f1

Browse files
hughmcmasternikic
authored andcommitted
ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS
Closes GH-4220.
1 parent a982125 commit c9830f1

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

ext/zip/config.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ if test "$PHP_ZIP" != "no"; then
88

99
PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
1010
PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)
11-
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
1211

1312
AC_DEFINE(HAVE_LIBZIP, 1, [ ])
1413

@@ -18,15 +17,15 @@ if test "$PHP_ZIP" != "no"; then
1817
], [
1918
AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
2019
], [
21-
-L$LIBZIP_LIBDIR
20+
$LIBZIP_LIBS
2221
])
2322

2423
PHP_CHECK_LIBRARY(zip, zip_libzip_version,
2524
[
2625
AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
2726
], [
2827
], [
29-
-L$LIBZIP_LIBDIR
28+
$LIBZIP_LIBS
3029
])
3130

3231
AC_DEFINE(HAVE_ZIP,1,[ ])

0 commit comments

Comments
 (0)