From 90f86cb5d1692306d36c9363691f5d064bc3fce8 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 4 Dec 2001 09:53:18 +0000 Subject: [PATCH] Makefile.in (AR, RANLIB): Add, for substitutions. * Makefile.in (AR, RANLIB): Add, for substitutions. (all-unilib, $(LIBG2C)): Depend on object lists, not convenience libraries. (s-libe77): Renamed from libE77.la; build object list. (install): Do not move libraries to libdir. (mostlyclean, clean): Adjust. * libF77/Makefile.in (RANLIB): Add. (LINK): Remove. (../s-libf77): Renamed from ../libF77.la; build object list. (../libfrtbegin.a): Remove target first. Don't use $<. (all, clean, distclean): Adjust. * libF77/configure.in: Substitute RANLIB. * libF77/configure: Rebuilt. * libI77/Makefile.in (LINK): Delete. (../s-libi77): Renamed from ../libI77.la; build object list. (all, clean, distclean): Adjust. * libU77/Makefile.in: Likewise. From-SVN: r47605 --- libf2c/ChangeLog | 20 ++++++ libf2c/Makefile.in | 40 +++++++---- libf2c/libF77/Makefile.in | 21 +++--- libf2c/libF77/configure | 142 ++++++++++++++++++++++++------------- libf2c/libF77/configure.in | 7 +- libf2c/libI77/Makefile.in | 15 ++-- libf2c/libU77/Makefile.in | 17 ++--- 7 files changed, 175 insertions(+), 87 deletions(-) diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index df93ebc6b96..7441f47ebaa 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,23 @@ +2001-12-04 Alexandre Oliva + + * Makefile.in (AR, RANLIB): Add, for substitutions. + (all-unilib, $(LIBG2C)): Depend on object lists, not + convenience libraries. + (s-libe77): Renamed from libE77.la; build object list. + (install): Do not move libraries to libdir. + (mostlyclean, clean): Adjust. + * libF77/Makefile.in (RANLIB): Add. + (LINK): Remove. + (../s-libf77): Renamed from ../libF77.la; build object list. + (../libfrtbegin.a): Remove target first. Don't use $<. + (all, clean, distclean): Adjust. + * libF77/configure.in: Substitute RANLIB. + * libF77/configure: Rebuilt. + * libI77/Makefile.in (LINK): Delete. + (../s-libi77): Renamed from ../libI77.la; build object list. + (all, clean, distclean): Adjust. + * libU77/Makefile.in: Likewise. + 2001-12-02 Toon Moene PR fortran/4885 diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in index eb0074a6587..d45c71c57d7 100644 --- a/libf2c/Makefile.in +++ b/libf2c/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU F77 compiler runtime. -# Copyright (C) 1995-1998 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2001 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -61,6 +61,8 @@ INSTALL_DATA = @INSTALL_DATA@ LIBTOOL = @LIBTOOL@ CC = @CC@ CFLAGS = @CFLAGS@ +AR = @AR@ +RANLIB = @RANLIB@ # List of variables to pass to sub-makes. # Quote this way so that it can be used to set shell variables too. @@ -118,24 +120,34 @@ all: all-unilib # meant to be invoked via multi-do for multilibs. # Its dependencies can be satisfied in parallel. The [fiu]77 targets -# always invoke sub makes to check dependencies in the subdirs, else we'd +# update stamp files (object file lists, actually, see the subdir +# makefiles) on which the $(LIBG2C) depends. The stamp files +# s-lib[fiu]77 are intentionally not targets, since we're only meant +# to come in at the level of this target. The [fiu]77 targets always +# invoke sub makes to check dependencies in the subdirs, else we'd # have to maintain them at this level; we live with the overhead of # some recursive makes which may do nothing. -all-unilib: i77 f77 u77 libE77.la +all-unilib: i77 f77 u77 s-libe77 $(MAKE) $(FLAGS_TO_PASS) $(LIBG2C) i77 f77 u77: g2c.h # This target should normally only get invoked via `all-unilib' -- # after all's well in the subdirs -- actually to assemble the library. +# The stamp files contain the object lists of each component of the +# library. The point of breaking them up is to avoid command-line +# length limitations. -$(LIBG2C): libF77.la libI77.la libU77.la libE77.la - rm -f $@ ;\ - set -e; \ +$(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77 $(LIBTOOL) --mode=link $(CC) -o $@ \ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \ - -rpath $(prefix)/lib libE77.la libF77.la libI77.la libU77.la -lc -lm + -rpath $(prefix)/lib \ + -objectlist s-libe77 \ + -objectlist s-libf77 \ + -objectlist s-libi77 \ + -objectlist s-libu77 \ + -lc -lm i77: cd libI77; $(MAKE) $(FLAGS_TO_PASS) all @@ -146,18 +158,19 @@ f77: u77: cd libU77; $(MAKE) $(FLAGS_TO_PASS) all -libE77.la: f2cext.c - rm -f $@ +s-libe77: f2cext.c if [ -d libE77 ]; then rm -f libE77/*.o libE77/*.lo; else mkdir libE77; fi + -rm -f $@.T $@ for name in $(F2CEXT); \ do \ echo $${name}; \ $(LIBTOOL) --mode=compile $(CC) -c -I. -I$(srcdir) -I../../include \ $(CPPFLAGS) $(CFLAGS) -DL$${name} $(srcdir)/f2cext.c \ - -o libE77/L$${name}.o ; \ + -o libE77/L$${name}.lo ; \ if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + echo libE77/L$${name}.lo >> $@.T; \ done - $(LIBTOOL) --mode=link $(CC) -o libE77.la libE77/*.lo + mv $@.T $@ f2cext.c: g2c.h @@ -192,7 +205,6 @@ check: install: all $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(MULTISUBDIR) - (cd $(libsubdir)/$(MULTISUBDIR) ; mv -f $(LIBG2C_BASE).* $(prefix)/lib) $(INSTALL_DATA) libfrtbegin.a $(libsubdir)/$(MULTISUBDIR) $(RANLIB) $(libsubdir)/$(MULTISUBDIR)/libfrtbegin.a $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h @@ -220,7 +232,7 @@ mostlyclean: rm -f $(LIBG2C) objlist $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ $(MULTICLEAN) multi-clean DO=$@ - rm -fr libE77 libE77.la + rm -fr libE77 s-libe77 clean: mostlyclean rm -f config.log @@ -229,7 +241,7 @@ clean: mostlyclean rm -rf .libs distclean: clean - rm -f g2c.h libE77.la + rm -f g2c.h s-libe77 $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ $(MULTICLEAN) multi-clean DO=distclean rm -f config.cache config.status Makefile diff --git a/libf2c/libF77/Makefile.in b/libf2c/libF77/Makefile.in index 02fcc8fdf10..4f6730de41c 100644 --- a/libf2c/libF77/Makefile.in +++ b/libf2c/libF77/Makefile.in @@ -1,7 +1,7 @@ # Makefile for GNU F77 compiler runtime. # Copyright 1990 - 1994 by AT&T Bell Laboratories and Bellcore (see the # file `Notice'). -# Portions of this file Copyright (C) 1995-1998 Free Software Foundation, Inc. +# Portions of this file Copyright (C) 1995-1998, 2001 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -38,6 +38,7 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ AR = @AR@ ARFLAGS = rc +RANLIB = @RANLIB@ @SET_MAKE@ SHELL = /bin/sh @@ -52,8 +53,6 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) $(DEFS) $ .c.lo: @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< -LINK = @LIBTOOL@ --mode=link $(CC) -o $@ - MISC = F77_aloc.lo VersionF.lo s_rnge.lo abort_.lo getarg_.lo iargc_.lo\ getenv_.lo signal_.lo s_stop.lo s_paus.lo system_.lo cabs.lo\ derf_.lo derfc_.lo erf_.lo erfc_.lo sig_die.lo exit_.lo setarg.lo setsig.lo @@ -80,10 +79,13 @@ F90BIT = lbitbits.lo lbitshft.lo qbitbits.lo qbitshft.lo OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \ $(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) -all: ../libF77.la ../libfrtbegin.a +all: ../s-libf77 ../libfrtbegin.a -../libF77.la: $(OBJS) - $(LINK) $(OBJS) +../s-libf77: $(OBJS) + -rm -f $@.T $@ + objs='$(OBJS)'; for name in $$objs; do \ + echo libF77/$${name} >> $@.T; done + mv $@.T $@ Makefile: Makefile.in config.status $(SHELL) config.status @@ -104,7 +106,8 @@ frtbegin.o : main.c $(CC) -c $(ALL_CFLAGS) $(srcdir)/main.c -o $@ ../libfrtbegin.a: frtbegin.o - $(AR) $(ARFLAGS) $@ $< + -rm -f $@ + $(AR) $(ARFLAGS) $@ frtbegin.o $(RANLIB) $@ F77_aloc.lo: F77_aloc.c @@ -241,10 +244,10 @@ mostlyclean: clean: mostlyclean rm -f config.log - rm -f ../libF77.la + rm -f ../s-libf77 distclean: clean - rm -f config.cache config.status Makefile ../libF77.la configure + rm -f config.cache config.status Makefile ../s-libf77 configure maintainer-clean: diff --git a/libf2c/libF77/configure b/libf2c/libF77/configure index 17b81d333a8..5b6a257737b 100755 --- a/libf2c/libF77/configure +++ b/libf2c/libF77/configure @@ -28,6 +28,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -142,6 +143,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -312,6 +314,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -477,12 +484,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -530,7 +541,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:534: checking for $ac_word" >&5 +echo "configure:545: 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 @@ -560,7 +571,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:564: checking for $ac_word" >&5 +echo "configure:575: 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 @@ -611,7 +622,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:615: checking for $ac_word" >&5 +echo "configure:626: 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 @@ -644,7 +655,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:648: checking whether we are using GNU C" >&5 +echo "configure:659: 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 @@ -653,7 +664,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:657: \"$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:668: \"$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 @@ -672,7 +683,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:676: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:687: 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 @@ -709,8 +720,42 @@ LIBTOOL='$(SHELL) ../libtool' test "$AR" || AR=ar +if test "$RANLIB"; then : + +else + # 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:730: 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 + +fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:714: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:759: 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 @@ -740,7 +785,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:744: checking how to run the C preprocessor" >&5 +echo "configure:789: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -755,13 +800,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -772,13 +817,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -789,13 +834,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -821,17 +866,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:825: checking for stdio.h" >&5 +echo "configure:870: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -859,12 +904,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:863: checking for ANSI C header files" >&5 +echo "configure:908: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -872,7 +917,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -889,7 +934,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -907,7 +952,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -928,7 +973,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -939,7 +984,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -964,12 +1009,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:968: checking for posix" >&5 +echo "configure:1013: checking for posix" >&5 if eval "test \"`echo '$''{'g77_cv_header_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -995,12 +1040,12 @@ echo "$ac_t""$g77_cv_header_posix" 1>&6 # We can rely on the GNU library being posix-ish. I guess checking the # header isn't actually like checking the functions, though... echo $ac_n "checking for GNU library""... $ac_c" 1>&6 -echo "configure:999: checking for GNU library" >&5 +echo "configure:1044: checking for GNU library" >&5 if eval "test \"`echo '$''{'g77_cv_lib_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef __GNU_LIBRARY__ @@ -1023,12 +1068,12 @@ fi echo "$ac_t""$g77_cv_lib_gnu" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1027: checking return type of signal handlers" >&5 +echo "configure:1072: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1045,7 +1090,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1066,12 +1111,12 @@ EOF # we'll get atexit by default if test $ac_cv_header_stdc != yes; then echo $ac_n "checking for atexit""... $ac_c" 1>&6 -echo "configure:1070: checking for atexit" >&5 +echo "configure:1115: checking for atexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atexit=yes" else @@ -1119,12 +1164,12 @@ else EOF echo $ac_n "checking for onexit""... $ac_c" 1>&6 -echo "configure:1123: checking for onexit" >&5 +echo "configure:1168: checking for onexit" >&5 if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_onexit=yes" else @@ -1165,12 +1210,12 @@ if eval "test \"`echo '$ac_cv_func_'onexit`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for on_exit""... $ac_c" 1>&6 -echo "configure:1169: checking for on_exit" >&5 +echo "configure:1214: checking for on_exit" >&5 if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_on_exit=yes" else @@ -1223,7 +1268,7 @@ else true fi echo $ac_n "checking for drem in -lm""... $ac_c" 1>&6 -echo "configure:1227: checking for drem in -lm" >&5 +echo "configure:1272: checking for drem in -lm" >&5 ac_lib_var=`echo m'_'drem | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1231,7 +1276,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1422,6 +1467,7 @@ s%@mandir@%$mandir%g s%@CC@%$CC%g s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g +s%@RANLIB@%$RANLIB%g s%@SET_MAKE@%$SET_MAKE%g s%@CPP@%$CPP%g diff --git a/libf2c/libF77/configure.in b/libf2c/libF77/configure.in index d83be79dd5b..ae34d36d908 100644 --- a/libf2c/libF77/configure.in +++ b/libf2c/libF77/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 2001 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -37,6 +37,11 @@ AC_SUBST(LIBTOOL) test "$AR" || AR=ar AC_SUBST(AR) +if test "$RANLIB"; then : + AC_SUBST(RANLIB) +else + AC_PROG_RANLIB +fi AC_PROG_MAKE_SET dnl Checks for libraries. diff --git a/libf2c/libI77/Makefile.in b/libf2c/libI77/Makefile.in index b7ca7d72eaf..16941a7079f 100644 --- a/libf2c/libI77/Makefile.in +++ b/libf2c/libI77/Makefile.in @@ -51,18 +51,19 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) \ .c.lo: @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs -DAllow_TYQUAD $(ALL_CFLAGS) $< -LINK = @LIBTOOL@ --mode=link $(CC) -o $@ - OBJS = VersionI.lo backspace.lo close.lo dfe.lo dolio.lo due.lo endfile.lo err.lo \ fmt.lo fmtlib.lo iio.lo ilnw.lo inquire.lo lread.lo lwrite.lo open.lo \ rdfmt.lo rewind.lo rsfe.lo rsli.lo rsne.lo sfe.lo sue.lo typesize.lo uio.lo \ util.lo wref.lo wrtfmt.lo wsfe.lo wsle.lo wsne.lo xwsne.lo \ ftell_.lo -all: ../libI77.la +all: ../s-libi77 -../libI77.la: $(OBJS) - $(LINK) $(OBJS) +../s-libi77: $(OBJS) + -rm -f $@.T $@ + objs='$(OBJS)'; for name in $$objs; do \ + echo libI77/$${name} >> $@.T; done + mv $@.T $@ Makefile: Makefile.in config.status $(SHELL) config.status @@ -157,10 +158,10 @@ mostlyclean: rm -rf .libs clean: mostlyclean - rm -f config.log ../libI77.la + rm -f config.log ../s-libi77 distclean: clean - rm -f config.cache config.status Makefile ../libI77.la configure + rm -f config.cache config.status Makefile ../s-libi77 configure maintainer-clean: diff --git a/libf2c/libU77/Makefile.in b/libf2c/libU77/Makefile.in index c6dcadb812f..19945115016 100644 --- a/libf2c/libU77/Makefile.in +++ b/libf2c/libU77/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU F77 compiler runtime, libc interface. -# Copyright (C) 1995-1998 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2001 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of the GNU Fortran libU77 library. @@ -55,8 +55,6 @@ G77DIR = ../../../gcc/ .c.lo: @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< -LINK = @LIBTOOL@ --mode=link $(CC) -o $@ - OBJS = VersionU.lo gerror_.lo perror_.lo ierrno_.lo itime_.lo time_.lo \ unlink_.lo fnum_.lo getpid_.lo getuid_.lo getgid_.lo kill_.lo rand_.lo \ srand_.lo irand_.lo sleep_.lo idate_.lo ctime_.lo etime_.lo \ @@ -78,10 +76,13 @@ SRCS = Version.c gerror_.c perror_.c ierrno_.c itime_.c time_.c \ umask_.c sys_clock_.c date_.c second_.c flush1_.c mclock_.c \ alarm_.c datetime_.c -all: ../libU77.la +all: ../s-libu77 -../libU77.la: $(OBJS) - $(LINK) $(OBJS) +../s-libu77: $(OBJS) + -rm -f $@.T $@ + objs='$(OBJS)'; for name in $$objs; do \ + echo libU77/$${name} >> $@.T; done + mv $@.T $@ Makefile: Makefile.in config.status $(SHELL) config.status @@ -178,11 +179,11 @@ mostlyclean: rm -rf .libs clean: mostlyclean - rm -f config.log ../libU77.la + rm -f config.log ../s-libu77 distclean: clean rm -f config.cache config.status Makefile config.h stamp.h \ - ../libU77.la configure + ../s-libu77 configure maintainer-clean: