X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfigure.in;h=20a64d501b507f928759ffe7cee7407d231de11e;hb=aac129d77611fab3db3f354c67c0f2c9406fa828;hp=280fc701fe81e646ae22dba2a0d62685999149e4;hpb=208a4923edd990535a9bbf73bf39a8609771aec3;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/configure.in b/gas/configure.in index 280fc701fe..20a64d501b 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -17,7 +17,7 @@ AC_CANONICAL_TARGET AC_ISC_POSIX changequote(,)dnl -BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in` +BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` changequote([,])dnl AM_INIT_AUTOMAKE(gas, ${BFD_VERSION}) @@ -58,6 +58,15 @@ AM_BINUTILS_WARNINGS # Generate a header file AC_CONFIG_HEADERS(config.h:config.in) +# PR 14072 +AH_VERBATIM([00_CONFIG_H_CHECK], +[/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1]) + # If we are on a DOS filesystem, we must use gdb.ini rather than # .gdbinit. case "${host}" in @@ -299,9 +308,9 @@ changequote([,])dnl extra_objects="$extra_objects bfin-parse.o" fi - echo ${extra_objects} | grep -s "bfin-lex.o" + echo ${extra_objects} | grep -s "bfin-lex-wrapper.o" if test $? -ne 0 ; then - extra_objects="$extra_objects bfin-lex.o" + extra_objects="$extra_objects bfin-lex-wrapper.o" fi ;; @@ -332,9 +341,9 @@ changequote([,])dnl extra_objects="$extra_objects itbl-parse.o" fi - echo ${extra_objects} | grep -s "itbl-lex.o" + echo ${extra_objects} | grep -s "itbl-lex-wrapper.o" if test $? -ne 0 ; then - extra_objects="$extra_objects itbl-lex.o" + extra_objects="$extra_objects itbl-lex-wrapper.o" fi echo ${extra_objects} | grep -s "itbl-ops.o" @@ -654,11 +663,8 @@ AC_C_INLINE # VMS doesn't have unlink. AC_CHECK_FUNCS(unlink remove, break) +AC_CHECK_FUNCS(sbrk setlocale) -# Some systems don't have sbrk(). -AC_CHECK_FUNCS(sbrk) - -AC_CHECK_FUNCS(setlocale) AM_LC_MESSAGES # do we need the math library? @@ -721,8 +727,7 @@ GAS_CHECK_DECL_NEEDED(malloc, f, char *(*f)(), $gas_test_headers) GAS_CHECK_DECL_NEEDED(sbrk, f, char *(*f)(), $gas_test_headers) GAS_CHECK_DECL_NEEDED(strstr, f, char *(*f)(), $gas_test_headers) -AC_CHECK_DECLS([mempcpy]) -AC_CHECK_DECLS([vsnprintf]) +AC_CHECK_DECLS([free, getenv, malloc, mempcpy, realloc, stpcpy, strstr, vsnprintf]) BFD_BINARY_FOPEN