Makefile.am cleanup

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6a07d1ea5c3be839995ca6ac7a26887a10329cfc..6ce4740b2fe4c3774a4f121d2ca7b8f2520c26f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,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
@@ -159,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"])
 
 
@@ -264,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=