Merging upstream version 1.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 138 insertions, 12 deletions

diff --git a/configure b/configure
index ccf86c6..460a3e3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for dnsjit 1.3.0.
+# Generated by GNU Autoconf 2.71 for dnsjit 1.4.0.
 #
 # Report bugs to <admin@dns-oarc.net>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dnsjit'
 PACKAGE_TARNAME='dnsjit'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='dnsjit 1.3.0'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='dnsjit 1.4.0'
 PACKAGE_BUGREPORT='admin@dns-oarc.net'
 PACKAGE_URL='https://github.com/DNS-OARC/dnsjit/issues'
 
@@ -663,6 +663,8 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+liblzma_LIBS
+liblzma_CFLAGS
 libzstd_LIBS
 libzstd_CFLAGS
 liblz4_LIBS
@@ -847,7 +849,9 @@ gnutls_LIBS
 liblz4_CFLAGS
 liblz4_LIBS
 libzstd_CFLAGS
-libzstd_LIBS'
+libzstd_LIBS
+liblzma_CFLAGS
+liblzma_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1396,7 +1400,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dnsjit 1.3.0 to adapt to many kinds of systems.
+\`configure' configures dnsjit 1.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1467,7 +1471,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dnsjit 1.3.0:";;
+     short | recursive ) echo "Configuration of dnsjit 1.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1541,6 +1545,10 @@ Some influential environment variables:
               C compiler flags for libzstd, overriding pkg-config
   libzstd_LIBS
               linker flags for libzstd, overriding pkg-config
+  liblzma_CFLAGS
+              C compiler flags for liblzma, overriding pkg-config
+  liblzma_LIBS
+              linker flags for liblzma, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1610,7 +1618,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dnsjit configure 1.3.0
+dnsjit configure 1.4.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2098,7 +2106,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dnsjit $as_me 1.3.0, which was
+It was created by dnsjit $as_me 1.4.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -2858,7 +2866,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 printf "%s\n" "#define PACKAGE_MAJOR_VERSION 1" >>confdefs.h
 
 
-printf "%s\n" "#define PACKAGE_MINOR_VERSION 3" >>confdefs.h
+printf "%s\n" "#define PACKAGE_MINOR_VERSION 4" >>confdefs.h
 
 
 printf "%s\n" "#define PACKAGE_PATCH_VERSION 0" >>confdefs.h
@@ -3377,7 +3385,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dnsjit'
- VERSION='1.3.0'
+ VERSION='1.4.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16158,6 +16166,124 @@ printf "%s\n" "yes" >&6; }
 printf "%s\n" "#define HAVE_ZSTD /**/" >>confdefs.h
 
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
+printf %s "checking for gzopen in -lz... " >&6; }
+if test ${ac_cv_lib_z_gzopen+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char gzopen ();
+int
+main (void)
+{
+return gzopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_z_gzopen=yes
+else $as_nop
+  ac_cv_lib_z_gzopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzopen" >&5
+printf "%s\n" "$ac_cv_lib_z_gzopen" >&6; }
+if test "x$ac_cv_lib_z_gzopen" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBZ 1" >>confdefs.h
+
+  LIBS="-lz $LIBS"
+
+else $as_nop
+  as_fn_error $? "zlib not found" "$LINENO" 5
+fi
+
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for liblzma >= 5.2.0" >&5
+printf %s "checking for liblzma >= 5.2.0... " >&6; }
+
+if test -n "$liblzma_CFLAGS"; then
+    pkg_cv_liblzma_CFLAGS="$liblzma_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblzma >= 5.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "liblzma >= 5.2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_liblzma_CFLAGS=`$PKG_CONFIG --cflags "liblzma >= 5.2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$liblzma_LIBS"; then
+    pkg_cv_liblzma_LIBS="$liblzma_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblzma >= 5.2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "liblzma >= 5.2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_liblzma_LIBS=`$PKG_CONFIG --libs "liblzma >= 5.2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        liblzma_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblzma >= 5.2.0" 2>&1`
+        else
+	        liblzma_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblzma >= 5.2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$liblzma_PKG_ERRORS" >&5
+
+	:
+elif test $pkg_failed = untried; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+	:
+else
+	liblzma_CFLAGS=$pkg_cv_liblzma_CFLAGS
+	liblzma_LIBS=$pkg_cv_liblzma_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_LZMA /**/" >>confdefs.h
+
+fi
 
 # Checks for sizes
 # The cast to long int works around a bug in the HP C Compiler
@@ -17045,7 +17171,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dnsjit $as_me 1.3.0, which was
+This file was extended by dnsjit $as_me 1.4.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17114,7 +17240,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-dnsjit config.status 1.3.0
+dnsjit config.status 1.4.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"