X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=configure.ac;h=8c77b2eb55c0a454bc628bcb093f9ebcbaa41cfd;hb=f73332717baf4ab155b57f64ec9dbcd344d7f0c1;hp=517ae42382c44027ead9796f5fe17db02f4ff7c7;hpb=928c195b35671c185ac1db6e4ca6089df01e0366;p=wimlib diff --git a/configure.ac b/configure.ac index 517ae423..8c77b2eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ ############################################################################### -AC_INIT([wimlib], [1.13.1-BETA1], [ebiggers3@gmail.com]) +AC_INIT([wimlib], m4_esyscmd_s([tools/get-version-number]), + [https://wimlib.net/forums/]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) @@ -174,87 +175,8 @@ if test "$WITH_FUSE" = "yes"; then fi AM_CONDITIONAL([WITH_FUSE], [test "$WITH_FUSE" = "yes"]) -# ------------------------ SHA-1 implementation --------------------------------- - -AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA-1]) -AC_ARG_ENABLE([ssse3-sha1], - [AS_HELP_STRING([--enable-ssse3-sha1], - [Include SSSE3-accelerated SHA-1 implementation by - Intel. This implies --without-libcrypto.])], - [ENABLE_SSSE3_SHA1=$enableval], - [ENABLE_SSSE3_SHA1=no]) -AC_MSG_RESULT([$ENABLE_SSSE3_SHA1]) - -if test "$ENABLE_SSSE3_SHA1" = "yes" ; then - AC_DEFINE([ENABLE_SSSE3_SHA1], [1], - [Define to 1 if using SSSE3 implementation of SHA-1]) - AC_PROG_NASM - NASM_SYMBOL_PREFIX="" - NASM_PLATFORM_FLAGS="" - if test "$WINDOWS_NATIVE_BUILD" = "yes"; then - NASM_PLATFORM_FLAGS="-DWIN_ABI" - fi - case "$host_os" in - darwin* | rhapsody* | nextstep* | openstep* | macos*) - NASM_SYMBOL_PREFIX="_" - ;; - esac - AC_SUBST([NASM_PLATFORM_FLAGS], [$NASM_PLATFORM_FLAGS]) - AC_SUBST([NASM_SYMBOL_PREFIX], [$NASM_SYMBOL_PREFIX]) -else - AC_MSG_CHECKING([whether to use SHA-1 implementation from system libcrypto]) - AC_ARG_WITH([libcrypto], - [AS_HELP_STRING([--without-libcrypto], - [build in the SHA-1 algorithm, rather than - use external libcrypto from OpenSSL - (default is autodetect)])], - [WITH_LIBCRYPTO=$withval], - [WITH_LIBCRYPTO=auto]) - AC_MSG_RESULT([$WITH_LIBCRYPTO]) - if test "$WITH_LIBCRYPTO" != "no"; then - PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [ - PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libcrypto" - AC_DEFINE([WITH_LIBCRYPTO], [1], - [Define to 1 if using libcrypto SHA-1]) - ], [AC_MSG_WARN([Cannot find libcrypto: using stand-alone SHA-1 code instead])]) - fi -fi -AM_CONDITIONAL([ENABLE_SSSE3_SHA1], [test "$ENABLE_SSSE3_SHA1" = "yes"]) - # ----------------------------- Other options --------------------------------- -AC_MSG_CHECKING([whether to include error messages]) -AC_ARG_ENABLE([error_messages], - AS_HELP_STRING([--disable-error-messages], [do not compile in error messsages]), - [ENABLE_ERROR_MESSAGES=$enableval], - [ENABLE_ERROR_MESSAGES=yes]) -AC_MSG_RESULT([$ENABLE_ERROR_MESSAGES]) -if test "$ENABLE_ERROR_MESSAGES" = "yes"; then - AC_DEFINE([ENABLE_ERROR_MESSAGES], [1], [Define to 1 if including error messages]) -fi - -AC_MSG_CHECKING([whether to include assertions]) -AC_ARG_ENABLE([assertions], - AS_HELP_STRING([--disable-assertions], [do not include assertions]), - [ENABLE_ASSERTIONS=$enableval], - [ENABLE_ASSERTIONS=yes]) -AC_MSG_RESULT([$ENABLE_ASSERTIONS]) -if test "$ENABLE_ASSERTIONS" = "yes"; then - AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions]) -fi - -AC_MSG_CHECKING([whether to include support for multi-threaded compression]) -AC_ARG_ENABLE([multithreaded-compression], - AS_HELP_STRING([--disable-multithreaded-compression], - [disable support for multithreaded compression]), - [ENABLE_MULTITHREADED_COMPRESSION=$enableval], - [ENABLE_MULTITHREADED_COMPRESSION=yes]) -AC_MSG_RESULT([$ENABLE_MULTITHREADED_COMPRESSION]) -if test "$ENABLE_MULTITHREADED_COMPRESSION" = "yes"; then - AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1], - [Define to 1 to support multithreaded compression]) -fi - AC_ARG_WITH(pkgconfigdir, [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], [pkgconfigdir=$withval],