You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by sa...@apache.org on 2006/06/21 08:31:44 UTC

svn commit: r415925 - in /webservices/sandesha/trunk/c: INSTALL build.sh configure.ac src/wsrm/Makefile.am

Author: sahan
Date: Tue Jun 20 23:31:44 2006
New Revision: 415925

URL: http://svn.apache.org/viewvc?rev=415925&view=rev
Log:
Changing the build to search (or to specify) axis2 include only

Modified:
    webservices/sandesha/trunk/c/INSTALL
    webservices/sandesha/trunk/c/build.sh
    webservices/sandesha/trunk/c/configure.ac
    webservices/sandesha/trunk/c/src/wsrm/Makefile.am

Modified: webservices/sandesha/trunk/c/INSTALL
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/INSTALL?rev=415925&r1=415924&r2=415925&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/INSTALL (original)
+++ webservices/sandesha/trunk/c/INSTALL Tue Jun 20 23:31:44 2006
@@ -6,7 +6,7 @@
         - Download Axis2C from http://ws.apache.org/axis2/c/download.cgi and
           install.
     - Go to Sandesha2C source directory
-    - Run configure with AXIS2_UTILS include path and AXIOM include path.
-        ./configure --prefix=<install_dir> --enable-static=no --with-axis2_util=<axis2_util_path> --with-axiom=<axiom_path>
+    - Run configure with AXIS2 include path.
+        ./configure --prefix=<install_dir> --enable-static=no --with-axis2=<axis2_install_path>
     - Run make and make install
     

Modified: webservices/sandesha/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/build.sh?rev=415925&r1=415924&r2=415925&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/build.sh (original)
+++ webservices/sandesha/trunk/c/build.sh Tue Jun 20 23:31:44 2006
@@ -1,5 +1,5 @@
 #!/bin/bash
 ./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include 
 make
 make install

Modified: webservices/sandesha/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?rev=415925&r1=415924&r2=415925&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Tue Jun 20 23:31:44 2006
@@ -38,57 +38,32 @@
 AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Sandesha2C)
-AC_ARG_WITH(axiom,
-[  --with-axiom[=PATH]      use axiom.],
+AC_MSG_CHECKING(To Use Axis2C . This is a compulsory to build Sandesha2C)
+AC_ARG_WITH(axis2,
+[  --with-axis2[=PATH]      use axis2c.],
 [ case "$withval" in
   no)
     AC_MSG_RESULT(no)
     ;;
   *)
     AC_MSG_RESULT(yes)
-    dnl Find axiom include dir in the path
+    dnl Find axis2 include dir in the path
     if test -d $withval; then
-        axiominc="-I$withval"
-    dnl else find the axiom include dir in $(AXIS2C_HOME)/include
+        axis2inc="-I$withval"
+    dnl else find the axis2inc include dir in $(AXIS2C_HOME)/include
     elif test -d '$(AXIS2C_HOME)/include'; then
-        axiominc="-I$(AXIS2C_HOME)/include"
+        axis2inc="-I$(AXIS2C_HOME)/include"
     else
-        AC_MSG_ERROR(could not find axiom. stop)
+        AC_MSG_ERROR(could not find axis2inc. stop)
     fi
     ;;
   esac ],
   AC_MSG_RESULT(no)
 )
 
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Sandesha2C)
-AC_ARG_WITH(axis2_util,
-[  --with-axis2_util[=PATH]      use axis2_util.],
-[ case "$withval" in
-  no)
-    AC_MSG_RESULT(no)
-    ;;
-  *)
-    AC_MSG_RESULT(yes)
-    dnl Find axis2_util include dir in the path
-    if test -d $withval; then
-        axis2_utilinc="-I$withval"
-    dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
-    elif test -d '$(AXIS2C_HOME)/include'; then
-        axis2_utilinc="-I$(AXIS2C_HOME)/include"
-    else
-        AC_MSG_ERROR(could not find axis2_util. stop)
-    fi
-    ;;
-  esac ],
-  AC_MSG_RESULT(no)
-)
-
-UTILINC=$axis2_utilinc
-AXIOMINC=$axiominc
+AXIS2INC=$axis2inc
 
-AC_SUBST(UTILINC)
-AC_SUBST(AXIOMINC)
+AC_SUBST(AXIS2INC)
 
 AC_CONFIG_FILES([Makefile
     src/Makefile \

Modified: webservices/sandesha/trunk/c/src/wsrm/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/Makefile.am?rev=415925&r1=415924&r2=415925&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/wsrm/Makefile.am Tue Jun 20 23:31:44 2006
@@ -26,5 +26,4 @@
                                terminate_seq_res.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIOMINC@ \
-            @UTILINC@
+            @AXIS2INC@



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