Makefile.am cleanup

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0f469a69e0e0b7ffb09b6f55d8581671238a829e..6ce4740b2fe4c3774a4f121d2ca7b8f2520c26f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.7.2], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.4-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -10,38 +10,10 @@ LT_INIT
 PKGCONFIG_PRIVATE_REQUIRES=""
 PKGCONFIG_PRIVATE_LIBS=""
 
-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/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/"$IMAGEX_PROGNAME"-verify.1:doc/man1/imagex-verify.1.in]
-               [doc/man1/mkwinpeimg.1])
+               [wimlib.pc])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
 
@@ -128,18 +100,6 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then
        AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.])
 fi
 
-AC_MSG_CHECKING([whether to include more assertions])
-AC_ARG_ENABLE([more-assertions],
-       AS_HELP_STRING([--enable-more-assertions], [include even more assertions]),
-       [ENABLE_MORE_ASSERTIONS=$enableval],
-       [ENABLE_MORE_ASSERTIONS=no]
-       )
-AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS])
-if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then
-       AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.])
-fi
-
-
 AC_MSG_CHECKING([whether to include automatic compression verification])
 AC_ARG_ENABLE([verify_compression],
              AS_HELP_STRING([--enable-verify-compression], [always
@@ -174,19 +134,17 @@ AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
 WITH_NTFS_3G_DEFAULT="no"
 WITH_FUSE_DEFAULT="no"
 WINDOWS_NATIVE_BUILD="no"
-VISIBILITY_CFLAGS="-fvisibility=hidden"
-WINDOWS_CFLAGS=""
-WINDOWS_CPPFLAGS=""
-WINDOWS_LDFLAGS=""
+PLATFORM_CPPFLAGS=""
+PLATFORM_CFLAGS="-fvisibility=hidden"
+PLATFORM_LDFLAGS=""
 
 case "$host_os" in
        mingw*)
                # Native Windows
                WINDOWS_NATIVE_BUILD="yes"
-               VISIBILITY_CFLAGS=""
-               WINDOWS_CFLAGS="-municode"
-               WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
-               WINDOWS_LDFLAGS="-no-undefined"
+               PLATFORM_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
+               PLATFORM_CFLAGS="-municode -mno-ms-bitfields"
+               PLATFORM_LDFLAGS="-no-undefined"
                ;;
        linux*)
                # Linux
@@ -199,10 +157,9 @@ case "$host_os" in
                ;;
 esac
 
-AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
-AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
-AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
-AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
+AC_SUBST([PLATFORM_CPPFLAGS], [$PLATFORM_CPPFLAGS])
+AC_SUBST([PLATFORM_CFLAGS], [$PLATFORM_CFLAGS])
+AC_SUBST([PLATFORM_LDFLAGS], [$PLATFORM_LDFLAGS])
 AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 
 
@@ -304,16 +261,16 @@ if test "x$ENABLE_SSSE3_SHA1" = "xyes"; then
        SSSE3_SHA1_OBJ=src/sha1-ssse3.lo
        AC_PROG_NASM
        NASM_SYMBOL_PREFIX=""
-       NASM_WINDOWS_FLAGS=
+       NASM_PLATFORM_FLAGS=""
        if test "x$WINDOWS_NATIVE_BUILD" = "xyes"; then
-               NASM_WINDOWS_FLAGS="-DWIN_ABI"
+               NASM_PLATFORM_FLAGS="-DWIN_ABI"
        fi
        case "$host_os" in
                darwin* | rhapsody* | nextstep* | openstep* | macos*)
                        NASM_SYMBOL_PREFIX="_"
                        ;;
        esac
-       AC_SUBST([NASM_WINDOWS_FLAGS], $NASM_WINDOWS_FLAGS)
+       AC_SUBST([NASM_PLATFORM_FLAGS], $NASM_PLATFORM_FLAGS)
        AC_SUBST([NASM_SYMBOL_PREFIX], $NASM_SYMBOL_PREFIX)
 else
        SSSE3_SHA1_OBJ=