From e3f07fb2c34a4337d0e95a0d2814ed0e312be1ae Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Thu, 9 May 2002 22:47:59 +0000 Subject: [PATCH] Gcc 3.1.0 pre-release's libf2c bits from the FSF anoncvs repo on 9-May-2002 15:57:15 EDT. --- contrib/libf2c/ChangeLog | 275 ++++- contrib/libf2c/Makefile.in | 100 +- contrib/libf2c/aclocal.m4 | 224 ++++ contrib/libf2c/configure | 1797 ++++++++++++++++++++++++---- contrib/libf2c/configure.in | 53 +- contrib/libf2c/libF77/Makefile.in | 322 ++--- contrib/libf2c/libF77/Version.c | 2 +- contrib/libf2c/libF77/configure | 146 ++- contrib/libf2c/libF77/configure.in | 10 +- contrib/libf2c/libI77/Makefile.in | 151 ++- contrib/libf2c/libI77/Version.c | 2 +- contrib/libf2c/libI77/backspace.c | 18 +- contrib/libf2c/libI77/config.h.in | 29 +- contrib/libf2c/libI77/configure | 355 ++++-- contrib/libf2c/libI77/configure.in | 23 +- contrib/libf2c/libI77/dfe.c | 2 +- contrib/libf2c/libI77/due.c | 6 +- contrib/libf2c/libI77/endfile.c | 15 +- contrib/libf2c/libI77/err.c | 12 +- contrib/libf2c/libI77/fio.h | 11 + contrib/libf2c/libI77/ftell_.c | 4 +- contrib/libf2c/libI77/inquire.c | 2 +- contrib/libf2c/libI77/open.c | 6 +- contrib/libf2c/libI77/rdfmt.c | 2 +- contrib/libf2c/libI77/rewind.c | 3 +- contrib/libf2c/libI77/sfe.c | 1 + contrib/libf2c/libI77/sue.c | 16 +- contrib/libf2c/libI77/wsfe.c | 1 + contrib/libf2c/libU77/Makefile.in | 163 ++- contrib/libf2c/libU77/Version.c | 2 +- contrib/libf2c/libU77/config.hin | 22 +- contrib/libf2c/libU77/configure | 159 ++- contrib/libf2c/libU77/configure.in | 14 + contrib/libf2c/libU77/date_.c | 15 + contrib/libf2c/libU77/vxtidate_.c | 15 + 35 files changed, 3061 insertions(+), 917 deletions(-) create mode 100644 contrib/libf2c/aclocal.m4 diff --git a/contrib/libf2c/ChangeLog b/contrib/libf2c/ChangeLog index 4b01ec934b24..f38b66a93cfb 100644 --- a/contrib/libf2c/ChangeLog +++ b/contrib/libf2c/ChangeLog @@ -1,18 +1,270 @@ -2001-10-23 Release Manager +2002-05-08 Alexandre Oliva - * GCC 3.0.2 Released. + * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at + script entry, and set LD to it when configuring multilibs. + * configure: Rebuilt. -2001-08-19 Release Manager +2002-05-02 Alexandre Oliva - * GCC 3.0.1 Released. + * Makefile.in: Fix for multilibbed natives. -2001-08-19 Release Manager +2002-04-15 Loren J. Rittle - * GCC 3.0.1 Released. + * aclocal.m4 (gcc_version_trigger): Use robust path construction. + * configure: Rebuilt. -20010617 Release Manager +2002-04-01 Phil Edwards - * GCC 3.0 Released. + * libF77/Version.c: Fix misplaced leading blanks on first line. + * libI77/Version.c: Likewise. + * libU77/Version.c: Likewise. + +2002-01-28 Geoffrey Keating + + * aclocal.m4: Replace with version copied from libstdc++-v3. + * configure.in: Update for changes to aclocal and Makefile. + * configure: Regenerate. + * Makefile.in: Correct install and uninstall for cross targets. + * libU77/configure: Regenerate. + +2002-01-20 Toon Moene + + * Makefile.in: $(MULTISUBDIR) has an implied leading `/'; + remove duplicates. + Use libtool for removing libg2c{a|la|so} for the `uninstall' target. + +2002-01-18 Toon Moene + + * Makefile.in: Add missing `/' separator in last change. + +2002-01-18 Toon Moene + + * Makefile.in: Install libg2c.{a|la|so} in $(libdir)$(MULTISUBDIR) + instead of $(libsubdir)$(MULTISUBDIR). + +2002-01-15 Loren J. Rittle + + * libI77/configure.in: Remove fcntl.h check; never define + _POSIX_SOURCE, NO_FCNTL or OPEN_DECL. Add check for tmpnam(). + * libI77/configure: Rebuilt. + * libI77/config.h.in: Rebuilt. + * libI77/Makefile.in: Remove all traces of rawio.h from + dependencies lists. + * libI77/fio.h (FSEEK): Unroll -j1.7 -j1.6 made 2002-01-04. + * libI77/open.c (f_open): Use HAVE_TMPNAM. + * libI77/rawio.h: Remove file. + +2002-01-14 John David Anglin + + * libI77/configure.in (_LARGEFILE_SOURCE): AC_DEFINE. + * libI77/configure: Rebuilt. + * libI77/config.h.in: Rebuilt. + +2002-01-04 Loren J. Rittle + + * libI77/fio.h (FSEEK): Enforce type of second parameter to be + off_t when prototype is missing from system headers for the + non-standard function. + +2002-01-03 Loren J. Rittle + + * Makefile.in ($(LIBG2C):): Let libtool decide when to add -lc. + +2001-12-04 Alexandre Oliva + + * Makefile.in ($(LIBG2C)): Fix -rpath argument to libtool. + + * 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 + * endfile.c (t_runc): After ftruncate, seek to end-of-file. + +2001-11-25 Toon Moene + + * libF77/Makefile.in: Fix non-portable use of `$<' in z_log.c's rule. + +2001-11-23 Toon Moene + + PR libf2c/4930 + * libF77/Makefile.in: Compile z_log.c with -ffloat-store. + +2001-11-16 John David Anglin + + * Makefile.in: Add MAKEOVERRIDES= to suppress exporting + environment to (sub)shells. + +2001-11-13 Toon Moene + + * Makefile.in: Change dependencies on stamp files + into dependencies on the generated .la files. + Get rid of objlist. Update comment. + * libF77/Makefile.in: Ditto. + * libI77/Makefile.in: Ditto. + * libU77/Makefile.in: Ditto. + +2001-10-20 Hans-Peter Nilsson + + * configure.in: Fake AC_EXEEXT invocation. + * configure: Regenerate. + +2001-10-20 David Edelsohn + + * Makefile.in: Do not include SUBDIRS in objlist. Create + libg2c.so from F2CEXT and SUBDIRS archives. + * libF77/Makefile.in: Create archive. + * libI77/Makefile.in: Same. + * libU77/Makefile.in: Same. + +2001-10-05 Toon Moene + + * Makefile.in: Move libg2c.so and libg2c.{l}a to + the same directory at install. + +2001-10-03 Toon Moene + + * Makefile.in: Add "AR" reference, change + from frtbegin.o to libfrtbegin.a. + * libF77/Makefile.in: Ditto. + +2001-10-02 Toon Moene + + * libF77/Makefile.in: Make .lo the target of compilation. + * libI77/Makefile.in: Ditto. + * libU77/Makefile.in: Ditto. + +2001-10-01 Toon Moene + + * Makefile.in: Set major:minor:sub version number + of shared libf2c to 0:0:0. + +2001-09-29 Juergen Pfeifer + Toon Moene + + Make libf2c a shared library. + + * aclocal.m4: Get definition of libtool. + * Makefile.in: Use libtool. + * configure.in: Use libtool. + * configure: Regenerated. + * libF77/Makefile.in: Use libtool; treat main program contained in + libF77/main.c specially. + * libF77/configure.in: Use libtool. + * libF77/configure: Regenerated. + * libI77/Makefile.in: Use libtool. + * libI77/configure.in: Use libtool. + * libI77/configure: Regenerated. + * libU77/Makefile.in: Use libtool. + * libU77/configure.in: Use libtool. + * libU77/configure: Regenerated. + * libU77/date_.c: Adapt for -fPIC compiling. + * libU77/vxtidate_.c: Ditto. + +2001-09-22 Richard Earnshaw + + * libI77/configure.in (__EXTENSIONS__): Define. + * libI77/config.h.in, libI77/conifgure: regenerate. + * libU77/configure.in (__EXTENSIONS__): Likewise. + +2001-07-18 Toon Moene + + * libI77/configure.in (_XOPEN_SOURCE, _FILE_OFFSET_BITS): Move + these defines before tests which might be affected by them. + (_XOPEN_SOURCE_EXTENDED): Define. + * libI77/configure, libI77/config.h.in: Regenerate. + +Wed Jul 18 11:14:33 2001 Kaveh R. Ghazi + + * libU77/configure.in (_XOPEN_SOURCE, _FILE_OFFSET_BITS): Move + these defines before tests which might be affected by them. + (_XOPEN_SOURCE_EXTENDED): Define. + + * libU77/configure, libU77/config.hin: Regenerate. + +2001-07-10 Toon Moene + + * libI77/fio.h: Revert type of url from off_t to int. + * libI77/dfe.c (c_dfe): Cast offset expression in FSEEK to off_t. + * libI77/due.c (c_due): Ditto. (e_rdue): Ditto. + * libI77/ftell_.c (G77_ftell_0): Cast result of FTELL to integer. + (G77_fseek_0): Cast offset argument of FSEEK to off_t. + +2001-07-07 Toon Moene + + * libI77/Makefile.in: Update config.h dependencies. + * libI77/configure.in: Define _XOPEN_SOURCE and + _FILE_OFFSET_BITS unconditionally. + * libI77/configure: Rebuilt. + * libI77/config.h.in: Rebuilt. + * libI77/endfile.c (t_runc): Replace rewind by FSEEK. + * libI77/err.c (f__nowwriting): The type of `loc' is off_t. + * libI77/open.c (f_open): Replace rewind by FSEEK. + * libI77/rewind.c: Include config.h. (f_rew): Replace + rewind by FSEEK. + * libI77/sfe.c: Include config.h. + * libI77/wsfe.c: Ditto. + * libU77/configure.in: Define _XOPEN_SOURCE and + _FILE_OFFSET_BITS unconditionally. + * libU77/configure: Rebuilt. + * libU77/config.hin: Rebuilt. + +2001-07-07 Toon Moene + + * libI77/Makefile.in: Add necessary dependencies on config.h. + +2001-07-06 Toon Moene + Pedro Vazquez + + * libI77/configure.in: Check for fseeko, ftello. + * libI77/configure: Rebuilt. + * libI77/config.h.in: Rebuilt. + * libI77/fio.h: Define FSEEK to be fseek or fseeko, depending + on configure's findings. Ditto for FTELL and ftell / ftello. + * libI77/backspace.c (f_back): Use FSEEK for fseek, FTELL for ftell. + * libI77/dfe.c (c_dfe): Ditto. + * libI77/due.c (c_due, e_rdue): Ditto. + * libI77/endfile.c (t_runc): Ditto. + * libI77/err.c (f__nowreading, f__nowwriting): Ditto. + * libI77/ftell_.c (G77_ftell_0, G77_fseek_0): Ditto. + * libI77/inquire.c (f_inqu): Ditto. + * libI77/open.c (f_open): Ditto. + * libI77/rdfmt.c (rd_ed): Ditto. + * libI77/sue.c (s_wsue, e_wsue, e_rsue): Ditto. + +2001-07-04 Zack Weinberg + + * Makefile.in: Take PICFLAG and RUNTESTFLAGS out of FLAGS_TO_PASS. + +2001-07-01 Toon Moene + + * libI77/fio.h: Include for off_t. + +2001-07-01 Toon Moene + Pedro Vazquez + + * libI77/fio.h: Use off_t when appropriate. + * libI77/backspace.c (f_back): Ditto. + * libI77/endfile.c (t_runc): Ditto. + * libI77/err.c (f__nowreading): Ditto. + * libI77/ftell_.c (unit_chk): Ditto. + * libI77/sue.c (global f__recloc, s_wsue): Ditto. 2001-06-13 Toon Moene @@ -80,12 +332,17 @@ ftruncate() prototype is somehow missing even though autoconf test found it properly. -2001-02-27 Toon Moene +2001-02-26 Toon Moene * libI77/configure.in: Test for ftruncate. * libI77/configure: Rebuilt. * libI77/endfile.c: Use fflush/ftruncate when available. +2001-02-19 Joseph S. Myers + + * libF77/Version.c, libI77/Version.c, libU77/Version.c: Update G77 + version number to 0.5.27. + 2001-02-08 Geoffrey Keating * configure.in: Don't run AC_PROG_CC_WORKS, because diff --git a/contrib/libf2c/Makefile.in b/contrib/libf2c/Makefile.in index 9075360fe9bb..ef42e39d1a7f 100644 --- a/contrib/libf2c/Makefile.in +++ b/contrib/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, 2002 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -20,19 +20,33 @@ #02111-1307, USA. SHELL = /bin/sh +MAKEOVERRIDES= +.NOEXPORTS: #### Start of system configuration section. #### -srcdir = @srcdir@ -VPATH = @srcdir@ +srcdir = @glibcpp_srcdir@ +VPATH = @glibcpp_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ target_alias = @target_alias@ gcc_version = @gcc_version@ gcc_version_trigger = @gcc_version_trigger@ +top_srcdir = @top_srcdir@ +toplevel_srcdir = @toplevel_srcdir@ +toolexecdir = @glibcpp_toolexecdir@ +glibcpp_toolexecdir = @glibcpp_toolexecdir@ +glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ + +top_builddir = . libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) +# +# Versions should start at 0:0:0 - See libtool manual. +VERSION_MAJOR=0 +VERSION_MINOR=0 +VERSION_SUB=0 # Multilib support variables. MULTISRCTOP = @@ -43,38 +57,37 @@ MULTIDO = true MULTICLEAN = true # Not configured per top-level version, since that doesn't get passed +# Versions should start at 0:0:0 - See libtool manual. # down at configure time, but overrridden by the top-level install # target. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -AR = @AR@ -AR_FLAGS = rc - -RANLIB = @RANLIB@ - +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. -# Currently no use for PICFLAG, RUNTESTFLAGS -- check usage. FLAGS_TO_PASS= \ CC='$(CC)' \ + LD='$(LD)' \ + LIBTOOL='$(LIBTOOL)' \ CFLAGS='$(CFLAGS)' \ CPPFLAGS='$(CPPFLAGS)' \ AR='$(AR)' \ RANLIB='$(RANLIB)' \ - PICFLAG='$(PICFLAG)' \ - RUNTESTFLAGS='$(RUNTESTFLAGS)' \ prefix='$(prefix)' \ exec_prefix='$(exec_prefix)' \ libdir='$(libdir)' \ libsubdir='$(libsubdir)' \ tooldir='$(tooldir)' -LIBG2C = libg2c.a +LIBG2C_BASE = libg2c +LIBG2C = $(LIBG2C_BASE).la SUBDIRS = libI77 libF77 libU77 @@ -114,9 +127,8 @@ all: all-unilib # meant to be invoked via multi-do for multilibs. # Its dependencies can be satisfied in parallel. The [fiu]77 targets -# update stamp files (see the subdir makefiles) which the $(LIBG2C) -# target checks in the sub make to decide whether to run ar/ranlib. -# (Probably only one stamp file is really needed.) The stamp files +# 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 @@ -130,19 +142,19 @@ 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 file dependencies are just to check whether libg2c.a is -# up-to-date (to avoid running ar regardless) -- the files should -# always have been created by a successful `all-unilib'. +# 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): s-libi77 s-libf77 s-libu77 s-libe77 - rm -f $(LIBG2C) - set -e; \ - for i in $(SUBDIRS); \ - do (cd $$i && $(MAKE) $(FLAGS_TO_PASS) LIBG2C=../$(LIBG2C) archive); \ - done - objs=""; for i in $(F2CEXT); do objs="$$objs libE77/L$$i.o"; done; \ - $(AR) $(AR_FLAGS) $(LIBG2C) $$objs - $(RANLIB) $(LIBG2C) + $(LIBTOOL) --mode=link $(CC) -o $@ \ + -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \ + -rpath $(libdir)$(MULTISUBDIR) \ + -objectlist s-libe77 \ + -objectlist s-libf77 \ + -objectlist s-libi77 \ + -objectlist s-libu77 \ + -lm i77: cd libI77; $(MAKE) $(FLAGS_TO_PASS) all @@ -154,16 +166,18 @@ u77: cd libU77; $(MAKE) $(FLAGS_TO_PASS) all s-libe77: f2cext.c - if [ -d libE77 ]; then rm -f libE77/*.o; else mkdir libE77; fi + if [ -d libE77 ]; then rm -f libE77/*.o libE77/*.lo; else mkdir libE77; fi + -rm -f $@.T $@ for name in $(F2CEXT); \ do \ echo $${name}; \ - $(CC) -c -I. -I$(srcdir) -I../../include $(CPPFLAGS) $(CFLAGS) \ - -DL$${name} $(srcdir)/f2cext.c \ - -o libE77/L$${name}.o; \ + $(LIBTOOL) --mode=compile $(CC) -c -I. -I$(srcdir) -I../../include \ + $(CPPFLAGS) $(CFLAGS) -DL$${name} $(srcdir)/f2cext.c \ + -o libE77/L$${name}.lo ; \ if [ $$? -eq 0 ] ; then true; else exit 1; fi; \ + echo libE77/L$${name}.lo >> $@.T; \ done - echo timestamp >s-libe77 + mv $@.T $@ f2cext.c: g2c.h @@ -197,30 +211,25 @@ check: cd libU77; $(MAKE) G77DIR=../../../gcc/ check install: all - $(INSTALL_DATA) $(LIBG2C) $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C).n - ( cd $(libsubdir)/$(MULTISUBDIR) ; $(RANLIB) $(LIBG2C).n ) - mv -f $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C).n $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C) + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(glibcpp_toolexeclibdir) + $(INSTALL_DATA) libfrtbegin.a $(glibcpp_toolexeclibdir) + $(RANLIB) $(glibcpp_toolexeclibdir)/libfrtbegin.a $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h - @if [ -f f2c-install-ok -o -f $(srcdir)/f2c-install-ok ]; then \ - echo ''; \ - echo 'Warning: g77 no longer installs libf2c.a or f2c.h.'; \ - echo ' You must do so yourself. For more information,'; \ - echo ' read "Distributing Binaries" in the g77 docs.'; \ - echo ' (To turn off this warning, delete the file'; \ - echo ' f2c-install-ok in the source or build directory.)'; \ - echo ''; \ - else true; fi $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" + @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall: - rm -f $(libsubdir)/$(MULTISUBDIR)/include/g2c.h $(libsubdir)/$(MULTISUBDIR)/$(LIBG2C) + rm -f $(libsubdir)/include/g2c.h + rm -f $(glibcpp_toolexeclibdir)/libfrtbegin.a + $(LIBTOOL) --mode=uninstall rm -f $(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" mostlyclean: - rm -f $(LIBG2C) + rm -f $(LIBG2C) objlist $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ $(MULTICLEAN) multi-clean DO=$@ rm -fr libE77 s-libe77 @@ -229,6 +238,7 @@ clean: mostlyclean rm -f config.log $(MAKE) DO=$@ DODIRS="$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do; \ $(MULTICLEAN) multi-clean DO=$@ + rm -rf .libs distclean: clean rm -f g2c.h s-libe77 diff --git a/contrib/libf2c/aclocal.m4 b/contrib/libf2c/aclocal.m4 new file mode 100644 index 000000000000..5cd9369daffc --- /dev/null +++ b/contrib/libf2c/aclocal.m4 @@ -0,0 +1,224 @@ +dnl Copyright (C) 1994, 1995-8, 1999, 2001 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. + +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. + +dnl +dnl Initialize configure bits. +dnl +dnl GLIBCPP_CONFIGURE +AC_DEFUN(GLIBCPP_CONFIGURE, [ + dnl Default to --enable-multilib + AC_ARG_ENABLE(multilib, + [ --enable-multilib build hella library versions (default)], + [case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [multilib=yes])dnl + +# When building with srcdir == objdir, links to the source files will +# be created in directories within the target_subdir. We have to +# adjust toplevel_srcdir accordingly, so that configure finds +# install-sh and other auxiliary files that live in the top-level +# source directory. +if test "${srcdir}" = "."; then + if test -z "${with_target_subdir}"; then + toprel=".." + else + if test "${with_target_subdir}" != "."; then + toprel="${with_multisrctop}../.." + else + toprel="${with_multisrctop}.." + fi + fi +else + toprel=".." +fi +AC_CONFIG_AUX_DIR(${srcdir}/$toprel) +toplevel_srcdir=\${top_srcdir}/$toprel +AC_SUBST(toplevel_srcdir) + +# Export build and source directories. +# These need to be absolute paths, yet at the same time need to +# canonicalize only relative paths, because then amd will not unmount +# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. +glibcpp_builddir=`pwd` +case $srcdir in +[\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;; +*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; +esac +AC_SUBST(glibcpp_builddir) +AC_SUBST(glibcpp_srcdir) + +dnl This is here just to satisfy automake. +ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)]) + +# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also +# be 'cp -p' if linking isn't available. +#ac_cv_prog_LN_S='cp -p' +AC_PROG_LN_S + +# We use these options to decide which functions to include. +AC_ARG_WITH(target-subdir, +[ --with-target-subdir=SUBDIR + configuring in a subdirectory]) +AC_ARG_WITH(cross-host, +[ --with-cross-host=HOST configuring with a cross compiler]) + + # Never versions of autoconf add an underscore to these functions. + # Prevent future problems ... + ifdef([AC_PROG_CC_G],[],[define([AC_PROG_CC_G],defn([_AC_PROG_CC_G]))]) + ifdef([AC_PROG_CC_GNU],[],[define([AC_PROG_CC_GNU],defn([_AC_PROG_CC_GNU]))]) + ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))]) + ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))]) + +# AC_PROG_CC + +# FIXME: We temporarily define our own version of AC_PROG_CC. This is +# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We +# are probably using a cross compiler, which will not be able to fully +# link an executable. This should really be fixed in autoconf +# itself. + +AC_DEFUN(LIB_AC_PROG_CC, +[AC_BEFORE([$0], [AC_PROG_CPP])dnl +dnl Fool anybody using AC_PROG_CC. +AC_PROVIDE([AC_PROG_CC]) +AC_CHECK_PROG(CC, gcc, gcc) +if test -z "$CC"; then + AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) + test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) +fi + +AC_PROG_CC_GNU + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +dnl Check whether -g works, even if CFLAGS is set, in case the package +dnl plays around with CFLAGS (such as to build both debugging and +dnl normal versions of a library), tasteless as that idea is. + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + AC_PROG_CC_G + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" + fi +else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" +fi +]) + +LIB_AC_PROG_CC + + AC_CHECK_TOOL(AS, as) + AC_CHECK_TOOL(AR, ar) + AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error) + AC_PROG_INSTALL + + # We need AC_EXEEXT to keep automake happy in cygnus mode. However, + # at least currently, we never actually build a program, so we never + # need to use $(EXEEXT). Moreover, the test for EXEEXT normally + # fails, because we are probably configuring with a cross compiler + # which can't create executables. So we include AC_EXEEXT to keep + # automake happy, but we don't execute it, since we don't care about + # the result. + if false; then + # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands + # to nothing, so nothing would remain between `then' and `fi' if it + # were not for the `:' below. + : + AC_EXEEXT + fi +]) + + +dnl +dnl GLIBCPP_EXPORT_INSTALL_INFO +dnl calculates gxx_install_dir +dnl exports glibcpp_toolexecdir +dnl exports glibcpp_toolexeclibdir +dnl exports glibcpp_prefixdir +dnl +dnl Assumes cross_compiling bits already done, and with_cross_host in +dnl particular +dnl +dnl GLIBCPP_EXPORT_INSTALL_INFO +AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [ +# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and +# exported correctly in GLIBCPP_CONFIGURE. +glibcpp_toolexecdir=no +glibcpp_toolexeclibdir=no +glibcpp_prefixdir=${prefix} + +AC_MSG_CHECKING([for interface version number]) +libstdcxx_interface=$INTERFACE +AC_MSG_RESULT($libstdcxx_interface) + +# Process the option "--enable-version-specific-runtime-libs" +AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) +AC_ARG_ENABLE(version-specific-runtime-libs, +[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ], +[case "$enableval" in + yes) version_specific_libs=yes ;; + no) version_specific_libs=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);; + esac], +version_specific_libs=no)dnl +# Option set, now we can test it. +AC_MSG_RESULT($version_specific_libs) + +gcc_version_trigger=${toplevel_srcdir}/gcc/version.c +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^ \"]]*\)[[ \"]].*/\1/'` +gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +AC_SUBST(gcc_version) +AC_SUBST(gcc_version_trigger) + +if test $version_specific_libs = yes; then + # Need the gcc compiler version to know where to install libraries + # and header files if --enable-version-specific-runtime-libs option + # is selected. + changequote(,)dnl + glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' + changequote([,])dnl +fi + +# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir +# Install a library built with a cross compiler in tooldir, not libdir. +if test x"$glibcpp_toolexecdir" = x"no"; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + else + glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + fi +fi + +AC_SUBST(glibcpp_prefixdir) +AC_SUBST(glibcpp_toolexecdir) +AC_SUBST(glibcpp_toolexeclibdir) +]) + +sinclude(../libtool.m4) +dnl The lines below arrange for aclocal not to bring an installed +dnl libtool.m4 into aclocal.m4, while still arranging for automake to +dnl add a definition of LIBTOOL to Makefile.in. +ifelse(,,,[AC_SUBST(LIBTOOL) +AC_DEFUN([AM_PROG_LIBTOOL]) +AC_DEFUN([AC_LIBTOOL_DLOPEN]) +AC_DEFUN([AC_PROG_LD]) +]) diff --git a/contrib/libf2c/configure b/contrib/libf2c/configure index 75b9e5fe9b72..ff9501278446 100755 --- a/contrib/libf2c/configure +++ b/contrib/libf2c/configure @@ -11,6 +11,27 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-multilib build hella library versions (default)" +ac_help="$ac_help + --with-target-subdir=SUBDIR + configuring in a subdirectory" +ac_help="$ac_help + --with-cross-host=HOST configuring with a cross compiler" +ac_help="$ac_help + --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory " +ac_help="$ac_help + --enable-shared[=PKGS] build shared libraries [default=yes]" +ac_help="$ac_help + --enable-static[=PKGS] build static libraries [default=yes]" +ac_help="$ac_help + --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" +ac_help="$ac_help + --with-gnu-ld assume the C compiler uses GNU ld [default=no]" +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]" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -28,6 +49,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -142,6 +164,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 +335,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 +505,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 @@ -522,17 +554,14 @@ fi -if test "${srcdir}" = "." ; then - if test "${with_target_subdir}" != "." ; then - topsrcdir=${with_multisrctop}../.. - else - topsrcdir=${with_multisrctop}.. - fi -else - topsrcdir=${srcdir}/.. -fi +# 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_aux_dir= -for ac_dir in $topsrcdir $srcdir/$topsrcdir; do +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -544,56 +573,300 @@ for ac_dir in $topsrcdir $srcdir/$topsrcdir; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $topsrcdir $srcdir/$topsrcdir" 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -# 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. -# Note that when we look for the compiler, we search both with and without -# extension to handle cross and canadian cross builds. -compiler_name=f771 -rm -f skip-this-dir -echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 -echo "configure:562: checking if compiler $compiler_name has been built" >&5 -if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then +# Do some error checking and defaulting for the host and target type. +# The inputs are: +# configure --host=HOST --target=TARGET --build=BUILD NONOPT +# +# The rules are: +# 1. You are not allowed to specify --host, --target, and nonopt at the +# same time. +# 2. Host defaults to nonopt. +# 3. If nonopt is not specified, then host defaults to the current host, +# as determined by config.guess. +# 4. Target and build default to nonopt. +# 5. If nonopt is not specified, then target and build default to host. + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +case $host---$target---$nonopt in +NONE---*---* | *---NONE---* | *---*---NONE) ;; +*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; +esac + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:611: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:632: checking target system type" >&5 + +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac + +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:650: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +test "$host_alias" != "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + +target_alias=${target_alias-$target} + + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:682: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - g77_cv_compiler_exists=yes -if test -n "$r"; then - if test -d "$r"/gcc; then - if test -f "$r"/gcc/$compiler_name \ - || test -f "$r"/gcc/$compiler_name.exe; then - true + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +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:715: 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 <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_mingw32=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_mingw32" 1>&6 +MINGW32= +test "$ac_cv_mingw32" = yes && MINGW32=yes + + # Check whether --enable-multilib or --disable-multilib was given. +if test "${enable_multilib+set}" = set; then + enableval="$enable_multilib" + case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;; + esac +else + multilib=yes +fi + +# When building with srcdir == objdir, links to the source files will +# be created in directories within the target_subdir. We have to +# adjust toplevel_srcdir accordingly, so that configure finds +# install-sh and other auxiliary files that live in the top-level +# source directory. +if test "${srcdir}" = "."; then + if test -z "${with_target_subdir}"; then + toprel=".." + else + if test "${with_target_subdir}" != "."; then + toprel="${with_multisrctop}../.." else - g77_cv_compiler_exists=no - echo "rm -f config.cache config.log multilib.out" > skip-this-dir + toprel="${with_multisrctop}.." fi fi +else + toprel=".." fi - +ac_aux_dir= +for ac_dir in ${srcdir}/$toprel $srcdir/${srcdir}/$toprel; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/$toprel $srcdir/${srcdir}/$toprel" 1>&2; exit 1; } fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -echo "$ac_t""$g77_cv_compiler_exists" 1>&6 -if test x$g77_cv_compiler_exists = xno +toplevel_srcdir=\${top_srcdir}/$toprel + + +# Export build and source directories. +# These need to be absolute paths, yet at the same time need to +# canonicalize only relative paths, because then amd will not unmount +# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. +glibcpp_builddir=`pwd` +case $srcdir in +\\/$* | ?:\\/*) glibcpp_srcdir=${srcdir} ;; +*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; +esac + + + + + +# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also +# be 'cp -p' if linking isn't available. +#ac_cv_prog_LN_S='cp -p' +echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:814: 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 + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null then - rm -f Makefile conftest* confdefs* core - exit 0 + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" +else + ac_cv_prog_LN_S=ln +fi +fi +LN_S="$ac_cv_prog_LN_S" +if test "$ac_cv_prog_LN_S" = "ln -s"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 fi +# We use these options to decide which functions to include. +# Check whether --with-target-subdir or --without-target-subdir was given. +if test "${with_target_subdir+set}" = set; then + withval="$with_target_subdir" + : +fi + +# Check whether --with-cross-host or --without-cross-host was given. +if test "${with_cross_host+set}" = set; then + withval="$with_cross_host" + : +fi + + + # Never versions of autoconf add an underscore to these functions. + # Prevent future problems ... + + + + + +# AC_PROG_CC + +# FIXME: We temporarily define our own version of AC_PROG_CC. This is +# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We +# are probably using a cross compiler, which will not be able to fully +# link an executable. This should really be fixed in autoconf +# itself. + -# For g77 we'll set CC to point at the built gcc, but this will get it into -# the makefiles # 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:597: checking for $ac_word" >&5 +echo "configure:870: 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 @@ -623,7 +896,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:627: checking for $ac_word" >&5 +echo "configure:900: 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 @@ -668,46 +941,11 @@ else echo "$ac_t""no" 1>&6 fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # 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:678: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:711: checking whether we are using GNU C" >&5 +echo "configure:949: 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 @@ -716,7 +954,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:720: \"$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:958: \"$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 @@ -727,15 +965,11 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes -else - GCC= -fi - -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:739: checking whether ${CC-cc} accepts -g" >&5 + 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:973: 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 @@ -750,23 +984,1224 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else - CFLAGS="-g" + CFLAGS="-O2" fi else - if test "$GCC" = yes; then - CFLAGS="-O2" + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" +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:1004: 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 + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # 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_AS="${ac_tool_prefix}as" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +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:1036: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +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:1068: 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:1100: 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="ranlib-not-found-in-path-error" +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="ranlib-not-found-in-path-error" +fi +fi + + # 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: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# 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:1144: 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 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_save_IFS" + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" else - CFLAGS= + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + # We need AC_EXEEXT to keep automake happy in cygnus mode. However, + # at least currently, we never actually build a program, so we never + # need to use $(EXEEXT). Moreover, the test for EXEEXT normally + # fails, because we are probably configuring with a cross compiler + # which can't create executables. So we include AC_EXEEXT to keep + # automake happy, but we don't execute it, since we don't care about + # the result. + if false; then + # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands + # to nothing, so nothing would remain between `then' and `fi' if it + # were not for the `:' below. + : + + +echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +echo "configure:1212: checking for executable suffix" >&5 +if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$CYGWIN" = yes || test "$MINGW32" = yes; then + ac_cv_exeext=.exe +else + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= + if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + else + { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } + fi + rm -f conftest* + test x"${ac_cv_exeext}" = x && ac_cv_exeext=no +fi +fi + +EXEEXT="" +test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +echo "$ac_t""${ac_cv_exeext}" 1>&6 +ac_exeext=$EXEEXT + + fi + + +# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and +# exported correctly in GLIBCPP_CONFIGURE. +glibcpp_toolexecdir=no +glibcpp_toolexeclibdir=no +glibcpp_prefixdir=${prefix} + +echo $ac_n "checking for interface version number""... $ac_c" 1>&6 +echo "configure:1252: checking for interface version number" >&5 +libstdcxx_interface=$INTERFACE +echo "$ac_t""$libstdcxx_interface" 1>&6 + +# Process the option "--enable-version-specific-runtime-libs" +echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 +echo "configure:1258: checking for --enable-version-specific-runtime-libs" >&5 +# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. +if test "${enable_version_specific_runtime_libs+set}" = set; then + enableval="$enable_version_specific_runtime_libs" + case "$enableval" in + yes) version_specific_libs=yes ;; + no) version_specific_libs=no ;; + *) { echo "configure: error: Unknown argument to enable/disable version-specific libs" 1>&2; exit 1; };; + esac +else + version_specific_libs=no +fi +# Option set, now we can test it. +echo "$ac_t""$version_specific_libs" 1>&6 + +gcc_version_trigger=${toplevel_srcdir}/gcc/version.c +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'` +gcc_version=`echo ${gcc_version_full} | sed -e 's/\(^ *\) .*/\1/'` + + + +if test $version_specific_libs = yes; then + # Need the gcc compiler version to know where to install libraries + # and header files if --enable-version-specific-runtime-libs option + # is selected. + glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' + fi + +# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir +# Install a library built with a cross compiler in tooldir, not libdir. +if test x"$glibcpp_toolexecdir" = x"no"; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + else + glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' fi fi + + + + +# 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. +# Note that when we look for the compiler, we search both with and without +# extension to handle cross and canadian cross builds. +compiler_name=f771 +rm -f skip-this-dir +echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 +echo "configure:1312: checking if compiler $compiler_name has been built" >&5 +if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + g77_cv_compiler_exists=yes +if test -n "$r"; then + if test -d "$r"/gcc; then + if test -f "$r"/gcc/$compiler_name \ + || test -f "$r"/gcc/$compiler_name.exe; then + true + else + g77_cv_compiler_exists=no + echo "rm -f config.cache config.log multilib.out" > skip-this-dir + fi + fi +fi + +fi + +echo "$ac_t""$g77_cv_compiler_exists" 1>&6 +if test x$g77_cv_compiler_exists = xno +then + rm -f Makefile conftest* confdefs* core + exit 0 +fi + + +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + p=${PACKAGE-default} +case $enableval in +yes) enable_shared=yes ;; +no) enable_shared=no ;; +*) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_shared=yes +fi + +# Check whether --enable-static or --disable-static was given. +if test "${enable_static+set}" = set; then + enableval="$enable_static" + p=${PACKAGE-default} +case $enableval in +yes) enable_static=yes ;; +no) enable_static=no ;; +*) + enable_static=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_static=yes +fi + +# Check whether --enable-fast-install or --disable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval="$enable_fast_install" + p=${PACKAGE-default} +case $enableval in +yes) enable_fast_install=yes ;; +no) enable_fast_install=no ;; +*) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," + for pkg in $enableval; do + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$ac_save_ifs" + ;; +esac +else + enable_fast_install=yes +fi + +# Check whether --with-gnu-ld or --without-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval="$with_gnu_ld" + test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$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:1420: 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 + # Accept absolute paths. + [\\/]* | [A-Za-z]:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # 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 + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +echo "configure:1450: checking for GNU ld" >&5 +else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +echo "configure:1453: checking for non-GNU ld" >&5 +fi +if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + 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" + # 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 + test "$with_gnu_ld" != no && break + else + test "$with_gnu_ld" != yes && break + fi + fi + done + IFS="$ac_save_ifs" +else + lt_cv_path_LD="$LD" # Let the user override the test with a path. +fi +fi + +LD="$lt_cv_path_LD" +if test -n "$LD"; then + echo "$ac_t""$LD" 1>&6 +else + echo "$ac_t""no" 1>&6 +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:1488: checking if the linker ($LD) is GNU ld" >&5 +if eval "test \"`echo '$''{'lt_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 &5; then + lt_cv_prog_gnu_ld=yes +else + lt_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:1505: 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""$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:1517: checking for BSD-compatible nm" >&5 +if eval "test \"`echo '$''{'lt_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" +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 + # 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" + 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" + break + else + lt_cv_path_NM=${lt_cv_path_NM="$tmp_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 +fi +fi + +NM="$lt_cv_path_NM" +echo "$ac_t""$NM" 1>&6 + +echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 +echo "configure:1555: 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*) + 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 + ;; + +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:1719: 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:1725: \"$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:1749: 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 <&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:1811: 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 <&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 + ;; +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:1882: 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:1914: 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:1949: 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:1981: 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" + + +# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval="$enable_libtool_lock" + : +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 +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 2048 "configure"' > conftest.$ac_ext + if { (eval echo configure:2049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -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:2070: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + lt_cv_cc_needs_belf=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + 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 + 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" + fi + ;; + + +esac + + +# Save cache, so that ltconfig can load it +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +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" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ +|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + +# Reload cache, that may have been modified by ltconfig +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +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" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +# Redirect the config.log output again, so that the ltconfig log is not +# clobbered by the next message. +exec 5>>./config.log + + + + + + + test "$AR" || AR=ar if test "$RANLIB"; then : @@ -775,7 +2210,7 @@ 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:779: checking for $ac_word" >&5 +echo "configure:2214: 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 @@ -815,7 +2250,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:819: checking for a BSD compatible install" >&5 +echo "configure:2254: 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 @@ -868,7 +2303,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:872: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2307: 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 @@ -897,7 +2332,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:901: checking how to run the C preprocessor" >&5 +echo "configure:2336: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -912,13 +2347,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:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2357: \"$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 : @@ -929,13 +2364,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:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2374: \"$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 : @@ -946,13 +2381,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:956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2391: \"$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 : @@ -978,17 +2413,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:982: checking for stdio.h" >&5 +echo "configure:2417: 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:992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2427: \"$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* @@ -1016,12 +2451,12 @@ fi echo $ac_n "checking for built-in g77 integer types""... $ac_c" 1>&6 -echo "configure:1020: checking for built-in g77 integer types" >&5 +echo "configure:2455: checking for built-in g77 integer types" >&5 if eval "test \"`echo '$''{'libf2c_cv_has_g77_builtin_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libf2c_cv_has_g77_builtin_types=yes else @@ -1057,107 +2492,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 - - - - -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1100: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1121: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1139: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - subdirs="libU77 libI77 libF77" # Do Makefile first since g2c.h depends on it and shouldn't get an @@ -1308,16 +2642,6 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g -s%@CC@%$CC%g -s%@AR@%$AR%g -s%@RANLIB@%$RANLIB%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CPP@%$CPP%g -s%@gcc_version@%$gcc_version%g -s%@gcc_version_trigger@%$gcc_version_trigger%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -1333,6 +2657,28 @@ s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g +s%@toplevel_srcdir@%$toplevel_srcdir%g +s%@glibcpp_builddir@%$glibcpp_builddir%g +s%@glibcpp_srcdir@%$glibcpp_srcdir%g +s%@LN_S@%$LN_S%g +s%@CC@%$CC%g +s%@AS@%$AS%g +s%@AR@%$AR%g +s%@RANLIB@%$RANLIB%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@EXEEXT@%$EXEEXT%g +s%@gcc_version@%$gcc_version%g +s%@gcc_version_trigger@%$gcc_version_trigger%g +s%@glibcpp_prefixdir@%$glibcpp_prefixdir%g +s%@glibcpp_toolexecdir@%$glibcpp_toolexecdir%g +s%@glibcpp_toolexeclibdir@%$glibcpp_toolexeclibdir%g +s%@OBJEXT@%$OBJEXT%g +s%@STRIP@%$STRIP%g +s%@LIBTOOL@%$LIBTOOL%g +s%@SET_MAKE@%$SET_MAKE%g +s%@CPP@%$CPP%g s%@subdirs@%$subdirs%g CEOF @@ -1442,17 +2788,18 @@ 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} EOF cat >> $CONFIG_STATUS <<\EOF 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 diff --git a/contrib/libf2c/configure.in b/contrib/libf2c/configure.in index bbcaac76a02f..f905722ad613 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} ) diff --git a/contrib/libf2c/libF77/Makefile.in b/contrib/libf2c/libF77/Makefile.in index 74c69a0915a6..4f6730de41c0 100644 --- a/contrib/libf2c/libF77/Makefile.in +++ b/contrib/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. @@ -31,8 +31,6 @@ VPATH = @srcdir@ # configuration. DEFS = @DEFS@ -LIBG2C = ../libg2c.a - F2C_H_DIR = @srcdir@/.. G2C_H_DIR = .. CC = @CC@ @@ -40,6 +38,7 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ AR = @AR@ ARFLAGS = rc +RANLIB = @RANLIB@ @SET_MAKE@ SHELL = /bin/sh @@ -49,44 +48,44 @@ SHELL = /bin/sh ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) $(DEFS) $(CFLAGS) .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .lo -.c.o: - $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< +.c.lo: + @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< -MISC = F77_aloc.o VersionF.o main.o s_rnge.o abort_.o getarg_.o iargc_.o\ - getenv_.o signal_.o s_stop.o s_paus.o system_.o cabs.o\ - derf_.o derfc_.o erf_.o erfc_.o sig_die.o exit_.o setarg.o setsig.o -POW = pow_ci.o pow_dd.o pow_di.o pow_hh.o pow_ii.o pow_ri.o pow_zi.o pow_zz.o \ - pow_qq.o -CX = c_abs.o c_cos.o c_div.o c_exp.o c_log.o c_sin.o c_sqrt.o -DCX = z_abs.o z_cos.o z_div.o z_exp.o z_log.o z_sin.o z_sqrt.o -REAL = r_abs.o r_acos.o r_asin.o r_atan.o r_atn2.o r_cnjg.o r_cos.o\ - r_cosh.o r_dim.o r_exp.o r_imag.o r_int.o\ - r_lg10.o r_log.o r_mod.o r_nint.o r_sign.o\ - r_sin.o r_sinh.o r_sqrt.o r_tan.o r_tanh.o -DBL = d_abs.o d_acos.o d_asin.o d_atan.o d_atn2.o\ - d_cnjg.o d_cos.o d_cosh.o d_dim.o d_exp.o\ - d_imag.o d_int.o d_lg10.o d_log.o d_mod.o\ - d_nint.o d_prod.o d_sign.o d_sin.o d_sinh.o\ - d_sqrt.o d_tan.o d_tanh.o -INT = i_abs.o i_dim.o i_dnnt.o i_indx.o i_len.o i_mod.o i_nint.o i_sign.o -HALF = h_abs.o h_dim.o h_dnnt.o h_indx.o h_len.o h_mod.o h_nint.o h_sign.o -CMP = l_ge.o l_gt.o l_le.o l_lt.o hl_ge.o hl_gt.o hl_le.o hl_lt.o -EFL = ef1asc_.o ef1cmc_.o -CHAR = s_cat.o s_cmp.o s_copy.o -F90BIT = lbitbits.o lbitshft.o qbitbits.o qbitshft.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 +POW = pow_ci.lo pow_dd.lo pow_di.lo pow_hh.lo pow_ii.lo pow_ri.lo pow_zi.lo pow_zz.lo \ + pow_qq.lo +CX = c_abs.lo c_cos.lo c_div.lo c_exp.lo c_log.lo c_sin.lo c_sqrt.lo +DCX = z_abs.lo z_cos.lo z_div.lo z_exp.lo z_log.lo z_sin.lo z_sqrt.lo +REAL = r_abs.lo r_acos.lo r_asin.lo r_atan.lo r_atn2.lo r_cnjg.lo r_cos.lo\ + r_cosh.lo r_dim.lo r_exp.lo r_imag.lo r_int.lo\ + r_lg10.lo r_log.lo r_mod.lo r_nint.lo r_sign.lo\ + r_sin.lo r_sinh.lo r_sqrt.lo r_tan.lo r_tanh.lo +DBL = d_abs.lo d_acos.lo d_asin.lo d_atan.lo d_atn2.lo\ + d_cnjg.lo d_cos.lo d_cosh.lo d_dim.lo d_exp.lo\ + d_imag.lo d_int.lo d_lg10.lo d_log.lo d_mod.lo\ + d_nint.lo d_prod.lo d_sign.lo d_sin.lo d_sinh.lo\ + d_sqrt.lo d_tan.lo d_tanh.lo +INT = i_abs.lo i_dim.lo i_dnnt.lo i_indx.lo i_len.lo i_mod.lo i_nint.lo i_sign.lo +HALF = h_abs.lo h_dim.lo h_dnnt.lo h_indx.lo h_len.lo h_mod.lo h_nint.lo h_sign.lo +CMP = l_ge.lo l_gt.lo l_le.lo l_lt.lo hl_ge.lo hl_gt.lo hl_le.lo hl_lt.lo +EFL = ef1asc_.lo ef1cmc_.lo +CHAR = s_cat.lo s_cmp.lo s_copy.lo +F90BIT = lbitbits.lo lbitshft.lo qbitbits.lo qbitshft.lo OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \ $(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) -all: ../s-libf77 +all: ../s-libf77 ../libfrtbegin.a ../s-libf77: $(OBJS) - echo timestamp > ../s-libf77 - -archive: - $(AR) $(ARFLAGS) $(LIBG2C) $(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 @@ -100,130 +99,138 @@ ${srcdir}/configure: configure.in rm -f config.cache cd ${srcdir} && autoconf -VersionF.o: Version.c - $(CC) -c $(ALL_CFLAGS) -o $@ $(srcdir)/Version.c +VersionF.lo: Version.c + @LIBTOOL@ --mode=compile $(CC) -c $(ALL_CFLAGS) $(srcdir)/Version.c -o $@ -F77_aloc.o: F77_aloc.c -main.o: main.c -s_rnge.o: s_rnge.c -abort_.o: abort_.c -getarg_.o: getarg_.c -iargc_.o: iargc_.c -getenv_.o: getenv_.c -signal_.o: signal_.c -s_stop.o: s_stop.c -s_paus.o: s_paus.c -system_.o: system_.c -cabs.o: cabs.c -derf_.o: derf_.c -derfc_.o: derfc_.c -erf_.o: erf_.c -erfc_.o: erfc_.c -sig_die.o: sig_die.c -exit_.o: exit_.c -setarg.o: setarg.c -setsig.o: setsig.c -pow_ci.o: pow_ci.c -pow_dd.o: pow_dd.c -pow_di.o: pow_di.c -pow_hh.o: pow_hh.c -pow_ii.o: pow_ii.c -pow_ri.o: pow_ri.c -pow_zi.o: pow_zi.c -pow_zz.o: pow_zz.c -pow_qq.o: pow_qq.c -c_abs.o: c_abs.c -c_cos.o: c_cos.c -c_div.o: c_div.c -c_exp.o: c_exp.c -c_log.o: c_log.c -c_sin.o: c_sin.c -c_sqrt.o: c_sqrt.c -z_abs.o: z_abs.c -z_cos.o: z_cos.c -z_div.o: z_div.c -z_exp.o: z_exp.c -z_log.o: z_log.c -z_sin.o: z_sin.c -z_sqrt.o: z_sqrt.c -r_abs.o: r_abs.c -r_acos.o: r_acos.c -r_asin.o: r_asin.c -r_atan.o: r_atan.c -r_atn2.o: r_atn2.c -r_cnjg.o: r_cnjg.c -r_cos.o: r_cos.c -r_cosh.o: r_cosh.c -r_dim.o: r_dim.c -r_exp.o: r_exp.c -r_imag.o: r_imag.c -r_int.o: r_int.c -r_lg10.o: r_lg10.c -r_log.o: r_log.c -r_mod.o: r_mod.c -r_nint.o: r_nint.c -r_sign.o: r_sign.c -r_sin.o: r_sin.c -r_sinh.o: r_sinh.c -r_sqrt.o: r_sqrt.c -r_tan.o: r_tan.c -r_tanh.o: r_tanh.c -d_abs.o: d_abs.c -d_acos.o: d_acos.c -d_asin.o: d_asin.c -d_atan.o: d_atan.c -d_atn2.o: d_atn2.c -d_cnjg.o: d_cnjg.c -d_cos.o: d_cos.c -d_cosh.o: d_cosh.c -d_dim.o: d_dim.c -d_exp.o: d_exp.c -d_imag.o: d_imag.c -d_int.o: d_int.c -d_lg10.o: d_lg10.c -d_log.o: d_log.c -d_mod.o: d_mod.c -d_nint.o: d_nint.c -d_prod.o: d_prod.c -d_sign.o: d_sign.c -d_sin.o: d_sin.c -d_sinh.o: d_sinh.c -d_sqrt.o: d_sqrt.c -d_tan.o: d_tan.c -d_tanh.o: d_tanh.c -i_abs.o: i_abs.c -i_dim.o: i_dim.c -i_dnnt.o: i_dnnt.c -i_indx.o: i_indx.c -i_len.o: i_len.c -i_mod.o: i_mod.c -i_nint.o: i_nint.c -i_sign.o: i_sign.c -h_abs.o: h_abs.c -h_dim.o: h_dim.c -h_dnnt.o: h_dnnt.c -h_indx.o: h_indx.c -h_len.o: h_len.c -h_mod.o: h_mod.c -h_nint.o: h_nint.c -h_sign.o: h_sign.c -l_ge.o: l_ge.c -l_gt.o: l_gt.c -l_le.o: l_le.c -l_lt.o: l_lt.c -hl_ge.o: hl_ge.c -hl_gt.o: hl_gt.c -hl_le.o: hl_le.c -hl_lt.o: hl_lt.c -ef1asc_.o: ef1asc_.c -ef1cmc_.o: ef1cmc_.c -s_cat.o: s_cat.c -s_cmp.o: s_cmp.c -s_copy.o: s_copy.c -lbitbits.o: lbitbits.c -lbitshft.o: lbitshft.c -qbitbits.o: qbitbits.c -qbitshft.o: qbitshft.c +frtbegin.o : main.c + $(CC) -c $(ALL_CFLAGS) $(srcdir)/main.c -o $@ + +../libfrtbegin.a: frtbegin.o + -rm -f $@ + $(AR) $(ARFLAGS) $@ frtbegin.o + $(RANLIB) $@ + +F77_aloc.lo: F77_aloc.c +s_rnge.lo: s_rnge.c +abort_.lo: abort_.c +getarg_.lo: getarg_.c +iargc_.lo: iargc_.c +getenv_.lo: getenv_.c +signal_.lo: signal_.c +s_stop.lo: s_stop.c +s_paus.lo: s_paus.c +system_.lo: system_.c +cabs.lo: cabs.c +derf_.lo: derf_.c +derfc_.lo: derfc_.c +erf_.lo: erf_.c +erfc_.lo: erfc_.c +sig_die.lo: sig_die.c +exit_.lo: exit_.c +setarg.lo: setarg.c +setsig.lo: setsig.c +pow_ci.lo: pow_ci.c +pow_dd.lo: pow_dd.c +pow_di.lo: pow_di.c +pow_hh.lo: pow_hh.c +pow_ii.lo: pow_ii.c +pow_ri.lo: pow_ri.c +pow_zi.lo: pow_zi.c +pow_zz.lo: pow_zz.c +pow_qq.lo: pow_qq.c +c_abs.lo: c_abs.c +c_cos.lo: c_cos.c +c_div.lo: c_div.c +c_exp.lo: c_exp.c +c_log.lo: c_log.c +c_sin.lo: c_sin.c +c_sqrt.lo: c_sqrt.c +z_abs.lo: z_abs.c +z_cos.lo: z_cos.c +z_div.lo: z_div.c +z_exp.lo: z_exp.c +z_log.lo: z_log.c + @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) -ffloat-store $(srcdir)/z_log.c +z_sin.lo: z_sin.c +z_sqrt.lo: z_sqrt.c +r_abs.lo: r_abs.c +r_acos.lo: r_acos.c +r_asin.lo: r_asin.c +r_atan.lo: r_atan.c +r_atn2.lo: r_atn2.c +r_cnjg.lo: r_cnjg.c +r_cos.lo: r_cos.c +r_cosh.lo: r_cosh.c +r_dim.lo: r_dim.c +r_exp.lo: r_exp.c +r_imag.lo: r_imag.c +r_int.lo: r_int.c +r_lg10.lo: r_lg10.c +r_log.lo: r_log.c +r_mod.lo: r_mod.c +r_nint.lo: r_nint.c +r_sign.lo: r_sign.c +r_sin.lo: r_sin.c +r_sinh.lo: r_sinh.c +r_sqrt.lo: r_sqrt.c +r_tan.lo: r_tan.c +r_tanh.lo: r_tanh.c +d_abs.lo: d_abs.c +d_acos.lo: d_acos.c +d_asin.lo: d_asin.c +d_atan.lo: d_atan.c +d_atn2.lo: d_atn2.c +d_cnjg.lo: d_cnjg.c +d_cos.lo: d_cos.c +d_cosh.lo: d_cosh.c +d_dim.lo: d_dim.c +d_exp.lo: d_exp.c +d_imag.lo: d_imag.c +d_int.lo: d_int.c +d_lg10.lo: d_lg10.c +d_log.lo: d_log.c +d_mod.lo: d_mod.c +d_nint.lo: d_nint.c +d_prod.lo: d_prod.c +d_sign.lo: d_sign.c +d_sin.lo: d_sin.c +d_sinh.lo: d_sinh.c +d_sqrt.lo: d_sqrt.c +d_tan.lo: d_tan.c +d_tanh.lo: d_tanh.c +i_abs.lo: i_abs.c +i_dim.lo: i_dim.c +i_dnnt.lo: i_dnnt.c +i_indx.lo: i_indx.c +i_len.lo: i_len.c +i_mod.lo: i_mod.c +i_nint.lo: i_nint.c +i_sign.lo: i_sign.c +h_abs.lo: h_abs.c +h_dim.lo: h_dim.c +h_dnnt.lo: h_dnnt.c +h_indx.lo: h_indx.c +h_len.lo: h_len.c +h_mod.lo: h_mod.c +h_nint.lo: h_nint.c +h_sign.lo: h_sign.c +l_ge.lo: l_ge.c +l_gt.lo: l_gt.c +l_le.lo: l_le.c +l_lt.lo: l_lt.c +hl_ge.lo: hl_ge.c +hl_gt.lo: hl_gt.c +hl_le.lo: hl_le.c +hl_lt.lo: hl_lt.c +ef1asc_.lo: ef1asc_.c +ef1cmc_.lo: ef1cmc_.c +s_cat.lo: s_cat.c +s_cmp.lo: s_cmp.c +s_copy.lo: s_copy.c +lbitbits.lo: lbitbits.c +lbitshft.lo: lbitshft.c +qbitbits.lo: qbitbits.c +qbitshft.lo: qbitshft.c # Not quite all these actually do depend on f2c.h... $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) \ @@ -232,7 +239,8 @@ $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) $(HALF) $(CMP) $(EFL) \ check install uninstall install-strip dist installcheck installdirs: mostlyclean: - rm -f *.o + rm -f *.o *.lo ../libfrtbegin.a + rm -rf .libs clean: mostlyclean rm -f config.log diff --git a/contrib/libf2c/libF77/Version.c b/contrib/libf2c/libF77/Version.c index ad367f4d95db..e8adbb79ec19 100644 --- a/contrib/libf2c/libF77/Version.c +++ b/contrib/libf2c/libF77/Version.c @@ -3,7 +3,7 @@ static char junk[] = "\n@(#)LIBF77 VERSION 20000929\n"; /* */ -char __G77_LIBF77_VERSION__[] = "0.5.26 20011023 (release)"; +char __G77_LIBF77_VERSION__[] = "3.1 20020509 (prerelease)"; /* 2.00 11 June 1980. File version.c added to library. diff --git a/contrib/libf2c/libF77/configure b/contrib/libf2c/libF77/configure index 9017e8354bc9..5b6a257737b9 100755 --- a/contrib/libf2c/libF77/configure +++ b/contrib/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 @@ -704,10 +715,47 @@ else fi +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:711: 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 @@ -737,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:741: 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= @@ -752,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:762: \"$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 : @@ -769,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:779: \"$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 : @@ -786,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:796: \"$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 : @@ -818,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:822: 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:832: \"$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* @@ -856,12 +904,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:860: 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 @@ -869,7 +917,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:873: \"$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* @@ -886,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 @@ -904,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 @@ -925,7 +973,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -936,7 +984,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:940: \"$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 @@ -961,12 +1009,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:965: 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 @@ -992,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:996: 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__ @@ -1020,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:1024: 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 @@ -1042,7 +1090,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1046: \"$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 @@ -1063,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:1067: 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 @@ -1116,12 +1164,12 @@ else EOF echo $ac_n "checking for onexit""... $ac_c" 1>&6 -echo "configure:1120: 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 @@ -1162,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:1166: 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 @@ -1220,7 +1268,7 @@ else true fi echo $ac_n "checking for drem in -lm""... $ac_c" 1>&6 -echo "configure:1224: 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 @@ -1228,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 @@ -1417,7 +1465,9 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g 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/contrib/libf2c/libF77/configure.in b/contrib/libf2c/libF77/configure.in index 9d344822fb09..ae34d36d908f 100644 --- a/contrib/libf2c/libF77/configure.in +++ b/contrib/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. @@ -32,8 +32,16 @@ define([AC_PROG_CC_WORKS],[]) # the makefiles AC_PROG_CC +LIBTOOL='$(SHELL) ../libtool' +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/contrib/libf2c/libI77/Makefile.in b/contrib/libf2c/libI77/Makefile.in index 544f24ef4d50..ff0d8e151768 100644 --- a/contrib/libf2c/libI77/Makefile.in +++ b/contrib/libf2c/libI77/Makefile.in @@ -31,15 +31,11 @@ VPATH = @srcdir@ # configuration. DEFS = @DEFS@ -LIBG2C = ../libg2c.a - F2C_H_DIR = @srcdir@/.. G2C_H_DIR = .. CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ -AR = @AR@ -ARFLAGS = rc @SET_MAKE@ SHELL = /bin/sh @@ -50,31 +46,31 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(G2C_H_DIR) -I$(F2C_H_DIR) $(CPPFLAGS) \ $(DEFS) $(CFLAGS) .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .lo -.c.o: - $(CC) -c -DSkip_f2c_Undefs -DAllow_TYQUAD $(ALL_CFLAGS) $< +.c.lo: + @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs -DAllow_TYQUAD $(ALL_CFLAGS) $< -OBJ = VersionI.o backspace.o close.o dfe.o dolio.o due.o endfile.o err.o \ - fmt.o fmtlib.o iio.o ilnw.o inquire.o lread.o lwrite.o open.o \ - rdfmt.o rewind.o rsfe.o rsli.o rsne.o sfe.o sue.o typesize.o uio.o \ - util.o wref.o wrtfmt.o wsfe.o wsle.o wsne.o xwsne.o \ - ftell_.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: ../s-libi77 -../s-libi77: $(OBJ) - echo timestamp > ../s-libi77 - -archive: - $(AR) $(ARFLAGS) $(LIBG2C) $(OBJ) +../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 config.status: configure rm -f config.cache - CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \ + CONFIG_SITE=no-such-file CC='$(CC)' CFLAGS='$(CFLAGS)' \ CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck ${srcdir}/configure: configure.in @@ -93,72 +89,73 @@ stamp-h: config.h.in config.status CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) config.status echo timestamp > stamp-h -VersionI.o: Version.c - $(CC) -c $(ALL_CFLAGS) -o $@ $(srcdir)/Version.c +VersionI.lo: Version.c + @LIBTOOL@ --mode=compile $(CC) -c $(ALL_CFLAGS) $(srcdir)/Version.c -o $@ -backspace.o: backspace.c fio.h -close.o: close.c fio.h -dfe.o: fio.h -dfe.o: dfe.c fmt.h -dolio.o: dolio.c -due.o: due.c fio.h -endfile.o: endfile.c fio.h rawio.h config.h -err.o: err.c fio.h rawio.h -fmt.o: fio.h -fmt.o: fmt.c fmt.h -fmtlib.o: fmtlib.c -ftell_.o: ftell_.c fio.h -iio.o: fio.h -iio.o: iio.c fmt.h -ilnw.o: fio.h -ilnw.o: ilnw.c lio.h -inquire.o: inquire.c fio.h -lread.o: fio.h -lread.o: fmt.h -lread.o: lio.h -lread.o: lread.c fp.h -lwrite.o: fio.h -lwrite.o: fmt.h -lwrite.o: lwrite.c lio.h -open.o: open.c fio.h rawio.h -rdfmt.o: fio.h -rdfmt.o: fmt.h -rdfmt.o: rdfmt.c fp.h -rewind.o: rewind.c fio.h -rsfe.o: fio.h -rsfe.o: rsfe.c fmt.h -rsli.o: fio.h -rsli.o: rsli.c lio.h -rsne.o: fio.h -rsne.o: rsne.c lio.h -sfe.o: sfe.c fio.h -sue.o: sue.c fio.h -typesize.o: typesize.c -uio.o: uio.c fio.h -util.o: util.c fio.h -wref.o: fio.h -wref.o: fmt.h -wref.o: wref.c fp.h -wrtfmt.o: fio.h -wrtfmt.o: wrtfmt.c fmt.h -wsfe.o: fio.h -wsfe.o: wsfe.c fmt.h -wsle.o: fio.h -wsle.o: fmt.h -wsle.o: wsle.c lio.h -wsne.o: fio.h -wsne.o: wsne.c lio.h -xwsne.o: fio.h -xwsne.o: lio.h -xwsne.o: xwsne.c fmt.h +backspace.lo: backspace.c fio.h config.h +close.lo: close.c fio.h config.h +dfe.lo: fio.h config.h +dfe.lo: dfe.c fmt.h +dolio.lo: dolio.c config.h +due.lo: due.c fio.h config.h +endfile.lo: endfile.c fio.h config.h +err.lo: err.c fio.h config.h +fmt.lo: fio.h config.h +fmt.lo: fmt.c fmt.h +fmtlib.lo: fmtlib.c config.h +ftell_.lo: ftell_.c fio.h config.h +iio.lo: fio.h +iio.lo: iio.c fmt.h +ilnw.lo: fio.h config.h +ilnw.lo: ilnw.c lio.h +inquire.lo: inquire.c fio.h config.h +lread.lo: fio.h config.h +lread.lo: fmt.h +lread.lo: lio.h +lread.lo: lread.c fp.h +lwrite.lo: fio.h +lwrite.lo: fmt.h +lwrite.lo: lwrite.c lio.h +open.lo: open.c fio.h config.h +rdfmt.lo: fio.h config.h +rdfmt.lo: fmt.h +rdfmt.lo: rdfmt.c fp.h +rewind.lo: rewind.c fio.h config.h +rsfe.lo: fio.h config.h +rsfe.lo: rsfe.c fmt.h +rsli.lo: fio.h +rsli.lo: rsli.c lio.h +rsne.lo: fio.h config.h +rsne.lo: rsne.c lio.h +sfe.lo: sfe.c fio.h config.h +sue.lo: sue.c fio.h config.h +typesize.lo: typesize.c config.h +uio.lo: uio.c fio.h +util.lo: util.c fio.h config.h +wref.lo: fio.h +wref.lo: fmt.h +wref.lo: wref.c fp.h +wrtfmt.lo: fio.h config.h +wrtfmt.lo: wrtfmt.c fmt.h +wsfe.lo: fio.h config.h +wsfe.lo: wsfe.c fmt.h +wsle.lo: fio.h config.h +wsle.lo: fmt.h +wsle.lo: wsle.c lio.h +wsne.lo: fio.h +wsne.lo: wsne.c lio.h +xwsne.lo: fio.h config.h +xwsne.lo: lio.h +xwsne.lo: xwsne.c fmt.h # May be pessimistic: -$(OBJ): $(F2C_H_DIR)/f2c.h $(G2C_H_DIR)/g2c.h +$(OBJS): $(F2C_H_DIR)/f2c.h $(G2C_H_DIR)/g2c.h check install uninstall install-strip dist installcheck installdirs: mostlyclean: - rm -f *.o + rm -f *.o *.lo + rm -rf .libs clean: mostlyclean rm -f config.log ../s-libi77 diff --git a/contrib/libf2c/libI77/Version.c b/contrib/libf2c/libI77/Version.c index 0ff447fecc8e..51f3d166b966 100644 --- a/contrib/libf2c/libI77/Version.c +++ b/contrib/libf2c/libI77/Version.c @@ -3,7 +3,7 @@ static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n"; /* */ -char __G77_LIBI77_VERSION__[] = "0.5.26 20011023 (release)"; +char __G77_LIBI77_VERSION__[] = "3.1 20020509 (prerelease)"; /* 2.01 $ format added diff --git a/contrib/libf2c/libI77/backspace.c b/contrib/libf2c/libI77/backspace.c index b2bd4163222a..848923912bf8 100644 --- a/contrib/libf2c/libI77/backspace.c +++ b/contrib/libf2c/libI77/backspace.c @@ -8,7 +8,7 @@ integer f_back(a) alist *a; integer f_back(alist *a) #endif { unit *b; - long v, w, x, y, z; + off_t v, w, x, y, z; uiolen n; FILE *f; @@ -34,31 +34,31 @@ integer f_back(alist *a) f = b->ufd; /* may have changed in t_runc() */ if(b->url>0) { - x=ftell(f); + x=FTELL(f); y = x % b->url; if(y == 0) x--; x /= b->url; x *= b->url; - (void) fseek(f,x,SEEK_SET); + FSEEK(f,x,SEEK_SET); return(0); } if(b->ufmt==0) - { fseek(f,-(long)sizeof(uiolen),SEEK_CUR); + { FSEEK(f,-(off_t)sizeof(uiolen),SEEK_CUR); fread((char *)&n,sizeof(uiolen),1,f); - fseek(f,-(long)n-2*sizeof(uiolen),SEEK_CUR); + FSEEK(f,-(off_t)n-2*sizeof(uiolen),SEEK_CUR); return(0); } - w = x = ftell(f); + w = x = FTELL(f); z = 0; loop: while(x) { x -= x < 64 ? x : 64; - fseek(f,x,SEEK_SET); + FSEEK(f,x,SEEK_SET); for(y = x; y < w; y++) { if (getc(f) != '\n') continue; - v = ftell(f); + v = FTELL(f); if (v == w) { if (z) goto break2; @@ -69,6 +69,6 @@ integer f_back(alist *a) err(a->aerr,(EOF),"backspace"); } break2: - fseek(f, z, SEEK_SET); + FSEEK(f, z, SEEK_SET); return 0; } diff --git a/contrib/libf2c/libI77/config.h.in b/contrib/libf2c/libI77/config.h.in index 58f83af092fd..3ae78d198ad7 100644 --- a/contrib/libf2c/libI77/config.h.in +++ b/contrib/libf2c/libI77/config.h.in @@ -6,15 +6,18 @@ /* Define to `long' if doesn't define. */ #undef off_t -/* Define if you need to in order for stat and other things to work. */ -#undef _POSIX_SOURCE - /* Define to `unsigned' if doesn't define. */ #undef size_t /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define if you have the fseeko function. */ +#undef HAVE_FSEEKO + +/* Define if you have the ftello function. */ +#undef HAVE_FTELLO + /* Define if you have the ftruncate function. */ #undef HAVE_FTRUNCATE @@ -24,11 +27,23 @@ /* Define if you have the tempnam function. */ #undef HAVE_TEMPNAM -/* Define if fcntl.h is missing. */ -#undef NO_FCNTL +/* Define if you have the tmpnam function. */ +#undef HAVE_TMPNAM -/* Define if fcntl.h is missing. */ -#undef OPEN_DECL +/* Get Single Unix Specification semantics */ +#undef _XOPEN_SOURCE + +/* Get Single Unix Specification semantics */ +#undef _XOPEN_SOURCE_EXTENDED + +/* Solaris extensions */ +#undef __EXTENSIONS__ + +/* Get 64-bit file size support */ +#undef _FILE_OFFSET_BITS + +/* Define for HP-UX ftello and fseeko extension. */ +#undef _LARGEFILE_SOURCE /* Define if we do not have Unix Stdio. */ #undef NON_UNIX_STDIO diff --git a/contrib/libf2c/libI77/configure b/contrib/libf2c/libI77/configure index ec7988e86b4c..e064fbaa43e1 100755 --- a/contrib/libf2c/libI77/configure +++ b/contrib/libf2c/libI77/configure @@ -523,6 +523,31 @@ fi +# These defines are necessary to get 64-bit file size support. + +cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE 500L +EOF + +# The following is needed by irix6.2 so that struct timeval is declared. +cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE_EXTENDED 1 +EOF + +# The following is needed by Solaris2.5.1 so that struct timeval is declared. +cat >> confdefs.h <<\EOF +#define __EXTENSIONS__ 1 +EOF + +cat >> confdefs.h <<\EOF +#define _FILE_OFFSET_BITS 64 +EOF + +cat >> confdefs.h <<\EOF +#define _LARGEFILE_SOURCE 1 +EOF + + @@ -531,7 +556,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:535: checking for $ac_word" >&5 +echo "configure:560: 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 @@ -561,7 +586,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:565: checking for $ac_word" >&5 +echo "configure:590: 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 @@ -612,7 +637,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:616: checking for $ac_word" >&5 +echo "configure:641: 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 @@ -645,7 +670,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:649: checking whether we are using GNU C" >&5 +echo "configure:674: 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 @@ -654,7 +679,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:658: \"$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:683: \"$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 @@ -673,7 +698,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:677: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:702: 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 @@ -705,10 +730,13 @@ else fi +LIBTOOL='$(SHELL) ../libtool' + + test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:712: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:740: 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 @@ -738,7 +766,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:742: checking how to run the C preprocessor" >&5 +echo "configure:770: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -753,13 +781,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:763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:791: \"$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 : @@ -770,13 +798,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:780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:808: \"$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 : @@ -787,13 +815,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:797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:825: \"$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 : @@ -819,17 +847,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:823: checking for stdio.h" >&5 +echo "configure:851: 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:833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:861: \"$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* @@ -857,12 +885,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:861: checking for ANSI C header files" >&5 +echo "configure:889: 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 @@ -870,7 +898,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:902: \"$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* @@ -887,7 +915,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 @@ -905,7 +933,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 @@ -926,7 +954,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -937,7 +965,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -962,12 +990,12 @@ fi echo $ac_n "checking for posix""... $ac_c" 1>&6 -echo "configure:966: checking for posix" >&5 +echo "configure:994: 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 @@ -993,12 +1021,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:997: checking for GNU library" >&5 +echo "configure:1025: 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__ @@ -1022,12 +1050,12 @@ echo "$ac_t""$g77_cv_lib_gnu" 1>&6 # Apparently cygwin needs to be special-cased. echo $ac_n "checking for cyg\`win'32""... $ac_c" 1>&6 -echo "configure:1026: checking for cyg\`win'32" >&5 +echo "configure:1054: checking for cyg\`win'32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 # ditto for mingw32. echo $ac_n "checking for mingw32""... $ac_c" 1>&6 -echo "configure:1054: checking for mingw32" >&5 +echo "configure:1082: checking for mingw32" >&5 if eval "test \"`echo '$''{'g77_cv_sys_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -ac_safe=`echo "fcntl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for fcntl.h""... $ac_c" 1>&6 -echo "configure:1083: checking for fcntl.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:1093: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - test $g77_cv_header_posix = yes && cat >> confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - -else - echo "$ac_t""no" 1>&6 -cat >> confdefs.h <<\EOF -#define NO_FCNTL 1 -EOF - - cat >> confdefs.h <<\EOF -#define OPEN_DECL 1 -EOF - -fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1127: checking for working const" >&5 +echo "configure:1110: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1198,12 +1181,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1202: checking for size_t" >&5 +echo "configure:1185: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1236,12 +1219,12 @@ fi # Apparently positive result on cygwin loses re. NON_UNIX_STDIO # (as of cygwin b18). Likewise on mingw. echo $ac_n "checking for fstat""... $ac_c" 1>&6 -echo "configure:1240: checking for fstat" >&5 +echo "configure:1223: checking for fstat" >&5 if eval "test \"`echo '$''{'ac_cv_func_fstat'+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:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fstat=yes" else @@ -1284,7 +1267,7 @@ else fi echo $ac_n "checking need for NON_UNIX_STDIO""... $ac_c" 1>&6 -echo "configure:1288: checking need for NON_UNIX_STDIO" >&5 +echo "configure:1271: checking need for NON_UNIX_STDIO" >&5 if test $g77_cv_sys_cygwin32 = yes \ || test $g77_cv_sys_mingw32 = yes \ || test $ac_cv_func_fstat = no; then @@ -1297,15 +1280,15 @@ else echo "$ac_t""no" 1>&6 fi -for ac_func in ftruncate +for ac_func in fseeko do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1304: checking for $ac_func" >&5 +echo "configure:1287: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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:1315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in ftello +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1342: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in ftruncate +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1397: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1355,12 +1448,12 @@ done for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1359: checking for $ac_func" >&5 +echo "configure:1452: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1410,12 +1503,12 @@ done for ac_func in tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1414: checking for $ac_func" >&5 +echo "configure:1507: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in tmpnam +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1562: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1468,19 +1616,19 @@ done # However, on my sunos4/gcc setup unistd.h leads us wrongly to believe # we're posix-conformant, so always do the test. echo $ac_n "checking for ansi/posix sprintf result""... $ac_c" 1>&6 -echo "configure:1472: checking for ansi/posix sprintf result" >&5 +echo "configure:1620: checking for ansi/posix sprintf result" >&5 if test "$cross_compiling" = yes; then g77_cv_sys_sprintf_ansi=no else cat > conftest.$ac_ext < /* does sprintf return the number of chars transferred? */ main () {char foo[2]; (sprintf(foo, "1") == 1) ? exit(0) : exit(1);} EOF -if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then g77_cv_sys_sprintf_ansi=yes else @@ -1511,9 +1659,9 @@ fi # define NON_ANSI_RW_MODES on unix (can't hurt) echo $ac_n "checking NON_ANSI_RW_MODES""... $ac_c" 1>&6 -echo "configure:1515: checking NON_ANSI_RW_MODES" >&5 +echo "configure:1663: checking NON_ANSI_RW_MODES" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1562: checking for off_t" >&5 +echo "configure:1710: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1729,6 +1877,7 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@CC@%$CC%g +s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g s%@SET_MAKE@%$SET_MAKE%g s%@CPP@%$CPP%g diff --git a/contrib/libf2c/libI77/configure.in b/contrib/libf2c/libI77/configure.in index 20f2628ba3a2..988a8e542c30 100644 --- a/contrib/libf2c/libI77/configure.in +++ b/contrib/libf2c/libI77/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995, 1997, 1998, 2001 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 2001, 2002 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -23,6 +23,16 @@ AC_PREREQ(2.12.1) AC_INIT(ftell_.c) AC_CONFIG_HEADER(config.h) +# These defines are necessary to get 64-bit file size support. + +AC_DEFINE(_XOPEN_SOURCE, 500L, [Get Single Unix Specification semantics]) +# The following is needed by irix6.2 so that struct timeval is declared. +AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Get Single Unix Specification semantics]) +# The following is needed by Solaris2.5.1 so that struct timeval is declared. +AC_DEFINE(__EXTENSIONS__, 1, [Solaris extensions]) +AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support]) +AC_DEFINE(_LARGEFILE_SOURCE, 1, [Define for HP-UX ftello and fseeko extension.]) + dnl Checks for programs. dnl FIXME AC_PROG_CC wants CC to be able to link things, but it may @@ -33,6 +43,9 @@ define([AC_PROG_CC_WORKS],[]) # the makefiles AC_PROG_CC +LIBTOOL='$(SHELL) ../libtool' +AC_SUBST(LIBTOOL) + test "$AR" || AR=ar AC_SUBST(AR) AC_PROG_MAKE_SET @@ -111,11 +124,6 @@ AC_CACHE_VAL(g77_cv_sys_mingw32, AC_MSG_RESULT($g77_cv_sys_mingw32) -AC_CHECK_HEADER(fcntl.h, - test $g77_cv_header_posix = yes && AC_DEFINE(_POSIX_SOURCE), - AC_DEFINE(NO_FCNTL, 1, [Define if fcntl.h is missing.]) - AC_DEFINE(OPEN_DECL, 1, [Define if fcntl.h is missing.])) - dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_TYPE_SIZE_T @@ -136,9 +144,12 @@ else AC_MSG_RESULT(no) fi +AC_CHECK_FUNCS(fseeko) +AC_CHECK_FUNCS(ftello) AC_CHECK_FUNCS(ftruncate) AC_CHECK_FUNCS(mkstemp) AC_CHECK_FUNCS(tempnam) +AC_CHECK_FUNCS(tmpnam) # posix will guarantee the right behaviour for sprintf, else we can't be # sure; HEADER_STDC wouldn't be the right check in sunos4, for instance. diff --git a/contrib/libf2c/libI77/dfe.c b/contrib/libf2c/libI77/dfe.c index e90b16d05511..18edabc9cd10 100644 --- a/contrib/libf2c/libI77/dfe.c +++ b/contrib/libf2c/libI77/dfe.c @@ -82,7 +82,7 @@ c_dfe(cilist *a) f__fmtbuf=a->cifmt; if(a->cirec <= 0) err(a->cierr,130,"dfe"); - (void) fseek(f__cf,(long)f__curunit->url * (a->cirec-1),SEEK_SET); + FSEEK(f__cf,(off_t)f__curunit->url * (a->cirec-1),SEEK_SET); f__curunit->uend = 0; return(0); } diff --git a/contrib/libf2c/libI77/due.c b/contrib/libf2c/libI77/due.c index df3413321500..f7d6941935e1 100644 --- a/contrib/libf2c/libI77/due.c +++ b/contrib/libf2c/libI77/due.c @@ -25,7 +25,7 @@ c_due(cilist *a) if(f__curunit->ufd==NULL) err(a->cierr,114,"cdue"); if(a->cirec <= 0) err(a->cierr,130,"due"); - fseek(f__cf,(long)(a->cirec-1)*f__curunit->url,SEEK_SET); + FSEEK(f__cf,(off_t)(a->cirec-1)*f__curunit->url,SEEK_SET); f__curunit->uend = 0; return(0); } @@ -60,8 +60,8 @@ integer e_rdue(Void) f__init = 1; if(f__curunit->url==1 || f__recpos==f__curunit->url) return(0); - fseek(f__cf,(long)(f__curunit->url-f__recpos),SEEK_CUR); - if(ftell(f__cf)%f__curunit->url) + FSEEK(f__cf,(off_t)(f__curunit->url-f__recpos),SEEK_CUR); + if(FTELL(f__cf)%f__curunit->url) err(f__elist->cierr,200,"syserr"); return(0); } diff --git a/contrib/libf2c/libI77/endfile.c b/contrib/libf2c/libI77/endfile.c index 980c91d22820..4c5a9dd21d63 100644 --- a/contrib/libf2c/libI77/endfile.c +++ b/contrib/libf2c/libI77/endfile.c @@ -70,7 +70,7 @@ t_runc(a) alist *a; t_runc(alist *a) #endif { - long loc, len; + off_t loc, len; unit *b; int rc; FILE *bf; @@ -81,9 +81,9 @@ t_runc(alist *a) b = &f__units[a->aunit]; if(b->url) return(0); /*don't truncate direct files*/ - loc=ftell(bf = b->ufd); - fseek(bf,0L,SEEK_END); - len=ftell(bf); + loc=FTELL(bf = b->ufd); + FSEEK(bf,0,SEEK_END); + len=FTELL(bf); if (loc >= len || b->useek == 0 || b->ufnm == NULL) return(0); #ifndef HAVE_FTRUNCATE @@ -111,7 +111,7 @@ t_runc(alist *a) } if (!(bf = freopen(b->ufnm, f__w_mode[0], bf))) goto bad1; - rewind(tf); + FSEEK(tf, 0, SEEK_SET); if (copy(tf, loc, bf)) goto bad1; b->uwrt = 1; @@ -121,7 +121,7 @@ t_runc(alist *a) fclose(bf); if (!(bf = fopen(b->ufnm, f__w_mode[3]))) goto bad; - fseek(bf,0L,SEEK_END); + FSEEK(bf,0,SEEK_END); b->urw = 3; } #endif @@ -131,7 +131,8 @@ done: f__cf = b->ufd = bf; #else /* !defined(HAVE_FTRUNCATE) */ fflush(b->ufd); - rc = ftruncate(fileno(b->ufd), (off_t)loc); + rc = ftruncate(fileno(b->ufd), loc); + FSEEK(bf,loc,SEEK_SET); #endif /* !defined(HAVE_FTRUNCATE) */ if (rc) err(a->aerr,111,"endfile"); diff --git a/contrib/libf2c/libI77/err.c b/contrib/libf2c/libI77/err.c index 6784cdd45766..1c21f198cdbc 100644 --- a/contrib/libf2c/libI77/err.c +++ b/contrib/libf2c/libI77/err.c @@ -210,7 +210,7 @@ f__nowreading(x) unit *x; f__nowreading(unit *x) #endif { - long loc; + off_t loc; int ufmt, urw; extern char *f__r_mode[], *f__w_mode[]; @@ -219,7 +219,7 @@ f__nowreading(unit *x) if (!x->ufnm) goto cantread; ufmt = x->url ? 0 : x->ufmt; - loc = ftell(x->ufd); + loc = FTELL(x->ufd); urw = 3; if (!freopen(x->ufnm, f__w_mode[ufmt|2], x->ufd)) { urw = 1; @@ -229,7 +229,7 @@ f__nowreading(unit *x) return 1; } } - fseek(x->ufd,loc,SEEK_SET); + FSEEK(x->ufd,loc,SEEK_SET); x->urw = urw; done: x->uwrt = 0; @@ -241,7 +241,7 @@ f__nowwriting(x) unit *x; f__nowwriting(unit *x) #endif { - long loc; + off_t loc; int ufmt; extern char *f__w_mode[]; @@ -257,7 +257,7 @@ f__nowwriting(unit *x) x->urw = 2; } else { - loc=ftell(x->ufd); + loc=FTELL(x->ufd); if (!(f__cf = x->ufd = freopen(x->ufnm, f__w_mode[ufmt |= 2], x->ufd))) { @@ -267,7 +267,7 @@ f__nowwriting(unit *x) return(1); } x->urw = 3; - fseek(x->ufd,loc,SEEK_SET); + FSEEK(x->ufd,loc,SEEK_SET); } done: x->uwrt = 1; diff --git a/contrib/libf2c/libI77/fio.h b/contrib/libf2c/libI77/fio.h index 846351d5413f..8c6d274fe498 100644 --- a/contrib/libf2c/libI77/fio.h +++ b/contrib/libf2c/libI77/fio.h @@ -1,3 +1,4 @@ +#include #include #include #ifndef NULL @@ -14,6 +15,16 @@ #define SEEK_END 2 #endif +/* Only use fseeko/ftello if they are both there. */ + +#if defined (HAVE_FSEEKO) && defined (HAVE_FTELLO) +#define FSEEK fseeko +#define FTELL ftello +#else +#define FSEEK fseek +#define FTELL ftell +#endif + #if defined (MSDOS) && !defined (GO32) #ifndef NON_UNIX_STDIO #define NON_UNIX_STDIO diff --git a/contrib/libf2c/libI77/ftell_.c b/contrib/libf2c/libI77/ftell_.c index 1f6d87f50bd5..250a0cc9bcd5 100644 --- a/contrib/libf2c/libI77/ftell_.c +++ b/contrib/libf2c/libI77/ftell_.c @@ -22,7 +22,7 @@ G77_ftell_0 (integer *Unit) #endif { FILE *f; - return (f = unit_chk(*Unit, "ftell")) ? ftell(f) : -1L; + return (f = unit_chk(*Unit, "ftell")) ? (integer) FTELL(f) : -1L; } integer @@ -43,5 +43,5 @@ G77_fseek_0 (integer *Unit, integer *offset, integer *xwhence) w = wohin[w]; #endif return !(f = unit_chk(*Unit, "fseek")) - || fseek(f, *offset, w) ? 1 : 0; + || FSEEK(f, (off_t) *offset, w) ? 1 : 0; } diff --git a/contrib/libf2c/libI77/inquire.c b/contrib/libf2c/libI77/inquire.c index 71eb700a57a1..5c5575a1d124 100644 --- a/contrib/libf2c/libI77/inquire.c +++ b/contrib/libf2c/libI77/inquire.c @@ -100,7 +100,7 @@ integer f_inqu(inlist *a) if(a->inrecl!=NULL && p!=NULL) *a->inrecl=p->url; if(a->innrec!=NULL && p!=NULL && p->url>0) - *a->innrec=ftell(p->ufd)/p->url+1; + *a->innrec=FTELL(p->ufd)/p->url+1; if(a->inblank && p!=NULL && p->ufmt) if(p->ublnk) b_char("ZERO",a->inblank,a->inblanklen); diff --git a/contrib/libf2c/libI77/open.c b/contrib/libf2c/libI77/open.c index 56bbc5232eee..9457ccc807b2 100644 --- a/contrib/libf2c/libI77/open.c +++ b/contrib/libf2c/libI77/open.c @@ -231,7 +231,7 @@ integer f_open(olist *a) (void) strcpy (buf, s); free (s); #else /* ! defined (HAVE_TEMPNAM) */ -#ifdef _POSIX_SOURCE +#ifdef HAVE_TMPNAM tmpnam(buf); #else (void) strcpy(buf,"tmp.FXXXXXX"); @@ -281,9 +281,9 @@ integer f_open(olist *a) #endif if(b->useek) if (a->orl) - rewind(b->ufd); + FSEEK(b->ufd, 0, SEEK_SET); else if ((s = a->oacc) && (*s == 'a' || *s == 'A') - && fseek(b->ufd, 0L, SEEK_END)) + && FSEEK(b->ufd, 0, SEEK_END)) opnerr(a->oerr,129,"open"); return(0); } diff --git a/contrib/libf2c/libI77/rdfmt.c b/contrib/libf2c/libI77/rdfmt.c index 6ddd36958a5b..81426ae7d1a2 100644 --- a/contrib/libf2c/libI77/rdfmt.c +++ b/contrib/libf2c/libI77/rdfmt.c @@ -471,7 +471,7 @@ rd_ed(struct syl *p, char *ptr, ftnlen len) f__icptr += f__cursor; } else if(f__curunit && f__curunit->useek) - (void) fseek(f__cf,(long) f__cursor,SEEK_CUR); + FSEEK(f__cf,(off_t)f__cursor,SEEK_CUR); else err(f__elist->cierr,106,"fmt"); f__recpos += f__cursor; diff --git a/contrib/libf2c/libI77/rewind.c b/contrib/libf2c/libI77/rewind.c index 9ba4b239f328..06915195d670 100644 --- a/contrib/libf2c/libI77/rewind.c +++ b/contrib/libf2c/libI77/rewind.c @@ -1,3 +1,4 @@ +#include "config.h" #include "f2c.h" #include "fio.h" #ifdef KR_headers @@ -20,7 +21,7 @@ integer f_rew(alist *a) (void) t_runc(a); b->uwrt = 3; } - rewind(b->ufd); + FSEEK(b->ufd, 0, SEEK_SET); b->uend=0; return(0); } diff --git a/contrib/libf2c/libI77/sfe.c b/contrib/libf2c/libI77/sfe.c index 77ade5b5a7f5..b67d823cf7c6 100644 --- a/contrib/libf2c/libI77/sfe.c +++ b/contrib/libf2c/libI77/sfe.c @@ -1,4 +1,5 @@ /* sequential formatted external common routines*/ +#include "config.h" #include "f2c.h" #include "fio.h" diff --git a/contrib/libf2c/libI77/sue.c b/contrib/libf2c/libI77/sue.c index e7dbba02bd48..8865054b10b7 100644 --- a/contrib/libf2c/libI77/sue.c +++ b/contrib/libf2c/libI77/sue.c @@ -2,7 +2,7 @@ #include "f2c.h" #include "fio.h" extern uiolen f__reclen; -long f__recloc; +off_t f__recloc; #ifdef KR_headers c_sue(a) cilist *a; @@ -62,27 +62,27 @@ integer s_wsue(cilist *a) f__reclen=0; if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit)) err(a->cierr, errno, "write start"); - f__recloc=ftell(f__cf); - (void) fseek(f__cf,(long)sizeof(uiolen),SEEK_CUR); + f__recloc=FTELL(f__cf); + FSEEK(f__cf,(off_t)sizeof(uiolen),SEEK_CUR); return(0); } integer e_wsue(Void) -{ long loc; +{ off_t loc; f__init = 1; fwrite((char *)&f__reclen,sizeof(uiolen),1,f__cf); #ifdef ALWAYS_FLUSH if (fflush(f__cf)) err(f__elist->cierr, errno, "write end"); #endif - loc=ftell(f__cf); - fseek(f__cf,f__recloc,SEEK_SET); + loc=FTELL(f__cf); + FSEEK(f__cf,f__recloc,SEEK_SET); fwrite((char *)&f__reclen,sizeof(uiolen),1,f__cf); - fseek(f__cf,loc,SEEK_SET); + FSEEK(f__cf,loc,SEEK_SET); return(0); } integer e_rsue(Void) { f__init = 1; - (void) fseek(f__cf,(long)(f__reclen-f__recpos+sizeof(uiolen)),SEEK_CUR); + FSEEK(f__cf,(off_t)(f__reclen-f__recpos+sizeof(uiolen)),SEEK_CUR); return(0); } diff --git a/contrib/libf2c/libI77/wsfe.c b/contrib/libf2c/libI77/wsfe.c index babfb3479d9a..490231ac75ad 100644 --- a/contrib/libf2c/libI77/wsfe.c +++ b/contrib/libf2c/libI77/wsfe.c @@ -1,4 +1,5 @@ /*write sequential formatted external*/ +#include "config.h" #include "f2c.h" #include "fio.h" #include "fmt.h" diff --git a/contrib/libf2c/libU77/Makefile.in b/contrib/libf2c/libU77/Makefile.in index ac91077dae0e..199451150161 100644 --- a/contrib/libf2c/libU77/Makefile.in +++ b/contrib/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. @@ -30,15 +30,11 @@ VPATH = @srcdir@ DEFS = @DEFS@ LIBS = @LIBS@ -LIBG2C = ../libg2c.a - F2C_H_DIR = @srcdir@/.. G2C_H_DIR = .. CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ -AR = @AR@ -ARFLAGS = rc @SET_MAKE@ SHELL = /bin/sh @@ -54,21 +50,21 @@ ALL_CFLAGS = -I. -I$(srcdir) -I$(F2C_H_DIR)/libI77 -I$(G2C_H_DIR) \ G77DIR = ../../../gcc/ .SUFFIXES: -.SUFFIXES: .c .o +.SUFFIXES: .c .lo -.c.o: - $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< +.c.lo: + @LIBTOOL@ --mode=compile $(CC) -c -DSkip_f2c_Undefs $(ALL_CFLAGS) $< -OBJS = VersionU.o gerror_.o perror_.o ierrno_.o itime_.o time_.o \ - unlink_.o fnum_.o getpid_.o getuid_.o getgid_.o kill_.o rand_.o \ - srand_.o irand_.o sleep_.o idate_.o ctime_.o etime_.o \ - dtime_.o isatty_.o ltime_.o fstat_.o stat_.o \ - lstat_.o access_.o link_.o getlog_.o ttynam_.o getcwd_.o symlnk_.o \ - vxttime_.o vxtidate_.o gmtime_.o fdate_.o secnds_.o \ - bes.o dbes.o \ - chdir_.o chmod_.o lnblnk_.o hostnm_.o rename_.o fgetc_.o fputc_.o \ - umask_.o sys_clock_.o date_.o second_.o flush1_.o mclock_.o \ - alarm_.o datetime_.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 \ + dtime_.lo isatty_.lo ltime_.lo fstat_.lo stat_.lo \ + lstat_.lo access_.lo link_.lo getlog_.lo ttynam_.lo getcwd_.lo symlnk_.lo \ + vxttime_.lo vxtidate_.lo gmtime_.lo fdate_.lo secnds_.lo \ + bes.lo dbes.lo \ + chdir_.lo chmod_.lo lnblnk_.lo hostnm_.lo rename_.lo fgetc_.lo fputc_.lo \ + umask_.lo sys_clock_.lo date_.lo second_.lo flush1_.lo mclock_.lo \ + alarm_.lo datetime_.lo SRCS = Version.c gerror_.c perror_.c ierrno_.c itime_.c time_.c \ unlink_.c fnum_.c getpid_.c getuid_.c getgid_.c kill_.c rand_.c \ srand_.c irand_.c sleep_.c idate_.c ctime_.c etime_.c \ @@ -83,17 +79,17 @@ SRCS = Version.c gerror_.c perror_.c ierrno_.c itime_.c time_.c \ all: ../s-libu77 ../s-libu77: $(OBJS) - echo timestamp > ../s-libu77 - -archive: - $(AR) $(ARFLAGS) $(LIBG2C) $(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 config.status: configure rm -f config.cache - CONFIG_SITE=no-such-file CC='$(CC)' AR='$(AR)' CFLAGS='$(CFLAGS)' \ + CONFIG_SITE=no-such-file CC='$(CC)' CFLAGS='$(CFLAGS)' \ CPPFLAGS='$(CPPFLAGS)' $(SHELL) config.status --recheck ${srcdir}/configure: configure.in @@ -109,67 +105,67 @@ stamp-h: config.hin config.status $(SHELL) config.status echo timestamp > stamp-h -VersionU.o: Version.c - $(CC) -c $(ALL_CFLAGS) -o $@ $(srcdir)/Version.c +VersionU.lo: Version.c + @LIBTOOL@ --mode=compile $(CC) -c $(ALL_CFLAGS) $(srcdir)/Version.c -o $@ $(OBJS): $(F2C_H_DIR)/f2c.h $(G2C_H_DIR)/g2c.h config.h -access_.o: access_.c -ctime_.o: ctime_.c -dtime_.o: dtime_.c -etime_.o: etime_.c -fnum_.o: fnum_.c $(F2C_H_DIR)/libI77/fio.h -fstat_.o: fstat_.c -gerror_.o: gerror_.c -getcwd_.o: getcwd_.c -getgid_.o: getgid_.c -getlog_.o: getlog_.c -getpid_.o: getpid_.c -getuid_.o: getuid_.c -idate_.o: idate_.c -ierrno_.o: ierrno_.c -irand_.o: irand_.c -isatty_.o: isatty_.c $(F2C_H_DIR)/libI77/fio.h -itime_.o: itime_.c -kill_.o: kill_.c -link_.o: link_.c -loc_.o: loc_.c -lstat_.o: lstat_.c -ltime_.o: ltime_.c -perror_.o: perror_.c -qsort.o: qsort.c -qsort_.o: qsort_.c -rand_.o: rand_.c -rename_.o: rename_.c -second_.o: second_.c -sleep_.o: sleep_.c -srand_.o: srand_.c -stat_.o: stat_.c -symlnk_.o: symlnk_.c -time_.o: time_.c -ttynam_.o: ttynam_.c -unlink_.o: unlink_.c -wait_.o: wait_.c -vxttime_.o: vxttime_.c -vtxidate_.o: vxtidate_.c -fdate_.o: fdate_.c -gmtime_.o: gmtime_.c -secnds_.o: secnds_.c -bes.o: bes.c -dbes.o: dbes.c -lnblnk_.o: lnblnk_.c -chmod_.o: chmod_.c -chdir_.o: chdir_.c -hostnm_.o: hostnm_.c -rename_.o: rename_.c -fputc_.o: fputc_.c -fgetc_.o: fgetc_.c -sys_clock_.o: sys_clock_.c -date_.o: date_.c -umask_.o: umask_.c -flush1_.o: flush1_.c -mclock_.o: mclock_.c -alarm_.o: alarm_.c -datetime_.o: datetime_.c +access_.lo: access_.c +ctime_.lo: ctime_.c +dtime_.lo: dtime_.c +etime_.lo: etime_.c +fnum_.lo: fnum_.c $(F2C_H_DIR)/libI77/fio.h +fstat_.lo: fstat_.c +gerror_.lo: gerror_.c +getcwd_.lo: getcwd_.c +getgid_.lo: getgid_.c +getlog_.lo: getlog_.c +getpid_.lo: getpid_.c +getuid_.lo: getuid_.c +idate_.lo: idate_.c +ierrno_.lo: ierrno_.c +irand_.lo: irand_.c +isatty_.lo: isatty_.c $(F2C_H_DIR)/libI77/fio.h +itime_.lo: itime_.c +kill_.lo: kill_.c +link_.lo: link_.c +loc_.lo: loc_.c +lstat_.lo: lstat_.c +ltime_.lo: ltime_.c +perror_.lo: perror_.c +qsort.lo: qsort.c +qsort_.lo: qsort_.c +rand_.lo: rand_.c +rename_.lo: rename_.c +second_.lo: second_.c +sleep_.lo: sleep_.c +srand_.lo: srand_.c +stat_.lo: stat_.c +symlnk_.lo: symlnk_.c +time_.lo: time_.c +ttynam_.lo: ttynam_.c +unlink_.lo: unlink_.c +wait_.lo: wait_.c +vxttime_.lo: vxttime_.c +vtxidate_.lo: vxtidate_.c +fdate_.lo: fdate_.c +gmtime_.lo: gmtime_.c +secnds_.lo: secnds_.c +bes.lo: bes.c +dbes.lo: dbes.c +lnblnk_.lo: lnblnk_.c +chmod_.lo: chmod_.c +chdir_.lo: chdir_.c +hostnm_.lo: hostnm_.c +rename_.lo: rename_.c +fputc_.lo: fputc_.c +fgetc_.lo: fgetc_.c +sys_clock_.lo: sys_clock_.c +date_.lo: date_.c +umask_.lo: umask_.c +flush1_.lo: flush1_.c +mclock_.lo: mclock_.c +alarm_.lo: alarm_.c +datetime_.lo: datetime_.c check: -$(G77DIR)g77 -B$(G77DIR) -L.. -g $(srcdir)/u77-test.f \ @@ -179,7 +175,8 @@ check: install uninstall install-strip dist installcheck installdirs: mostlyclean: - rm -f *.o a.out + rm -f *.o *.lo a.out + rm -rf .libs clean: mostlyclean rm -f config.log ../s-libu77 diff --git a/contrib/libf2c/libU77/Version.c b/contrib/libf2c/libU77/Version.c index a2ae11889d90..6da3fcf6abac 100644 --- a/contrib/libf2c/libU77/Version.c +++ b/contrib/libf2c/libU77/Version.c @@ -1,6 +1,6 @@ static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n"; -char __G77_LIBU77_VERSION__[] = "0.5.26 20011023 (release)"; +char __G77_LIBU77_VERSION__[] = "3.1 20020509 (prerelease)"; #include diff --git a/contrib/libf2c/libU77/config.hin b/contrib/libf2c/libU77/config.hin index 19f5399d5385..2f20872a4cff 100644 --- a/contrib/libf2c/libU77/config.hin +++ b/contrib/libf2c/libU77/config.hin @@ -33,12 +33,6 @@ /* Define as the path of the `chmod' program. */ #undef CHMOD_PATH -/* Define if your gettimeofday takes only one argument. */ -#undef GETTIMEOFDAY_ONE_ARGUMENT - -/* Define if your gettimeofday takes a time zome argument. */ -#undef HAVE_TIMEZONE - /* Define if you have the alarm function. */ #undef HAVE_ALARM @@ -60,9 +54,6 @@ /* Define if you have the getrusage function. */ #undef HAVE_GETRUSAGE -/* Define if you have the gettimeofday function. */ -#undef HAVE_GETTIMEOFDAY - /* Define if you have the getuid function. */ #undef HAVE_GETUID @@ -110,3 +101,16 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H + +/* Get Single Unix Specification semantics */ +#undef _XOPEN_SOURCE + +/* Get Single Unix Specification semantics */ +#undef _XOPEN_SOURCE_EXTENDED + +/* Solaris extensions */ +#undef __EXTENSIONS__ + +/* Get 64-bit file size support */ +#undef _FILE_OFFSET_BITS + diff --git a/contrib/libf2c/libU77/configure b/contrib/libf2c/libU77/configure index 713704226c04..f25748f99f0b 100755 --- a/contrib/libf2c/libU77/configure +++ b/contrib/libf2c/libU77/configure @@ -523,6 +523,27 @@ fi +# These defines are necessary to get 64-bit file size support. + +cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE 500L +EOF + +# The following is needed by irix6.2 so that struct timeval is declared. +cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE_EXTENDED 1 +EOF + +# The following is needed by Solaris2.5.1 so that struct timeval is declared. +cat >> confdefs.h <<\EOF +#define __EXTENSIONS__ 1 +EOF + +cat >> confdefs.h <<\EOF +#define _FILE_OFFSET_BITS 64 +EOF + + @@ -531,7 +552,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:535: checking for $ac_word" >&5 +echo "configure:556: 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 @@ -561,7 +582,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:565: checking for $ac_word" >&5 +echo "configure:586: 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 @@ -612,7 +633,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:616: checking for $ac_word" >&5 +echo "configure:637: 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 @@ -645,7 +666,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:649: checking whether we are using GNU C" >&5 +echo "configure:670: 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 @@ -654,7 +675,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:658: \"$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:679: \"$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 @@ -673,7 +694,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:677: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:698: 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 @@ -704,6 +725,10 @@ else fi fi + +LIBTOOL='$(SHELL) ../libtool' + + if test "$CROSS";then ac_cv_c_cross=yes else @@ -713,7 +738,7 @@ fi test "$AR" || AR=ar echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:717: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:742: 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 @@ -743,7 +768,7 @@ fi # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:747: checking for $ac_word" >&5 +echo "configure:772: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ac_cv_prog_chmod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -787,7 +812,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:791: checking how to run the C preprocessor" >&5 +echo "configure:816: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -802,13 +827,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:812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:837: \"$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 : @@ -819,13 +844,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:829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:854: \"$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 : @@ -836,13 +861,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:846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:871: \"$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 : @@ -867,12 +892,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:871: checking for ANSI C header files" >&5 +echo "configure:896: 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 @@ -880,7 +905,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:909: \"$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* @@ -897,7 +922,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 @@ -915,7 +940,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 @@ -936,7 +961,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -947,7 +972,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -972,12 +997,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:976: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1001: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -986,7 +1011,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1011,17 +1036,17 @@ for ac_hdr in limits.h unistd.h sys/time.h string.h stdlib.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1015: checking for $ac_hdr" >&5 +echo "configure:1040: checking for $ac_hdr" >&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:1025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1050: \"$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* @@ -1049,12 +1074,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1053: checking for working const" >&5 +echo "configure:1078: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1124,12 +1149,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1128: checking for size_t" >&5 +echo "configure:1153: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1157,12 +1182,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1161: checking for mode_t" >&5 +echo "configure:1186: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1191,12 +1216,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1195: checking for pid_t" >&5 +echo "configure:1220: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1224,12 +1249,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:1228: checking for st_blksize in struct stat" >&5 +echo "configure:1253: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1237,7 +1262,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:1241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -1258,12 +1283,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:1262: checking for st_blocks in struct stat" >&5 +echo "configure:1287: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1271,7 +1296,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:1275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -1294,12 +1319,12 @@ else fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:1298: checking for st_rdev in struct stat" >&5 +echo "configure:1323: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1307,7 +1332,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:1311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -1328,12 +1353,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1332: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1357: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1341,7 +1366,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1363,7 +1388,7 @@ fi echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:1367: checking for gethostname in -lsocket" >&5 +echo "configure:1392: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1371,7 +1396,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1411: \"$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 @@ -1408,12 +1433,12 @@ for ac_func in symlink getcwd getwd lstat gethostname strerror clock \ getrusage times alarm getlogin getgid getuid kill link ttyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1412: checking for $ac_func" >&5 +echo "configure:1437: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1465,12 +1490,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1469: checking for $ac_func" >&5 +echo "configure:1494: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1519,19 +1544,19 @@ done if test "$ac_cv_func_gettimeofday" = yes; then echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:1523: checking for struct timezone" >&5 +echo "configure:1548: checking for struct timezone" >&5 if eval "test \"`echo '$''{'g77_cv_struct_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct timezone tz; ; return 0; } EOF -if { (eval echo configure:1535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* g77_cv_struct_timezone=yes else @@ -1552,7 +1577,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -1591,12 +1616,12 @@ fi fi echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6 -echo "configure:1595: checking whether gettimeofday can accept two arguments" >&5 +echo "configure:1620: checking whether gettimeofday can accept two arguments" >&5 if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+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:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_gettimeofday_two_arguments=yes else @@ -1652,6 +1677,7 @@ test $ac_cv_func_clock = yes && MAYBES="$MAYBES mclock_.o" + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1785,6 +1811,7 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@CC@%$CC%g +s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g s%@SET_MAKE@%$SET_MAKE%g s%@ac_cv_prog_chmod@%$ac_cv_prog_chmod%g diff --git a/contrib/libf2c/libU77/configure.in b/contrib/libf2c/libU77/configure.in index 03bfe660a517..13fa524129f1 100644 --- a/contrib/libf2c/libU77/configure.in +++ b/contrib/libf2c/libU77/configure.in @@ -23,6 +23,15 @@ AC_PREREQ(2.12.1) AC_INIT(access_.c) AC_CONFIG_HEADER(config.h:config.hin) +# These defines are necessary to get 64-bit file size support. + +AC_DEFINE(_XOPEN_SOURCE, 500L, [Get Single Unix Specification semantics]) +# The following is needed by irix6.2 so that struct timeval is declared. +AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Get Single Unix Specification semantics]) +# The following is needed by Solaris2.5.1 so that struct timeval is declared. +AC_DEFINE(__EXTENSIONS__, 1, [Solaris extensions]) +AC_DEFINE(_FILE_OFFSET_BITS, 64, [Get 64-bit file size support]) + dnl Checks for programs. dnl FIXME AC_PROG_CC wants CC to be able to link things, but it may @@ -32,6 +41,10 @@ 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 + +LIBTOOL='$(SHELL) ../libtool' +AC_SUBST(LIBTOOL) + dnl AC_C_CROSS dnl Gives misleading `(cached)' message from the check. if test "$CROSS";then @@ -107,4 +120,5 @@ AC_SUBST(MAYBES) AC_SUBST(CROSS) AC_SUBST(RANLIB) AC_SUBST(RANLIB_TEST) + AC_OUTPUT(Makefile) diff --git a/contrib/libf2c/libU77/date_.c b/contrib/libf2c/libU77/date_.c index 4f8254d37408..c3cd55d7ace8 100644 --- a/contrib/libf2c/libU77/date_.c +++ b/contrib/libf2c/libU77/date_.c @@ -38,3 +38,18 @@ static integer c__5 = 5; return 0; } /* date_ */ +#ifdef PIC +# include + +const char *G77_Non_Y2K_Compliance_Message = + "Call to non Y2K compliant subroutine detected."; + +int G77_date_y2kbuggy_0 (char *buf, ftnlen buf_len) +{ + extern int G77_abort_0(); + fprintf (stderr, "%s\n", G77_Non_Y2K_Compliance_Message); + G77_abort_0(); +} +#endif + + diff --git a/contrib/libf2c/libU77/vxtidate_.c b/contrib/libf2c/libU77/vxtidate_.c index d5f289c7064b..e5963af42e65 100644 --- a/contrib/libf2c/libU77/vxtidate_.c +++ b/contrib/libf2c/libU77/vxtidate_.c @@ -54,3 +54,18 @@ int G77_vxtidate_y2kbug_0 (integer *m, integer *d, integer *y) *d = lt->tm_mday; return 0; } + +#ifdef PIC +extern const char *G77_Non_Y2K_Compliance_Message; +# ifdef KR_headers +int G77_vxtidate_y2kbuggy_0 (m, d, y) + integer *y, *m, *d; +# else +int G77_vxtidate_y2kbuggy_0 (integer *m, integer *d, integer *y) +# endif +{ + extern int G77_abort_0(); + fprintf (stderr, "%s\n", G77_Non_Y2K_Compliance_Message); + G77_abort_0(); +} +#endif