From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 19 Aug 2005 15:25:48 +0000 (+0000)
Subject: - updates
X-Git-Tag: ApacheJServ-1_1_2-1~33
X-Git-Url: http://git.pld-linux.org/?p=packages%2FApacheJServ.git;a=commitdiff_plain;h=ab4009b30748375aac4d80369e882d94ef92e22c

- updates

Changed files:
    ApacheJServ-ac.patch -> 1.2
---

diff --git a/ApacheJServ-ac.patch b/ApacheJServ-ac.patch
index 1cff7c5..31ebe41 100644
--- a/ApacheJServ-ac.patch
+++ b/ApacheJServ-ac.patch
@@ -52,7 +52,7 @@ http_config requires httpd.h, so we skip it
  
      echo ""
 -    if ${TEST} -z "${BOOTFILE}" -o ! -f ${BOOTFILE} ; then
-+	set -x
++	#set -x
 +    if ${TEST} -z "${BOOTFILE}" -o ! -f "${BOOTFILE}" ; then
          echo "You might consider putting frequently used options into "
          echo "${BOOTFILE}, one per line."
@@ -96,3 +96,15 @@ http_config requires httpd.h, so we skip it
  	@ if ${TEST} -e ./.libs/${LIBJA} ; then \
  		echo "${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO}" ; \
  		${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO} ; \
+--- ./configure.in~	2005-08-19 15:55:37.000000000 +0300
++++ ./configure.in	2005-08-19 16:01:54.000000000 +0300
+@@ -98,6 +98,9 @@
+ 
+ AM_CONDITIONAL(MAINTAINER_BUILD, ${TEST} "${maintainer_debug}" = "true")
+ 
++AM_GNU_GETTEXT([external])
++AC_SUBST(USE_INCLUDED_LIBINTL)
++
+ # allow use of compressed jar file
+ AC_ARG_ENABLE(compressed-jar,
+ [  --enable-compressed-jar allows generation of a zipped jar file [default=no]],