- pl updates and fixes

[packages/ApacheJServ.git] / ApacheJServ-ac.patch

diff --git a/ApacheJServ-ac.patch b/ApacheJServ-ac.patch
index 1cff7c509594628e8fda11a50f21e7e18499f401..a0f842cce6d3872d949c167c6881e15eac45457c 100644 (file)
--- 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,57 @@ 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]],
+--- ./src/java/Makefile.am~    2000-03-15 22:02:09.000000000 +0200
++++ ./src/java/Makefile.am     2005-08-19 19:25:12.000000000 +0300
+@@ -6,7 +6,7 @@
+ SUBDIRS = org
+ 
+ ARCHIVE = $(PACKAGE).jar
+-jardir = ${libexecdir}
++jardir = $(datadir)/java
+ jar_DATA=${ARCHIVE}
+ 
+ # VT: NOTE: This is not going to be as bad as in ECS because the findstring
+--- ./conf/Makefile.am~        1999-10-26 01:47:22.000000000 +0300
++++ ./conf/Makefile.am 2005-08-19 20:08:50.000000000 +0300
+@@ -1,4 +1,3 @@
+-INSTALL=./save-install.sh
+ EXTRA_DIST = save-install.sh.in
+ sysconf_DATA  = jserv.conf jserv.properties zone.properties
+ 
+--- ./configure.in~    2005-08-19 19:55:38.000000000 +0300
++++ ./configure.in     2005-08-19 20:06:25.000000000 +0300
+@@ -296,7 +296,9 @@
+     AC_MSG_RESULT(${apache_include})
+    
+     AC_MSG_CHECKING(for Apache configuration directory)
+-    sysconfdir=`$APXS -q SYSCONFDIR`/jserv
++      if [ -z "$sysconfdir" ]; then
++              sysconfdir=`$APXS -q SYSCONFDIR`/jserv
++      fi
+     AC_MSG_RESULT(${sysconfdir})
+ 
+     AC_MSG_CHECKING(for Apache library directory)
+--- ./configure.in~    2005-08-19 20:22:34.000000000 +0300
++++ ./configure.in     2005-08-19 20:22:36.000000000 +0300
+@@ -509,7 +509,7 @@
+ SYSCONFDIR=`eval echo "${sysconfdir}"`
+ 
+ APACHE_DIR=${apache_dir}
+-JSERV_CLASSES=${LIBEXECDIR}/${PACKAGE}.jar
++JSERV_CLASSES=${datadir}/java/${PACKAGE}.jar
+ 
+ JSERV_CONF="${SYSCONFDIR}"
+