configure.ac: explicitly call PKG_PROG_PKG_CONFIG

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8c77b2eb55c0a454bc628bcb093f9ebcbaa41cfd..f77b3e7a7eb215081d2532563eb9cf63aee44ebc 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])
@@ -36,7 +37,7 @@ mingw*)
        # Native Windows
        WINDOWS_NATIVE_BUILD="yes"
        # -D__MINGW_USE_VC2005_COMPAT: make time_t 64-bit on 32-bit Windows.
-       PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS -D__MINGW_USE_VC2005_COMPAT"
+       PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS -D__MINGW_USE_VC2005_COMPAT -D_WIN32_WINNT=0x0600"
        PLATFORM_CFLAGS="-municode -mno-ms-bitfields"
        PLATFORM_LDFLAGS="-no-undefined"
        WITH_NTFS_3G_DEFAULT="no"
@@ -94,23 +95,14 @@ AC_CHECK_MEMBER([struct stat.st_mtim],
                [],
                [#include <sys/stat.h>])
 
-# Check for possible support for the Linux getrandom() system call
-AC_CHECK_DECL([__NR_getrandom],
-             [AC_DEFINE([HAVE_NR_GETRANDOM], [1], [Define to 1 if the system
-              headers define a system call number for getrandom()])],
-             [],
-             [#include <sys/syscall.h>])
-
 ###############################################################################
 #                           Required libraries                               #
 ###############################################################################
 
 # ------------------------------ pthreads -------------------------------------
-AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
-
-# ------------------------------ libxml2 --------------------------------------
-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
-PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0"
+if test "$WINDOWS_NATIVE_BUILD" != "yes"; then
+       AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
+fi
 
 ###############################################################################
 #                        Configuration options                               #