- install ApacheJServ.jar to %{_javadir}

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

diff --git a/ApacheJServ-ac.patch b/ApacheJServ-ac.patch
index 1cff7c509594628e8fda11a50f21e7e18499f401..09d9a3c3e960ad1eaab48700d25e0192fe7da0af 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,26 @@ 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