1 --- ./configure.in~ 2000-06-17 21:00:39.000000000 +0200
2 +++ ./configure.in 2005-07-21 15:48:15.000000000 +0300
5 for testdir in ${apache_dir} ${apache_include} ${libexecdir} ${sysconfigdir} ; do
6 if ${TEST} ! -d ${testdir} ; then
7 - AC_MSG_ERROR(${testdir} doesn't exist, not readable or not a directory)
8 + AC_MSG_WARN(${testdir} doesn't exist, not readable or not a directory)
14 http_config requires httpd.h, so we skip it
15 --- ./configure.in~ 2005-07-22 23:40:01.000000000 +0300
16 +++ ./configure.in 2005-07-22 23:47:17.000000000 +0300
19 if ${TEST} -n ${apache_dir} ; then
20 # now that we have include dir check for these
21 -AC_CHECK_HEADERS([httpd.h http_config.h http_core.h http_log.h http_main.h http_protocol.h util_script.h util_md5.h os-inline.c],
22 +AC_CHECK_HEADERS([httpd.h http_core.h http_log.h http_main.h http_protocol.h util_script.h util_md5.h os-inline.c],
24 # do nothing if they are all found
26 --- ./configure.in~ 2005-07-23 15:19:08.000000000 +0300
27 +++ ./configure.in 2005-07-23 15:35:07.000000000 +0300
30 if ${TEST} -n ${apache_dir} ; then
31 # now that we have include dir check for these
32 -AC_CHECK_HEADERS([httpd.h http_core.h http_log.h http_main.h http_protocol.h util_script.h util_md5.h os-inline.c],
33 +AC_CHECK_HEADERS([httpd.h os-inline.c],
35 # do nothing if they are all found
37 --- ./configure.in~ 2005-07-23 15:35:07.000000000 +0300
38 +++ ./configure.in 2005-07-23 15:37:01.000000000 +0300
40 echo " ${TARGET_CLASSPATH}"
43 - if ${TEST} ! -f ${BOOTFILE} ; then
44 + if ${TEST} -z "${BOOTFILE}" -o ! -f ${BOOTFILE} ; then
45 echo "You might consider putting frequently used options into "
46 echo "${BOOTFILE}, one per line."
48 --- ./configure.in~ 2005-07-23 15:37:19.000000000 +0300
49 +++ ./configure.in 2005-07-23 15:40:01.000000000 +0300
51 echo " ${TARGET_CLASSPATH}"
54 - if ${TEST} -z "${BOOTFILE}" -o ! -f ${BOOTFILE} ; then
56 + if ${TEST} -z "${BOOTFILE}" -o ! -f "${BOOTFILE}" ; then
57 echo "You might consider putting frequently used options into "
58 echo "${BOOTFILE}, one per line."
60 --- ./configure.in~ 2005-08-19 15:35:30.000000000 +0300
61 +++ ./configure.in 2005-08-19 15:44:07.000000000 +0300
68 # The things below might be a little bit overkill, but better that than
69 # failing with no obvious reason...
70 --- ./src/c/Makefile.am~ 2000-03-31 18:03:23.000000000 +0200
71 +++ ./src/c/Makefile.am 2005-08-19 15:53:44.000000000 +0300
73 EXTRA_DIST = ${APACHE_FILES} ${HDRS} jserv_shmedit.c
75 libjserv_la_LDFLAGS = -avoid-version -o libjserv.la -rpath ${LIBEXECDIR}
76 +libjserv_la_CFLAGS = $(AM_CFLAGS)
79 ${CC} jserv_shmedit.o jserv_mmap.o -o jserv_shmedit -lnsl
80 --- ./src/c/Makefile.am~ 2005-08-19 15:53:44.000000000 +0300
81 +++ ./src/c/Makefile.am 2005-08-19 15:54:34.000000000 +0300
83 @echo "Copying files to Apache Modules Directory..."
84 ${top_srcdir}/src/scripts/build/unix/mkinstalldirs $(DESTDIR)${LIBEXECDIR}
86 - # on AIX, the .so file is created with a number, ie:
87 - # libjserv.so.0.0.0. It seems as though on though a libjserv.a
88 - # file is also created (and on Solaris, the .a file isn't created)
89 - # so check for that to make things work.
91 +# on AIX, the .so file is created with a number, ie:
92 +# libjserv.so.0.0.0. It seems as though on though a libjserv.a
93 +# file is also created (and on Solaris, the .a file isn't created)
94 +# so check for that to make things work.
96 @ if ${TEST} -e ./.libs/${LIBJA} ; then \
97 echo "${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO}" ; \
98 ${CP} ./.libs/${LIBJA} $(DESTDIR)${LIBEXECDIR}/${MODSO} ; \
99 --- ./configure.in~ 2005-08-19 15:55:37.000000000 +0300
100 +++ ./configure.in 2005-08-19 16:01:54.000000000 +0300
103 AM_CONDITIONAL(MAINTAINER_BUILD, ${TEST} "${maintainer_debug}" = "true")
105 +AM_GNU_GETTEXT([external])
106 +AC_SUBST(USE_INCLUDED_LIBINTL)
108 # allow use of compressed jar file
109 AC_ARG_ENABLE(compressed-jar,
110 [ --enable-compressed-jar allows generation of a zipped jar file [default=no]],
111 --- ./src/java/Makefile.am~ 2000-03-15 22:02:09.000000000 +0200
112 +++ ./src/java/Makefile.am 2005-08-19 19:25:12.000000000 +0300
116 ARCHIVE = $(PACKAGE).jar
117 -jardir = ${libexecdir}
118 +jardir = $(datadir)/java
121 # VT: NOTE: This is not going to be as bad as in ECS because the findstring
122 --- ./conf/Makefile.am~ 1999-10-26 01:47:22.000000000 +0300
123 +++ ./conf/Makefile.am 2005-08-19 20:08:50.000000000 +0300
125 -INSTALL=./save-install.sh
126 EXTRA_DIST = save-install.sh.in
127 sysconf_DATA = jserv.conf jserv.properties zone.properties
129 --- ./configure.in~ 2005-08-19 19:55:38.000000000 +0300
130 +++ ./configure.in 2005-08-19 20:06:25.000000000 +0300
132 AC_MSG_RESULT(${apache_include})
134 AC_MSG_CHECKING(for Apache configuration directory)
135 - sysconfdir=`$APXS -q SYSCONFDIR`/jserv
136 + if [ -z "$sysconfdir" ]; then
137 + sysconfdir=`$APXS -q SYSCONFDIR`/jserv
139 AC_MSG_RESULT(${sysconfdir})
141 AC_MSG_CHECKING(for Apache library directory)
142 --- ./configure.in~ 2005-08-19 20:22:34.000000000 +0300
143 +++ ./configure.in 2005-08-19 20:22:36.000000000 +0300
145 SYSCONFDIR=`eval echo "${sysconfdir}"`
147 APACHE_DIR=${apache_dir}
148 -JSERV_CLASSES=${LIBEXECDIR}/${PACKAGE}.jar
149 +JSERV_CLASSES=${datadir}/java/${PACKAGE}.jar
151 JSERV_CONF="${SYSCONFDIR}"