libsciconsole must be, in any cases for the gui, loaded before the minimal implementation 64/14364/2
Sylvestre Ledru [Mon, 7 Apr 2014 14:02:50 +0000 (16:02 +0200)]
Fix Ubuntu bug: #1299686

Change-Id: I4a4b38b97a9d06d88cd26d3777bebb8386e3a757

scilab/Makefile.am
scilab/Makefile.in

index 6831557..f9b0945 100644 (file)
@@ -68,7 +68,8 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
 scilab_bin_LDADD       = \
                        $(top_builddir)/modules/libscilab.la \
                        $(top_builddir)/modules/libscilab-cli.la \
-                       $(top_builddir)/modules/console/libsciconsole-minimal.la \
+                        $(top_builddir)/modules/console/libsciconsole.la \
+                        $(top_builddir)/modules/console/libsciconsole-minimal.la \
                        $(OPENMPI_LIBS) $(XML_LIBS) \
                        $(COMMON_LIBS) $(FLIBS)
 
index d1f054d..83a0eb6 100644 (file)
@@ -269,6 +269,7 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
+       $(top_builddir)/modules/console/libsciconsole.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) $(am__append_3) \
@@ -819,6 +820,7 @@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
 # libraries explicitly unless we link with -Wl,--copy-dt-needed-entries
 scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
        $(top_builddir)/modules/libscilab-cli.la \
+       $(top_builddir)/modules/console/libsciconsole.la \
        $(top_builddir)/modules/console/libsciconsole-minimal.la \
        $(OPENMPI_LIBS) $(XML_LIBS) $(COMMON_LIBS) $(FLIBS) \
        $(am__append_3) $(am__append_10)