Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

WSDL2C.sh is now discovered with autoconf. Fixed dependency in suse (…

…java

is now what we depend on at runtime).
  • Loading branch information...
commit ede1781e5955478c75dfc54054fb02732c65a0c2 1 parent 4736c23
graziano obertelli authored
View
1  Makedefs.in
@@ -44,3 +44,4 @@ INCLUDES = @INCLUDES@
LIBS = @LIBS@
INSTALL = @INSTALL@
ANT = @ANT@ -e
+WSDL2C = @WSDL2C@
View
2  cluster/Makefile
@@ -12,7 +12,7 @@ SERVICE_SO=libEucalyptusCC.so
SERVICE_NAME=EucalyptusCC
CLIENT=CCclient
CLIENTKILLALL=euca_killall
-WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
+#WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
NCLIBS=../util/data.o ../node/client-marshal-adb.o ../util/ipc.o
SCLIBS=../storage/storage.o
VNLIBS=../net/vnetwork.o ../util/misc.o
View
41 configure
@@ -646,6 +646,7 @@ LIBVIRT_HOME
AXIS2_HOME
AXIS2C_HOME
JAVA_HOME
+WSDL2C
TOP
VERSION
LIBOBJS
@@ -3620,6 +3621,7 @@ AXIS2_HOME="${AXIS2_HOME}"
LIBVIRT_HOME="${LIBVIRT_HOME}"
ANT=""
JAVA=""
+WSDL2C=""
java_min_version="1.6.0"
ant_min_version="1.6.5"
@@ -4558,6 +4560,44 @@ $as_echo "no" >&6; }
fi
+# let's search for WSDL2C.sh
+# we cannot use AC_PROG_PATH because WSDL2C.sh is not executable
+#AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
+WSDL2C=$AXIS2C_HOME/bin/tools/wsdl2c/WSDL2C.sh
+as_ac_File=`$as_echo "ac_cv_file_$WSDL2C" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $WSDL2C" >&5
+$as_echo_n "checking for $WSDL2C... " >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ $as_echo_n "(cached) " >&6
+else
+ test "$cross_compiling" = yes &&
+ { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$WSDL2C"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval 'as_val=${'$as_ac_File'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_File'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
+ :
+else
+ WSDL2C=""
+fi
+
+if test -z "$WSDL2C" ; then
+ { { $as_echo "$as_me:$LINENO: error: Cannot find WSDL2C.sh!" >&5
+$as_echo "$as_me: error: Cannot find WSDL2C.sh!" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
# we need JAVA_HOME
if test -z "$JAVA_HOME" ; then
{ { $as_echo "$as_me:$LINENO: error: JAVA_HOME is not defined!" >&5
@@ -10663,6 +10703,7 @@ _ACEOF
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
View
11 configure.ac
@@ -32,6 +32,7 @@ AXIS2_HOME="${AXIS2_HOME}"
LIBVIRT_HOME="${LIBVIRT_HOME}"
ANT=""
JAVA=""
+WSDL2C=""
java_min_version="1.6.0"
ant_min_version="1.6.5"
@@ -83,6 +84,15 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
+# let's search for WSDL2C.sh
+# we cannot use AC_PROG_PATH because WSDL2C.sh is not executable
+#AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
+WSDL2C=$AXIS2C_HOME/bin/tools/wsdl2c/WSDL2C.sh
+AC_CHECK_FILE($WSDL2C,,WSDL2C="")
+if test -z "$WSDL2C" ; then
+ AC_MSG_ERROR([Cannot find WSDL2C.sh!])
+fi
+
# we need JAVA_HOME
if test -z "$JAVA_HOME" ; then
AC_MSG_ERROR([JAVA_HOME is not defined!])
@@ -189,6 +199,7 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_SUBST(VERSION)
AC_SUBST(TOP)
AC_SUBST(ANT)
+AC_SUBST(WSDL2C)
AC_SUBST(JAVA_HOME)
AC_SUBST(AXIS2C_HOME)
AC_SUBST(AXIS2_HOME)
View
2  eucalyptus.spec.suse
@@ -22,7 +22,7 @@ eucalyptus-cloud, eucalyptus-cc or eucalyptus-nc (or all of them).
%package cloud
Summary: Elastic Utility Computing Architecture - cloud controller
-Requires: eucalyptus >= 1.5.1, java-sdk >= 1.6.0, ant, ant-nodeps, lvm2
+Requires: eucalyptus >= 1.5.1, java >= 1.6.0, ant, ant-nodeps, lvm2
Group: Applications/System
%description cloud
View
2  gatherlog/Makefile
@@ -10,7 +10,7 @@ GLWSDL=$(WSDLPATH)/$(GLWSDLNAME)
SERVICE_SO=libEucalyptusGL.so
SERVICE_NAME=EucalyptusGL
CLIENT=GLclient
-WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
+#WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
all: server client
View
2  node/Makefile
@@ -9,7 +9,7 @@ NCWSDLNAME=eucalyptus_nc.wsdl
SERVICE_SO=libEucalyptusNC.so
SERVICE_NAME=EucalyptusNC
CLIENT=NCclient
-WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
+#WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
NC_LIBS = $(LIBS) -lvirt -lcurl
NC_HANDLERS=handlers_xen.o handlers_kvm.o
Please sign in to comment.
Something went wrong with that request. Please try again.