Deal with formal release of upstream library

diff --git a/configure.ac b/configure.ac
index 1b501232275238a8afdaa8f4b6a315ecc203b520..1b663422e9fd75b108c1da57faa3ffcd5086255d 100644 (file)
--- 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 b756aabc99234e93586c95415bdbfd0adb1e5e8c..3b85412e5582aec11f516792c59dda37bfa264f0 100644 (file)
--- 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 (file)
index 0404276..0000000
--- 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 66ec49930a1878430b0729887dd968f5898e9f12..d3e921d3b722c26191f45f2c3615b36757986223 100644 (file)
--- 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 b2285aa2fc0b369d430203a328bad38bef0d2c22..49e7a1751c36a6c64b766bc11212c3bb1f4eb757 100644 (file)
--- 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 6cee5a77b366c23e6b06366d2bd6e90a7f6587bc..b46cddd1f259b01d9a99d68566fa27a1caae9561 100644 (file)
--- 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 fe064709e07b59e3c0b475c23071f3c560b320db..59b57b490c200df5a535a20c89b9ad85226db3e1 100644 (file)
--- 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 e7770dedb5a8912801ec41838150f0f327642e48..e26fa95794ec1e5fde74a72180584676d092627d 100644 (file)
--- 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 7d4a901cee56f04eb64fd48c6b508f1d927e178d..b77da939d007895fd71d255041f519e42d95ee21 100644 (file)
--- 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