Uses also the LD_LIBRARY_PATH of the system for call_scilab 25/7425/6
Sylvestre Ledru [Thu, 7 Jun 2012 09:33:14 +0000 (11:33 +0200)]
To test:
make check-call_scilab

Change-Id: I65da766f8865e5c42d924bf77bcf8b9366115a02

scilab/Makefile.call_scilab.am
scilab/Makefile.in

index 1b7fb3d..ec5c568 100644 (file)
@@ -11,7 +11,7 @@
 
 CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/ $(FLIBS)
 
-CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
+CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la $(COMPILER_LDFLAGS)
 
 
 # These binaries are built here and not in the call_scilab module because 
@@ -26,7 +26,7 @@ check_PROGRAMS = call_scilab_c_simple call_scilab_c call_scilab_c_getlastjob cal
 check-call_scilab: $(check_PROGRAMS)
        @for a in $(JAVA_JNI_LIBS); do \
                LD_PATH=`echo $$a|grep '^-L'|sed -e 's|-L\(.*\)|\1|g'`;\
-               LOCAL_LD="$$LOCAL_LD:$$LD_PATH"; \
+               LOCAL_LD="$$LOCAL_LD:$$LD_PATH:$$LD_LIBRARY_PATH"; \
        done; \
        for f in $(check_PROGRAMS); do \
                if test "$$f" != "call_scilab_c"; then \
index b5976e2..78ef0a3 100644 (file)
@@ -698,7 +698,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 # Files to install in Pkgconfig directory
 pkgconfig_DATA = scilab.pc
 CALL_SCILAB_CFLAGS_COMMON = -I$(top_srcdir)/modules/call_scilab/includes/ -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/modules/api_scilab/includes/ $(FLIBS)
-CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la
+CALL_SCILAB_LDADD_COMMON = $(top_builddir)/modules/libscilab.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/call_scilab/libscicall_scilab.la $(COMPILER_LDFLAGS)
 call_scilab_c_SOURCES = $(top_srcdir)/modules/call_scilab/examples/call_scilab/c/common/myprog.c
 call_scilab_c_CFLAGS = $(CALL_SCILAB_CFLAGS_COMMON)
 call_scilab_c_LDFLAGS = $(CALL_SCILAB_LDADD_COMMON)
@@ -2010,7 +2010,7 @@ codecoverage-java: clean-reports
 check-call_scilab: $(check_PROGRAMS)
        @for a in $(JAVA_JNI_LIBS); do \
                LD_PATH=`echo $$a|grep '^-L'|sed -e 's|-L\(.*\)|\1|g'`;\
-               LOCAL_LD="$$LOCAL_LD:$$LD_PATH"; \
+               LOCAL_LD="$$LOCAL_LD:$$LD_PATH:$$LD_LIBRARY_PATH"; \
        done; \
        for f in $(check_PROGRAMS); do \
                if test "$$f" != "call_scilab_c"; then \