From 360b6956ce9ecba3d671cf579f38aa5bcfbb657c Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Wed, 12 May 2004 23:31:12 +0000 Subject: renamed directory Documentation to docs updated configure and makefile to use new m4 files --- diff --git a/CHANGELOG b/CHANGELOG index 4beccec..3e0d531 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,10 @@ * Changed default preserve file location to logs/mod_log_sql-preserve And made LogSQLPreserveFile root relative. * fixed bug where preserve file wouldn't be created in apache 2 +* finished TransferLog documentation +* changed strstr to ap_strstr calls and strchr to ap_strchr calls to + stop warning when compiling with AP_DEBUG enabled in apache 2 +* Updated apache m4 to not pass for apache 1.3 if apache 2 is found 1.97: 2004-04-08 * 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 @@ This document has been superseded by the new documentation in the -Documentation/ directory. There you will find the docs in a variety of +docs/ directory. There you will find the docs in a variety of formats, including PostScript, plaintext, and HTML. 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 @@ # @configure_input@ # Modify these top variables. -SUBDIRS = Documentation contrib +SUBDIRS = docs contrib SOURCES = @PACKAGE_NAME@.c HEADERS = mod_log_sql.h \ @@ -19,33 +19,47 @@ EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG TARGET = @PACKAGE_NAME@@APXS_EXTENSION@ +TARGETS = $(TARGET) + sslSOURCES = @PACKAGE_NAME@_ssl.c sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@ sslLDADD = sslCFLAGS = @MOD_SSL_CFLAGS@ sslNAME = log_sql_ssl +ifeq (@WANT_SSL_MOD@,1) +TARGETS += $(sslTARGET) +endif + mysqlSOURCES = @PACKAGE_NAME@_mysql.c mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@ mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@ mysqlCFLAGS = @MYSQL_CFLAGS@ mysqlNAME = log_sql_mysql +ifeq (@WANT_MYSQL_MOD@,1) +TARGETS += $(mysqlTARGET) +endif + pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@ pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@ pgsqlCFLAGS = @PGSQL_CFLAGS@ pgsqlNAME = log_sql_pgsql -TARGETS = $(TARGET) - -ifeq (@WANT_SSL_MOD@,1) -TARGETS += $(sslTARGET) +ifeq (@WANT_PGSQL_MOD@,1) +TARGETS += $(pgsqlTARGET) endif -TARGETS += $(mysqlTARGET) +dbiSOURCES = @PACKAGE_NAME@_dbi.c +dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@ +dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@ +dbiCFLAGS = @DBI_CFLAGS@ +dbiNAME = log_sql_dbi -TARGETS += $(pgsqlTARGET) +ifeq (@WANT_DBI_MOD@,1) +TARGETS += $(dbiTARGET) +endif #Don't modify anything below here @@ -70,8 +84,8 @@ STD_DIST = install-sh \ stamp-h.in \ config.h.in -DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(sslSOURCES) $(mysqlSOURCES) \ - $(HEADERS) +DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS) \ + $(sslSOURCES) $(mysqlSOURCES) all: $(TARGETS) all-subdirs @@ -95,23 +109,23 @@ TODO: TODO.in $(TARGET): $(SOURCES) $(HEADERS) @@APXS_BIN@ -c -o $(TARGET) $(CFLAGS) \ - @DEFS@ @APACHE_DEFS@ $(LDADD) $(SOURCES) + @DEFS@ @AP_DEFS@ $(LDADD) $(SOURCES) $(sslTARGET): $(sslSOURCES) $(HEADERS) @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \ - @DEFS@ @APACHE_DEFS@ $(sslLDADD) $(sslSOURCES) + @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES) $(mysqlTARGET): $(mysqlSOURCES) $(HEADERS) @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \ - @DEFS@ @APACHE_DEFS@ $(mysqlLDADD) $(mysqlSOURCES) + @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES) $(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS) @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \ - @DEFS@ @APACHE_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES) + @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES) -include: - rm -rf include - ln -s @APACHE_INCDIR@ include +$(dbiTARGET): $(dbiSOURCES) $(HEADERS) + @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \ + @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES) install: $(TARGETS) install-subdirs @@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 @@ dnl Required initializer -AC_INIT(mod_log_sql, 1.97) +AC_INIT(mod_log_sql, 1.98) +OOO_CONFIG_NICE(config.nice) AC_PREREQ(2.53) AC_CONFIG_HEADERS(config.h) @@ -10,7 +11,7 @@ AC_PROG_CC APACHE20_VERSION=2.0.40 APACHE13_VERSION=1.3.20 -CHECK_PATH_APACHE($APACHE13_VERSION,$APACHE20_VERSION, +CHECK_APACHE($APACHE13_VERSION,$APACHE20_VERSION, :, :, AC_MSG_ERROR([*** The correct version Apache was not found!]) @@ -30,6 +31,13 @@ CHECK_PATH_MOD_SSL( AC_SUBST(WANT_SSL_MOD) +WANT_MYSQL_MOD=1 +AC_SUBST(WANT_MYSQL_MOD) +WANT_PGSQL_MOD=0 +AC_SUBST(WANT_PGSQL_MOD) +WANT_DBI_MOD=0 +AC_SUBST(WANT_DBI_MOD) + case "$target" in *-*-solaris* | *-*-osf* ) if test $APACHE_VERSION -eq 1.3; then @@ -43,24 +51,20 @@ esac AC_SUBST(RT_LIBS) + AC_CHECK_HEADERS(limits.h) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) -PGSQL_LIBS=-lpq - -AC_SUBST(PGSQL_LIBS) -AC_SUBST(PGSQL_LDFLAGS) -AC_SUBST(PGSQL_CFLAGS) - dnl Write config.status and the Makefile AC_OUTPUT(Makefile -Documentation/Makefile +docs/Makefile contrib/Makefile) + AC_MSG_RESULT([------------------------------------]) -AC_MSG_RESULT([Apache version : $APACHE_VERSION]) +AC_MSG_RESULT([Apache version : $AP_VERSION]) if test $WANT_SSL_MOD -eq 1; then AC_MSG_RESULT([SSL Support : yes]) 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 -- cgit v0.9.2