From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 25 May 2017 09:05:29 +0000 (+0200)
Subject: Deal with formal release of upstream library
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e578eb29fb25153e5fa44696963ac5cef58c640d;p=pspp

Deal with formal release of upstream library
---

diff --git a/configure.ac b/configure.ac
index 1b50123227..1b663422e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,9 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.44], [],
     [PSPP_REQUIRED_PREREQ([glib 2.0 version 2.44 or later (or use --without-gui)])])
 
+  PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget], [],
+    [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.0 (or use --without-gui)])])
+
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index b756aabc99..3b85412e55 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -99,6 +99,7 @@ src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
+	$(SPREAD_SHEET_WIDGET_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL) \
 	$(GSL_LIBS)
@@ -390,7 +391,6 @@ BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/u
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
 	src/ui/gui/resources.c $(nodist_src_ui_gui_psppire_DATA)
 
-include $(top_srcdir)/src/ui/gui/efficient-sheet.mk
 endif HAVE_GUI
 
 #ensure the installcheck passes even if there is no X server available
diff --git a/src/ui/gui/efficient-sheet.mk b/src/ui/gui/efficient-sheet.mk
deleted file mode 100644
index 04042766d7..0000000000
--- a/src/ui/gui/efficient-sheet.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-src_ui_gui_psppire_SOURCES += \
-	src/ui/gui/efficient-sheet/src/ssw-axis-model.c \
-	src/ui/gui/efficient-sheet/src/ssw-constraint.c \
-	src/ui/gui/efficient-sheet/src/ssw-sheet.c \
-	src/ui/gui/efficient-sheet/src/ssw-sheet-axis.c \
-	src/ui/gui/efficient-sheet/src/ssw-sheet-body.c \
-	src/ui/gui/efficient-sheet/src/ssw-sheet-single.c \
-	src/ui/gui/efficient-sheet/src/ssw-datum.c \
-	src/ui/gui/efficient-sheet/src/ssw-cell.c
-
-nodist_src_ui_gui_psppire_SOURCES += \
-	src/ui/gui/efficient-sheet/src/ssw-marshaller.c \
-	src/ui/gui/efficient-sheet/src/ssw-marshaller.h
-
-src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet/src
-
-BUILT_SOURCES += \
-	src/ui/gui/efficient-sheet/src/ssw-marshaller.c \
-	src/ui/gui/efficient-sheet/src/ssw-marshaller.h
-
-src/ui/gui/efficient-sheet/src/ssw-marshaller.c: src/ui/gui/efficient-sheet/src/marshall-list
-	glib-genmarshal --body --prefix=ssw_cclosure_marshal $< > $@
-
-src/ui/gui/efficient-sheet/src/ssw-marshaller.h: src/ui/gui/efficient-sheet/src/marshall-list
-	glib-genmarshal --header --prefix=ssw_cclosure_marshal $< > $@
-
diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 66ec49930a..d3e921d3b7 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -41,7 +41,7 @@
 #include "ui/gui/psppire-data-sheet.h"
 
 
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
diff --git a/src/ui/gui/psppire-data-sheet.h b/src/ui/gui/psppire-data-sheet.h
index b2285aa2fc..49e7a1751c 100644
--- a/src/ui/gui/psppire-data-sheet.h
+++ b/src/ui/gui/psppire-data-sheet.h
@@ -19,7 +19,7 @@
 #define _PSPPIRE_DATA_SHEET_H
 
 #include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
 
 struct _PsppireDataSheet
 {
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 6cee5a77b3..b46cddd1f2 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -47,7 +47,7 @@
 #include "gl/c-strcasestr.h"
 #include "gl/xvasprintf.h"
 
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
 
 #include "find-dialog.h"
 #include "options-dialog.h"
diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index fe064709e0..59b57b490c 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -34,7 +34,7 @@
 #include "ui/gui/psppire-marshal.h"
 #include "ui/gui/psppire-var-ptr.h"
 
-#include "ui/gui/efficient-sheet/src/ssw-datum.h"
+#include <ssw-datum.h>
 
 #include <gobject/genums.h>
 
diff --git a/src/ui/gui/psppire-var-sheet-header.c b/src/ui/gui/psppire-var-sheet-header.c
index e7770dedb5..e26fa95794 100644
--- a/src/ui/gui/psppire-var-sheet-header.c
+++ b/src/ui/gui/psppire-var-sheet-header.c
@@ -21,8 +21,8 @@
 
 #include "psppire-var-sheet-header.h"
 
-#include "efficient-sheet/src/ssw-axis-model.h"
-#include "efficient-sheet/src/ssw-datum.h"
+#include <ssw-axis-model.h>
+#include <ssw-datum.h>
 
 enum  {CHANGED,
        n_SIGNALS};
diff --git a/src/ui/gui/psppire-variable-sheet.h b/src/ui/gui/psppire-variable-sheet.h
index 7d4a901cee..b77da939d0 100644
--- a/src/ui/gui/psppire-variable-sheet.h
+++ b/src/ui/gui/psppire-variable-sheet.h
@@ -19,7 +19,7 @@
 #define _PSPPIRE_VARIABLE_SHEET_H
 
 #include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
 
 
 struct _PsppireVariableSheet