X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=3f7f2b897ce76d111184050a290581df823cb4e4;hp=0f84c1440deedfba5b4a168b6a7e15e43c9560af;hb=c07877105822d01725b36b011c93609559164b06;hpb=cb877891bfb9d911db2372444a9990aeb4bc0cdd

diff --git a/configure.ac b/configure.ac
index 0f84c144..3f7f2b89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([wimlib], [1.5.1], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.6.3-BETA], [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])
+AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign])
 AC_C_BIGENDIAN
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
@@ -24,23 +24,23 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile]
 		[doc/Doxyfile]
 		[wimlib.pc]
-		[doc/"$IMAGEX_PROGNAME".1:doc/imagex.1.in]
-		[doc/"$IMAGEX_PROGNAME"-append.1:doc/imagex-append.1.in]
-		[doc/"$IMAGEX_PROGNAME"-apply.1:doc/imagex-apply.1.in]
-		[doc/"$IMAGEX_PROGNAME"-capture.1:doc/imagex-capture.1.in]
-		[doc/"$IMAGEX_PROGNAME"-delete.1:doc/imagex-delete.1.in]
-		[doc/"$IMAGEX_PROGNAME"-dir.1:doc/imagex-dir.1.in]
-		[doc/"$IMAGEX_PROGNAME"-export.1:doc/imagex-export.1.in]
-		[doc/"$IMAGEX_PROGNAME"-extract.1:doc/imagex-extract.1.in]
-		[doc/"$IMAGEX_PROGNAME"-info.1:doc/imagex-info.1.in]
-		[doc/"$IMAGEX_PROGNAME"-join.1:doc/imagex-join.1.in]
-		[doc/"$IMAGEX_PROGNAME"-mount.1:doc/imagex-mount.1.in]
-		[doc/"$IMAGEX_PROGNAME"-mountrw.1:doc/imagex-mountrw.1.in]
-		[doc/"$IMAGEX_PROGNAME"-optimize.1:doc/imagex-optimize.1.in]
-		[doc/"$IMAGEX_PROGNAME"-split.1:doc/imagex-split.1.in]
-		[doc/"$IMAGEX_PROGNAME"-unmount.1:doc/imagex-unmount.1.in]
-		[doc/"$IMAGEX_PROGNAME"-update.1:doc/imagex-update.1.in]
-		[doc/mkwinpeimg.1])
+		[doc/man1/"$IMAGEX_PROGNAME".1:doc/man1/imagex.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-append.1:doc/man1/imagex-append.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-apply.1:doc/man1/imagex-apply.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-capture.1:doc/man1/imagex-capture.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-delete.1:doc/man1/imagex-delete.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-dir.1:doc/man1/imagex-dir.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-export.1:doc/man1/imagex-export.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-extract.1:doc/man1/imagex-extract.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-info.1:doc/man1/imagex-info.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-join.1:doc/man1/imagex-join.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-mount.1:doc/man1/imagex-mount.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-mountrw.1:doc/man1/imagex-mountrw.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-optimize.1:doc/man1/imagex-optimize.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-split.1:doc/man1/imagex-split.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-unmount.1:doc/man1/imagex-unmount.1.in]
+		[doc/man1/"$IMAGEX_PROGNAME"-update.1:doc/man1/imagex-update.1.in]
+		[doc/man1/mkwinpeimg.1])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
 
@@ -61,11 +61,13 @@ AC_CHECK_HEADERS([alloca.h		\
 		  glob.h		\
 		  machine/endian.h	\
 		  stdarg.h		\
+		  stddef.h		\
 		  stdlib.h		\
 		  sys/byteorder.h	\
 		  sys/endian.h		\
 		  sys/file.h		\
 		  sys/param.h		\
+		  sys/sysctl.h		\
 		  sys/times.h		\
 		  time.h		\
 		  utime.h])
@@ -101,19 +103,6 @@ if test "x$ENABLE_DEBUG" = "xyes"; then
 			[Define to 1 if including lots of debug messages.])
 fi
 
-AC_MSG_CHECKING([whether to include more debugging messages])
-AC_ARG_ENABLE([more_debug],
-	AS_HELP_STRING([--enable-more-debug],
-			[include even more debugging messages]),
-	[ENABLE_MORE_DEBUG=$enableval],
-	[ENABLE_MORE_DEBUG=no]
-	)
-AC_MSG_RESULT([$ENABLE_MORE_DEBUG])
-if test "x$ENABLE_MORE_DEBUG" = "xyes"; then
-	AC_DEFINE([ENABLE_MORE_DEBUG], [1],
-			[Define to 1 if including even more debug messages.])
-fi
-
 AC_MSG_CHECKING([whether to include error messages])
 AC_ARG_ENABLE([error_messages],
 	AS_HELP_STRING([--disable-error-messages],
@@ -127,20 +116,6 @@ if test "x$ENABLE_ERROR_MESSAGES" = "xyes"; then
 			[Define to 1 if including error messages])
 fi
 
-AC_MSG_CHECKING([whether to support custom memory allocation functions])
-AC_ARG_ENABLE([custom_memory_allocator],
-	AS_HELP_STRING([--disable-custom-memory-allocator],
-		       [do not support the use of custom memory allocation
-			functions]),
-	[ENABLE_CUSTOM_MEMORY_ALLOCATOR=$enableval],
-	[ENABLE_CUSTOM_MEMORY_ALLOCATOR=yes]
-	)
-AC_MSG_RESULT([$ENABLE_CUSTOM_MEMORY_ALLOCATOR])
-if test "x$ENABLE_CUSTOM_MEMORY_ALLOCATOR" = "xyes"; then
-	AC_DEFINE([ENABLE_CUSTOM_MEMORY_ALLOCATOR], [1],
-		[Define to 1 if supporting custom memory allocation functions])
-fi
-
 AC_MSG_CHECKING([whether to include assertions])
 AC_ARG_ENABLE([assertions],
 	AS_HELP_STRING([--disable-assertions], [do not include assertions]),