diff options
Diffstat (limited to 'math/scilab/patches/patch-aa')
| -rw-r--r-- | math/scilab/patches/patch-aa | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa index 852a713b783..f533a5ad8cf 100644 --- a/math/scilab/patches/patch-aa +++ b/math/scilab/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.4 1999/11/23 16:12:40 dmcmahill Exp $ ---- configure.in.orig Thu Sep 17 07:44:35 1998 -+++ configure.in Mon Oct 4 21:52:54 1999 +--- ./configure.in.orig Thu Sep 17 07:44:35 1998 ++++ ./configure.in Mon Nov 22 19:55:08 1999 @@ -684,4 +684,108 @@ MAKEFILE_TARGET=Makefile.gcwin32 ;; @@ -59,13 +59,13 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ + AC_MSG_ERROR([Unable to configure: Fortran compiler f2c-f77 not found]) + fi + else -+ AC_CHECK_PROGS(F77,f77 f2c-f77,no) ++ AC_CHECK_PROGS(F77,"${FC}" f77 f2c-f77,no) + if test "$F77" = no; then + AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found]) + fi + fi + -+ FC=$F77 ++ FC="$F77" + FC_OPTIONS='-O2' + FC_LDFLAGS="-Wl,-R${X11BASE}/lib" + FC_PICFLAGS='-fPIC' @@ -121,7 +121,7 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ + ################## ## termcap library -@@ -883,20 +992,38 @@ +@@ -883,19 +992,19 @@ if test "$with_pvm" != no; then -AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch, @@ -131,44 +131,28 @@ $NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ -if test "$ac_cv_PVM_arch" = UNKNOWN; then - AC_MSG_WARN("PVM unable to find architecture: I will not use PVM") -else -+case "$host" in -+ *-*-netbsd*) -+ ## with NetBSD, use the version of pvm3 which is part of the package collection -+ AC_MSG_CHECKING("for PVM architecture") -+ AC_MSG_RESULT("NETBSD") - AC_DEFINE(WITH_PVM) +- AC_DEFINE(WITH_PVM) - PVMARCH="$ac_cv_PVM_arch" - PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a" - PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a" -+ PVMARCH=NETBSD -+ PVMLIB=${LOCALBASE}/lib/libpvm3.a -+ PVMGLIB=${LOCALBASE}/lib/libgpvm3.a - PVMSCIDIR=pvm - PVMSCILIB=libs/pvm.a +- PVMSCIDIR=pvm +- PVMSCILIB=libs/pvm.a - PVMTARGET=scilex-lib -fi -+ PVMTARGET=pvm-no-build -+ ;; -+ -+ *) - + AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch, + [ -+ ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch` ++ ac_cv_PVM_arch=`${LOCALBASE}/pvm3/lib/pvmgetarch` + ]) + if test "$ac_cv_PVM_arch" = UNKNOWN; then + AC_MSG_WARN("PVM unable to find architecture: I will not use PVM") + else + AC_DEFINE(WITH_PVM) + PVMARCH="$ac_cv_PVM_arch" -+ PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a" -+ PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a" ++ PVMGLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a" ++ PVMLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a" + PVMSCIDIR=pvm + PVMSCILIB=libs/pvm.a -+ PVMTARGET=scilex-lib ++ PVMTARGET=pvm-no-build + fi -+ ;; -+ -+esac - fi + fi |