From: Jim Evins Date: Sun, 20 Jul 2008 03:16:56 +0000 (+0000) Subject: 2008-07-19 Jim Evins X-Git-Tag: glabels-2_3_0~260 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d842a8e3b41ef987d9f402f80a5ea19f2cc8528f;p=glabels 2008-07-19 Jim Evins * 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 d4966ff4..80cf5a01 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,10 @@ +2008-07-19 Jim Evins + + * configure.in: + * src/mygal/Makefile.am: + Make sure libtool handles library dependencies for mygal + properly. + 2008-05-21 Jim Evins * src/glabels-batch.c: (main): diff --git a/glabels2/configure.in b/glabels2/configure.in index d4f9e34e..dbd1468a 100644 --- 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 c4f29d46..054cbe7a 100644 --- 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 = \