diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | configure | 95 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 13 insertions, 90 deletions
@@ -1,5 +1,8 @@ 2013-01-25 Thomas Schwinge <thomas@codesourcery.com> + * configure.in (_AC_PROG_CC_C89): New definition. + * configure: Regenerate. + * configure.in (AC_PROG_CPP): New definition. * configure: Regenerate. @@ -2327,6 +2327,11 @@ _ACEOF # <http://sourceware.org/ml/libc-alpha/2013-01/msg00721.html>. # AC_PROG_CPP +# We require GCC. Override _AC_PROG_CC_C89 here to work around the Autoconf +# issue discussed in +# <http://sourceware.org/ml/libc-alpha/2013-01/msg00757.html>. + + subdirs="$subdirs " @@ -2899,96 +2904,6 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/configure.in b/configure.in index 2c50d09..c578979 100644 --- a/configure.in +++ b/configure.in @@ -34,6 +34,11 @@ fi AC_SUBST(CPP)dnl ])# AC_PROG_CPP +# We require GCC. Override _AC_PROG_CC_C89 here to work around the Autoconf +# issue discussed in +# <http://sourceware.org/ml/libc-alpha/2013-01/msg00757.html>. +AC_DEFUN([_AC_PROG_CC_C89], [[$1]]) + dnl This is here so we can set $subdirs directly based on configure fragments. AC_CONFIG_SUBDIRS() |