]>
Commit | Line | Data |
---|---|---|
36aa8c36 JR |
1 | Index: squid3/acinclude.m4 |
2 | diff -c squid3/acinclude.m4:1.8 squid3/acinclude.m4:1.9 | |
3 | *** squid3/acinclude.m4:1.8 Mon Jul 28 14:41:02 2003 | |
4 | --- squid3/acinclude.m4 Mon Aug 18 18:15:01 2003 | |
5 | *************** | |
6 | *** 52,54 **** | |
7 | --- 52,86 ---- | |
8 | #include <sys/param.h> | |
9 | #endif | |
10 | ]) | |
11 | + | |
12 | + dnl | |
13 | + dnl thanks to autogen, for the template.. | |
14 | + dnl | |
15 | + dnl @synopsis AC_TEST_CHECKFORHUGEOBJECTS | |
16 | + dnl | |
17 | + dnl Test whether -fhuge-objects is available with this c++ compiler. gcc-29.5 series compilers need this on some platform with large objects. | |
18 | + dnl | |
19 | + AC_DEFUN([AC_TEST_CHECKFORHUGEOBJECTS],[ | |
20 | + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) | |
21 | + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ | |
22 | + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc | |
23 | + ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null | |
24 | + res=$? | |
25 | + rm -f conftest.* | |
26 | + echo yes | |
27 | + exit $res` 2> /dev/null | |
28 | + if [[ $? -ne 0 ]] | |
29 | + then ac_cv_test_checkforhugeobjects=no | |
30 | + else if [[ -z "$ac_cv_test_checkforhugeobjects" ]] | |
31 | + then ac_cv_test_checkforhugeobjects=yes | |
32 | + fi ; fi | |
33 | + ]) # end of CACHE_VAL | |
34 | + AC_MSG_RESULT([${ac_cv_test_checkforhugeobjects}]) | |
35 | + | |
36 | + if test "X${ac_cv_test_checkforhugeobjects}" != Xno | |
37 | + then | |
38 | + HUGE_OBJECT_FLAG="-fhuge-objects" | |
39 | + else | |
40 | + HUGE_OBJECT_FLAG="" | |
41 | + fi | |
42 | + ]) # end of AC_DEFUN of AC_TEST_CHECKFORHUGEOBJECTS | |
43 | Index: squid3/configure.in | |
44 | diff -c squid3/configure.in:1.346 squid3/configure.in:1.347 | |
45 | *** squid3/configure.in:1.346 Fri Aug 15 19:03:09 2003 | |
46 | --- squid3/configure.in Mon Aug 18 18:15:01 2003 | |
47 | *************** | |
48 | *** 133,138 **** | |
49 | --- 133,141 ---- | |
50 | AC_SUBST(SQUID_CFLAGS) | |
51 | AC_SUBST(SQUID_CXXFLAGS) | |
52 | ||
53 | + AC_TEST_CHECKFORHUGEOBJECTS | |
54 | + SQUID_CXXFLAGS="$SQUID_CXXFLAGS $HUGE_OBJECT_FLAG" | |
55 | + | |
56 | dnl Set LDFLAGS | |
57 | if test -z "$PRESET_LDFLAGS"; then | |
58 | if test "$GCC" = "yes"; then | |
59 | Index: squid3/lib/libTrie/configure.in | |
60 | diff -c squid3/lib/libTrie/configure.in:1.3 squid3/lib/libTrie/configure.in:1.4 | |
61 | *** squid3/lib/libTrie/configure.in:1.3 Mon Jul 14 08:16:14 2003 | |
62 | --- squid3/lib/libTrie/configure.in Mon Aug 18 18:15:02 2003 | |
63 | *************** | |
64 | *** 4,10 **** | |
65 | AM_CONFIG_HEADER([config.h]) | |
66 | ||
67 | SquidInline="yes" | |
68 | ! AC_ARG_ENABLE(inline, | |
69 | [ --disable-inline Don't compile trivial methods as inline. Squid | |
70 | is coded with much of the code able to be inlined.< Inlining is good for production builds, but not | |
71 | good for development. During development, use | |
72 | --- 4,10 ---- | |
73 | AM_CONFIG_HEADER([config.h]) | |
74 | ||
75 | SquidInline="yes" | |
76 | ! AC_ARG_ENABLE(inline, | |
77 | [ --disable-inline Don't compile trivial methods as inline. Squid | |
78 | is coded with much of the code able to be inlined.< Inlining is good for production builds, but not | |
79 | good for development. During development, use | |
80 | *************** | |
81 | *** 13,62 **** | |
82 | production builds, or load tests, use | |
83 | --enable-inline to have squid make all trivial | |
84 | methods inlinable by the compiler.], | |
85 | ! [ if test "$enableval" = "no" ; then | |
86 | ! SquidInline="no" | |
87 | ! fi | |
88 | ! ]) | |
89 | ! | |
90 | ! if test "$SquidInline" = "yes" ; then | |
91 | ! AC_DEFINE(_SQUID_INLINE_, inline, [Keyword used by squid for inlining methods]) | |
92 | ! AC_DEFINE(_USE_INLINE_,, [Include inline methods into header file]) | |
93 | ! else | |
94 | ! AC_DEFINE(_SQUID_INLINE_,, [Keyword used by squid for inlining methods]) | |
95 | ! fi | |
96 | ||
97 | # Checks for programs. | |
98 | ! AC_PROG_CXX | |
99 | ! AC_PROG_CC | |
100 | ! AC_PROG_MAKE_SET | |
101 | # for old automakes - like squid-cache.orgs! | |
102 | ! AM_INIT_AUTOMAKE(libTrie, 0.1) | |
103 | ! AM_MAINTAINER_MODE | |
104 | ! AC_PROG_RANLIB | |
105 | ! | |
106 | ! dnl set useful flags | |
107 | ! if test "$GCC" = "yes"; then | |
108 | ! TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" | |
109 | ! TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wcomments" | |
110 | ! else | |
111 | ! TRIE_CFLAGS= | |
112 | ! TRIE_CXXFLAGS= | |
113 | ! fi | |
114 | ! AC_SUBST(TRIE_CFLAGS) | |
115 | ! AC_SUBST(TRIE_CXXFLAGS) | |
116 | ||
117 | # Checks for libraries. | |
118 | ||
119 | # Checks for header files. | |
120 | ||
121 | # Checks for typedefs, structures, and compiler characteristics. | |
122 | ! AC_C_CONST | |
123 | ! AC_TYPE_SIZE_T | |
124 | ||
125 | # Checks for library functions. | |
126 | ||
127 | ! AC_CONFIG_FILES([Makefile | |
128 | ! include/Makefile | |
129 | ! src/Makefile | |
130 | ! test/Makefile]) | |
131 | ! AC_OUTPUT | |
132 | --- 13,66 ---- | |
133 | production builds, or load tests, use | |
134 | --enable-inline to have squid make all trivial | |
135 | methods inlinable by the compiler.], | |
136 | ! [ if test "$enableval" = "no" ; then | |
137 | ! SquidInline="no" | |
138 | ! fi | |
139 | ! ]) | |
140 | ! | |
141 | ! if test "$SquidInline" = "yes" ; then | |
142 | ! AC_DEFINE(_SQUID_INLINE_, inline, [Keyword used by squid for inlining methods]) | |
143 | ! AC_DEFINE(_USE_INLINE_,, [Include inline methods into header file]) | |
144 | ! else | |
145 | ! AC_DEFINE(_SQUID_INLINE_,, [Keyword used by squid for inlining methods]) | |
146 | ! fi | |
147 | ||
148 | # Checks for programs. | |
149 | ! AC_PROG_CXX | |
150 | ! AC_PROG_CC | |
151 | ! AC_PROG_MAKE_SET | |
152 | # for old automakes - like squid-cache.orgs! | |
153 | ! AM_INIT_AUTOMAKE(libTrie, 0.1) | |
154 | ! AM_MAINTAINER_MODE | |
155 | ! AC_PROG_RANLIB | |
156 | ! | |
157 | ! dnl set useful flags | |
158 | ! if test "$GCC" = "yes"; then | |
159 | ! TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" | |
160 | ! TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wcomments" | |
161 | ! else | |
162 | ! TRIE_CFLAGS= | |
163 | ! TRIE_CXXFLAGS= | |
164 | ! fi | |
165 | ! | |
166 | ! AC_TEST_CHECKFORHUGEOBJECTS | |
167 | ! TRIE_CXXFLAGS="$TRIE_CXXFLAGS $HUGE_OBJECT_FLAG" | |
168 | ! | |
169 | ! AC_SUBST(TRIE_CFLAGS) | |
170 | ! AC_SUBST(TRIE_CXXFLAGS) | |
171 | ||
172 | # Checks for libraries. | |
173 | ||
174 | # Checks for header files. | |
175 | ||
176 | # Checks for typedefs, structures, and compiler characteristics. | |
177 | ! AC_C_CONST | |
178 | ! AC_TYPE_SIZE_T | |
179 | ||
180 | # Checks for library functions. | |
181 | ||
182 | ! AC_CONFIG_FILES([Makefile | |
183 | ! include/Makefile | |
184 | ! src/Makefile | |
185 | ! test/Makefile]) | |
186 | ! AC_OUTPUT | |
187 | Index: squid3/aclocal.m4 | |
188 | diff -c squid3/aclocal.m4:1.34 squid3/aclocal.m4:1.35 | |
189 | *** squid3/aclocal.m4:1.34 Mon Jul 28 14:41:02 2003 | |
190 | --- squid3/aclocal.m4 Mon Aug 18 18:20:25 2003 | |
191 | *************** | |
192 | *** 66,71 **** | |
193 | --- 66,103 ---- | |
194 | #endif | |
195 | ]) | |
196 | ||
197 | + dnl | |
198 | + dnl thanks to autogen, for the template.. | |
199 | + dnl | |
200 | + dnl @synopsis AC_TEST_CHECKFORHUGEOBJECTS | |
201 | + dnl | |
202 | + dnl Test whether -fhuge-objects is available with this c++ compiler. gcc-29.5 series compilers need this on some platform with large objects. | |
203 | + dnl | |
204 | + AC_DEFUN([AC_TEST_CHECKFORHUGEOBJECTS],[ | |
205 | + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) | |
206 | + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ | |
207 | + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc | |
208 | + ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null | |
209 | + res=$? | |
210 | + rm -f conftest.* | |
211 | + echo yes | |
212 | + exit $res` 2> /dev/null | |
213 | + if [[ $? -ne 0 ]] | |
214 | + then ac_cv_test_checkforhugeobjects=no | |
215 | + else if [[ -z "$ac_cv_test_checkforhugeobjects" ]] | |
216 | + then ac_cv_test_checkforhugeobjects=yes | |
217 | + fi ; fi | |
218 | + ]) # end of CACHE_VAL | |
219 | + AC_MSG_RESULT([${ac_cv_test_checkforhugeobjects}]) | |
220 | + | |
221 | + if test "X${ac_cv_test_checkforhugeobjects}" != Xno | |
222 | + then | |
223 | + HUGE_OBJECT_FLAG="-fhuge-objects" | |
224 | + else | |
225 | + HUGE_OBJECT_FLAG="" | |
226 | + fi | |
227 | + ]) # end of AC_DEFUN of AC_TEST_CHECKFORHUGEOBJECTS | |
228 | + | |
229 | # Do all the work for Automake. -*- Autoconf -*- | |
230 | ||
231 | # This macro actually does too much some checks are only needed if | |
232 | Index: squid3/configure | |
233 | diff -c squid3/configure:1.367 squid3/configure:1.368 | |
234 | *** squid3/configure:1.367 Sat Aug 16 18:13:46 2003 | |
235 | --- squid3/configure Mon Aug 18 18:20:25 2003 | |
236 | *************** | |
237 | *** 1,5 **** | |
238 | #! /bin/sh | |
239 | ! # From configure.in Revision: 1.346 . | |
240 | # Guess values for system-dependent variables and create Makefiles. | |
241 | # Generated by GNU Autoconf 2.57. | |
242 | # | |
243 | --- 1,5 ---- | |
244 | #! /bin/sh | |
245 | ! # From configure.in Revision: 1.347 . | |
246 | # Guess values for system-dependent variables and create Makefiles. | |
247 | # Generated by GNU Autoconf 2.57. | |
248 | # | |
249 | *************** | |
250 | *** 4376,4381 **** | |
251 | --- 4376,4414 ---- | |
252 | fi | |
253 | ||
254 | ||
255 | + | |
256 | + | |
257 | + echo "$as_me:$LINENO: checking whether compiler accepts -fhuge-objects" >&5 | |
258 | + echo $ECHO_N "checking whether compiler accepts -fhuge-objects... $ECHO_C" >&6 | |
259 | + if test "${ac_cv_test_checkforhugeobjects+set}" = set; then | |
260 | + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
261 | + else | |
262 | + | |
263 | + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc | |
264 | + ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null | |
265 | + res=$? | |
266 | + rm -f conftest.* | |
267 | + echo yes | |
268 | + exit $res` 2> /dev/null | |
269 | + if [ $? -ne 0 ] | |
270 | + then ac_cv_test_checkforhugeobjects=no | |
271 | + else if [ -z "$ac_cv_test_checkforhugeobjects" ] | |
272 | + then ac_cv_test_checkforhugeobjects=yes | |
273 | + fi ; fi | |
274 | + | |
275 | + fi | |
276 | + # end of CACHE_VAL | |
277 | + echo "$as_me:$LINENO: result: ${ac_cv_test_checkforhugeobjects}" >&5 | |
278 | + echo "${ECHO_T}${ac_cv_test_checkforhugeobjects}" >&6 | |
279 | + | |
280 | + if test "X${ac_cv_test_checkforhugeobjects}" != Xno | |
281 | + then | |
282 | + HUGE_OBJECT_FLAG="-fhuge-objects" | |
283 | + else | |
284 | + HUGE_OBJECT_FLAG="" | |
285 | + fi | |
286 | + | |
287 | + SQUID_CXXFLAGS="$SQUID_CXXFLAGS $HUGE_OBJECT_FLAG" | |
288 | ||
289 | if test -z "$PRESET_LDFLAGS"; then | |
290 | if test "$GCC" = "yes"; then | |
291 | Index: squid3/lib/libTrie/Makefile.in | |
292 | diff -c squid3/lib/libTrie/Makefile.in:1.7 squid3/lib/libTrie/Makefile.in:1.8 | |
293 | *** squid3/lib/libTrie/Makefile.in:1.7 Mon Jul 14 09:14:42 2003 | |
294 | --- squid3/lib/libTrie/Makefile.in Mon Aug 18 18:20:27 2003 | |
295 | *************** | |
296 | *** 137,145 **** | |
297 | installdirs-recursive install-recursive uninstall-recursive \ | |
298 | check-recursive installcheck-recursive | |
299 | DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ | |
300 | ! Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \ | |
301 | ! configure configure.in depcomp install-sh ltmain.sh missing \ | |
302 | ! mkinstalldirs | |
303 | all: config.h | |
304 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | |
305 | ||
306 | --- 137,145 ---- | |
307 | installdirs-recursive install-recursive uninstall-recursive \ | |
308 | check-recursive installcheck-recursive | |
309 | DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ | |
310 | ! Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \ | |
311 | ! config.h.in config.sub configure configure.in depcomp \ | |
312 | ! install-sh ltmain.sh missing mkinstalldirs | |
313 | all: config.h | |
314 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | |
315 | ||
316 | *************** | |
317 | *** 158,164 **** | |
318 | $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) | |
319 | cd $(srcdir) && $(AUTOCONF) | |
320 | ||
321 | ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in | |
322 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | |
323 | ||
324 | config.h: stamp-h1 | |
325 | --- 158,164 ---- | |
326 | $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) | |
327 | cd $(srcdir) && $(AUTOCONF) | |
328 | ||
329 | ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 | |
330 | cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | |
331 | ||
332 | config.h: stamp-h1 | |
333 | Index: squid3/lib/libTrie/aclocal.m4 | |
334 | diff -c squid3/lib/libTrie/aclocal.m4:1.3 squid3/lib/libTrie/aclocal.m4:1.4 | |
335 | *** squid3/lib/libTrie/aclocal.m4:1.3 Mon May 5 16:57:21 2003 | |
336 | --- squid3/lib/libTrie/aclocal.m4 Mon Aug 18 18:20:27 2003 | |
337 | *************** | |
338 | *** 11,16 **** | |
339 | --- 11,48 ---- | |
340 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | |
341 | # PARTICULAR PURPOSE. | |
342 | ||
343 | + dnl | |
344 | + dnl thanks to autogen, for the template.. | |
345 | + dnl | |
346 | + dnl @synopsis AC_TEST_CHECKFORHUGEOBJECTS | |
347 | + dnl | |
348 | + dnl Test whether -fhuge-objects is available with this c++ compiler. gcc-29.5 series compilers need this on some platform with large objects. | |
349 | + dnl | |
350 | + AC_DEFUN([AC_TEST_CHECKFORHUGEOBJECTS],[ | |
351 | + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) | |
352 | + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ | |
353 | + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc | |
354 | + ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null | |
355 | + res=$? | |
356 | + rm -f conftest.* | |
357 | + echo yes | |
358 | + exit $res` 2> /dev/null | |
359 | + if [[ $? -ne 0 ]] | |
360 | + then ac_cv_test_checkforhugeobjects=no | |
361 | + else if [[ -z "$ac_cv_test_checkforhugeobjects" ]] | |
362 | + then ac_cv_test_checkforhugeobjects=yes | |
363 | + fi ; fi | |
364 | + ]) # end of CACHE_VAL | |
365 | + AC_MSG_RESULT([${ac_cv_test_checkforhugeobjects}]) | |
366 | + | |
367 | + if test "X${ac_cv_test_checkforhugeobjects}" != Xno | |
368 | + then | |
369 | + HUGE_OBJECT_FLAG="-fhuge-objects" | |
370 | + else | |
371 | + HUGE_OBJECT_FLAG="" | |
372 | + fi | |
373 | + ]) # end of AC_DEFUN of AC_TEST_CHECKFORHUGEOBJECTS | |
374 | + | |
375 | # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- | |
376 | ||
377 | # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. | |
378 | Index: squid3/lib/libTrie/configure | |
379 | diff -c squid3/lib/libTrie/configure:1.4 squid3/lib/libTrie/configure:1.5 | |
380 | *** squid3/lib/libTrie/configure:1.4 Mon Jul 14 09:14:43 2003 | |
381 | --- squid3/lib/libTrie/configure Mon Aug 18 18:20:27 2003 | |
382 | *************** | |
383 | *** 1302,1317 **** | |
384 | ||
385 | ||
386 | SquidInline="yes" | |
387 | ! # Check whether --enable-inline or --disable-inline was given. | |
388 | if test "${enable_inline+set}" = set; then | |
389 | enableval="$enable_inline" | |
390 | if test "$enableval" = "no" ; then | |
391 | ! SquidInline="no" | |
392 | ! fi | |
393 | ||
394 | fi; | |
395 | ||
396 | ! if test "$SquidInline" = "yes" ; then | |
397 | ||
398 | cat >>confdefs.h <<\_ACEOF | |
399 | #define _SQUID_INLINE_ inline | |
400 | --- 1302,1317 ---- | |
401 | ||
402 | ||
403 | SquidInline="yes" | |
404 | ! # Check whether --enable-inline or --disable-inline was given. | |
405 | if test "${enable_inline+set}" = set; then | |
406 | enableval="$enable_inline" | |
407 | if test "$enableval" = "no" ; then | |
408 | ! SquidInline="no" | |
409 | ! fi | |
410 | ||
411 | fi; | |
412 | ||
413 | ! if test "$SquidInline" = "yes" ; then | |
414 | ||
415 | cat >>confdefs.h <<\_ACEOF | |
416 | #define _SQUID_INLINE_ inline | |
417 | *************** | |
418 | *** 1322,1337 **** | |
419 | #define _USE_INLINE_ | |
420 | _ACEOF | |
421 | ||
422 | ! else | |
423 | ||
424 | cat >>confdefs.h <<\_ACEOF | |
425 | #define _SQUID_INLINE_ | |
426 | _ACEOF | |
427 | ||
428 | ! fi | |
429 | ||
430 | # Checks for programs. | |
431 | ! ac_ext=cc | |
432 | ac_cpp='$CXXCPP $CPPFLAGS' | |
433 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
434 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
435 | --- 1322,1337 ---- | |
436 | #define _USE_INLINE_ | |
437 | _ACEOF | |
438 | ||
439 | ! else | |
440 | ||
441 | cat >>confdefs.h <<\_ACEOF | |
442 | #define _SQUID_INLINE_ | |
443 | _ACEOF | |
444 | ||
445 | ! fi | |
446 | ||
447 | # Checks for programs. | |
448 | ! ac_ext=cc | |
449 | ac_cpp='$CXXCPP $CPPFLAGS' | |
450 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
451 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
452 | *************** | |
453 | *** 1854,1860 **** | |
454 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
455 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
456 | ||
457 | ! ac_ext=c | |
458 | ac_cpp='$CPP $CPPFLAGS' | |
459 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
460 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
461 | --- 1854,1860 ---- | |
462 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
463 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
464 | ||
465 | ! ac_ext=c | |
466 | ac_cpp='$CPP $CPPFLAGS' | |
467 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
468 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
469 | *************** | |
470 | *** 2519,2525 **** | |
471 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
472 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
473 | ||
474 | ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
475 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | |
476 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | |
477 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | |
478 | --- 2519,2525 ---- | |
479 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
480 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
481 | ||
482 | ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
483 | echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | |
484 | set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` | |
485 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | |
486 | *************** | |
487 | *** 2549,2555 **** | |
488 | fi | |
489 | ||
490 | # for old automakes - like squid-cache.orgs! | |
491 | ! am__api_version="1.7" | |
492 | ac_aux_dir= | |
493 | for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | |
494 | if test -f $ac_dir/install-sh; then | |
495 | --- 2549,2555 ---- | |
496 | fi | |
497 | ||
498 | # for old automakes - like squid-cache.orgs! | |
499 | ! am__api_version="1.7" | |
500 | ac_aux_dir= | |
501 | for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | |
502 | if test -f $ac_dir/install-sh; then | |
503 | *************** | |
504 | *** 3157,3163 **** | |
505 | ||
506 | ||
507 | ||
508 | ! echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | |
509 | echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 | |
510 | # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. | |
511 | if test "${enable_maintainer_mode+set}" = set; then | |
512 | --- 3157,3163 ---- | |
513 | ||
514 | ||
515 | ||
516 | ! echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 | |
517 | echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 | |
518 | # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. | |
519 | if test "${enable_maintainer_mode+set}" = set; then | |
520 | *************** | |
521 | *** 3181,3187 **** | |
522 | MAINT=$MAINTAINER_MODE_TRUE | |
523 | ||
524 | ||
525 | ! if test -n "$ac_tool_prefix"; then | |
526 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | |
527 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | |
528 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
529 | --- 3181,3187 ---- | |
530 | MAINT=$MAINTAINER_MODE_TRUE | |
531 | ||
532 | ||
533 | ! if test -n "$ac_tool_prefix"; then | |
534 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | |
535 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | |
536 | echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
537 | *************** | |
538 | *** 3262,3274 **** | |
539 | fi | |
540 | ||
541 | ||
542 | ! if test "$GCC" = "yes"; then | |
543 | ! TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" | |
544 | ! TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wcomments" | |
545 | ! else | |
546 | ! TRIE_CFLAGS= | |
547 | ! TRIE_CXXFLAGS= | |
548 | ! fi | |
549 | ||
550 | ||
551 | ||
552 | --- 3262,3308 ---- | |
553 | fi | |
554 | ||
555 | ||
556 | ! if test "$GCC" = "yes"; then | |
557 | ! TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" | |
558 | ! TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wcomments" | |
559 | ! else | |
560 | ! TRIE_CFLAGS= | |
561 | ! TRIE_CXXFLAGS= | |
562 | ! fi | |
563 | ! | |
564 | ! | |
565 | ! echo "$as_me:$LINENO: checking whether compiler accepts -fhuge-objects" >&5 | |
566 | ! echo $ECHO_N "checking whether compiler accepts -fhuge-objects... $ECHO_C" >&6 | |
567 | ! if test "${ac_cv_test_checkforhugeobjects+set}" = set; then | |
568 | ! echo $ECHO_N "(cached) $ECHO_C" >&6 | |
569 | ! else | |
570 | ! | |
571 | ! ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc | |
572 | ! ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null | |
573 | ! res=$? | |
574 | ! rm -f conftest.* | |
575 | ! echo yes | |
576 | ! exit $res` 2> /dev/null | |
577 | ! if [ $? -ne 0 ] | |
578 | ! then ac_cv_test_checkforhugeobjects=no | |
579 | ! else if [ -z "$ac_cv_test_checkforhugeobjects" ] | |
580 | ! then ac_cv_test_checkforhugeobjects=yes | |
581 | ! fi ; fi | |
582 | ! | |
583 | ! fi | |
584 | ! # end of CACHE_VAL | |
585 | ! echo "$as_me:$LINENO: result: ${ac_cv_test_checkforhugeobjects}" >&5 | |
586 | ! echo "${ECHO_T}${ac_cv_test_checkforhugeobjects}" >&6 | |
587 | ! | |
588 | ! if test "X${ac_cv_test_checkforhugeobjects}" != Xno | |
589 | ! then | |
590 | ! HUGE_OBJECT_FLAG="-fhuge-objects" | |
591 | ! else | |
592 | ! HUGE_OBJECT_FLAG="" | |
593 | ! fi | |
594 | ! | |
595 | ! TRIE_CXXFLAGS="$TRIE_CXXFLAGS $HUGE_OBJECT_FLAG" | |
596 | ! | |
597 | ||
598 | ||
599 | ||
600 | *************** | |
601 | *** 3376,3382 **** | |
602 | ||
603 | fi | |
604 | ||
605 | ! ac_ext=c | |
606 | ac_cpp='$CPP $CPPFLAGS' | |
607 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
608 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
609 | --- 3410,3416 ---- | |
610 | ||
611 | fi | |
612 | ||
613 | ! ac_ext=c | |
614 | ac_cpp='$CPP $CPPFLAGS' | |
615 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
616 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
617 | *************** | |
618 | *** 3909,3917 **** | |
619 | ||
620 | # Checks for library functions. | |
621 | ||
622 | ! ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile test/Makefile" | |
623 | ||
624 | ! cat >confcache <<\_ACEOF | |
625 | # This file is a shell script that caches the results of configure | |
626 | # tests run on this system so they can be shared between configure | |
627 | # scripts and configure runs, see configure's option --config-cache. | |
628 | --- 3943,3951 ---- | |
629 | ||
630 | # Checks for library functions. | |
631 | ||
632 | ! ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile test/Makefile" | |
633 | ||
634 | ! cat >confcache <<\_ACEOF | |
635 | # This file is a shell script that caches the results of configure | |
636 | # tests run on this system so they can be shared between configure | |
637 | # scripts and configure runs, see configure's option --config-cache. |