X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=48aa4ad6691b0309307f02e2db5fe32ee05f90b7;hp=1b90c4851cb0d74eb9740c93c2a6dc3387a74f09;hb=da14d32decefdb0b7ab11f631fcb56bea47e8ac7;hpb=811a38dfe05ef337e2d627f654f8a3e559900790 diff --git a/configure.ac b/configure.ac index 1b90c485..48aa4ad6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -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]) @@ -6,33 +6,47 @@ AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects]) 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_CHECK_FUNCS([utimensat lutimes utime flock]) AC_CHECK_HEADERS([endian.h byteswap.h sys/byteorder.h sys/endian.h \ sys/param.h machine/endian.h alloca.h stdlib.h stdarg.h \ - errno.h attr/xattr.h utime.h sys/file.h]) + errno.h attr/xattr.h utime.h sys/file.h glob.h]) AC_CHECK_MEMBER([struct stat.st_mtim], [AC_DEFINE([HAVE_STAT_NANOSECOND_PRECISION], [1], @@ -41,15 +55,6 @@ AC_CHECK_MEMBER([struct stat.st_mtim], [], [[#include ]]) -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 - AC_ARG_WITH(pkgconfigdir, [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], @@ -141,11 +146,11 @@ fi 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 @@ -165,37 +170,51 @@ if test "x$ENABLE_MULTITHREADED_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]) -case "$host" in - *-*-cygwin*) - dnl -no-undefined is needed to build a DLL in a Cygwin environment. - CYGWIN_EXTRA_LDFLAGS="-no-undefined" +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="" - dnl -fvisibility=hidden should not be used when building PE - dnl binaries on Windows +case "$host" in + *-*-mingw*) + # Native Windows + WITH_NTFS_3G_DEFAULT="no" + WITH_FUSE_DEFAULT="no" + WINDOWS_NATIVE_BUILD="yes" VISIBILITY_CFLAGS="" - + 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" - WINDOWS_BUILD="yes" + VISIBILITY_CFLAGS="" ;; *) - CYGWIN_EXTRA_LDFLAGS="" - VISIBILITY_CFLAGS="-fvisibility=hidden" - WITH_NTFS_3G_DEFAULT="yes" - WITH_FUSE_DEFAULT="yes" - WINDOWS_BUILD="no" + # UNIX / other ;; esac -AC_SUBST([CYGWIN_EXTRA_LDFLAGS], [$CYGWIN_EXTRA_LDFLAGS]) AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS]) -AM_CONDITIONAL([WINDOWS_BUILD], [test "x$WINDOWS_BUILD" = "xyes"]) +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]) AC_ARG_WITH([ntfs-3g], @@ -234,12 +253,21 @@ if test "x$WITH_NTFS_3G" = "xyes"; then else LIBNTFS_3G_LDADD= LIBNTFS_3G_CFLAGS= + 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.