diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index ae78cb18..fc1a0526 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-2014 Free Software Foundation, Inc. +# Copyright (C) 1991-2015 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 @@ -18,7 +18,7 @@ dnl Written by Jim Meyering. -AC_PREREQ([2.64]) +AC_PREREQ([2.69]) # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which # indicates that it is built from the 219th delta (in _some_ repository) @@ -454,28 +454,36 @@ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then gl_ADD_PROG([optional_bin_progs], [df]) fi -AC_MSG_CHECKING([whether this is system supports stdbuf]) -AC_COMPILE_IFELSE( +# Build stdbuf only if supported +ac_save_CFLAGS=$CFLAGS +ac_save_LDFLAGS=$LDFLAGS +# Detect warnings about ignored "constructor" attributes. +gl_WARN_ADD([-Werror], [CFLAGS]) +gl_WARN_ADD([-errwarn], [CFLAGS]) +# Put this message here, after gl_WARN_ADD's chatter. +AC_MSG_CHECKING([whether this system supports stdbuf]) +CFLAGS="-fPIC $CFLAGS" +LDFLAGS="-shared $LDFLAGS" +stdbuf_supported=no +# Note we only LINK here rather than RUN to support cross compilation +AC_LINK_IFELSE( [AC_LANG_PROGRAM([[ static int stdbuf = 0; - /* Restrict to ELF systems with compilers - that support the constructor attribute. */ void __attribute__ ((constructor)) stdbuf_init (void) { - #if __ELF__ - stdbuf = 1; - #endif + stdbuf = 1; }]],[[ return !(stdbuf == 1);]]) ], - [stdbuf_supported=yes], - [stdbuf_supported=no]) + [stdbuf_supported=yes]) AC_MSG_RESULT([$stdbuf_supported]) -if test "$stdbuf_supported" = "yes"; then +if test "$stdbuf_supported" = "yes" && test -z "$EXEEXT"; then gl_ADD_PROG([optional_bin_progs], [stdbuf]) fi +CFLAGS=$ac_save_CFLAGS +LDFLAGS=$ac_save_LDFLAGS ############################################################################ @@ -488,6 +496,8 @@ m4_include([m4/cu-progs.m4]) # Now that we know which programs will actually be built, determine # which optional helper progs should be compiled. +# Note it adding to pkglibexec_PROGRAMS, $(transform) in src/local.mk +# may need to be updated accordingly. case " $optional_bin_progs " in *' stdbuf '*) pkglibexec_PROGRAMS='src/libstdbuf.so';; *) pkglibexec_PROGRAMS='';; @@ -582,20 +592,11 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in # translatable strings, we must use need-formatstring-macros here. AM_GNU_GETTEXT([external], [need-formatstring-macros]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.2]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR -# If doing dynamic dependency checking, create man/dynamic-deps.mk so -# that 'make' doesn't complain about its being absent. Use an old -# time stamp, so that 'make' thinks it is older than 'Makefile'. -# Use time stamp 1, since some 'make' implementations treat 0 specially. -# Use 'touch -t', since older 'touch' implementations don't grok -d. -AC_CONFIG_COMMANDS([man/dynamic-deps.mk], - [test -n "$AMDEP_TRUE" || - TZ=UTC0 touch -t 197001010000.01 man/dynamic-deps.mk]) - AC_CONFIG_FILES( Makefile po/Makefile.in |