1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
--- ./configure.in~ 2000-06-17 21:00:39.000000000 +0200
+++ ./configure.in 2005-07-21 15:48:15.000000000 +0300
@@ -311,7 +311,7 @@
for testdir in ${apache_dir} ${apache_include} ${libexecdir} ${sysconfigdir} ; do
if ${TEST} ! -d ${testdir} ; then
- AC_MSG_ERROR(${testdir} doesn't exist, not readable or not a directory)
+ AC_MSG_WARN(${testdir} doesn't exist, not readable or not a directory)
fi
done
http_config requires httpd.h, so we skip it
--- ./configure.in~ 2005-07-22 23:40:01.000000000 +0300
+++ ./configure.in 2005-07-22 23:47:17.000000000 +0300
@@ -527,7 +527,7 @@
if ${TEST} -n ${apache_dir} ; then
# now that we have include dir check for these
-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],
+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],
[
# do nothing if they are all found
],
--- ./configure.in~ 2005-07-23 15:19:08.000000000 +0300
+++ ./configure.in 2005-07-23 15:35:07.000000000 +0300
@@ -527,7 +527,7 @@
if ${TEST} -n ${apache_dir} ; then
# now that we have include dir check for these
-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],
+AC_CHECK_HEADERS([httpd.h os-inline.c],
[
# do nothing if they are all found
],
--- ./configure.in~ 2005-07-23 15:35:07.000000000 +0300
+++ ./configure.in 2005-07-23 15:37:01.000000000 +0300
@@ -676,7 +676,7 @@
echo " ${TARGET_CLASSPATH}"
echo ""
- if ${TEST} ! -f ${BOOTFILE} ; then
+ if ${TEST} -z "${BOOTFILE}" -o ! -f ${BOOTFILE} ; then
echo "You might consider putting frequently used options into "
echo "${BOOTFILE}, one per line."
else
--- ./configure.in~ 2005-07-23 15:37:19.000000000 +0300
+++ ./configure.in 2005-07-23 15:40:01.000000000 +0300
@@ -676,7 +676,8 @@
echo " ${TARGET_CLASSPATH}"
echo ""
- if ${TEST} -z "${BOOTFILE}" -o ! -f ${BOOTFILE} ; then
+ #set -x
+ if ${TEST} -z "${BOOTFILE}" -o ! -f "${BOOTFILE}" ; then
echo "You might consider putting frequently used options into "
echo "${BOOTFILE}, one per line."
else
--- ./configure.in~ 2005-08-19 15:35:30.000000000 +0300
+++ ./configure.in 2005-08-19 15:44:07.000000000 +0300
@@ -50,6 +50,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_CC
+AM_PROG_GCJ
# The things below might be a little bit overkill, but better that than
# failing with no obvious reason...
--- ./src/c/Makefile.am~ 2000-03-31 18:03:23.000000000 +0200
+++ ./src/c/Makefile.am 2005-08-19 15:53:44.000000000 +0300
@@ -18,6 +18,7 @@
EXTRA_DIST = ${APACHE_FILES} ${HDRS} jserv_shmedit.c
libjserv_la_LDFLAGS = -avoid-version -o libjserv.la -rpath ${LIBEXECDIR}
+libjserv_la_CFLAGS = $(AM_CFLAGS)
jserv_shmedit:
${CC} jserv_shmedit.o jserv_mmap.o -o jserv_shmedit -lnsl
--- ./src/c/Makefile.am~ 2005-08-19 15:53:44.000000000 +0300
+++ ./src/c/Makefile.am 2005-08-19 15:54:34.000000000 +0300
@@ -38,11 +38,11 @@
@echo "Copying files to Apache Modules Directory..."
${top_srcdir}/src/scripts/build/unix/mkinstalldirs $(DESTDIR)${LIBEXECDIR}
- # on AIX, the .so file is created with a number, ie:
- # libjserv.so.0.0.0. It seems as though on though a libjserv.a
- # file is also created (and on Solaris, the .a file isn't created)
- # so check for that to make things work.
- # HPUX uses .sl
+# on AIX, the .so file is created with a number, ie:
+# libjserv.so.0.0.0. It seems as though on though a libjserv.a
+# file is also created (and on Solaris, the .a file isn't created)
+# so check for that to make things work.
+# HPUX uses .sl
@ 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}"
|
