Updated autotools for ChangeLog auto generation.

Removed some comments.
Updated configure.ac to stop execution if gdal isn't found.

diff --git a/.gitignore b/.gitignore
index c92b0fcb033363811050c3a251e5c056915d9c0a..517b2c6b68c0d98f2a63d4c56d9d0aa9eae26b7a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 Makefile
 Makefile.in
 
+ChangeLog
+*.gz
+
 .anjuta
 .tm_project2.cache
 aclocal.m4

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Makefile.am b/Makefile.am
index ca8c7f0ebcfae4f8c489965b0e7b4e4192001699..13c841aee570246ceafc80efe7e80d30bd3c3ba4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,24 @@ EXTRA_DIST = autogen.sh libgtkgis.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtkgis.pc
+
+distclean-local:
+       if test "$(srcdir)" = "."; then :; else \
+               rm -f ChangeLog; \
+       fi
+
+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 \
+         && mv -f $@.tmp $@ \
+         || ($(RM) $@.tmp; \
+             echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+             (test -f $@ || echo git-log is required to generate this file >> $@)); \
+       else \
+         test -f $@ || \
+         (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+         echo A git checkout and git-log is required to generate this file >> $@); \
+       fi
+
+.PHONY: ChangeLog

diff --git a/config.h.in b/config.h.in
index ad1549fee6e9e7c83635ebc9b9f93e6c0ea13d60..572cca1f696ec698f2e22ca5527a64bd5735aabc 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -64,6 +64,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

diff --git a/configure.ac b/configure.ac
index 0140d9d189274c69086e0548c7d31639b20a6a8f..7eea2cabb9deebbdccda5eaa7145e3d6585a9327 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.61)
 AC_INIT([libgtkgis], [0.0.2], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/gtkgis.c])
 AC_CONFIG_HEADER([config.h])
@@ -25,7 +25,11 @@ AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 GTK_DOC_CHECK
 
-AC_PATH_PROG(GDAL_CONFIG, "gdal-config", "", $PATH)
+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])
+fi
 
 # Checks for libraries.
 PKG_CHECK_MODULES([GTKGIS], [gtk+-2.0 >= 2.10.0

diff --git a/docs/reference/libgtkgis-decl.txt b/docs/reference/libgtkgis-decl.txt
index 220354bc35852b2e5931c4251de4a1593fe16481..d6e6f66bf704230e49a1698478f70bd259a7a2fa 100644 (file)
--- a/docs/reference/libgtkgis-decl.txt
+++ b/docs/reference/libgtkgis-decl.txt
@@ -928,5 +928,5 @@ void
 <FUNCTION>
 <NAME>gtk_gis_geometry_raster_new_from_pixbuf</NAME>
 <RETURNS>GtkGisGeometry *</RETURNS>
-GdkPixbuf *pixbuf, gdouble x, gdouble y, gdouble pixsize_x, gdouble pixsize_y
+GdkPixbuf *pixbuf,gdouble x,gdouble y,gdouble width,gdouble height
 </FUNCTION>

diff --git a/docs/reference/libgtkgis-undocumented.txt b/docs/reference/libgtkgis-undocumented.txt
index e0b7ac71eb5e2c74c5c0f04d037d30da63648cdf..cdf5a9303865478f72a089f014467a380b33c298 100644 (file)
--- a/docs/reference/libgtkgis-undocumented.txt
+++ b/docs/reference/libgtkgis-undocumented.txt
@@ -107,7 +107,7 @@ gtk_gis_geometry_polygon_add_line_from_list
 gtk_gis_geometry_polygon_get_type
 gtk_gis_geometry_polygon_remove_line
 gtk_gis_geometry_raster_get_type
-gtk_gis_geometry_raster_new_from_pixbuf (x, y, x, y, pixsize_x, pixsize_y)
+gtk_gis_geometry_raster_new_from_pixbuf (x, y, width, height, x, y, width, height)
 gtk_gis_geometry_set_editable
 gtk_gis_get_layer_by_name
 gtk_gis_get_legend

diff --git a/docs/reference/tmpl/geometryraster.sgml b/docs/reference/tmpl/geometryraster.sgml
index 033791aca4b8240c3bc0db68a5e8c638b26d1653..f508c33d4068c62d82cdc1044564a0431ed7f2eb 100644 (file)
--- a/docs/reference/tmpl/geometryraster.sgml
+++ b/docs/reference/tmpl/geometryraster.sgml
@@ -86,8 +86,8 @@ GtkGisGeometryRaster
 @pixbuf: 
 @x: 
 @y: 
-@pixsize_x: 
-@pixsize_y: 
+@width: 
+@height: 
 @Returns: 
 
 

diff --git a/libgtkgis.pc.in b/libgtkgis.pc.in
index 76457fb27e46bc320c7bbdb56500574d8e2d92d3..6e9e2847134bff6043560457ef2570953f84d760 100644 (file)
--- a/libgtkgis.pc.in
+++ b/libgtkgis.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: A Gtk+ widget to embed base GIS functionalities into applications.
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0 goocanvas libxml-2.0
+Requires: gtk+-2.0 libxml-2.0 goocanvas
 Libs: -L${libdir} @GDAL_LIBS@ -lgtkgis
 Cflags: @GDAL_CFLAGS@ -I${includedir}/gtkgis

diff --git a/src/gtkgis.c b/src/gtkgis.c
index 742a3473e93346d83964499100a2608edf76639d..c27503516791e1c3a91622c72c96187fd6600e2c 100644 (file)
--- a/src/gtkgis.c
+++ b/src/gtkgis.c
@@ -433,8 +433,8 @@ gtk_gis_add_layer (GtkGis *gtkgis, GtkGisLayer *layer)
                                                        priv->extent->max_y = extent->max_y;
                                                }
                                }
-g_fprintf(stderr,"geometry extent %f %f %f %f\n",extent->min_x,extent->min_y,extent->max_x,extent->max_y);
-g_fprintf(stderr,"max extent %f %f %f %f\n",priv->extent->min_x,priv->extent->min_y,priv->extent->max_x,priv->extent->max_y);
+/*g_fprintf(stderr,"geometry extent %f %f %f %f\n",extent->min_x,extent->min_y,extent->max_x,extent->max_y);
+g_fprintf(stderr,"max extent %f %f %f %f\n",priv->extent->min_x,priv->extent->min_y,priv->extent->max_x,priv->extent->max_y);*/
                        goo_canvas_set_bounds (GOO_CANVAS (priv->canvas),
                                                           priv->extent->min_x,
                                                           priv->extent->min_y,