Fix a typo in iconv.m4.

config/
2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
	Append $INCICONV to it.

gdb/
2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* configure: Regenerate.

binutils/
2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* configure: Regenerate.

intl/
2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>

	* configure: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 77c61aa..873c3dd 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * configure: Regenerate.
+
 2018-11-09  Mathias   <m4tze@exitno.de>
 
        * strings.c (print_strings): Check for multibyte encodings.

diff --git a/binutils/configure b/binutils/configure
index e356ffd..a2282b2 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -14803,7 +14803,7 @@ rm -f core conftest.err conftest.$ac_objext \
     if test "$am_cv_func_iconv" != yes; then
       am_save_CPPFLAGS="$CPPFLAGS"
       am_save_LIBS="$LIBS"
-      CPPFLAGS="$LIBS $INCICONV"
+      CPPFLAGS="$CPPFLAGS $INCICONV"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

diff --git a/config/ChangeLog b/config/ChangeLog
index b7f81e3..f1b6873 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
+       Append $INCICONV to it.
+
 2018-10-31  Joseph Myers  <joseph@codesourcery.com>
 
        Merge from GCC:

diff --git a/config/iconv.m4 b/config/iconv.m4
index 5f9304a..f1e54c5 100644 (file)
--- a/config/iconv.m4
+++ b/config/iconv.m4
@@ -73,7 +73,7 @@ AC_DEFUN([AM_ICONV_LINK],
     if test "$am_cv_func_iconv" != yes; then
       am_save_CPPFLAGS="$CPPFLAGS"
       am_save_LIBS="$LIBS"
-      CPPFLAGS="$LIBS $INCICONV"
+      CPPFLAGS="$CPPFLAGS $INCICONV"
       LIBS="$LIBS $LIBICONV"
       AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 17bb500..b6c612b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * configure: Regenerate.
+
 2018-11-09  Tom de Vries  <tdevries@suse.de>
 
        * symtab.c (symbol_set_names): Call symbol_find_demangled_name

diff --git a/gdb/configure b/gdb/configure
index 0f3ec45..7665ba6 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -8719,7 +8719,7 @@ rm -f core conftest.err conftest.$ac_objext \
     if test "$am_cv_func_iconv" != yes; then
       am_save_CPPFLAGS="$CPPFLAGS"
       am_save_LIBS="$LIBS"
-      CPPFLAGS="$LIBS $INCICONV"
+      CPPFLAGS="$CPPFLAGS $INCICONV"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

diff --git a/intl/ChangeLog b/intl/ChangeLog
index eddacfb..06c0270 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+       * configure: Regenerate.
+
 2018-08-02  Simon Marchi  <simon.marchi@ericsson.com>
 
        * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext,

diff --git a/intl/configure b/intl/configure
index 5881cff..2f35993 100755 (executable)
--- a/intl/configure
+++ b/intl/configure
@@ -5639,7 +5639,7 @@ rm -f core conftest.err conftest.$ac_objext \
     if test "$am_cv_func_iconv" != yes; then
       am_save_CPPFLAGS="$CPPFLAGS"
       am_save_LIBS="$LIBS"
-      CPPFLAGS="$LIBS $INCICONV"
+      CPPFLAGS="$CPPFLAGS $INCICONV"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */