Fix a typo in iconv.m4.

config/
2018-11-09  Hafiz Abid Qadeer  <[email protected]>

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

gdb/
2018-11-09  Hafiz Abid Qadeer  <[email protected]>

	* configure: Regenerate.

binutils/
2018-11-09  Hafiz Abid Qadeer  <[email protected]>

	* configure: Regenerate.

intl/
2018-11-09  Hafiz Abid Qadeer  <[email protected]>

	* configure: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 77c61aac43fb4f76d98ff003a931d2521b76760a..873c3dd9fa56fdaf68ffb541f2d5d68aa948caa4 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <[email protected]>
+
+       * configure: Regenerate.
+
 2018-11-09  Mathias   <[email protected]>
 
        * strings.c (print_strings): Check for multibyte encodings.

diff --git a/binutils/configure b/binutils/configure
index e356ffdbda83679be5f722248cbb11ee51228c08..a2282b23576624124e6f53de59668fa602dcee86 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 b7f81e3b6ac7d9f2ed4f3835049c3cb0024963ed..f1b68731882d7a47bab2dfa703b9b2c37892c357 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-09  Hafiz Abid Qadeer  <[email protected]>
+
+       * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS.
+       Append $INCICONV to it.
+
 2018-10-31  Joseph Myers  <[email protected]>
 
        Merge from GCC:

diff --git a/config/iconv.m4 b/config/iconv.m4
index 5f9304a6ba6f6870e42f86b167b7d0fe59ff1f09..f1e54c5aedc99a832eaa223a548c1024361a681d 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 17bb500ad4953741d338fabf4c53913fcace90c3..b6c612bd0b2039b30c6726f7417c9cbf7bdbab07 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <[email protected]>
+
+       * configure: Regenerate.
+
 2018-11-09  Tom de Vries  <[email protected]>
 
        * symtab.c (symbol_set_names): Call symbol_find_demangled_name

diff --git a/gdb/configure b/gdb/configure
index 0f3ec4520aa9b9423af6b52739933d684b6dc65c..7665ba65319f52eaf62d4ce79c4535b4f134ed42 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 eddacfb309fd1e300ea825a3ed54f2b715f74c40..06c02701d8dd1a864106f77c115bce2f7825f8bd 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2018-11-09  Hafiz Abid Qadeer  <[email protected]>
+
+       * configure: Regenerate.
+
 2018-08-02  Simon Marchi  <[email protected]>
 
        * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext,

diff --git a/intl/configure b/intl/configure
index 5881cff2d896500d6c65c4e584c380623999f641..2f35993148e526cdb9ce68d04dae16a0e5d7b5ae 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.  */