Update XZ Utils to 5.0.3 (in deps)

configure.ac

 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 ###############################################################################
 #
 # Author: Lasse Collin
 #
 # This file has been put into the public domain.
 # You can do whatever you want with this file.
 #
 ###############################################################################
 
 # NOTE: Don't add useless checks. autoscan detects this and that, but don't
 # let it confuse you. For example, we don't care about checking for behavior
 # of malloc(), stat(), or lstat(), since we don't use those functions in
 # a way that would cause the problems the autoconf macros check.
 
 AC_PREREQ([2.64])
 
-AC_INIT([XZ Utils], m4_esyscmd([/bin/sh version.sh]),
+AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]),
         [lasse.collin@tukaani.org], [xz], [http://tukaani.org/xz/])
 AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 
 echo
 echo "$PACKAGE_STRING"
 
 echo
@@ skipping 55 matching lines @@
 AC_MSG_CHECKING([which encoders to build])
 AC_ARG_ENABLE([encoders], AC_HELP_STRING([--enable-encoders=LIST],
                 [Comma-separated list of encoders to build. Default=all.
                 Available encoders:]
                         m4_translit(m4_defn([SUPPORTED_FILTERS]), [,], [ ])),
         [], [enable_encoders=SUPPORTED_FILTERS])
 enable_encoders=`echo "$enable_encoders" | sed 's/,/ /g'`
 if test "x$enable_encoders" = xno || test "x$enable_encoders" = x; then
         AC_MSG_RESULT([(none)])
 else
-        AC_DEFINE([HAVE_ENCODER], [1],
-                [Define to 1 if encoder components are enabled.])
         for arg in $enable_encoders
         do
                 case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [
                         NAME)
                                 enable_filter_[]NAME=yes
                                 enable_encoder_[]NAME=yes
                                 AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1],
                                 [Define to 1 if] NAME [encoder is enabled.])
                                 ;;])
                         *)
                                 AC_MSG_RESULT([])
                                 AC_MSG_ERROR([unknown filter: $arg])
                                 ;;
                 esac
         done
         AC_MSG_RESULT([$enable_encoders])
 fi
 
 AC_MSG_CHECKING([which decoders to build])
 AC_ARG_ENABLE([decoders], AC_HELP_STRING([--enable-decoders=LIST],
                 [Comma-separated list of decoders to build. Default=all.
                 Available decoders are the same as available encoders.]),
         [], [enable_decoders=SUPPORTED_FILTERS])
 enable_decoders=`echo "$enable_decoders" | sed 's/,/ /g'`
 if test "x$enable_decoders" = xno || test "x$enable_decoders" = x; then
         AC_MSG_RESULT([(none)])
 else
-        AC_DEFINE([HAVE_DECODER], [1],
-                [Define to 1 if decoder components are enabled.])
         for arg in $enable_decoders
         do
                 case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [
                         NAME)
                                 enable_filter_[]NAME=yes
                                 enable_decoder_[]NAME=yes
                                 AC_DEFINE(HAVE_DECODER_[]m4_toupper(NAME), [1],
                                 [Define to 1 if] NAME [decoder is enabled.])
                                 ;;])
                         *)
@@ skipping 89 matching lines @@
         AC_MSG_RESULT([(none because not building any LZ-based encoder)])
 fi
 
 
 ####################
 # Integrity checks #
 ####################
 
 m4_define([SUPPORTED_CHECKS], [crc32,crc64,sha256])
 
-m4_foreach([NAME], [SUPPORTED_FILTERS],
+m4_foreach([NAME], [SUPPORTED_CHECKS],
 [enable_check_[]NAME=no
 ])dnl
 
 AC_MSG_CHECKING([which integrity checks to build])
 AC_ARG_ENABLE([checks], AC_HELP_STRING([--enable-checks=LIST],
                 [Comma-separated list of integrity checks to build.
                 Default=all. Available integrity checks:]
                 m4_translit(m4_defn([SUPPORTED_CHECKS]), [,], [ ])),
         [], [enable_checks=SUPPORTED_CHECKS])
 enable_checks=`echo "$enable_checks" | sed 's/,/ /g'`
@@ skipping 33 matching lines @@
 AC_MSG_CHECKING([if assembler optimizations should be used])
 AC_ARG_ENABLE([assembler], AC_HELP_STRING([--disable-assembler],
                 [Do not use assembler optimizations even if such exist
                 for the architecture.]),
         [], [enable_assembler=yes])
 if test "x$enable_assembler" = xyes; then
         enable_assembler=no
         case $host_os in
                 # Darwin should work too but only if not creating universal
                 # binaries. Solaris x86 could work too but I cannot test.
-                linux* | *bsd* | mingw* | cygwin*)
+                linux* | *bsd* | mingw* | cygwin* | *djgpp*)
                         case $host_cpu in
                                 i?86)   enable_assembler=x86 ;;
                                 x86_64) enable_assembler=x86_64 ;;
                         esac
                         ;;
         esac
 fi
 case $enable_assembler in
         x86 | x86_64 | no)
                 AC_MSG_RESULT([$enable_assembler])
@@ skipping 61 matching lines @@
 if test -z "$enable_assume_ram" || test -n "$assume_ram_check"; then
         AC_MSG_RESULT([])
         AC_MSG_ERROR([--enable-assume-ram accepts only an integer argument])
 fi
 AC_MSG_RESULT([$enable_assume_ram MiB])
 AC_DEFINE_UNQUOTED([ASSUME_RAM], [$enable_assume_ram],
                 [How many MiB of RAM to assume if the real amount cannot
                 be determined.])
 
 
-############################################
-# xz/xzdec/lzmadec linkage against liblzma #
-############################################
+#########################
+# Components to install #
+#########################
 
-# Link the xz, xzdec, and lzmadec command line tools against static liblzma
-# unless using --enable-dynamic. Using static liblzma gives a little bit
-# faster executable on x86, because no register is wasted for PIC. We also
-# have one dependency less, which allows users to more freely copy the xz
-# binary to other boxes. However, I wouldn't be surprised if distro
-# maintainers still prefer dynamic linking, so let's make it easy for them.
+AC_ARG_ENABLE([xz], [AC_HELP_STRING([--disable-xz],
+                [do not build the xz tool])],
+        [], [enable_xz=yes])
+AM_CONDITIONAL([COND_XZ], [test x$enable_xz != xno])
 
-AC_MSG_CHECKING([how programs should be linked against liblzma])
-AC_ARG_ENABLE([dynamic], [AC_HELP_STRING([--enable-dynamic=TYPE],
-                        [Set how command line tools are linked against liblzma.
-                        TYPE can be mixed, yes, or no. The default is mixed.])],
-                [], [enable_dynamic=mixed])
-case $enable_dynamic in
-        mixed)
-                AC_MSG_RESULT([mixed (some dynamically, some statically)])
-                ;;
-        yes)
-                AC_MSG_RESULT([dynamically])
-                ;;
-        no)
-                AC_MSG_RESULT([statically])
-                ;;
-        *)
-                AC_MSG_RESULT([])
-                AC_MSG_ERROR([--enable-dynamic accepts only \`mixed', \`yes', or \`no'])
-                ;;
-esac
-# We use the actual results later, because we don't know yet
-# if --disable-shared or --disable-static was used.
+AC_ARG_ENABLE([xzdec], [AC_HELP_STRING([--disable-xzdec],
+                [do not build xzdec])],
+        [], [enable_xzdec=yes])
+AM_CONDITIONAL([COND_XZDEC], [test x$enable_xzdec != xno])
+
+AC_ARG_ENABLE([lzmadec], [AC_HELP_STRING([--disable-lzmadec],
+                [do not build lzmadec
+                (it exists primarily for LZMA Utils compatibility)])],
+        [], [enable_lzmadec=yes])
+AM_CONDITIONAL([COND_LZMADEC], [test x$enable_lzmadec != xno])
+
+AC_ARG_ENABLE([lzmainfo], [AC_HELP_STRING([--disable-lzmainfo],
+                [do not build lzmainfo
+                (it exists primarily for LZMA Utils compatibility)])],
+        [], [enable_lzmainfo=yes])
+AM_CONDITIONAL([COND_LZMAINFO], [test x$enable_lzmainfo != xno])
+
+AC_ARG_ENABLE([lzma-links], [AC_HELP_STRING([--disable-lzma-links],
+                [do not create symlinks for LZMA Utils compatibility])],
+        [], [enable_lzma_links=yes])
+AM_CONDITIONAL([COND_LZMALINKS], [test x$enable_lzma_links != xno])
+
+AC_ARG_ENABLE([scripts], [AC_HELP_STRING([--disable-scripts],
+                [do not install the scripts xzdiff, xzgrep, xzless, xzmore,
+                and their symlinks])],
+        [], [enable_scripts=yes])
+AM_CONDITIONAL([COND_SCRIPTS], [test x$enable_scripts != xno])
 
 
 ###############################################################################
 # Checks for programs.
 ###############################################################################
 
 echo
 gl_POSIX_SHELL
 if test -z "$POSIX_SHELL" ; then
         AC_MSG_ERROR([No POSIX conforming shell (sh) was found.])
@@ skipping 100 matching lines @@
 # Gnulib replacements as needed
 gl_GETOPT
 
 # Find the best function to set timestamps.
 AC_CHECK_FUNCS([futimens futimes futimesat utimes utime], [break])
 
 TUKLIB_PROGNAME
 TUKLIB_INTEGER
 TUKLIB_PHYSMEM
 TUKLIB_CPUCORES
+TUKLIB_MBSTR
 
 
 ###############################################################################
 # If using GCC, set some additional AM_CFLAGS:
 ###############################################################################
 
 if test "$GCC" = yes ; then
         echo
         echo "GCC extensions:"
 fi
@@ skipping 36 matching lines @@
                         -Wstrict-prototypes \
                         -Wold-style-definition \
                         -Wmissing-prototypes \
                         -Wmissing-declarations \
                         -Wmissing-noreturn \
                         -Wredundant-decls
         do
                 AC_MSG_CHECKING([if $CC accepts $NEW_FLAG])
                 OLD_CFLAGS="$CFLAGS"
                 CFLAGS="$CFLAGS $NEW_FLAG"
-                AC_COMPILE_IFELSE([void foo(void) { }], [
+                AC_COMPILE_IFELSE([AC_LANG_SOURCE([void foo(void) { }])], [
                         AM_CFLAGS="$AM_CFLAGS $NEW_FLAG"
                         AC_MSG_RESULT([yes])
                 ], [
                         AC_MSG_RESULT([no])
                 ])
                 CFLAGS="$OLD_CFLAGS"
         done
 
         AC_ARG_ENABLE([werror],
                 AC_HELP_STRING([--enable-werror], [Enable -Werror to abort
@@ skipping 11 matching lines @@
 
 echo
 
 # Don't build the lib directory at all if we don't need any replacement
 # functions.
 AM_CONDITIONAL([COND_GNULIB], test -n "$LIBOBJS")
 
 # Add default AM_CFLAGS.
 AC_SUBST([AM_CFLAGS])
 
-# Set additional flags for static/dynamic linking. The idea is that every
-# program (not library) being built will use either STATIC_{CPPFLAGS,LDFLAGS}
-# or DYNAMIC_{CPPFLAGS,LDFLAGS} depending on which type of linkage is
-# preferred. These preferences get overridden by use of --disable-static,
-# --disable-shared, or --enable-dynamic.
-#
-# This is quite messy, because we want to use LZMA_API_STATIC when linking
-# against static liblzma. It's needed on Windows.
-if test "x$enable_static" = xno; then
-        enable_dynamic=yes
-fi
-if test "x$enable_shared" = xno; then
-        enable_dynamic=no
-fi
-case $enable_dynamic in
-        yes)
-                STATIC_CPPFLAGS=
-                STATIC_LDFLAGS=
-                DYNAMIC_CPPFLAGS=
-                DYNAMIC_LDFLAGS=
-                ;;
-        mixed)
-                STATIC_CPPFLAGS="-DLZMA_API_STATIC"
-                STATIC_LDFLAGS="-static"
-                DYNAMIC_CPPFLAGS=
-                DYNAMIC_LDFLAGS=
-                ;;
-        no)
-                STATIC_CPPFLAGS="-DLZMA_API_STATIC"
-                STATIC_LDFLAGS="-static"
-                DYNAMIC_CPPFLAGS="-DLZMA_API_STATIC"
-                DYNAMIC_LDFLAGS="-static"
-                ;;
-esac
-AC_SUBST([STATIC_CPPFLAGS])
-AC_SUBST([STATIC_LDFLAGS])
-AC_SUBST([DYNAMIC_CPPFLAGS])
-AC_SUBST([DYNAMIC_LDFLAGS])
-
 # This is needed for src/scripts.
 xz=`echo xz | sed "$program_transform_name"`
 AC_SUBST([xz])
 
 AC_CONFIG_FILES([
         Doxyfile
         Makefile
         po/Makefile.in
         lib/Makefile
         src/Makefile
@@ skipping 22 matching lines @@
         echo "Consider using --enable-assume-ram (if you didn't already)"
         echo "or make a patch to add support for this operating system."
 fi
 
 # Not threading yet so don't warn.
 #if test x$tuklib_cv_cpucores_method = xunknown; then
 #       echo
 #       echo "WARNING:"
 #       echo "No supported method to detect the number of CPU cores."
 #fi