re PR preprocessor/31932 (cpp -f*-charset and gcj --encoding accept no values except...

2009-03-30  Sergiy Vyshnevetskiy  <serg@vostok.net>

	PR preprocessor/31932:
	* internal.h: Don't mention HAVE_ICONV_H.
	* configure, config.in: Rebuild.
	* configure.ac: Don't check for iconv.h.

From-SVN: r145316

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 2672832..b2f4232 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-30  Sergiy Vyshnevetskiy  <serg@vostok.net>
+
+       PR preprocessor/31932:
+       * internal.h: Don't mention HAVE_ICONV_H.
+       * configure, config.in: Rebuild.
+       * configure.ac: Don't check for iconv.h.
+
 2009-03-30  Tom Tromey  <tromey@redhat.com>
 
        PR preprocessor/39512:

diff --git a/libcpp/config.in b/libcpp/config.in
index 5d52ec1..193f2a9 100644 (file)
--- a/libcpp/config.in
+++ b/libcpp/config.in
@@ -158,9 +158,6 @@
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 

diff --git a/libcpp/configure b/libcpp/configure
index d36ed25..9a4f30d 100755 (executable)
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -3619,8 +3619,7 @@ done
 
 
 
-
-for ac_header in iconv.h locale.h fcntl.h limits.h stddef.h \
+for ac_header in locale.h fcntl.h limits.h stddef.h \
        stdlib.h strings.h string.h sys/file.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index fd09865..833eb43 100644 (file)
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -37,7 +37,7 @@ ZW_PROG_COMPILER_DEPENDENCIES([CC])
 # Checks for header files.
 AC_HEADER_TIME
 ACX_HEADER_STRING
-AC_CHECK_HEADERS(iconv.h locale.h fcntl.h limits.h stddef.h \
+AC_CHECK_HEADERS(locale.h fcntl.h limits.h stddef.h \
        stdlib.h strings.h string.h sys/file.h unistd.h)
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/libcpp/internal.h b/libcpp/internal.h
index d4eeda4..38a80c6 100644 (file)
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -26,10 +26,6 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include "symtab.h"
 #include "cpp-id-data.h"
 
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
 #if HAVE_ICONV
 #include <iconv.h>
 #else