390147533e
Changes according to the NEWS file: * Configure checks for "malloc.h". * Fixed configure to work with autoconf-2.57.
75 lines
2.9 KiB
Text
75 lines
2.9 KiB
Text
$NetBSD: patch-ab,v 1.3 2003/07/02 20:32:02 jtb Exp $
|
|
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -1318,7 +1318,7 @@
|
|
LIBS="$LIBS -lm"
|
|
f77_compile='${F77-f77} $FFLAGS -c conftest.f 1>&5 2>&5'
|
|
f77_make='make F77="${F77-f77}" FFLAGS="$FFLAGS" -f conftest.mak conftest.o 1>&5 2>&5'
|
|
-c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS conftest.c conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5'
|
|
+c_f77_link='(${F77-f77} $FFLAGS -c conftestf.f && ${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c && ${F77-f77} conftest.o conftestf.o -o conftest $LDFLAGS $LIBS) 1>&5 2>&5'
|
|
|
|
# The next two don't include LDFLAGS, because some loser f77 compilers
|
|
# (like on hp) do their own thing with the -L option.
|
|
@@ -4378,60 +4378,12 @@
|
|
|
|
|
|
#---------------------------------------------------------------------
|
|
-# Where would we expect to find the Fortran libraries?
|
|
-#---------------------------------------------------------------------
|
|
-
|
|
-
|
|
-# Check whether --with-fortran-libs or --without-fortran-libs was given.
|
|
-if test "${with_fortran_libs+set}" = set; then
|
|
- withval="$with_fortran_libs"
|
|
- fortran_libs="${withval}"
|
|
-else
|
|
- # The patterns are not necessarily exclusive, so their order is important.
|
|
- case "$host" in
|
|
- sparc-sun-sunos4* )
|
|
- fortran_libs="/usr/lang/SC1.0" ;;
|
|
- sparc-sun-solaris2* )
|
|
- fortran_libs=`/bin/ls -d /opt/SUNWspro/SC* | head -1`/lib ;;
|
|
- alpha*-*-osf* )
|
|
- fortran_libs="/usr/lib" ;;
|
|
- *-hp-hpux1* )
|
|
- fortran_libs="/opt/fortran/lib" ;;
|
|
- * )
|
|
- fortran_libs="" ;;
|
|
- esac
|
|
-fi;
|
|
-
|
|
-#---------------------------------------------------------------------
|
|
-# What are the names of the native Fortran libraries? The patterns
|
|
-# are not necessarily exclusive, so their order is important.
|
|
-#---------------------------------------------------------------------
|
|
-
|
|
-case "$host" in
|
|
- alpha* ) f77_lib_names="Futil ots for Ufor" ;;
|
|
- *-aix* ) f77_lib_names="xlf xlf90" ;;
|
|
- *-hpux1* ) f77_lib_names="cl U77" ;;
|
|
- *-hpux9* ) f77_lib_names="f U77" ;;
|
|
- *-hpux* ) f77_lib_names="F77 I77 IO77" ;;
|
|
- *-dec-ultrix* ) f77_lib_names="for i util ots I77 U77 F77" ;;
|
|
- mips-sgi-irix*) f77_lib_names="F77 I77 U77 isam fpe ftn" ;;
|
|
- mips-* ) f77_lib_names="F77 I77 U77 isam" ;;
|
|
- *-solaris2* ) f77_lib_names="F77 M77 sunmath" ;;
|
|
- *-sunos4* ) f77_lib_names="F77 V77" ;;
|
|
- titan-* ) f77_lib_names="iF77 uF77 mF77" ;;
|
|
- *-unicos* ) f77_lib_names="F77 I77 sci f" ;;
|
|
- * ) f77_lib_names="F77 I77" ;;
|
|
-esac
|
|
-f77_lib_names="$f77_lib_names g2c f2c"
|
|
-for f in $f77_lib_names; do reversed_names="$f $reversed_names"; done
|
|
-
|
|
-#---------------------------------------------------------------------
|
|
# On linux (and perhaps other GNU systems), the linker has trouble
|
|
# with dynamically linked Fortran.
|
|
#---------------------------------------------------------------------
|
|
|
|
cat >> confdefs.h <<\EOF
|
|
-#if linux
|
|
+#if linux || defined(__NetBSD__)
|
|
void MAIN__ (void) {abort();}
|
|
#endif
|
|
EOF
|