Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix failure to find WSDL2C.sh when it is not +x

  • Loading branch information...
commit c7499b93cb894023d39f1bdbc52a62225a50ed52 1 parent 0e47422
@gholms gholms authored
Showing with 12 additions and 2 deletions.
  1. +6 −1 configure
  2. +6 −1 configure.ac
View
7 configure
@@ -4456,7 +4456,7 @@ else
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$AXIS2C_HOME/bin/tools/wsdl2c:$PATH"
+as_dummy="${AXIS2C_HOME}/bin/tools/wsdl2c:$PATH"
for as_dir in $as_dummy
do
IFS=$as_save_IFS
@@ -4485,6 +4485,11 @@ fi
fi
+## HACK: Sometimes WSDL2C.sh isn't executable for some reason. We call sh on
+## it directly, so look for a non-executable file just in case.
+if test -z "$WSDL2C" && test -f ${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh; then
+ WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
+fi
# check if we found WSDL2C.sh
if test -z "$WSDL2C" ; then
as_fn_error $? "Cannot find WSDL2C.sh!" "$LINENO" 5
View
7 configure.ac
@@ -142,7 +142,12 @@ AC_PATH_PROG(RM, rm)
if test -z "$WSDL2C"; then
# let's search for WSDL2C.sh
- AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
+ AC_PATH_PROG([WSDL2C], WSDL2C.sh,,${AXIS2C_HOME}/bin/tools/wsdl2c:$PATH)
+fi
+## HACK: Sometimes WSDL2C.sh isn't executable for some reason. We call sh on
+## it directly, so look for a non-executable file just in case.
+if test -z "$WSDL2C" && test -f ${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh; then
+ WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
fi
# check if we found WSDL2C.sh
if test -z "$WSDL2C" ; then
Please sign in to comment.
Something went wrong with that request. Please try again.