X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=74ff4744d08db2ec3367000bd01d185038bd1f1b;hp=18a2aa77f0a7b007d184fca1005dfd9f20c0ed19;hb=f2e360a90b9520928821928d2fa882ab1da15ba3;hpb=5ea71b35aff264dea029792b1fdb3404c6bd9d54

diff --git a/configure.ac b/configure.ac
index 18a2aa77..74ff4744 100644
--- 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])
@@ -64,7 +64,6 @@ AC_CHECK_FUNCS([futimens utimensat flock mempcpy	\
 # 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 +75,9 @@ AC_CHECK_HEADERS([alloca.h		\
 		  sys/byteorder.h	\
 		  sys/endian.h		\
 		  sys/file.h		\
-		  sys/param.h		\
 		  sys/sysctl.h		\
 		  sys/times.h		\
+		  sys/xattr.h		\
 		  time.h		\
 		  utime.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				      #
 ###############################################################################
@@ -170,12 +159,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 +251,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])