modif pour FreeBSD js@jeannot.org
Serge Steer [Fri, 8 Feb 2002 09:30:24 +0000 (09:30 +0000)]
scilab/.pvmd.conf
scilab/Makefile.incl.in
scilab/configure.in
scilab/routines/default/Makefile.in
scilab/routines/pvm/Makefile

index 0d72ef8..61a2584 100755 (executable)
@@ -1 +1 @@
-* dx=$SCI/pvm3/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
+* dx=$PVM_ROOT/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
index 89afa06..57647dd 100644 (file)
@@ -60,6 +60,7 @@ DLD_SUBDIR = @DLD_SUBDIR@
 PVMLIB = @PVMLIB@
 PVMGLIB = @PVMGLIB@
 PVMROOT = @PVMROOT@
+PVMINCLUDE = @PVMINCLUDE@
 XAWLIB = @XAWLIB@
 XMULIB = @XMULIB@
 XAW_LOCAL_SUBDIR = @XAW_LOCAL_SUBDIR@
index ac3d5c0..a38b79f 100644 (file)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 ## Copyright INRIA
 
-AC_REVISION($Revision: 1.15 $)dnl
+AC_REVISION($Revision: 1.16 $)dnl
 AC_INIT(license.txt)
 SCIDIR=`pwd`
 AC_CONFIG_AUX_DIR(config)
@@ -840,18 +840,21 @@ case "$host" in
 # FreeBSD  systems (not supported by INRIA)
   *-*-freebsd*)
      GCC=yes
-     CC=gcc
-     CC_OPTIONS='-O2 -Dfreebsd'
+     #CC=gcc
+     #CC_OPTIONS='-O2 -Dfreebsd'
+     CC=cc
+     CC_OPTIONS="${CFLAGS} -Dfreebsd"
      CC_LDFLAGS=-lm
      CC_PICFLAGS='-fPIC'
      # script shell f77 have bugs, get ours
      FC=f77
-     FC_OPTIONS='-O2 -Dfreebsd'
+     FC_OPTIONS="${CFLAGS} -Dfreebsd"  
      FC_OPTIONS_O0='-Dfreebsd'
-     FC_LDFLAGS=-lm
+     FC_LDFLAGS='-lm -Wl,--export-dynamic'
      FC_PICFLAGS='-fPIC'
      LD=ld
      LD_LDFLAGS=-lm
+
      if test "$enable_debug" = yes; then 
        CC_OPTIONS='-g -Dfreebsd'
        FC_OPTIONS=-g
@@ -1250,6 +1253,12 @@ else
   PVMROOT="$SCIDIR/pvm3"
   PVMTARGET=scilex-lib
 fi
+PVMINCLUDE=$PVMROOT/include
+AC_ARG_WITH(pvm-include,
+    [  --with-pvm-include=DIR  PVM include files are in DIR ],
+    [  PVMINCLUDE=$withval
+    ])
+
 
 AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
 [
@@ -1261,8 +1270,15 @@ if test "$ac_cv_PVM_arch" = UNKNOWN; then
 else
   AC_DEFINE(WITH_PVM)
   PVMARCH="$ac_cv_PVM_arch"
-  PVMGLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a"
-  PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a"
+       
+  PVMLIBDIR=$PVMROOT/lib/$ac_cv_PVM_arch
+  AC_ARG_WITH(pvm-library,
+       [  --with-pvm-library=DIR  PVM library files are in DIR ],
+       [  PVMLIBDIR=$withval
+           ])
+  PVMGLIB="$PVMLIBDIR/libgpvm3.a"
+  PVMLIB="$PVMLIBDIR/libpvm3.a"
+       
   PVMSCIDIR=pvm
   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
 fi
@@ -1416,6 +1432,7 @@ AC_SUBST(PVMSCILIB)
 AC_SUBST(PVMGLIB)
 AC_SUBST(PVMTARGET)
 AC_SUBST(PVMROOT)
+AC_SUBST(PVMINCLUDE)
 AC_SUBST(TK_INC_PATH)
 AC_SUBST(TCL_INC_PATH)
 AC_SUBST(TCLTK_LIBS)
index 437afd8..2b45b1e 100644 (file)
@@ -7,6 +7,8 @@ CFLAGS = $(CC_OPTIONS)
 
 FFLAGS = $(FC_OPTIONS)
 
+include ../Make.lib
+
 EXAMPLES= Ex-colnew.o Ex-corr.o  Ex-feval.o  Ex-fsolve.o  Ex-impl.o  \
        Ex-intg.o \
        Ex-ode-more.o  Ex-ode.o  Ex-odedc.o  Ex-optim.o  Ex-schur.o  \
index b0a1f5a..876f660 100644 (file)
@@ -10,7 +10,7 @@ OBJSF = intpvm.o mycmatptr.o varpack.o scipvmf77tosci.o scipvmscitof77.o
 
 include ../../Makefile.incl
 
-CFLAGS = $(CC_OPTIONS)  -I${PVMROOT}/include
+CFLAGS = $(CC_OPTIONS)  -I${PVMINCLUDE}
 
 FFLAGS = $(FC_OPTIONS)