summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Edward Rudd 2008-09-21 15:54:12 +0000
committerGravatar Edward Rudd 2008-09-21 15:54:12 +0000
commitba30ceeb705e9b4d40ce0d98f6a4e047d47ce919 (patch)
tree5768679317a303031c80be6cba683b6addeb07ac
parentd33662354f64354c601ae257bd5b1b043c484d97 (diff)
moved all modules source to src subdirectory.. Moved header files into include subdirectory
cleaned up makefiles.
Diffstat
-rw-r--r--Makefile.in170
-rw-r--r--configure.ac24
-rw-r--r--contrib/Makefile.in53
-rw-r--r--docs/Makefile.in24
-rwxr-xr-xgen_todo.pl64
-rw-r--r--include/apache13.h (renamed from apache13.h)2
-rw-r--r--include/apache20.h (renamed from apache20.h)2
-rw-r--r--include/mod_log_sql.h (renamed from mod_log_sql.h)0
-rw-r--r--include/winconfig.h (renamed from winconfig.h)0
-rw-r--r--src/Makefile.in165
-rw-r--r--src/functions.h (renamed from functions.h)0
-rw-r--r--src/functions13.h (renamed from functions13.h)0
-rw-r--r--src/functions20.h (renamed from functions20.h)0
-rw-r--r--src/mod_log_sql.c (renamed from mod_log_sql.c)0
-rw-r--r--src/mod_log_sql_dbd.c (renamed from mod_log_sql_dbd.c)0
-rw-r--r--src/mod_log_sql_dbi.c (renamed from mod_log_sql_dbi.c)0
-rw-r--r--src/mod_log_sql_logio.c (renamed from mod_log_sql_logio.c)0
-rw-r--r--src/mod_log_sql_mysql.c (renamed from mod_log_sql_mysql.c)0
-rw-r--r--src/mod_log_sql_pgsql.c (renamed from mod_log_sql_pgsql.c)0
-rw-r--r--src/mod_log_sql_ssl.c (renamed from mod_log_sql_ssl.c)0
20 files changed, 196 insertions, 308 deletions
diff --git a/Makefile.in b/Makefile.in
index 2647d2e..fb4ea42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,108 +1,17 @@
1# @configure_input@ 1# @configure_input@
2 2
3# Modify these top variables. 3# Modify these top variables.
4SUBDIRS = docs contrib 4SUBDIRS = docs contrib src
5
6HEADERS = mod_log_sql.h \
7 functions.h \
8 functions13.h \
9 functions20.h \
10 apache13.h \
11 apache20.h \
12 winconfig.h
13
14CFLAGS = -Wc,-Wall -Wc,-fno-strict-aliasing
15
16ifeq (@OOO_MAINTAIN@,1)
17CFLAGS += -Wc,-Werror
18endif
19 5
20EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \ 6EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG \
21 build-apache13.bat build-apache2.bat \ 7 build-apache13.bat build-apache2.bat \
22 8
23coreSOURCES = @PACKAGE_NAME@.c
24coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@
25coreLDADD = @RT_LIBS@
26coreCFLAGS =
27coreNAME = log_sql
28TARGETS = $(coreTARGET)
29
30sslSOURCES = @PACKAGE_NAME@_ssl.c
31sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@
32sslLDADD =
33sslCFLAGS = @MOD_SSL_CFLAGS@
34sslNAME = log_sql_ssl
35
36ifeq (@WANT_SSL_MOD@,1)
37TARGETS += $(sslTARGET)
38endif
39
40logioSOURCES = @PACKAGE_NAME@_logio.c
41logioTARGET = @PACKAGE_NAME@_logio@APXS_EXTENSION@
42logioLDADD =
43logioCFLAGS =
44logioNAME = log_sql_logio
45
46ifeq (@WANT_LOGIO_MOD@,1)
47TARGETS += $(logioTARGET)
48endif
49
50mysqlSOURCES = @PACKAGE_NAME@_mysql.c
51mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@
52mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
53mysqlCFLAGS = @MYSQL_CFLAGS@
54mysqlNAME = log_sql_mysql
55
56ifeq (@WANT_MYSQL_MOD@,1)
57TARGETS += $(mysqlTARGET)
58endif
59
60pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c
61pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@
62pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@
63pgsqlCFLAGS = @PGSQL_CFLAGS@
64pgsqlNAME = log_sql_pgsql
65
66ifeq (@WANT_PGSQL_MOD@,1)
67TARGETS += $(pgsqlTARGET)
68endif
69
70dbiSOURCES = @PACKAGE_NAME@_dbi.c
71dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@
72dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@
73dbiCFLAGS = @DBI_CFLAGS@
74dbiNAME = log_sql_dbi
75
76ifeq (@WANT_DBI_MOD@,1)
77TARGETS += $(dbiTARGET)
78endif
79
80dbdSOURCES = @PACKAGE_NAME@_dbd.c
81dbdTARGET = @PACKAGE_NAME@_dbd@APXS_EXTENSION@
82dbdLDADD =
83dbdCFLAGS =
84dbdNAME = log_sql_dbd
85
86ifeq (@WANT_DBD_MOD@,1)
87TARGETS += $(dbdTARGET)
88endif
89
90#Don't modify anything below here 9#Don't modify anything below here
91 10
92PROVIDERS_SUBDIRS = @subdirs@ 11top_srcdir = @top_srcdir@
93
94srcdir = @abs_srcdir@ 12srcdir = @abs_srcdir@
95builddir = @abs_builddir@ 13builddir = @abs_builddir@
96 14
97OBJ = $(coreSOURCES:.c=.o) $(logioSOURCES:.c=.o) $(sslSOURCES:.c=.o) $(mysqlSOURCES:.c=.o) \
98 $(dbiSOURCES:.c=.o) $(pgsqlSOURCES:.c=.o) $(dbdSOURCES:.c=.o)
99
100LO = $(coreSOURCES:.c=.lo) $(logioSOURCES:.c=.lo) $(sslSOURCES:.c=.lo) $(mysqlSOURCES:.c=.lo) \
101 $(dbiSOURCES:.c=.lo) $(pgsqlSOURCES:.c=.lo) $(dbdSOURCES:.c=.lo)
102
103SLO = $(coreSOURCES:.c=.slo) $(logioSOURCES:.c=.slo) $(sslSOURCES:.c=.slo) $(mysqlSOURCES:.c=.slo) \
104 $(dbiSOURCES:.c=.slo) $(pgsqlSOURCES:.c=.slo) $(dbdSOURCES:.c=.slo)
105
106STD_DIST = install-sh \ 15STD_DIST = install-sh \
107 config.sub \ 16 config.sub \
108 config.guess \ 17 config.guess \
@@ -111,16 +20,15 @@ STD_DIST = install-sh \
111 configure.ac \ 20 configure.ac \
112 configure \ 21 configure \
113 stamp-h.in \ 22 stamp-h.in \
114 config.h.in 23 include/config.h.in
115 24
116DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(coreSOURCES) $(HEADERS) \ 25DISTFILES = $(STD_DIST) $(EXTRA_DIST)
117 $(sslSOURCES) $(logioSOURCES) $(mysqlSOURCES) $(pgsqlSOURCES) $(dbiSOURCES) $(dbdSOURCES)
118 26
119all: $(TARGETS) all-subdirs 27all: all-subdirs
120 28
121all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs: 29all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
122 @otarget=`echo $@|sed s/-subdirs//`; \ 30 @otarget=`echo $@|sed s/-subdirs//`; \
123 list=' $(PROVIDERS_SUBDIRS) $(SUBDIRS)'; \ 31 list=' $(SUBDIRS)'; \
124 for i in $$list; do \ 32 for i in $$list; do \
125 if test -d "$$i"; then \ 33 if test -d "$$i"; then \
126 target="$$otarget"; \ 34 target="$$otarget"; \
@@ -134,57 +42,9 @@ all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
134 done; 42 done;
135 43
136TODO: TODO.in 44TODO: TODO.in
137 @./gen_todo.pl 45 @./m4/scripts/gen_todo.pl
138
139$(coreTARGET): $(coreSOURCES) $(HEADERS)
140 @@APXS_BIN@ -c -o $(coreTARGET) $(coreCFLAGS) $(CFLAGS) \
141 @DEFS@ @AP_DEFS@ $(coreLDADD) $(coreSOURCES)
142
143$(logioTARGET): $(logioSOURCES) $(HEADERS)
144 @@APXS_BIN@ -c -o $(logioTARGET) $(logioCFLAGS) $(CFLAGS) \
145 @DEFS@ @AP_DEFS@ $(logioLDADD) $(logioSOURCES)
146 46
147$(sslTARGET): $(sslSOURCES) $(HEADERS) 47install: install-subdirs
148 @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \
149 @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES)
150
151$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS)
152 @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \
153 @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES)
154
155$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS)
156 @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \
157 @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES)
158
159$(dbiTARGET): $(dbiSOURCES) $(HEADERS)
160 @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \
161 @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
162
163$(dbdTARGET): $(dbdSOURCES) $(HEADERS)
164 @@APXS_BIN@ -c -o $(dbdTARGET) $(dbdCFLAGS) $(CFLAGS) \
165 @DEFS@ @AP_DEFS@ $(dbdLDADD) $(dbdSOURCES)
166
167
168install: $(TARGETS) install-subdirs
169 @@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \
170 if test @WANT_MYSQL_MOD@ -eq 1; then \
171 @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
172 fi; \
173 if test @WANT_PGSQL_MOD@ -eq 1; then \
174 @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \
175 fi; \
176 if test @WANT_DBI_MOD@ -eq 1; then \
177 @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \
178 fi; \
179 if test @WANT_DBD_MOD@ -eq 1; then \
180 @APXS_BIN@ -n $(dbdNAME) -i $(dbdTARGET); \
181 fi; \
182 if test @WANT_SSL_MOD@ -eq 1; then \
183 @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
184 fi; \
185 if test @WANT_LOGIO_MOD@ -eq 1; then \
186 @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \
187 fi; \
188 echo "*************************************************************************"; \ 48 echo "*************************************************************************"; \
189 echo "*** The mod_log_sql modules have been installed."; \ 49 echo "*** The mod_log_sql modules have been installed."; \
190 echo "*** Please edit your Apache configuration files and"; \ 50 echo "*** Please edit your Apache configuration files and"; \
@@ -201,17 +61,11 @@ install: $(TARGETS) install-subdirs
201 echo "*************************************************************************"; 61 echo "*************************************************************************";
202 62
203activate: activate-subdirs 63activate: activate-subdirs
204 @@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \
205 if test @WANT_SSL_MOD@ -eq 1; then \
206 @APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \
207 fi
208 64
209clean: clean-subdirs 65clean: clean-subdirs
210 $(RM) $(OBJ) $(SLO) $(LO) $(TARGETS)
211 $(RM) -r .libs
212 66
213distclean: clean distclean-subdirs 67distclean: clean distclean-subdirs
214 $(RM) config.status config.log config.h config.h.in \ 68 $(RM) config.status config.log include/config.h include/config.h.in \
215 configure stamp-h stamp-h.in Makefile aclocal.m4 69 configure stamp-h stamp-h.in Makefile aclocal.m4
216 $(RM) -r autom4te-2.53.cache 70 $(RM) -r autom4te-2.53.cache
217 71
@@ -219,7 +73,7 @@ DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
219DESTTGZ = $(DESTDIR).tar.gz 73DESTTGZ = $(DESTDIR).tar.gz
220dist: 74dist:
221 @rm -rf $(DESTDIR); \ 75 @rm -rf $(DESTDIR); \
222 list=' $(PROVIDERS_SUBDIRS) $(SUBDIRS)'; \ 76 list=' $(SUBDIRS)'; \
223 for i in $$list; do \ 77 for i in $$list; do \
224 if test -d "$$i"; then \ 78 if test -d "$$i"; then \
225 target=local-dist; \ 79 target=local-dist; \
@@ -240,8 +94,8 @@ dist:
240 rm -rf $(DESTDIR); \ 94 rm -rf $(DESTDIR); \
241 95
242local-dist: $(DISTFILES) 96local-dist: $(DISTFILES)
243 @mkdir -p $(DESTDIR); \ 97 mkdir -p $(DESTDIR)
244 cp -dp --parents $(DISTFILES) $(DESTDIR); 98 cp -dp --parents $(DISTFILES) $(DESTDIR)
245 99
246.PHONY: include all-subdirs activate-subdirs install-subdirs \ 100.PHONY: include all-subdirs activate-subdirs install-subdirs \
247 clean-subdirs distclean-subdirs dist 101 clean-subdirs distclean-subdirs dist
diff --git a/configure.ac b/configure.ac
index 55de120..07ac486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
1dnl Required initializer 1dnl Required initializer
2AC_INIT(mod_log_sql, 1.102) 2AC_INIT([mod_log_sql],[1.102])
3OOO_CONFIG_NICE(config.nice) 3OOO_CONFIG_NICE(config.nice)
4AC_PREREQ(2.53) 4AC_PREREQ(2.59)
5AC_CONFIG_HEADERS(config.h) 5AC_CONFIG_HEADERS(include/config.h)
6AC_CONFIG_SRCDIR(mod_log_sql.c) 6AC_CONFIG_SRCDIR(src/mod_log_sql.c)
7 7
8OOO_MAINTAIN_MODE 8OOO_MAINTAIN_MODE
9 9
@@ -18,7 +18,7 @@ CHECK_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
18 :, 18 :,
19 AC_MSG_ERROR([*** The correct version Apache was not found!]) 19 AC_MSG_ERROR([*** The correct version Apache was not found!])
20 AC_MSG_ERROR([*** You need either Apache 1.3 version $APACHE13_VERSION or greater]) 20 AC_MSG_ERROR([*** You need either Apache 1.3 version $APACHE13_VERSION or greater])
21 AC_MSG_ERROR([*** or Apache 2.0/2.1 version $APACHE20_VERSION or greater!]) 21 AC_MSG_ERROR([*** or Apache 2.0/2.2 version $APACHE20_VERSION or greater!])
22 ) 22 )
23 23
24if test $AP_VERSION = "2.0"; then 24if test $AP_VERSION = "2.0"; then
@@ -29,11 +29,9 @@ fi
29 29
30AC_SUBST(WANT_LOGIO_MOD) 30AC_SUBST(WANT_LOGIO_MOD)
31 31
32if test $AP_VERSION = "2.0"; then 32CHECK_APU_HEADERS([apr_dbd.h],
33 WANT_DBD_MOD=1 33 WANT_DBD_MOD=1,
34else 34 WANT_DBD_MOD=0)
35 WANT_DBD_MOD=0
36fi
37 35
38AC_SUBST(WANT_DBD_MOD) 36AC_SUBST(WANT_DBD_MOD)
39 37
@@ -84,9 +82,11 @@ AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
84 82
85dnl Write config.status and the Makefile 83dnl Write config.status and the Makefile
86 84
87AC_OUTPUT(Makefile 85AC_CONFIG_FILES([Makefile
86src/Makefile
88docs/Makefile 87docs/Makefile
89contrib/Makefile) 88contrib/Makefile])
89AC_OUTPUT
90 90
91 91
92AC_MSG_RESULT([------------------------------------]) 92AC_MSG_RESULT([------------------------------------])
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index b384fd0..c2bd203 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -17,60 +17,17 @@ STD_DIST = Makefile.in
17 17
18DISTFILES = $(STD_DIST) $(EXTRA_DIST) 18DISTFILES = $(STD_DIST) $(EXTRA_DIST)
19 19
20all: all-subdirs 20all:
21 21
22all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs: 22install:
23 @otarget=`echo $@|sed s/-subdirs//`; \
24 list=' $(SUBDIRS)'; \
25 for i in $$list; do \
26 if test -d "$$i"; then \
27 target="$$otarget"; \
28 echo "Making $$target in $$i"; \
29 if test "$$i" = "."; then \
30 made_local=yes; \
31 target="local-$$target"; \
32 fi; \
33 (cd $$i && $(MAKE) $$target) || exit 1; \
34 fi; \
35 done; \
36 23
37include: 24update:
38 rm -rf include
39 ln -s @APACHE_INCDIR@ include
40 25
41install: install-subdirs 26clean:
42 27
43update: update-subdirs 28distclean: clean
44
45clean: clean-subdirs
46
47distclean: clean distclean-subdirs
48 $(RM) Makefile 29 $(RM) Makefile
49 30
50DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
51DESTTGZ = $(DESTDIR).tar.gz
52dist:
53 @rm -rf $(DESTDIR); \
54 list=' $(SUBDIRS)'; \
55 for i in $$list; do \
56 if test -d "$$i"; then \
57 target=local-dist; \
58 echo "Making $$target in $$i"; \
59 if test "$$i" = "."; then \
60 made_local=yes; \
61 target="local-dist"; \
62 fi; \
63 NEWDESTDIR=$(builddir)/$(DESTDIR)/$$i; \
64 echo $(NEWDESTDIR); \
65 (cd $$i && $(MAKE) DESTDIR=$(builddir)/$(DESTDIR)/$$i $$target) || exit 1; \
66 fi; \
67 done;
68 if test "$$made_local" != "yes"; then \
69 $(MAKE) "local-dist" || exit 1; \
70 fi
71 tar -zcf $(DESTTGZ) $(DESTDIR)
72 rm -rf $(DESTDIR)
73
74local-dist: $(DISTFILES) 31local-dist: $(DISTFILES)
75 mkdir -p $(DESTDIR) 32 mkdir -p $(DESTDIR)
76 cp -dp --parents $(DISTFILES) $(DESTDIR) 33 cp -dp --parents $(DISTFILES) $(DESTDIR)
diff --git a/docs/Makefile.in b/docs/Makefile.in
index fa1bd2e..d88e72b 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -52,30 +52,6 @@ clean: clean-subdirs
52distclean: clean distclean-subdirs 52distclean: clean distclean-subdirs
53 $(RM) Makefile 53 $(RM) Makefile
54 54
55DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
56DESTTGZ = $(DESTDIR).tar.gz
57dist:
58 @rm -rf $(DESTDIR); \
59 list=' $(SUBDIRS)'; \
60 for i in $$list; do \
61 if test -d "$$i"; then \
62 target=local-dist; \
63 echo "Making $$target in $$i"; \
64 if test "$$i" = "."; then \
65 made_local=yes; \
66 target="local-dist"; \
67 fi; \
68 NEWDESTDIR=$(builddir)/$(DESTDIR)/$$i; \
69 echo $(NEWDESTDIR); \
70 (cd $$i && $(MAKE) DESTDIR=$(builddir)/$(DESTDIR)/$$i $$target) || exit 1; \
71 fi; \
72 done;
73 if test "$$made_local" != "yes"; then \
74 $(MAKE) "local-dist" || exit 1; \
75 fi
76 tar -zcf $(DESTTGZ) $(DESTDIR)
77 rm -rf $(DESTDIR)
78
79local-dist: $(DISTFILES) 55local-dist: $(DISTFILES)
80 mkdir -p $(DESTDIR) 56 mkdir -p $(DESTDIR)
81 cp -dp --parents $(DISTFILES) $(DESTDIR) 57 cp -dp --parents $(DISTFILES) $(DESTDIR)
diff --git a/gen_todo.pl b/gen_todo.pl
deleted file mode 100755
index 20b0894..0000000
--- a/gen_todo.pl
+++ /dev/null
@@ -1,64 +0,0 @@
1#!/usr/bin/perl
2
3# Copyright 2003-2004 Edward Rudd
4#
5# Licensed under the Apache License, Version 2.0 (the "License");
6# you may not use this file except in compliance with the License.
7# You may obtain a copy of the License at
8#
9# http://www.apache.org/licenses/LICENSE-2.0
10#
11# Unless required by applicable law or agreed to in writing, software
12# distributed under the License is distributed on an "AS IS" BASIS,
13# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14# See the License for the specific language governing permissions and
15# limitations under the License.
16
17use strict;
18my $rootdir = ".";
19opendir(MYDIR, $rootdir) or die "Unable to open directory";
20print "Building TODO file for source directory\n";
21my $todo_header = "* Things TODO *\n\n";
22if (open ( TODOFILE, "TODO.in")) {
23 $todo_header = do { local $/; <TODOFILE> };
24 close (TODOFILE);
25}
26open (TODOFILE, "> TODO");
27print TODOFILE $todo_header;
28print "Parsing...";
29while (my $entry = readdir(MYDIR)) {
30 next if (!($entry =~ /\.[ch]$/));
31 print "$entry...";
32 open(DAFILE, $rootdir.'/'.$entry) or die "Unable to open file\n";
33 my $linenumber = 0;
34 my $status = 0; # 0=no comment 1=comment 2=in todo block
35 while (my $line = <DAFILE>) {
36 $linenumber++;
37 if ($status==0) {
38 if ( ($line =~ /\/\/\s+TODO: (.*)/) || ($line =~ /\/\*\s+TODO: (.*)\s*\*\//) ){
39 print TODOFILE $entry.":".$linenumber.": ".$1."\n";
40 } else {
41 if ($line =~ /\/\*\*/) {
42 $status = 1;
43 }
44 }
45 } else {
46 if ($line =~ /\*\//) {
47 $status = 0;
48 } else {
49 if ($status==1) {
50 if ($line =~ /TODO:/) {
51 $status=2;
52 }
53 } else {
54 if ($line =~ /\* \s+-?\s*(.*)/) {
55 print TODOFILE $entry.":".$linenumber.": ".$1."\n";
56 }
57 }
58 }
59 }
60 }
61 close(DAFILE);
62}
63print "\n";
64closedir(MYDIR);
diff --git a/apache13.h b/include/apache13.h
index 8174263..5659420 100644
--- a/apache13.h
+++ b/include/apache13.h
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id: apache13.h 175 2007-10-20 13:18:20Z urkle@drip.ws $ */
2#ifndef APACHE13_H 2#ifndef APACHE13_H
3#define APACHE13_H 3#define APACHE13_H
4 4
diff --git a/apache20.h b/include/apache20.h
index 9d87588..4c755ab 100644
--- a/apache20.h
+++ b/include/apache20.h
@@ -1,4 +1,4 @@
1/* $Id$ */ 1/* $Id: apache20.h 125 2004-04-29 18:05:25Z urkle@drip.ws $ */
2#ifndef APACHE20_H 2#ifndef APACHE20_H
3#define APACHE20_H 3#define APACHE20_H
4 4
diff --git a/mod_log_sql.h b/include/mod_log_sql.h
index c1d9bff..c1d9bff 100644
--- a/mod_log_sql.h
+++ b/include/mod_log_sql.h
diff --git a/winconfig.h b/include/winconfig.h
index 702c35f..702c35f 100644
--- a/winconfig.h
+++ b/include/winconfig.h
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..558b621
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,165 @@
1# @configure_input@
2
3top_srcdir = @top_srcdir@
4srcdir = @abs_srcdir@
5builddir = @abs_builddir@
6
7HEADERS = ../include/mod_log_sql.h \
8 functions.h \
9 functions13.h \
10 functions20.h \
11 ../include/apache13.h \
12 ../include/apache20.h \
13 ../include/winconfig.h
14
15CFLAGS = -Wc,-Wall -Wc,-fno-strict-aliasing -I$(top_srcdir)/include
16
17ifeq (@OOO_MAINTAIN@,1)
18CFLAGS += -Wc,-Werror
19endif
20
21coreSOURCES = @PACKAGE_NAME@.c
22coreTARGET = @PACKAGE_NAME@@APXS_EXTENSION@
23coreLDADD = @RT_LIBS@
24coreCFLAGS =
25coreNAME = log_sql
26TARGETS = $(coreTARGET)
27
28sslSOURCES = @PACKAGE_NAME@_ssl.c
29sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@
30sslLDADD =
31sslCFLAGS = @MOD_SSL_CFLAGS@
32sslNAME = log_sql_ssl
33
34ifeq (@WANT_SSL_MOD@,1)
35TARGETS += $(sslTARGET)
36endif
37
38logioSOURCES = @PACKAGE_NAME@_logio.c
39logioTARGET = @PACKAGE_NAME@_logio@APXS_EXTENSION@
40logioLDADD =
41logioCFLAGS =
42logioNAME = log_sql_logio
43
44ifeq (@WANT_LOGIO_MOD@,1)
45TARGETS += $(logioTARGET)
46endif
47
48mysqlSOURCES = @PACKAGE_NAME@_mysql.c
49mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@
50mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
51mysqlCFLAGS = @MYSQL_CFLAGS@
52mysqlNAME = log_sql_mysql
53
54ifeq (@WANT_MYSQL_MOD@,1)
55TARGETS += $(mysqlTARGET)
56endif
57
58pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c
59pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@
60pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@
61pgsqlCFLAGS = @PGSQL_CFLAGS@
62pgsqlNAME = log_sql_pgsql
63
64ifeq (@WANT_PGSQL_MOD@,1)
65TARGETS += $(pgsqlTARGET)
66endif
67
68dbiSOURCES = @PACKAGE_NAME@_dbi.c
69dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@
70dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@
71dbiCFLAGS = @DBI_CFLAGS@
72dbiNAME = log_sql_dbi
73
74ifeq (@WANT_DBI_MOD@,1)
75TARGETS += $(dbiTARGET)
76endif
77
78dbdSOURCES = @PACKAGE_NAME@_dbd.c
79dbdTARGET = @PACKAGE_NAME@_dbd@APXS_EXTENSION@
80dbdLDADD =
81dbdCFLAGS =
82dbdNAME = log_sql_dbd
83
84ifeq (@WANT_DBD_MOD@,1)
85TARGETS += $(dbdTARGET)
86endif
87
88OBJ = $(coreSOURCES:.c=.o) $(logioSOURCES:.c=.o) $(sslSOURCES:.c=.o) $(mysqlSOURCES:.c=.o) \
89 $(dbiSOURCES:.c=.o) $(pgsqlSOURCES:.c=.o) $(dbdSOURCES:.c=.o)
90
91LO = $(coreSOURCES:.c=.lo) $(logioSOURCES:.c=.lo) $(sslSOURCES:.c=.lo) $(mysqlSOURCES:.c=.lo) \
92 $(dbiSOURCES:.c=.lo) $(pgsqlSOURCES:.c=.lo) $(dbdSOURCES:.c=.lo)
93
94SLO = $(coreSOURCES:.c=.slo) $(logioSOURCES:.c=.slo) $(sslSOURCES:.c=.slo) $(mysqlSOURCES:.c=.slo) \
95 $(dbiSOURCES:.c=.slo) $(pgsqlSOURCES:.c=.slo) $(dbdSOURCES:.c=.slo)
96
97STD_DIST = Makefile.in
98
99DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(coreSOURCES) $(HEADERS) \
100 $(sslSOURCES) $(logioSOURCES) $(mysqlSOURCES) $(pgsqlSOURCES) $(dbiSOURCES) $(dbdSOURCES)
101
102all: $(TARGETS)
103
104$(coreTARGET): $(coreSOURCES) $(HEADERS)
105 @@APXS_BIN@ -c -o $(coreTARGET) $(coreCFLAGS) $(CFLAGS) \
106 @DEFS@ @AP_DEFS@ $(coreLDADD) $(coreSOURCES)
107
108$(logioTARGET): $(logioSOURCES) $(HEADERS)
109 @@APXS_BIN@ -c -o $(logioTARGET) $(logioCFLAGS) $(CFLAGS) \
110 @DEFS@ @AP_DEFS@ $(logioLDADD) $(logioSOURCES)
111
112$(sslTARGET): $(sslSOURCES) $(HEADERS)
113 @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \
114 @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES)
115
116$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS)
117 @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \
118 @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES)
119
120$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS)
121 @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \
122 @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES)
123
124$(dbiTARGET): $(dbiSOURCES) $(HEADERS)
125 @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \
126 @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
127
128$(dbdTARGET): $(dbdSOURCES) $(HEADERS)
129 @@APXS_BIN@ -c -o $(dbdTARGET) $(dbdCFLAGS) $(CFLAGS) \
130 @DEFS@ @AP_DEFS@ $(dbdLDADD) $(dbdSOURCES)
131
132install: $(TARGETS)
133 @@APXS_BIN@ -n $(coreNAME) -i $(coreTARGET); \
134 if test @WANT_MYSQL_MOD@ -eq 1; then \
135 @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
136 fi; \
137 if test @WANT_PGSQL_MOD@ -eq 1; then \
138 @APXS_BIN@ -n $(pgsqlNAME) -i $(pgsqlTARGET); \
139 fi; \
140 if test @WANT_DBI_MOD@ -eq 1; then \
141 @APXS_BIN@ -n $(dbiNAME) -i $(dbiTARGET); \
142 fi; \
143 if test @WANT_DBD_MOD@ -eq 1; then \
144 @APXS_BIN@ -n $(dbdNAME) -i $(dbdTARGET); \
145 fi; \
146 if test @WANT_SSL_MOD@ -eq 1; then \
147 @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
148 fi; \
149 if test @WANT_LOGIO_MOD@ -eq 1; then \
150 @APXS_BIN@ -n $(logioNAME) -i $(logioTARGET); \
151 fi;
152
153activate:
154 @@APXS_BIN@ -n $(coreNAME) -i -a $(coreTARGET); \
155 if test @WANT_SSL_MOD@ -eq 1; then \
156 @APXS_BIN@ -n $(sslNAME) -i -a $(sslTARGET); \
157 fi
158
159clean:
160 $(RM) $(OBJ) $(SLO) $(LO) $(TARGETS)
161 $(RM) -r .libs
162
163local-dist: $(DISTFILES)
164 mkdir -p $(DESTDIR)
165 cp -dp --parents $(DISTFILES) $(DESTDIR)
diff --git a/functions.h b/src/functions.h
index 07711d2..07711d2 100644
--- a/functions.h
+++ b/src/functions.h
diff --git a/functions13.h b/src/functions13.h
index 54e3138..54e3138 100644
--- a/functions13.h
+++ b/src/functions13.h
diff --git a/functions20.h b/src/functions20.h
index 5220b7c..5220b7c 100644
--- a/functions20.h
+++ b/src/functions20.h
diff --git a/mod_log_sql.c b/src/mod_log_sql.c
index d319e97..d319e97 100644
--- a/mod_log_sql.c
+++ b/src/mod_log_sql.c
diff --git a/mod_log_sql_dbd.c b/src/mod_log_sql_dbd.c
index c78a128..c78a128 100644
--- a/mod_log_sql_dbd.c
+++ b/src/mod_log_sql_dbd.c
diff --git a/mod_log_sql_dbi.c b/src/mod_log_sql_dbi.c
index 40a972b..40a972b 100644
--- a/mod_log_sql_dbi.c
+++ b/src/mod_log_sql_dbi.c
diff --git a/mod_log_sql_logio.c b/src/mod_log_sql_logio.c
index ed69acf..ed69acf 100644
--- a/mod_log_sql_logio.c
+++ b/src/mod_log_sql_logio.c
diff --git a/mod_log_sql_mysql.c b/src/mod_log_sql_mysql.c
index 942c03a..942c03a 100644
--- a/mod_log_sql_mysql.c
+++ b/src/mod_log_sql_mysql.c
diff --git a/mod_log_sql_pgsql.c b/src/mod_log_sql_pgsql.c
index 4e12920..4e12920 100644
--- a/mod_log_sql_pgsql.c
+++ b/src/mod_log_sql_pgsql.c
diff --git a/mod_log_sql_ssl.c b/src/mod_log_sql_ssl.c
index 47bba8b..47bba8b 100644
--- a/mod_log_sql_ssl.c
+++ b/src/mod_log_sql_ssl.c
generated by cgit (git 2.34.1) at 2025-10-29 08:06:30 +0000