diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2010-02-25 00:00:08 +0300 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2010-02-25 00:00:08 +0300 |
commit | 9035cfbd127e4342a6f16a30e08048204915dff9 (patch) | |
tree | 1eec12c3243f0b63022f0470d0d9d7ed89d3ba5d /newlib/libc/machine/sh | |
parent | ba7b214766091547ee5769d0f6b1bd92a4fdec50 (diff) |
2010-02-24 Charles Wilson <...>
Work around issues with new libtool files in ..
* configure.in: Unconditionally call _LT_PROG_ECHO_BACKSLASH.
* iconvdata/configure.in: Ditto.
* libc/configure.in: Ditto.
* libc/machine/configure.in: Ditto.
* libc/machine/i386/configure.in: Ditto.
* libc/sys/configure.in: Ditto.
* libc/sys/linux/configure.in: Ditto.
* libc/sys/linux/linuxthreads/configure.in: Ditto.
* libc/sys/linux/linuxthreads/machine/configure.in: Ditto.
* libc/sys/linux/linuxthreads/machine/i386/configure.in: Ditto.
* libc/sys/linux/machine/configure.in: Ditto.
* libc/sys/linux/machine/i386/configure.in: Ditto.
* libm/configure.in: Ditto.
* libm/machine/configure.in: Ditto.
* libm/machine/i386/configure.in: Ditto.
* libc/machine/sh/configure.in: Ditto. Also, call
AC_NO_EXECUTABLES before NEWLIB_CONFIGURE.
* aclocal.m4: Regenerated.
* configure: Ditto.
* Makefile.in: Ditto.
* doc/aclocal.m4: Ditto.
* doc/Makefile.in: Ditto.
* libc/*/aclocal.m4: Ditto.
* libc/*/Makefile.in: Ditto.
* libc/*/configure: Ditto.
* libm/*/aclocal.m4: Ditto.
* libm/*/Makefile.in: Ditto.
* libm/*/configure: Ditto.
Diffstat (limited to 'newlib/libc/machine/sh')
-rw-r--r-- | newlib/libc/machine/sh/Makefile.in | 2 | ||||
-rw-r--r-- | newlib/libc/machine/sh/aclocal.m4 | 6 | ||||
-rwxr-xr-x | newlib/libc/machine/sh/configure | 4 | ||||
-rw-r--r-- | newlib/libc/machine/sh/configure.in | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in index 4ed7dad2e..6bf5d38a5 100644 --- a/newlib/libc/machine/sh/Makefile.in +++ b/newlib/libc/machine/sh/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/newlib/libc/machine/sh/aclocal.m4 b/newlib/libc/machine/sh/aclocal.m4 index 9eff3d3a6..0564b7c4e 100644 --- a/newlib/libc/machine/sh/aclocal.m4 +++ b/newlib/libc/machine/sh/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/newlib/libc/machine/sh/configure b/newlib/libc/machine/sh/configure index f71f35c2c..314f93fa0 100755 --- a/newlib/libc/machine/sh/configure +++ b/newlib/libc/machine/sh/configure @@ -1886,6 +1886,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -3665,8 +3667,6 @@ OBJEXT=${oext} - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/newlib/libc/machine/sh/configure.in b/newlib/libc/machine/sh/configure.in index 248dd28b3..0adc8d6c3 100644 --- a/newlib/libc/machine/sh/configure.in +++ b/newlib/libc/machine/sh/configure.in @@ -8,10 +8,10 @@ AC_CONFIG_SRCDIR([asm.h]) dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. AC_CONFIG_AUX_DIR(../../../..) -NEWLIB_CONFIGURE(../../..) - AC_NO_EXECUTABLES +NEWLIB_CONFIGURE(../../..) + AC_EGREP_CPP([sh5], [ #if __SH5__ sh5 |