diff options
| -rw-r--r-- | gcc/ChangeLog | 15 | ||||
| -rw-r--r-- | gcc/config.in | 6 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 | ||||
| -rw-r--r-- | gcc/intl.h | 10 |
5 files changed, 18 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1256a2e918a..a615f7fcd42 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2013-05-08 Diego Novillo <dnovillo@google.com> + + PR bootstrap/54659 + + Revert: + + 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. + 2013-05-08 Jan Hubicka <jh@suse.cz> PR lto/54095 diff --git a/gcc/config.in b/gcc/config.in index 66e47caa3ff..f122d48579e 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1297,12 +1297,6 @@ #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 diff --git a/gcc/configure b/gcc/configure index e1262cd2887..5161ae40d69 100755 --- a/gcc/configure +++ b/gcc/configure @@ -8292,7 +8292,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 libintl.h + direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.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" diff --git a/gcc/configure.ac b/gcc/configure.ac index a289cf748b5..b042f00013e 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -942,7 +942,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 libintl.h) + direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h) # Check for thread headers. AC_CHECK_HEADER(thread.h, [have_thread_h=yes], [have_thread_h=]) diff --git a/gcc/intl.h b/gcc/intl.h index 5ea5f5b7878..e1c6c2b22f6 100644 --- a/gcc/intl.h +++ b/gcc/intl.h @@ -26,16 +26,8 @@ # 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 |