-AC_INIT([wimlib], [1.3.0], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.3.3], [ebiggers3@gmail.com])
AC_CONFIG_SRCDIR([src/wim.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_C_BIGENDIAN
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT
+
+AC_ARG_WITH(imagex-progname,
+ [AS_HELP_STRING([--with-imagex-progname=NAME],
+ [Set the name of installed ImageX program (default: wimlib-imagex)])],
+ [IMAGEX_PROGNAME=$withval],
+ [IMAGEX_PROGNAME="wimlib-imagex"])
+
+AC_SUBST([IMAGEX_PROGNAME], [$IMAGEX_PROGNAME])
+AC_DEFINE_UNQUOTED([IMAGEX_PROGNAME], ["$IMAGEX_PROGNAME"],
+ [Binary name for the implementation of ImageX distributed with wimlib])
+
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile
- doc/Doxyfile
- wimlib.pc
- doc/imagex.1
- doc/imagex-append.1
- doc/imagex-apply.1
- doc/imagex-capture.1
- doc/imagex-delete.1
- doc/imagex-dir.1
- doc/imagex-export.1
- doc/imagex-info.1
- doc/imagex-join.1
- doc/imagex-mount.1
- doc/imagex-mountrw.1
- doc/imagex-optimize.1
- doc/imagex-split.1
- doc/imagex-unmount.1
- doc/mkwinpeimg.1
- ])
+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"-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/mkwinpeimg.1])
+
+AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
+
AC_PROG_CC
AM_PROG_CC_C_O
AC_CANONICAL_HOST
AC_MSG_CHECKING([whether to include compression verification])
AC_ARG_ENABLE([verify_compression],
- AS_HELP_STRING([--disable-verify-compression], [disable
- checking if blocks we compress can be correctly
+ AS_HELP_STRING([--enable-verify-compression], [always
+ check if blocks we compress can be correctly
decompressed]),
[ENABLE_VERIFY_COMPRESSION=$enableval],
- [ENABLE_VERIFY_COMPRESSION=yes]
+ [ENABLE_VERIFY_COMPRESSION=no]
)
AC_MSG_RESULT([$ENABLE_VERIFY_COMPRESSION])
if test "x$ENABLE_VERIFY_COMPRESSION" = "xyes"; then
AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
[Define to 1 if including support for multithreaded
compression])
- PTHREAD_LDADD="-lpthread"
-else
- PTHREAD_LDADD=""
fi
+
+PTHREAD_LDADD="-lpthread"
AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
WITH_NTFS_3G_DEFAULT="yes"
WITH_FUSE_DEFAULT="yes"
WINDOWS_NATIVE_BUILD="no"
VISIBILITY_CFLAGS="-fvisibility=hidden"
+WINDOWS_CFLAGS=""
WINDOWS_CPPFLAGS=""
WINDOWS_LDFLAGS=""
WINDOWS_LDADD=""
WITH_FUSE_DEFAULT="no"
WINDOWS_NATIVE_BUILD="yes"
VISIBILITY_CFLAGS=""
- WINDOWS_CPPFLAGS="-D_POSIX"
+ WINDOWS_CFLAGS="-municode"
+ WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE"
WINDOWS_LDFLAGS="-no-undefined"
WINDOWS_LDADD="-lshlwapi"
;;
*-*-cygwin*)
# Cygwin (WARNING: not well supported)
+ AC_MSG_WARN([wimlib has not been tested with Cygwin! Please do
+ a Windows-native build with MinGW-w64 instead])
WITH_NTFS_3G_DEFAULT="no"
WITH_FUSE_DEFAULT="no"
VISIBILITY_CFLAGS=""
AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
+AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
AC_MSG_CHECKING([whether to include support for ntfs-3g])
LIBNTFS_3G_LDADD=
LIBNTFS_3G_CFLAGS=
- if test "x$WINDOWS_NATIVE_BUILD" != "xyes"; then
- AM_ICONV
- if test "x$am_cv_func_iconv" != "xyes"; then
- AC_MSG_ERROR([Cannot find the iconv() function.
- iconv() is used to convert between UTF-8 and UTF-16 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
- fi
fi
AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
+AM_ICONV
+if test "x$am_cv_func_iconv" != "xyes"; 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
+
AC_MSG_CHECKING([whether to include support for mounting WIMs])
AC_ARG_WITH([fuse],
AS_HELP_STRING([--without-fuse], [build without libfuse.
git://wimlib.net / wimlib / blobdiff