packages: gnuplot/gnuplot-lua.patch, gnuplot/gnuplot.spec - fix building lu...

[draenog]

Author: draenog                      Date: Tue Sep 14 19:03:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building lua/TikZ terminal

---- Files affected:
packages/gnuplot:
   gnuplot-lua.patch (1.1 -> 1.2) , gnuplot.spec (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: packages/gnuplot/gnuplot-lua.patch
diff -u packages/gnuplot/gnuplot-lua.patch:1.1 packages/gnuplot/gnuplot-lua.patch:1.2
--- packages/gnuplot/gnuplot-lua.patch:1.1	Mon Mar 15 16:32:28 2010
+++ packages/gnuplot/gnuplot-lua.patch	Tue Sep 14 21:03:00 2010
@@ -1,6 +1,6 @@
 --- gnuplot-4.4.0-orig/configure.in	2010-03-15 16:23:38.963407453 +0100
 +++ gnuplot-4.4.0/configure.in	2010-03-15 16:24:15.163122072 +0100
-@@ -617,7 +617,7 @@
+@@ -617,13 +617,15 @@
    with_lua=yes)
  
  if test "${with_lua}" = yes ; then
@@ -9,3 +9,24 @@
    if test $pkg_failed != no; then
      AC_MSG_WARN([The lua terminal will not be compiled.])
      with_lua=no
+   else
+     _libs="$LIBS"
++    _cppflags="$CPPFLAGS"
+     LIBS="$LIBS $LUA_LIBS"
++    CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
+   fi
+ 
+   AC_SEARCH_LIBS(luaL_openlibs, lua,
+@@ -652,11 +654,11 @@
+      AC_CHECK_HEADERS(lua.h,,
+        AC_MSG_WARN([please add path to lua.h to CPPFLAGS in Makefile]))
+      with_lua=yes
+-     LUA_LIBS='-llua'
+     ],
+     with_lua=no)
+  
+   LIBS="$_libs"
++  CPPFLAGS="$_cppflags"
+   if test "$with_lua" != no; then
+     TERMLIBS="$TERMLIBS $LUA_LIBS"
+     CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"

================================================================
Index: packages/gnuplot/gnuplot.spec
diff -u packages/gnuplot/gnuplot.spec:1.89 packages/gnuplot/gnuplot.spec:1.90
--- packages/gnuplot/gnuplot.spec:1.89	Tue Sep 14 19:25:42 2010
+++ packages/gnuplot/gnuplot.spec	Tue Sep 14 21:03:00 2010
@@ -31,6 +31,7 @@
 BuildRequires:	gtk+2-devel
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtool
+BuildRequires:	lua51-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
@@ -178,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2010/09/14 19:03:00  draenog
+- fix building lua/TikZ terminal
+
 Revision 1.89  2010/09/14 17:25:42  draenog
 - up to 4.4.1
 - enable wxt terminal
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnuplot/gnuplot-lua.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnuplot/gnuplot.spec?r1=1.89&r2=1.90&f=u