README.WINDOWS: describe 64-bit build by default

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 18a2aa77f0a7b007d184fca1005dfd9f20c0ed19..dc569f7bb104b1d55f75511a29e06a2aeaca861a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.9.1-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.10.0-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -76,7 +76,6 @@ AC_CHECK_HEADERS([alloca.h            \
                  sys/byteorder.h       \
                  sys/endian.h          \
                  sys/file.h            \
-                 sys/param.h           \
                  sys/sysctl.h          \
                  sys/times.h           \
                  time.h                \
@@ -102,16 +101,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                               #
 ###############################################################################
@@ -268,6 +257,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])