Some adjustments to autotools.

Added watch cursor when drawing.

diff --git a/Makefile.am b/Makefile.am
index 13c841aee570246ceafc80efe7e80d30bd3c3ba4..6525c927689f93bc1c6e74e67f1768ee2d557ed4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
-ACLOCAL_AMFLAGS=-I m4
+ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 SUBDIRS = src data docs tests
 
-EXTRA_DIST = autogen.sh libgtkgis.pc.in
+EXTRA_DIST = \
+             autogen.sh \
+             libgtkgis.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtkgis.pc
@@ -17,7 +19,7 @@ distclean-local:
 ChangeLog:
        @echo Creating $@
        @if test -d "$(srcdir)/.git"; then \
-         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GTKGIS_0_0_1.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
+         (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
          && mv -f $@.tmp $@ \
          || ($(RM) $@.tmp; \
              echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \

diff --git a/autogen.sh b/autogen.sh
index a4b22d677dc4900f8abfafbb69505408f5d906ba..1425ea0d5b773461d4a97f6261d25a901622dc37 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@ DIE=0
 
 have_libtool=false
 if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
-       libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+       libtool_version=`libtoolize --version | sed 's/^.*[  ]\([0-9.]*[a-z]*\).*$/\1/'`
        case $libtool_version in
            2.*)
                have_libtool=true

diff --git a/configure.ac b/configure.ac
index 7eea2cabb9deebbdccda5eaa7145e3d6585a9327..93c481a7e85681df8eacb829fc35f35791c4b7d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ GTK_DOC_CHECK
 AC_PATH_PROG(GDAL_CONFIG, "gdal-config", no)
 
 if test x"$GDAL_CONFIG" = xno; then
-  AC_MSG_ERROR([gdal-config executable not found in your path - make sure yo have gdal installed])
+  AC_MSG_ERROR([gdal-config executable not found in your path - make sure yo have gdal installed or set GDAL_CFLAGS and GDAL_LIBS on command line])
 fi
 
 # Checks for libraries.
@@ -42,8 +42,8 @@ AC_SUBST(GTKGIS_LIBS)
 GDAL_CFLAGS=`$GDAL_CONFIG --cflags`
 GDAL_LIBS=`$GDAL_CONFIG --libs`
 
-AC_SUBST(GDAL_CFLAGS)
-AC_SUBST(GDAL_LIBS)
+AC_ARG_VAR(GDAL_CFLAGS, [C compiler flags for Gdal - on Windows there isn't gdal-config so you are obliged to set it])
+AC_ARG_VAR(GDAL_LIBS, [linker flags for Gdal - on Windows there isn't gdal-config so you are obliged to set it])
 
 # Checks for header files.
 AC_FUNC_ALLOCA

diff --git a/src/gtkgis.c b/src/gtkgis.c
index c27503516791e1c3a91622c72c96187fd6600e2c..1708a127a793c4da12abf9f5f4200e475a405e07 100644 (file)
--- a/src/gtkgis.c
+++ b/src/gtkgis.c
@@ -505,6 +505,7 @@ void
 gtk_gis_draw (GtkGis *gtkgis)
 {
        GtkGisPrivate *priv;
+       GdkCursor *cursor;
        GSList *cur;
        GtkGisLayerSource *layer_source;
 
@@ -512,6 +513,12 @@ gtk_gis_draw (GtkGis *gtkgis)
 
        priv = GTK_GIS_GET_PRIVATE (gtkgis);
 
+       cursor = gdk_cursor_new (GDK_WATCH);
+       gdk_window_set_cursor (GTK_WIDGET (gtkgis)->window, cursor);
+
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        cur = priv->layers;
        while (cur != NULL)
                {
@@ -524,6 +531,8 @@ gtk_gis_draw (GtkGis *gtkgis)
                }
 
        gtk_gis_canvas_resize (gtkgis);
+
+       gdk_window_set_cursor (GTK_WIDGET (gtkgis)->window, NULL);
 }
 
 /**
@@ -560,6 +569,7 @@ void
 gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale)
 {
        GtkGisPrivate *priv;
+       GdkCursor *cursor;
 
        g_return_if_fail (scale != NULL);
 
@@ -569,12 +579,20 @@ gtk_gis_set_scale (GtkGis *gtkgis, GtkGisScale *scale)
        priv->scale->y = scale->y;
        priv->scale->xy = scale->xy;
 
+       cursor = gdk_cursor_new (GDK_WATCH);
+       gdk_window_set_cursor (GTK_WIDGET (gtkgis)->window, cursor);
+
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        g_object_set (priv->canvas,
                      "scale-x", priv->scale->x,
                      "scale-y", priv->scale->y,
                      NULL);
 
        gtk_gis_canvas_resize (gtkgis);
+
+       gdk_window_set_cursor (GTK_WIDGET (gtkgis)->window, NULL);
 }
 
 /**