Remove all glib dependencies from libsofia-sip-ua. Clsoes sf.net bug #1446635.

darcs-hash:20060601211236-7659e-bfa835c6889ae949a0eda18279c04ad689106abf.gz

RELEASE

@@ -28,6 +28,10 @@ Contributors to this release
  - name of the contributor should be enough
 /> 
 
+[libsofia-sip-ua-glib]
+- Applications must now separately check for libsofia-sip-ua-glib
+  with pkg-config. The pkg-config dependency 'libsofia-sip-ua ->
+  libsofia-sip-ua-glib' has been removed. See sf.net bug #1446635.
 
 Notes on new features
 ---------------------

m4/sac-su2.m4

@@ -327,11 +327,10 @@ fi # GLib path is explicitly defined
 
 
 if test "x$HAVE_GLIB" = xyes ; then
-  SAC_COMMA_APPEND([SOFIA_PKG_REQUIRES],[glib-2.0])
-  SOFIA_PKG_LIBS=-lsofia-sip-ua-glib
+  SAC_COMMA_APPEND([SOFIA_GLIB_PKG_REQUIRES],[glib-2.0])
 fi
 if test "x$HAVE_GLIB" = xyes ; then
-  SAC_COMMA_APPEND([SOFIA_PKG_REQUIRES],[gobject-2.0 >= 2.4])
+  SAC_COMMA_APPEND([SOFIA_GLIB_PKG_REQUIRES],[gobject-2.0 >= 2.4])
 fi
 
 AM_CONDITIONAL([HAVE_GLIB], [test "x$HAVE_GLIB" = xyes])
@@ -342,8 +341,7 @@ AC_SUBST([GLIB_VERSION])
 AC_SUBST([GOBJECT_LIBS])
 AC_SUBST([GOBJECT_CFLAGS])
 AC_SUBST([GOBJECT_VERSION])
-AC_SUBST([SOFIA_PKG_REQUIRES])
-AC_SUBST([SOFIA_PKG_LIBS])
+AC_SUBST([SOFIA_GLIB_PKG_REQUIRES])
 
 # ===========================================================================
 # Checks for library functions.

packages/sofia-sip-ua-glib.pc.in

@@ -8,6 +8,6 @@ include_sofiadir=@include_sofiadir@
 Name: sofia-sip-ua-glib
 Description: Sofia-SIP library bindings for glib/gobject
 Version: @VERSION@
-Requires: @SOFIA_PKG_REQUIRES@
+Requires: @SOFIA_GLIB_PKG_REQUIRES@
 Libs: -L${libdir} -lsofia-sip-ua -lsofia-sip-ua-glib
 Cflags: -I@include_sofiadir@

packages/sofia-sip-ua.pc.in

@@ -8,7 +8,6 @@ include_sofiadir=@include_sofiadir@
 Name: sofia-sip-ua
 Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library
 Version: @VERSION@
-Requires: @SOFIA_PKG_REQUIRES@
-Libs: -L${libdir} -lsofia-sip-ua @SOFIA_PKG_LIBS@
+Libs: -L${libdir} -lsofia-sip-ua
 Cflags: -I@include_sofiadir@