X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=329a5d9df86068a897cd719af52909b31d07410e;hp=1d53735331136c9c612ea36b3cd7145e53839a1f;hb=refs%2Fheads%2Fmaster;hpb=3a2b0ab60709d6a7c38f42804242ad49279e5354 diff --git a/configure.ac b/configure.ac index 1d537353..21fec5bf 100644 --- 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 # ############################################################################### @@ -131,7 +128,9 @@ if test "$WITH_NTFS_3G" = "yes"; then NTFS volume while preserving NTFS-specific data such as security descriptors and named data streams. Either install libntfs-3g, or configure --without-ntfs-3g to disable this - feature.])]) + feature. If your operating system packages development files + separately, the package you need to install may be called + ntfs-3g-dev, ntfs-3g-devel, or similar.])]) PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g" AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 if using NTFS-3G support]) fi @@ -142,7 +141,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,11 +149,13 @@ 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 - disable this feature.])]) + 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. If your operating system packages + development files separately, the package you need to install + may be called libfuse3-dev, fuse-devel, or similar.])]) PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES fuse" AC_DEFINE([WITH_FUSE], [1], [Define to 1 if using FUSE support])