| blob | acd49598c1c342a8d50ea0fb3a88802bbe67e18b |
1 --- a/configure.in 2009-02-06 13:41:23.015147047 +0300
2 +++ b/configure.in 2009-02-06 13:41:42.203146296 +0300
3 @@ -118,27 +118,27 @@ dnl Checks for header files.
4 dnl
6 AC_HEADER_STDC
7 -AC_CHECK_HEADERS(db.h regex.h unistd.h)
8 -
9 -AC_CHECK_HEADER(db.h,,[
10 - echo
11 - echo "** No db.h found"
12 - echo " The Berkley DB library is required for squidGuard"
13 - echo " to compile. Get it from http://www.oracle.com"
14 - echo " use --with-db=DIR or --with-db-inc=DIR to specify"
15 - echo " its location. (default is $dbprefix/BerkeleyDB)"
16 - echo
17 - exit 1
18 - ])
19 -
20 -if test $HAVE_REGEX.H = no; then
21 - echo
22 - echo "** No regex.h found"
23 - echo " The regexp library is required for squidGuard"
24 - echo " to compile. Get it from http://www.gnu.org"
25 - echo
26 - exit 1
27 -fi
28 +#AC_CHECK_HEADERS(db.h regex.h unistd.h)
29 +#
30 +#AC_CHECK_HEADER(db.h,,[
31 +# echo
32 +# echo "** No db.h found"
33 +# echo " The Berkley DB library is required for squidGuard"
34 +# echo " to compile. Get it from http://www.oracle.com"
35 +# echo " use --with-db=DIR or --with-db-inc=DIR to specify"
36 +# echo " its location. (default is $dbprefix/BerkeleyDB)"
37 +# echo
38 +# exit 1
39 +# ])
40 +#
41 +#if test $HAVE_REGEX.H = no; then
42 +# echo
43 +# echo "** No regex.h found"
44 +# echo " The regexp library is required for squidGuard"
45 +# echo " to compile. Get it from http://www.gnu.org"
46 +# echo
47 +# exit 1
48 +#fi
50 dnl
51 dnl Checks if runtime logmessages shall be suppressed. Is --nolog given?
52 @@ -294,115 +294,115 @@ AC_CHECK_LIB(pthread,pthread_create,,[
53 echo
54 ])
56 -dnl Check DB
57 +#dnl Check DB
58 LIBS="$LIBS -ldb"
59 -AC_RUN_IFELSE([
60 - #include <db.h>
61 - int main()
62 - {
63 - int major, minor, patch;
64 - float ver;
65 -#if DB_VERSION_MAJOR
66 - major = DB_VERSION_MAJOR;
67 - minor = DB_VERSION_MINOR;
68 - patch = DB_VERSION_PATCH;
69 -#else
70 - db_version(&major, &minor, &patch);
71 -#endif
72 - ver = major + ((float) minor / 1000);
73 - if (ver >= 2.006)
74 - exit (0);
75 - exit (1);
76 - }
77 - ], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
78 -
79 -if test $db_ok_version = no; then
80 - echo
81 - echo "** The Berkley DB library version 2.6.4 or newer"
82 - echo " is required. Get it from http://www.oracle.com"
83 - echo " use --with-db=DIR or --with-db-inc=DIR, "
84 - echo " --with-db-lib=DIR to specify its location"
85 - echo " (default is $dbprefix/BerkeleyDB)"
86 - echo
87 - exit 1;
88 -fi
89 -
90 -AC_RUN_IFELSE([
91 - #include <db.h>
92 - int main()
93 - {
94 - int major, minor, patch;
95 - float ver;
96 -#if DB_VERSION_MAJOR
97 - major = DB_VERSION_MAJOR;
98 - minor = DB_VERSION_MINOR;
99 - patch = DB_VERSION_PATCH;
100 +#AC_RUN_IFELSE([
101 +# #include <db.h>
102 +# int main()
103 +# {
104 +# int major, minor, patch;
105 +# float ver;
106 +##if DB_VERSION_MAJOR
107 +# major = DB_VERSION_MAJOR;
108 +# minor = DB_VERSION_MINOR;
109 +# patch = DB_VERSION_PATCH;
110 #else
111 - db_version(&major, &minor, &patch);
112 -#endif
113 - ver = major + ((float) minor / 1000);
114 - if (ver > 2.007 && ver < 3.002)
115 - exit (1);
116 - exit (0);
117 - }
118 - ], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
119 -
120 -if test $db_ok_version = no; then
121 - echo
122 - echo "** The Berkley DB library version 3.2.* or newer"
123 - echo " is required, when using 3.* versions of the library"
124 - echo " Get it from http://www.oracle.com"
125 - echo " use --with-db=DIR or --with-db-inc=DIR, "
126 - echo " --with-db-lib=DIR to specify its location"
127 - echo " (default is $dbprefix/BerkeleyDB)"
128 - echo
129 - exit 1;
130 -fi
131 -
132 -AC_RUN_IFELSE([
133 - #include <db.h>
134 - int main()
135 - {
136 - int major, minor, patch;
137 - float ver;
138 -#if DB_VERSION_MAJOR
139 - major = DB_VERSION_MAJOR;
140 - minor = DB_VERSION_MINOR;
141 - patch = DB_VERSION_PATCH;
142 -#else
143 - db_version(&major, &minor, &patch);
144 -#endif
145 - ver = major + ((float) minor / 1000);
146 - if (ver >= 3.002)
147 - exit (0);
148 - exit (1);
149 - }
150 - ], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
151 -
152 +# db_version(&major, &minor, &patch);
153 +##endif
154 +# ver = major + ((float) minor / 1000);
155 +# if (ver >= 2.006)
156 +# exit (0);
157 +# exit (1);
158 +# }
159 +# ], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
160 +#
161 +#if test $db_ok_version = no; then
162 +# echo
163 +# echo "** The Berkley DB library version 2.6.4 or newer"
164 +# echo " is required. Get it from http://www.oracle.com"
165 +# echo " use --with-db=DIR or --with-db-inc=DIR, "
166 +# echo " --with-db-lib=DIR to specify its location"
167 +# echo " (default is $dbprefix/BerkeleyDB)"
168 +# echo
169 +# exit 1;
170 +#fi
171 +#
172 +#AC_RUN_IFELSE([
173 +# #include <db.h>
174 +# int main()
175 +# {
176 +# int major, minor, patch;
177 +# float ver;
178 +##if DB_VERSION_MAJOR
179 +# major = DB_VERSION_MAJOR;
180 +# minor = DB_VERSION_MINOR;
181 +# patch = DB_VERSION_PATCH;
182 +##else
183 +# db_version(&major, &minor, &patch);
184 +##endif
185 +# ver = major + ((float) minor / 1000);
186 +# if (ver > 2.007 && ver < 3.002)
187 +# exit (1);
188 +# exit (0);
189 +# }
190 +# ], db_ok_version=yes, db_ok_version=no, db_ok_version=no)
191 +#
192 +#if test $db_ok_version = no; then
193 +# echo
194 +# echo "** The Berkley DB library version 3.2.* or newer"
195 +# echo " is required, when using 3.* versions of the library"
196 +# echo " Get it from http://www.oracle.com"
197 +# echo " use --with-db=DIR or --with-db-inc=DIR, "
198 +# echo " --with-db-lib=DIR to specify its location"
199 +# echo " (default is $dbprefix/BerkeleyDB)"
200 +# echo
201 +# exit 1;
202 +#fi
203 +#
204 +#AC_RUN_IFELSE([
205 +# #include <db.h>
206 +# int main()
207 +# {
208 +# int major, minor, patch;
209 +# float ver;
210 +##if DB_VERSION_MAJOR
211 +# major = DB_VERSION_MAJOR;
212 +# minor = DB_VERSION_MINOR;
213 +# patch = DB_VERSION_PATCH;
214 +##else
215 +# db_version(&major, &minor, &patch);
216 +##endif
217 +# ver = major + ((float) minor / 1000);
218 +# if (ver >= 3.002)
219 +# exit (0);
220 +# exit (1);
221 +# }
222 +# ], dbg2_ok_version=yes, dbg2_ok_version=no, dbg2_ok_version=no)
223 +#
224 if test $dbg2_ok_version = yes; then
225 AC_DEFINE(DB_VERSION_GT2)
226 fi
228 -AC_RUN_IFELSE([
229 - #include <db.h>
230 - int main()
231 - {
232 - int major, minor, patch;
233 - float ver;
234 -#if DB_VERSION_MAJOR
235 - major = DB_VERSION_MAJOR;
236 - minor = DB_VERSION_MINOR;
237 - patch = DB_VERSION_PATCH;
238 -#else
239 - db_version(&major, &minor, &patch);
240 -#endif
241 - ver = major + ((float) minor / 1000);
242 - if (ver >= 4.002)
243 - exit (0);
244 - exit (1);
245 - }
246 - ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
247 -
248 +#AC_RUN_IFELSE([
249 +# #include <db.h>
250 +# int main()
251 +# {
252 +# int major, minor, patch;
253 +# float ver;
254 +##if DB_VERSION_MAJOR
255 +# major = DB_VERSION_MAJOR;
256 +# minor = DB_VERSION_MINOR;
257 +# patch = DB_VERSION_PATCH;
258 +##else
259 +# db_version(&major, &minor, &patch);
260 +##endif
261 +# ver = major + ((float) minor / 1000);
262 +# if (ver >= 4.002)
263 +## exit (0);
264 +# exit (1);
265 +# }
266 +# ], dbg3_ok_version=yes, dbg3_ok_version=no, dbg3_ok_version=no)
267 +#
268 if test $dbg3_ok_version = yes; then
269 AC_DEFINE(DB_VERSION_GT3)
270 fi