[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp INSTALL configure.ac src/ui/gui/dict-displ...
From: |
John Darrington |
Subject: |
[Pspp-cvs] pspp INSTALL configure.ac src/ui/gui/dict-displ... |
Date: |
Thu, 29 May 2008 00:43:02 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/05/29 00:43:02
Modified files:
. : INSTALL configure.ac
src/ui/gui : dict-display.c text-data-import-dialog.c
Log message:
Added a --enable-anachronistic-dependencies flag to configure, which
allows psppire to be built against older versions of GTK and other libraries.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/INSTALL?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/text-data-import-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6
Patches:
Index: INSTALL
===================================================================
RCS file: /sources/pspp/pspp/INSTALL,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- INSTALL 9 May 2008 06:35:33 -0000 1.22
+++ INSTALL 29 May 2008 00:43:01 -0000 1.23
@@ -209,6 +209,14 @@
In these cases you can use --without-lib{xx} to force configure
to disregard it.
+`--enable-anachronistic-dependencies'
+ If you use this option, some of the checks for dependent libraries
+ will be relaxed, permitting configure to succeed when older versions
+ of libraries are detected. Use of this option is not recommended.
+ If you use it, some features may be missing and the build may fail
+ with obscure error messages.
+
+
Defining Variables
==================
Index: configure.ac
===================================================================
RCS file: /sources/pspp/pspp/configure.ac,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- configure.ac 20 May 2008 14:01:09 -0000 1.85
+++ configure.ac 29 May 2008 00:43:01 -0000 1.86
@@ -16,6 +16,11 @@
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+AC_ARG_ENABLE(
+ anachronistic-dependencies,
+ [AS_HELP_STRING([--enable-anachronistic-dependencies],
+ [Attempt to allow building against older versions of
dependent libraries])])
+
PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
@@ -39,9 +44,14 @@
gui,
[AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
+required_gtk_version=2.12
+if test x"$enable_anachronistic_dependencies" = x"yes" ; then
+ required_gtk_version=2.8.20
+fi
+
if test x"$with_gui" != x"no" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12.0,,
- [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.0 or later (or use --without-gui)])])
+ 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
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/ui/gui/dict-display.c 14 Mar 2008 10:42:55 -0000 1.7
+++ src/ui/gui/dict-display.c 29 May 2008 00:43:02 -0000 1.8
@@ -154,6 +154,7 @@
}
+#if GTK_CHECK_VERSION (2, 12, 0)
/* Sets the tooltip to be the name of the variable under the cursor */
static gboolean
set_tooltip_for_variable (GtkTreeView *treeview,
@@ -171,6 +172,7 @@
struct variable *var = NULL;
gboolean ok;
+
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
@@ -199,6 +201,7 @@
return TRUE;
}
+#endif
/* Sets up TREEVIEW to display the variables of DICT.
MODE is the selection mode for TREEVIEW.
@@ -269,7 +272,9 @@
g_object_set (treeview, "has-tooltip", TRUE, NULL);
+#if GTK_CHECK_VERSION (2, 12, 0)
g_signal_connect (treeview, "query-tooltip", G_CALLBACK
(set_tooltip_for_variable), NULL);
+#endif
}
Index: src/ui/gui/text-data-import-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/text-data-import-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/text-data-import-dialog.c 8 May 2008 23:58:56 -0000
1.5
+++ src/ui/gui/text-data-import-dialog.c 29 May 2008 00:43:02 -0000
1.6
@@ -16,11 +16,15 @@
#include <config.h>
+#include <gtk/gtk.h>
+
+
+
#include "checkbox-treeview.h"
#include "descriptives-dialog.h"
#include <errno.h>
-#include <gtk/gtk.h>
+
#include <gtksheet/gtksheet.h>
#include <limits.h>
#include <stdlib.h>
@@ -50,6 +54,30 @@
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
+
+#if !GTK_CHECK_VERSION (2, 10, 0)
+
+void
+text_data_import_assistant (GObject *o, gpointer de_)
+{
+ struct data_editor *de = de_;
+
+ GtkWidget *dialog =
+ gtk_message_dialog_new (de->parent.window,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ _("The text import assistant has not been "
+ "compiled into this build of PSPPIRE, because "
+ "GTK+ version 2.10.0 or later was not
available."));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+}
+
+#else
+
/* TextImportModel, a GtkTreeModel used by the text data import
dialog. */
enum
@@ -2282,3 +2310,5 @@
gdk_window_set_cursor (widget->window, NULL);
}
}
+
+#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp INSTALL configure.ac src/ui/gui/dict-displ...,
John Darrington <=