Commit 79148bc0 authored by Kai Vehmanen's avatar Kai Vehmanen

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

darcs-hash:20060601211236-7659e-bfa835c6889ae949a0eda18279c04ad689106abf.gz
parent c011e6f7
...@@ -28,6 +28,10 @@ Contributors to this release ...@@ -28,6 +28,10 @@ Contributors to this release
- name of the contributor should be enough - 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 Notes on new features
--------------------- ---------------------
......
...@@ -327,11 +327,10 @@ fi # GLib path is explicitly defined ...@@ -327,11 +327,10 @@ fi # GLib path is explicitly defined
if test "x$HAVE_GLIB" = xyes ; then if test "x$HAVE_GLIB" = xyes ; then
SAC_COMMA_APPEND([SOFIA_PKG_REQUIRES],[glib-2.0]) SAC_COMMA_APPEND([SOFIA_GLIB_PKG_REQUIRES],[glib-2.0])
SOFIA_PKG_LIBS=-lsofia-sip-ua-glib
fi fi
if test "x$HAVE_GLIB" = xyes ; then 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 fi
AM_CONDITIONAL([HAVE_GLIB], [test "x$HAVE_GLIB" = xyes]) AM_CONDITIONAL([HAVE_GLIB], [test "x$HAVE_GLIB" = xyes])
...@@ -342,8 +341,7 @@ AC_SUBST([GLIB_VERSION]) ...@@ -342,8 +341,7 @@ AC_SUBST([GLIB_VERSION])
AC_SUBST([GOBJECT_LIBS]) AC_SUBST([GOBJECT_LIBS])
AC_SUBST([GOBJECT_CFLAGS]) AC_SUBST([GOBJECT_CFLAGS])
AC_SUBST([GOBJECT_VERSION]) AC_SUBST([GOBJECT_VERSION])
AC_SUBST([SOFIA_PKG_REQUIRES]) AC_SUBST([SOFIA_GLIB_PKG_REQUIRES])
AC_SUBST([SOFIA_PKG_LIBS])
# =========================================================================== # ===========================================================================
# Checks for library functions. # Checks for library functions.
......
...@@ -8,6 +8,6 @@ include_sofiadir=@include_sofiadir@ ...@@ -8,6 +8,6 @@ include_sofiadir=@include_sofiadir@
Name: sofia-sip-ua-glib Name: sofia-sip-ua-glib
Description: Sofia-SIP library bindings for glib/gobject Description: Sofia-SIP library bindings for glib/gobject
Version: @VERSION@ Version: @VERSION@
Requires: @SOFIA_PKG_REQUIRES@ Requires: @SOFIA_GLIB_PKG_REQUIRES@
Libs: -L${libdir} -lsofia-sip-ua -lsofia-sip-ua-glib Libs: -L${libdir} -lsofia-sip-ua -lsofia-sip-ua-glib
Cflags: -I@include_sofiadir@ Cflags: -I@include_sofiadir@
...@@ -8,7 +8,6 @@ include_sofiadir=@include_sofiadir@ ...@@ -8,7 +8,6 @@ include_sofiadir=@include_sofiadir@
Name: sofia-sip-ua Name: sofia-sip-ua
Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library
Version: @VERSION@ Version: @VERSION@
Requires: @SOFIA_PKG_REQUIRES@ Libs: -L${libdir} -lsofia-sip-ua
Libs: -L${libdir} -lsofia-sip-ua @SOFIA_PKG_LIBS@
Cflags: -I@include_sofiadir@ Cflags: -I@include_sofiadir@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment