diff options
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | INSTALL | 2 | ||||
-rw-r--r-- | Makefile.in | 46 | ||||
-rw-r--r-- | configure.ac | 24 | ||||
-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
@@ -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 | ||
10 | 1.97: 2004-04-08 | 14 | 1.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 |
@@ -1,5 +1,5 @@ | |||
1 | This document has been superseded by the new documentation in the | 1 | This document has been superseded by the new documentation in the |
2 | Documentation/ directory. There you will find the docs in a variety of | 2 | docs/ directory. There you will find the docs in a variety of |
3 | formats, including PostScript, plaintext, and HTML. | 3 | formats, including PostScript, plaintext, and HTML. |
4 | 4 | ||
5 | Basic overview is.. | 5 | Basic 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. |
4 | SUBDIRS = Documentation contrib | 4 | SUBDIRS = docs contrib |
5 | SOURCES = @PACKAGE_NAME@.c | 5 | SOURCES = @PACKAGE_NAME@.c |
6 | 6 | ||
7 | HEADERS = mod_log_sql.h \ | 7 | HEADERS = mod_log_sql.h \ |
@@ -19,33 +19,47 @@ EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG | |||
19 | 19 | ||
20 | TARGET = @PACKAGE_NAME@@APXS_EXTENSION@ | 20 | TARGET = @PACKAGE_NAME@@APXS_EXTENSION@ |
21 | 21 | ||
22 | TARGETS = $(TARGET) | ||
23 | |||
22 | sslSOURCES = @PACKAGE_NAME@_ssl.c | 24 | sslSOURCES = @PACKAGE_NAME@_ssl.c |
23 | sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@ | 25 | sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@ |
24 | sslLDADD = | 26 | sslLDADD = |
25 | sslCFLAGS = @MOD_SSL_CFLAGS@ | 27 | sslCFLAGS = @MOD_SSL_CFLAGS@ |
26 | sslNAME = log_sql_ssl | 28 | sslNAME = log_sql_ssl |
27 | 29 | ||
30 | ifeq (@WANT_SSL_MOD@,1) | ||
31 | TARGETS += $(sslTARGET) | ||
32 | endif | ||
33 | |||
28 | mysqlSOURCES = @PACKAGE_NAME@_mysql.c | 34 | mysqlSOURCES = @PACKAGE_NAME@_mysql.c |
29 | mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@ | 35 | mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@ |
30 | mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ | 36 | mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ |
31 | mysqlCFLAGS = @MYSQL_CFLAGS@ | 37 | mysqlCFLAGS = @MYSQL_CFLAGS@ |
32 | mysqlNAME = log_sql_mysql | 38 | mysqlNAME = log_sql_mysql |
33 | 39 | ||
40 | ifeq (@WANT_MYSQL_MOD@,1) | ||
41 | TARGETS += $(mysqlTARGET) | ||
42 | endif | ||
43 | |||
34 | pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c | 44 | pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c |
35 | pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@ | 45 | pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@ |
36 | pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@ | 46 | pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@ |
37 | pgsqlCFLAGS = @PGSQL_CFLAGS@ | 47 | pgsqlCFLAGS = @PGSQL_CFLAGS@ |
38 | pgsqlNAME = log_sql_pgsql | 48 | pgsqlNAME = log_sql_pgsql |
39 | 49 | ||
40 | TARGETS = $(TARGET) | 50 | ifeq (@WANT_PGSQL_MOD@,1) |
41 | 51 | TARGETS += $(pgsqlTARGET) | |
42 | ifeq (@WANT_SSL_MOD@,1) | ||
43 | TARGETS += $(sslTARGET) | ||
44 | endif | 52 | endif |
45 | 53 | ||
46 | TARGETS += $(mysqlTARGET) | 54 | dbiSOURCES = @PACKAGE_NAME@_dbi.c |
55 | dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@ | ||
56 | dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@ | ||
57 | dbiCFLAGS = @DBI_CFLAGS@ | ||
58 | dbiNAME = log_sql_dbi | ||
47 | 59 | ||
48 | TARGETS += $(pgsqlTARGET) | 60 | ifeq (@WANT_DBI_MOD@,1) |
61 | TARGETS += $(dbiTARGET) | ||
62 | endif | ||
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 | ||
73 | DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(sslSOURCES) $(mysqlSOURCES) \ | 87 | DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS) \ |
74 | $(HEADERS) | 88 | $(sslSOURCES) $(mysqlSOURCES) |
75 | 89 | ||
76 | all: $(TARGETS) all-subdirs | 90 | all: $(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 | ||
112 | include: | 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 | ||
116 | install: $(TARGETS) install-subdirs | 130 | install: $(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 @@ | |||
1 | dnl Required initializer | 1 | dnl Required initializer |
2 | AC_INIT(mod_log_sql, 1.97) | 2 | AC_INIT(mod_log_sql, 1.98) |
3 | OOO_CONFIG_NICE(config.nice) | ||
3 | AC_PREREQ(2.53) | 4 | AC_PREREQ(2.53) |
4 | AC_CONFIG_HEADERS(config.h) | 5 | AC_CONFIG_HEADERS(config.h) |
5 | 6 | ||
@@ -10,7 +11,7 @@ AC_PROG_CC | |||
10 | 11 | ||
11 | APACHE20_VERSION=2.0.40 | 12 | APACHE20_VERSION=2.0.40 |
12 | APACHE13_VERSION=1.3.20 | 13 | APACHE13_VERSION=1.3.20 |
13 | CHECK_PATH_APACHE($APACHE13_VERSION,$APACHE20_VERSION, | 14 | CHECK_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 | ||
31 | AC_SUBST(WANT_SSL_MOD) | 32 | AC_SUBST(WANT_SSL_MOD) |
32 | 33 | ||
34 | WANT_MYSQL_MOD=1 | ||
35 | AC_SUBST(WANT_MYSQL_MOD) | ||
36 | WANT_PGSQL_MOD=0 | ||
37 | AC_SUBST(WANT_PGSQL_MOD) | ||
38 | WANT_DBI_MOD=0 | ||
39 | AC_SUBST(WANT_DBI_MOD) | ||
40 | |||
33 | case "$target" in | 41 | case "$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 | ||
44 | AC_SUBST(RT_LIBS) | 52 | AC_SUBST(RT_LIBS) |
45 | 53 | ||
54 | |||
46 | AC_CHECK_HEADERS(limits.h) | 55 | AC_CHECK_HEADERS(limits.h) |
47 | 56 | ||
48 | AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) | 57 | AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) |
49 | 58 | ||
50 | PGSQL_LIBS=-lpq | ||
51 | |||
52 | AC_SUBST(PGSQL_LIBS) | ||
53 | AC_SUBST(PGSQL_LDFLAGS) | ||
54 | AC_SUBST(PGSQL_CFLAGS) | ||
55 | |||
56 | dnl Write config.status and the Makefile | 59 | dnl Write config.status and the Makefile |
57 | 60 | ||
58 | AC_OUTPUT(Makefile | 61 | AC_OUTPUT(Makefile |
59 | Documentation/Makefile | 62 | docs/Makefile |
60 | contrib/Makefile) | 63 | contrib/Makefile) |
61 | 64 | ||
65 | |||
62 | AC_MSG_RESULT([------------------------------------]) | 66 | AC_MSG_RESULT([------------------------------------]) |
63 | AC_MSG_RESULT([Apache version : $APACHE_VERSION]) | 67 | AC_MSG_RESULT([Apache version : $AP_VERSION]) |
64 | if test $WANT_SSL_MOD -eq 1; then | 68 | if test $WANT_SSL_MOD -eq 1; then |
65 | AC_MSG_RESULT([SSL Support : yes]) | 69 | AC_MSG_RESULT([SSL Support : yes]) |
66 | else | 70 | else |
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 | |||