From ec06ba32ef1bfb3de7fd87ddc9c43468d5f5684e Mon Sep 17 00:00:00 2001 From: Christopher Powell Date: Tue, 15 Jan 2002 18:40:14 +0000 Subject: Ported to mysql_real_connect, made a change for the mass-virtual-hosting folks, and enabled a socket name DEFINE. --- Makefile | 56 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5744be4..65e0cd5 100644 --- a/Makefile +++ b/Makefile @@ -1,37 +1,47 @@ -# $Id: Makefile,v 1.4 2001/12/07 03:52:56 helios Exp $ +# $Id: Makefile,v 1.5 2002/01/15 18:40:14 helios Exp $ +MLMVERS = 1.13 -# Verify that this points to the right place... -APACHEDIR = /usr/local/src/apache_1.3.22 +# Where you unpacked your Apache tarball -- the source. +APACHESOURCE = /usr/local/src/apache_1.3.22 -# Use the first one if you want mod_log_mysql to be able to log -# SSL variables like keysize or cipher. Use the second one if -# you don't use SSL or don't care to log it. -DEFS = -DWANT_SSL_LOGGING -#DEFS = +# Where Apache [got|will get] installed +APACHEINST = /usr/local/Apache -# Use this one if you do WANT_SSL_LOGGING, and confirm the last three paths. -# Point "/usr/local/ssl/include" to where your openssl/*.h files are, -# Point "/usr/include/db1" to where ndbm.h can be found, -# Point "/usr/local/src/apache_1.3.22/src/modules/ssl" to where mod_ssl.h can be found. +# Use the first DEFS line if you want mod_log_mysql to be able to log SSL +# variables like keysize or cipher. Use the second one if you don't use SSL +# or don't care to log it. # -# How to find your directories: +# If your MySQL db is running on the same machine as Apache, modify the +# MYSQLSOCKET path to point to your MySQL socket. This define has no effect +# if your MySQL machine is a networked (TCP/IP) machine. + +DEFS = -DMYSQLSOCKET="\"/var/lib/mysql/mysql.sock\"" -DWANT_SSL_LOGGING +#DEFS = -DMYSQLSOCKET="\"/var/lib/mysql/mysql.sock\"" + +# Use the first CFLAGS if you *do* WANT_SSL_LOGGING, and confirm the paths. # -# $ locate http_core.h -# /usr/local/Apache/include/http_core.h +# Modify "/usr/local/ssl/include" to where YOUR openssl/*.h files are, +# Modify "/usr/include/db1" to where YOUR ndbm.h can be found, +# Modify "/usr/local/src/apache_1.3.22/src/modules/ssl" to where YOUR mod_ssl.h can be found. +# +# How to find your directories: # # $ locate x509.h # /usr/local/ssl/include/openssl/x509.h +# ^^^^^^^^^^^^^^^^^^^^^^ # # $ locate ndbm.h # /usr/include/db1/ndbm.h +# ^^^^^^^^^^^^^^^^ # # $ locate mod_ssl.h # /usr/local/src/apache_1.3.22/src/modules/ssl/mod_ssl.h +# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -CFLAGS = -fpic -O2 -Wall -I/usr/local/Apache/include -I/usr/local/ssl/include -I/usr/include/db1 -I/usr/local/src/apache_1.3.22/src/modules/ssl +CFLAGS = -fpic -O2 -Wall -I${APACHEINST}/include -I/usr/local/ssl/include -I/usr/include/db1 -I${APACHESOURCE}/src/modules/ssl -# Use this one if you don't WANT_SSL_LOGGING: -#CFLAGS = -fpic -O2 -Wall -I/usr/local/Apache/include +# Use this CFLAGS if you don't WANT_SSL_LOGGING: +#CFLAGS = -fpic -O2 -Wall -I${APACHEINST}/include # --------------------------------------------------------- @@ -46,13 +56,13 @@ mod_log_mysql.o: mod_log_mysql.c Makefile $(CC) ${CFLAGS} ${DEFS} -c mod_log_mysql.c install: all - $(INSTALL) mod_log_mysql.o ${APACHEDIR}/src/mod_log_mysql.o + $(INSTALL) mod_log_mysql.o ${APACHESOURCE}/src/mod_log_mysql.o distro: all - cp -f INSTALL /usr/local/Apache/html/mod_log_mysql/ - cp -f README /usr/local/Apache/html/mod_log_mysql/ - cp -f CHANGELOG /usr/local/Apache/html/mod_log_mysql/ - cd ..; tar zcf mod_log_mysql.tar.gz --exclude mod_log_mysql/CVS mod_log_mysql/; $(INSTALL) mod_log_mysql.tar.gz /usr/local/Apache/html/mod_log_mysql/; rm -f mod_log_mysql.tar.gz + cp -f INSTALL ${APACHEINST}/html/mod_log_mysql/ + cp -f README ${APACHEINST}/html/mod_log_mysql/ + cp -f CHANGELOG ${APACHEINST}/html/mod_log_mysql/ + cd ..; tar zcf mod_log_mysql-${MLMVERS}.tar.gz --exclude mod_log_mysql/CVS mod_log_mysql/; $(INSTALL) mod_log_mysql-${MLMVERS}.tar.gz ${APACHEINST}/html/mod_log_mysql/; rm -f mod_log_mysql-${MLMVERS}.tar.gz clean: rm -f *.o *~ -- cgit