You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bu...@apache.org on 2004/10/07 21:29:12 UTC
DO NOT REPLY [Bug 31587] New: -
Problems with jakarta-tomcat-connectors/jk/native2/configure and HP-UX 11.0
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=31587>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=31587
Problems with jakarta-tomcat-connectors/jk/native2/configure and HP-UX 11.0
Summary: Problems with jakarta-tomcat-
connectors/jk/native2/configure and HP-UX 11.0
Product: Tomcat 5
Version: 5.0.28
Platform: HP
OS/Version: HP-UX
Status: NEW
Severity: Normal
Priority: Other
Component: Unknown
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: mark.horstman@sbc.com
I cannot get the jakarta-tomcat-connectors/jk/native2/configure script to work
without errors under HP-UX 11.0. The problems occur when the script does
something like:
if ${TEST} "${apxs_support}" = "false" ; then
or
if ${TEST} -z "$tempval" ; then
and the variable being tested has not been previously set. With 'set -x' turned
on to assist in debugging, the first test gives an error of:
+ /usr/bin/test = false
/usr/bin/test[7]: test: Specify a parameter with this command.
while the second ones gives:
+ /usr/bin/test -z
/usr/bin/test[7]: test: Specify a parameter with this command.
This style of variable checking is used extensively throughout the script.
Short of hacking each one to be something like:
if ${TEST} "${apxs_support}x" = "falsex" ; then
or
if ${TEST} "${tempval}x" = "x" ; then
does anyone have any ideas how I can get around this? Is this an autoconf
issue? I've tried re-generating the configure script using buildconf.sh by
installing GNU autoconf-2.58, automake-1.9.2 and libtool-1.5.8 but I get the
same problems.
DIFF PATCH TO FIX
---8<--- snip snip ---8<---
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/native2/configure.in
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/native2/configure.in
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/native2/configure.in
Sat Aug 28 19:14:22 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/native2/configure.in
Tue Oct 5 14:00:50 2004
***************
*** 157,163 ****
AC_SUBST(PCRE_LIBS)
dnl Check that at least one WEBSERVER has been given
! if ${TEST} -z "$WEBSERVERS" ; then
AC_MSG_ERROR(Cannot find any WebServer)
fi
--- 157,163 ----
AC_SUBST(PCRE_LIBS)
dnl Check that at least one WEBSERVER has been given
! if ${TEST} "${WEBSERVERS}x" = "x" ; then
AC_MSG_ERROR(Cannot find any WebServer)
fi
***************
*** 164,181 ****
AC_SUBST(WEBSERVERS)
dnl if --with-apr is specified, --with-apr-util must be too
! if ${TEST} ! -z "$APR_BUILD" -a -z "$APR_UTIL_DIR"; then
AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
fi
dnl apache 1.3 consistancy checks
! if ! ${TEST} -z "$APACHE_HOME" ; then
dnl check if apache 1.3 was selected without apr sources
! if ${TEST} -z "$APR_BUILD"; then
AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use --with-apr and
--with-apr-util])
fi
dnl make sure compiler matchs apxs
! if ${TEST} -n "$APACHE_CC" -a "$APACHE_CC" != "$CC"; then
AC_MSG_RESULT([error])
AC_MSG_RESULT([compiler discovered by configure: ${CC}])
AC_MSG_RESULT([compiler used by apache: ${APACHE_CC}])
--- 164,181 ----
AC_SUBST(WEBSERVERS)
dnl if --with-apr is specified, --with-apr-util must be too
! if ${TEST} "${APR_BUILD}x" != "x" -a "${APR_UTIL_DIR}x" = "x" ; then
AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
fi
dnl apache 1.3 consistancy checks
! if ${TEST} "${APACHE_HOME}x" != "x" ; then
dnl check if apache 1.3 was selected without apr sources
! if ${TEST} "${APR_BUILD}x" = "x" ; then
AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use --with-apr and
--with-apr-util])
fi
dnl make sure compiler matchs apxs
! if ${TEST} "${APACHE_CC}x" != "x" -a "${APACHE_CC}x" != "${CC}x"; then
AC_MSG_RESULT([error])
AC_MSG_RESULT([compiler discovered by configure: ${CC}])
AC_MSG_RESULT([compiler used by apache: ${APACHE_CC}])
***************
*** 185,197 ****
fi
dnl apache 2 consistancy checks
! if ${TEST} ! -z "$APACHE2_HOME" ; then
dnl check if apache 2 was selected with apr sources
! if ${TEST} ! -z "$APR_BUILD"; then
AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
fi
dnl make sure compiler matchs apxs
! if ${TEST} -n "$APACHE2_CC" -a "$APACHE2_CC" != "$CC"; then
AC_MSG_RESULT([error])
AC_MSG_RESULT([compiler discovered by configure: ${CC}])
AC_MSG_RESULT([compiler used by apache: ${APACHE2_CC}])
--- 185,197 ----
fi
dnl apache 2 consistancy checks
! if ${TEST} "${APACHE2_HOME}x" != "x" ; then
dnl check if apache 2 was selected with apr sources
! if ${TEST} "${APR_BUILD}x" != "x" ; then
AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
fi
dnl make sure compiler matchs apxs
! if ${TEST} "${APACHE2_CC}x" != "x" -a "${APACHE2_CC}x" != "${CC}x"; then
AC_MSG_RESULT([error])
AC_MSG_RESULT([compiler discovered by configure: ${CC}])
AC_MSG_RESULT([compiler used by apache: ${APACHE2_CC}])
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_apr.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_apr.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_apr.m4 Sat
Aug 28 19:14:24 2004
--- jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_apr.m4
Tue Oct 5 13:45:00 2004
***************
*** 78,84 ****
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} ! -z "$tempval" ; then
APR_BUILD="apr-build"
APR_CFLAGS="-I ${tempval}/include"
APR_CLEAN="apr-clean"
--- 78,84 ----
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} "${tempval}x" != "x" ; then
APR_BUILD="apr-build"
APR_CFLAGS="-I ${tempval}/include"
APR_CLEAN="apr-clean"
***************
*** 142,152 ****
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} -z "${APR_BUILD}"; then
AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
fi
! if ${TEST} ! -z "$tempval" ; then
APR_UTIL_DIR=${tempval}
APR_CFLAGS="${APR_CFLAGS} -I ${APR_UTIL_DIR}/include"
APR_UTIL_INCDIR="${APR_UTIL_DIR}/include"
--- 142,152 ----
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} "${APR_BUILD}x" = "x" ; then
AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
fi
! if ${TEST} "${tempval}x" != "x" ; then
APR_UTIL_DIR=${tempval}
APR_CFLAGS="${APR_CFLAGS} -I ${APR_UTIL_DIR}/include"
APR_UTIL_INCDIR="${APR_UTIL_DIR}/include"
***************
*** 207,213 ****
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} ! -z "$tempval" ; then
APR_BUILD=""
APR_CFLAGS="-I${tempval}"
APR_CLEAN=""
--- 207,213 ----
AC_MSG_ERROR(can't locate ${tempval}/$1)
fi
! if ${TEST} "${tempval}x" != "x" ; then
APR_BUILD=""
APR_CFLAGS="-I${tempval}"
APR_CLEAN=""
***************
*** 250,256 ****
AC_MSG_ERROR(Not a directory: ${tempval})
fi
! if ${TEST} ! -z "$tempval" ; then
APR_BUILD=""
APR_CLEAN=""
APR_DIR=""
--- 250,256 ----
AC_MSG_ERROR(Not a directory: ${tempval})
fi
! if ${TEST} "${tempval}x" != "x" ; then
APR_BUILD=""
APR_CLEAN=""
APR_DIR=""
***************
*** 282,288 ****
AC_MSG_ERROR([cannot find apr-config file in $2])
fi
jk_apr_get_tempval=`$2/apr-config --link-libtool 2> /dev/null`
! if ${TEST} -z "${jk_apr_get_tempval}" ; then
AC_MSG_ERROR([$2/apr-config --link-libtool failed])
fi
jk_apr_get_tempval=`basename ${jk_apr_get_tempval}`
--- 282,288 ----
AC_MSG_ERROR([cannot find apr-config file in $2])
fi
jk_apr_get_tempval=`$2/apr-config --link-libtool 2> /dev/null`
! if ${TEST} "${jk_apr_get_tempval}x" = "x" ; then
AC_MSG_ERROR([$2/apr-config --link-libtool failed])
fi
jk_apr_get_tempval=`basename ${jk_apr_get_tempval}`
***************
*** 306,312 ****
AC_MSG_ERROR([cannot find apu-config file in $2])
fi
jk_apu_get_tempval=`$2/apu-config --link-libtool 2> /dev/null`
! if ${TEST} -z "${jk_apu_get_tempval}" ; then
AC_MSG_ERROR([$2/apu-config --link-libtool failed])
fi
jk_apu_get_tempval=`basename ${jk_apu_get_tempval}`
--- 306,312 ----
AC_MSG_ERROR([cannot find apu-config file in $2])
fi
jk_apu_get_tempval=`$2/apu-config --link-libtool 2> /dev/null`
! if ${TEST} "${jk_apu_get_tempval}x" = "x" ; then
AC_MSG_ERROR([$2/apu-config --link-libtool failed])
fi
jk_apu_get_tempval=`basename ${jk_apu_get_tempval}`
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_apxs.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_apxs.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_apxs.m4
Sat Aug 28 19:14:24 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_apxs.m4
Tue Oct 5 12:08:16 2004
***************
*** 62,68 ****
${APXS$1} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false
! if ${TEST} "${apxs_support}" = "false" ; then
AC_MSG_RESULT(could not find ${APXS$1})
AC_MSG_ERROR(You must specify a valid --with-apxs$1 path)
fi
--- 62,68 ----
${APXS$1} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false
! if ${TEST} "${apxs_support}x" = "falsex" ; then
AC_MSG_RESULT(could not find ${APXS$1})
AC_MSG_ERROR(You must specify a valid --with-apxs$1 path)
fi
***************
*** 101,111 ****
APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
LIBTOOL=`${APXS$1} -q LIBTOOL`
! if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f
${APACHE2_LIBDIR}/libapr-1.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1"
! elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f
${APACHE2_LIBDIR}/libapr-0.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0"
! elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f
${APACHE2_LIBDIR}/libapr.dylib; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr"
else
AC_MSG_ERROR(can't locate libapr)
--- 101,111 ----
APR_UTIL_INCDIR="-I`${APXS$1} -q APU_INCLUDEDIR`"
APACHE2_LIBDIR="`${APXS$1} -q LIBDIR`"
LIBTOOL=`${APXS$1} -q LIBTOOL`
! if ${TEST} -f ${APACHE2_LIBDIR}/libapr-1.so -o -f
${APACHE2_LIBDIR}/libapr-1.dylib -o -f ${APACHE2_LIBDIR}/libapr-1.sl ; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-1"
! elif ${TEST} -f ${APACHE2_LIBDIR}/libapr-0.so -o -f
${APACHE2_LIBDIR}/libapr-0.dylib -o -f ${APACHE2_LIBDIR}/libapr-0.sl ; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr-0"
! elif ${TEST} -f ${APACHE2_LIBDIR}/libapr.so -o -f
${APACHE2_LIBDIR}/libapr.dylib -o -f ${APACHE2_LIBDIR}/libapr.sl ; then
APR_LIBS="-L${APACHE2_LIBDIR} -lapr"
else
AC_MSG_ERROR(can't locate libapr)
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_dominohome.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_dominohome.m4
***
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_dominohome.m4
Sat Aug 28 19:14:24 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_dominohome.m4
Tue Oct 5 13:22:15 2004
***************
*** 60,66 ****
esac
]) ! if ${TEST} -z "$tempval" ; then
AC_MSG_RESULT(not provided)
else
[$2]=${tempval}
--- 60,66 ----
esac
]) ! if ${TEST} "${tempval}x" = "x" ; then
AC_MSG_RESULT(not provided)
else
[$2]=${tempval}
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_exec.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_exec.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_exec.m4
Sat Aug 28 19:06:02 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_exec.m4
Tue Oct 5 11:22:57 2004
***************
*** 35,41 ****
[JK_EXEC],
[
jk_exec_curdir="`pwd`"
! if test -d "$4" ; then
cd "$4"
else
AC_MSG_ERROR([can't switch to directory $4])
--- 35,41 ----
[JK_EXEC],
[
jk_exec_curdir="`pwd`"
! if ${TEST} -d "$4" ; then
cd "$4"
else
AC_MSG_ERROR([can't switch to directory $4])
***************
*** 47,53 ****
set $2
jk_exec_file=[$]1
! if test ! -x "${jk_exec_file}" ; then
cd "${jk_exec_curdir}"
AC_MSG_ERROR([cannot find or execute \"${jk_exec_file}\" in \"$4\"])
exit 1
--- 47,53 ----
set $2
jk_exec_file=[$]1
! if ${TEST} ! -x "${jk_exec_file}" ; then
cd "${jk_exec_curdir}"
AC_MSG_ERROR([cannot find or execute \"${jk_exec_file}\" in \"$4\"])
exit 1
***************
*** 62,74 ****
jk_exec_ret=0
while true ; do
read jk_exec_first jk_exec_line
! if test ! "$?" -eq "0" ; then
break
else
! if test "${jk_exec_first}" = "jk_exec_retvalue" ; then
jk_exec_ret="${jk_exec_line}"
else
! if test -n "${jk_exec_line}" ; then
echo " $3: ${jk_exec_first} ${jk_exec_line}"
fi
fi
--- 62,74 ----
jk_exec_ret=0
while true ; do
read jk_exec_first jk_exec_line
! if ${TEST} ! "$?" -eq "0" ; then
break
else
! if ${TEST} "${jk_exec_first}x" = "jk_exec_retvaluex" ; then
jk_exec_ret="${jk_exec_line}"
else
! if ${TEST} "${jk_exec_line}x" != "x" ; then
echo " $3: ${jk_exec_first} ${jk_exec_line}"
fi
fi
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_java.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_java.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_java.m4
Sat Aug 28 19:14:24 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_java.m4
Tue Oct 5 11:23:33 2004
***************
*** 41,47 ****
*) use_jni=true ;;
esac
! if ${TEST} "${use_jni}" = "true"; then
HAVE_JNI="-DHAVE_JNI"
JNI_BUILD="jni-build"
fi
--- 41,47 ----
*) use_jni=true ;;
esac
! if ${TEST} "${use_jni}x" = "truex"; then
HAVE_JNI="-DHAVE_JNI"
JNI_BUILD="jni-build"
fi
***************
*** 51,60 ****
AC_DEFUN(
[JK_JDK],
[
! if ${TEST} "${use_jni}" = "true"; then
tempval=""
AC_MSG_CHECKING([for JDK location (please wait)])
! if ${TEST} -n "${JAVA_HOME}" ; then
JAVA_HOME_ENV="${JAVA_HOME}"
else
JAVA_HOME_ENV=""
--- 51,60 ----
AC_DEFUN(
[JK_JDK],
[
! if ${TEST} "${use_jni}x" = "truex"; then
tempval=""
AC_MSG_CHECKING([for JDK location (please wait)])
! if ${TEST} "${JAVA_HOME}x" != "x" ; then
JAVA_HOME_ENV="${JAVA_HOME}"
else
JAVA_HOME_ENV=""
***************
*** 86,98 ****
# Since Sun uses JAVA_HOME a lot, we check it first and ignore the
# JAVA_HOME, otherwise just use whatever JAVA_HOME was specified.
! if ${TEST} -n "${JAVA_HOME_ENV}" ; then
JAVA_HOME=${JAVA_HOME_ENV}
AC_MSG_RESULT(${JAVA_HOME_ENV} from environment)
fi
])
! if ${TEST} -z "${JAVA_HOME}" ; then
# Oh well, nobody set neither JAVA_HOME nor JAVA_HOME, have to guess
# The following code is based on the code submitted by Henner Zeller
--- 86,98 ----
# Since Sun uses JAVA_HOME a lot, we check it first and ignore the
# JAVA_HOME, otherwise just use whatever JAVA_HOME was specified.
! if ${TEST} "${JAVA_HOME_ENV}x" != "x" ; then
JAVA_HOME=${JAVA_HOME_ENV}
AC_MSG_RESULT(${JAVA_HOME_ENV} from environment)
fi
])
! if ${TEST} "${JAVA_HOME}x" = "x" ; then
# Oh well, nobody set neither JAVA_HOME nor JAVA_HOME, have to guess
# The following code is based on the code submitted by Henner Zeller
***************
*** 119,149 ****
fi
done
! if ${TEST} -n "${JAVA_HOME}" ; then
break;
fi
done
! if ${TEST} -n "${JAVA_HOME}" ; then
break;
fi
done
! if ${TEST} -n "${JAVA_HOME}" ; then
break;
fi
done
! if ${TEST} ! -n "${JAVA_HOME}" ; then
AC_MSG_ERROR(can't locate a valid JDK location)
fi
fi
! if ${TEST} -n "${JAVA_PLATFORM}"; then
AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM})
else
AC_MSG_CHECKING(Java platform)
--- 119,149 ----
fi
done
! if ${TEST} "${JAVA_HOME}x" != "x" ; then
break;
fi
done
! if ${TEST} "${JAVA_HOME}x" != "x" ; then
break;
fi
done
! if ${TEST} "${JAVA_HOME}x" != "x" ; then
break;
fi
done
! if ${TEST} "${JAVA_HOME}x" = "x" ; then
AC_MSG_ERROR(can't locate a valid JDK location)
fi
fi
! if ${TEST} "${JAVA_PLATFORM}x" != "x" ; then
AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM})
else
AC_MSG_CHECKING(Java platform)
***************
*** 163,169 ****
esac
],
[
! if ${TEST} -n "${JAVA_PLATFORM}"; then
AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM})
else
AC_MSG_CHECKING(Java platform)
--- 163,169 ----
esac
],
[
! if ${TEST} "${JAVA_PLATFORM}x" != "x" ; then
AC_MSG_RESULT(Java Platform detected - 1.${JAVA_PLATFORM})
else
AC_MSG_CHECKING(Java platform)
***************
*** 184,190 ****
AC_DEFUN(
[JK_JDK_OS],
[
! if ${TEST} "${use_jni}" = "true"; then
tempval=""
OS=""
AC_ARG_WITH(os-type,
--- 184,190 ----
AC_DEFUN(
[JK_JDK_OS],
[
! if ${TEST} "${use_jni}x" = "truex" ; then
tempval=""
OS=""
AC_ARG_WITH(os-type,
***************
*** 210,216 ****
echo " ${OS}"
fi
done
! if ${TEST} -z "${OS}"; then
AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS})
AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
fi
--- 210,216 ----
echo " ${OS}"
fi
done
! if ${TEST} "${OS}x" = "x" ; then
AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS})
AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
fi
diff -rc
jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_tchome.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_tchome.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_tchome.m4
Sat Aug 28 19:14:24 2004
---
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_tchome.m4
Tue Oct 5 11:23:14 2004
***************
*** 59,65 ****
esac
]) ! if ${TEST} -z "$tempval" ; then
AC_MSG_RESULT(not provided)
else
[$2]=${tempval}
--- 59,65 ----
esac
]) ! if ${TEST} "${tempval}x" = "x" ; then
AC_MSG_RESULT(not provided)
else
[$2]=${tempval}
diff -rc jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_ws.m4
jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_ws.m4
*** jakarta-tomcat-5.0.28-src/jakarta-tomcat-connectors/jk/support/jk_ws.m4 Sat
Aug 28 19:14:24 2004
--- jakarta-tomcat-5.0.28-src.new/jakarta-tomcat-connectors/jk/support/jk_ws.m4
Tue Oct 5 11:22:52 2004
***************
*** 56,62 ****
AC_MSG_ERROR(can't locate ${tempval}/$3)
fi
! if ${TEST} ! -z "$tempval" ; then
$2_BUILD="true"
$2_CFLAGS="-I ${tempval}/include"
$2_DIR=${tempval}
--- 56,62 ----
AC_MSG_ERROR(can't locate ${tempval}/$3)
fi
! if ${TEST} "${tempval}x" != "x" ; then
$2_BUILD="true"
$2_CFLAGS="-I ${tempval}/include"
$2_DIR=${tempval}
***************
*** 69,75 ****
if ${TEST} -d ${withval}/src/include ; then
# read osdir from the existing apache.
osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e
's:^OSDIR=.*/os:os:'`
! if ${TEST} -z "${osdir}" ; then
osdir=os/unix
fi
$2_INCL="-I${tempval}/src/include -I${withval}/src/${osdir}"
--- 69,75 ----
if ${TEST} -d ${withval}/src/include ; then
# read osdir from the existing apache.
osdir=`${GREP} '^OSDIR=' ${withval}/src/Makefile.config | ${SED} -e
's:^OSDIR=.*/os:os:'`
! if ${TEST} "${osdir}x" = "x" ; then
osdir=os/unix
fi
$2_INCL="-I${tempval}/src/include -I${withval}/src/${osdir}"
***************
*** 112,118 ****
esac
])
! if ${TEST} -z "$tempval" ; then
AC_MSG_RESULT(not provided)
else
AC_MSG_RESULT(${tempval})
--- 112,118 ----
esac
])
! if ${TEST} "${tempval}x" = "x" ; then
AC_MSG_RESULT(not provided)
else
AC_MSG_RESULT(${tempval})
***************
*** 153,159 ****
AC_MSG_ERROR(can't locate ${tempval}/$3)
fi
! if ${TEST} ! -z "$tempval" ; then
$2_BUILD=""
$2_CFLAGS="-I${tempval}"
$2_CLEAN=""
--- 153,159 ----
AC_MSG_ERROR(can't locate ${tempval}/$3)
fi
! if ${TEST} "${tempval}x" != "x" ; then
$2_BUILD=""
$2_CFLAGS="-I${tempval}"
$2_CLEAN=""
***************
*** 202,208 ****
AC_MSG_ERROR(Not a directory: ${tempval})
fi
! if ${TEST} ! -z "$tempval" ; then
$2_BUILD=""
$2_CLEAN=""
$2_DIR=""
--- 202,208 ----
AC_MSG_ERROR(Not a directory: ${tempval})
fi
! if ${TEST} "${tempval}x" != "x" ; then
$2_BUILD=""
$2_CLEAN=""
$2_DIR=""
---8<--- snip snip ---8<---
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org