Author: sahan Date: Sun Jun 3 22:56:31 2007 New Revision: 544060 URL: http://svn.apache.org/viewvc?view=rev&rev=544060 Log: Port to Mac OS
Modified: webservices/axis2/trunk/c/autogen.sh webservices/axis2/trunk/c/axiom/autogen.sh webservices/axis2/trunk/c/axiom/configure.ac webservices/axis2/trunk/c/configure.ac webservices/axis2/trunk/c/guththila/autogen.sh webservices/axis2/trunk/c/guththila/configure.ac webservices/axis2/trunk/c/include/axis2_http_server.h webservices/axis2/trunk/c/neethi/autogen.sh webservices/axis2/trunk/c/neethi/configure.ac webservices/axis2/trunk/c/samples/autogen.sh webservices/axis2/trunk/c/samples/configure.ac webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c webservices/axis2/trunk/c/src/core/transport/http/sender/Makefile.am webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am webservices/axis2/trunk/c/src/modules/mod_log/Makefile.am webservices/axis2/trunk/c/test/core/transport/Makefile.am webservices/axis2/trunk/c/util/autogen.sh webservices/axis2/trunk/c/util/configure.ac webservices/axis2/trunk/c/util/include/axutil_error.h webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h webservices/axis2/trunk/c/util/src/error.c Modified: webservices/axis2/trunk/c/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/autogen.sh (original) +++ webservices/axis2/trunk/c/autogen.sh Sun Jun 3 22:56:31 2007 @@ -19,7 +19,15 @@ cd .. echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize +else + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then + echo 'done.' else echo 'failed.' Modified: webservices/axis2/trunk/c/axiom/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/axiom/autogen.sh (original) +++ webservices/axis2/trunk/c/axiom/autogen.sh Sun Jun 3 22:56:31 2007 @@ -1,7 +1,14 @@ #!/bin/bash echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize +else + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then echo 'done.' else echo 'failed.' Modified: webservices/axis2/trunk/c/axiom/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/axiom/configure.ac (original) +++ webservices/axis2/trunk/c/axiom/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,7 +5,7 @@ AC_INIT(axis2_axiom-src, 1.0.0) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr/local/axis2_axiom) dnl Checks for programs. @@ -128,7 +128,7 @@ TESTDIR="" ) - +PKG_PROG_PKG_CONFIG(0.20) PKG_CHECK_MODULES(LIBXML2, libxml-2.0) CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS" Modified: webservices/axis2/trunk/c/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/configure.ac (original) +++ webservices/axis2/trunk/c/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,8 +5,10 @@ AC_INIT(axis2c-src, 1.0.0) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +dnl AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr/local/axis2c) +m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) dnl Checks for programs. AC_PROG_CC @@ -98,7 +100,7 @@ dnl It may be better to do a Darwin check AC_CHECK_HEADERS([sys/appleapiopts.h]) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST +dnl AC_C_CONST dnl Checks for library functions. AC_FUNC_MALLOC Modified: webservices/axis2/trunk/c/guththila/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/guththila/autogen.sh (original) +++ webservices/axis2/trunk/c/guththila/autogen.sh Sun Jun 3 22:56:31 2007 @@ -1,7 +1,15 @@ #!/bin/bash echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize +else + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then + echo 'done.' else echo 'failed.' Modified: webservices/axis2/trunk/c/guththila/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/guththila/configure.ac (original) +++ webservices/axis2/trunk/c/guththila/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,8 +5,11 @@ AC_INIT(guththilac-src, 0.91_pre) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +dnl AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr/local/guththila) + +m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) dnl Checks for programs. AC_PROG_CC Modified: webservices/axis2/trunk/c/include/axis2_http_server.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_server.h?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/include/axis2_http_server.h (original) +++ webservices/axis2/trunk/c/include/axis2_http_server.h Sun Jun 3 22:56:31 2007 @@ -40,7 +40,7 @@ { #endif - int axis2_http_socket_read_timeout; + extern int axis2_http_socket_read_timeout; AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL axis2_http_server_create ( Modified: webservices/axis2/trunk/c/neethi/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/neethi/autogen.sh (original) +++ webservices/axis2/trunk/c/neethi/autogen.sh Sun Jun 3 22:56:31 2007 @@ -1,11 +1,19 @@ #!/bin/bash echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then - echo 'done.' +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize else - echo 'failed.' - exit 1 + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then + + echo 'done.' +else + echo 'failed.' + exit 1 fi echo -n 'Running aclocal...' Modified: webservices/axis2/trunk/c/neethi/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/neethi/configure.ac (original) +++ webservices/axis2/trunk/c/neethi/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,7 +5,9 @@ AC_INIT(neethi-src, 0.1) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +dnl AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE +m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) AC_PREFIX_DEFAULT(/usr/local/neethi) dnl Checks for programs. Modified: webservices/axis2/trunk/c/samples/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/samples/autogen.sh (original) +++ webservices/axis2/trunk/c/samples/autogen.sh Sun Jun 3 22:56:31 2007 @@ -1,12 +1,20 @@ #!/bin/bash - echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then - echo 'done.' +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize +else + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then + + echo 'done.' else - echo 'failed.' - exit 1 + echo 'failed.' + exit 1 fi + echo -n 'Running aclocal...' if aclocal > /dev/null 2>&1; then Modified: webservices/axis2/trunk/c/samples/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/samples/configure.ac (original) +++ webservices/axis2/trunk/c/samples/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,7 +5,9 @@ AC_INIT(axis2c-sample-src, 1.0.0) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +dnl AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE +m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) AC_PREFIX_DEFAULT(/usr/local/axis2c) dnl Checks for programs. Modified: webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c (original) +++ webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c Sun Jun 3 22:56:31 2007 @@ -27,6 +27,7 @@ #include <axutil_error_default.h> #include <axiom_xml_reader.h> #include <signal.h> +int axis2_http_socket_read_timeout = AXIS2_HTTP_DEFAULT_SO_TIMEOUT; struct axis2_http_svr_thread { Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/Makefile.am?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/src/core/transport/http/sender/Makefile.am (original) +++ webservices/axis2/trunk/c/src/core/transport/http/sender/Makefile.am Sun Jun 3 22:56:31 2007 @@ -1,33 +1,39 @@ SUBDIRS=ssl libcurl lib_LTLIBRARIES = libaxis2_http_sender.la -libaxis2_http_sender_la_SOURCES = http_transport_sender.c\ - http_sender.c\ - http_client.c -libaxis2_http_sender_la_LIBADD = $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la\ - $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\ - $(top_builddir)/axiom/src/om/libaxis2_axiom.la\ - $(top_builddir)/util/src/libaxutil.la if AXIS2_LIBCURL_ENABLED -libaxis2_http_sender_la_SOURCES +=libcurl/axis2_libcurl.c\ - libcurl/libcurl_stream.c - -libaxis2_http_sender_la_LIBADD +=-lssl\ - -lcrypto\ - -lcurl\ - -ldl\ - -lz +LIBCURL_SOURCES=libcurl/axis2_libcurl.c\ + libcurl/libcurl_stream.c +LIBCURL_LIBS=-lssl -lcrypto -lcurl -ldl -lz +else +LIBCURL_SOURCES= +LIBCURL_LIBS= endif if AXIS2_SSL_ENABLED -libaxis2_http_sender_la_SOURCES += ssl/ssl_stream.c\ - ssl/ssl_utils.c -libaxis2_http_sender_la_LIBADD += -lssl\ - -lcrypto +SSL_SOURCES = ssl/ssl_stream.c\ + ssl/ssl_utils.c +SSL_LIBS = -lssl -lcrypto +else +SSL_SOURCES= +SSL_LIBS= endif + +libaxis2_http_sender_la_SOURCES = http_transport_sender.c \ + http_sender.c \ + http_client.c \ + $(SSL_SOURCES) \ + $(LIBCURL_SOURCES) + +libaxis2_http_sender_la_LIBADD = $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la\ + $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\ + $(top_builddir)/axiom/src/om/libaxis2_axiom.la\ + $(top_builddir)/util/src/libaxutil.la\ + $(LIBCURL_LIBS)\ + $(SSL_LIBS) INCLUDES = -I$(top_builddir)/include \ Modified: webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c (original) +++ webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c Sun Jun 3 22:56:31 2007 @@ -98,7 +98,6 @@ int port = 9090; const axis2_char_t *repo_path = "../"; - axis2_http_socket_read_timeout = AXIS2_HTTP_DEFAULT_SO_TIMEOUT; while ((c = AXIS2_GETOPT(argc, argv, ":p:r:ht:l:f:")) != -1) { Modified: webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am (original) +++ webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am Sun Jun 3 22:56:31 2007 @@ -6,21 +6,8 @@ addr_out_handler.c \ mod_addr.c -libaxis2_mod_addr_la_LIBADD = $(top_builddir)/src/core/engine/libaxis2_engine.la \ - $(top_builddir)/axiom/src/om/libaxis2_axiom.la \ +libaxis2_mod_addr_la_LIBADD = $(top_builddir)/axiom/src/om/libaxis2_axiom.la \ $(top_builddir)/util/src/libaxutil.la - -lib_LTLIBRARIES = libaxis2.la -libaxis2_la_SOURCES = addr_in_handler.c \ - addr_out_handler.c \ - mod_addr.c - -libaxis2_la_LIBADD = $(top_builddir)/src/core/engine/libaxis2_engine.la \ - $(top_builddir)/axiom/src/om/libaxis2_axiom.la \ - $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la \ - $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \ - $(top_builddir)/axiom/src/parser/${WRAPPER_DIR}/libaxis2_parser.la - INCLUDES = -I$(top_builddir)/include \ Modified: webservices/axis2/trunk/c/src/modules/mod_log/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_log/Makefile.am?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/src/modules/mod_log/Makefile.am (original) +++ webservices/axis2/trunk/c/src/modules/mod_log/Makefile.am Sun Jun 3 22:56:31 2007 @@ -7,7 +7,6 @@ mod_log.c libaxis2_mod_log_la_LIBADD = \ - $(top_builddir)/src/core/engine/libaxis2_engine.la \ $(top_builddir)/util/src/libaxutil.la \ $(top_builddir)/axiom/src/om/libaxis2_axiom.la Modified: webservices/axis2/trunk/c/test/core/transport/Makefile.am URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/Makefile.am?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/test/core/transport/Makefile.am (original) +++ webservices/axis2/trunk/c/test/core/transport/Makefile.am Sun Jun 3 22:56:31 2007 @@ -1,2 +1 @@ -TESTS = SUBDIRS = http Modified: webservices/axis2/trunk/c/util/autogen.sh URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/autogen.sh?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/util/autogen.sh (original) +++ webservices/axis2/trunk/c/util/autogen.sh Sun Jun 3 22:56:31 2007 @@ -1,7 +1,14 @@ #!/bin/bash echo -n 'Running libtoolize...' -if libtoolize --force > /dev/null 2>&1; then +if [ `uname -s` = Darwin ] +then + export LIBTOOLIZE=glibtoolize +else + export LIBTOOLIZE=libtoolize +fi + +if $LIBTOOLIZE --force > /dev/null 2>&1; then echo 'done.' else echo 'failed.' Modified: webservices/axis2/trunk/c/util/configure.ac URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/configure.ac?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/util/configure.ac (original) +++ webservices/axis2/trunk/c/util/configure.ac Sun Jun 3 22:56:31 2007 @@ -5,7 +5,7 @@ AC_INIT(axis2_util-src, 1.0.0) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-ustar]) +AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr/local/axis2_util) dnl Checks for programs. Modified: webservices/axis2/trunk/c/util/include/axutil_error.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_error.h?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/util/include/axutil_error.h (original) +++ webservices/axis2/trunk/c/util/include/axutil_error.h Sun Jun 3 22:56:31 2007 @@ -574,7 +574,7 @@ be inserted so that another new module can know about the already occupied spaces. */ - const axis2_char_t* axutil_error_messages[AXIS2_ERROR_LAST + 10000]; + extern const axis2_char_t* axutil_error_messages[]; struct axutil_error; typedef enum axis2_status_codes axis2_status_codes_t; typedef enum axutil_error_codes axutil_error_codes_t; Modified: webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h (original) +++ webservices/axis2/trunk/c/util/include/platforms/unix/axutil_unix.h Sun Jun 3 22:56:31 2007 @@ -19,9 +19,7 @@ #ifndef AXIS2_UNIX_H #define AXIS2_UNIX_H -#ifdef IS_MACOSX - #include <config.h> -#endif +#include <config.h> /** * @file axutil_unix.h @@ -188,10 +186,18 @@ /** * Platform specific path separator char */ -#define AXIS2_PATH_SEP_CHAR '/' -#define AXIS2_PATH_SEP_STR "/" -#define AXIS2_LIB_PREFIX "lib" -#define AXIS2_LIB_SUFFIX ".so" +#ifdef IS_MACOSX + #define AXIS2_PATH_SEP_CHAR '/' + #define AXIS2_PATH_SEP_STR "/" + #define AXIS2_LIB_PREFIX "lib" + #define AXIS2_LIB_SUFFIX ".dylib" +#else + #define AXIS2_PATH_SEP_CHAR '/' + #define AXIS2_PATH_SEP_STR "/" + #define AXIS2_LIB_PREFIX "lib" + #define AXIS2_LIB_SUFFIX ".so" +#endif + /** * Platform specific time Modified: webservices/axis2/trunk/c/util/src/error.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?view=diff&rev=544060&r1=544059&r2=544060 ============================================================================== --- webservices/axis2/trunk/c/util/src/error.c (original) +++ webservices/axis2/trunk/c/util/src/error.c Sun Jun 3 22:56:31 2007 @@ -18,6 +18,8 @@ #include <stdlib.h> #include "axutil_error_default.h" +const axis2_char_t* axutil_error_messages[AXIS2_ERROR_LAST + 10000]; + AXIS2_EXTERN axis2_status_t AXIS2_CALL axutil_error_init() { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]