gnuplot: upgrade to 5.0.5

Add PACKAGECONFIG for 'qt4' and default to not enable it as there's
do_compile failure when qt4 is enabled.

The obsolete '--without-lisp-files' option is removed.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Qi.Chen@windriver.com
2016-11-07 18:05:02 +08:00
committed by Martin Jansa
parent b70dd8f2af
commit 2372fb6412
4 changed files with 4 additions and 3 deletions

View File

@@ -0,0 +1,16 @@
Index: gnuplot-4.6.5/configure.in
===================================================================
--- gnuplot-4.6.5.orig/configure.in
+++ gnuplot-4.6.5/configure.in
@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then
fi
if test "$with_lua" != no; then
+ dnl check for dlopen/dl to fix loadlibs link failure
+ AC_CHECK_FUNC([dlopen], [],
+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
+ AC_SUBST(DLOPEN_LIBS)
+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS"
TERMLIBS="$TERMLIBS $LUA_LIBS"
CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
else

View File

@@ -0,0 +1,11 @@
--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200
+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign 1.2h
-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
+SUBDIRS = config m4 term src $(LISPDIR) man share
EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \