File gnuplot-automake.diff of Package gnuplot

Overview Repositories Revisions Requests Users Attributes Meta

File gnuplot-automake.diff of Package gnuplot

From: Jan Engelhardt <jengelh@inai.de>
Date: 2012-05-30 17:27:56.732814252 +0200

Rip out obsolete constructs.

---
 Makefile.am     |    1 -
 configure.in    |    3 +--
 src/Makefile.am |    3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

Index: gnuplot-4.6.0/Makefile.am
===================================================================
--- gnuplot-4.6.0.orig/Makefile.am
+++ gnuplot-4.6.0/Makefile.am
@@ -1,5 +1,4 @@
 ## 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
 
Index: gnuplot-4.6.0/configure.in
===================================================================
--- gnuplot-4.6.0.orig/configure.in
+++ gnuplot-4.6.0/configure.in
@@ -10,7 +10,7 @@ AC_INIT(gnuplot, 4.6.0)
 AC_CONFIG_SRCDIR(src/graphics.c)
 AC_PREREQ(2.58)
 AM_CONFIG_HEADER(config.h:config.hin)
-AM_INIT_AUTOMAKE(1.7.9)
+AM_INIT_AUTOMAKE([foreign 1.7.9])
 
 AM_MAINTAINER_MODE
 
@@ -24,7 +24,6 @@ dnl Check for ANSI C prototypes, the con
 dnl and ANSI style stringification
 AC_GNU_SOURCE
 AC_PROG_CC
-AM_C_PROTOTYPES
 AC_PROG_CPP
 AC_C_CONST
 AC_C_INLINE
Index: gnuplot-4.6.0/src/Makefile.am
===================================================================
--- gnuplot-4.6.0.orig/src/Makefile.am
+++ gnuplot-4.6.0/src/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h
 
 # in the spirit of automake ...
 pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@
@@ -40,7 +39,7 @@ binonly: $(bin_PROGRAMS)
 transform = @program_transform_name@
 GNUPLOT_X11 = `echo gnuplot_x11 | sed '$(transform)'`$(EXEEXT)
 
-AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\"  -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\"
+AM_CPPFLAGS = -DPROTOTYPES -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DQT_DRIVER_DIR=\"$(QT_DRIVER_DIR)\" -DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DGNUPLOT_JS_DIR=\"$(GNUPLOT_JS_DIR)\" -DGNUPLOT_LUA_DIR=\"$(GNUPLOT_LUA_DIR)\"  -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" -DGNUPLOT_X11=\"$(GNUPLOT_X11)\" -DXAPPLRESDIR=\"$(XAPPLRESDIR)\"
 
 gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h binary.c \
 breaders.c breaders.h bitmap.h color.c color.h command.c \

Places

File gnuplot-automake.diff of Package gnuplot

Places