libepc r200 - trunk

[hasselmm svn gnome org]

Author: hasselmm
Date: Fri Jan 18 18:01:53 2008
New Revision: 200
URL: http://svn.gnome.org/viewvc/libepc?rev=200&view=rev

Log:
Announce proper libsoup API in libepc-1.0.pc (#509699).

* configure.ac: Export LIBSOUP_API variable.
* libepc-1.0.pc.in: Use LIBSOUP_API variable.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/libepc-1.0.pc.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jan 18 18:01:53 2008
@@ -44,15 +44,15 @@
 PKG_CHECK_MODULES(LIBEPC_UI, [gtk+-2.0     >= 2.10])
 
 PKG_CHECK_MODULES(LIBSOUP,   [libsoup-2.4  >= 2.3],
-                             [libsoup_api=2.4],[
+                             [LIBSOUP_API=2.4],[
 PKG_CHECK_MODULES(LIBSOUP,   [libsoup-2.2  >= 2.2],
-                             [libsoup_api=2.2])])
+                             [LIBSOUP_API=2.2])])
 
 PKG_CHECK_MODULES(GIO,       [gio-2.0      >= 2.15.1],
                              [have_gio=yes],
                              [have_gio=no])
 
-if test "2.2" == "$libsoup_api"
+if test "2.2" == "$LIBSOUP_API"
 then
   AC_DEFINE([HAVE_LIBSOUP22], [1], [Define to 1 if you still want to use libsoup 2.2.])
 fi
@@ -85,9 +85,11 @@
 AC_SUBST(GLIB_GENMARSHAL)
 AC_SUBST(GLIB_MKENUMS)
 
+AC_SUBST(LIBSOUP_API)
+
 AC_OUTPUT
 
 AC_MSG_NOTICE([============================================])
-AC_MSG_NOTICE([  libsoup API ........................ $libsoup_api])
+AC_MSG_NOTICE([  libsoup API ........................ $LIBSOUP_API])
 AC_MSG_NOTICE([  gio support ........................ $have_gio])
 AC_MSG_NOTICE([============================================])

Modified: trunk/libepc-1.0.pc.in
==============================================================================
--- trunk/libepc-1.0.pc.in	(original)
+++ trunk/libepc-1.0.pc.in	Fri Jan 18 18:01:53 2008
@@ -6,7 +6,7 @@
 Name: Easy Publish and Consume Library
 Description: a library to easily publish and consume values on networks
 Version: @VERSION@
-Requires: avahi-client avahi-glib libsoup-2.2
+Requires: avahi-client avahi-glib libsoup- LIBSOUP_API@
 Cflags: -I${includedir}/libepc-1.0
 Libs: -L${libdir} -lepc-1.0