X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=b978c03b851163f5ad1e8b47cdb5d2ffd56940c6;hp=de0a8a430c0b9a7d9e441a20f7747a127851fff9;hb=4169b7d1888f88f2c0180e2c675461acfadaccc0;hpb=39edbeed8b1d86646e7a8e457f39244c54b1cf14

diff --git a/configure.ac b/configure.ac
index de0a8a43..b978c03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 ###############################################################################
 
-AC_INIT([wimlib], [1.8.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.9.2], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign])
+AM_SILENT_RULES([yes])
 AC_C_BIGENDIAN
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
@@ -101,16 +102,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				      #
 ###############################################################################
@@ -137,7 +128,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"])
 
@@ -267,6 +258,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])