[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.4.0-1.1-14-g0dc855f

[Anton Gladky]

The following commit has been merged in the master branch:
commit 663e40439162e1b6ea5832d1fe0d5aa469ef74e0
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Mar 20 12:47:31 2012 +0100

    Add liblua5.1-dev dependency and set include path to enable lua (closes #503269).
    
    gnuplot 4.6 enables lua terminal by default if lua is available.
    Add liblua5.1-dev dependency to make sure that happens.
    
    Setting explicit path to lua includes is still needed, so is added
    to CFLAGS.

diff --git a/debian/control b/debian/control
index b72f75a..aa771a3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7), libpng-dev, libx11-dev, libxt-dev, 
  pkg-config, texinfo (>= 4.8), texlive-latex-base, texlive-latex-recommended, 
- texlive-latex-extra,
+ texlive-latex-extra, liblua5.1-dev,
  zlib1g-dev, libgd2-noxpm-dev, quilt, libwxgtk2.8-dev, libcairo2-dev, 
  libpango1.0-dev, libedit-dev (>= 2.11-20080614-2), autoconf, automake
 Homepage: http://gnuplot.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index 38f252b..8d2910a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+# Tell compiler where should find lua headers
+CFLAGS += -I/usr/include/lua5.1
+
 BUILDDIR_NOX = $(CURDIR)/debian/build-nox
 BUILDDIR_X11 = $(CURDIR)/debian/build-x11
 
@@ -22,8 +25,8 @@ configure-nox: configure-nox-stamp
 configure-nox-stamp: autoreconf-stamp
 	dh_testdir
 	mkdir -p $(BUILDDIR_NOX)
-	cd $(BUILDDIR_NOX); CFLAGS="$(CFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" ../../configure \
+	cd $(BUILDDIR_NOX);  ../../configure \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
 	  	--infodir=\$${prefix}/share/info \
@@ -39,8 +42,8 @@ configure-x11: configure-x11-stamp
 configure-x11-stamp: autoreconf-stamp
 	dh_testdir
 	mkdir -p $(BUILDDIR_X11)
-	cd $(BUILDDIR_X11); CFLAGS="$(CFLAGS)" \
-		LDFLAGS="$(LDFLAGS)" ../../configure \
+	cd $(BUILDDIR_X11); ../../configure \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	  	--prefix=/usr --mandir=\$${prefix}/share/man \
 	  	--infodir=\$${prefix}/share/info \

-- 
Gnuplot. Interactive plotting program