From 062a147a6b32945a98365b43e42c9837ba5b85be Mon Sep 17 00:00:00 2001 From: Vincent COUVERT Date: Thu, 20 Mar 2014 17:49:54 +0100 Subject: [PATCH] Force link against XML LIB (useful when using --with-libxml2 option at configure) This reverts commit 53c53cc809e4bfdccff5445c8f57b9e482fea829. Change-Id: I6cddf99e85b51e283fb9546d0cf622fc666b15fb --- scilab/Makefile.am | 4 ++-- scilab/Makefile.in | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scilab/Makefile.am b/scilab/Makefile.am index af4dc75..487d86e 100644 --- a/scilab/Makefile.am +++ b/scilab/Makefile.am @@ -38,8 +38,8 @@ if IS_MACOSX bin_SCRIPTS += bin/checkmacosx.applescript endif -scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) -scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) +scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS) +scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS) if USE_STATIC_SYSTEM_LIB scilab_bin_LDFLAGS += -static-libstdc++ -static-libgcc diff --git a/scilab/Makefile.in b/scilab/Makefile.in index b6ded3d..72b366d 100644 --- a/scilab/Makefile.in +++ b/scilab/Makefile.in @@ -780,10 +780,10 @@ AM_LDFLAGS = $(SCI_LDFLAGS) changelogs = CHANGES CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X CHANGES_5.4.X CHANGES_5.5.X bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli \ bin/scinotes bin/xcos $(am__append_1) -scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_2) \ - $(am__append_4) $(am__append_6) -scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_3) \ - $(am__append_5) +scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS) \ + $(am__append_2) $(am__append_4) $(am__append_6) +scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS) \ + $(am__append_3) $(am__append_5) scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \ -I$(top_srcdir)/modules/console/includes/ \ -I$(top_srcdir)/modules/localization/includes/ $(AM_CPPFLAGS) \ -- 1.7.9.5