diff options
Diffstat (limited to 'contrib/libf2c/configure.in')
| -rw-r--r-- | contrib/libf2c/configure.in | 53 |
1 files changed, 17 insertions, 36 deletions
diff --git a/contrib/libf2c/configure.in b/contrib/libf2c/configure.in index bbcaac7..f905722 100644 --- a/contrib/libf2c/configure.in +++ b/contrib/libf2c/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -22,18 +22,18 @@ AC_PREREQ(2.13) AC_INIT(libF77/Version.c) -if test "${srcdir}" = "." ; then - if test "${with_target_subdir}" != "." ; then - topsrcdir=${with_multisrctop}../.. - else - topsrcdir=${with_multisrctop}.. - fi -else - topsrcdir=${srcdir}/.. -fi -dnl This is needed for a multilibbed build in the source tree so -dnl that install-sh and config.sub get found. -AC_CONFIG_AUX_DIR($topsrcdir) +# This works around the fact that libtool configuration may change LD +# for this particular configuration, but some shells, instead of +# keeping the changes in LD private, export them just because LD is +# exported. +ORIGINAL_LD_FOR_MULTILIBS=$LD + +AC_CANONICAL_SYSTEM +target_alias=${target_alias-$target} +AC_SUBST(target_alias) + +GLIBCPP_CONFIGURE(.) +GLIBCPP_EXPORT_INSTALL_INFO # If the language specific compiler does not exist, but the "gcc" directory # does, we do not build anything. Note, $r is set by the top-level Makefile. @@ -65,14 +65,7 @@ fi dnl Checks for programs. -dnl FIXME AC_PROG_CC wants CC to be able to link things, but it may -dnl not be able to. -define([AC_PROG_CC_WORKS],[]) - -# For g77 we'll set CC to point at the built gcc, but this will get it into -# the makefiles - -AC_PROG_CC +AM_PROG_LIBTOOL dnl These should be inherited in the recursive make, but ensure they are dnl defined: @@ -119,19 +112,6 @@ test -f libF77/makefile && mv libF77/makefile libF77/makefile.ori test -f libI77/makefile && mv libI77/makefile libI77/makefile.ori test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori -# Get the version trigger filename from the toplevel -if [[ "${with_gcc_version_trigger+set}" = set ]]; then - gcc_version_trigger=$with_gcc_version_trigger - gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'` -else - gcc_version_trigger= - gcc_version=UNKNOWN -fi - -AC_SUBST(gcc_version) -AC_SUBST(gcc_version_trigger) -AC_CANONICAL_SYSTEM -AC_SUBST(target_alias) AC_CONFIG_SUBDIRS(libU77 libI77 libF77) # Do Makefile first since g2c.h depends on it and shouldn't get an # earlier timestamp. Of course, it does when the multilib gunk below @@ -139,10 +119,11 @@ AC_CONFIG_SUBDIRS(libU77 libI77 libF77) AC_OUTPUT(Makefile g2c.h:g2c.hin, [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then + LD="${ORIGINAL_LD_FOR_MULTILIBS}" if test -n "${with_target_subdir}"; then # FIXME: We shouldn't need to set ac_file ac_file=Makefile - . ${topsrcdir}/config-ml.in + . ${toplevel_srcdir}/config-ml.in touch g2c.h # to keep it more recent than Makefile fi fi], @@ -152,8 +133,8 @@ target=${target} with_target_subdir=${with_target_subdir} with_multisubdir=${with_multisubdir} ac_configure_args="--enable-multilib ${ac_configure_args}" +toplevel_srcdir=${toplevel_srcdir} CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -topsrcdir=${topsrcdir} ) |
