[wsf-c-dev] svn commit r329 - in wsf/c/build/axis2: . modules/core/transport/http/server/simple_axis2_server

[svn at wso2.com]

Author: sanjaya
Date: Fri Jan  5 03:42:49 2007
New Revision: 329

Modified:
   wsf/c/build/axis2/configure.ac
   wsf/c/build/axis2/modules/core/transport/http/server/simple_axis2_server/Makefile.am
Log:
Linking libraries giving relative path


Modified: wsf/c/build/axis2/configure.ac
==============================================================================
--- wsf/c/build/axis2/configure.ac	(original)
+++ wsf/c/build/axis2/configure.ac	Fri Jan  5 03:42:49 2007
@@ -130,6 +130,23 @@
   AC_MSG_RESULT(no)
 )
 
+AC_MSG_CHECKING(whether to build xmpp server)
+AC_ARG_ENABLE(xmpp, [  --enable-xmpp build simple xmpp server. default=no],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    XMPP_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    XMPP_DIR="xmpp"
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
+
 AC_MSG_CHECKING(whether to build libxml2 xml parser library)
 AC_ARG_ENABLE(libxml2, [  --enable-libxml2    build libxml2 xml parser library wrapper. default=yes],
 [ case "${enableval}" in
@@ -185,7 +202,7 @@
     AC_MSG_RESULT(yes)
     dnl Find apache2 include dir in the path pointed by APACHE2_HOME env variable
     if test -d $withval; then
-        apache2inc="-I$withval/include"
+        apache2inc="-I$withval"
     dnl else find the apache2 include dir in /usr/local/apache2
     elif test -d '/usr/include/apache2'; then
         apache2inc="-I/usr/include/apache2"
@@ -209,7 +226,7 @@
     AC_MSG_RESULT(yes)
     dnl Find apr include dir in the path
     if test -d $withval; then
-        aprinc="-I$withval/include"
+        aprinc="-I$withval"
     dnl else find the apache2 include dir in /usr/local/apache2
     elif test -d '/usr/include/apr-0'; then
         aprinc="-I/usr/include/apr-0"
@@ -316,13 +333,13 @@
 AC_SUBST(APACHE2INC)
 AC_SUBST(APRINC)
 AC_SUBST(DICLIENT_DIR)
-AC_SUBST(TESTDIR)
 AC_SUBST(SAMPLES)
 AC_SUBST(APACHE2BUILD)
 AC_SUBST(PARSER_DIR)
 AC_SUBST(WRAPPER_DIR)
 AC_SUBST(GUTHTHILA_DIR)
 AC_SUBST(RAMPART_DIR)
+AC_SUBST(XMPP_DIR)
 AC_SUBST(GUTHTHILA_LIBS)
 AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
 #export PARSER_DIR
@@ -337,12 +354,18 @@
     modules/core/engine/Makefile \
     modules/core/addr/Makefile \
     modules/core/phaseresolver/Makefile \
+    modules/core/transport/Makefile \
+    modules/core/transport/xmpp/Makefile \
+    modules/core/transport/xmpp/server/Makefile \
+    modules/core/transport/xmpp/sender/Makefile \
+    modules/core/transport/xmpp/receiver/Makefile \
+    modules/core/transport/xmpp/server/simple_xmpp_server/Makefile \
     modules/core/transport/http/Makefile \
     modules/core/transport/http/sender/Makefile \
+    modules/core/transport/http/sender/ssl/Makefile \
     modules/core/transport/http/receiver/Makefile \
     modules/core/transport/http/server/simple_axis2_server/Makefile \
     modules/core/transport/http/server/Makefile \
-    modules/core/transport/http/server/apache2/Makefile \
     modules/core/deployment/Makefile \
     modules/core/clientapi/Makefile \
     modules/core/receivers/Makefile \
@@ -351,24 +374,6 @@
     modules/wsdl/builder/Makefile \
     modules/mod_addr/Makefile \
     modules/mod_log/Makefile \
-    test/Makefile \
-    test/wsdl/Makefile \
-    test/wsdl/builder/Makefile \
-    test/wsdl/builder/print/Makefile \
-    test/core/Makefile \
-    test/core/description/Makefile \
-    test/core/clientapi/Makefile \
-    test/core/deployment/Makefile \
-    test/core/context/Makefile \
-    test/core/engine/Makefile \
-    test/core/addr/Makefile \
-    test/core/transport/Makefile\
-    test/core/transport/http/Makefile \
-    test/itest/Makefile \
-    test/itest/whitemesa/Makefile \
-    test/itest/whitemesa/round1/Makefile \
-    test/itest/whitemesa/round2/Makefile \
-    test/tools/Makefile \
     ides/Makefile \
     ides/anjuta/Makefile \
     include/Makefile \

Modified: wsf/c/build/axis2/modules/core/transport/http/server/simple_axis2_server/Makefile.am
==============================================================================
--- wsf/c/build/axis2/modules/core/transport/http/server/simple_axis2_server/Makefile.am	(original)
+++ wsf/c/build/axis2/modules/core/transport/http/server/simple_axis2_server/Makefile.am	Fri Jan  5 03:42:49 2007
@@ -5,13 +5,12 @@
 axis2_http_server_SOURCES = http_server_main.c
 
 axis2_http_server_LDADD   =  $(LDFLAGS) \
-							-L$(AXIS2C_HOME)/lib \
                             -L$(top_builddir)/modules/wsdl \
                             -L$(top_builddir)/modules/core/engine \
                             -L$(top_builddir)/modules/core/transport/http/sender \
                             -L$(top_builddir)/modules/core/transport/http/receiver \
-							 -L../../../../../../axiom/src/om \
-							 -L../../../../../../util/src \
+							-L../../../../../../axiom/src/om \
+							-L../../../../../../util/src \
 							../../../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 							$(top_builddir)/woden/src/wsdl20/libwoden.la \
 							$(top_builddir)/xml_schema/src/libaxis2_xml_schema.la \