axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r452071 - in /webservices/axis2/trunk/c: Makefile.am configure.ac
Date Mon, 02 Oct 2006 15:22:36 GMT
Author: pini
Date: Mon Oct  2 08:22:35 2006
New Revision: 452071

URL: http://svn.apache.org/viewvc?view=rev&rev=452071
Log:
Removing rampart from default build.

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

Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=452071&r1=452070&r2=452071
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Mon Oct  2 08:22:35 2006
@@ -1,7 +1,7 @@
 datadir=$(prefix)
 logsdir=$(prefix)/logs
 docsdir=$(prefix)/docs
-SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart $(TESTDIR) include
ides
+SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules $(RAMPART_DIR) $(TESTDIR)
include ides
 include_HEADERS=$(top_builddir)/include/*.h
 data_DATA= samples/server/axis2.xml README \
 	INSTALL CREDITS COPYING NEWS config.guess missing install-sh depcomp config.sub ltmain.sh

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=452071&r1=452070&r2=452071
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Mon Oct  2 08:22:35 2006
@@ -38,10 +38,6 @@
     AC_CONFIG_SUBDIRS(woden)
 fi
 
-if test -d $srcdir/rampart; then
-    AC_CONFIG_SUBDIRS(rampart)
-fi
-
 #CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
@@ -79,8 +75,7 @@
 
 dnl This is a check to see if we are running MacOS X
 dnl It may be better to do a Darwin check
-AC_CHECK_HEADERS([sys/appleapiopts.h])
-
+AC_CHECK_HEADERS([sys/appleapiopts.h]) 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
@@ -89,6 +84,26 @@
 AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
+AC_MSG_CHECKING(whether to build rampart )
+AC_ARG_ENABLE(rampart, [  --enable-rampart build ramprt. default=no],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    RAMPART_DIR=""
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    RAMPART_DIR="rampart"
+    if test -d $srcdir/rampart; then
+        AC_CONFIG_SUBDIRS(rampart)
+    fi
+
+    ;;
+  esac ],
+  AC_MSG_RESULT(yes)
+  RAMPART_DIR="rampart"
+)
+
 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
@@ -279,6 +294,7 @@
 AC_SUBST(PARSER_DIR)
 AC_SUBST(WRAPPER_DIR)
 AC_SUBST(GUTHTHILA_DIR)
+AC_SUBST(RAMPART_DIR)
 #AC_SUBST(GUTHTHILA_LIBS)
 AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
 #export PARSER_DIR



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


Mime
View raw message