diff options
-rw-r--r-- | CHANGELOG | 6 | ||||
-rw-r--r-- | Makefile.in | 18 | ||||
-rw-r--r-- | configure.ac | 16 | ||||
-rw-r--r-- | m4/apache.m4 | 33 |
4 files changed, 57 insertions, 16 deletions
@@ -1,4 +1,8 @@ | |||
1 | $Id: CHANGELOG,v 1.17 2004/03/05 01:05:34 urkle Exp $ | 1 | $Id: CHANGELOG,v 1.18 2004/03/22 20:32:16 urkle Exp $ |
2 | ?: ? | ||
3 | * fixed apache.m4 to work with apache 2 setups with different include | ||
4 | directories for APR and APU then core Apache | ||
5 | |||
2 | 1.96: 2004-03-04 | 6 | 1.96: 2004-03-04 |
3 | * fixed LogSQLPreserveFile config parameter | 7 | * fixed LogSQLPreserveFile config parameter |
4 | * reworked safe_create_tables and core SQL insert routine. | 8 | * reworked safe_create_tables and core SQL insert routine. |
diff --git a/Makefile.in b/Makefile.in index 65a0823..e45968b 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -16,7 +16,7 @@ CFLAGS = -Wc,-Wall -Wc,-Werror -Wc,-fno-strict-aliasing | |||
16 | 16 | ||
17 | INCLUDES = @MYSQL_CFLAGS@ | 17 | INCLUDES = @MYSQL_CFLAGS@ |
18 | 18 | ||
19 | LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ | 19 | LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ @RT_LIBS |
20 | 20 | ||
21 | EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG | 21 | EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG |
22 | 22 | ||
@@ -90,7 +90,21 @@ install: $(TARGETS) install-subdirs | |||
90 | @@APXS_BIN@ -i $(TARGET); \ | 90 | @@APXS_BIN@ -i $(TARGET); \ |
91 | if test @WANT_SSL_MOD@ -eq 1; then \ | 91 | if test @WANT_SSL_MOD@ -eq 1; then \ |
92 | @APXS_BIN@ -i $(sslTARGET); \ | 92 | @APXS_BIN@ -i $(sslTARGET); \ |
93 | fi | 93 | fi; \ |
94 | echo "*************************************************************************"; \ | ||
95 | echo "*** The mod_log_sql modules have been installed."; \ | ||
96 | echo "*** Please edit your Apache configuration files and"; \ | ||
97 | echo "*** add the appropriate LoadModule directives per the documentation"; \ | ||
98 | echo "*** in docs/manual.html"; \ | ||
99 | echo "*** If you have previously used 1.18 or lower then update you must change"; \ | ||
100 | echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \ | ||
101 | echo "*** to"; \ | ||
102 | echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \ | ||
103 | echo "*** in your httpd.conf as the internal name of the module has changed."; \ | ||
104 | echo "*** "; \ | ||
105 | echo "*** Also read the documentation about using SSL support and new "; \ | ||
106 | echo "*** configuration directives."; \ | ||
107 | echo "*************************************************************************"; | ||
94 | 108 | ||
95 | activate: activate-subdirs | 109 | activate: activate-subdirs |
96 | @@APXS_BIN@ -i -a $(TARGET); \ | 110 | @@APXS_BIN@ -i -a $(TARGET); \ |
diff --git a/configure.ac b/configure.ac index 9dcc71d..bf8ba6e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | dnl Required initializer | 1 | dnl Required initializer |
2 | AC_INIT(mod_log_sql, 1.96) | 2 | AC_INIT(mod_log_sql, 1.97) |
3 | AC_PREREQ(2.53) | 3 | AC_PREREQ(2.53) |
4 | AC_CONFIG_HEADERS(config.h) | 4 | AC_CONFIG_HEADERS(config.h) |
5 | 5 | ||
@@ -30,6 +30,19 @@ CHECK_PATH_MOD_SSL( | |||
30 | 30 | ||
31 | AC_SUBST(WANT_SSL_MOD) | 31 | AC_SUBST(WANT_SSL_MOD) |
32 | 32 | ||
33 | case "$target" in | ||
34 | *-*-solaris* | *-*-osf* ) | ||
35 | if test $APACHE_VERSION -eq 1.3; then | ||
36 | RTLIBS=-lrt | ||
37 | fi | ||
38 | ;; | ||
39 | *) | ||
40 | RTLIBS="" | ||
41 | ;; | ||
42 | esac | ||
43 | |||
44 | AC_SUBST(RTLIBS) | ||
45 | |||
33 | AC_CHECK_HEADERS(limits.h) | 46 | AC_CHECK_HEADERS(limits.h) |
34 | 47 | ||
35 | AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) | 48 | AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) |
@@ -47,5 +60,4 @@ if test $WANT_SSL_MOD -eq 1; then | |||
47 | else | 60 | else |
48 | AC_MSG_RESULT([SSL Support : no]) | 61 | AC_MSG_RESULT([SSL Support : no]) |
49 | AC_MSG_RESULT([*** Use --enable-ssl to enable SSL support]) | 62 | AC_MSG_RESULT([*** Use --enable-ssl to enable SSL support]) |
50 | AC_MSG_RESULT([*** and --with-ssl-inc for the directory for SSL headers]) | ||
51 | fi | 63 | fi |
diff --git a/m4/apache.m4 b/m4/apache.m4 index 3d76b72..ef9ce90 100644 --- a/m4/apache.m4 +++ b/m4/apache.m4 | |||
@@ -1,14 +1,17 @@ | |||
1 | dnl TEST_APACHE_VERSION([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 1 | dnl TEST_APACHE_VERSION(RELEASE, [MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
2 | dnl Test for Apache | 2 | dnl Test for Apache |
3 | dnl | 3 | dnl |
4 | AC_DEFUN(TEST_APACHE_VERSION, | 4 | AC_DEFUN(TEST_APACHE_VERSION, |
5 | [dnl | 5 | [dnl |
6 | AC_REQUIRE([AC_CANONICAL_TARGET]) | 6 | AC_REQUIRE([AC_CANONICAL_TARGET]) |
7 | 7 | releasetest=$1 | |
8 | min_apache_version="$1" | 8 | min_apache_version="$2" |
9 | no_apache="" | 9 | no_apache="" |
10 | ac_save_CFLAGS="$CFLAGS" | 10 | ac_save_CFLAGS="$CFLAGS" |
11 | CFLAGS="$CFLAGS $APACHE_CFLAGS" | 11 | CFLAGS="$CFLAGS $APACHE_CFLAGS" |
12 | if test $releasetest -eq 20; then | ||
13 | CFLAGS="$CFLAGS -I$APU_INCDIR -I$APR_INCDIR" | ||
14 | fi | ||
12 | 15 | ||
13 | AC_TRY_RUN([ | 16 | AC_TRY_RUN([ |
14 | #include <stdio.h> | 17 | #include <stdio.h> |
@@ -70,7 +73,7 @@ int main (int argc, char *argv[]) | |||
70 | CFLAGS="$ac_save_CFLAGS" | 73 | CFLAGS="$ac_save_CFLAGS" |
71 | 74 | ||
72 | if test "x$no_apache" = x ; then | 75 | if test "x$no_apache" = x ; then |
73 | ifelse([$2], , :, [$2]) | 76 | ifelse([$3], , :, [$3]) |
74 | else | 77 | else |
75 | if test -f conf.apachetest ; then | 78 | if test -f conf.apachetest ; then |
76 | : | 79 | : |
@@ -90,7 +93,7 @@ int main(int argc, char *argv[]) | |||
90 | [ echo "*** The test program failed to compile or link. Check config.log" ]) | 93 | [ echo "*** The test program failed to compile or link. Check config.log" ]) |
91 | CFLAGS="$ac_save_CFLAGS" | 94 | CFLAGS="$ac_save_CFLAGS" |
92 | fi | 95 | fi |
93 | ifelse([$3], , :, [$3]) | 96 | ifelse([$4], , :, [$4]) |
94 | fi | 97 | fi |
95 | rm -f conf.apachetest | 98 | rm -f conf.apachetest |
96 | ]) | 99 | ]) |
@@ -129,18 +132,24 @@ AC_ARG_ENABLE( | |||
129 | AC_MSG_ERROR([*** your path, or use the --with-apxs configure option]) | 132 | AC_MSG_ERROR([*** your path, or use the --with-apxs configure option]) |
130 | else | 133 | else |
131 | APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR` | 134 | APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR` |
132 | APACHE_CPPFLAGS=`$APXS_BIN -q CFLAGS` | 135 | APR_INCDIR=`$APXS_BIN -q APR_INCLUDEDIR` |
133 | APACHE_CFLAGS="-I$APACHE_INCDIR" | 136 | APU_INCDIR=`$APXS_BIN -q APU_INCLUDEDIR` |
137 | APACHE_CPPFLAGS=`$APXS_BIN -q CPPFLAGS` | ||
138 | APACHE_CPPFLAGS="$APACHE_CPPFLAGS -I$APACHE_INCDIR" | ||
139 | APACHE_CFLAGS=`$APXS_BIN -q CFLAGS` | ||
140 | APACHE_CFLAGS="$APACHE_CFLAGS -I$APACHE_INCDIR" | ||
134 | APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR` | 141 | APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR` |
135 | 142 | ||
136 | if test "x$enable_apachetest" = "xyes" ; then | 143 | if test "x$enable_apachetest" = "xyes" ; then |
137 | if test "$min_apache20_version" != "no"; then | 144 | if test "$min_apache20_version" != "no"; then |
138 | AC_MSG_CHECKING(for Apache 2.0 version >= $min_apache20_version) | 145 | AC_MSG_CHECKING(for Apache 2.0 version >= $min_apache20_version) |
139 | TEST_APACHE_VERSION($min_apache20_version, | 146 | TEST_APACHE_VERSION(20,$min_apache20_version, |
140 | AC_MSG_RESULT(yes) | 147 | AC_MSG_RESULT(yes) |
141 | AC_DEFINE(WITH_APACHE20,1,[Define to 1 if we are compiling with Apache 2.0.x]) | 148 | AC_DEFINE(WITH_APACHE20,1,[Define to 1 if we are compiling with Apache 2.0.x]) |
142 | APACHE_VERSION="20" | 149 | APACHE_VERSION="2.0" |
143 | APXS_EXTENSION=.la | 150 | APXS_EXTENSION=.la |
151 | APACHE_CFLAGS="$APACHE_CFLAGS -I$APU_INCDIR -I$APR_INCDIR" | ||
152 | APACHE_CPPFLAGS="$APACHE_CPPFLAGS -I$APU_INCDIR -I$APR_INCDIR" | ||
144 | APACHE_DEFS="-DWITH_APACHE20" | 153 | APACHE_DEFS="-DWITH_APACHE20" |
145 | ifelse([$4], , , $4), | 154 | ifelse([$4], , , $4), |
146 | AC_MSG_RESULT(no) | 155 | AC_MSG_RESULT(no) |
@@ -151,10 +160,10 @@ AC_ARG_ENABLE( | |||
151 | fi | 160 | fi |
152 | if test "$min_apache13_version" != "no" -a "x$APACHE_VERSION" = "x"; then | 161 | if test "$min_apache13_version" != "no" -a "x$APACHE_VERSION" = "x"; then |
153 | AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version) | 162 | AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version) |
154 | TEST_APACHE_VERSION($min_apache13_version, | 163 | TEST_APACHE_VERSION(13,$min_apache13_version, |
155 | AC_MSG_RESULT(yes) | 164 | AC_MSG_RESULT(yes) |
156 | AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x]) | 165 | AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x]) |
157 | APACHE_VERSION="13" | 166 | APACHE_VERSION="1.3" |
158 | APXS_EXTENSION=.so | 167 | APXS_EXTENSION=.so |
159 | APACHE_CFLAGS="-g $APACHE_CFLAGS" | 168 | APACHE_CFLAGS="-g $APACHE_CFLAGS" |
160 | APACHE_DEFS="-DWITH_APACHE13" | 169 | APACHE_DEFS="-DWITH_APACHE13" |
@@ -168,6 +177,8 @@ AC_ARG_ENABLE( | |||
168 | AC_SUBST(APACHE_CFLAGS) | 177 | AC_SUBST(APACHE_CFLAGS) |
169 | AC_SUBST(APACHE_CPPFLAGS) | 178 | AC_SUBST(APACHE_CPPFLAGS) |
170 | AC_SUBST(APACHE_INCDIR) | 179 | AC_SUBST(APACHE_INCDIR) |
180 | AC_SUBST(APR_INCDIR) | ||
181 | AC_SUBST(APU_INCDIR) | ||
171 | AC_SUBST(APACHE_MODDIR) | 182 | AC_SUBST(APACHE_MODDIR) |
172 | AC_SUBST(APACHE_VERSION) | 183 | AC_SUBST(APACHE_VERSION) |
173 | AC_SUBST(APXS_EXTENSION) | 184 | AC_SUBST(APXS_EXTENSION) |