[gnuplot5] 06/07: Enable wxt-terminal.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gnuplot5.

commit e56cfcac811677acab905c8796c3333b7c788ea1
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jan 22 23:15:20 2015 +0100

    Enable wxt-terminal.
---
 debian/patches/11_fix_linkage_wx.patch | 15 +++++++++++++++
 debian/rules                           |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/patches/11_fix_linkage_wx.patch b/debian/patches/11_fix_linkage_wx.patch
new file mode 100644
index 0000000..112ed58
--- /dev/null
+++ b/debian/patches/11_fix_linkage_wx.patch
@@ -0,0 +1,15 @@
+Description: Add missing linkage against X11 libs.
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-01-22
+
+--- gnuplot5-5.0.0+dfsg1.orig/src/Makefile.am
++++ gnuplot5-5.0.0+dfsg1/src/Makefile.am
+@@ -89,6 +89,8 @@ $(EXTRA_gnuplot_SOURCES)
+ 
+ if BUILD_WXWIDGETS
+ gnuplot_SOURCES += wxterminal/wxt_gui.cpp
++XLIBS = @LIBRARIES_FOR_X@
++gnuplot_LDADD += $(XLIBS)
+ endif
+ 
+ if BUILD_GPCAIRO
diff --git a/debian/rules b/debian/rules
index 3c8ee89..f40029f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,11 +32,11 @@ conf_opts += \
 
 override_dh_auto_configure:
 	mkdir -p $(BUILDDIR_NOX)
-	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --with-qt=no --without-x --disable-wxwidgets --disable-wxt
+	cd $(BUILDDIR_NOX);  ./../../configure $(conf_opts) --with-qt=no --without-x --disable-wxwidgets
 	mkdir -p $(BUILDDIR_X11)
-	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --with-tutorial --disable-wxt
+	cd $(BUILDDIR_X11); ../../configure $(conf_opts) --with-qt=no --with-tutorial
 	mkdir -p $(BUILDDIR_QT)
-	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt --disable-wxt
+	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt
 
 override_dh_auto_build:
 	dh_auto_build -a -- -C $(BUILDDIR_NOX)/src

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gnuplot5.git