2008-07-19 Jim Evins <evins@snaught.com>

	* configure.in:
	* src/mygal/Makefile.am:
		Make sure libtool handles library dependencies for mygal
		properly.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@774 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index d4966ff4162873261c95671183217160b07a1f19..80cf5a01de6cf617fa2e8153cba0c61de6e9dd71 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-19  Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * src/mygal/Makefile.am:
+               Make sure libtool handles library dependencies for mygal
+               properly.
+       
 2008-05-21  Jim Evins  <evins@snaught.com>
 
        * src/glabels-batch.c: (main):

diff --git a/glabels2/configure.in b/glabels2/configure.in
index d4f9e34e4fba012bf4acb096ca0e88da6fe81c63..dbd1468a87b8e604101b293bf8f22f189a39a8d4 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -115,6 +115,18 @@ AC_SUBST(LIBGLABELS_CFLAGS)
 AC_SUBST(LIBGLABELS_LIBS)
 
 
+dnl ---------------------------------------------------------------------------
+dnl - MYGAL prerequisites
+dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(MYGAL, \
+gtk+-2.0 >= $GTK_REQUIRED \
+libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
+)
+
+AC_SUBST(MYGAL_CFLAGS)
+AC_SUBST(MYGAL_LIBS)
+
+
 dnl ---------------------------------------------------------------------------
 dnl - Enable deprecation testing
 dnl ---------------------------------------------------------------------------

diff --git a/glabels2/src/mygal/Makefile.am b/glabels2/src/mygal/Makefile.am
index c4f29d46b88a16ca11904ebf8d022292b71a6fca..054cbe7a1593cddfb3f158d59b116518d7eeffdc 100644 (file)
--- a/glabels2/src/mygal/Makefile.am
+++ b/glabels2/src/mygal/Makefile.am
@@ -1,7 +1,10 @@
 INCLUDES = \
-       $(GLABELS_CFLAGS)
+       $(MYGAL_CFLAGS)
 
 
+libmygal_la_LDFLAGS=\
+        $(MYGAL_LIBS)
+
 noinst_LTLIBRARIES = libmygal.la
 
 libmygal_la_SOURCES =                  \