[RFA] Change how CC, CFLAGS get set
Jeff Johnston
jjohnstn@redhat.com
Tue Jun 29 00:46:00 GMT 2004
I have a number of concerns with the patch you have submitted, but no objections
to the concept.
First of all, if you go around changing acinclude.m4, then "all" aclocal.m4
files and configure files have to be regenerated in the newlib directory.
Second, if you can, please use aclocal-1.4-p6 so as to minimize changes being
introduced.
Thirdly, the code moved to acinclude.m4 won't work for lower level directories
because it is using `pwd` which will change the targ-include directory every time.
-- Jeff J.
Christopher Faylor wrote:
> I just found out that, when building for cygwin, cd'ing to my newlib
> build directory, and typing "make", I was not getting the same
> environment as when building from the top-level. The reason is that the
> top-level makefile correctly puts cygwin include directories first while
> the newlib makefile, when not overridden, puts them last. Attempting to
> fix this turned out to be tricky but I think the below patch does it.
>
> The patch changes things so that all of the C compiler's flags are now
> in NEWLIB_CFLAGS rather than some conditionally showing up in the
> CC_FOR_NEWLIB and some in NEWLIB_CFLAGS. IMO this is a good thing. I
> think that CC should just be the compiler and not the compiler + flags.
> YMMV.
>
> Anyway, after this change CC_FOR_NEWLIB just turns out to be "CC", so
> maybe the right change is to get rid of CC_FOR_NEWLIB, too. I'll do
> that if the PTB (Hi, Jeff) think it's a good idea.
>
> Ok to checkin?
>
> cgf
>
> 2004-06-27 Christopher Faylor <cgf@timesys.com>
>
> * configure.in: Move NEWLIB_FOR_CC test to acinclude.m4.
> * configure: Regenerate.
> * configure.host: Put cygwin include search first rather than last.
> * acinclude.m4: Set NEWLIB_FOR_CC here. Don't modify CC. Just add
> stuff to CFLAGS.
> * aclocal.m4: Regenerate.
>
> Index: acinclude.m4
> ===================================================================
> RCS file: /cvs/uberbaum/newlib/acinclude.m4,v
> retrieving revision 1.17
> diff -d -u -p -r1.17 acinclude.m4
> --- acinclude.m4 25 Jun 2004 20:32:30 -0000 1.17
> +++ acinclude.m4 27 Jun 2004 19:16:56 -0000
> @@ -154,6 +154,13 @@ AM_MAINTAINER_MODE
> if false; then
> AC_EXEEXT
> fi
> +# These get added in the top-level configure.in, except in the case where
> +# newlib is being built natively.
> +LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
> +abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
> +if test -z "${LIBC_INCLUDE_GREP}"; then
> + newlib_cflags="$newlib_cflags -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
> +fi
>
> . [$]{newlib_basedir}/configure.host
>
> Index: aclocal.m4
> ===================================================================
> RCS file: /cvs/uberbaum/newlib/aclocal.m4,v
> retrieving revision 1.18
> diff -d -u -p -r1.18 aclocal.m4
> --- aclocal.m4 25 Jun 2004 20:32:31 -0000 1.18
> +++ aclocal.m4 27 Jun 2004 19:16:56 -0000
> @@ -1,6 +1,6 @@
> -dnl aclocal.m4 generated automatically by aclocal 1.4-p6
> +dnl aclocal.m4 generated automatically by aclocal 1.4
>
> -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
> +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
> dnl This file is free software; the Free Software Foundation
> dnl gives unlimited permission to copy and/or distribute it,
> dnl with or without modifications, as long as this notice is preserved.
> @@ -166,6 +166,13 @@ AM_MAINTAINER_MODE
> if false; then
> AC_EXEEXT
> fi
> +# These get added in the top-level configure.in, except in the case where
> +# newlib is being built natively.
> +LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
> +abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
> +if test -z "${LIBC_INCLUDE_GREP}"; then
> + newlib_cflags="$newlib_cflags -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
> +fi
>
> . [$]{newlib_basedir}/configure.host
>
> @@ -207,9 +214,8 @@ AC_SUBST(sys_dir)
> dnl Usage:
> dnl AM_INIT_AUTOMAKE(package,version, [no-define])
>
> -AC_DEFUN([AM_INIT_AUTOMAKE],
> -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
> -AC_REQUIRE([AC_PROG_INSTALL])
> +AC_DEFUN(AM_INIT_AUTOMAKE,
> +[AC_REQUIRE([AC_PROG_INSTALL])
> PACKAGE=[$1]
> AC_SUBST(PACKAGE)
> VERSION=[$2]
> @@ -225,47 +231,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
> AC_REQUIRE([AC_ARG_PROGRAM])
> dnl FIXME This is truly gross.
> missing_dir=`cd $ac_aux_dir && pwd`
> -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
> +AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
> AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
> -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
> +AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
> AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
> AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
> AC_REQUIRE([AC_PROG_MAKE_SET])])
>
> -# Copyright 2002 Free Software Foundation, Inc.
> -
> -# This program is free software; you can redistribute it and/or modify
> -# it under the terms of the GNU General Public License as published by
> -# the Free Software Foundation; either version 2, or (at your option)
> -# any later version.
> -
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> -# GNU General Public License for more details.
> -
> -# You should have received a copy of the GNU General Public License
> -# along with this program; if not, write to the Free Software
> -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
> -
> -# AM_AUTOMAKE_VERSION(VERSION)
> -# ----------------------------
> -# Automake X.Y traces this macro to ensure aclocal.m4 has been
> -# generated from the m4 files accompanying Automake X.Y.
> -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
> -
> -# AM_SET_CURRENT_AUTOMAKE_VERSION
> -# -------------------------------
> -# Call AM_AUTOMAKE_VERSION so it can be traced.
> -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
> -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
> - [AM_AUTOMAKE_VERSION([1.4-p6])])
> -
> #
> # Check to make sure that the build environment is sane.
> #
>
> -AC_DEFUN([AM_SANITY_CHECK],
> +AC_DEFUN(AM_SANITY_CHECK,
> [AC_MSG_CHECKING([whether build environment is sane])
> # Just in case
> sleep 1
> @@ -306,7 +283,7 @@ AC_MSG_RESULT(yes)])
>
> dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
> dnl The program must properly implement --version.
> -AC_DEFUN([AM_MISSING_PROG],
> +AC_DEFUN(AM_MISSING_PROG,
> [AC_MSG_CHECKING(for working $2)
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> @@ -322,7 +299,7 @@ AC_SUBST($1)])
>
> # Define a conditional.
>
> -AC_DEFUN([AM_CONDITIONAL],
> +AC_DEFUN(AM_CONDITIONAL,
> [AC_SUBST($1_TRUE)
> AC_SUBST($1_FALSE)
> if $2; then
> @@ -338,7 +315,7 @@ fi])
>
> # serial 1
>
> -AC_DEFUN([AM_MAINTAINER_MODE],
> +AC_DEFUN(AM_MAINTAINER_MODE,
> [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
> dnl maintainer-mode is disabled by default
> AC_ARG_ENABLE(maintainer-mode,
> @@ -355,7 +332,7 @@ AC_DEFUN([AM_MAINTAINER_MODE],
>
> # Like AC_CONFIG_HEADER, but automatically create stamp file.
>
> -AC_DEFUN([AM_CONFIG_HEADER],
> +AC_DEFUN(AM_CONFIG_HEADER,
> [AC_PREREQ([2.12])
> AC_CONFIG_HEADER([$1])
> dnl When config.status generates a header, we must update the stamp-h file.
> @@ -377,59 +354,27 @@ done<<>>dnl>>)
> changequote([,]))])
>
>
> -# serial 46 AC_PROG_LIBTOOL
> -AC_DEFUN([AC_PROG_LIBTOOL],
> -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
> -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
> -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
> - AC_PROVIDE_IFELSE([AC_PROG_CXX],
> - [AC_LIBTOOL_CXX],
> - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
> -])])
> -
> -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
> -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
> -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
> - AC_PROVIDE_IFELSE([AC_PROG_GCJ],
> - [AC_LIBTOOL_GCJ],
> - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
> - [AC_LIBTOOL_GCJ],
> - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
> - [AC_LIBTOOL_GCJ],
> - [ifdef([AC_PROG_GCJ],
> - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
> -])])
> - ifdef([A][M_PROG_GCJ],
> - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
> -])])
> - ifdef([LT_AC_PROG_GCJ],
> - [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
> -])])])])])])
> -
> -AC_DEFUN([_AC_PROG_LIBTOOL],
> +# serial 40 AC_PROG_LIBTOOL
> +AC_DEFUN(AC_PROG_LIBTOOL,
> [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
> -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
> -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
>
> # Save cache, so that ltconfig can load it
> AC_CACHE_SAVE
>
> # Actually configure libtool. ac_aux_dir is where install-sh is found.
> -AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
> -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
> -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
> -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
> -deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
> +CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
> +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
> +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
> ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
> -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
> +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
> || AC_MSG_ERROR([libtool configure failed])
>
> # Reload cache, that may have been modified by ltconfig
> AC_CACHE_LOAD
>
> # This can be used to rebuild libtool when needed
> -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
> +LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
>
> # Always use our own libtool.
> LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> @@ -440,43 +385,32 @@ AC_SUBST(LIBTOOL)dnl
> exec 5>>./config.log
> ])
>
> -AC_DEFUN([AC_LIBTOOL_SETUP],
> +AC_DEFUN(AC_LIBTOOL_SETUP,
> [AC_PREREQ(2.13)dnl
> AC_REQUIRE([AC_ENABLE_SHARED])dnl
> AC_REQUIRE([AC_ENABLE_STATIC])dnl
> AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
> AC_REQUIRE([AC_CANONICAL_HOST])dnl
> AC_REQUIRE([AC_CANONICAL_BUILD])dnl
> +AC_REQUIRE([AC_PROG_RANLIB])dnl
> AC_REQUIRE([AC_PROG_CC])dnl
> AC_REQUIRE([AC_PROG_LD])dnl
> -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
> AC_REQUIRE([AC_PROG_NM])dnl
> AC_REQUIRE([AC_PROG_LN_S])dnl
> -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
> -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
> -AC_REQUIRE([AC_OBJEXT])dnl
> -AC_REQUIRE([AC_EXEEXT])dnl
> dnl
>
> -# Only perform the check for file, if the check method requires it
> -case $deplibs_check_method in
> -file_magic*)
> - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
> - AC_PATH_MAGIC
> - fi
> - ;;
> +case "$target" in
> +NONE) lt_target="$host" ;;
> +*) lt_target="$target" ;;
> esac
>
> -AC_CHECK_TOOL(RANLIB, ranlib, :)
> -AC_CHECK_TOOL(STRIP, strip, :)
> -
> # Check for any special flags to pass to ltconfig.
> libtool_flags="--cache-file=$cache_file"
> test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
> test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
> test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
> -test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
> -test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
> +test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
> +test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
> ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
> [libtool_flags="$libtool_flags --enable-dlopen"])
> ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
> @@ -486,20 +420,14 @@ AC_ARG_ENABLE(libtool-lock,
> test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
> test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
>
> -AC_ARG_WITH(pic,
> - [ --with-pic try to use only PIC/non-PIC objects [default=use both]],
> - pic_mode="$withval", pic_mode=default)
> -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
> -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
> -
> # Some flags need to be propagated to the compiler or linker for good
> # libtool support.
> -case $host in
> +case "$lt_target" in
> *-*-irix6*)
> # Find out which ABI we are using.
> echo '[#]line __oline__ "configure"' > conftest.$ac_ext
> if AC_TRY_EVAL(ac_compile); then
> - case `/usr/bin/file conftest.$ac_objext` in
> + case "`/usr/bin/file conftest.o`" in
> *32-bit*)
> LD="${LD-ld} -32"
> ;;
> @@ -514,31 +442,12 @@ case $host in
> rm -rf conftest*
> ;;
>
> -ia64-*-hpux*)
> - # Find out which ABI we are using.
> - echo 'int i;' > conftest.$ac_ext
> - if AC_TRY_EVAL(ac_compile); then
> - case "`/usr/bin/file conftest.o`" in
> - *ELF-32*)
> - HPUX_IA64_MODE="32"
> - ;;
> - *ELF-64*)
> - HPUX_IA64_MODE="64"
> - ;;
> - esac
> - fi
> - rm -rf conftest*
> - ;;
> -
> *-*-sco3.2v5*)
> # On SCO OpenServer 5, we need -belf to get full-featured binaries.
> SAVE_CFLAGS="$CFLAGS"
> CFLAGS="$CFLAGS -belf"
> AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
> - [AC_LANG_SAVE
> - AC_LANG_C
> - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
> - AC_LANG_RESTORE])
> + [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
> if test x"$lt_cv_cc_needs_belf" != x"yes"; then
> # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
> CFLAGS="$SAVE_CFLAGS"
> @@ -546,56 +455,33 @@ ia64-*-hpux*)
> ;;
>
> ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
> -[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
> +[*-*-cygwin* | *-*-mingw*)
> AC_CHECK_TOOL(DLLTOOL, dlltool, false)
> AC_CHECK_TOOL(AS, as, false)
> AC_CHECK_TOOL(OBJDUMP, objdump, false)
> -
> - # recent cygwin and mingw systems supply a stub DllMain which the user
> - # can override, but on older systems we have to supply one
> - AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
> - [AC_TRY_LINK([],
> - [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
> - DllMain (0, 0, 0);],
> - [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
> -
> - case $host/$CC in
> - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
> - # old mingw systems require "-dll" to link a DLL, while more recent ones
> - # require "-mdll"
> - SAVE_CFLAGS="$CFLAGS"
> - CFLAGS="$CFLAGS -mdll"
> - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
> - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
> - CFLAGS="$SAVE_CFLAGS" ;;
> - *-*-cygwin* | *-*-pw32*)
> - # cygwin systems need to pass --dll to the linker, and not link
> - # crt.o which will require a WinMain@16 definition.
> - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
> - esac
> ;;
> - ])
> +])
> esac
> ])
>
> # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
> -AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
> +AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
>
> # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
> -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
> +AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
>
> # AC_ENABLE_SHARED - implement the --enable-shared flag
> # Usage: AC_ENABLE_SHARED[(DEFAULT)]
> # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
> # `yes'.
> -AC_DEFUN([AC_ENABLE_SHARED],
> -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
> +AC_DEFUN(AC_ENABLE_SHARED, [dnl
> +define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
> AC_ARG_ENABLE(shared,
> changequote(<<, >>)dnl
> << --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
> changequote([, ])dnl
> [p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_shared=yes ;;
> no) enable_shared=no ;;
> *)
> @@ -614,21 +500,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)d
> ])
>
> # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
> -AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> +AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> AC_ENABLE_SHARED(no)])
>
> # AC_ENABLE_STATIC - implement the --enable-static flag
> # Usage: AC_ENABLE_STATIC[(DEFAULT)]
> # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
> # `yes'.
> -AC_DEFUN([AC_ENABLE_STATIC],
> -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
> +AC_DEFUN(AC_ENABLE_STATIC, [dnl
> +define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
> AC_ARG_ENABLE(static,
> changequote(<<, >>)dnl
> << --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
> changequote([, ])dnl
> [p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_static=yes ;;
> no) enable_static=no ;;
> *)
> @@ -647,8 +533,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)d
> ])
>
> # AC_DISABLE_STATIC - set the default static flag to --disable-static
> -AC_DEFUN([AC_DISABLE_STATIC],
> -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> +AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> AC_ENABLE_STATIC(no)])
>
>
> @@ -656,14 +541,14 @@ AC_ENABLE_STATIC(no)])
> # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
> # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
> # `yes'.
> -AC_DEFUN([AC_ENABLE_FAST_INSTALL],
> -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
> +AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
> +define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
> AC_ARG_ENABLE(fast-install,
> changequote(<<, >>)dnl
> << --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
> changequote([, ])dnl
> [p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_fast_install=yes ;;
> no) enable_fast_install=no ;;
> *)
> @@ -681,98 +566,12 @@ esac],
> enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
> ])
>
> -# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
> -AC_DEFUN([AC_DISABLE_FAST_INSTALL],
> -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> +# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
> +AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> AC_ENABLE_FAST_INSTALL(no)])
>
> -# AC_LIBTOOL_PICMODE - implement the --with-pic flag
> -# Usage: AC_LIBTOOL_PICMODE[(MODE)]
> -# Where MODE is either `yes' or `no'. If omitted, it defaults to
> -# `both'.
> -AC_DEFUN([AC_LIBTOOL_PICMODE],
> -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> -pic_mode=ifelse($#,1,$1,default)])
> -
> -
> -# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
> -AC_DEFUN([AC_PATH_TOOL_PREFIX],
> -[AC_MSG_CHECKING([for $1])
> -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
> -[case $MAGIC_CMD in
> - /*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
> - ;;
> - ?:/*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
> - ;;
> - *)
> - ac_save_MAGIC_CMD="$MAGIC_CMD"
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> -dnl $ac_dummy forces splitting on constant user-supplied paths.
> -dnl POSIX.2 word splitting is done only on the output of word expansions,
> -dnl not every word. This closes a longstanding sh security hole.
> - ac_dummy="ifelse([$2], , $PATH, [$2])"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/$1; then
> - lt_cv_path_MAGIC_CMD="$ac_dir/$1"
> - if test -n "$file_magic_test_file"; then
> - case $deplibs_check_method in
> - "file_magic "*)
> - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
> - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
> - egrep "$file_magic_regex" > /dev/null; then
> - :
> - else
> - cat <<EOF 1>&2
> -
> -*** Warning: the command libtool uses to detect shared libraries,
> -*** $file_magic_cmd, produces output that libtool cannot recognize.
> -*** The result is that libtool may fail to recognize shared libraries
> -*** as such. This will affect the creation of libtool libraries that
> -*** depend on shared libraries, but programs linked with such libtool
> -*** libraries will work regardless of this problem. Nevertheless, you
> -*** may want to report the problem to your system manager and/or to
> -*** bug-libtool@gnu.org
> -
> -EOF
> - fi ;;
> - esac
> - fi
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> - MAGIC_CMD="$ac_save_MAGIC_CMD"
> - ;;
> -esac])
> -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> -if test -n "$MAGIC_CMD"; then
> - AC_MSG_RESULT($MAGIC_CMD)
> -else
> - AC_MSG_RESULT(no)
> -fi
> -])
> -
> -
> -# AC_PATH_MAGIC - find a file program which can recognise a shared library
> -AC_DEFUN([AC_PATH_MAGIC],
> -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
> -AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
> -if test -z "$lt_cv_path_MAGIC_CMD"; then
> - if test -n "$ac_tool_prefix"; then
> - AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
> - else
> - MAGIC_CMD=:
> - fi
> -fi
> -])
> -
> -
> # AC_PROG_LD - find the path to the GNU or non-GNU linker
> -AC_DEFUN([AC_PROG_LD],
> +AC_DEFUN(AC_PROG_LD,
> [AC_ARG_WITH(gnu-ld,
> [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
> test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
> @@ -780,20 +579,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
> AC_REQUIRE([AC_CANONICAL_HOST])dnl
> AC_REQUIRE([AC_CANONICAL_BUILD])dnl
> ac_prog=ld
> -if test "$GCC" = yes; then
> +if test "$ac_cv_prog_gcc" = yes; then
> # Check if gcc -print-prog-name=ld gives a path.
> AC_MSG_CHECKING([for ld used by GCC])
> - case $host in
> - *-*-mingw*)
> - # gcc leaves a trailing carriage return which upsets mingw
> - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
> - *)
> - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
> - esac
> - case $ac_prog in
> + ac_prog=`($CC -print-prog-name=ld) 2>&5`
> + case "$ac_prog" in
> # Accept absolute paths.
> - [[\\/]* | [A-Za-z]:[\\/]*)]
> - re_direlt=['/[^/][^/]*/\.\./']
> +changequote(,)dnl
> + [\\/]* | [A-Za-z]:[\\/]*)
> + re_direlt='/[^/][^/]*/\.\./'
> +changequote([,])dnl
> # Canonicalize the path of ld
> ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
> while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
> @@ -815,17 +610,17 @@ elif test "$with_gnu_ld" = yes; then
> else
> AC_MSG_CHECKING([for non-GNU ld])
> fi
> -AC_CACHE_VAL(lt_cv_path_LD,
> +AC_CACHE_VAL(ac_cv_path_LD,
> [if test -z "$LD"; then
> IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> for ac_dir in $PATH; do
> test -z "$ac_dir" && ac_dir=.
> if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
> - lt_cv_path_LD="$ac_dir/$ac_prog"
> + ac_cv_path_LD="$ac_dir/$ac_prog"
> # Check to see if the program is GNU ld. I'd rather use --version,
> # but apparently some GNU ld's only accept -v.
> # Break only if it was the GNU/non-GNU ld that we prefer.
> - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
> + if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
> test "$with_gnu_ld" != no && break
> else
> test "$with_gnu_ld" != yes && break
> @@ -834,9 +629,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
> done
> IFS="$ac_save_ifs"
> else
> - lt_cv_path_LD="$LD" # Let the user override the test with a path.
> + ac_cv_path_LD="$LD" # Let the user override the test with a path.
> fi])
> -LD="$lt_cv_path_LD"
> +LD="$ac_cv_path_LD"
> if test -n "$LD"; then
> AC_MSG_RESULT($LD)
> else
> @@ -846,240 +641,56 @@ test -z "$LD" && AC_MSG_ERROR([no accept
> AC_PROG_LD_GNU
> ])
>
> -AC_DEFUN([AC_PROG_LD_GNU],
> -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
> +AC_DEFUN(AC_PROG_LD_GNU,
> +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
> [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
> if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
> - lt_cv_prog_gnu_ld=yes
> + ac_cv_prog_gnu_ld=yes
> else
> - lt_cv_prog_gnu_ld=no
> + ac_cv_prog_gnu_ld=no
> fi])
> -with_gnu_ld=$lt_cv_prog_gnu_ld
> ])
>
> -# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
> -# -- PORTME Some linkers may need a different reload flag.
> -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
> -[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
> -[lt_cv_ld_reload_flag='-r'])
> -reload_flag=$lt_cv_ld_reload_flag
> -test -n "$reload_flag" && reload_flag=" $reload_flag"
> -])
> -
> -# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
> -# -- PORTME fill in with the dynamic library characteristics
> -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
> -[AC_CACHE_CHECK([how to recognise dependant libraries],
> -lt_cv_deplibs_check_method,
> -[lt_cv_file_magic_cmd='$MAGIC_CMD'
> -lt_cv_file_magic_test_file=
> -lt_cv_deplibs_check_method='unknown'
> -# Need to set the preceding variable on all platforms that support
> -# interlibrary dependencies.
> -# 'none' -- dependencies not supported.
> -# `unknown' -- same as none, but documents that we really don't know.
> -# 'pass_all' -- all dependencies passed with no checks.
> -# 'test_compile' -- check by making test program.
> -# 'file_magic [regex]' -- check by looking for files in library path
> -# which responds to the $file_magic_cmd with a given egrep regex.
> -# If you have `file' or equivalent on your system and you're not sure
> -# whether `pass_all' will *always* work, you probably want this one.
> -
> -case $host_os in
> -aix*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -beos*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -bsdi4*)
> - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
> - lt_cv_file_magic_cmd='/usr/bin/file -L'
> - lt_cv_file_magic_test_file=/shlib/libc.so
> - ;;
> -
> -cygwin* | mingw* |pw32*)
> - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
> - lt_cv_file_magic_cmd='$OBJDUMP -f'
> - ;;
> -
> -darwin* | rhapsody*)
> - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
> - lt_cv_file_magic_cmd='/usr/bin/file -L'
> - case "$host_os" in
> - rhapsody* | darwin1.[012])
> - lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
> - ;;
> - *) # Darwin 1.3 on
> - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
> - ;;
> - esac
> - ;;
> -
> -freebsd* )
> - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
> - case $host_cpu in
> - i*86 )
> - # Not sure whether the presence of OpenBSD here was a mistake.
> - # Let's accept both of them until this is cleared up.
> - lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
> - ;;
> - esac
> - else
> - lt_cv_deplibs_check_method=pass_all
> - fi
> - ;;
> -
> -gnu*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -hpux10.20*|hpux11*)
> - case $host_cpu in
> - hppa*)
> - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/libc.sl
> - ;;
> - ia64*)
> - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
> - ;;
> - esac
> - ;;
> -
> -irix5* | irix6*)
> - case $host_os in
> - irix5*)
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
> - ;;
> - *)
> - case $LD in
> - *-32|*"-32 ") libmagic=32-bit;;
> - *-n32|*"-n32 ") libmagic=N32;;
> - *-64|*"-64 ") libmagic=64-bit;;
> - *) libmagic=never-match;;
> - esac
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
> - ;;
> - esac
> - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -# This must be Linux ELF.
> -linux-gnu*)
> - case $host_cpu in
> - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
> - lt_cv_deplibs_check_method=pass_all ;;
> - *)
> - # glibc up to 2.1.1 does not perform some relocations on ARM
> - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
> - esac
> - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
> - ;;
> -
> -netbsd*)
> - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
> - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
> - else
> - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
> - fi
> - ;;
> -
> -newsos6)
> - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/libnls.so
> - ;;
> -
> -osf3* | osf4* | osf5*)
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
> - lt_cv_file_magic_test_file=/shlib/libc.so
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -sco3.2v5*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -solaris*)
> - lt_cv_deplibs_check_method=pass_all
> - lt_cv_file_magic_test_file=/lib/libc.so
> - ;;
> -
> -[sysv5uw[78]* | sysv4*uw2*)]
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
> - case $host_vendor in
> - ncr)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> - motorola)
> - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
> - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
> - ;;
> - esac
> - ;;
> -esac
> -])
> -file_magic_cmd=$lt_cv_file_magic_cmd
> -deplibs_check_method=$lt_cv_deplibs_check_method
> -])
> -
> -
> # AC_PROG_NM - find the path to a BSD-compatible name lister
> -AC_DEFUN([AC_PROG_NM],
> +AC_DEFUN(AC_PROG_NM,
> [AC_MSG_CHECKING([for BSD-compatible nm])
> -AC_CACHE_VAL(lt_cv_path_NM,
> +AC_CACHE_VAL(ac_cv_path_NM,
> [if test -n "$NM"; then
> # Let the user override the test.
> - lt_cv_path_NM="$NM"
> + ac_cv_path_NM="$NM"
> else
> IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
> test -z "$ac_dir" && ac_dir=.
> - tmp_nm=$ac_dir/${ac_tool_prefix}nm
> - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
> + if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
> # Check to see if the nm accepts a BSD-compat flag.
> # Adding the `sed 1q' prevents false positives on HP-UX, which says:
> # nm: unknown option "B" ignored
> - # Tru64's nm complains that /dev/null is an invalid object file
> - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
> - lt_cv_path_NM="$tmp_nm -B"
> + if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> + ac_cv_path_NM="$ac_dir/nm -B"
> break
> - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> - lt_cv_path_NM="$tmp_nm -p"
> + elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> + ac_cv_path_NM="$ac_dir/nm -p"
> break
> else
> - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
> + ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
> continue # so that we can try to find one that supports BSD flags
> fi
> fi
> done
> IFS="$ac_save_ifs"
> - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
> + test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
> fi])
> -NM="$lt_cv_path_NM"
> +NM="$ac_cv_path_NM"
> AC_MSG_RESULT([$NM])
> ])
>
> # AC_CHECK_LIBM - check for math library
> -AC_DEFUN([AC_CHECK_LIBM],
> +AC_DEFUN(AC_CHECK_LIBM,
> [AC_REQUIRE([AC_CANONICAL_HOST])dnl
> LIBM=
> -case $host in
> -*-*-beos* | *-*-cygwin* | *-*-pw32*)
> +case "$lt_target" in
> +*-*-beos* | *-*-cygwin*)
> # These system don't have libm
> ;;
> *-ncr-sysv4.3*)
> @@ -1093,39 +704,33 @@ esac
> ])
>
> # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
> -# the libltdl convenience library and INCLTDL to the include flags for
> -# the libltdl header and adds --enable-ltdl-convenience to the
> -# configure arguments. Note that LIBLTDL and INCLTDL are not
> -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
> -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
> -# with '${top_builddir}/' and INCLTDL will be prefixed with
> -# '${top_srcdir}/' (note the single quotes!). If your package is not
> -# flat and you're not using automake, define top_builddir and
> -# top_srcdir appropriately in the Makefiles.
> -AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
> -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> - case $enable_ltdl_convenience in
> +# the libltdl convenience library, adds --enable-ltdl-convenience to
> +# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
> +# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
> +# to be `${top_builddir}/libltdl'. Make sure you start DIR with
> +# '${top_builddir}/' (note the single quotes!) if your package is not
> +# flat, and, if you're not using automake, define top_builddir as
> +# appropriate in the Makefiles.
> +AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> + case "$enable_ltdl_convenience" in
> no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
> "") enable_ltdl_convenience=yes
> ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
> esac
> - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
> - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
> + LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
> + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
> ])
>
> # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
> -# the libltdl installable library and INCLTDL to the include flags for
> -# the libltdl header and adds --enable-ltdl-install to the configure
> -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
> -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
> -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
> -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
> -# with '${top_srcdir}/' (note the single quotes!). If your package is
> -# not flat and you're not using automake, define top_builddir and
> -# top_srcdir appropriately in the Makefiles.
> +# the libltdl installable library, and adds --enable-ltdl-install to
> +# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
> +# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
> +# to be `${top_builddir}/libltdl'. Make sure you start DIR with
> +# '${top_builddir}/' (note the single quotes!) if your package is not
> +# flat, and, if you're not using automake, define top_builddir as
> +# appropriate in the Makefiles.
> # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
> -AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
> -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> +AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
> AC_CHECK_LIB(ltdl, main,
> [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
> [if test x"$enable_ltdl_install" = xno; then
> @@ -1136,8 +741,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
> ])
> if test x"$enable_ltdl_install" = x"yes"; then
> ac_configure_args="$ac_configure_args --enable-ltdl-install"
> - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
> - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
> + LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
> + INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
> else
> ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
> LIBLTDL="-lltdl"
> @@ -1145,91 +750,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
> fi
> ])
>
> -# If this macro is not defined by Autoconf, define it here.
> -ifdef([AC_PROVIDE_IFELSE],
> - [],
> - [define([AC_PROVIDE_IFELSE],
> - [ifdef([AC_PROVIDE_$1],
> - [$2], [$3])])])
> -
> -# AC_LIBTOOL_CXX - enable support for C++ libraries
> -AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
> -
> -AC_DEFUN([_AC_LIBTOOL_CXX],
> -[AC_REQUIRE([AC_PROG_CXX])
> -AC_REQUIRE([AC_PROG_CXXCPP])
> -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
> -lt_save_CC="$CC"
> -lt_save_CFLAGS="$CFLAGS"
> -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
> -dnl is set to the C++ compiler.
> -AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
> -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
> -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
> -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
> -deplibs_check_method="$deplibs_check_method" \
> -file_magic_cmd="$file_magic_cmd" \
> -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
> ---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
> -|| AC_MSG_ERROR([libtool tag configuration failed])
> -CC="$lt_save_CC"
> -CFLAGS="$lt_save_CFLAGS"
> -
> -# Redirect the config.log output again, so that the ltconfig log is not
> -# clobbered by the next message.
> -exec 5>>./config.log
> -])
> -
> -# AC_LIBTOOL_GCJ - enable support for GCJ libraries
> -AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
> -
> -AC_DEFUN([_AC_LIBTOOL_GCJ],
> -[AC_REQUIRE([AC_PROG_LIBTOOL])
> -AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
> - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
> - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
> - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
> - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
> - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
> -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
> -lt_save_CC="$CC"
> -lt_save_CFLAGS="$CFLAGS"
> -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
> -dnl is set to the C++ compiler.
> -AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
> -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
> -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
> -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
> -deplibs_check_method="$deplibs_check_method" \
> -file_magic_cmd="$file_magic_cmd" \
> -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
> ---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
> -|| AC_MSG_ERROR([libtool tag configuration failed])
> -CC="$lt_save_CC"
> -CFLAGS="$lt_save_CFLAGS"
> -
> -# Redirect the config.log output again, so that the ltconfig log is not
> -# clobbered by the next message.
> -exec 5>>./config.log
> -])
> -
> dnl old names
> -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
> -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
> -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
> -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
> -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
> -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
> -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
> +AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
> +AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
> +AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
> +AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
> +AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
> +AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
> +AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
>
> dnl This is just to silence aclocal about the macro not being used
> ifelse([AC_DISABLE_FAST_INSTALL])dnl
>
> -AC_DEFUN([LT_AC_PROG_GCJ],
> -[AC_CHECK_TOOL(GCJ, gcj, no)
> - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
> - AC_SUBST(GCJFLAGS)
> -])
> -
> Index: configure
> ===================================================================
> RCS file: /cvs/uberbaum/newlib/configure,v
> retrieving revision 1.33
> diff -d -u -p -r1.33 configure
> --- configure 25 Jun 2004 20:32:31 -0000 1.33
> +++ configure 27 Jun 2004 19:16:57 -0000
> @@ -57,8 +57,6 @@ ac_help="$ac_help
> ac_help="$ac_help
> --disable-libtool-lock avoid locking (might break parallel builds)"
> ac_help="$ac_help
> - --with-pic try to use only PIC/non-PIC objects [default=use both]"
> -ac_help="$ac_help
> --enable-newlib-hw-fp Turn on hardware floating point math"
>
> # Initialize some variables set by options.
> @@ -706,7 +704,7 @@ else
> newlib_iconv_external_ccs=${newlib_iconv_external_ccs}
> fi
>
> -am__api_version="1.4"
> +
> # Find a good install program. We prefer a C program (faster),
> # so one script is as good as another. But avoid the broken or
> # incompatible versions:
> @@ -719,7 +717,7 @@ am__api_version="1.4"
> # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> # ./install, which can be erroneously created by make from ./install.sh.
> echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
> -echo "configure:723: checking for a BSD compatible install" >&5
> +echo "configure:721: checking for a BSD compatible install" >&5
> if test -z "$INSTALL"; then
> if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> @@ -772,7 +770,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>
> echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
> -echo "configure:776: checking whether build environment is sane" >&5
> +echo "configure:774: checking whether build environment is sane" >&5
> # Just in case
> sleep 1
> echo timestamp > conftestfile
> @@ -829,7 +827,7 @@ test "$program_suffix" != NONE &&
> test "$program_transform_name" = "" && program_transform_name="s,x,x,"
>
> echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
> -echo "configure:833: checking whether ${MAKE-make} sets \${MAKE}" >&5
> +echo "configure:831: checking whether ${MAKE-make} sets \${MAKE}" >&5
> set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
> if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> @@ -862,12 +860,12 @@ else
> fi
>
> echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
> -echo "configure:866: checking for Cygwin environment" >&5
> +echo "configure:864: checking for Cygwin environment" >&5
> if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> cat > conftest.$ac_ext <<EOF
> -#line 871 "configure"
> +#line 869 "configure"
> #include "confdefs.h"
>
> int main() {
> @@ -878,7 +876,7 @@ int main() {
> return __CYGWIN__;
> ; return 0; }
> EOF
> -if { (eval echo configure:882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> rm -rf conftest*
> ac_cv_cygwin=yes
> else
> @@ -895,19 +893,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
> CYGWIN=
> test "$ac_cv_cygwin" = yes && CYGWIN=yes
> echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
> -echo "configure:899: checking for mingw32 environment" >&5
> +echo "configure:897: checking for mingw32 environment" >&5
> if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> cat > conftest.$ac_ext <<EOF
> -#line 904 "configure"
> +#line 902 "configure"
> #include "confdefs.h"
>
> int main() {
> return __MINGW32__;
> ; return 0; }
> EOF
> -if { (eval echo configure:911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> +if { (eval echo configure:909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> rm -rf conftest*
> ac_cv_mingw32=yes
> else
> @@ -1063,7 +1061,7 @@ else { echo "configure: error: can not r
> fi
>
> echo $ac_n "checking host system type""... $ac_c" 1>&6
> -echo "configure:1067: checking host system type" >&5
> +echo "configure:1065: checking host system type" >&5
>
> host_alias=$host
> case "$host_alias" in
> @@ -1084,7 +1082,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
> echo "$ac_t""$host" 1>&6
>
> echo $ac_n "checking target system type""... $ac_c" 1>&6
> -echo "configure:1088: checking target system type" >&5
> +echo "configure:1086: checking target system type" >&5
>
> target_alias=$target
> case "$target_alias" in
> @@ -1102,7 +1100,7 @@ target_os=`echo $target | sed 's/^\([^-]
> echo "$ac_t""$target" 1>&6
>
> echo $ac_n "checking build system type""... $ac_c" 1>&6
> -echo "configure:1106: checking build system type" >&5
> +echo "configure:1104: checking build system type" >&5
>
> build_alias=$build
> case "$build_alias" in
> @@ -1144,21 +1142,21 @@ EOF
>
>
> missing_dir=`cd $ac_aux_dir && pwd`
> -echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
> -echo "configure:1149: checking for working aclocal-${am__api_version}" >&5
> +echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
> +echo "configure:1147: checking for working aclocal" >&5
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> # Redirect stdin to placate older versions of autoconf. Sigh.
> -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
> - ACLOCAL=aclocal-${am__api_version}
> +if (aclocal --version) < /dev/null > /dev/null 2>&1; then
> + ACLOCAL=aclocal
> echo "$ac_t""found" 1>&6
> else
> - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
> + ACLOCAL="$missing_dir/missing aclocal"
> echo "$ac_t""missing" 1>&6
> fi
>
> echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
> -echo "configure:1162: checking for working autoconf" >&5
> +echo "configure:1160: checking for working autoconf" >&5
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> # Redirect stdin to placate older versions of autoconf. Sigh.
> @@ -1170,21 +1168,21 @@ else
> echo "$ac_t""missing" 1>&6
> fi
>
> -echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
> -echo "configure:1175: checking for working automake-${am__api_version}" >&5
> +echo $ac_n "checking for working automake""... $ac_c" 1>&6
> +echo "configure:1173: checking for working automake" >&5
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> # Redirect stdin to placate older versions of autoconf. Sigh.
> -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
> - AUTOMAKE=automake-${am__api_version}
> +if (automake --version) < /dev/null > /dev/null 2>&1; then
> + AUTOMAKE=automake
> echo "$ac_t""found" 1>&6
> else
> - AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
> + AUTOMAKE="$missing_dir/missing automake"
> echo "$ac_t""missing" 1>&6
> fi
>
> echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
> -echo "configure:1188: checking for working autoheader" >&5
> +echo "configure:1186: checking for working autoheader" >&5
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> # Redirect stdin to placate older versions of autoconf. Sigh.
> @@ -1197,7 +1195,7 @@ else
> fi
>
> echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
> -echo "configure:1201: checking for working makeinfo" >&5
> +echo "configure:1199: checking for working makeinfo" >&5
> # Run test in a subshell; some versions of sh will print an error if
> # an executable is not found, even if stderr is redirected.
> # Redirect stdin to placate older versions of autoconf. Sigh.
> @@ -1222,7 +1220,7 @@ fi
> # Extract the first word of "gcc", so it can be a program name with args.
> set dummy gcc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1226: checking for $ac_word" >&5
> +echo "configure:1224: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1252,7 +1250,7 @@ if test -z "$CC"; then
> # Extract the first word of "cc", so it can be a program name with args.
> set dummy cc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1256: checking for $ac_word" >&5
> +echo "configure:1254: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1301,7 +1299,7 @@ fi
> fi
>
> echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
> -echo "configure:1305: checking whether we are using GNU C" >&5
> +echo "configure:1303: checking whether we are using GNU C" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1310,7 +1308,7 @@ else
> yes;
> #endif
> EOF
> -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
> +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
> ac_cv_prog_gcc=yes
> else
> ac_cv_prog_gcc=no
> @@ -1325,7 +1323,7 @@ if test $ac_cv_prog_gcc = yes; then
> ac_save_CFLAGS="$CFLAGS"
> CFLAGS=
> echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
> -echo "configure:1329: checking whether ${CC-cc} accepts -g" >&5
> +echo "configure:1327: checking whether ${CC-cc} accepts -g" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1356,7 +1354,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
> set dummy ${ac_tool_prefix}as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1360: checking for $ac_word" >&5
> +echo "configure:1358: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1388,7 +1386,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
> set dummy ${ac_tool_prefix}ar; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1392: checking for $ac_word" >&5
> +echo "configure:1390: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1420,7 +1418,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
> set dummy ${ac_tool_prefix}ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1424: checking for $ac_word" >&5
> +echo "configure:1422: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1452,7 +1450,7 @@ if test -n "$ac_tool_prefix"; then
> # Extract the first word of "ranlib", so it can be a program name with args.
> set dummy ranlib; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1456: checking for $ac_word" >&5
> +echo "configure:1454: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1497,7 +1495,7 @@ fi
> # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
> # ./install, which can be erroneously created by make from ./install.sh.
> echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
> -echo "configure:1501: checking for a BSD compatible install" >&5
> +echo "configure:1499: checking for a BSD compatible install" >&5
> if test -z "$INSTALL"; then
> if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> @@ -1551,7 +1549,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
>
>
> echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
> -echo "configure:1555: checking whether to enable maintainer-specific portions of Makefiles" >&5
> +echo "configure:1553: checking whether to enable maintainer-specific portions of Makefiles" >&5
> # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
> if test "${enable_maintainer_mode+set}" = set; then
> enableval="$enable_maintainer_mode"
> @@ -1585,7 +1583,7 @@ if false; then
>
>
> echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
> -echo "configure:1589: checking for executable suffix" >&5
> +echo "configure:1587: checking for executable suffix" >&5
> if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1595,7 +1593,7 @@ else
> rm -f conftest*
> echo 'int main () { return 0; }' > conftest.$ac_ext
> ac_cv_exeext=
> - if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
> + if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
> for file in conftest.*; do
> case $file in
> *.c | *.o | *.obj) ;;
> @@ -1616,6 +1614,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
> ac_exeext=$EXEEXT
>
> fi
> +# These get added in the top-level configure.in, except in the case where
> +# newlib is being built natively.
> +LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
> +abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
> +if test -z "${LIBC_INCLUDE_GREP}"; then
> + newlib_cflags="$newlib_cflags -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
> +fi
>
> . ${newlib_basedir}/configure.host
>
> @@ -1695,6 +1700,8 @@ OBJEXT=${oext}
>
>
>
> +CC_FOR_NEWLIB="${CC}"
> +
>
> if test "${use_libtool}" = "yes"; then
>
> @@ -1702,7 +1709,7 @@ if test "${use_libtool}" = "yes"; then
> if test "${enable_shared+set}" = set; then
> enableval="$enable_shared"
> p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_shared=yes ;;
> no) enable_shared=no ;;
> *)
> @@ -1725,7 +1732,7 @@ fi
> if test "${enable_static+set}" = set; then
> enableval="$enable_static"
> p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_static=yes ;;
> no) enable_static=no ;;
> *)
> @@ -1748,7 +1755,7 @@ fi
> if test "${enable_fast_install+set}" = set; then
> enableval="$enable_fast_install"
> p=${PACKAGE-default}
> -case $enableval in
> +case "$enableval" in
> yes) enable_fast_install=yes ;;
> no) enable_fast_install=no ;;
> *)
> @@ -1767,10 +1774,40 @@ else
> enable_fast_install=yes
> fi
>
> +# Extract the first word of "ranlib", so it can be a program name with args.
> +set dummy ranlib; ac_word=$2
> +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> +echo "configure:1781: checking for $ac_word" >&5
> +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
> + echo $ac_n "(cached) $ac_c" 1>&6
> +else
> + if test -n "$RANLIB"; then
> + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
> +else
> + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> + ac_dummy="$PATH"
> + for ac_dir in $ac_dummy; do
> + test -z "$ac_dir" && ac_dir=.
> + if test -f $ac_dir/$ac_word; then
> + ac_cv_prog_RANLIB="ranlib"
> + break
> + fi
> + done
> + IFS="$ac_save_ifs"
> + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
> +fi
> +fi
> +RANLIB="$ac_cv_prog_RANLIB"
> +if test -n "$RANLIB"; then
> + echo "$ac_t""$RANLIB" 1>&6
> +else
> + echo "$ac_t""no" 1>&6
> +fi
> +
> # Extract the first word of "gcc", so it can be a program name with args.
> set dummy gcc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1774: checking for $ac_word" >&5
> +echo "configure:1811: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1800,7 +1837,7 @@ if test -z "$CC"; then
> # Extract the first word of "cc", so it can be a program name with args.
> set dummy cc; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1804: checking for $ac_word" >&5
> +echo "configure:1841: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1851,7 +1888,7 @@ fi
> # Extract the first word of "cl", so it can be a program name with args.
> set dummy cl; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:1855: checking for $ac_word" >&5
> +echo "configure:1892: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1883,7 +1920,7 @@ fi
> fi
>
> echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
> -echo "configure:1887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
> +echo "configure:1924: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
>
> ac_ext=c
> # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
> @@ -1894,12 +1931,12 @@ cross_compiling=$ac_cv_prog_cc_cross
>
> cat > conftest.$ac_ext << EOF
>
> -#line 1898 "configure"
> +#line 1935 "configure"
> #include "confdefs.h"
>
> main(){return(0);}
> EOF
> -if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> ac_cv_prog_cc_works=yes
> # If we can't run a trivial program, we are probably using a cross compiler.
> if (./conftest; exit) 2>/dev/null; then
> @@ -1925,12 +1962,12 @@ if test $ac_cv_prog_cc_works = no; then
> { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
> fi
> echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
> -echo "configure:1929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
> +echo "configure:1966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
> echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
> cross_compiling=$ac_cv_prog_cc_cross
>
> echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
> -echo "configure:1934: checking whether we are using GNU C" >&5
> +echo "configure:1971: checking whether we are using GNU C" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1939,7 +1976,7 @@ else
> yes;
> #endif
> EOF
> -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
> +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
> ac_cv_prog_gcc=yes
> else
> ac_cv_prog_gcc=no
> @@ -1958,7 +1995,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
> ac_save_CFLAGS="$CFLAGS"
> CFLAGS=
> echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
> -echo "configure:1962: checking whether ${CC-cc} accepts -g" >&5
> +echo "configure:1999: checking whether ${CC-cc} accepts -g" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -1998,18 +2035,12 @@ else
> fi
>
> ac_prog=ld
> -if test "$GCC" = yes; then
> +if test "$ac_cv_prog_gcc" = yes; then
> # Check if gcc -print-prog-name=ld gives a path.
> echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
> -echo "configure:2005: checking for ld used by GCC" >&5
> - case $host in
> - *-*-mingw*)
> - # gcc leaves a trailing carriage return which upsets mingw
> - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
> - *)
> - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
> - esac
> - case $ac_prog in
> +echo "configure:2042: checking for ld used by GCC" >&5
> + ac_prog=`($CC -print-prog-name=ld) 2>&5`
> + case "$ac_prog" in
> # Accept absolute paths.
> [\\/]* | [A-Za-z]:[\\/]*)
> re_direlt='/[^/][^/]*/\.\./'
> @@ -2031,12 +2062,12 @@ echo "configure:2005: checking for ld us
> esac
> elif test "$with_gnu_ld" = yes; then
> echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
> -echo "configure:2035: checking for GNU ld" >&5
> +echo "configure:2066: checking for GNU ld" >&5
> else
> echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
> -echo "configure:2038: checking for non-GNU ld" >&5
> +echo "configure:2069: checking for non-GNU ld" >&5
> fi
> -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
> +if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> if test -z "$LD"; then
> @@ -2044,11 +2075,11 @@ else
> for ac_dir in $PATH; do
> test -z "$ac_dir" && ac_dir=.
> if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
> - lt_cv_path_LD="$ac_dir/$ac_prog"
> + ac_cv_path_LD="$ac_dir/$ac_prog"
> # Check to see if the program is GNU ld. I'd rather use --version,
> # but apparently some GNU ld's only accept -v.
> # Break only if it was the GNU/non-GNU ld that we prefer.
> - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
> + if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
> test "$with_gnu_ld" != no && break
> else
> test "$with_gnu_ld" != yes && break
> @@ -2057,11 +2088,11 @@ else
> done
> IFS="$ac_save_ifs"
> else
> - lt_cv_path_LD="$LD" # Let the user override the test with a path.
> + ac_cv_path_LD="$LD" # Let the user override the test with a path.
> fi
> fi
>
> -LD="$lt_cv_path_LD"
> +LD="$ac_cv_path_LD"
> if test -n "$LD"; then
> echo "$ac_t""$LD" 1>&6
> else
> @@ -2069,74 +2100,59 @@ else
> fi
> test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
> echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
> -echo "configure:2073: checking if the linker ($LD) is GNU ld" >&5
> -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
> +echo "configure:2104: checking if the linker ($LD) is GNU ld" >&5
> +if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> # I'd rather use --version here, but apparently some GNU ld's only accept -v.
> if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
> - lt_cv_prog_gnu_ld=yes
> + ac_cv_prog_gnu_ld=yes
> else
> - lt_cv_prog_gnu_ld=no
> + ac_cv_prog_gnu_ld=no
> fi
> fi
>
> -echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
> -with_gnu_ld=$lt_cv_prog_gnu_ld
> -
> -
> -echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
> -echo "configure:2090: checking for $LD option to reload object files" >&5
> -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - lt_cv_ld_reload_flag='-r'
> -fi
> +echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
>
> -echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
> -reload_flag=$lt_cv_ld_reload_flag
> -test -n "$reload_flag" && reload_flag=" $reload_flag"
>
> echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
> -echo "configure:2102: checking for BSD-compatible nm" >&5
> -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
> +echo "configure:2120: checking for BSD-compatible nm" >&5
> +if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> if test -n "$NM"; then
> # Let the user override the test.
> - lt_cv_path_NM="$NM"
> + ac_cv_path_NM="$NM"
> else
> IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
> for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
> test -z "$ac_dir" && ac_dir=.
> - tmp_nm=$ac_dir/${ac_tool_prefix}nm
> - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
> + if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
> # Check to see if the nm accepts a BSD-compat flag.
> # Adding the `sed 1q' prevents false positives on HP-UX, which says:
> # nm: unknown option "B" ignored
> - # Tru64's nm complains that /dev/null is an invalid object file
> - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
> - lt_cv_path_NM="$tmp_nm -B"
> + if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> + ac_cv_path_NM="$ac_dir/nm -B"
> break
> - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> - lt_cv_path_NM="$tmp_nm -p"
> + elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
> + ac_cv_path_NM="$ac_dir/nm -p"
> break
> else
> - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
> + ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
> continue # so that we can try to find one that supports BSD flags
> fi
> fi
> done
> IFS="$ac_save_ifs"
> - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
> + test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
> fi
> fi
>
> -NM="$lt_cv_path_NM"
> +NM="$ac_cv_path_NM"
> echo "$ac_t""$NM" 1>&6
>
> echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
> -echo "configure:2140: checking whether ln -s works" >&5
> +echo "configure:2156: checking whether ln -s works" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2156,482 +2172,19 @@ else
> echo "$ac_t""no" 1>&6
> fi
>
> -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
> -echo "configure:2161: checking how to recognise dependant libraries" >&5
> -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - lt_cv_file_magic_cmd='$MAGIC_CMD'
> -lt_cv_file_magic_test_file=
> -lt_cv_deplibs_check_method='unknown'
> -# Need to set the preceding variable on all platforms that support
> -# interlibrary dependencies.
> -# 'none' -- dependencies not supported.
> -# `unknown' -- same as none, but documents that we really don't know.
> -# 'pass_all' -- all dependencies passed with no checks.
> -# 'test_compile' -- check by making test program.
> -# 'file_magic [regex]' -- check by looking for files in library path
> -# which responds to the $file_magic_cmd with a given egrep regex.
> -# If you have `file' or equivalent on your system and you're not sure
> -# whether `pass_all' will *always* work, you probably want this one.
> -
> -case $host_os in
> -aix*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -beos*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -bsdi4*)
> - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
> - lt_cv_file_magic_cmd='/usr/bin/file -L'
> - lt_cv_file_magic_test_file=/shlib/libc.so
> - ;;
> -
> -cygwin* | mingw* |pw32*)
> - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
> - lt_cv_file_magic_cmd='$OBJDUMP -f'
> - ;;
> -
> -darwin* | rhapsody*)
> - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
> - lt_cv_file_magic_cmd='/usr/bin/file -L'
> - case "$host_os" in
> - rhapsody* | darwin1.012)
> - lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
> - ;;
> - *) # Darwin 1.3 on
> - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
> - ;;
> - esac
> - ;;
> -
> -freebsd* )
> - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
> - case $host_cpu in
> - i*86 )
> - # Not sure whether the presence of OpenBSD here was a mistake.
> - # Let's accept both of them until this is cleared up.
> - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
> - ;;
> - esac
> - else
> - lt_cv_deplibs_check_method=pass_all
> - fi
> - ;;
> -
> -gnu*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -hpux10.20*|hpux11*)
> - case $host_cpu in
> - hppa*)
> - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/libc.sl
> - ;;
> - ia64*)
> - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
> - ;;
> - esac
> - ;;
> -
> -irix5* | irix6*)
> - case $host_os in
> - irix5*)
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
> - ;;
> - *)
> - case $LD in
> - *-32|*"-32 ") libmagic=32-bit;;
> - *-n32|*"-n32 ") libmagic=N32;;
> - *-64|*"-64 ") libmagic=64-bit;;
> - *) libmagic=never-match;;
> - esac
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
> - ;;
> - esac
> - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -# This must be Linux ELF.
> -linux-gnu*)
> - case $host_cpu in
> - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
> - lt_cv_deplibs_check_method=pass_all ;;
> - *)
> - # glibc up to 2.1.1 does not perform some relocations on ARM
> - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
> - esac
> - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
> - ;;
> -
> -netbsd*)
> - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
> - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
> - else
> - lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
> - fi
> - ;;
> -
> -newsos6)
> - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
> - lt_cv_file_magic_cmd=/usr/bin/file
> - lt_cv_file_magic_test_file=/usr/lib/libnls.so
> - ;;
> -
> -osf3* | osf4* | osf5*)
> - # this will be overridden with pass_all, but let us keep it just in case
> - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
> - lt_cv_file_magic_test_file=/shlib/libc.so
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -sco3.2v5*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -solaris*)
> - lt_cv_deplibs_check_method=pass_all
> - lt_cv_file_magic_test_file=/lib/libc.so
> - ;;
> -
> -sysv5uw[78]* | sysv4*uw2*)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> -
> -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
> - case $host_vendor in
> - ncr)
> - lt_cv_deplibs_check_method=pass_all
> - ;;
> - motorola)
> - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
> - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
> - ;;
> - esac
> - ;;
> -esac
> -
> -fi
> -
> -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
> -file_magic_cmd=$lt_cv_file_magic_cmd
> -deplibs_check_method=$lt_cv_deplibs_check_method
> -
> -echo $ac_n "checking for object suffix""... $ac_c" 1>&6
> -echo "configure:2334: checking for object suffix" >&5
> -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - rm -f conftest*
> -echo 'int i = 1;' > conftest.$ac_ext
> -if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> - for ac_file in conftest.*; do
> - case $ac_file in
> - *.c) ;;
> - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
> - esac
> - done
> -else
> - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
> -fi
> -rm -f conftest*
> -fi
> -
> -echo "$ac_t""$ac_cv_objext" 1>&6
> -OBJEXT=$ac_cv_objext
> -ac_objext=$ac_cv_objext
> -
> -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
>
> -# Only perform the check for file, if the check method requires it
> -case $deplibs_check_method in
> -file_magic*)
> - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
> - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
> -echo "configure:2364: checking for ${ac_tool_prefix}file" >&5
> -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - case $MAGIC_CMD in
> - /*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
> - ;;
> - ?:/*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
> - ;;
> - *)
> - ac_save_MAGIC_CMD="$MAGIC_CMD"
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="/usr/bin:$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/${ac_tool_prefix}file; then
> - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
> - if test -n "$file_magic_test_file"; then
> - case $deplibs_check_method in
> - "file_magic "*)
> - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
> - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
> - egrep "$file_magic_regex" > /dev/null; then
> - :
> - else
> - cat <<EOF 1>&2
> -
> -*** Warning: the command libtool uses to detect shared libraries,
> -*** $file_magic_cmd, produces output that libtool cannot recognize.
> -*** The result is that libtool may fail to recognize shared libraries
> -*** as such. This will affect the creation of libtool libraries that
> -*** depend on shared libraries, but programs linked with such libtool
> -*** libraries will work regardless of this problem. Nevertheless, you
> -*** may want to report the problem to your system manager and/or to
> -*** bug-libtool@gnu.org
> -
> -EOF
> - fi ;;
> - esac
> - fi
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> - MAGIC_CMD="$ac_save_MAGIC_CMD"
> - ;;
> -esac
> -fi
> -
> -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> -if test -n "$MAGIC_CMD"; then
> - echo "$ac_t""$MAGIC_CMD" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> -if test -z "$lt_cv_path_MAGIC_CMD"; then
> - if test -n "$ac_tool_prefix"; then
> - echo $ac_n "checking for file""... $ac_c" 1>&6
> -echo "configure:2426: checking for file" >&5
> -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - case $MAGIC_CMD in
> - /*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
> - ;;
> - ?:/*)
> - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
> - ;;
> - *)
> - ac_save_MAGIC_CMD="$MAGIC_CMD"
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="/usr/bin:$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/file; then
> - lt_cv_path_MAGIC_CMD="$ac_dir/file"
> - if test -n "$file_magic_test_file"; then
> - case $deplibs_check_method in
> - "file_magic "*)
> - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
> - MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
> - egrep "$file_magic_regex" > /dev/null; then
> - :
> - else
> - cat <<EOF 1>&2
> -
> -*** Warning: the command libtool uses to detect shared libraries,
> -*** $file_magic_cmd, produces output that libtool cannot recognize.
> -*** The result is that libtool may fail to recognize shared libraries
> -*** as such. This will affect the creation of libtool libraries that
> -*** depend on shared libraries, but programs linked with such libtool
> -*** libraries will work regardless of this problem. Nevertheless, you
> -*** may want to report the problem to your system manager and/or to
> -*** bug-libtool@gnu.org
> -
> -EOF
> - fi ;;
> - esac
> - fi
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> - MAGIC_CMD="$ac_save_MAGIC_CMD"
> - ;;
> -esac
> -fi
> -
> -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> -if test -n "$MAGIC_CMD"; then
> - echo "$ac_t""$MAGIC_CMD" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> - else
> - MAGIC_CMD=:
> - fi
> -fi
> -
> - fi
> - ;;
> +case "$target" in
> +NONE) lt_target="$host" ;;
> +*) lt_target="$target" ;;
> esac
>
> -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
> -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
> -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2497: checking for $ac_word" >&5
> -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - if test -n "$RANLIB"; then
> - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
> -else
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/$ac_word; then
> - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> -fi
> -fi
> -RANLIB="$ac_cv_prog_RANLIB"
> -if test -n "$RANLIB"; then
> - echo "$ac_t""$RANLIB" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> -
> -if test -z "$ac_cv_prog_RANLIB"; then
> -if test -n "$ac_tool_prefix"; then
> - # Extract the first word of "ranlib", so it can be a program name with args.
> -set dummy ranlib; ac_word=$2
> -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2529: checking for $ac_word" >&5
> -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - if test -n "$RANLIB"; then
> - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
> -else
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/$ac_word; then
> - ac_cv_prog_RANLIB="ranlib"
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
> -fi
> -fi
> -RANLIB="$ac_cv_prog_RANLIB"
> -if test -n "$RANLIB"; then
> - echo "$ac_t""$RANLIB" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> -else
> - RANLIB=":"
> -fi
> -fi
> -
> -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
> -set dummy ${ac_tool_prefix}strip; ac_word=$2
> -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2564: checking for $ac_word" >&5
> -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - if test -n "$STRIP"; then
> - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
> -else
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/$ac_word; then
> - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> -fi
> -fi
> -STRIP="$ac_cv_prog_STRIP"
> -if test -n "$STRIP"; then
> - echo "$ac_t""$STRIP" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> -
> -if test -z "$ac_cv_prog_STRIP"; then
> -if test -n "$ac_tool_prefix"; then
> - # Extract the first word of "strip", so it can be a program name with args.
> -set dummy strip; ac_word=$2
> -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2596: checking for $ac_word" >&5
> -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - if test -n "$STRIP"; then
> - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
> -else
> - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
> - ac_dummy="$PATH"
> - for ac_dir in $ac_dummy; do
> - test -z "$ac_dir" && ac_dir=.
> - if test -f $ac_dir/$ac_word; then
> - ac_cv_prog_STRIP="strip"
> - break
> - fi
> - done
> - IFS="$ac_save_ifs"
> - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
> -fi
> -fi
> -STRIP="$ac_cv_prog_STRIP"
> -if test -n "$STRIP"; then
> - echo "$ac_t""$STRIP" 1>&6
> -else
> - echo "$ac_t""no" 1>&6
> -fi
> -
> -else
> - STRIP=":"
> -fi
> -fi
> -
> -
> # Check for any special flags to pass to ltconfig.
> libtool_flags="--cache-file=$cache_file"
> test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
> test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
> test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
> -test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
> -test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
> +test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
> +test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
>
> libtool_flags="$libtool_flags --enable-win32-dll"
> # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
> @@ -2643,25 +2196,14 @@ fi
> test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
> test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
>
> -# Check whether --with-pic or --without-pic was given.
> -if test "${with_pic+set}" = set; then
> - withval="$with_pic"
> - pic_mode="$withval"
> -else
> - pic_mode=default
> -fi
> -
> -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
> -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
> -
> # Some flags need to be propagated to the compiler or linker for good
> # libtool support.
> -case $host in
> +case "$lt_target" in
> *-*-irix6*)
> # Find out which ABI we are using.
> - echo '#line 2663 "configure"' > conftest.$ac_ext
> - if { (eval echo configure:2664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> - case `/usr/bin/file conftest.$ac_objext` in
> + echo '#line 2205 "configure"' > conftest.$ac_ext
> + if { (eval echo configure:2206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> + case "`/usr/bin/file conftest.o`" in
> *32-bit*)
> LD="${LD-ld} -32"
> ;;
> @@ -2676,48 +2218,24 @@ case $host in
> rm -rf conftest*
> ;;
>
> -ia64-*-hpux*)
> - # Find out which ABI we are using.
> - echo 'int i;' > conftest.$ac_ext
> - if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
> - case "`/usr/bin/file conftest.o`" in
> - *ELF-32*)
> - HPUX_IA64_MODE="32"
> - ;;
> - *ELF-64*)
> - HPUX_IA64_MODE="64"
> - ;;
> - esac
> - fi
> - rm -rf conftest*
> - ;;
> -
> *-*-sco3.2v5*)
> # On SCO OpenServer 5, we need -belf to get full-featured binaries.
> SAVE_CFLAGS="$CFLAGS"
> CFLAGS="$CFLAGS -belf"
> echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
> -echo "configure:2701: checking whether the C compiler needs -belf" >&5
> +echo "configure:2227: checking whether the C compiler needs -belf" >&5
> if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> -
> - ac_ext=c
> -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
> -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
> -cross_compiling=$ac_cv_prog_cc_cross
> -
> - cat > conftest.$ac_ext <<EOF
> -#line 2714 "configure"
> + cat > conftest.$ac_ext <<EOF
> +#line 2232 "configure"
> #include "confdefs.h"
>
> int main() {
>
> ; return 0; }
> EOF
> -if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> rm -rf conftest*
> lt_cv_cc_needs_belf=yes
> else
> @@ -2727,13 +2245,6 @@ else
> lt_cv_cc_needs_belf=no
> fi
> rm -f conftest*
> - ac_ext=c
> -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
> -ac_cpp='$CPP $CPPFLAGS'
> -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
> -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
> -cross_compiling=$ac_cv_prog_cc_cross
> -
> fi
>
> echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
> @@ -2743,11 +2254,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
> fi
> ;;
>
> -*-*-cygwin* | *-*-mingw* | *-*-pw32*)
> +*-*-cygwin* | *-*-mingw*)
> # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
> set dummy ${ac_tool_prefix}dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2751: checking for $ac_word" >&5
> +echo "configure:2262: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2779,7 +2290,7 @@ if test -n "$ac_tool_prefix"; then
> # Extract the first word of "dlltool", so it can be a program name with args.
> set dummy dlltool; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2783: checking for $ac_word" >&5
> +echo "configure:2294: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2814,7 +2325,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
> set dummy ${ac_tool_prefix}as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2818: checking for $ac_word" >&5
> +echo "configure:2329: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2846,7 +2357,7 @@ if test -n "$ac_tool_prefix"; then
> # Extract the first word of "as", so it can be a program name with args.
> set dummy as; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2850: checking for $ac_word" >&5
> +echo "configure:2361: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2881,7 +2392,7 @@ fi
> # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
> set dummy ${ac_tool_prefix}objdump; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2885: checking for $ac_word" >&5
> +echo "configure:2396: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2913,7 +2424,7 @@ if test -n "$ac_tool_prefix"; then
> # Extract the first word of "objdump", so it can be a program name with args.
> set dummy objdump; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:2917: checking for $ac_word" >&5
> +echo "configure:2428: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -2945,77 +2456,8 @@ else
> fi
> fi
>
> -
> - # recent cygwin and mingw systems supply a stub DllMain which the user
> - # can override, but on older systems we have to supply one
> - echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
> -echo "configure:2953: checking if libtool should supply DllMain function" >&5
> -if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - cat > conftest.$ac_ext <<EOF
> -#line 2958 "configure"
> -#include "confdefs.h"
> -
> -int main() {
> -extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
> - DllMain (0, 0, 0);
> -; return 0; }
> -EOF
> -if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> - rm -rf conftest*
> - lt_cv_need_dllmain=no
> -else
> - echo "configure: failed program was:" >&5
> - cat conftest.$ac_ext >&5
> - rm -rf conftest*
> - lt_cv_need_dllmain=yes
> -fi
> -rm -f conftest*
> -fi
> -
> -echo "$ac_t""$lt_cv_need_dllmain" 1>&6
> -
> - case $host/$CC in
> - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
> - # old mingw systems require "-dll" to link a DLL, while more recent ones
> - # require "-mdll"
> - SAVE_CFLAGS="$CFLAGS"
> - CFLAGS="$CFLAGS -mdll"
> - echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
> -echo "configure:2987: checking how to link DLLs" >&5
> -if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
> - echo $ac_n "(cached) $ac_c" 1>&6
> -else
> - cat > conftest.$ac_ext <<EOF
> -#line 2992 "configure"
> -#include "confdefs.h"
> -
> -int main() {
> -
> -; return 0; }
> -EOF
> -if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
> - rm -rf conftest*
> - lt_cv_cc_dll_switch=-mdll
> -else
> - echo "configure: failed program was:" >&5
> - cat conftest.$ac_ext >&5
> - rm -rf conftest*
> - lt_cv_cc_dll_switch=-dll
> -fi
> -rm -f conftest*
> -fi
> -
> -echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
> - CFLAGS="$SAVE_CFLAGS" ;;
> - *-*-cygwin* | *-*-pw32*)
> - # cygwin systems need to pass --dll to the linker, and not link
> - # crt.o which will require a WinMain@16 definition.
> - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
> - esac
> ;;
> -
> +
> esac
>
>
> @@ -3069,14 +2511,12 @@ rm -f confcache
>
>
> # Actually configure libtool. ac_aux_dir is where install-sh is found.
> -AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
> -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
> -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
> -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
> -deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
> +CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
> +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
> +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
> +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
> ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
> -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
> +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
> || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
>
> # Reload cache, that may have been modified by ltconfig
> @@ -3090,7 +2530,7 @@ fi
>
>
> # This can be used to rebuild libtool when needed
> -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
> +LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
>
> # Always use our own libtool.
> LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> @@ -3099,17 +2539,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
> # clobbered by the next message.
> exec 5>>./config.log
>
> -
> -
> -
> -
> -
> for ac_prog in mawk gawk nawk awk
> do
> # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
> -echo "configure:3113: checking for $ac_word" >&5
> +echo "configure:2548: checking for $ac_word" >&5
> if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> @@ -3189,17 +2624,6 @@ case $host in
> esac
>
>
> -# These get added in the top-level configure.in, except in the case where
> -# newlib is being built natively.
> -LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
> -abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
> -if test -z "${LIBC_INCLUDE_GREP}"; then
> - CC_FOR_NEWLIB="${CC} -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
> -else
> - CC_FOR_NEWLIB="${CC}"
> -fi
> -
> -
> subdirs="${configdirs}"
>
>
> @@ -3614,8 +3038,8 @@ s%@aext@%$aext%g
> s%@libm_machine_dir@%$libm_machine_dir%g
> s%@machine_dir@%$machine_dir%g
> s%@sys_dir@%$sys_dir%g
> +s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g
> s%@LN_S@%$LN_S%g
> -s%@STRIP@%$STRIP%g
> s%@DLLTOOL@%$DLLTOOL%g
> s%@OBJDUMP@%$OBJDUMP%g
> s%@LIBTOOL@%$LIBTOOL%g
> @@ -3625,7 +3049,6 @@ s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FAL
> s%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g
> s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g
> s%@EXTRA_DIRS@%$EXTRA_DIRS%g
> -s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g
> s%@subdirs@%$subdirs%g
> s%@CRT0@%$CRT0%g
> s%@CRT0_DIR@%$CRT0_DIR%g
> Index: configure.host
> ===================================================================
> RCS file: /cvs/uberbaum/newlib/configure.host,v
> retrieving revision 1.60
> diff -d -u -p -r1.60 configure.host
> --- configure.host 9 Jun 2004 19:05:08 -0000 1.60
> +++ configure.host 27 Jun 2004 19:16:57 -0000
> @@ -43,7 +43,7 @@
> # crt1 name of crt1 object if one is provided
> # crt1_dir directory where crt1 object is found
>
> -newlib_cflags=
> +#newlib_cflags= # could already have stuff in it
> libm_machine_dir=
> machine_dir=
> sys_dir=
> @@ -445,7 +445,7 @@ case "${host}" in
> default_newlib_io_long_long="yes"
> default_newlib_io_long_double="yes"
> default_newlib_io_pos_args="yes"
> - newlib_cflags="${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -D_COMPILING_NEWLIB -DHAVE_FCNTL -DMALLOC_PROVIDED -I${cygwin_srcdir}/include"
> + newlib_cflags="-I${cygwin_srcdir}/include ${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -D_COMPILING_NEWLIB -DHAVE_FCNTL -DMALLOC_PROVIDED"
> syscall_dir=syscalls
> ;;
> # RTEMS supplies its own versions of some routines:
> Index: configure.in
> ===================================================================
> RCS file: /cvs/uberbaum/newlib/configure.in,v
> retrieving revision 1.22
> diff -d -u -p -r1.22 configure.in
> --- configure.in 25 Jun 2004 20:32:31 -0000 1.22
> +++ configure.in 27 Jun 2004 19:16:57 -0000
> @@ -96,7 +96,10 @@ AC_ARG_ENABLE(newlib-iconv-external-ccs,
> esac
> fi], [newlib_iconv_external_ccs=${newlib_iconv_external_ccs}])dnl
>
> +
> NEWLIB_CONFIGURE(.)
> +CC_FOR_NEWLIB="${CC}"
> +AC_SUBST(CC_FOR_NEWLIB)
>
> dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
> dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
> @@ -135,17 +138,6 @@ case $host in
> esac
> AC_SUBST(EXTRA_DIRS)
>
> -# These get added in the top-level configure.in, except in the case where
> -# newlib is being built natively.
> -LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
> -abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
> -if test -z "${LIBC_INCLUDE_GREP}"; then
> - CC_FOR_NEWLIB="${CC} -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
> -else
> - CC_FOR_NEWLIB="${CC}"
> -fi
> -AC_SUBST(CC_FOR_NEWLIB)
> -
> AC_CONFIG_SUBDIRS(${configdirs})
>
> CRT0=
More information about the Newlib
mailing list