From 5d762de01cc537cec47d3c7bbae0424a33b33b04 Mon Sep 17 00:00:00 2001 From: Hafiz Abid Qadeer Date: Fri, 9 Nov 2018 16:03:11 +0000 Subject: [PATCH] Fix a typo in iconv.m4. config/ 2018-11-09 Hafiz Abid Qadeer * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. Append $INCICONV to it. gdb/ 2018-11-09 Hafiz Abid Qadeer * configure: Regenerate. binutils/ 2018-11-09 Hafiz Abid Qadeer * configure: Regenerate. intl/ 2018-11-09 Hafiz Abid Qadeer * configure: Regenerate. --- binutils/ChangeLog | 4 ++++ binutils/configure | 2 +- config/ChangeLog | 5 +++++ config/iconv.m4 | 2 +- gdb/ChangeLog | 4 ++++ gdb/configure | 2 +- intl/ChangeLog | 4 ++++ intl/configure | 2 +- 8 files changed, 21 insertions(+), 4 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 77c61aac43f..873c3dd9fa5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2018-11-09 Hafiz Abid Qadeer + + * configure: Regenerate. + 2018-11-09 Mathias * strings.c (print_strings): Check for multibyte encodings. diff --git a/binutils/configure b/binutils/configure index e356ffdbda8..a2282b23576 100755 --- 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 b7f81e3b6ac..f1b68731882 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2018-11-09 Hafiz Abid Qadeer + + * iconv.m4 (AM_ICONV_LINK): Don't overwrite CPPFLAGS. + Append $INCICONV to it. + 2018-10-31 Joseph Myers Merge from GCC: diff --git a/config/iconv.m4 b/config/iconv.m4 index 5f9304a6ba6..f1e54c5aedc 100644 --- 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 #include ], diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 17bb500ad49..b6c612bd0b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-11-09 Hafiz Abid Qadeer + + * configure: Regenerate. + 2018-11-09 Tom de Vries * symtab.c (symbol_set_names): Call symbol_find_demangled_name diff --git a/gdb/configure b/gdb/configure index 0f3ec4520aa..7665ba65319 100755 --- 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 eddacfb309f..06c02701d8d 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2018-11-09 Hafiz Abid Qadeer + + * configure: Regenerate. + 2018-08-02 Simon Marchi * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext, diff --git a/intl/configure b/intl/configure index 5881cff2d89..2f35993148e 100755 --- 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. */ -- 2.30.2