From 57bcaa2844150267668887216b3f4e6cca4c0467 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 27 Sep 2020 11:01:24 +0200 Subject: Import newer upstream version of ax_check_zlib.m4 --- m4_ax_check_zlib.m4 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/m4_ax_check_zlib.m4 b/m4_ax_check_zlib.m4 index ae5705f..1a16843 100644 --- a/m4_ax_check_zlib.m4 +++ b/m4_ax_check_zlib.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_zlib.html +# https://www.gnu.org/software/autoconf-archive/ax_check_zlib.html # =========================================================================== # # SYNOPSIS @@ -47,7 +47,7 @@ # Public License for more details. # # You should have received a copy of the GNU General Public License along -# with this program. If not, see . +# with this program. If not, see . # # As a special exception, the respective Autoconf Macro's copyright owner # gives unlimited permission to copy, distribute and modify the configure @@ -62,7 +62,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 14 +#serial 16 AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB]) AC_DEFUN([AX_CHECK_ZLIB], @@ -108,11 +108,10 @@ then LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" fi - AC_LANG_SAVE - AC_LANG_C + AC_LANG_PUSH([C]) AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no]) AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no]) - AC_LANG_RESTORE + AC_LANG_POP([C]) if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes" then # -- cgit v1.2.3