Remove references to libglade from config and documentation

diff --git a/INSTALL b/INSTALL
index 9254a0d36f707dc313f7fe2dc9c9ebfc2abc1213..d3a469cf6ee124c7c583abc233e10abfa3081035 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -50,9 +50,6 @@ use the GUI, you must run `configure' with --without-gui.
 
     * GTK+ (http://www.gtk.org/), version 2.12.0 or later.
 
-    * libglade (http://www.jamesh.id.au/software/libglade/), version
-      2.6 or later.
-
 Installing the following packages will allow your PSPP binary to read
 Gnumeric files.
 

diff --git a/configure.ac b/configure.ac
index fc4b9828e9a4d2fa286eb5db9a8f4d77836d7b07..7e7a4c6077c23585c036847fc7535dd728a807db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,6 @@ required_gtk_version=2.12
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
-  PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0,,
-    [PSPP_REQUIRED_PREREQ([libglade 2.0 v2.6.0 or later (or use --without-gui)])])
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 92acbd69409776f1cb2e092d0e7892ad5dcc162f..5e4bceb2500aa9c16a8676dcdbe5f3177a9074be 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,7 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
        -DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
 
 
@@ -27,7 +27,6 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(GLADE_LIBS) \
        @LIBINTL@ \
        $(LIB_CLOSE)
 
@@ -74,7 +73,6 @@ nodist_src_ui_gui_psppire_DATA = \
        $(top_builddir)/src/ui/gui/t-test.ui
 
 dist_src_ui_gui_psppire_DATA = \
-       $(top_srcdir)/src/ui/gui/text-data-import.glade \
        $(top_srcdir)/src/ui/gui/pspplogo.png \
        $(top_srcdir)/src/ui/gui/icons/value-labels.png \
        $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@ -219,6 +217,7 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/recode.glade \
        src/ui/gui/regression.glade \
        src/ui/gui/syntax-editor.glade \
+       src/ui/gui/text-data-import.glade \
        src/ui/gui/t-test.glade