Revert "Force link against XML LIB (useful when using --with-libxml2 option at config... 89/14089/2
Vincent COUVERT [Thu, 20 Mar 2014 15:22:22 +0000 (16:22 +0100)]
See https://codereview.scilab.org/14088

This reverts commit e03172292da872f9fb32903b18ac1fe1bcc7c4dc.

Change-Id: Ifae35ae1d149dd63881e49b51e243e2321c26d6b

scilab/Makefile.am
scilab/Makefile.in

index 487d86e..af4dc75 100644 (file)
@@ -38,8 +38,8 @@ if IS_MACOSX
 bin_SCRIPTS            += bin/checkmacosx.applescript
 endif
 
-scilab_bin_LDFLAGS         = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS)
-scilab_cli_bin_LDFLAGS  = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(XML_LIBS)
+scilab_bin_LDFLAGS         = $(AM_LDFLAGS) $(OPENMPI_LIBS)
+scilab_cli_bin_LDFLAGS  = $(AM_LDFLAGS) $(OPENMPI_LIBS)
 
 if USE_STATIC_SYSTEM_LIB
 scilab_bin_LDFLAGS += -static-libstdc++ -static-libgcc
index 72b366d..b6ded3d 100644 (file)
@@ -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) $(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_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_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
        -I$(top_srcdir)/modules/console/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ $(AM_CPPFLAGS) \