Commit 41286754 authored by Pekka Pessi's avatar Pekka Pessi

Moved public include files to sofia-sip subdirectories.

All public include files installed in ${sofiadir} are now in sofia-sip
subdirectories. They are installed to ${sofiadir}/sofia-sip, too.

${sofiadir} is defined by configure script relative to your ${prefix}, by
default ${sofidir} is ${prefix}/include/sofia-sip-1.11. The default prefix
is /usr/local and ${sofiadir} is /usr/local/include/sofia-sip-1.11. When
using package manager, the ${prefix} is usually /usr and ${sofiadir} is
/usr/include/sofia-sip-1.11.

The public include files should be referenced using sofia-sip path, e.g.,
<sofia-sip/su.h>.

You can either fix your applications to use the new include file names
with the fix-include-sofia-sip sed script found in scripts/ directory, or
add both ${sofiadir} and ${sofiadir}/sofia-sip into your include path,
e.g.,

INCLUDES

darcs-hash:20060214140740-65a35-305973241d6cc2e1ab3fe19359445b839b3c22a8.gz
parent 64fec982
2006-02-14 Pekka Pessi <Pekka.Pessi@nokia.com>
* Moved public include files to sofia-sip subdirectories.
All public include files installed in ${sofiadir} are now in sofia-sip
subdirectories. They are installed to ${sofiadir}/sofia-sip, too.
${sofiadir} is defined by configure script relative to your ${prefix}, by
default ${sofidir} is ${prefix}/include/sofia-sip-1.11. The default prefix
is /usr/local and ${sofiadir} is /usr/local/include/sofia-sip-1.11. When
using package manager, the ${prefix} is usually /usr and ${sofiadir} is
/usr/include/sofia-sip-1.11.
The public include files should be referenced using sofia-sip path, e.g.,
<sofia-sip/su.h>.
You can either fix your applications to use the new include file names
with the fix-include-sofia-sip sed script found in scripts/ directory, or
add both ${sofiadir} and ${sofiadir}/sofia-sip into your include path,
e.g.,
INCLUDES = -I/usr/include/sofia-1.11 -I/usr/include/sofia-1.11/sofia-sip
At the same time, I took the liberty to rename two include files
sofia_sip_features.h => sofia-sip/features.h
su_memmem.h => sofia-sip/su_bm.h
The fix-include-sofia-sip sed script takes care of both of them.
* Improved 100rel handling in nua.
Added test_100rel to test_nua.c.
* Using CONDITION_PARAMS macro instead of CONDITION_FUNCTION in test_nua.c
* Improving getaddrinfo replacements.
Testing functions getaddrinfo()/freeaddrinfo(), getnameinfo() and
gai_strerror() separately.
There is no gai_strerror() in windows, I think.
2006-02-03 Pekka Pessi <Pekka.Pessi@nokia.com>
* Code cleanup and memory leak fix in soa/sdp.
......
......@@ -18,12 +18,16 @@ API/ABI changes and versioning
other important information to developers;
- and should be updated _continuously_! />
- Moved all header files that are installed to sofia-sip subdirectories
There is a sed script (scripts/fix-include-sofia-sip) that can be used
to modify include directives to use "sofia-sip/foo.h" instead of "foo.h"
- Removed include files msg/msg_bnf.h msg/msg_auth.h sip/sip_extensions.h
sip/sip_internal.h and su/su_configure_win32.h
- The clone su_home_t semantics were extended.
Added su_home_is_threadsafe(), modified prototype of su_home_unref().
- Removed *_dll.h files - defining *_DLL macros in <su_config.h>.
Contributors to this release
----------------------------
......@@ -37,6 +41,9 @@ Contributors to this release
Bugs fixed in this release
--------------------------
- Handling responses to PRACK
- Double free in SDP parser (#1423415)
< notable bugs fixed in this release
- check the sf.net bug tracker; see closed bugs,
sorted by closing date
......
......@@ -8,7 +8,7 @@ dnl ---------------------------
dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
AC_INIT([sofia-sip], [1.11.5cvs])
AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sip.h])
AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-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')
......@@ -149,7 +149,6 @@ libsofia-sip-ua/docs/Makefile
libsofia-sip-ua/docs/Doxyfile.version
libsofia-sip-ua/docs/sofia-footer.html
libsofia-sip-ua/features/Makefile
libsofia-sip-ua/features/sofia_sip_features.h
libsofia-sip-ua/http/Makefile
libsofia-sip-ua/ipt/Makefile
libsofia-sip-ua/iptsec/Makefile
......@@ -166,6 +165,7 @@ libsofia-sip-ua/stun/Makefile
libsofia-sip-ua/su/Makefile
libsofia-sip-ua/tport/Makefile
libsofia-sip-ua/url/Makefile
libsofia-sip-ua/features/sofia-sip/features.h
utils/Makefile
win32/Makefile
win32/config.h
......
......@@ -17,7 +17,7 @@ check_PROGRAMS = torture_bnf
# ----------------------------------------------------------------------
# Rules for building the targets
include_sofia_HEADERS = bnf.h
nobase_include_sofia_HEADERS = sofia-sip/bnf.h
libbnf_la_SOURCES = bnf.c
......
......@@ -32,7 +32,7 @@
#include "config.h"
#include "bnf.h"
#include "sofia-sip/bnf.h"
#include <assert.h>
......
......@@ -35,7 +35,7 @@
*
*/
#include <su_config.h>
#include <sofia-sip/su_config.h>
#include <string.h>
......
......@@ -40,12 +40,12 @@
#include <stdio.h>
#include <assert.h>
#include "bnf.h"
#include "sofia-sip/bnf.h"
static int test_flags = 0;
#define TSTFLAGS test_flags
#include <tstdef.h>
#include <sofia-sip/tstdef.h>
char const name[] = "torture_bnf";
......
PROJECT_NAME = "features"
OUTPUT_DIRECTORY = ../docs/html/features
INPUT = sofia_sip_features.docs .
INPUT = features.docs .
@INCLUDE = ../docs/Doxyfile.conf
......
......@@ -29,13 +29,15 @@ noinst_LTLIBRARIES = libfeatures.la
# ----------------------------------------------------------------------
# Rules for building the targets
include_sofia_HEADERS = sofia_sip_features.h
nobase_include_sofia_HEADERS = sofia-sip/features.h
libfeatures_la_SOURCES = sofia_sip_features.c
libfeatures_la_SOURCES = features.c
# ----------------------------------------------------------------------
# Install and distribution rules
EXTRA_DIST = Doxyfile features.docs
# ----------------------------------------------------------------------
# Sofia specific rules
......
......@@ -34,9 +34,9 @@
#include <stddef.h>
#include <su_configure.h>
#include <sofia-sip/su_configure.h>
#include <tport_tls.h>
#include "sofia_sip_features.h"
#include "sofia-sip/features.h"
/** The name and version of software package providing Sofia-SIP-UA library. */
char const * const sofia_sip_name_version = SOFIA_SIP_NAME_VERSION;
......
......@@ -22,15 +22,16 @@ TESTS = test_http
# ----------------------------------------------------------------------
# Rules for building the targets
PUBLIC_H = http.h http_header.h http_parser.h \
http_tag_class.h http_status.h http_hclasses.h
PUBLIC_H = sofia-sip/http.h sofia-sip/http_header.h \
sofia-sip/http_parser.h sofia-sip/http_tag_class.h \
sofia-sip/http_status.h sofia-sip/http_hclasses.h
BUILT_H = http_protos.h http_tag.h
BUILT_H = sofia-sip/http_protos.h sofia-sip/http_tag.h
BUILT_C = http_tag.c http_tag_ref.c http_parser_table.c
BUILT_SOURCES = $(BUILT_H) $(BUILT_C)
include_sofia_HEADERS = $(BUILT_H) $(PUBLIC_H)
nobase_include_sofia_HEADERS = $(BUILT_H) $(PUBLIC_H)
libhttp_la_SOURCES = $(INTERNAL_H) \
http_parser.c http_header.c \
......@@ -52,10 +53,10 @@ test_http_LDFLAGS = -static
# Install and distribution rules
EXTRA_DIST = Doxyfile http.docs \
http_parser_table.c.in \
http_protos.h.in \
http_tag.c.in \
http_tag.h.in
sofia-sip/http_parser_table.c.in \
sofia-sip/http_protos.h.in \
sofia-sip/http_tag.h.in \
http_tag.c.in
# ----------------------------------------------------------------------
# Sofia specific rules
......@@ -68,13 +69,14 @@ MSG_PARSER_AWK = $(srcdir)/../msg/msg_parser.awk
AWK_HTTP_AWK = $(AWK) -f $(MSG_PARSER_AWK) module=http
http_tag.h: http_tag.h.in $(MSG_PARSER_AWK)
http_protos.h: http_protos.h.in $(MSG_PARSER_AWK)
sofia-sip/http_tag.h: sofia-sip/http_tag.h.in $(MSG_PARSER_AWK)
sofia-sip/http_protos.h: sofia-sip/http_protos.h.in $(MSG_PARSER_AWK)
http_tag.c: http_tag.c.in $(MSG_PARSER_AWK)
http_parser_table.c: http_parser_table.c.in $(MSG_PARSER_AWK)
http_tag.c http_protos.h http_tag.h: http.h
sofia-sip/http_tag.c sofia-sip/http_protos.h sofia-sip/http_tag.h: \
sofia-sip/http.h
$(AWK_HTTP_AWK) PR=$@ TEMPLATE=$(srcdir)/$@.in $<
http_parser_table.c: http.h
http_parser_table.c: sofia-sip/http.h
$(AWK_HTTP_AWK) PT=$@ MC_HASH_SIZE=127 $<
......@@ -43,14 +43,14 @@
#include <assert.h>
#include <stdio.h>
#include <su_alloc.h>
#include <sofia-sip/su_alloc.h>
#include <http_parser.h>
#include <http_header.h>
#include <http_status.h>
#include <sofia-sip/http_parser.h>
#include <sofia-sip/http_header.h>
#include <sofia-sip/http_status.h>
#include <msg_mime_protos.h>
#include <msg_date.h>
#include <sofia-sip/msg_mime_protos.h>
#include <sofia-sip/msg_date.h>
/* ====================================================================== */
......
......@@ -39,7 +39,7 @@
#include <limits.h>
#include <assert.h>
#include "http_parser.h"
#include "sofia-sip/http_parser.h"
/* ========================================================================== */
......@@ -336,7 +336,7 @@ void http_set_cookie_update(http_set_cookie_t *sc)
}
#include <msg_date.h>
#include <sofia-sip/msg_date.h>
/* Scan a cookie parameter */
static int set_cookie_scanner(char *s)
......
......@@ -42,14 +42,14 @@
#include <assert.h>
#include <su_alloc.h>
#include <sofia-sip/su_alloc.h>
#define HTTP_STATIC_INLINE
#include "http_parser.h"
#include "sofia-sip/http_parser.h"
#include <http_header.h>
#include <http_status.h>
#include <sofia-sip/http_header.h>
#include <sofia-sip/http_status.h>
/** Complete a HTTP request. */
int http_request_complete(msg_t *msg)
......
......@@ -41,15 +41,15 @@
#include <limits.h>
#include <stdarg.h>
#include <su_tagarg.h>
#include <sofia-sip/su_tagarg.h>
#include <su_alloc.h>
#include <sofia-sip/su_alloc.h>
#include "http_parser.h"
#include <msg_parser.h>
#include <http_header.h>
#include <http_status.h>
#include <msg_mclass.h>
#include "sofia-sip/http_parser.h"
#include <sofia-sip/msg_parser.h>
#include <sofia-sip/http_header.h>
#include <sofia-sip/http_status.h>
#include <sofia-sip/msg_mclass.h>
/** HTTP version 1.1. */
char const http_version_1_1[] = "HTTP/1.1";
......
......@@ -46,8 +46,8 @@
#include <stddef.h>
#include <string.h>
#include <http_parser.h>
#include <msg_mclass.h>
#include <sofia-sip/http_parser.h>
#include <sofia-sip/msg_mclass.h>
#define HTTP_PARSER_FLAGS (MSG_FLG_CHUNKING)
......
......@@ -32,7 +32,7 @@
#include "config.h"
#include <stddef.h>
#include <http_status.h>
#include <sofia-sip/http_status.h>
char const
http_100_continue[] = "Continue",
......
......@@ -47,12 +47,12 @@
#include <stddef.h>
#include <string.h>
#include <su.h>
#include <sofia-sip/su.h>
#include <http.h>
#include <http_protos.h>
#include <http_tag.h>
#include <http_tag_class.h>
#include <sofia-sip/http.h>
#include <sofia-sip/http_protos.h>
#include <sofia-sip/http_tag.h>
#include <sofia-sip/http_tag_class.h>
tag_typedef_t httptag_any = NSTAG_TYPEDEF(*);
......
......@@ -35,15 +35,15 @@
#include <stddef.h>
#include <string.h>
#include <su.h>
#include <sofia-sip/su.h>
#include <http_parser.h>
#include <sofia-sip/http_parser.h>
#include <http_tag.h>
#include <su_tag_class.h>
#include <su_tag_inline.h>
#include <http_tag_class.h>
#include <su_tagarg.h>
#include <sofia-sip/http_tag.h>
#include <sofia-sip/su_tag_class.h>
#include <sofia-sip/su_tag_inline.h>
#include <sofia-sip/http_tag_class.h>
#include <sofia-sip/su_tagarg.h>
tag_class_t httphdrtag_class[1] =
{{
......
......@@ -37,13 +37,13 @@
*/
#ifndef MSG_H
#include <msg.h>
#include <sofia-sip/msg.h>
#endif
#ifndef URL_H
#include <url.h>
#include <sofia-sip/url.h>
#endif
#ifndef MSG_MIME_H
#include <msg_mime.h>
#include <sofia-sip/msg_mime.h>
#endif
SOFIA_BEGIN_DECLS
......
......@@ -33,7 +33,7 @@
*/
#ifndef MSG_TYPES_H
#include <msg_types.h>
#include <sofia-sip/msg_types.h>
#endif
SOFIA_BEGIN_DECLS
......@@ -60,7 +60,7 @@ SOFIA_BEGIN_DECLS
#ifndef HTTP_PROTOS_H
#define HTTP_HCLASSES_ONLY
#include <http_protos.h>
#include <sofia-sip/http_protos.h>
#undef HTTP_HCLASSES_ONLY
#endif
......
......@@ -35,19 +35,19 @@
*/
#ifndef SU_ALLOC_H
#include <su_alloc.h>
#include <sofia-sip/su_alloc.h>
#endif
#ifndef SU_TAG_H
#include <su_tag.h>
#include <sofia-sip/su_tag.h>
#endif
#ifndef HTTP_H
#include <http.h>
#include <sofia-sip/http.h>
#endif
#ifndef MSG_HEADER_H
#include <msg_header.h>
#include <sofia-sip/msg_header.h>
#endif
SOFIA_BEGIN_DECLS
......@@ -251,7 +251,7 @@ int http_query_parse(char *query,
...);
#ifndef HTTP_PROTOS_H
#include <http_protos.h>
#include <sofia-sip/http_protos.h>
#endif
SOFIA_END_DECLS
......
......@@ -33,27 +33,27 @@
*/
#ifndef SU_ALLOC_H
#include <su_alloc.h>
#include <sofia-sip/su_alloc.h>
#endif
#ifndef MSG_H
#define MSG_PUB_T struct http_s
#define MSG_HDR_T union http_header_u
#include <msg.h>
#include <sofia-sip/msg.h>
#else
#error "<http_parser.h> must be included before <msg.h>"
#endif
#ifndef MSG_PARSER_H
#include <msg_parser.h>
#include <sofia-sip/msg_parser.h>
#endif
#ifndef HTTP_H
#include <http.h>
#include <sofia-sip/http.h>
#endif
#ifndef HTTP_HEADER_H
#include <http_header.h>
#include <sofia-sip/http_header.h>
#endif
SOFIA_BEGIN_DECLS
......
......@@ -39,13 +39,13 @@
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
*/
#include <su_config.h>
#include <sofia-sip/su_config.h>
#ifndef HTTP_HEADER_H
#include <http_header.h>
#include <sofia-sip/http_header.h>
#endif
#ifndef HTTP_HCLASSES_H
#include <http_hclasses.h>
#include <sofia-sip/http_hclasses.h>
#endif
#define http_header_make(h, c, s) \
......
......@@ -34,7 +34,7 @@
* @date Created: Tue Sep 18 18:55:09 2001 ppessi
*/
#include <su_config.h>
#include <sofia-sip/su_config.h>
SOFIA_BEGIN_DECLS
......
......@@ -42,17 +42,17 @@
*/
#ifndef SU_TAG_H
#include <su_tag.h>
#include <sofia-sip/su_tag.h>
#endif
#ifndef SU_TAG_CLASS_H
#include <su_tag_class.h>
#include <sofia-sip/su_tag_class.h>
#endif
#ifndef SU_TAG_CLASS_H
#include <su_tag_class.h>
#include <sofia-sip/su_tag_class.h>
#endif
#ifndef HTTP_H
#include <http.h>
#include <sofia-sip/http.h>
#endif
SOFIA_BEGIN_DECLS
......
......@@ -35,11 +35,11 @@
#ifndef SU_TAG_CLASS_H
#include <su_tag_class.h>
#include <sofia-sip/su_tag_class.h>
#endif
#ifndef MSG_TAG_CLASS_H
#include <msg_tag_class.h>
#include <sofia-sip/msg_tag_class.h>
#endif
SOFIA_BEGIN_DECLS
......
......@@ -38,25 +38,25 @@
#include <stddef.h>
#include <assert.h>
#include <su.h>
#include <sofia-sip/su.h>
#include <su_types.h>
#include <sofia-sip/su_types.h>
#include <su_tag.h>
#include <su_tag_class.h>
#include <su_tag_io.h>
#include <sofia-sip/su_tag.h>
#include <sofia-sip/su_tag_class.h>
#include <sofia-sip/su_tag_io.h>
#include <http_parser.h>
#include <sofia-sip/http_parser.h>
#include <http_tag.h>
#include <url_tag.h>
#include <sofia-sip/http_tag.h>
#include <sofia-sip/url_tag.h>
#include <http_header.h>
#include <msg_addr.h>
#include <sofia-sip/http_header.h>
#include <sofia-sip/msg_addr.h>
#define TSTFLAGS tstflags
#include <tstdef.h>
#include <sofia-sip/tstdef.h>
char const *name = "test_http";
......
......@@ -19,8 +19,11 @@ TESTS = sha1test torture_base64
# ----------------------------------------------------------------------
# Rules for building the targets
include_sofia_HEADERS = rc4.h utf8.h sha1.h base64.h \
string0.h token64.h uniqueid.h
nobase_include_sofia_HEADERS = \
sofia-sip/rc4.h sofia-sip/utf8.h \
sofia-sip/sha1.h sofia-sip/base64.h \
sofia-sip/string0.h sofia-sip/token64.h \
sofia-sip/uniqueid.h
libipt_la_SOURCES = utf8internal.h \
utf8.c ucs2.c ucs4.c rc4.c \
......
......@@ -32,7 +32,7 @@
#include <stdio.h>
#include <string.h>
#include "base64.h"
#include "sofia-sip/base64.h"
static unsigned char const code[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
......
......@@ -29,7 +29,7 @@
#include "config.h"