svn commit: r559399 - /webservices/axis2/trunk/c/configure.ac

[da...@apache.org]

Author: damitha
Date: Wed Jul 25 04:19:19 2007
New Revision: 559399

URL: http://svn.apache.org/viewvc?view=rev&rev=559399
Log:
change xmpp configure options so that user can give the path to include files

Modified:
    webservices/axis2/trunk/c/configure.ac

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=559399&r1=559398&r2=559399
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Jul 25 04:19:19 2007
@@ -2,13 +2,11 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT(axis2c-src, 1.1.0)
+AC_INIT(axis2c-src, 1.0.0)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-dnl AM_INIT_AUTOMAKE([tar-ustar])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-ustar])
 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
@@ -100,7 +98,6 @@
 dnl It may be better to do a Darwin check
 AC_CHECK_HEADERS([sys/appleapiopts.h]) 
 dnl Checks for typedefs, structures, and compiler characteristics.
-dnl AC_C_CONST
 
 dnl Checks for library functions.
 dnl AC_FUNC_MALLOC
@@ -153,7 +150,7 @@
 )
 
 AC_MSG_CHECKING(whether to build tcp transport)
-AC_ARG_ENABLE(tcp, [  --enable-tcp    
+AC_ARG_ENABLE(tcp, [  --enable-tcp
                           build tcp transport (default=no)],
 [ case "${enableval}" in
   no)
@@ -317,13 +314,82 @@
   CFLAGS="$CFLAGS"
 )
 
+AC_MSG_CHECKING(whether to use xmpp as server transport)
+AC_ARG_WITH(xmpp,
+[  --with-xmpp[=PATH]   Whether to build xmpp   .
+    ],
+[ case "$withval" in
+  no)
+    AC_MSG_RESULT(no)
+    XMPP_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    dnl Find xmpp include dir
+    if test -d $withval; then
+        iksemelinc="-I$withval"
+    	XMPP_DIR="xmpp"
+    dnl else find the include dir in /usr/include
+    elif test -d '/usr/include'; then
+        iksemelinc="-I/usr/include"
+    	XMPP_DIR="xmpp"
+    else
+        AC_MSG_ERROR(could not find xmpp. stop)
+    fi
+	XMPP_DIR="xmpp"
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
+AC_MSG_CHECKING(whether to use gssapi)
+AC_ARG_ENABLE(openssl, [  --enable-gssapi      enable gssapi (default=no)],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    CFLAGS="$CFLAGS"
+    gssapi_enabled=false
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    CFLAGS="$CFLAGS -DAXIS2_XMPP_GSSAPI"
+    gssapi_enabled=true
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+  CFLAGS="$CFLAGS"
+)
+
+#AC_MSG_CHECKING(whether to build xmpp)
+#AC_ARG_ENABLE(xmpp, [  --enable-xmpp
+#                          enable xmpp build (default=no)],
+#[ case "${enableval}" in
+#  no)
+#    AC_MSG_RESULT(no)
+#    CFLAGS="$CFLAGS"
+#    xmpp_enabled=false
+#    ;;
+#  *)
+#    AC_MSG_RESULT(yes)
+#    XMPP_DIR="xmpp"
+#    CFLAGS="$CFLAGS -DAXIS2_XMPP_ENABLED"
+#    xmpp_enabled=false
+#    ;;
+#  esac ],
+#  AC_MSG_RESULT(no)
+#  CFLAGS="$CFLAGS"
+#)
+
+
 APACHE2INC=$apache2inc
+IKSEMELINC=$iksemelinc
 APRINC=$aprinc
 VERSION_NO="1:0:1"
 
 AC_SUBST(VERSION_NO)
 AC_SUBST(PARSER_LIBS)
 AC_SUBST(APACHE2INC)
+AC_SUBST(IKSEMELINC)
 AC_SUBST(APRINC)
 AC_SUBST(DICLIENT_DIR)
 AC_SUBST(TESTDIR)
@@ -331,11 +397,15 @@
 AC_SUBST(APACHE2BUILD)
 AC_SUBST(PARSER_DIR)
 AC_SUBST(WRAPPER_DIR)
-AC_SUBST(GUTHTHILA_DIR)
+AC_SUBST(XMPP_DIR)
 AC_SUBST(TCP_DIR)
+AC_SUBST(GUTHTHILA_DIR)
 AC_SUBST(GUTHTHILA_LIBS)
 AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
 AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
+AM_CONDITIONAL(AXIS2_XMPP_GSSAPI, test x$gssapi_enabled = xtrue)
+AM_CONDITIONAL(AXIS2_XMPP_ENABLED, test x$xmpp_enabled = xtrue)
+
 #export PARSER_DIR
 export WRAPPER_DIR
 export prefix 
@@ -364,6 +434,11 @@
     src/core/transport/tcp/receiver/Makefile \
     src/core/transport/tcp/server/Makefile \
     src/core/transport/tcp/server/simple_tcp_server/Makefile \
+    src/core/transport/xmpp/Makefile \
+    src/core/transport/xmpp/sender/Makefile \
+    src/core/transport/xmpp/receiver/Makefile \
+    src/core/transport/xmpp/server/Makefile \
+    src/core/transport/xmpp/server/simple_xmpp_server/Makefile \
     src/core/deployment/Makefile \
     src/core/clientapi/Makefile \
     src/core/receivers/Makefile \
@@ -379,7 +454,7 @@
     test/core/context/Makefile \
     test/core/engine/Makefile \
     test/core/addr/Makefile \
-    test/core/transport/Makefile \
+    test/core/transport/Makefile\
     test/core/transport/http/Makefile \
     ides/Makefile \
     include/Makefile \



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org