X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.ac;h=7fe58ac24d13de5f8e041b184b99aadf41b0e9e0;hb=refs%2Fheads%2Fmaster;hp=555bb9c04804e8a29081e07e95e4bf7bae721666;hpb=800deb09b422a73c1212233a93839a223ff59678;p=debian%2Fgzip diff --git a/configure.ac b/configure.ac index 555bb9c..7fe58ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,12 @@ # Configure template for gzip. -# Copyright (C) 1999, 2000, 2001, 2002, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2002, 2006-2007, 2009-2018 Free Software Foundation, Inc. # Copyright (C) 1992-1993 Jean-loup Gailly # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # This program is distributed in the hope that it will be useful, @@ -20,35 +19,181 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_PREREQ([2.60]) -AC_INIT([gzip], [1.3.12], [bug-gzip@gnu.org]) -AC_CONFIG_SRCDIR(gzip.c) -AC_CONFIG_AUX_DIR(build-aux) +AC_PREREQ([2.63]) +AC_INIT([gzip], + m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [bug-gzip@gnu.org]) + +AC_CONFIG_SRCDIR([gzip.c]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) -AM_INIT_AUTOMAKE([gnits]) +AM_INIT_AUTOMAKE([1.11 subdir-objects dist-xz dist-zip + color-tests parallel-tests]) +AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. + +dnl POSIXCHECK is worthwhile for maintainers, but adds several seconds +dnl (more than 10% execution time) to ./configure, with no benefit for +dnl most users. Using it to look for bugs requires: +dnl GNULIB_POSIXCHECK=1 autoreconf -f +dnl ./configure +dnl make +dnl make -C src clean +dnl make CFLAGS=-DGNULIB_POSIXCHECK=1 +dnl FIXME: Once we figure out how to avoid false positives, we should +dnl have 'make my-distcheck' in dist-check.mk exercise this. +m4_syscmd([test "${GNULIB_POSIXCHECK+set}" = set]) +m4_if(m4_sysval, [0], [], [dnl +gl_ASSERT_NO_GNULIB_POSIXCHECK]) AC_PROG_CC_STDC AM_PROG_CC_C_O AC_PROG_CPP +AC_PROG_GREP AC_CHECK_TOOL([NM], [nm], [nm]) AC_PROG_LN_S AC_PROG_RANLIB AC_PROG_SHELL gl_EARLY -AC_SYS_LARGEFILE gl_INIT +AC_ARG_ENABLE([gcc-warnings], + [AS_HELP_STRING([--enable-gcc-warnings], + [turn on many GCC warnings (for developers; best with GNU make)])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; + esac + gl_gcc_warnings=$enableval], + [if test -d "$srcdir"/.git; then + gl_gcc_warnings=yes + else + gl_gcc_warnings=no + fi] +) + +# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) +# ------------------------------------------------ +# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. +# Otherwise, run RUN-IF-NOT-FOUND. +AC_DEFUN([gl_GCC_VERSION_IFELSE], + [AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM( + [[ +#if ($1) < __GNUC__ || (($1) == __GNUC__ && ($2) <= __GNUC_MINOR__) +/* ok */ +#else +# error "your version of gcc is older than $1.$2" +#endif + ]]), + ], [$3], [$4]) + ] +) + +if test "$gl_gcc_warnings" = yes; then + gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) + AC_SUBST([WERROR_CFLAGS]) + + nw= + # This, $nw, is the list of warnings we disable. + nw="$nw -Wdeclaration-after-statement" # too useful to forbid + nw="$nw -Waggregate-return" # anachronistic + nw="$nw -Wlong-long" # C90 is anachronistic (lib/gethrxtime.h) + nw="$nw -Wc++-compat" # We don't care about C++ compilers + nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib + nw="$nw -Wtraditional" # Warns on #elif which we use often + nw="$nw -Wcast-qual" # Too many warnings for now + nw="$nw -Wconversion" # Too many warnings for now + nw="$nw -Wduplicated-branches" # Too many false alarms + nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings + nw="$nw -Wsign-conversion" # Too many warnings for now + nw="$nw -Wtraditional-conversion" # Too many warnings for now + nw="$nw -Wpadded" # Our structs are not padded + nw="$nw -Wredundant-decls" # openat.h declares e.g., mkdirat + nw="$nw -Wlogical-op" # any use of fwrite provokes this + nw="$nw -Wformat-nonliteral" # who.c and pinky.c strftime uses + nw="$nw -Wvla" # warnings in gettext.h + nw="$nw -Wnested-externs" # use of XARGMATCH/verify_function__ + nw="$nw -Wswitch-enum" # Too many warnings for now + nw="$nw -Wswitch-default" # Too many warnings for now + nw="$nw -Wstack-protector" # not worth working around + # things I might fix soon: + nw="$nw -Wfloat-equal" # sort.c, seq.c + nw="$nw -Wmissing-format-attribute" # copy.c + nw="$nw -Wunsafe-loop-optimizations" # a few src/*.c + nw="$nw -Winline" # system.h's readdir_ignoring_dot_and_dotdot + + # Warnings that gzip runs afoul of but coreutils does not. + nw="$nw -Wold-style-definition" + nw="$nw -Wshadow" + nw="$nw -Wstrict-overflow" + + # Using -Wstrict-overflow is a pain, but the alternative is worse. + # For an example, see the code that provoked this report: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=33498 + # Code like that still infloops with gcc-4.6.0 and -O2. Scary indeed. + + gl_MANYWARN_ALL_GCC([ws]) + gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw]) + for w in $ws; do + gl_WARN_ADD([$w]) + done + gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now + gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now + gl_WARN_ADD([-Wsuggest-attribute=const]) + gl_WARN_ADD([-Wsuggest-attribute=noreturn]) + gl_WARN_ADD([-Wno-format-nonliteral]) + + # Enable this warning only with gcc-4.7 and newer. With 4.6.2 20111027, + # it suggests test.c's advance function may be pure, even though it + # increments a global variable. Oops. + # Normally we'd write code to test for the precise failure, but that + # requires a relatively large input to make gcc exhibit the failure. + gl_GCC_VERSION_IFELSE([4], [7], [gl_WARN_ADD([-Wsuggest-attribute=pure])]) + + # In spite of excluding -Wlogical-op above, it is enabled, as of + # gcc 4.5.0 20090517, and it provokes warnings in cat.c, dd.c, truncate.c + gl_WARN_ADD([-Wno-logical-op]) + + gl_WARN_ADD([-fdiagnostics-show-option]) + gl_WARN_ADD([-funit-at-a-time]) + + AC_SUBST([WARN_CFLAGS]) + + AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting glibc 2.15+. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) + AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks]) + + # We use a slightly smaller set of warning options for lib/. + # Remove the following and save the result in GNULIB_WARN_CFLAGS. + nw= + nw="$nw -Wstrict-overflow" + nw="$nw -Wformat-truncation=2" + nw="$nw -Wuninitialized" + nw="$nw -Wunused-macros" + nw="$nw -Wmissing-prototypes" + nw="$nw -Wold-style-definition" + gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw]) + AC_SUBST([GNULIB_WARN_CFLAGS]) +fi + # cc -E produces incorrect asm files on SVR4, so postprocess it. -ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'" +ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'" AC_SUBST([ASCPPPOST]) AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline], [gzip_cv_underline=yes AC_TRY_COMPILE([int foo() {return 0;}], [], [$NM conftest.$OBJEXT | grep _foo >/dev/null 2>&1 || - gzip_cv_underline=no])]) + gzip_cv_underline=no])]) ASCPPFLAGS= if test $gzip_cv_underline = no; then ASCPPFLAGS='-DNO_UNDERLINE' @@ -61,31 +206,31 @@ AC_OBJEXT AC_CACHE_CHECK([for an assembler syntax supported by this package], [gzip_cv_assembler], [gzip_cv_assembler=no - case " $DEFS " in - *' NO_ASM '*) ;; + case $DEFS in + *NO_ASM*) ;; *) if cp $srcdir/lib/match.c _match.S && - eval "$CPP $CPPFLAGS $ASCPPFLAGS _match.S > _match.i" 2>/dev/null && - eval "$ASCPPPOST < _match.i > match_.s" 2>/dev/null; then + eval "$CPP $CPPFLAGS $ASCPPFLAGS _match.S > _match.i" && + eval "$ASCPPPOST < _match.i > match_.s"; then if test ! -s match_.s || grep error < match_.s > /dev/null; then - : - elif eval "$CC $CPPFLAGS $CFLAGS -c match_.s >/dev/null 2>&1" && - test -f match_.$OBJEXT; then - rm -f match_.$OBJEXT - gzip_cv_assembler=yes - if echo 'void foo (void) {}' > conftest.c && - eval "$CC $CPPFLAGS $CFLAGS -S conftest.c >/dev/null 2>&1" && - grep '\.note\.GNU-stack' conftest.s >/dev/null 2>&1 && - eval "$CC $CPPFLAGS $CFLAGS -c -Wa,--noexecstack match_.s >/dev/null 2>&1" && - test -f match_.$OBJEXT; then - gzip_cv_assembler='yes, with -Wa,--noexecstack' - fi + : + elif eval "$CC $CPPFLAGS $CFLAGS -c match_.s >/dev/null" && + test -f match_.$OBJEXT; then + rm -f match_.$OBJEXT + gzip_cv_assembler=yes + if echo 'void foo (void) {}' > conftest.c && + eval "$CC $CPPFLAGS $CFLAGS -S conftest.c >/dev/null" && + grep '\.note\.GNU-stack' conftest.s >/dev/null && + eval "$CC $CPPFLAGS $CFLAGS -c -Wa,--noexecstack match_.s >/dev/null" && + test -f match_.$OBJEXT; then + gzip_cv_assembler='yes, with -Wa,--noexecstack' + fi fi fi rm -f conftest* _match.i _match.S match_.s match_.$OBJEXT;; esac]) if test "$gzip_cv_assembler" != no; then - AC_DEFINE(ASMV, , + AC_DEFINE([ASMV], , [Define if an assembler version of longest_match is available.]) AC_LIBOBJ(match) fi @@ -100,13 +245,11 @@ AC_ISC_POSIX AC_C_CONST AC_HEADER_STDC AC_CHECK_HEADERS_ONCE(fcntl.h limits.h memory.h time.h) -AC_CHECK_FUNCS_ONCE([chown fchmod fchown fdopendir lstat siginterrupt]) +AC_CHECK_FUNCS_ONCE([chown fchmod fchown lstat siginterrupt]) AC_HEADER_DIRENT AC_TYPE_SIGNAL AC_TYPE_SIZE_T AC_TYPE_OFF_T -AC_PREFIX_PROGRAM(gzip) - -AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile]) +AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile tests/Makefile]) AC_OUTPUT