Permalink
Browse files

Fix missing WSDL2C lib (attempt 2)

  • Loading branch information...
1 parent e56770c commit 1fe927f3596092a85e7ed61c56c4563f79a274b5 @gholms gholms committed Jan 14, 2011
Showing with 10 additions and 6 deletions.
  1. +5 −3 configure
  2. +5 −3 configure.ac
View
@@ -4417,8 +4417,9 @@ fi
-# let's search for WSDL2C.sh
-# Extract the first word of "WSDL2C.sh", so it can be a program name with args.
+if test -z "$WSDL2C"; then
+ # let's search for WSDL2C.sh
+ # Extract the first word of "WSDL2C.sh", so it can be a program name with args.
set dummy WSDL2C.sh; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -4459,9 +4460,10 @@ $as_echo "no" >&6; }
fi
+fi
# check if we found WSDL2C.sh
if test -z "$WSDL2C" ; then
- as_fn_error $? "Cannot find WSDL2C.sh!" "$LINENO" 5
+ as_fn_error $? "Cannot find WSDL2C.sh!" "$LINENO" 5
fi
# we need JAVA_HOME
View
@@ -127,11 +127,13 @@ AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PATH_PROG(RM, rm)
-# let's search for WSDL2C.sh
-AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
+if test -z "$WSDL2C"; then
+ # let's search for WSDL2C.sh
+ AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
+fi
# check if we found WSDL2C.sh
if test -z "$WSDL2C" ; then
- AC_MSG_ERROR([Cannot find WSDL2C.sh!])
+ AC_MSG_ERROR([Cannot find WSDL2C.sh!])
fi
# we need JAVA_HOME

0 comments on commit 1fe927f

Please sign in to comment.