diff options
author | Edward Rudd | 2004-05-12 23:31:12 +0000 |
---|---|---|
committer | Edward Rudd | 2004-05-12 23:31:12 +0000 |
commit | 360b6956ce9ecba3d671cf579f38aa5bcfbb657c (patch) | |
tree | 5769d75c980b3e02d2a670dfe0fc187f9a17c865 /configure.ac | |
parent | a5763701ea0d1a256c85861c0412c49b383bcc5a (diff) |
renamed directory Documentation to docs
updated configure and makefile to use new m4 files
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 24 |
1 files changed, 14 insertions, 10 deletions
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 |