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.
8 years ago · 5d762de01c
8 changed files with 21 additions and 4 deletions
--- 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.
--- 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.  */
--- 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:
--- 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>],
--- 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
--- 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.  */
--- 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,
--- 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.  */