diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 181 |
1 files changed, 80 insertions, 101 deletions
diff --git a/configure.ac b/configure.ac index 5a4860e7..3f0c58b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- autoconf -*- # Process this file with autoconf to produce a configure script. -# Copyright (C) 1991-2012 Free Software Foundation, Inc. +# Copyright (C) 1991-2013 Free Software Foundation, Inc. # 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 @@ -32,7 +32,8 @@ AC_CONFIG_SRCDIR([src/ls.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) -AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests]) +AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz color-tests parallel-tests + subdir-objects]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. dnl POSIXCHECK is worthwhile for maintainers, but adds several seconds @@ -59,16 +60,12 @@ gl_EARLY gl_INIT coreutils_MACROS -AC_ARG_ENABLE([gcc-warnings], - [AS_HELP_STRING([--enable-gcc-warnings], - [turn on lots of GCC warnings (for developers)])], - [case $enableval in - yes|no) ;; - *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; - esac - gl_gcc_warnings=$enableval], - [gl_gcc_warnings=no] -) +# The test suite needs to know if we have a working perl. +# FIXME: this is suboptimal. Ideally, we would be able to call gl_PERL +# with an ACTION-IF-NOT-FOUND argument ... +cu_have_perl=yes +case $PERL in *"/missing "*) cu_have_perl=no;; esac +AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes]) # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) # ------------------------------------------------ @@ -88,6 +85,24 @@ AC_DEFUN([gl_GCC_VERSION_IFELSE], ] ) +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], + [ + # GCC provides fine-grained control over diagnostics which + # is used in gnulib for example to suppress warnings from + # certain sections of code. So if this is available and + # we're running from a git repo, then auto enable the warnings. + gl_gcc_warnings=no + gl_GCC_VERSION_IFELSE([4], [6], + [test -d "$srcdir"/.git && gl_gcc_warnings=yes])] +) + if test "$gl_gcc_warnings" = yes; then gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) AC_SUBST([WERROR_CFLAGS]) @@ -120,6 +135,7 @@ if test "$gl_gcc_warnings" = yes; then 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 + nw="$nw -Wsuggest-attribute=format" # warns about copy.c and factor.c # Using -Wstrict-overflow is a pain, but the alternative is worse. # For an example, see the code that provoked this report: @@ -154,8 +170,13 @@ if test "$gl_gcc_warnings" = yes; then AC_SUBST([WARN_CFLAGS]) AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + 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/. @@ -380,7 +401,6 @@ AC_CHECK_DECLS([strsignal, sys_siglist, _sys_siglist, __sys_siglist], , , [AC_INCLUDES_DEFAULT #include <signal.h>]) -cu_LIB_CHECK cu_GMP # Build df only if there's a point to it. @@ -400,95 +420,59 @@ if test "$elf_sys" = "yes" && \ fi ############################################################################ -mk="$srcdir/src/Makefile.am" -# Extract all literal names from the definition of $(EXTRA_PROGRAMS) -# in $mk but don't expand the variable references. -# Append each literal name to $optional_bin_progs. -v=EXTRA_PROGRAMS -for gl_i in `sed -n '/^'$v' =/,/[[^\]]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '`; do - gl_ADD_PROG([optional_bin_progs], $gl_i) -done - -# As above, extract literal names from the definition of $(no_install__progs) -# in $mk but don't expand the variable references. -v=no_install__progs -t=`sed -n '/^'$v' =/,/[[^\]]$/p' $mk \ - | sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \ - | tr -s '\\015\\012\\\\' ' '` -# Remove any trailing space. -no_install_progs_default=`echo "$t"|sed 's/ $//'` - -# Unfortunately, due to the way autoconf's AS_HELP_STRING works, the list -# of default-not-installed programs, "arch hostname su", must appear in two -# places: in this file below, and in $mk. Using "$no_install_progs_default" -# below cannot work. And we can't substitute the names into $mk because -# automake needs the literals, too. -# The compromise is to ensure that the space-separated list extracted -# above matches the literal 2nd argument below. -c="$srcdir/configure.ac" -re='^g''l_INCLUDE_EXCLUDE_PROG(.* [\[\(.*\)\]])' -t=`sed -n '/'"$re"'/{s/'"$re"'/\1/;s/,/ /gp -}' $c` -case $t in - $no_install_progs_default) ;; - *) AC_MSG_ERROR([[internal error: g'l_INCLUDE_EXCLUDE_PROG's 2nd arg, $t, - does not match the list of default-not-installed programs - ($no_install_progs_default) also recorded in $mk]], - 1) ;; -esac -# Given the name of a variable containing a space-separated list of -# install-by-default programs and the actual list do-not-install-by-default -# programs, modify the former variable to reflect any "do-install" and -# "don't-install" requests. -# I.e., add any program name specified via --enable-install-program=..., and -# remove any program name specified via --enable-no-install-program=... -# Note how the second argument below is a literal, with "," separators. -# That is required due to the way the macro works, and since the -# corresponding ./configure option argument is comma-separated on input. -gl_INCLUDE_EXCLUDE_PROG([optional_bin_progs], [arch,hostname,su]) - -# Now that we know which programs will actually be built up, figure out -# which optional helper progs should be compiled. -optional_pkglib_progs= -case " $optional_bin_progs " in - *' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;; -esac +dnl Autogenerated by the 'gen-lists-of-programs.sh' auxiliary script. +dnl Issue proper calls to the macros gl_INCLUDE_EXCLUDE_PROG and +dnl gl_ADD_PROG (updating $optional_bin_progs), and generate the list +dnl of coreutils programs to be built only upon explicit user request, +dnl saving that list in the $no_install_progs_default shell variable. +m4_include([m4/cu-progs.m4]) -# Set INSTALL_SU if su installation has been requested via -# --enable-install-program=su. -AC_SUBST([INSTALL_SU]) +# Now that we know which programs will actually be built, determine +# which optional helper progs should be compiled. case " $optional_bin_progs " in - *' su '*) INSTALL_SU=yes ;; - *) INSTALL_SU=no ;; + *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; + *) pkglibexec_PROGRAMS='';; esac -MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'` - -# Change "ginstall.1" to "install.1" in $MAN. -MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \ - | tr '\015\012' ' '; echo` - -# Remove [.1, since writing a portable rule for it in man/Makefile.am -# is not practical. The sed LHS below uses the autoconf quadrigraph -# representing '['. -MAN=`echo "$MAN"|sed 's/\@<:@\.1//'` - -OPTIONAL_BIN_PROGS=`echo "$optional_bin_progs "|sed 's/ /\$(EXEEXT) /g;s/ $//'` -AC_SUBST([OPTIONAL_BIN_PROGS]) -OPTIONAL_PKGLIB_PROGS=`echo "$optional_pkglib_progs " | sed 's/ $//'` -AC_SUBST([OPTIONAL_PKGLIB_PROGS]) -NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default -AC_SUBST([NO_INSTALL_PROGS_DEFAULT]) +man1_MANS=` + for p in $optional_bin_progs; do + # Change "ginstall.1" to "install.1". + test $p = ginstall && p=install + # Ignore the "[" program, since writing a portable make rule to + # generate its manpage is not practical. + dnl Use the autoconf-provided quadrigraph to represent "[", + dnl otherwise we will incur in dreadful quoting issues. + test x$p = x'@<:@' && continue + echo "man/$p.1" + done` + +# Not installed by "make install", but must be built when creating +# a distribution tarball. +EXTRA_MANS=`for p in $no_install_progs_default; do echo man/$p.1; done` + +# The programs built and installed by "make && make install". +# Since this is AC_SUBST'd, Automake won't be able to perform rewrite +# with $(EXEEXT) appending on it, so we have to do it ourselves -- in +# this case, only for $(bin_PROGRAMS). +bin_PROGRAMS=` + for p in $optional_bin_progs; do echo src/"$p"'$(EXEEXT)'; done` + +# Normalize whitespace. +man1_MANS=`echo $man1_MANS` +EXTRA_MANS=`echo $EXTRA_MANS` +bin_PROGRAMS=`echo $bin_PROGRAMS` +pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS` + +AC_SUBST([bin_PROGRAMS]) AM_SUBST_NOTMAKE([bin_PROGRAMS]) +AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS]) +AC_SUBST([man1_MANS]) AM_SUBST_NOTMAKE([man1_MANS]) +AC_SUBST([EXTRA_MANS]) AM_SUBST_NOTMAKE([EXTRA_MANS]) + +AC_SUBST([built_programs], [$optional_bin_progs]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) -# Arrange to rerun configure whenever the file, src/Makefile.am, -# containing the list of program names changes. -CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/src/Makefile.am' -AC_SUBST([CONFIG_STATUS_DEPENDENCIES]) ############################################################################ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in @@ -501,12 +485,7 @@ gt_LOCALE_FR AC_CONFIG_FILES( Makefile - doc/Makefile - lib/Makefile - man/Makefile po/Makefile.in - src/Makefile - tests/Makefile gnulib-tests/Makefile ) AC_OUTPUT |