Fix win32-test-imagex-capture_and_apply.bat and add to CI

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1d53735331136c9c612ea36b3cd7145e53839a1f..105b223c5cfc98786cbe19fb8e0cb7496f9ac8a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 ###############################################################################
 
-AC_INIT([wimlib], m4_esyscmd_s([tools/get-version-number]),
+AC_INIT([wimlib], m4_esyscmd_s([tools/get-version-number.sh]),
        [https://wimlib.net/forums/])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
@@ -10,6 +10,7 @@ AM_SILENT_RULES([yes])
 AC_C_BIGENDIAN
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
+PKG_PROG_PKG_CONFIG
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile] [doc/Doxyfile] [wimlib.pc])
@@ -103,10 +104,6 @@ if test "$WINDOWS_NATIVE_BUILD" != "yes"; then
        AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
 fi
 
-# ------------------------------ libxml2 --------------------------------------
-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
-PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0"
-
 ###############################################################################
 #                        Configuration options                               #
 ###############################################################################
@@ -142,7 +139,7 @@ AM_CONDITIONAL([WITH_NTFS_3G], [test "$WITH_NTFS_3G" = "yes"])
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
            [AS_HELP_STRING([--without-fuse],
-                           [build without libfuse.  This will disable the
+                           [build without libfuse3.  This will disable the
                             ability to mount WIM images.])],
            [WITH_FUSE=$withval],
            [WITH_FUSE=$WITH_FUSE_DEFAULT])
@@ -150,10 +147,10 @@ AC_MSG_RESULT([$WITH_FUSE])
 
 if test "$WITH_FUSE" = "yes"; then
 
-       PKG_CHECK_MODULES([LIBFUSE], [fuse], [],
-               [AC_MSG_ERROR([Cannot find libfuse!
-               Without libfuse, wimlib cannot include support for mounting WIM
-               images.  Either install libfuse, or configure --without-fuse to
+       PKG_CHECK_MODULES([LIBFUSE], [fuse3], [],
+               [AC_MSG_ERROR([Cannot find libfuse3!
+               Without libfuse3, wimlib cannot include support for mounting WIM
+               images.  Either install libfuse3, or configure --without-fuse to
                disable this feature.])])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse"
        AC_DEFINE([WITH_FUSE], [1], [Define to 1 if using FUSE support])