Changeset 77

Show
Ignore:
Timestamp:
14/10/06 23:38:20 (2 years ago)
Author:
smoku
Message:

using system-wide expat

Location:
trunk
Files:
1 removed
19 modified

Legend:

Unmodified
Added
Removed

  • trunk/c2s/c2s.h

    r70 r77  
    2323#endif 
    2424 
     25#include <expat.h> 
     26 
    2527#include "mio/mio.h" 
    2628#include "sx/sx.h" 

  • trunk/c2s/Makefile.am

    r2 r77  
    99            $(top_builddir)/mio/libmio.la \ 
    1010            $(top_builddir)/util/libutil.la \ 
    11             $(top_builddir)/subst/libsubst.la \ 
    12             $(top_builddir)/expat/libexpat.la 
     11            $(top_builddir)/subst/libsubst.la 

  • trunk/ChangeLog

    r75 r77  
     12006-10-14 Tomasz Sterna <tomek@xiaoka.com> 
     2        * using system-wide expat (by Maxim Britov) 
     3 
    142006-10-08 Tomasz Sterna <tomek@xiaoka.com> 
    25        * integrated Juha Heinanen's authreg_pam realm handling 

  • trunk/configure.in

    r52 r77  
    311311 
    312312    AC_DEFINE(HAVE_SSL,1,[Define to 1 if OpenSSL is available.]) 
     313fi 
     314 
     315dnl find expat 
     316AC_ARG_ENABLE(expat, AC_HELP_STRING([--enable-expat], [enable expat (yes)]), want_expat=$enableval, want_expat=yes) 
     317if test "x-$want_expat" = "x-yes" ; then 
     318    AC_CHECK_HEADERS(expat.h) 
     319    LIBS="-lexpat $LIBS" 
    313320fi 
    314321 
    … …  
    783790          tools/Makefile \ 
    784791          man/Makefile \ 
    785           expat/Makefile \ 
    786792          mio/Makefile \ 
    787793          subst/Makefile \ 

  • trunk/docs/layout

    r2 r77  
    44        dev/    - Hacker docs 
    55 
    6     expat/      - Expat (XML parsing library) 
    76    idn/        - GNU Libidn (stringprep) 
    87    mio/        - Managed Input/Ouput (FD event processor) 

  • trunk/Makefile.am

    r2 r77  
    11EXTRA_DIST = PROTOCOL Doxyfile.in README.win32 contrib 
    22 
    3 SUBDIRS = etc tools man expat mio subst sx util c2s resolver router s2s sm 
     3SUBDIRS = etc tools man mio subst sx util c2s resolver router s2s sm 
    44 
    55docs: Doxyfile 

  • trunk/README

    r2 r77  
    1 README for Jabber Open Source Server (2.0s8) 
    2  
    3 Thanks for downloading jabberd 2.0. Below are some basic instructions to 
     1README for Jabber Open Source Server (2.1ch) 
     2 
     3Thanks for downloading jabberd 2.1. Below are some basic instructions to 
    44get you started. Complete documentation is available at 
    55http://jabberd.jabberstudio.org/2/docs/ 
    66 
    77-- the jabberd team 
     8 
     9 
     10Required packages: 
     11 
     12 - expat - XML parsing libraries 
     13     http://expat.sourceforge.net/ 
    814 
    915 

  • trunk/resolver/Makefile.am

    r2 r77  
    99                 $(top_builddir)/mio/libmio.la \ 
    1010                 $(top_builddir)/util/libutil.la \ 
    11                  $(top_builddir)/subst/libsubst.la \ 
    12                  $(top_builddir)/expat/libexpat.la 
     11                 $(top_builddir)/subst/libsubst.la  

  • trunk/router/Makefile.am

    r2 r77  
    99               $(top_builddir)/mio/libmio.la \ 
    1010               $(top_builddir)/util/libutil.la \ 
    11                $(top_builddir)/subst/libsubst.la \ 
    12                $(top_builddir)/expat/libexpat.la 
     11               $(top_builddir)/subst/libsubst.la 

  • trunk/s2s/Makefile.am

    r2 r77  
    99            $(top_builddir)/mio/libmio.la \ 
    1010            $(top_builddir)/util/libutil.la \ 
    11             $(top_builddir)/subst/libsubst.la \ 
    12             $(top_builddir)/expat/libexpat.la 
     11            $(top_builddir)/subst/libsubst.la 

  • trunk/sm/Makefile.am

    r17 r77  
    4949           $(top_builddir)/mio/libmio.la \ 
    5050           $(top_builddir)/util/libutil.la \ 
    51            $(top_builddir)/subst/libsubst.la \ 
    52            $(top_builddir)/expat/libexpat.la 
     51           $(top_builddir)/subst/libsubst.la 
    5352 
    5453libmod_active_la_SOURCES = mod_active.c 

  • trunk/storage/Makefile.am

    r2 r77  
    1010            $(top_builddir)/mio/libmio.la \ 
    1111            $(top_builddir)/util/libutil.la \ 
    12             $(top_builddir)/subst/libsubst.la \ 
    13             $(top_builddir)/expat/libexpat.la 
     12            $(top_builddir)/subst/libsubst.la 

  • trunk/sx/sasl.h

    r18 r77  
    2626#include <sasl/sasl.h> 
    2727#include <sasl/saslutil.h> 
     28#include <sasl/saslplug.h> 
    2829 
    2930#ifdef __cplusplus 

  • trunk/sx/sx.h

    r2 r77  
    2828#include "ac-stdint.h" 
    2929 
    30 #include <expat/expat.h> 
     30#include <expat.h> 
    3131#include <util/util.h> 
    3232 

  • trunk/util/config.c

    r2 r77  
    2020 
    2121#include "util.h" 
    22 #include "expat/expat.h" 
     22#include "expat.h" 
    2323 
    2424/** new config structure */ 

  • trunk/util/nad.c

    r62 r77  
    3535#include "util.h" 
    3636 
    37 #ifdef HAVE_EXPAT 
    38 #include "expat/expat.h" 
    39 #endif 
     37#include "expat.h" 
    4038 
    4139/* define NAD_DEBUG to get pointer tracking - great for weird bugs that you can't reproduce */ 
    … …  
    11811179} 
    11821180 
    1183 #ifdef HAVE_EXPAT 
    11841181 
    11851182/** parse a buffer into a nad */ 
    … …  
    13241321    return bd.nad; 
    13251322} 
    1326  
    1327 #endif 

  • trunk/util/nad.h

    r2 r77  
    4848#ifdef HAVE_CONFIG_H 
    4949# include <config.h> 
    50 #endif 
    51  
    52 /* !!! if configure ever checks for expat, then remove this */ 
    53 #ifndef HAVE_EXPAT 
    54 # define HAVE_EXPAT 1 
    5550#endif 
    5651 
    … …  
    149144nad_t nad_deserialize(pool_t p, const char *buf); 
    150145 
    151 #ifdef HAVE_EXPAT 
    152146/** create a nad from raw xml */ 
    153147nad_t nad_parse(pool_t p, const char *buf, int len); 
    154 #endif 
    155148 
    156149/* these are some helpful macros */ 

  • trunk/util/util.h

    r2 r77  
    3232#include <assert.h> 
    3333 
     34#include <expat.h> 
     35 
    3436#ifdef HAVE_SYS_TYPES_H 
    3537# include <sys/types.h> 
    … …  
    7375extern "C" { 
    7476#endif 
    75  
    76 /* expat is available */ 
    77 #define HAVE_EXPAT 1 
    78  
    7977 
    8078/* crypto hashing utils */ 
    … …  
    532530nad_t nad_deserialize(nad_cache_t cache, const char *buf); 
    533531 
    534 #ifdef HAVE_EXPAT 
    535532/** create a nad from raw xml */ 
    536533nad_t nad_parse(nad_cache_t cache, const char *buf, int len); 
    537 #endif 
    538534 
    539535/* these are some helpful macros */ 

  • trunk/util/xconfig.c

    r2 r77  
    2121#include "xconfig.h" 
    2222 
    23 #include "expat/expat.h" 
     23#include "expat.h" 
    2424 
    2525#include <stdio.h>