Fix dynamic link in Linux binary versions: 01/15501/1
Vincent COUVERT [Fri, 7 Nov 2014 14:44:40 +0000 (15:44 +0100)]
 - Eigen detection with prerequirements are used
 - Missing file in installation.

Change-Id: I8894a88603793d7ca27fa9ea6b1d849b95147818

scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
scilab/modules/javasci/Makefile.in

index d004a5b..54eb3bb 100644 (file)
@@ -244,6 +244,7 @@ includes/ast/deserializervisitor.hxx \
 includes/ast/dynlib_ast.h \
 includes/ast/execvisitor.hxx \
 includes/ast/dummyvisitor.hxx \
+includes/types/addfunction.h \
 includes/types/dollar.hxx \
 includes/types/user.hxx \
 includes/types/bool.hxx \
index dcdc645..ef3c447 100644 (file)
@@ -883,6 +883,7 @@ includes/ast/deserializervisitor.hxx \
 includes/ast/dynlib_ast.h \
 includes/ast/execvisitor.hxx \
 includes/ast/dummyvisitor.hxx \
+includes/types/addfunction.h \
 includes/types/dollar.hxx \
 includes/types/user.hxx \
 includes/types/bool.hxx \
index 6101964..4aceadb 100644 (file)
@@ -24,6 +24,25 @@ function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc, flagsType)
     end
 
     cmd = "";
+
+    ScilabTreeFound=%f;
+    // Manage Eigen in Scilab 6 source tree version
+    if isdir(SCI+"/modules/core/includes/") then
+        if isdir(SCI+"/lib/Eigen/includes/") then
+            if flagsType == "configure" then
+                cmd = " --with-eigen-include="+SCI+"/lib/Eigen/includes/";
+            end
+        end
+    end
+    //  Manage Eigen in Scilab 6 binary version
+    if isdir(SCI+"/../../include/scilab/") & ~ScilabTreeFound then
+        if isdir(SCI+"/../../lib/Eigen/includes/") then
+            if flagsType == "configure" then
+                cmd = " --with-eigen-include="+SCI+"/../../lib/Eigen/includes/";
+            end
+        end
+    end
+
     tbxFlag = " -D__SCILAB_TOOLBOX__ ";
     envFlag = "";
 
index bdc95b0..9a261aa 100644 (file)
@@ -998,10 +998,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+@JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@distclean-local:
 @JAVASCI_FALSE@install-data-local:
-@JAVASCI_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \