diff options
Diffstat (limited to 'math/scilab/patches/patch-ag')
| -rw-r--r-- | math/scilab/patches/patch-ag | 105 |
1 files changed, 61 insertions, 44 deletions
diff --git a/math/scilab/patches/patch-ag b/math/scilab/patches/patch-ag index a4b3271f4c3..466a9ae73fd 100644 --- a/math/scilab/patches/patch-ag +++ b/math/scilab/patches/patch-ag @@ -1,49 +1,66 @@ -$NetBSD: patch-ag,v 1.2 1999/03/05 11:22:34 frueauf Exp $ +$NetBSD: patch-ag,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $ ---- routines/sun/link_SYSV.c.orig Tue Oct 13 08:27:18 1998 -+++ routines/sun/link_SYSV.c Sat Dec 19 23:54:03 1998 -@@ -34,5 +34,5 @@ - #endif +--- ./configure.in.orig Tue Dec 14 06:57:17 1999 ++++ ./configure.in Tue Dec 21 17:29:53 1999 +@@ -795,5 +795,5 @@ + 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]) +@@ -801,5 +801,5 @@ + fi + +- FC=$F77 ++ FC="$F77" + FC_OPTIONS='-O2' + FC_LDFLAGS="-Wl,-R${X11BASE}/lib" +@@ -1055,21 +1055,30 @@ + PVMSCILIB= + PVMTARGET=pvm-bidon ++PVMROOT= --#ifdef linux -+#if defined(linux) || defined(netbsd) || defined(freebsd) - #include <unistd.h> - #include <sys/wait.h> -@@ -41,4 +41,5 @@ - #ifndef linux - #ifndef hppa -+#if (!defined(netbsd) && !defined(freebsd)) - #if (defined(sun) && ! defined(SYSV)) - #else -@@ -47,6 +48,7 @@ - #endif - #endif -+#endif + if test "$with_pvm" != no; then ++#check for a locally installed PVM ++if test -x $PVM_ROOT/lib/pvmgetarch ; then ++ PVMROOT=$PVM_ROOT ++ PVMTARGET=pvm-bidon ++else ++ PVMROOT="$SCIDIR/pvm3" ++ PVMTARGET=scilex-lib ++fi --#ifndef linux -+#if !defined(linux) && !defined(netbsd) - #ifdef __alpha - #include <c_asm.h> -@@ -59,7 +61,9 @@ - #endif + AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch, + [ +-ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch` ++ac_cv_PVM_arch=`$PVMROOT/lib/pvmgetarch` + ]) + if test "$ac_cv_PVM_arch" = UNKNOWN; then + AC_MSG_WARN("PVM unable to find architecture: I will not use PVM") ++ PVMTARGET=pvm-bidon + 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="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a" ++ PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a" + PVMSCIDIR=pvm + PVMSCILIB="\$(SCIDIR)/libs/pvm.a" +- PVMTARGET=scilex-lib + fi -+#if !defined(netbsd) - #if defined __alpha || defined sgi - #include <a.out.h> - #endif -+#endif +@@ -1157,5 +1166,5 @@ + echo "configuration of libtool" - #include <string.h> -@@ -264,8 +268,12 @@ - "/usr/bin/ld", "-shared", "-o", 0, 0 - #else -+#if defined(netbsd) || defined(freebsd) -+ "/usr/bin/ld", "-Bshareable", "-o", 0, 0 -+#else - #ifdef hppa - "/bin/ld", "-b", "-o", 0, 0 - #else - "/bin/ld", "-shared", "-o", 0, 0 -+#endif - #endif - #endif +-AM_PROG_LIBTOOL ++#AM_PROG_LIBTOOL + + echo "end of configuration of libtool" +@@ -1208,4 +1217,5 @@ + AC_SUBST(PVMGLIB) + AC_SUBST(PVMTARGET) ++AC_SUBST(PVMROOT) + AC_SUBST(TK_INC_PATH) + AC_SUBST(TCL_INC_PATH) |