From a460b41527a09a681bc0ca4e161aec2cc1efab3d Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Thu, 6 Aug 2009 10:28:10 +0000
Subject: [PATCH] better support for external plugins

---
 Makefile.am          |  5 ++---
 configure.ac         |  1 +
 src/aweather-gui.c   |  2 ++
 src/gis/Makefile.am  |  3 +++
 src/gis/gis-opengl.h |  1 -
 src/gis/gis.h        |  1 -
 src/gis/libgis.pc.in | 11 +++++++++++
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/gis/libgis.pc.in

diff --git a/Makefile.am b/Makefile.am
index 1698362..d937d76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
 SUBDIRS = src data docs
 
+ACLOCAL_AMFLAGS=-I m4
+
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.h.in config.sub \
 		       configure depcomp gtk-doc.make install-sh ltmain.sh \
 		       Makefile.in missing
 
-
-ACLOCAL_AMFLAGS=-I m4
-
 test: all
 	(cd src && make test)
 
diff --git a/configure.ac b/configure.ac
index 0d2d33d..4e8929e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	src/gis/Makefile
+	src/gis/libgis.pc
 	src/plugins/Makefile
 	data/Makefile
 	docs/Makefile
diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index be6ed5b..93d9e94 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -536,6 +536,7 @@ void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
 	GtkWidget *body   = gis_plugin_get_config(plugin);
 	gtk_notebook_append_page(GTK_NOTEBOOK(config), body, tab);
 	gtk_widget_show_all(config);
+	gis_opengl_redraw(self->opengl);
 }
 void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
 {
@@ -552,4 +553,5 @@ void aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name)
 			gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
 	}
 	gis_plugins_unload(self->plugins, name);
+	gis_opengl_redraw(self->opengl);
 }
diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 786be00..5dc04a5 100644
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -22,6 +22,9 @@ libgis_la_SOURCES = \
 libgis_la_CPPFLAGS = -DPLUGINDIR="\"$(libdir)/gis\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
 libgis_la_LIBADD = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgis.pc
+
 MAINTAINERCLEANFILES = Makefile.in
 
 .list.c:
diff --git a/src/gis/gis-opengl.h b/src/gis/gis-opengl.h
index e814969..ee753a7 100644
--- a/src/gis/gis-opengl.h
+++ b/src/gis/gis-opengl.h
@@ -18,7 +18,6 @@
 #ifndef __GIS_OPENGL_H__
 #define __GIS_OPENGL_H__
 
-#include <config.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 #include <glib-object.h>
diff --git a/src/gis/gis.h b/src/gis/gis.h
index be6cbc3..772c239 100644
--- a/src/gis/gis.h
+++ b/src/gis/gis.h
@@ -26,7 +26,6 @@
 
 /* GIS helprs */
 #include "gis-data.h"
-#include "gis-marshal.h"
 
 /* Plugins */
 #include "gis-plugin.h"
diff --git a/src/gis/libgis.pc.in b/src/gis/libgis.pc.in
new file mode 100644
index 0000000..859289e
--- /dev/null
+++ b/src/gis/libgis.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libgis
+Description: GIS Library for Gtk+ applications
+Version: @VERSION@
+Requires: gmodule-2.0 gtk+-2.0 gtkglext-1.0 libsoup-2.4
+Libs: -L${libdir} -lgis
+Cflags: -I${includedir}/gis
-- 
2.43.2