pidgin.next.minor: d5e93b05: Add pidgin-2 and purple-2 .pc variants

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: d5e93b05ae1a8f5296a0a9b069c630630285d3c3
Ancestor: 797d85e6f45b1cef1d58416082a44958de025e97
Author: resiak at pidgin.im
Date: 2009-12-20T18:03:58
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/d5e93b05ae1a8f5296a0a9b069c630630285d3c3

Added files:
        libpurple/purple-2-uninstalled.pc.in
        libpurple/purple-2.pc.in pidgin/pidgin-2-uninstalled.pc.in
        pidgin/pidgin-2.pc.in
Modified files:
        configure.ac libpurple/media/codec.h

ChangeLog: 

Add pidgin-2 and purple-2 .pc variants

Instead of adding ${includedir}/libpurple to the include path, purple-2 adds
${includedir}. This allows projects to #include <libpurple/debug.h> rather than
#include <debug.h>, which prevents libpurple's headers colliding with the
project's own, and is more conventional.

media/codec.h needed tweaking to compile.

-------------- next part --------------
============================================================
--- libpurple/purple-2-uninstalled.pc.in	37bc735ddbf90c48cbe318d1e3aefbfa3f4dbd08
+++ libpurple/purple-2-uninstalled.pc.in	37bc735ddbf90c48cbe318d1e3aefbfa3f4dbd08
@@ -0,0 +1,22 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
+Libs: ${abs_builddir}/libpurple.la
============================================================
--- libpurple/purple-2.pc.in	85bccb8ee08949360496ac8997878b50c8433fd1
+++ libpurple/purple-2.pc.in	85bccb8ee08949360496ac8997878b50c8433fd1
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpurple
============================================================
--- pidgin/pidgin-2-uninstalled.pc.in	1264471406c31c23aab2228fa7b572fd1413688a
+++ pidgin/pidgin-2-uninstalled.pc.in	1264471406c31c23aab2228fa7b572fd1413688a
@@ -0,0 +1,21 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${abs_top_srcdir}
============================================================
--- pidgin/pidgin-2.pc.in	a1bb4908d26cbff714292975092914a251260527
+++ pidgin/pidgin-2.pc.in	a1bb4908d26cbff714292975092914a251260527
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${includedir}
============================================================
--- configure.ac	c2ffb9654421564848e066cce2c0c09b00da155f
+++ configure.ac	f87fcf926f779e26d4bc2423dbfd9e972c538ecf
@@ -2502,6 +2502,8 @@ AC_OUTPUT([Makefile
 		   pidgin/Makefile
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
+		   pidgin/pidgin-2.pc
+		   pidgin/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2519,6 +2521,8 @@ AC_OUTPUT([Makefile
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
 		   libpurple/purple-uninstalled.pc
+		   libpurple/purple-2.pc
+		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
============================================================
--- libpurple/media/codec.h	7749597290ec9ea5db31d0b7c606a677f34c449d
+++ libpurple/media/codec.h	e0d1b6c8c4c999e4406e2a47882958d1c5911ed6
@@ -32,7 +32,7 @@ typedef struct _PurpleMediaCodec PurpleM
 /** An opaque structure representing an audio or video codec. */
 typedef struct _PurpleMediaCodec PurpleMediaCodec;
 
-#include "util.h"
+#include "../util.h"
 
 #include <glib-object.h>