1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
--- configure.in.orig 2005-02-16 16:23:32.000000000 +0500
+++ configure.in 2008-01-25 23:42:04.000000000 +0500
@@ -34,18 +34,18 @@
dnl
dnl test for MySQL
dnl
-AC_ARG_WITH(mysql,
- --with-mysql=<directory> mysql installed in <directory>,[
-if test $withval != yes
-then
- dir=$withval
-else
- dir="/usr/local"
-fi
-mysqldir=""
+AC_ARG_WITH(mysql,
+ AS_HELP_STRING([--with-mysql=DIR], [mysql installed in DIR]),
+ [],
+ [with_mysql=no])
+
AC_MSG_CHECKING(for MySQL files)
-for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
-do
+mysqldir=""
+if test "$with_mysql" = no; then
+ AC_MSG_RESULT(disabled)
+else
+ for d in $with_mysql /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
+ do
if test -f $d/lib/mysql/libmysqlclient.so
then
AC_MSG_RESULT(found mysql in $d)
@@ -59,12 +59,12 @@
mysqldir_suffix=
break
fi
-done
+ done
-if test x$mysqldir = x
-then
+ if test x$mysqldir = x
+ then
AC_MSG_WARN(MySQL backend not used)
-else
+ else
AC_DEFINE(HAVE_MYSQL)
MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix}
MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix}
@@ -107,8 +107,8 @@
AC_MSG_RESULT(found new MySQL)
fi
-fi
-])
+ fi
+fi
dnl
@@ -117,31 +117,31 @@
dnl feature is only used in ulogd_MYSQL.c, there are no checks in any
dnl way.
dnl
-
AC_ARG_WITH(mysql-log-ip-as-string,
- --with-mysql-log-ip-as-string log IPs as string rather than as
- unsigned long-integer.
-,[
- EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
- AC_MSG_WARN(the use of --with-mysql-log-ip-as-string is discouraged)
-])
+ AS_HELP_STRING([--with-mysql-log-ip-as-string],
+ [log IPs as string rather than as unsigned long-integer]),
+ [
+ EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
+ AC_MSG_WARN(the use of --with-mysql-log-ip-as-string is discouraged)
+ ])
dnl
dnl test for PostgreSQL
dnl
-AC_ARG_WITH(pgsql,
- --with-pgsql=<directory> pgsql installed in <directory>,[
-if test $withval != yes
+AC_ARG_WITH(pgsql,
+ AS_HELP_STRING([--with-pgsql=DIR],[pgsql installed in DIR]),
+ [],
+ [with_pgsql=no])
+
+AC_MSG_CHECKING(for PGSQL files)
+pgsqldir=""
+if test $with_pgsql = no
then
- dir=$withval
+ AC_MSG_RESULT(disabled)
else
- dir="/usr/local"
-fi
-pgsqldir=""
-AC_MSG_CHECKING(for PGSQL files)
-for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
-do
+ for d in $with_pgsql /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
+ do
if test -f $d/lib/pgsql/libpq.so
then
AC_MSG_RESULT(found pgsql in $d)
@@ -153,12 +153,11 @@
pgsqldir=$d
break
fi
-done
+ done
-if test x$pgsqldir = x
-then
+ if test x$pgsqldir = x; then
AC_MSG_WARN(PGSQL backend not used)
-else
+ else
AC_DEFINE(HAVE_PGSQL)
for i in include include/postgresql include/pgsql
do
@@ -180,36 +179,34 @@
AC_SUBST(PGSQLINCLUDES)
AC_SUBST(PGSQL_LIB)
+ fi
fi
-])
dnl
dnl Check whether the user wants to log IP-addresses as strings rather
dnl than integers to his pgsql-database.
dnl
-
AC_ARG_WITH(pgsql-log-ip-as-string,
- --with-pgsql-log-ip-as-string log IPs as string rather than as interger
-,[
- EXTRA_PGSQL_DEF="-DIP_AS_STRING=1"
-])
-
+ AS_HELP_STRING([--with-pgsql-log-ip-as-string],
+ [log IPs as string rather than as integer]),
+ [EXTRA_PGSQL_DEF="-DIP_AS_STRING=1"])
dnl
dnl test for sqlite3
dnl
AC_ARG_WITH(sqlite3,
- --with-sqlite3=<directory> sqlite3 installed in <directory>,[
-if test $withval != yes
+ AS_HELP_STRING([--with-sqlite3=DIR],[sqlite3 installed in DIR]),
+ [],
+ [with_sqlite3=no])
+
+AC_MSG_CHECKING(for sqlite3 files)
+sqlite3dir=""
+if test $with_sqlite3 = no
then
- dir=$withval
+ AC_MSG_RESULT(disabled)
else
- dir="/usr/local"
-fi
-mysqldir=""
-AC_MSG_CHECKING(for sqlite3 files)
-for d in $dir /usr /usr/local /usr/local/sqlite3
-do
+ for d in $with_sqlite3 /usr /usr/local /usr/local/sqlite3
+ do
if test -f $d/lib/sqlite3/libsqlite3.so
then
AC_MSG_RESULT(found sqlite3 in $d)
@@ -223,12 +220,12 @@
sqlite3dir_suffix=
break
fi
-done
+ done
-if test x$sqlite3dir = x
-then
+ if test x$sqlite3dir = x
+ then
AC_MSG_WARN(sqlite3 backend not used)
-else
+ else
AC_DEFINE(HAVE_SQLITE3)
SQLITE3INCLUDES=${sqlite3dir}/include${sqlite3dir_suffix}
SQLITE3LIBS=${sqlite3dir}/lib${sqlite3dir_suffix}
@@ -246,8 +243,8 @@
AC_SUBST(SQLITE3INCLUDES)
AC_SUBST(SQLITE3_LIB)
-fi
-])
+ fi
+fi
dnl
@@ -256,14 +253,13 @@
dnl feature is only used in ulogd_SQLITE3.c, there are no checks in any
dnl way.
dnl
-
AC_ARG_WITH(sqlite3-log-ip-as-string,
- --with-sqlite3-log-ip-as-string log IPs as string rather than as
- unsigned long-integer.
-,[
- EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
- AC_MSG_WARN(the use of --with-sqlite3-log-ip-as-string is discouraged)
-])
+ AS_HELP_STRING([--with-sqlite3-log-ip-as-string],
+ [log IPs as string rather than as unsigned long-integer]),
+ [
+ EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
+ AC_MSG_WARN(the use of --with-sqlite3-log-ip-as-string is discouraged)
+ ])
AC_SUBST(DATABASE_DIR)
|
GitWeb