From 84e244091ac543a36f27a6e461074d61770d936f Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Wed, 29 Jul 2009 11:11:56 +0200
Subject: [PATCH] Updated autotools for ChangeLog auto generation. Removed some
comments. Updated configure.ac to stop execution if gdal isn't found.
---
.gitignore | 3 +++
ChangeLog | 0
Makefile.am | 21 +++++++++++++++++++++
config.h.in | 3 +++
configure.ac | 8 ++++++--
docs/reference/libgtkgis-decl.txt | 2 +-
docs/reference/libgtkgis-undocumented.txt | 2 +-
docs/reference/tmpl/geometryraster.sgml | 4 ++--
libgtkgis.pc.in | 2 +-
src/gtkgis.c | 4 ++--
10 files changed, 40 insertions(+), 9 deletions(-)
delete mode 100644 ChangeLog
diff --git a/.gitignore b/.gitignore
index c92b0fc..517b2c6 100644
--- 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
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index ca8c7f0..13c841a 100644
--- 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 ad1549f..572cca1 100644
--- 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 0140d9d..7eea2ca 100644
--- 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 220354b..d6e6f66 100644
--- 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 e0b7ac7..cdf5a93 100644
--- 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 033791a..f508c33 100644
--- 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 76457fb..6e9e284 100644
--- 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 742a347..c275035 100644
--- 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,
--
2.49.0