[gmime] Use Libs.private for extra libs

[Jeffrey Stedfast <fejj src gnome org>]

commit 2cdc3e2287c987f4241b982a7681a5ba5ee590ec
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Mon Nov 30 10:33:16 2009 -0500

    Use Libs.private for extra libs
    
    2009-11-30  Jeffrey Stedfast  <fejj novell com>
    
    	* configure.ac: Don't include EXTRA_LIBS in GMIME_LIBS, instead
    	add it to GMIME_LIBS_PRIVATE so that things properly expand in
    the
    	.pc file.
    
    	* gmime.pc.in: Moved -lz -lnsl, etc into Libs.private. Fixes bug
    	#603273.

 ChangeLog    |    9 +++++++++
 configure.ac |    8 +++++---
 gmime.pc.in  |    1 +
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c53bd6d..4ffdc91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-30  Jeffrey Stedfast  <fejj novell com>
+
+	* configure.ac: Don't include EXTRA_LIBS in GMIME_LIBS, instead
+	add it to GMIME_LIBS_PRIVATE so that things properly expand in the
+	.pc file.
+
+	* gmime.pc.in: Moved -lz -lnsl, etc into Libs.private. Fixes bug
+	#603273.
+
 2009-11-05  Jeffrey Stedfast  <fejj novell com>
 
 	* gmime/gmime-multipart.c (ptr_array_insert): Fixed to handle an
diff --git a/configure.ac b/configure.ac
index e2dcb73..ac6926f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,13 +569,15 @@ AC_SUBST(LIBS)
 
 GMIME_CFLAGS="$LFS_CFLAGS $GPGME_PTHREAD_CFLAGS"
 GMIME_LIBDIR="-L${libdir}"
-GMIME_INCLUDEDIR="-I${includedir}/gmime-2.6"
-GMIME_LIBS="-lgmime-2.6 $EXTRA_LIBS"
+GMIME_INCLUDEDIR="-I${includedir}/gmime-$GMIME_API_VERSION"
+GMIME_LIBS_PRIVATE="$EXTRA_LIBS"
+GMIME_LIBS="-lgmime-$GMIME_API_VERSION"
 
-AC_SUBST(GMIME_LIBS)
 AC_SUBST(GMIME_LIBDIR)
 AC_SUBST(GMIME_INCLUDEDIR)
+AC_SUBST(GMIME_LIBS_PRIVATE)
 AC_SUBST(GMIME_CFLAGS)
+AC_SUBST(GMIME_LIBS)
 
 
 AC_OUTPUT(
diff --git a/gmime.pc.in b/gmime.pc.in
index 4510385..de5b52f 100644
--- a/gmime.pc.in
+++ b/gmime.pc.in
@@ -9,4 +9,5 @@ Version: @VERSION@
 Description: MIME parser and utility library
 Requires: glib-2.0,gio-2.0,gobject-2.0
 Libs: -L${libdir} @GMIME_LIBS@
+Libs.private: @GMIME_LIBS_PRIVATE@
 Cflags: -I${includedir}/gmime- GMIME_API_VERSION@ @GMIME_CFLAGS@