You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/07/21 12:59:44 UTC
cvs commit: ws-axis/c build.sh configure.ac
damitha 2004/07/21 03:59:44
Modified: c build.sh configure.ac
Log:
Revision Changes Path
1.9 +0 -8 ws-axis/c/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/ws-axis/c/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.sh 20 Jul 2004 13:06:58 -0000 1.8
+++ build.sh 21 Jul 2004 10:59:44 -0000 1.9
@@ -30,11 +30,3 @@
echo "make install"
make install
-echo "Copy configuration files"
-cp -f $AXISCPP_HOME/deploy/axiscpp.conf_linux $AXISCPP_DEPLOY/axiscpp.conf
-cp -rf $AXISCPP_HOME/deploy/conf $AXISCPP_DEPLOY/
-echo "Copy deploying files"
-cp -f $AXISCPP_HOME/deploy/deploy_apache.sh $AXISCPP_DEPLOY/
-cp -f $AXISCPP_HOME/deploy/deploy_apache2.sh $AXISCPP_DEPLOY/
-echo "Copy the log directory"
-cp -rf $AXISCPP_HOME/deploy/log $AXISCPP_DEPLOY/
1.34 +27 -10 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.ac 20 Jul 2004 12:29:21 -0000 1.33
+++ configure.ac 21 Jul 2004 10:59:44 -0000 1.34
@@ -11,12 +11,12 @@
;;
*)
AC_MSG_RESULT(yes)
- dnl find the apache2 include dir in /usr/local/apache2
- if test -d '/usr/local/apache2/include'; then
- apache2inc="-I/usr/local/apache2/include"
- dnl else find it in the APACHE2_HOME env variable
- elif test -d ${APACHE2_HOME}; then
+ dnl Find apache2 include dir in the path pointed by APACHE2_HOME env variable
+ if test -d ${APACHE2_HOME}; then
apache2inc="-I${APACHE2_HOME}/include"
+ dnl else find the apache2 include dir in /usr/local/apache2
+ elif test -d '/usr/local/apache2/include'; then
+ apache2inc="-I/usr/local/apache2/include"
else
AC_MSG_ERROR(could not find apache2. stop)
fi
@@ -35,12 +35,12 @@
;;
*)
AC_MSG_RESULT(yes)
- dnl find the apache include dir in /usr/local/apache
- if test -d '/usr/local/apache/include'; then
- apacheinc="-I/usr/local/apache/include"
- dnl else find it in the APACHE_HOME env variable
- elif test -d ${APACHE_HOME}; then
+ dnl Find apache include dir in the path pointed by APACHE_HOME env variable
+ if test -d ${APACHE_HOME}; then
apacheinc="-I${APACHE_HOME}/include"
+ dnl else find the apache include dir in /usr/local/apache
+ elif test -d '/usr/local/apache/include'; then
+ apacheinc="-I/usr/local/apache/include"
else
AC_MSG_ERROR(could not find apache. stop)
exit
@@ -130,6 +130,23 @@
esac ],
AC_MSG_RESULT(no)
)
+
+if test -d "$prefix/conf"; then
+cp deploy/axiscpp.conf_linux $prefix/conf/axiscpp.conf
+else
+mkdir $prefix/conf
+cp deploy/conf/server.wsdd_linux $prefix/conf/server.wsdd
+cp deploy/axiscpp.conf_linux $prefix/axiscpp.conf
+cp deploy/deploy_apache2.sh $prefix
+cp deploy/deploy_apache.sh $prefix
+fi
+
+if test -d "$prefix/log"; then
+chmod -R 777 $prefix/log
+else
+mkdir $prefix/log
+chmod -R 777 $prefix/log
+fi
APACHE2INC=$apache2inc
APACHEINC=$apacheinc