Use dynamically-sized path buffer when scanning files

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index bd0f73599e36f20c60e87b4d7e44d3b388c168e2..80603382823e5aebf0ecef3ed0d996d4792cb36e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.9.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.12.0-BETA1], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -34,7 +34,8 @@ case "$host_os" in
 mingw*)
        # Native Windows
        WINDOWS_NATIVE_BUILD="yes"
-       PLATFORM_CPPFLAGS="-D_POSIX -D_POSIX_THREAD_SAFE_FUNCTIONS -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
+       # -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_CFLAGS="-municode -mno-ms-bitfields"
        PLATFORM_LDFLAGS="-no-undefined"
        WITH_NTFS_3G_DEFAULT="no"
@@ -59,12 +60,12 @@ AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "$WINDOWS_NATIVE_BUILD" = "yes"])
 
 # Useful functions which we can do without.
 AC_CHECK_FUNCS([futimens utimensat flock mempcpy       \
-               openat fstatat readlinkat fdopendir])
+               openat fstatat readlinkat fdopendir posix_fallocate \
+               llistxattr lgetxattr fsetxattr lsetxattr])
 
 # Header checks, most of which are only here to satisfy conditional includes
 # made by the libntfs-3g headers.
 AC_CHECK_HEADERS([alloca.h             \
-                 attr/xattr.h          \
                  byteswap.h            \
                  endian.h              \
                  errno.h               \
@@ -76,9 +77,10 @@ AC_CHECK_HEADERS([alloca.h           \
                  sys/byteorder.h       \
                  sys/endian.h          \
                  sys/file.h            \
-                 sys/param.h           \
+                 sys/syscall.h         \
                  sys/sysctl.h          \
                  sys/times.h           \
+                 sys/xattr.h           \
                  time.h                \
                  utime.h])
 
@@ -91,6 +93,13 @@ 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                               #
 ###############################################################################
@@ -102,16 +111,6 @@ AX_PTHREAD([], [AC_MSG_ERROR(["cannot find pthreads library"])])
 PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
 PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libxml-2.0"
 
-# ------------------------------ libiconv -------------------------------------
-AM_ICONV
-if test "$am_cv_func_iconv" != "yes"; then
-       AC_MSG_ERROR([Cannot find the iconv() function.  iconv() is used to
-                     convert between encodings of WIM filenames and XML data.
-                     wimlib cannot be compiled without it.  iconv() is
-                     available in the latest version of glibc and sometimes in
-                     other libraries.])
-fi
-
 ###############################################################################
 #                        Configuration options                               #
 ###############################################################################
@@ -138,7 +137,7 @@ if test "$WITH_NTFS_3G" = "yes"; then
                 libntfs-3g, or configure --without-ntfs-3g to disable this
                 feature.])])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libntfs-3g"
-       AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 if using NTFS-3g support])
+       AC_DEFINE([WITH_NTFS_3G], [1], [Define to 1 if using NTFS-3G support])
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "$WITH_NTFS_3G" = "yes"])
 
@@ -170,12 +169,6 @@ if test "$WITH_FUSE" = "yes"; then
        versions of glibc include this library.  Either install this library, or
        configure --without-fuse to disable support for mounting WIM images.])])
 
-       AC_CHECK_LIB([attr], [getxattr], [],
-                    [AC_MSG_ERROR([Cannot find libattr!
-       wimlib needs this for the extended attribute functions, which are used
-       in the code for mounting WIM images.  Either install this library, or
-       configure --without-fuse to disable support for mounting WIM images.])])
-
        PKGCONFIG_PRIVATE_LIBS="$PKGCONFIG_PRIVATE_LIBS -lrt"
        AC_SUBST([LIBRT_LIBS], [-lrt])
 fi
@@ -268,6 +261,19 @@ AC_ARG_WITH(pkgconfigdir,
             [pkgconfigdir='${libdir}/pkgconfig'])
 AC_SUBST(pkgconfigdir)
 
+AC_MSG_CHECKING([whether to enable supporting code for tests])
+AC_ARG_ENABLE([test-support],
+             [AS_HELP_STRING([--enable-test-support],
+                             [Enable supporting code for tests (developers only)])],
+             [ENABLE_TEST_SUPPORT=$enableval],
+             [ENABLE_TEST_SUPPORT=no])
+AC_MSG_RESULT([$ENABLE_TEST_SUPPORT])
+if test "$ENABLE_TEST_SUPPORT" = "yes" ; then
+       AC_DEFINE([ENABLE_TEST_SUPPORT], [1],
+                 [Define to 1 to enable supporting code for tests])
+fi
+AM_CONDITIONAL([ENABLE_TEST_SUPPORT], [test "$ENABLE_TEST_SUPPORT" = "yes"])
+
 ###############################################################################
 
 AC_SUBST([PKGCONFIG_PRIVATE_REQUIRES], [$PKGCONFIG_PRIVATE_REQUIRES])