* acinclude.m4 (_NEWLIB_VERSION): Rename to:

(DEF_NEWLIB_VERSION).
	* configure.in (_NEWLIB_VERSION): Use NEWLIB_VERSION.
	* configure: Regenerate.

newlib/ChangeLog

@@ -1,3 +1,10 @@
+2006-05-11  J"orn Rennecke <joern.rennecke@st.com>
+
+	* acinclude.m4 (_NEWLIB_VERSION): Rename to:
+	(DEF_NEWLIB_VERSION).
+	* configure.in (_NEWLIB_VERSION): Use NEWLIB_VERSION.
+	* configure: Regenerate.
+
 2006-05-09  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/ctype/Makefile.am: Add $(ELIX_SOURCES) to

newlib/acinclude.m4

@@ -1,7 +1,7 @@
 dnl This provides configure definitions used by all the newlib
 dnl configure.in files.
 
-AC_DEFUN([_NEWLIB_VERSION],
+AC_DEFUN([DEF_NEWLIB_VERSION],
 m4_define([NEWLIB_VERSION],[1.14.0]))
 
 dnl Basic newlib configury.  This calls basic introductory stuff,
@@ -10,7 +10,7 @@ dnl configure.host.  The only argument is the relative path to the top
 dnl newlib directory.
 
 AC_DEFUN([NEWLIB_CONFIGURE],
-[AC_REQUIRE([_NEWLIB_VERSION])
+[AC_REQUIRE([DEF_NEWLIB_VERSION])
 dnl Default to --enable-multilib
 AC_ARG_ENABLE(multilib,
 [  --enable-multilib         build many library versions (default)],

newlib/configure

@@ -5148,7 +5148,7 @@ _ACEOF
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define  "$VERSION"
+#define _NEWLIB_VERSION "1.14.0"
 _ACEOF
 
 

newlib/configure.in

@@ -243,7 +243,7 @@ if test "${newlib_iconv_external_ccs}" = "yes"; then
 AC_DEFINE_UNQUOTED(_ICONV_ENABLE_EXTERNAL_CCS)
 fi
 
-AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION")
+AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"NEWLIB_VERSION")
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"