summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG4
-rw-r--r--INSTALL2
-rw-r--r--Makefile.in46
-rw-r--r--configure.ac24
-rw-r--r--docs/.cvsignore (renamed from Documentation/.cvsignore)0
-rw-r--r--docs/Makefile.in (renamed from Documentation/Makefile.in)0
-rw-r--r--docs/README (renamed from Documentation/README)0
-rw-r--r--docs/documentation.lyx (renamed from Documentation/documentation.lyx)0
-rw-r--r--docs/manual.xml (renamed from Documentation/manual.xml)0
9 files changed, 49 insertions, 27 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4beccec..3e0d531 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@
6* Changed default preserve file location to logs/mod_log_sql-preserve 6* Changed default preserve file location to logs/mod_log_sql-preserve
7 And made LogSQLPreserveFile root relative. 7 And made LogSQLPreserveFile root relative.
8* fixed bug where preserve file wouldn't be created in apache 2 8* fixed bug where preserve file wouldn't be created in apache 2
9* finished TransferLog documentation
10* changed strstr to ap_strstr calls and strchr to ap_strchr calls to
11 stop warning when compiling with AP_DEBUG enabled in apache 2
12* Updated apache m4 to not pass for apache 1.3 if apache 2 is found
9 13
101.97: 2004-04-08 141.97: 2004-04-08
11* fixed apache.m4 to work with apache 2 setups with different include 15* fixed apache.m4 to work with apache 2 setups with different include
diff --git a/INSTALL b/INSTALL
index 38fb9bd..072f738 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
1This document has been superseded by the new documentation in the 1This document has been superseded by the new documentation in the
2Documentation/ directory. There you will find the docs in a variety of 2docs/ directory. There you will find the docs in a variety of
3formats, including PostScript, plaintext, and HTML. 3formats, including PostScript, plaintext, and HTML.
4 4
5Basic overview is.. 5Basic overview is..
diff --git a/Makefile.in b/Makefile.in
index b6391e1..07278d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
1# @configure_input@ 1# @configure_input@
2 2
3# Modify these top variables. 3# Modify these top variables.
4SUBDIRS = Documentation contrib 4SUBDIRS = docs contrib
5SOURCES = @PACKAGE_NAME@.c 5SOURCES = @PACKAGE_NAME@.c
6 6
7HEADERS = mod_log_sql.h \ 7HEADERS = mod_log_sql.h \
@@ -19,33 +19,47 @@ EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG
19 19
20TARGET = @PACKAGE_NAME@@APXS_EXTENSION@ 20TARGET = @PACKAGE_NAME@@APXS_EXTENSION@
21 21
22TARGETS = $(TARGET)
23
22sslSOURCES = @PACKAGE_NAME@_ssl.c 24sslSOURCES = @PACKAGE_NAME@_ssl.c
23sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@ 25sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@
24sslLDADD = 26sslLDADD =
25sslCFLAGS = @MOD_SSL_CFLAGS@ 27sslCFLAGS = @MOD_SSL_CFLAGS@
26sslNAME = log_sql_ssl 28sslNAME = log_sql_ssl
27 29
30ifeq (@WANT_SSL_MOD@,1)
31TARGETS += $(sslTARGET)
32endif
33
28mysqlSOURCES = @PACKAGE_NAME@_mysql.c 34mysqlSOURCES = @PACKAGE_NAME@_mysql.c
29mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@ 35mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@
30mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ 36mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
31mysqlCFLAGS = @MYSQL_CFLAGS@ 37mysqlCFLAGS = @MYSQL_CFLAGS@
32mysqlNAME = log_sql_mysql 38mysqlNAME = log_sql_mysql
33 39
40ifeq (@WANT_MYSQL_MOD@,1)
41TARGETS += $(mysqlTARGET)
42endif
43
34pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c 44pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c
35pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@ 45pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@
36pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@ 46pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@
37pgsqlCFLAGS = @PGSQL_CFLAGS@ 47pgsqlCFLAGS = @PGSQL_CFLAGS@
38pgsqlNAME = log_sql_pgsql 48pgsqlNAME = log_sql_pgsql
39 49
40TARGETS = $(TARGET) 50ifeq (@WANT_PGSQL_MOD@,1)
41 51TARGETS += $(pgsqlTARGET)
42ifeq (@WANT_SSL_MOD@,1)
43TARGETS += $(sslTARGET)
44endif 52endif
45 53
46TARGETS += $(mysqlTARGET) 54dbiSOURCES = @PACKAGE_NAME@_dbi.c
55dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@
56dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@
57dbiCFLAGS = @DBI_CFLAGS@
58dbiNAME = log_sql_dbi
47 59
48TARGETS += $(pgsqlTARGET) 60ifeq (@WANT_DBI_MOD@,1)
61TARGETS += $(dbiTARGET)
62endif
49 63
50#Don't modify anything below here 64#Don't modify anything below here
51 65
@@ -70,8 +84,8 @@ STD_DIST = install-sh \
70 stamp-h.in \ 84 stamp-h.in \
71 config.h.in 85 config.h.in
72 86
73DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(sslSOURCES) $(mysqlSOURCES) \ 87DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS) \
74 $(HEADERS) 88 $(sslSOURCES) $(mysqlSOURCES)
75 89
76all: $(TARGETS) all-subdirs 90all: $(TARGETS) all-subdirs
77 91
@@ -95,23 +109,23 @@ TODO: TODO.in
95 109
96$(TARGET): $(SOURCES) $(HEADERS) 110$(TARGET): $(SOURCES) $(HEADERS)
97 @@APXS_BIN@ -c -o $(TARGET) $(CFLAGS) \ 111 @@APXS_BIN@ -c -o $(TARGET) $(CFLAGS) \
98 @DEFS@ @APACHE_DEFS@ $(LDADD) $(SOURCES) 112 @DEFS@ @AP_DEFS@ $(LDADD) $(SOURCES)
99 113
100$(sslTARGET): $(sslSOURCES) $(HEADERS) 114$(sslTARGET): $(sslSOURCES) $(HEADERS)
101 @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \ 115 @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \
102 @DEFS@ @APACHE_DEFS@ $(sslLDADD) $(sslSOURCES) 116 @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES)
103 117
104$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS) 118$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS)
105 @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \ 119 @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \
106 @DEFS@ @APACHE_DEFS@ $(mysqlLDADD) $(mysqlSOURCES) 120 @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES)
107 121
108$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS) 122$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS)
109 @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \ 123 @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \
110 @DEFS@ @APACHE_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES) 124 @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES)
111 125
112include: 126$(dbiTARGET): $(dbiSOURCES) $(HEADERS)
113 rm -rf include 127 @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \
114 ln -s @APACHE_INCDIR@ include 128 @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
115 129
116install: $(TARGETS) install-subdirs 130install: $(TARGETS) install-subdirs
117 @@APXS_BIN@ -i $(TARGET); \ 131 @@APXS_BIN@ -i $(TARGET); \
diff --git a/configure.ac b/configure.ac
index 7cc2653..42e2bde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
1dnl Required initializer 1dnl Required initializer
2AC_INIT(mod_log_sql, 1.97) 2AC_INIT(mod_log_sql, 1.98)
3OOO_CONFIG_NICE(config.nice)
3AC_PREREQ(2.53) 4AC_PREREQ(2.53)
4AC_CONFIG_HEADERS(config.h) 5AC_CONFIG_HEADERS(config.h)
5 6
@@ -10,7 +11,7 @@ AC_PROG_CC
10 11
11APACHE20_VERSION=2.0.40 12APACHE20_VERSION=2.0.40
12APACHE13_VERSION=1.3.20 13APACHE13_VERSION=1.3.20
13CHECK_PATH_APACHE($APACHE13_VERSION,$APACHE20_VERSION, 14CHECK_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
14 :, 15 :,
15 :, 16 :,
16 AC_MSG_ERROR([*** The correct version Apache was not found!]) 17 AC_MSG_ERROR([*** The correct version Apache was not found!])
@@ -30,6 +31,13 @@ CHECK_PATH_MOD_SSL(
30 31
31AC_SUBST(WANT_SSL_MOD) 32AC_SUBST(WANT_SSL_MOD)
32 33
34WANT_MYSQL_MOD=1
35AC_SUBST(WANT_MYSQL_MOD)
36WANT_PGSQL_MOD=0
37AC_SUBST(WANT_PGSQL_MOD)
38WANT_DBI_MOD=0
39AC_SUBST(WANT_DBI_MOD)
40
33case "$target" in 41case "$target" in
34 *-*-solaris* | *-*-osf* ) 42 *-*-solaris* | *-*-osf* )
35 if test $APACHE_VERSION -eq 1.3; then 43 if test $APACHE_VERSION -eq 1.3; then
@@ -43,24 +51,20 @@ esac
43 51
44AC_SUBST(RT_LIBS) 52AC_SUBST(RT_LIBS)
45 53
54
46AC_CHECK_HEADERS(limits.h) 55AC_CHECK_HEADERS(limits.h)
47 56
48AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) 57AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
49 58
50PGSQL_LIBS=-lpq
51
52AC_SUBST(PGSQL_LIBS)
53AC_SUBST(PGSQL_LDFLAGS)
54AC_SUBST(PGSQL_CFLAGS)
55
56dnl Write config.status and the Makefile 59dnl Write config.status and the Makefile
57 60
58AC_OUTPUT(Makefile 61AC_OUTPUT(Makefile
59Documentation/Makefile 62docs/Makefile
60contrib/Makefile) 63contrib/Makefile)
61 64
65
62AC_MSG_RESULT([------------------------------------]) 66AC_MSG_RESULT([------------------------------------])
63AC_MSG_RESULT([Apache version : $APACHE_VERSION]) 67AC_MSG_RESULT([Apache version : $AP_VERSION])
64if test $WANT_SSL_MOD -eq 1; then 68if test $WANT_SSL_MOD -eq 1; then
65 AC_MSG_RESULT([SSL Support : yes]) 69 AC_MSG_RESULT([SSL Support : yes])
66else 70else
diff --git a/Documentation/.cvsignore b/docs/.cvsignore
index 73cd04a..73cd04a 100644
--- a/Documentation/.cvsignore
+++ b/docs/.cvsignore
diff --git a/Documentation/Makefile.in b/docs/Makefile.in
index 81f2298..81f2298 100644
--- a/Documentation/Makefile.in
+++ b/docs/Makefile.in
diff --git a/Documentation/README b/docs/README
index dd40351..dd40351 100644
--- a/Documentation/README
+++ b/docs/README
diff --git a/Documentation/documentation.lyx b/docs/documentation.lyx
index eeb6af5..eeb6af5 100644
--- a/Documentation/documentation.lyx
+++ b/docs/documentation.lyx
diff --git a/Documentation/manual.xml b/docs/manual.xml
index 880bf03..880bf03 100644
--- a/Documentation/manual.xml
+++ b/docs/manual.xml