* Bug #12133 fixed - parallel_run was not available. 17/10717/2
Sylvestre Ledru [Wed, 6 Mar 2013 17:21:48 +0000 (18:21 +0100)]
Change-Id: If28681a54ef7241758c11d60a8780237951db884

scilab/CHANGES_5.4.X
scilab/configure
scilab/configure.ac
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in

index 0abcca0..a824f8d 100644 (file)
@@ -390,6 +390,8 @@ Bug fixes
 
 * Bug #12021 fixed - Improve the help page of eigs.
 
+* Bug #12133 fixed - parallel_run was not available.
+
 * Bug #12135 fixed - stacksize('max') failed silently.
 
 * Bug #12137 fixed - eigs(A,B) returned incorrect result for sparse matrices.
index 7d1e5c0..df73111 100755 (executable)
@@ -42223,7 +42223,7 @@ if test $OPENMP_ENABLE = yes; then
    echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
    echo "OpenMP CXXFLAGS .... = $OPENMP_CXXFLAGS"
    echo "OpenMP LIBS ........ = $OPENMP_LIBS"
-   echo "OpenMP FFLAGS ...... = $OPENMP_LDFLAGS"
+   echo "OpenMP LDFLAGS ..... = $OPENMP_LDFLAGS"
 else
    echo "Not using OpenMP"
 fi
index b07e4d7..9d318e4 100644 (file)
@@ -2013,7 +2013,7 @@ if test $OPENMP_ENABLE = yes; then
    echo "OpenMP CFLAGS ...... = $OPENMP_CFLAGS"
    echo "OpenMP CXXFLAGS .... = $OPENMP_CXXFLAGS"
    echo "OpenMP LIBS ........ = $OPENMP_LIBS"
-   echo "OpenMP FFLAGS ...... = $OPENMP_LDFLAGS"
+   echo "OpenMP LDFLAGS ..... = $OPENMP_LDFLAGS"
 else
    echo "Not using OpenMP"
 fi
index d7e289a..df476b9 100644 (file)
@@ -31,7 +31,7 @@ $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libsciparallel.la
 
-
+libsciparallel_la_LIBADD = $(OPENMP_LIBS)
 
 if OPENMP
 libsciparallel_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
index 7de688a..14e1fa3 100644 (file)
@@ -141,7 +141,8 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciparallel_la_sci_gatewaydir)" \
        "$(DESTDIR)$(libsciparallel_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-libsciparallel_la_LIBADD =
+am__DEPENDENCIES_1 =
+libsciparallel_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__libsciparallel_la_SOURCES_DIST = src/noparallel/noparallel.h \
        src/noparallel/noparallel.c sci_gateway/c/gw_parallel.c \
        sci_gateway/c/sci_parallel_concurrency.c \
@@ -461,6 +462,7 @@ libsciparallel_la_CPPFLAGS = $(OPENMP_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libsciparallel.la
+libsciparallel_la_LIBADD = $(OPENMP_LIBS)
 @OPENMP_FALSE@libsciparallel_la_SOURCES = src/noparallel/noparallel.h \
 @OPENMP_FALSE@src/noparallel/noparallel.c