From eece8f14d92f71fc12ab87c529fffc5fcc5a4e94 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Wed, 2 Sep 2009 12:39:05 +0200 Subject: Add graph data chooser window, based on glade * configure.ac: Test for libglademm * grapher/GraphWidget.hxx (DataModelColumns): new class (onDataDialogCancel, void onDataAdd, onDataRemove, onDataDialogOpen): new methods * grapher/GraphWidget.cxx: ditto; methods for the graph data dialog. * grapher/graph-dialog.glade: New file. * grapher/graph-dialog.gladep: New file. * grapher/Makefile.am (dist_pkgdata_DATA): add graph-dialog.glade to installation. * grapher/GraphWidget.cxx (GraphWidget constructor): Use PKGDATADIR --- configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'configure') diff --git a/configure b/configure index a0bd0e23..a17a3cb1 100755 --- a/configure +++ b/configure @@ -7444,12 +7444,12 @@ if test -n "$gtkmm_CFLAGS"; then pkg_cv_gtkmm_CFLAGS="$gtkmm_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.8.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.8.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglademm-2.4 >= 2.6.7\"") >&5 + ($PKG_CONFIG --exists --print-errors "libglademm-2.4 >= 2.6.7") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_gtkmm_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4 >= 2.8.0" 2>/dev/null` + pkg_cv_gtkmm_CFLAGS=`$PKG_CONFIG --cflags "libglademm-2.4 >= 2.6.7" 2>/dev/null` else pkg_failed=yes fi @@ -7460,12 +7460,12 @@ if test -n "$gtkmm_LIBS"; then pkg_cv_gtkmm_LIBS="$gtkmm_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.8.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.8.0") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglademm-2.4 >= 2.6.7\"") >&5 + ($PKG_CONFIG --exists --print-errors "libglademm-2.4 >= 2.6.7") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_gtkmm_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4 >= 2.8.0" 2>/dev/null` + pkg_cv_gtkmm_LIBS=`$PKG_CONFIG --libs "libglademm-2.4 >= 2.6.7" 2>/dev/null` else pkg_failed=yes fi @@ -7483,9 +7483,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkmm-2.4 >= 2.8.0" 2>&1` + gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libglademm-2.4 >= 2.6.7" 2>&1` else - gtkmm_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkmm-2.4 >= 2.8.0" 2>&1` + gtkmm_PKG_ERRORS=`$PKG_CONFIG --print-errors "libglademm-2.4 >= 2.6.7" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$gtkmm_PKG_ERRORS" >&5 -- cgit