Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/public-domain/xz/dist Replace configure.ac with a s...
details: https://anonhg.NetBSD.org/src/rev/7d8853c1d993
branches: trunk
changeset: 758329:7d8853c1d993
user: joerg <joerg%NetBSD.org@localhost>
date: Tue Nov 02 15:40:58 2010 +0000
description:
Replace configure.ac with a stripped down version for later use by
src/tools.
diffstat:
external/public-domain/xz/dist/configure.ac | 589 +--------------------------
1 files changed, 23 insertions(+), 566 deletions(-)
diffs (truncated from 647 to 300 lines):
diff -r 6dc90a7b3df7 -r 7d8853c1d993 external/public-domain/xz/dist/configure.ac
--- a/external/public-domain/xz/dist/configure.ac Tue Nov 02 15:35:38 2010 +0000
+++ b/external/public-domain/xz/dist/configure.ac Tue Nov 02 15:40:58 2010 +0000
@@ -15,174 +15,28 @@
# 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_PREREQ([2.52])
-AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]),
- [lasse.collin%tukaani.org@localhost], [xz], [http://tukaani.org/xz/])
-AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
-AC_CONFIG_AUX_DIR([build-aux])
+AC_INIT([XZ Utils], 5.0.0, [joerg%NetBSD.org@localhost], [xz], [http://tukaani.org/xz/])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
-
-echo
-echo "$PACKAGE_STRING"
-
-echo
-echo "System type:"
-# This is needed to know if assembler optimizations can be used.
-AC_CANONICAL_HOST
-
-# We do some special things on Windows (32-bit or 64-bit) builds.
-case $host_os in
- mingw* | cygwin*) is_w32=yes ;;
- *) is_w32=no ;;
-esac
-AM_CONDITIONAL([COND_W32], [test "$is_w32" = yes])
+AC_CONFIG_AUX_DIR([../../gnu/dist/autoconf/config])
-# We need to use $EXEEXT with $(LN_S) when creating symlinks to
-# executables. Cygwin is an exception to this, since it is recommended
-# that symlinks don't have the .exe suffix. To make this work, we
-# define LN_EXEEXT.
-case $host_os in
- cygwin) LN_EXEEXT= ;;
- *) LN_EXEEXT='$(EXEEXT)' ;;
-esac
-AC_SUBST([LN_EXEEXT])
-
-echo
-echo "Configure options:"
-AM_CFLAGS=
-
-
-#############
-# Debugging #
-#############
-
-AC_MSG_CHECKING([if debugging code should be compiled])
-AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debugging code.]),
- [], enable_debug=no)
-if test "x$enable_debug" = xyes; then
- AC_MSG_RESULT([yes])
-else
- AC_DEFINE([NDEBUG], [1], [Define to 1 to disable debugging code.])
- AC_MSG_RESULT([no])
-fi
-
+AC_CANONICAL_HOST
+AC_USE_SYSTEM_EXTENSIONS
###########
# Filters #
###########
-m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])dnl
-m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,sparc])
-m4_define([LZ_FILTERS], [lzma1,lzma2])
-
-m4_foreach([NAME], [SUPPORTED_FILTERS],
-[enable_filter_[]NAME=no
-enable_encoder_[]NAME=no
-enable_decoder_[]NAME=no
-])dnl
-
-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
- 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
+m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])
-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
- 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.])
- ;;])
- *)
- AC_MSG_RESULT([])
- AC_MSG_ERROR([unknown filter: $arg])
- ;;
- esac
- done
-
- # LZMA2 requires that LZMA1 is enabled.
- test "x$enable_encoder_lzma2" = xyes && enable_encoder_lzma1=yes
- test "x$enable_decoder_lzma2" = xyes && enable_decoder_lzma1=yes
-
- AC_MSG_RESULT([$enable_decoders])
-fi
-
-if test "x$enable_encoder_lzma2$enable_encoder_lzma1" = xyesno \
- || test "x$enable_decoder_lzma2$enable_decoder_lzma1" = xyesno; then
- AC_MSG_ERROR([LZMA2 requires that LZMA1 is also enabled.])
-fi
-
-AM_CONDITIONAL(COND_MAIN_ENCODER, test "x$enable_encoders" != xno && test "x$enable_encoders" != x)
-AM_CONDITIONAL(COND_MAIN_DECODER, test "x$enable_decoders" != xno && test "x$enable_decoders" != x)
-
-m4_foreach([NAME], [SUPPORTED_FILTERS],
-[AM_CONDITIONAL(COND_FILTER_[]m4_toupper(NAME), test "x$enable_filter_[]NAME" = xyes)
-AM_CONDITIONAL(COND_ENCODER_[]m4_toupper(NAME), test "x$enable_encoder_[]NAME" = xyes)
-AM_CONDITIONAL(COND_DECODER_[]m4_toupper(NAME), test "x$enable_decoder_[]NAME" = xyes)
-])dnl
-
-# The so called "simple filters" share common code.
-enable_filter_simple=no
-enable_encoder_simple=no
-enable_decoder_simple=no
-m4_foreach([NAME], [SIMPLE_FILTERS],
-[test "x$enable_filter_[]NAME" = xyes && enable_filter_simple=yes
-test "x$enable_encoder_[]NAME" = xyes && enable_encoder_simple=yes
-test "x$enable_decoder_[]NAME" = xyes && enable_decoder_simple=yes
-])dnl
-AM_CONDITIONAL(COND_FILTER_SIMPLE, test "x$enable_filter_simple" = xyes)
-AM_CONDITIONAL(COND_ENCODER_SIMPLE, test "x$enable_encoder_simple" = xyes)
-AM_CONDITIONAL(COND_DECODER_SIMPLE, test "x$enable_decoder_simple" = xyes)
-
-# LZ-based filters share common code.
-enable_filter_lz=no
-enable_encoder_lz=no
-enable_decoder_lz=no
-m4_foreach([NAME], [LZ_FILTERS],
-[test "x$enable_filter_[]NAME" = xyes && enable_filter_lz=yes
-test "x$enable_encoder_[]NAME" = xyes && enable_encoder_lz=yes
-test "x$enable_decoder_[]NAME" = xyes && enable_decoder_lz=yes
-])dnl
-AM_CONDITIONAL(COND_FILTER_LZ, test "x$enable_filter_lz" = xyes)
-AM_CONDITIONAL(COND_ENCODER_LZ, test "x$enable_encoder_lz" = xyes)
-AM_CONDITIONAL(COND_DECODER_LZ, test "x$enable_decoder_lz" = xyes)
-
+m4_foreach([NAME], [SUPPORTED_FILTERS], [
+ AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1],
+ [Define to 1 if] NAME [encoder is enabled.])
+ AC_DEFINE(HAVE_DECODER_[]m4_toupper(NAME), [1],
+ [Define to 1 if] NAME [decoder is enabled.])
+])
#################
# Match finders #
@@ -190,281 +44,29 @@
m4_define([SUPPORTED_MATCH_FINDERS], [hc3,hc4,bt2,bt3,bt4])
-m4_foreach([NAME], [SUPPORTED_MATCH_FINDERS],
-[enable_match_finder_[]NAME=no
+m4_foreach([NAME], [SUPPORTED_MATCH_FINDERS], [
+ AC_DEFINE(HAVE_MF_[]m4_toupper(NAME), [1],
+ [Define to 1 to enable] NAME [match finder.])
])
-AC_MSG_CHECKING([which match finders to build])
-AC_ARG_ENABLE([match-finders], AC_HELP_STRING([--enable-match-finders=LIST],
- [Comma-separated list of match finders to build. Default=all.
- At least one match finder is required for encoding with
- the LZMA1 and LZMA2 filters. Available match finders:]
- m4_translit(m4_defn([SUPPORTED_MATCH_FINDERS]), [,], [ ])), [],
- [enable_match_finders=SUPPORTED_MATCH_FINDERS])
-enable_match_finders=`echo "$enable_match_finders" | sed 's/,/ /g'`
-if test "x$enable_encoder_lz" = xyes ; then
- for arg in $enable_match_finders
- do
- case $arg in m4_foreach([NAME], [SUPPORTED_MATCH_FINDERS], [
- NAME)
- enable_match_finder_[]NAME=yes
- AC_DEFINE(HAVE_MF_[]m4_toupper(NAME), [1],
- [Define to 1 to enable] NAME [match finder.])
- ;;])
- *)
- AC_MSG_RESULT([])
- AC_MSG_ERROR([unknown match finder: $arg])
- ;;
- esac
- done
- AC_MSG_RESULT([$enable_match_finders])
-else
- 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],
-[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'`
-if test "x$enable_checks" = xno || test "x$enable_checks" = x; then
- AC_MSG_RESULT([(none)])
-else
- for arg in $enable_checks
- do
- case $arg in m4_foreach([NAME], [SUPPORTED_CHECKS], [
- NAME)
- enable_check_[]NAME=yes
- AC_DEFINE(HAVE_CHECK_[]m4_toupper(NAME), [1],
- [Define to 1 if] NAME
- [integrity check is enabled.])
- ;;])
- *)
- AC_MSG_RESULT([])
- AC_MSG_ERROR([unknown integrity check: $arg])
- ;;
- esac
- done
- AC_MSG_RESULT([$enable_checks])
-fi
-if test "x$enable_checks_crc32" = xno ; then
- AC_MSG_ERROR([For now, the CRC32 check must always be enabled.])
-fi
-
-m4_foreach([NAME], [SUPPORTED_CHECKS],
-[AM_CONDITIONAL(COND_CHECK_[]m4_toupper(NAME), test "x$enable_check_[]NAME" = xyes)
-])dnl
-
-
-###########################
-# Assembler optimizations #
-###########################
+m4_foreach([NAME], [SUPPORTED_CHECKS], [
+ AC_DEFINE(HAVE_CHECK_[]m4_toupper(NAME), [1],
+ [Define to 1 if] NAME [integrity check is enabled.])
+])
-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*)
- case $host_cpu in
- i?86) enable_assembler=x86 ;;
- x86_64) enable_assembler=x86_64 ;;
- esac
- ;;
Home |
Main Index |
Thread Index |
Old Index