Xisco Fauli
57d226bd21
Downloaded from https://curl.se/download/curl-8.21.0.tar.xz Change-Id: Idbf678a0e00e2c7a802dbaad8439ec24b253ef57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207281 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
90 lines
1.8 KiB
Plaintext
90 lines
1.8 KiB
Plaintext
--- configure
|
|
+++ configure
|
|
@@ -23035,7 +23035,6 @@
|
|
clean_CPPFLAGS=$CPPFLAGS
|
|
clean_LDFLAGS=$LDFLAGS
|
|
clean_LIBS=$LIBS
|
|
-ZLIB_LIBS=""
|
|
|
|
# Check whether --with-zlib was given.
|
|
if test ${with_zlib+y}
|
|
@@ -23922,12 +23922,28 @@
|
|
|
|
|
|
if test "x$OPT_ZLIB" = "xno"; then
|
|
+ ZLIB_LIBS=""
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
|
|
printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
|
|
else
|
|
if test "x$OPT_ZLIB" = "xyes"; then
|
|
OPT_ZLIB=""
|
|
fi
|
|
+
|
|
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
|
|
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
|
+ LIBS="$ZLIB_LIBS $LIBS"
|
|
+ HAVE_LIBZ="1"
|
|
+
|
|
+
|
|
+$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
|
|
+
|
|
+
|
|
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
|
|
+
|
|
+ AMFIXLIB="1"
|
|
+ else
|
|
+ ZLIB_LIBS=""
|
|
|
|
if test -z "$OPT_ZLIB"; then
|
|
|
|
@@ -24777,6 +24777,7 @@
|
|
fi
|
|
curl_zlib_msg="enabled"
|
|
fi
|
|
+ fi
|
|
fi
|
|
|
|
if test "$AMFIXLIB" = "1"; then
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -1392,19 +1392,30 @@
|
|
clean_CPPFLAGS=$CPPFLAGS
|
|
clean_LDFLAGS=$LDFLAGS
|
|
clean_LIBS=$LIBS
|
|
-ZLIB_LIBS=""
|
|
AC_ARG_WITH(zlib,
|
|
AS_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
|
|
AS_HELP_STRING([--without-zlib],[disable use of zlib]),
|
|
[OPT_ZLIB="$withval"])
|
|
|
|
if test "x$OPT_ZLIB" = "xno"; then
|
|
+ ZLIB_LIBS=""
|
|
AC_MSG_WARN([zlib disabled])
|
|
else
|
|
if test "x$OPT_ZLIB" = "xyes"; then
|
|
OPT_ZLIB=""
|
|
fi
|
|
|
|
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
|
|
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
|
+ LIBS="$ZLIB_LIBS $LIBS"
|
|
+ HAVE_LIBZ="1"
|
|
+ AC_SUBST(HAVE_LIBZ)
|
|
+ AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
|
|
+ AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
|
|
+ AMFIXLIB="1"
|
|
+ else
|
|
+ ZLIB_LIBS=""
|
|
+
|
|
if test -z "$OPT_ZLIB"; then
|
|
CURL_CHECK_PKGCONFIG(zlib)
|
|
|
|
@@ -1571,6 +1571,7 @@
|
|
fi
|
|
curl_zlib_msg="enabled"
|
|
fi
|
|
+ fi
|
|
fi
|
|
|
|
dnl set variable for use in automakefile(s)
|