diff options
| author | Joern Rennecke <joern.rennecke@embecosm.com> | 2006-05-11 19:49:52 +0400 |
|---|---|---|
| committer | Joern Rennecke <joern.rennecke@embecosm.com> | 2006-05-11 19:49:52 +0400 |
| commit | e1b888df24db3424b2e6e8f6b6690905bfbfe7a8 (patch) | |
| tree | 1ce666d56a9be589b29c3e75de2d8a772b961c67 /newlib | |
| parent | 51d7d63178390e0a5e793896c212c8f472bbf40b (diff) | |
* acinclude.m4 (_NEWLIB_VERSION): Rename to:
(DEF_NEWLIB_VERSION).
* configure.in (_NEWLIB_VERSION): Use NEWLIB_VERSION.
* configure: Regenerate.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | newlib/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | newlib/configure | 2 | ||||
| -rw-r--r-- | newlib/configure.in | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index d6a8581d4..2d554b435 100644 --- a/newlib/ChangeLog +++ b/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 diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index 4ecc231ff..3d65c3176 100644 --- a/newlib/acinclude.m4 +++ b/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)], diff --git a/newlib/configure b/newlib/configure index 0366dced2..cf213e75a 100755 --- a/newlib/configure +++ b/newlib/configure @@ -5148,7 +5148,7 @@ _ACEOF fi cat >>confdefs.h <<_ACEOF -#define "$VERSION" +#define _NEWLIB_VERSION "1.14.0" _ACEOF diff --git a/newlib/configure.in b/newlib/configure.in index 4d04aae05..2c5ca3c5d 100644 --- a/newlib/configure.in +++ b/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" |