Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 237572 | Differences between
and this patch

Collapse All | Expand All

(-)scilab-5.1.1-orig/configure.ac (-1 / +1 lines)
Lines 1436-1442 Link Here
1436
echo ""
1436
echo ""
1437
if test $PVM_ENABLE = yes; then
1437
if test $PVM_ENABLE = yes; then
1438
   echo "PVM Configuration:"
1438
   echo "PVM Configuration:"
1439
   echo "PVM Architecture ... = $PVMARCH"
1439
   echo "PVM Architecture ... = $PVM_ARCH"
1440
   echo "PVM INCLUDE ........ = $PVM_INCLUDE"
1440
   echo "PVM INCLUDE ........ = $PVM_INCLUDE"
1441
   echo "PVM LIBS ........... = $PVM_LIB"
1441
   echo "PVM LIBS ........... = $PVM_LIB"
1442
else
1442
else
(-)scilab-5.1.1-orig/m4/pvm.m4 (-110 / +295 lines)
Lines 7-40 Link Here
7
dnl OUTPUTS
7
dnl OUTPUTS
8
dnl   PVM_OK : 1 if it is possible to use it
8
dnl   PVM_OK : 1 if it is possible to use it
9
dnl  
9
dnl  
10
dnl
11
dnl --------------------------------------------------------
12
dnl
13
dnl General comments about PVM detection
14
dnl
15
dnl A typical installation has a hierarchy under PVM_ROOT that includes
16
dnl PVM_ROOT/include/pvm3.h
17
dnl PVM_ROOT/lib/pvmgetarch
18
dnl PVM_ROOT/lib/<pvmarch>/libfpvm3.{a,so}
19
dnl PVM_ROOT/lib/<pvmarch>/libgpvm3.{a,so}
20
dnl PVM_ROOT/lib/<pvmarch>/libpvm3.{a,so}
21
dnl
22
dnl The setting for <pvmarch> is given by the output of the
23
dnl PVM_ROOT/lib/pvmgetarch program.
24
dnl
25
dnl This typical installation has been seen on several different
26
dnl operating systems and several different packaging systems.  It can
27
dnl be considered the "normal" case.  In addition, the documentation
28
dnl that comes with pvm3 says that the variable 
29
dnl PVM_ROOT should be set in the users environment when using
30
dnl pvm3 or compiling programs that use pvm3.
31
dnl
32
dnl --------------------------------------------------------
33
dnl Variations that have been encountered "in the field" are:
34
dnl
35
dnl --------------------------------------------------------
36
dnl header installed to /usr/include/pvm3.h but the rest of the install
37
dnl to PVM_ROOT (where PVM_ROOT=/usr/share/pvm3 in one particular instance).
38
dnl
39
dnl This case can be dealt with by using the --with-pvm-includes option
40
dnl --------------------------------------------------------
41
dnl No shared libraries installed.  Only static libs.  This may cause
42
dnl issues with linking on some systems.  This may have to wait for a real
43
dnl world trial to see how it pans out.
44
dnl --------------------------------------------------------
45
dnl 
46
dnl
47
dnl The libraries installed by pvm3 are:
48
dnl $PVM_ROOT/lib/$PVM_ARCH/libpvm3.a   -  C (base) library
49
dnl $PVM_ROOT/lib/$PVM_ARCH/libfpvm3.a  -  Fortran wrapper library
50
dnl $PVM_ROOT/lib/$PVM_ARCH/libgpvm3.a  -  Group function library
51
10
AC_DEFUN([AC_PVM], [
52
AC_DEFUN([AC_PVM], [
11
53
12
   AC_MSG_CHECKING([for PVM])
54
    AC_MSG_CHECKING([if PVM_ROOT has been set])
13
    if test "x$PVM_ROOT" == "x"; then
55
    if test "x$PVM_ROOT" = "x"; then
14
		echo "PVM_ROOT not set"
56
        AC_MSG_RESULT([no.  I will try to guess a value for it])
15
	fi
57
        _pvm_path="${PATH}"
16
	
58
        # this variable will be used later to see if the user specified
17
	# check for a PVM provided by the distrubtion in the PATH
59
        # PVM_ROOT or if we guessed at it based on the location of the
18
	AC_CHECK_PROG(PVMGETARCH,pvmgetarch,pvmgetarch,no)
60
        # header
19
    if test "$PVMGETARCH" = no; then
61
        _pvm_root_specified=no
20
	   if test -x $PVM_ROOT/lib/pvmgetarch; then  
62
    else
21
	   	# check for a PVM provided by the distrubtion in the PATH
63
        AC_MSG_RESULT([yes ($PVM_ROOT)])
22
		  PVMGETARCH=$PVM_ROOT/lib/pvmgetarch
64
23
	   else
65
        _pvm_root_specified=yes
24
	      AC_MSG_ERROR([Unable to find pvmgetarch in PATH or PVM_ROOT. (Scilab no longer provides an embedded PVM)])
66
        # PVM_ROOT is set, make sure the directory exists
25
	   fi
67
        AC_MSG_CHECKING([if the specified PVM_ROOT directory exists])
68
        if test -d "$PVM_ROOT" ; then
69
            AC_MSG_RESULT([yes])
70
        else
71
            AC_MSG_RESULT([no])
72
            AC_MSG_ERROR([The directory specified by PVM_ROOT does not exist.
73
The value of PVM_ROOT must either be left unspecified (empty or not defined)
74
or set to a valid directory that is the root of a pvm3 installation.
75
])
76
        fi
77
        
78
        # PVM_ROOT is set and the directory exists.  Now make sure it looks
79
        # like a pvm installation!
80
        AC_MSG_CHECKING([if the specified PVM_ROOT contains a pvm installation])
81
        if test -r "${PVM_ROOT}/include/pvm3.h" ; then
82
            AC_MSG_RESULT([yes])
83
        else
84
            AC_MSG_RESULT([no])
85
            AC_MSG_ERROR([The directory specified by PVM_ROOT does not appear
86
to be a valid pvm installation directory.  This is based on PVM_ROOT/include/pvm3.h
87
not existing.  The value of PVM_ROOT must either be left unspecified (empty or
88
not defined) or set to a valid directory that is the root of a pvm3 installation.])
89
        fi
90
91
	# If we made it this far then it means PVM_ROOT is set and appears to
92
	# be valid.
93
        # we'll use this path for looking for pvmgetarch.
94
        _pvm_path="${PVM_ROOT}/lib:${PATH}"
26
    fi
95
    fi
27
96
28
	AC_CACHE_CHECK([for PVM architecture],PVMARCH, [
97
    # check for pvmgetarch.  If specified then PVM_ROOT/lib is placed at the
29
	PVMARCH=`$PVMGETARCH`
98
    # beginning of the search path.  The user can force this by 
30
	])
99
    # simply setting PVMGETARCH on the configure command line like
31
	if test "$PVMARCH" = UNKNOWN; then
100
    # PVMGETARCH=/path/to/pvmgetarch if they need to force a particular value.
32
		AC_MSG_ERROR([PVM is unable to recognise the architecture])
101
    AC_PATH_PROG([PVMGETARCH],[pvmgetarch],[no], [$_pvm_path])
102
103
    if test "$PVMGETARCH" = "no" ; then
104
        AC_MSG_ERROR([Unable to find pvmgetarch in PVM_ROOT/lib or PATH])
105
     fi
106
107
108
    # FIXME -- if we ever wish to cross compile scilab with pvm support in place
109
    # then the user will need o specify PVM_ARCH correctly.  See pvm_intro(1PVM) for
110
    # more details on the supported environment variables.
111
	AC_CACHE_CHECK([for PVM architecture],[PVM_ARCH], [PVM_ARCH=`$PVMGETARCH`])
112
	if test "x$PVM_ARCH" = "xUNKNOWN"; then
113
		AC_MSG_ERROR([PVM is unable to recognise the architecture.  This means that
114
pvmgetarch ($PVMGETARCH) is broken on your system.
115
])
33
	fi
116
	fi
34
117
35
	PVMROOT="$SCIDIR/pvm3"
118
36
	PVMROOTR='$SCI/pvm3'
119
    # now we start looking for the pvm3.h header.
37
	
120
    USER_PVMINCLUDE=""	
38
	AC_ARG_WITH(pvm-include,
121
	AC_ARG_WITH(pvm-include,
39
		AC_HELP_STRING([--with-pvm-include=DIR],[Set the path to the PVM headers]),
122
		AC_HELP_STRING([--with-pvm-include=DIR],[Set the path to the PVM headers]),
40
		[  USER_PVMINCLUDE=$withval
123
		[  USER_PVMINCLUDE=$withval
Lines 43-65 Link Here
43
	AC_PVM_INCLUDE($USER_PVMINCLUDE)
126
	AC_PVM_INCLUDE($USER_PVMINCLUDE)
44
127
45
	AC_DEFINE([WITH_PVM],[],[With PVM])
128
	AC_DEFINE([WITH_PVM],[],[With PVM])
46
		
129
47
	PVMLIBDIR=$PVMROOT/lib/$PVMARCH
130
    if test "x$PVM_ROOT" = "x" ; then
48
	AC_ARG_WITH(pvm-library,
131
        # PVM_ROOT was not set so try to guess it from the header location.
49
		AC_HELP_STRING([--with-pvm-library=DIR],[Set the path to the PVM library]),
132
        # Since if we made it this far, we must have found the pvm3.h header
50
		[  USER_PVMLIBDIR=$withval
133
        # somewhere and that somewhere is in $PVM_INCLUDE_DIR.
134
        AC_MSG_CHECKING([for a reasonable guess at PVM_ROOT since PVM_ROOT was not set])
135
        PVM_ROOT="`dirname $PVM_INCLUDE_DIR`"
136
        AC_MSG_RESULT([$PVM_ROOT])
137
    fi
138
139
    PVMLIBDIR=$PVM_ROOT/lib/$PVM_ARCH
140
    USER_PVMLIBDIR=""	
141
    AC_ARG_WITH(pvm-library,
142
        AC_HELP_STRING([--with-pvm-library=DIR],[Set the path to the PVM library directory]),
143
            [  USER_PVMLIBDIR=$withval
51
	])
144
	])
52
	AC_PVM_LIBRARY($USER_PVMLIBDIR)
145
    AC_PVM_LIBRARY($USER_PVMLIBDIR)
53
146
54
147
55
if test ! -z "$PVM_INCLUDE" -a ! -z "$PVM_LIB"; then
148
    if test ! -z "$PVM_INCLUDE" -a ! -z "$PVM_LIB"; then
56
	PVM_OK=1
149
	    PVM_OK=1
57
else
150
    else
58
    AC_MSG_ERROR([Cannot find headers (pvm3.h) or PVM library. Please install the dev package.])
151
        AC_MSG_ERROR([Cannot find headers (pvm3.h) or PVM library. Please install the dev package for pvm3.])
59
fi 
152
    fi 
60
AC_SUBST(PVMARCH)
153
    AC_SUBST(PVM_ARCH)
61
AC_SUBST(PVM_LIB)
154
    AC_SUBST(PVM_LIB)
62
AC_SUBST(PVM_INCLUDE)
155
    AC_SUBST(PVM_INCLUDE)
63
])
156
])
64
157
65
158
Lines 69-117 Link Here
69
#
162
#
70
# OUTPUTS
163
# OUTPUTS
71
#  PVM_INCLUDE : Flag to include files
164
#  PVM_INCLUDE : Flag to include files
72
#  Check the version of tcl associated to header file tcl.h 
73
AC_DEFUN([AC_PVM_INCLUDE], [
165
AC_DEFUN([AC_PVM_INCLUDE], [
74
	AC_MSG_CHECKING([PVM header files])
166
	AC_MSG_CHECKING([PVM header files])
75
	USER_PVMINCLUDE=$1
167
	USER_PVMINCLUDE="$1"
76
	F=$USER_PVMINCLUDE/pvm3.h
168
77
    if test -f "$F" ; then ## A voir ce que l'on fait quand le param USER_PVMINCLUDE=$1 est fournit mais n'existe pas ...
169
    _pvm_header=pvm3.h
78
         PVM_INCLUDE="-I`dirname $F`"
170
    # if the user has given a --with-pvm-include configure option but the specified
79
	else
171
    # directory does not exist, then error out.  We don't keep searching in this case
80
		if test ! -z "$USER_PVMINCLUDE"; then ## 
172
    # because the user has explicitly told us where to look and that location didn't
81
			AC_MSG_WARN([Cannot find PVM sources in the specified directory ($F). Looking for PVM sources elsewhere.])
173
    # exist.
174
    if test "x$USER_PVMINCLUDE" != "x" -a ! -d "$USER_PVMINCLUDE" ; then
175
        AC_MSG_ERROR([The specified PVM include directory, $USER_PVMINCLUDE, does not exist.])
176
    fi
177
178
    if test "x$USER_PVMINCLUDE" != "x" ; then
179
        # if the user has given a --with-pvm-include configure option but there is no pvm3.h
180
        # there then error out.  We don't keep searching in this case because the user has 
181
        # explicitly told us where to look but we didn't find what we needed there.
182
        if test -f "$USER_PVMINCLUDE/${_pvm_header}" ; then 
183
            PVM_INCLUDE_DIR="$USER_PVMINCLUDE"
184
	    else
185
            AC_MSG_ERROR([Cannot find PVM header (${_pvm_header})  in the specified directory ($USER_PVMINCLUDE).])
82
		fi 
186
		fi 
83
		incpath="$PVMROOT/include $PVM_ROOT/include /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src"
187
    else
188
        # we have not been given a --with-pvm-include option, so we have to go looking
189
        # for the pvm header
190
        incpath=""
191
192
        # if PVM_ROOT is set, then look there first
193
        if test "x$PVM_ROOT" != "x" ; then
194
            incpath="$PVM_ROOT/include $incpath"
195
        else
196
            # PVM_ROOT is not set so lets take a guess at what it may be.
197
            # pvmgetarch is supposed to be installed as PVM_ROOT/lib/pvmgetarch
198
            # so dirname $PVMGETARCH should give PVM_ROOT/lib
199
            # and dirname again should give a guess at PVM_ROOT
200
            tmp=`dirname $PVMGETARCH`
201
            tmp=`dirname $tmp`
202
            incpath="${tmp}/include $incpath"
203
        fi
204
205
        # add a bunch of other paths
206
        incpath="$incpath /usr/include /usr/share /usr/share/include /usr/array/PVM /usr/local /usr/local/include /usr/local/src"
207
        PVM_INCLUDE=""
84
		for INC_PATH in $incpath; do
208
		for INC_PATH in $incpath; do
85
		    F="$INC_PATH/pvm3.h"
209
		    F="$INC_PATH/${_pvm_header}"
86
			if test -f "$F"; then
210
			if test -f "$F"; then
87
		         PVM_INCLUDE="-I`dirname $F`"
211
		         PVM_INCLUDE_DIR="${INC_PATH}"
88
				 break 1;
212
				 break 1;
89
			fi
213
			fi
90
		done
214
		done
91
		if test -z $PVM_INCLUDE; then
215
		if test -z "$PVM_INCLUDE_DIR"; then
92
	   	     AC_MSG_ERROR([Could not locate PVM include file])
216
	   	     AC_MSG_ERROR([Could not locate PVM include file (${_pvm_header})])
93
		fi
217
		fi
94
	fi
218
	fi
95
	echo "PVM sources found in $PVM_INCLUDE"
219
    AC_MSG_RESULT([PVM header found in $PVM_INCLUDE_DIR])
96
220
97
    ac_save_CPPFLAGS=$CPPFLAGS
221
    ac_save_CPPFLAGS="$CPPFLAGS"
98
    ac_save_CFLAGS=$CFLAGS
222
    ac_save_CFLAGS="$CFLAGS"
99
223
100
    CPPFLAGS="$PVM_INCLUDE $CPPFLAGS"
224
    CPPFLAGS="-I$PVM_INCLUDE_DIR $CPPFLAGS"
101
    CFLAGS="$PVM_INCLUDE $CFLAGS"
225
    CFLAGS="-I$PVM_INCLUDE_DIR $CFLAGS"
102
226
103
    AC_CHECK_HEADER([pvm3.h],,
227
    AC_CHECK_HEADER([pvm3.h],,[AC_MSG_ERROR([check for PVM headers failed])])
104
                    [
105
                    if test "$pvm" = yes; then
106
                      AC_MSG_ERROR([check for PVM library failed])
107
                    else
108
                      pvm=no
109
                    fi
110
                    ])
111
228
112
    CPPFLAGS=$ac_save_CPPFLAGS
229
    CPPFLAGS=$ac_save_CPPFLAGS
113
    CFLAGS=$ac_save_CFLAGS
230
    CFLAGS=$ac_save_CFLAGS
114
	
231
    PVM_INCLUDE="-I${PVM_INCLUDE_DIR}"	
115
])
232
])
116
233
117
234
Lines 122-177 Link Here
122
#  PVM_LIB : flag to link against pvm lib
239
#  PVM_LIB : flag to link against pvm lib
123
240
124
AC_DEFUN([AC_PVM_LIBRARY], [
241
AC_DEFUN([AC_PVM_LIBRARY], [
125
USER_PVMLIBDIR=$1
242
    USER_PVMLIBDIR="$1"
126
  AC_MSG_CHECKING([for PVM3 library])
243
127
dirs="$USER_PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 ."
244
    # if the user has given a --with-pvm-library configure option but the specified
128
libexts="so so.1.0 sl dylib a"
245
    # directory does not exist, then error out.  We don't keep searching in this case
129
libnames="pvm pvm3"
246
    # because the user has explicitly told us where to look and that location did not
130
247
    # exist.
131
for EXT_LIB_PVM in $libexts; do
248
    if test "x$USER_PVMLIBDIR" != "x" ; then
132
	for PATH_LIB_PVM in $dirs; do
249
        AC_MSG_CHECKING([if the specified PVM library directory ($USER_PVMLIBDIR) exists])
133
		for NAME_LIB_PVM in $libnames; do
250
        if test -d "$USER_PVMLIBDIR" ; then
134
			m="$PATH_LIB_PVM/lib$NAME_LIB_PVM.$EXT_LIB_PVM"
251
            AC_MSG_RESULT([yes])
135
			if test -r $m; then
252
        else
136
				AC_MSG_RESULT([found $m using -L$PATH_LIB_PVM -l$NAME_LIB_PVM])
253
            AC_MSG_ERROR([The specified PVM library directory ($USER_PVMLIBDIR) does not exist.
137
254
When specifying a PVM library directory with --with-pvm-libraries, the directory must
138
				saved_cflags="$CFLAGS"
255
exist and contain PVM libraries])
139
				saved_ldflags="$LDFLAGS"
256
        fi
140
				saved_cppflags="$CPPFLAGS"
257
    fi
141
				CFLAGS="$CFLAGS $PVM_INC_PATH"
142
				CPPFLAGS="$CPPFLAGS $PVM_INC_PATH"
143
				LDFLAGS="$LDFLAGS -L$PATH_LIB_PVM"
144
145
146
		        AC_CHECK_LIB([$NAME_LIB_PVM], pvm_spawn,
147
		        [
148
	    		    LDFLAGS="-lpvm3 $LDFLAGS"
149
			        AC_CHECK_LIB(pvm3, pvm_barrier,
150
    		    		[PVMLIBS="-lpvm3"; PVM_LIB_OK=1],
151
		        		[
152
        				AC_CHECK_LIB(gpvm3, pvm_barrier,
153
			        		[PVMLIBS="-lgpvm3 -lpvm3"; 
154
							PVM_LIB_OK=1])
155
		        		])
156
        		])
157
258
158
259
260
    dirs="$USER_PVMLIBDIR $PVMLIBDIR /lib /usr/lib /usr/lib/pvm3 /shlib /shlib/pvm3 /usr/shlib /usr/shlib/pvm3 /usr/local/lib /usr/local/lib/pvm3 /usr/local/shlib /usr/local/pvm3 /usr/pvm3 /usr/local/pvm3/lib /sw/lib/ /usr/share/pvm3 ."
261
    libnames="pvm3 pvm"
159
262
160
				AC_CHECK_LIB([$NAME_LIB_PVM], pvm_spawn, PVM_LIB_OK=1,PVM_LIB_OK=0)
263
161
264
    # if the user has given a --with-pvm-library configure option, only look there.
162
				CFLAGS="$saved_cflags"
265
    if test "x$USER_PVMLIBDIR" != "x" ; then
163
				CPPFLAGS="$saved_cppflags"
266
        dirs="$USER_PVMLIBDIR"
164
				LDFLAGS="$saved_ldflags"
267
        AC_MSG_CHECKING([for PVM libraries in $USER_PVMLIBDIR])
165
268
    elif test "$_pvm_root_specified" = "yes" ; then
166
				if test $PVM_LIB_OK = 1; then 
269
        # otherwise, if the user has specified PVM_ROOT (as opposed to configure
167
					PVM_LIB=" -L$PATH_LIB_PVM $PVMLIBS"
270
        # having guessed it), then only look in PVMLIBDIR (derived from PVM_ROOT
168
					break 3;
271
        # and PVMGETARCH output
169
				fi
272
        AC_MSG_CHECKING([for PVM libraries in $PVMLIBDIR])
170
			fi
273
        dirs="$PVMLIBDIR"
171
		done
274
    else
172
	done
275
        AC_MSG_CHECKING([for PVM libraries])
173
done
276
    fi
277
278
    # put the path loop on the outside because we always want to look in 
279
    # the user specified directory and the PVM_ROOT directory first for all possible
280
    # names instead of accidentally picking up something from a different directory
281
    for PATH_LIB_PVM in $dirs; do
282
        for NAME_LIB_PVM in $libnames; do
283
            m=lib${NAME_LIB_PVM}
284
            # note that the * is outside the quotes to allow the shell to expand it.
285
            # The rest is quoted in case we have spaces or anything weird in the path.
286
            ls "${PATH_LIB_PVM}/${m}."* >/dev/null 2>/dev/null
287
            rc=$?
288
            if test $rc -eq 0 ; then
289
                # we found a candidate directory
290
                # so check it out and see if it works
291
                AC_MSG_RESULT([found $m in $PATH_LIB_PVM])
292
                saved_cflags="$CFLAGS"
293
                saved_ldflags="$LDFLAGS"
294
                saved_cppflags="$CPPFLAGS"
295
                saved_libs="$LIBS"
296
                CFLAGS="$PVM_INCLUDE $CFLAGS"
297
                CPPFLAGS="$PVM_INCLUDE $CPPFLAGS"
298
                LDFLAGS="$LDFLAGS -L$PATH_LIB_PVM"
299
300
                # pvm_spawn() is a basic pvm3 function and should be in libpvm3
301
                AC_SEARCH_LIBS([pvm_spawn],[pvm3 pvm],[PVM_SPAWN=$ac_res], 
302
                    [AC_MSG_ERROR([Could not find the library with pvm_spawn().  Check that your PVM installation is not broken])]
303
                )
304
305
                if test "$PVM_SPAWN" = "none required" ; then 
306
		    PVM_SPAWN=""
307
		fi
308
309
                # pvm_barrier() is one of the group functions and should be in libgpvm3
310
                AC_SEARCH_LIBS([pvm_barrier],[pvm3 gpvm3],[PVM_BARRIER=$ac_res], 
311
                    [AC_MSG_ERROR([Could not find the library with pvm_barrier().  Check that your PVM installation is not broken])]
312
                )
313
314
                if test "$PVM_BARRIER" = "none required" ; then 
315
		    PVM_BARRIER=""
316
		fi
317
318
                PVMLIBS="$PVM_SPAWN $PVM_BARRIER"
319
		PVM_LIB_OK=1
320
321
                CFLAGS="$saved_cflags"
322
                CPPFLAGS="$saved_cppflags"
323
                LDFLAGS="$saved_ldflags"
324
                LIBS="$saved_libs"
325
326
                if test $PVM_LIB_OK = 1; then 
327
                    PVM_LIB="-L$PATH_LIB_PVM $PVMLIBS"
328
                    break 2;
329
                fi
330
            fi
331
        done # end of libname loop
332
    done # end of directory loop
333
334
335
# if we didn't find the PVM library, then spit out an error message
336
# about it.  The error message is customized based on if the user
337
# has specified PVM_ROOT or --with-pvm-libraries
174
if test -z "$PVM_LIB"; then
338
if test -z "$PVM_LIB"; then
175
	AC_MSG_ERROR([check for PVM library failed])
339
340
    if test "x$USER_PVMLIBDIR" != "x" ; then
341
342
        AC_MSG_ERROR([could not locate PVM libraries in the directory
343
specified by --with-pvm-libraries ($USER_PVMLIBDIR)])
344
345
    elif test "$_pvm_root_specified" = "yes" ; then
346
347
        AC_MSG_ERROR([could not locate PVM libraries by way of 
348
PVM_ROOT/lib/<PVM_ARCH> ($PVMLIBDIR).  Either correct your PVM
349
installation, PVM_ROOT, or use the --with-pvm-libraries configure
350
option if your pvm libraries are installed in a non-standard
351
location.])
352
353
    else
354
355
    	AC_MSG_ERROR([check for PVM library failed.  You may wish
356
to try setting PVM_ROOT to the root of your PVM installation or use
357
the --with-pvm-libraries option to specify the directory containing
358
the PVM library.])
359
    fi
176
fi
360
fi
361
177
])
362
])
(-)scilab-5.1.1-orig/modules/pvm/Makefile.am (-2 / +3 lines)
Lines 1-3 Link Here
1
# -*- Makefile -*-
1
##########
2
##########
2
### Sylvestre Ledru <sylvestre.ledru@inria.fr>
3
### Sylvestre Ledru <sylvestre.ledru@inria.fr>
3
### INRIA - Scilab 2006
4
### INRIA - Scilab 2006
Lines 50-60 Link Here
50
sci_gateway/c/sci_pvm_recv_var.c \
51
sci_gateway/c/sci_pvm_recv_var.c \
51
sci_gateway/c/sci_pvm_exit.c
52
sci_gateway/c/sci_pvm_exit.c
52
53
53
libscipvm_la_CFLAGS=  -I$(srcdir)/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(srcdir)/src/c/  -I$(top_srcdir)/modules/output_stream/includes/
54
libscipvm_la_CFLAGS=  -I$(srcdir)/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(srcdir)/src/c/  -I$(top_srcdir)/modules/output_stream/includes/ $(PVM_INCLUDE)
54
55
55
pkglib_LTLIBRARIES = libscipvm.la
56
pkglib_LTLIBRARIES = libscipvm.la
56
57
57
libscipvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(PVM_LIB) lgpvm3
58
libscipvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(PVM_LIB)
58
59
59
libscipvm_la_SOURCES = $(PVM_C_SOURCES) $(GATEWAY_C_SOURCES)
60
libscipvm_la_SOURCES = $(PVM_C_SOURCES) $(GATEWAY_C_SOURCES)
60
61

Return to bug 237572