Commit 05d16d32 authored by Pekka Pessi's avatar Pekka Pessi

Using package-specific install directory for public header files.

Default install directory for public header file has been changed
from '${prefix}/include/' to '${prefix}/include/sofia-sip-MAJOR.MINOR'.
The pkgconfig .pc file has been updated accordingly.

darcs-hash:20051117104028-65a35-4bfec0ce716e1f68038abdf3b93ade1c2546c50a.gz
parent b762b2f1
2005-11-15 Kai Vehmanen <kai.vehmanen@nokia.com>
* configure.ac: Added VER_LIBSOFIA_SIP_UA variables.
2005-11-14 Pekka Pessi <Pekka.Pessi@nokia.com>
tagged rel-sofia-sip-1_11_4
......
......@@ -5,8 +5,7 @@ Release notes for current version of Sofia-SIP
Changes since last release
--------------------------
The SDP offer/answer negotiation in soa module was extended to handle
selecting codecs as well.
TBD
API/ABI changes and versioning
------------------------------
......@@ -15,20 +14,18 @@ The libsofia-sip-ua library interface version (libtool) is set to zero.
Library version will not be frozen until the release of 1.12.0 stable
version.
- Added SOATAG_RTP_SELECT(), SOATAG_RTP_SORT() and SOATAG_RTP_MISMATCH().
- Deprecated NUTAG_MEDIA* tags were removed from libsofia-sip/nua/nua_tag.h.
- Added sdp_media_uses_rtp(), sdp_rtpmap_match(), sdp_rtpmap_find_matching()
and sdp_rtpmap_well_known[]
- Default install directory for public header file has been changed
from '${prefix}/include/' to '${prefix}/include/sofia-sip-MAJOR.MINOR'.
The pkgconfig .pc file has been updated accordingly.
Contributors to this release
----------------------------
See the AUTHORS file in the distribution package.
Bugs fixed in this release
--------------------------
- The SDP rtpmap timestamp rate for (old) G722 was changed to 8000
- Fixed socket shutdown() problem in tport
- Fixed problems win32 su_vsend()/su_vrecv()
- TBD
......@@ -6,9 +6,15 @@ AC_PREREQ(2.57)
dnl information on the package
dnl ---------------------------
dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
AC_INIT([sofia-sip], [1.11.4])
AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sip.h])
AC_SUBST(VER_LIBSOFIA_SIP_UA_MAJOR_MINOR, [1.11])
dnl Includedir specific to this sofia version
AC_SUBST(include_sofiadir, '${includedir}/sofia-sip-1.11')
AC_SUBST(VER_LIBSOFIA_SIP_UA_INTERFACE_CURRENT, [0])
AC_SUBST(VER_LIBSOFIA_SIP_UA_INTERFACE_AGE, [0])
# dnl calls AC_CANONICAL_ macros that are required by AM_INIT_AUTOMAKE
SAC_CANONICAL_SYSTEM_CACHE_CHECK
......
2005-11-15 Kai Vehmanen <kai.vehmanen@nokia.com>
* <SUBDIRS>/Makefile.am: Changed to use the 'include_sofia_HEADERS'
variable for listing public library headers. The variable
is defined in the top-level configure.ac.
2005-10-27 Pekka Pessi <Pekka.Pessi@nokia.com>
* Always including stun library.
......
......@@ -17,11 +17,11 @@ check_PROGRAMS = torture_bnf
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = bnf.h
include_sofia_HEADERS = bnf.h
libbnf_la_SOURCES = bnf.c
COVERAGE_INPUT = $(libbnf_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libbnf_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libbnf.la
......
......@@ -29,7 +29,7 @@ noinst_LTLIBRARIES = libfeatures.la
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = sofia_sip_features.h
include_sofia_HEADERS = sofia_sip_features.h
libfeatures_la_SOURCES = sofia_sip_features.c
......
......@@ -30,7 +30,7 @@ BUILT_C = http_tag.c http_tag_ref.c http_parser_table.c
BUILT_SOURCES = $(BUILT_H) $(BUILT_C)
include_HEADERS = $(BUILT_H) $(PUBLIC_H)
include_sofia_HEADERS = $(BUILT_H) $(PUBLIC_H)
libhttp_la_SOURCES = $(INTERNAL_H) \
http_parser.c http_header.c \
......@@ -38,7 +38,7 @@ libhttp_la_SOURCES = $(INTERNAL_H) \
http_status.c http_tag_class.c \
$(BUILT_C)
COVERAGE_INPUT = $(libhttp_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libhttp_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libhttp.la \
../bnf/libbnf.la \
......
......@@ -19,14 +19,14 @@ TESTS = sha1test torture_base64
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = rc4.h utf8.h sha1.h base64.h \
include_sofia_HEADERS = rc4.h utf8.h sha1.h base64.h \
string0.h token64.h uniqueid.h
libipt_la_SOURCES = utf8internal.h \
utf8.c ucs2.c ucs4.c rc4.c \
sha1.c base64.c string0.c token64.c
COVERAGE_INPUT = $(libipt_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libipt_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libipt.la \
../sresolv/libsresolv.la \
......
......@@ -28,7 +28,7 @@ TESTS = test_auth_digest
BUILT_SOURCES = auth_tag_ref.c
include_HEADERS = auth_client.h auth_digest.h auth_dll.h \
include_sofia_HEADERS = auth_client.h auth_digest.h auth_dll.h \
auth_module.h auth_plugin.h
libiptsec_la_SOURCES = iptsec_debug.h \
......@@ -41,7 +41,7 @@ libiptsec_la_SOURCES = iptsec_debug.h \
SIPSOURCES = auth_module_sip.c
HTTPSOURCES = auth_module_http.c
COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libiptsec.la \
../ipt/libipt.la \
......
......@@ -26,7 +26,7 @@ PUBLIC_H = msg.h msg_header.h msg_types.h \
msg_tag_class.h msg_dll.h msg_mime.h
INTERNAL_H = msg_internal.h test_class.h
include_HEADERS = $(GENERATED_H) $(PUBLIC_H)
include_sofia_HEADERS = $(GENERATED_H) $(PUBLIC_H)
BUILT_SOURCES = $(GENERATED_H) test_table.c test_protos.h
......@@ -38,7 +38,7 @@ libmsg_la_SOURCES = $(INTERNAL_H) \
msg_basic.c msg_generic.c msg_date.c msg_auth.c \
memspn.c
COVERAGE_INPUT = $(libmsg_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libmsg_la_SOURCES) $(include_sofia_HEADERS)
libtest_msg_a_SOURCES = test_class.c test_table.c test_protos.h
......
......@@ -26,12 +26,12 @@ TESTS =
BUILT_SOURCES = nea_tag_ref.c
include_HEADERS = nea.h nea_debug.h
include_sofia_HEADERS = nea.h nea_debug.h
libnea_la_SOURCES = nea.c nea_event.c \
nea_server.c nea_debug.c nea_tag.c nea_tag_ref.c
COVERAGE_INPUT = $(libnea_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libnea_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libnea.la \
../nta/libnta.la \
......
......@@ -29,7 +29,7 @@ TESTS_ENVIRONMENT = $(SHELL)
BUILT_SOURCES = nta_tag_ref.c
include_HEADERS = nta.h nta_stateless.h nta_tport.h \
include_sofia_HEADERS = nta.h nta_stateless.h nta_tport.h \
nta_tag.h nta_dll.h sl_utils.h
libnta_la_SOURCES = nta.c nta_tag.c nta_tag_ref.c \
......@@ -37,7 +37,7 @@ libnta_la_SOURCES = nta.c nta_tag.c nta_tag_ref.c \
sl_utils_print.c sl_utils_log.c \
sl_read_payload.c
COVERAGE_INPUT = $(libnta_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libnta_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libnta.la \
../ipt/libipt.la \
......
......@@ -28,11 +28,11 @@ TESTS = nth_test
BUILT_SOURCES = nth_tag_ref.c
include_HEADERS = nth.h nth_tag.h
include_sofia_HEADERS = nth.h nth_tag.h
libnth_la_SOURCES = nth_client.c nth_server.c nth_tag.c nth_tag_ref.c
COVERAGE_INPUT = $(libnth_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libnth_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libnth.la \
../iptsec/libiptsec.la \
......
2005-11-15 Kai Vehmanen <kai.vehmanen@nokia.com>
* Removed obsolete NUTAG_MEDIA* tags.
2005-11-03 Pekka Pessi <Pekka.Pessi@nokia.com>
* Indicate the response status with the nua_i_<method>.
......
......@@ -34,12 +34,12 @@ TESTS = test_nua
BUILT_SOURCES = nua_tag_ref.c
include_HEADERS = nua.h nua_tag.h
include_sofia_HEADERS = nua.h nua_tag.h
libnua_la_SOURCES = nua.c nua_stack.h nua_common.c nua_stack.c \
nua_tag.c nua_tag_ref.c
COVERAGE_INPUT = $(libnua_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libnua_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libnua.la \
../iptsec/libiptsec.la \
......
......@@ -852,19 +852,10 @@ void nua_unregister(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...)
* #NUTAG_HOLD \n
* #NUTAG_INVITE_TIMER \n
* #NUTAG_MEDIA_ADDRESS \n
* #NUTAG_MEDIA_CLONE \n
* #NUTAG_MEDIA_EVENT_DATA \n
* #NUTAG_MEDIA_EVENT_DLEN \n
* #NUTAG_MEDIA_EVENT_PATH \n
* #NUTAG_MEDIA_ENABLE \n
* #NUTAG_MEDIA_FEATURES \n
* #NUTAG_MEDIA_PATH \n
* #NUTAG_MEDIA_PARAMS \n
* #NUTAG_REFER_PAUSE \n
* #NUTAG_VIDEO_LOCAL \n
* #NUTAG_VIDEO_REMOTE \n
* #NUTAG_MEDIA_ENABLE \n
* #NUTAG_URL \n
* #NUTAG_MEDIA_SESSION \n
* tags in <sip_tag.h>
*
* @par Events:
......@@ -1328,12 +1319,7 @@ void nua_redirect(nua_handle_t *nh, tag_type_t tag, tag_value_t value, ...)
* nothing
*
* @par Related Tags:
* #NUTAG_MEDIA_PATH \n
* #NUTAG_MEDIA_PARAMS \n
* #NUTAG_MEDIA_ADDRESS \n
* #NUTAG_MEDIA_CLONE \n
* #NUTAG_MEDIA_SESSION \n
* #NUTAG_MEDIA_EVENT_PATH \n
* #NUTAG_AF \n
* #NUTAG_HOLD \n
* #NUTAG_VIDEO_LOCAL \n
......
......@@ -259,7 +259,6 @@ typedef struct nua_session_state
} ss_srequest[1];
} nua_session_state_t;
#define \
NH_ACTIVE_MEDIA_TAGS(include, soa) \
TAG_IF((include) && (soa) && soa_is_audio_active(soa) >= 0, \
......
......@@ -1317,47 +1317,4 @@ enum {
#define NUTAG_SRTP_INTEGRITY_PROTECTION(x) SOATAG_SRTP_INTEGRITY((x))
#define NUTAG_SRTP_INTEGRITY_PROTECTION_REF(x) SOATAG_SRTP_INTEGRITY_REF((x))
#if HAVE_SOFIA_MSS
#include <soa_mss.h>
#define NUTAG_MEDIA_SUBSYSTEM(x) SOATAG_MSS_POINTER(x)
#define NUTAG_MEDIA_SUBSYSTEM_REF(x) SOATAG_MSS_POINTER_REF(x)
#define NUTAG_MEDIA_SESSION(x) SOATAG_MSS_SESSION(x)
#define NUTAG_MEDIA_SESSION_REF(x) SOATAG_MSS_SESSION_REF(x)
#define NUTAG_MEDIA_PATH(x) SOATAG_MEDIA_PROFILE((x))
#define NUTAG_MEDIA_PATH_REF(x) SOATAG_MEDIA_PROFILE_REF((x))
#define NUTAG_MEDIA_CLONE(x) SOATAG_MEDIA_CLONE((x))
#define NUTAG_MEDIA_CLONE_REF(x) SOATAG_MEDIA_CLONE_REF((x))
#define NUTAG_MEDIA_PARAMS(x) SOATAG_MSS_CFG((x))
#define NUTAG_MEDIA_PARAMS_REF(x) SOATAG_MSS_CFG_REF((x))
#define NUTAG_MEDIA_DESCS(x) SOATAG_MSS_SDP((x))
#define NUTAG_MEDIA_DESCS_REF(x) SOATAG_MSS_SDP_REF((x))
#define NUTAG_IMAGE_LOCAL(x) SOATAG_IMAGE_LOCAL((x))
#define NUTAG_IMAGE_LOCAL_REF(x) SOATAG_IMAGE_LOCAL_REF((x))
#define NUTAG_IMAGE_REMOTE(x) SOATAG_IMAGE_REMOTE((x))
#define NUTAG_IMAGE_REMOTE_REF(x) SOATAG_IMAGE_REMOTE_REF((x))
#define NUTAG_TARGET_IMAGE_NAME(x) SOATAG_TARGET_IMAGE_NAME((x))
#define NUTAG_TARGET_IMAGE_NAME_REF(x) SOATAG_TARGET_IMAGE_NAME_REF((x))
#define NUTAG_VIDEO_LOCAL(x) SOATAG_VIDEO_LOCAL((x))
#define NUTAG_VIDEO_LOCAL_REF(x) SOATAG_VIDEO_LOCAL_REF((x))
#define NUTAG_VIDEO_REMOTE(x) SOATAG_VIDEO_REMOTE((x))
#define NUTAG_VIDEO_REMOTE_REF(x) SOATAG_VIDEO_REMOTE_REF((x))
#define NUTAG_MEDIA_EVENT_PATH(x) SOATAG_MEDIA_EVENT_PATH((x))
#define NUTAG_MEDIA_EVENT_PATH_REF(x) SOATAG_MEDIA_EVENT_PATH_REF((x))
#define NUTAG_MEDIA_EVENT_DATA(x) SOATAG_MEDIA_EVENT_DATA((x))
#define NUTAG_MEDIA_EVENT_DATA_REF(x) SOATAG_MEDIA_EVENT_DATA_REF((x))
#define NUTAG_MEDIA_EVENT_DLEN(x) SOATAG_MEDIA_EVENT_DLEN((x))
#define NUTAG_MEDIA_EVENT_DLEN_REF(x) SOATAG_MEDIA_EVENT_DLEN_REF((x))
#endif
#endif
......@@ -23,12 +23,12 @@ BUILT_SOURCES = sdp_tag_ref.c
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = sdp.h sdp_tag.h
include_sofia_HEADERS = sdp.h sdp_tag.h
libsdp_la_SOURCES = sdp.c sdp_parse.c sdp_print.c \
sdp_tag.c sdp_tag_ref.c
COVERAGE_INPUT = $(libsdp_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libsdp_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libsdp.la \
../su/libsu.la
......
......@@ -36,7 +36,7 @@ GENERATED_C = sip_tag.c sip_tag_ref.c sip_parser_table.c
BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C)
include_HEADERS = $(GENERATED_H) $(PUBLIC_H) $(H_IN)
include_sofia_HEADERS = $(GENERATED_H) $(PUBLIC_H) $(H_IN)
libsip_la_SOURCES = $(INTERNAL_H) \
sip_parser.c sip_header.c sip_util.c sip_pref_util.c \
......@@ -48,7 +48,7 @@ libsip_la_SOURCES = $(INTERNAL_H) \
sip_tag_class.c \
$(GENERATED_C)
COVERAGE_INPUT = $(libsip_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libsip_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libsip.la \
../msg/libmsg.la \
......
......@@ -24,12 +24,12 @@ TESTS = test_soa
BUILT_SOURCES = soa_tag_ref.c
include_HEADERS = soa.h soa_session.h soa_add.h soa_tag.h
include_sofia_HEADERS = soa.h soa_session.h soa_add.h soa_tag.h
libsoa_la_SOURCES = soa.c soa_static.c \
soa_tag.c soa_tag_ref.c
COVERAGE_INPUT = $(libsoa_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libsoa_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libsoa.la \
../sip/libsip.la \
......
......@@ -25,11 +25,11 @@ CLEANFILES = resolv.conf error.conf named.conf.tmp \
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = sresolv.h
include_sofia_HEADERS = sresolv.h
libsresolv_la_SOURCES = sresolv.c
COVERAGE_INPUT = $(libsresolv_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libsresolv_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libsresolv.la \
../su/libsu.la
......@@ -47,4 +47,4 @@ dist_noinst_DATA = run_test_sresolv \
# ----------------------------------------------------------------------
# Sofia specific rules
include ../sofia.am
\ No newline at end of file
include ../sofia.am
......@@ -29,14 +29,13 @@ noinst_PROGRAMS = ${stun_prog_targets}
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = stun.h stun_common.h stun_tag.h
include_sofia_HEADERS = stun.h stun_common.h stun_tag.h
libstun_la_SOURCES = $(stun_lib_sources) \
stun_tag.c stun_tag_ref.c
BUILT_SOURCES = stun_tag_ref.c
COVERAGE_INPUT = $(libstun_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libstun_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libstun.la \
../su/libsu.la
......
......@@ -41,7 +41,7 @@ endif
BUILT_SOURCES = su_tag_ref.c
include_HEADERS = su_types.h su.h su_localinfo.h \
include_sofia_HEADERS = su_types.h su.h su_localinfo.h \
su_wait.h $(GHEADERS) \
su_alloc.h su_alloc_stat.h su_strlst.h su_vector.h \
su_time.h \
......@@ -63,7 +63,7 @@ libsu_la_SOURCES = \
su_log.c su_global_log.c su_default_log.c \
su_md5.c su_uniqueid.c su_memmem.c
COVERAGE_INPUT = $(libsu_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libsu_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libsu.la $(GLIB_LIBS)
......
......@@ -26,7 +26,7 @@ TESTS = test_tport
# ----------------------------------------------------------------------
# Rules for building the targets
include_HEADERS = tport.h tport_tag.h
include_sofia_HEADERS = tport.h tport_tag.h
TLS_SRC = tport_tls.c tport_tls.h
......@@ -41,7 +41,7 @@ EXTRA_DIST = $(TLS_SRC)
BUILT_SOURCES = tport_tag_ref.c
COVERAGE_INPUT = $(libtport_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(libtport_la_SOURCES) $(include_sofia_HEADERS)
LDADD = libtport.la \
../stun/libstun.la \
......
......@@ -20,11 +20,11 @@ noinst_PROGRAMS = torture_url test_urlmap
BUILT_SOURCES = url_tag_ref.c
include_HEADERS = url.h url_dll.h url_tag.h url_tag_class.h
include_sofia_HEADERS = url.h url_dll.h url_tag.h url_tag_class.h
liburl_la_SOURCES = url.c url_tag.c url_tag_ref.c
COVERAGE_INPUT = $(liburl_la_SOURCES) $(include_HEADERS)
COVERAGE_INPUT = $(liburl_la_SOURCES) $(include_sofia_HEADERS)
LDADD = liburl.la \
../bnf/libbnf.la \
......
2005-11-15 Kai Vehmanen <kai.vehmanen@nokia.com>
* sofia-sip.spec.in: Removed the --includedir parameter.
The public headers are now installed under
includedir/sofia-sip-MAJOR.MINOR/
2005-10-06 Pekka Pessi <Pekka.Pessi@nokia.com>
* Added debian example directory from M Mela.
......
......@@ -9,4 +9,5 @@ Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library
Version: @VERSION@
Requires: glib-2.0
Libs: -L${libdir} -lsofia-sip-ua
Cflags: -I${includedir}
Cflags: -I@include_sofiadir@
......@@ -34,7 +34,7 @@ network elements.
%setup -q -n sofia-sip-%{version}
%build
%configure --with-pic --enable-shared --disable-dependency-tracking --includedir=%{_prefix}/include/sofia-sip --with-aclocal=aclocal
%configure --with-pic --enable-shared --disable-dependency-tracking --with-aclocal=aclocal
#make %{_smp_mflags}
make
%{?_with_check:make check}
......@@ -68,8 +68,8 @@ Development package for Sofia SIP UA library. This package includes
/usr/share/aclocal/sac-general.m4
/usr/share/aclocal/sac-su.m4
/usr/share/aclocal/sac-su2.m4
%{_prefix}/include/sofia-sip/*.h
%{_prefix}/include/sofia-sip/*.h.in
%{_prefix}/include/sofia-sip*/*.h
%{_prefix}/include/sofia-sip*/*.h.in
%{_prefix}/libexec/sofia/tag_dll.awk
%{_prefix}/libexec/sofia/msg_parser.awk
%{_prefix}/%{_lib}/libsofia-sip-ua.la
......@@ -94,6 +94,10 @@ Command line utilities for Sofia SIP UA library.
%{_prefix}/bin/sip-date
%changelog
* Tue Nov 15 2005 Kai Vehmanen <kai.vehmanen@nokia.com>
- Removed the --includedir parameter. The public headers are
now installed under includedir/sofia-sip-MAJOR.MINOR/
* Thu Oct 20 2005 Pekka Pessi <Pekka.Pessi@nokia.com> - @VERSION@
- Using %{_lib} instead of lib
......
......@@ -24,7 +24,7 @@ INCLUDES = -I$(sofiasrc)/features \
# ----------------------------------------------------------------------
# Build targets
include_HEADERS = apps_utils.h
noinst_HEADERS = apps_utils.h
bin_PROGRAMS = nua_cli sip-options sip-date
......
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