summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-05 14:38:57 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-05 14:38:57 +0000
commit374e0781dc6795c78d97f0de8cd2b6873431accb (patch)
tree3358ab37533d02c8b3f99a2f7f2186b9bb130e3c /zlib
parentc9a95885532b214c49415e6b80aaaab5a0ce7959 (diff)
downloadgcc-374e0781dc6795c78d97f0de8cd2b6873431accb.tar.gz
Merged r150260 through r150468 into branch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ifunc@150485 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'zlib')
-rw-r--r--zlib/ChangeLog.gcj4
-rw-r--r--zlib/configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index eee68cdf60b..2570352b14b 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,7 @@
+2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * configure.ac (_AC_ARG_VAR_PRECIOUS): Use m4_rename_force.
+
2009-03-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
diff --git a/zlib/configure.ac b/zlib/configure.ac
index c85f4d50c81..febe9e39b76 100644
--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -54,7 +54,7 @@ GCC_NO_EXECUTABLES
m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[])
AC_PROG_CC
-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
AC_SUBST(CFLAGS)