1 files changed, 21 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 80ce414..703c4a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 #  This file is part of GNU libextractor
-#  Copyright (C) 2003-2020 Christian Grothoff
+#  Copyright (C) 2003-2023 Christian Grothoff
 #
 #  GNU libextractor is free software; you can redistribute it and/or modify it under the
 #  terms of the GNU General Public License as published by the Free Software
@@ -15,15 +15,15 @@
 #  GNU libextractor; see the file COPYING.  If not, If not, see <http://www.gnu.org/license>
 #
 #
-AC_PREREQ(2.61)
-AC_INIT([libextractor], [1.11], [bug-libextractor@gnu.org])
+AC_PREREQ([2.71])
+AC_INIT([libextractor],[1.13],[bug-libextractor@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 
 LIB_VERSION_CURRENT=4
 LIB_VERSION_REVISION=8
@@ -46,7 +46,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_CANONICAL_HOST
-AC_PROG_LIBTOOL
+LT_INIT
 # save LIBS, libtool does a AC_SEARCH_LIBS(dlopen, dl), but plugins
 # need not have -ldl added
 LT_INIT([disable-static dlopen win32-dll])
@@ -176,6 +176,8 @@ AS_CASE(["$target_os"],
 
 AM_ICONV
 
+PKG_PROG_PKG_CONFIG()
+
 # We define the paths here, because MinGW/GCC expands paths
 # passed through the command line ("-DLOCALEDIR=..."). This would
 # lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
@@ -189,9 +191,7 @@ AC_DEFINE_DIR([ISOLOCALEDIR], [ISOPFX/share/locale], [iso-639 catalog])
 # relative plugin directory
 rplugindir="libextractor"
 AC_ARG_WITH(plugindirname,
-        AC_HELP_STRING(
-                [--with-plugindirname],
-                [install directory for plugins (always relative to libdir)]),
+        AS_HELP_STRING([--with-plugindirname],[install directory for plugins (always relative to libdir)]),
         [rplugindir=$withval])
 AC_SUBST(RPLUGINDIR, $rplugindir)
 
@@ -426,25 +426,19 @@ AC_CHECK_LIB(magic, magic_open,
    AM_CONDITIONAL(HAVE_MAGIC, false))],
   AM_CONDITIONAL(HAVE_MAGIC, false))
 
-AC_MSG_CHECKING(for tidyNodeGetValue -ltidy)
-AC_LANG_PUSH(C++)
-SAVED_LIBS=$LIBS
-LIBS="$LIBS -ltidy"
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM([[#include <tidy/tidy.h>]],
-    [[ Bool b = tidyNodeGetValue (NULL, NULL, NULL); ]])],
-  [AC_MSG_RESULT(yes)
-   AM_CONDITIONAL(HAVE_TIDY, true)
-   AC_DEFINE(HAVE_TIDY,1,[Have tidyNodeGetValue in libtidy])],
-  [AC_MSG_RESULT(no)
-   AM_CONDITIONAL(HAVE_TIDY, false)])
-LIBS=$SAVED_LIBS
-AC_LANG_POP(C++)
-
-# restore LIBS
-LIBS=$LIBSOLD
+# tidyNodeGetValue was already available in 5.0.0, released in 2015.
+maybe_tidy=1
+PKG_CHECK_MODULES([TIDY], [tidy >= 5.0.0],
+ [AC_DEFINE(HAVE_TIDY, 1, [Have tidy])
+  AM_CONDITIONAL(HAVE_TIDY, true)],
+ [maybe_tidy=0])
+CFLAGS="$CFLAGS $TIDY_CFLAGS"
+LIBS="$LIBS $TIDY_LIBS"
 
+AC_CHECK_HEADERS([tidy.h],,
+  AC_CHECK_HEADERS([tidy/tidy.h],,[maybe_tidy=0]))
 
+AM_CONDITIONAL(HAVE_TIDY, test "x$maybe_tidy" = "x1")
 
 # should 'make check' run tests?
 AC_MSG_CHECKING(whether to run tests)
@@ -455,10 +449,6 @@ AC_ARG_ENABLE([testruns],
 AC_MSG_RESULT($enable_test_run)
 AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"])
 
-
-
-# Checks for header files.
-AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([iconv.h fcntl.h netinet/in.h stdlib.h string.h unistd.h libintl.h limits.h stddef.h zlib.h])
@@ -553,7 +543,7 @@ AC_SUBST([SOCKET_LIBS],[$SOCKET_LIBS])
 LE_LIB_LIBS=$LIBS
 LIBS=$LIBSOLD
 
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.21])
 AM_GNU_GETTEXT([external])
 
 # check for GNU LD
@@ -566,7 +556,7 @@ AM_PATH_GLIB_2_0(2.0.0,
                  without_glib=true)
 AC_MSG_CHECKING([whether glib is disabled])
 AC_ARG_ENABLE(glib,
-  [AC_HELP_STRING([--disable-glib],[disable glib support])],
+  [AS_HELP_STRING([--disable-glib],[disable glib support])],
   [case "$enableval" in
    no)  AC_MSG_RESULT(disabled)
         without_glib=true