OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/54281 (Fails to bootstrap with --disable-nls)

Browse Source 
2012-08-17  Diego Novillo  <dnovillo@google.com>

	PR bootstrap/54281
	* configure.ac: Add libintl.h to AC_CHECK_HEADERS list.
	* config.in: Regenerate.
	* configure: Regenerate.
	* intl.h: Always include libintl.h if HAVE_LIBINTL_H is
	set.

From-SVN: r190487
This commit is contained in:
Diego Novillo 2012-08-17 11:37:57 -04:00 committed by Diego Novillo
parent a508e1a8cb
commit 4a8f754619
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2012-08-17 Diego Novillo <dnovillo@google.com>
PR bootstrap/54281
* configure.ac: Add libintl.h to AC_CHECK_HEADERS list.
* config.in: Regenerate.
* configure: Regenerate.
* intl.h: Always include libintl.h if HAVE_LIBINTL_H is
set.
2012-08-17 Richard Guenther <rguenther@suse.de>
* bitmap.h (struct bitmap_element_def): GTY annotate next/prev.

6
gcc/config.in
View File

@ -1260,6 +1260,12 @@
#endif
/* Define to 1 if you have the <libintl.h> header file. */
#ifndef USED_FOR_TARGET
#undef HAVE_LIBINTL_H
#endif
/* Define to 1 if you have the <limits.h> header file. */
#ifndef USED_FOR_TARGET
#undef HAVE_LIMITS_H

6
gcc/configure vendored
View File

@ -8248,7 +8248,7 @@ fi
for ac_header in limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h
direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h libintl.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
@ -17742,7 +17742,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 17744 "configure"
#line 17745 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -17848,7 +17848,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 17850 "configure"
#line 17851 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

2
gcc/configure.ac
View File

@ -912,7 +912,7 @@ AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h)
direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h libintl.h)
# Check for thread headers.
AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=])

10
gcc/intl.h
View File

@ -27,8 +27,16 @@
# define setlocale(category, locale) (locale)
#endif
/* If libintl.h is available, include it before testing for NLS. If we
are building with --disable-nls and another header file includes
libintl.h, the stubs defined down below will cause syntax errors
when parsing libintl.h. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54281
for details. */
#if defined(HAVE_LIBINTL_H) || defined(ENABLE_NLS)
# include <libintl.h>
#endif
#ifdef ENABLE_NLS
#include <libintl.h>
extern void gcc_init_libintl (void);
extern size_t gcc_gettext_width (const char *);
#else