Ubuntu
keepalived package

Merge lp:~andreserl/ubuntu/lucid/keepalived/merge-from-squeeze-lp519940 into lp:ubuntu/lucid/keepalived

  1. Lucid (10.04)
  2. merge-from-squeeze-lp519940
  3. Merge into lucid
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: not available
Proposed branch: lp:~andreserl/ubuntu/lucid/keepalived/merge-from-squeeze-lp519940
Merge into: lp:ubuntu/lucid/keepalived
Prerequisite: lp:debian/squeeze/keepalived
Diff against target: 6890 lines
To merge this branch: bzr merge lp:~andreserl/ubuntu/lucid/keepalived/merge-from-squeeze-lp519940
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+19043@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2010-02-10 19:08:16 +0000
3+++ configure 2010-02-10 19:08:16 +0000
4@@ -1,18 +1,9 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7-<<<<<<< TREE
8-# Generated by GNU Autoconf 2.63.
9-=======
10 # Generated by GNU Autoconf 2.61.
11->>>>>>> MERGE-SOURCE
12 #
13-<<<<<<< TREE
14-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
15-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
16-=======
17 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
18 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
19->>>>>>> MERGE-SOURCE
20 # This configure script is free software; the Free Software Foundation
21 # gives unlimited permission to copy, distribute and modify it.
22 ## --------------------- ##
23@@ -21,73 +12,6 @@
24
25 # Be more Bourne compatible
26 DUALCASE=1; export DUALCASE # for MKS sh
27-<<<<<<< TREE
28-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
29- emulate sh
30- NULLCMD=:
31- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
32- # is contrary to our usage. Disable this feature.
33- alias -g '${1+"$@"}'='"$@"'
34- setopt NO_GLOB_SUBST
35-else
36- case `(set -o) 2>/dev/null` in
37- *posix*) set -o posix ;;
38-esac
39-
40-fi
41-
42-
43-
44-
45-# PATH needs CR
46-# Avoid depending upon Character Ranges.
47-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
48-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
49-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
50-as_cr_digits='0123456789'
51-as_cr_alnum=$as_cr_Letters$as_cr_digits
52-
53-as_nl='
54-'
55-export as_nl
56-# Printing a long string crashes Solaris 7 /usr/bin/printf.
57-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
58-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
59-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
60-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
61- as_echo='printf %s\n'
62- as_echo_n='printf %s'
63-else
64- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
65- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
66- as_echo_n='/usr/ucb/echo -n'
67- else
68- as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
69- as_echo_n_body='eval
70- arg=$1;
71- case $arg in
72- *"$as_nl"*)
73- expr "X$arg" : "X\\(.*\\)$as_nl";
74- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
75- esac;
76- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
77- '
78- export as_echo_n_body
79- as_echo_n='sh -c $as_echo_n_body as_echo'
80- fi
81- export as_echo_body
82- as_echo='sh -c $as_echo_body as_echo'
83-fi
84-
85-# The user is always right.
86-if test "${PATH_SEPARATOR+set}" != set; then
87- PATH_SEPARATOR=:
88- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
89- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
90- PATH_SEPARATOR=';'
91- }
92-fi
93-=======
94 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
95 emulate sh
96 NULLCMD=:
97@@ -125,7 +49,6 @@
98 fi
99 rm -f conf$$.sh
100 fi
101->>>>>>> MERGE-SOURCE
102
103 # Support unset when possible.
104 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
105@@ -135,39 +58,6 @@
106 fi
107
108
109-<<<<<<< TREE
110-# IFS
111-# We need space, tab and new line, in precisely that order. Quoting is
112-# there to prevent editors from complaining about space-tab.
113-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
114-# splitting by setting IFS to empty value.)
115-IFS=" "" $as_nl"
116-
117-# Find who we are. Look in the path if we contain no directory separator.
118-case $0 in
119- *[\\/]* ) as_myself=$0 ;;
120- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
121-for as_dir in $PATH
122-do
123- IFS=$as_save_IFS
124- test -z "$as_dir" && as_dir=.
125- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
126-done
127-IFS=$as_save_IFS
128-
129- ;;
130-esac
131-# We did not find ourselves, most probably we were run as `sh COMMAND'
132-# in which case we are not to be found in the path.
133-if test "x$as_myself" = x; then
134- as_myself=$0
135-fi
136-if test ! -f "$as_myself"; then
137- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
138- { (exit 1); exit 1; }
139-fi
140-
141-=======
142 # IFS
143 # We need space, tab and new line, in precisely that order. Quoting is
144 # there to prevent editors from complaining about space-tab.
145@@ -201,7 +91,6 @@
146 { (exit 1); exit 1; }
147 fi
148
149->>>>>>> MERGE-SOURCE
150 # Work around bugs in pre-3.0 UWIN ksh.
151 for as_var in ENV MAIL MAILPATH
152 do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
153@@ -211,12 +100,6 @@
154 PS4='+ '
155
156 # NLS nuisances.
157-<<<<<<< TREE
158-LC_ALL=C
159-export LC_ALL
160-LANGUAGE=C
161-export LANGUAGE
162-=======
163 for as_var in \
164 LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
165 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
166@@ -228,7 +111,6 @@
167 ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
168 fi
169 done
170->>>>>>> MERGE-SOURCE
171
172 # Required to use basename.
173 if expr a : '\(a\)' >/dev/null 2>&1 &&
174@@ -249,95 +131,6 @@
175 as_me=`$as_basename -- "$0" ||
176 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
177 X"$0" : 'X\(//\)$' \| \
178-<<<<<<< TREE
179- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
180-$as_echo X/"$0" |
181- sed '/^.*\/\([^/][^/]*\)\/*$/{
182- s//\1/
183- q
184- }
185- /^X\/\(\/\/\)$/{
186- s//\1/
187- q
188- }
189- /^X\/\(\/\).*/{
190- s//\1/
191- q
192- }
193- s/.*/./; q'`
194-
195-# CDPATH.
196-$as_unset CDPATH
197-
198-
199-if test "x$CONFIG_SHELL" = x; then
200- if (eval ":") 2>/dev/null; then
201- as_have_required=yes
202-else
203- as_have_required=no
204-fi
205-
206- if test $as_have_required = yes && (eval ":
207-(as_func_return () {
208- (exit \$1)
209-}
210-as_func_success () {
211- as_func_return 0
212-}
213-as_func_failure () {
214- as_func_return 1
215-}
216-as_func_ret_success () {
217- return 0
218-}
219-as_func_ret_failure () {
220- return 1
221-}
222-
223-exitcode=0
224-if as_func_success; then
225- :
226-else
227- exitcode=1
228- echo as_func_success failed.
229-fi
230-
231-if as_func_failure; then
232- exitcode=1
233- echo as_func_failure succeeded.
234-fi
235-
236-if as_func_ret_success; then
237- :
238-else
239- exitcode=1
240- echo as_func_ret_success failed.
241-fi
242-
243-if as_func_ret_failure; then
244- exitcode=1
245- echo as_func_ret_failure succeeded.
246-fi
247-
248-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
249- :
250-else
251- exitcode=1
252- echo positional parameters were not saved.
253-fi
254-
255-test \$exitcode = 0) || { (exit 1); exit 1; }
256-
257-(
258- as_lineno_1=\$LINENO
259- as_lineno_2=\$LINENO
260- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
261- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
262-") 2> /dev/null; then
263- :
264-else
265- as_candidate_shells=
266-=======
267 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
268 echo X/"$0" |
269 sed '/^.*\/\([^/][^/]*\)\/*$/{
270@@ -425,7 +218,6 @@
271 :
272 else
273 as_candidate_shells=
274->>>>>>> MERGE-SOURCE
275 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
276 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
277 do
278@@ -438,203 +230,6 @@
279 done;;
280 esac
281 done
282-<<<<<<< TREE
283-IFS=$as_save_IFS
284-
285-
286- for as_shell in $as_candidate_shells $SHELL; do
287- # Try only shells that exist, to save several forks.
288- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
289- { ("$as_shell") 2> /dev/null <<\_ASEOF
290-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
291- emulate sh
292- NULLCMD=:
293- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
294- # is contrary to our usage. Disable this feature.
295- alias -g '${1+"$@"}'='"$@"'
296- setopt NO_GLOB_SUBST
297-else
298- case `(set -o) 2>/dev/null` in
299- *posix*) set -o posix ;;
300-esac
301-
302-fi
303-
304-
305-:
306-_ASEOF
307-}; then
308- CONFIG_SHELL=$as_shell
309- as_have_required=yes
310- if { "$as_shell" 2> /dev/null <<\_ASEOF
311-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
312- emulate sh
313- NULLCMD=:
314- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
315- # is contrary to our usage. Disable this feature.
316- alias -g '${1+"$@"}'='"$@"'
317- setopt NO_GLOB_SUBST
318-else
319- case `(set -o) 2>/dev/null` in
320- *posix*) set -o posix ;;
321-esac
322-
323-fi
324-
325-
326-:
327-(as_func_return () {
328- (exit $1)
329-}
330-as_func_success () {
331- as_func_return 0
332-}
333-as_func_failure () {
334- as_func_return 1
335-}
336-as_func_ret_success () {
337- return 0
338-}
339-as_func_ret_failure () {
340- return 1
341-}
342-
343-exitcode=0
344-if as_func_success; then
345- :
346-else
347- exitcode=1
348- echo as_func_success failed.
349-fi
350-
351-if as_func_failure; then
352- exitcode=1
353- echo as_func_failure succeeded.
354-fi
355-
356-if as_func_ret_success; then
357- :
358-else
359- exitcode=1
360- echo as_func_ret_success failed.
361-fi
362-
363-if as_func_ret_failure; then
364- exitcode=1
365- echo as_func_ret_failure succeeded.
366-fi
367-
368-if ( set x; as_func_ret_success y && test x = "$1" ); then
369- :
370-else
371- exitcode=1
372- echo positional parameters were not saved.
373-fi
374-
375-test $exitcode = 0) || { (exit 1); exit 1; }
376-
377-(
378- as_lineno_1=$LINENO
379- as_lineno_2=$LINENO
380- test "x$as_lineno_1" != "x$as_lineno_2" &&
381- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
382-
383-_ASEOF
384-}; then
385- break
386-fi
387-
388-fi
389-
390- done
391-
392- if test "x$CONFIG_SHELL" != x; then
393- for as_var in BASH_ENV ENV
394- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
395- done
396- export CONFIG_SHELL
397- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
398-fi
399-
400-
401- if test $as_have_required = no; then
402- echo This script requires a shell more modern than all the
403- echo shells that I found on your system. Please install a
404- echo modern shell, or manually run the script under such a
405- echo shell if you do have one.
406- { (exit 1); exit 1; }
407-fi
408-
409-
410-fi
411-
412-fi
413-
414-
415-
416-(eval "as_func_return () {
417- (exit \$1)
418-}
419-as_func_success () {
420- as_func_return 0
421-}
422-as_func_failure () {
423- as_func_return 1
424-}
425-as_func_ret_success () {
426- return 0
427-}
428-as_func_ret_failure () {
429- return 1
430-}
431-
432-exitcode=0
433-if as_func_success; then
434- :
435-else
436- exitcode=1
437- echo as_func_success failed.
438-fi
439-
440-if as_func_failure; then
441- exitcode=1
442- echo as_func_failure succeeded.
443-fi
444-
445-if as_func_ret_success; then
446- :
447-else
448- exitcode=1
449- echo as_func_ret_success failed.
450-fi
451-
452-if as_func_ret_failure; then
453- exitcode=1
454- echo as_func_ret_failure succeeded.
455-fi
456-
457-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
458- :
459-else
460- exitcode=1
461- echo positional parameters were not saved.
462-fi
463-
464-test \$exitcode = 0") || {
465- echo No shell found that supports shell functions.
466- echo Please tell bug-autoconf@gnu.org about your system,
467- echo including any error possibly output before this message.
468- echo This can help us improve future autoconf versions.
469- echo Configuration will now proceed without shell functions.
470-}
471-
472-
473-
474- as_lineno_1=$LINENO
475- as_lineno_2=$LINENO
476- test "x$as_lineno_1" != "x$as_lineno_2" &&
477- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
478-=======
479 IFS=$as_save_IFS
480
481
482@@ -829,7 +424,6 @@
483 as_lineno_2=$LINENO
484 test "x$as_lineno_1" != "x$as_lineno_2" &&
485 test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
486->>>>>>> MERGE-SOURCE
487
488 # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
489 # uniformly replaced by the line number. The first 'sed' inserts a
490@@ -856,13 +450,8 @@
491 t loop
492 s/-\n.*//
493 ' >$as_me.lineno &&
494-<<<<<<< TREE
495- chmod +x "$as_me.lineno" ||
496- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
497-=======
498 chmod +x "$as_me.lineno" ||
499 { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
500->>>>>>> MERGE-SOURCE
501 { (exit 1); exit 1; }; }
502
503 # Don't try to exec as it changes $[0], causing all sort of problems
504@@ -890,40 +479,15 @@
505 *)
506 ECHO_N='-n';;
507 esac
508-<<<<<<< TREE
509-if expr a : '\(a\)' >/dev/null 2>&1 &&
510- test "X`expr 00001 : '.*\(...\)'`" = X001; then
511-=======
512
513 if expr a : '\(a\)' >/dev/null 2>&1 &&
514 test "X`expr 00001 : '.*\(...\)'`" = X001; then
515->>>>>>> MERGE-SOURCE
516 as_expr=expr
517 else
518 as_expr=false
519 fi
520
521 rm -f conf$$ conf$$.exe conf$$.file
522-<<<<<<< TREE
523-if test -d conf$$.dir; then
524- rm -f conf$$.dir/conf$$.file
525-else
526- rm -f conf$$.dir
527- mkdir conf$$.dir 2>/dev/null
528-fi
529-if (echo >conf$$.file) 2>/dev/null; then
530- if ln -s conf$$.file conf$$ 2>/dev/null; then
531- as_ln_s='ln -s'
532- # ... but there are two gotchas:
533- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
534- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
535- # In both cases, we have to default to `cp -p'.
536- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
537- as_ln_s='cp -p'
538- elif ln conf$$.file conf$$ 2>/dev/null; then
539- as_ln_s=ln
540- else
541-=======
542 if test -d conf$$.dir; then
543 rm -f conf$$.dir/conf$$.file
544 else
545@@ -938,14 +502,9 @@
546 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
547 # In both cases, we have to default to `cp -p'.
548 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
549->>>>>>> MERGE-SOURCE
550 as_ln_s='cp -p'
551-<<<<<<< TREE
552- fi
553-=======
554 elif ln conf$$.file conf$$ 2>/dev/null; then
555 as_ln_s=ln
556->>>>>>> MERGE-SOURCE
557 else
558 as_ln_s='cp -p'
559 fi
560@@ -959,30 +518,6 @@
561 as_mkdir_p=false
562 fi
563
564-<<<<<<< TREE
565-if test -x / >/dev/null 2>&1; then
566- as_test_x='test -x'
567-else
568- if ls -dL / >/dev/null 2>&1; then
569- as_ls_L_option=L
570- else
571- as_ls_L_option=
572- fi
573- as_test_x='
574- eval sh -c '\''
575- if test -d "$1"; then
576- test -d "$1/.";
577- else
578- case $1 in
579- -*)set "./$1";;
580- esac;
581- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
582- ???[sx]*):;;*)false;;esac;fi
583- '\'' sh
584- '
585-fi
586-as_executable_p=$as_test_x
587-=======
588 if test -x / >/dev/null 2>&1; then
589 as_test_x='test -x'
590 else
591@@ -1005,7 +540,6 @@
592 '
593 fi
594 as_executable_p=$as_test_x
595->>>>>>> MERGE-SOURCE
596
597 # Sed expression to map a string onto a valid CPP name.
598 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
599@@ -1079,69 +613,6 @@
600 # include <unistd.h>
601 #endif"
602
603-<<<<<<< TREE
604-ac_subst_vars='LTLIBOBJS
605-LIBOBJS
606-VRRP_SUPPORT
607-IPVS_SUPPORT
608-VERSION_DATE
609-VERSION
610-DFLAGS
611-IPVS_SYNCD
612-KERN
613-LINKWATCH_SUPPORT
614-EGREP
615-GREP
616-CPP
617-STRIP
618-INSTALL_DATA
619-INSTALL_SCRIPT
620-INSTALL_PROGRAM
621-OBJEXT
622-EXEEXT
623-ac_ct_CC
624-CPPFLAGS
625-LDFLAGS
626-CFLAGS
627-CC
628-target_alias
629-host_alias
630-build_alias
631-LIBS
632-ECHO_T
633-ECHO_N
634-ECHO_C
635-DEFS
636-mandir
637-localedir
638-libdir
639-psdir
640-pdfdir
641-dvidir
642-htmldir
643-infodir
644-docdir
645-oldincludedir
646-includedir
647-localstatedir
648-sharedstatedir
649-sysconfdir
650-datadir
651-datarootdir
652-libexecdir
653-sbindir
654-bindir
655-program_transform_name
656-prefix
657-exec_prefix
658-PACKAGE_BUGREPORT
659-PACKAGE_STRING
660-PACKAGE_VERSION
661-PACKAGE_TARNAME
662-PACKAGE_NAME
663-PATH_SEPARATOR
664-SHELL'
665-=======
666 ac_subst_vars='SHELL
667 PATH_SEPARATOR
668 PACKAGE_NAME
669@@ -1203,46 +674,21 @@
670 VRRP_SUPPORT
671 LIBOBJS
672 LTLIBOBJS'
673->>>>>>> MERGE-SOURCE
674 ac_subst_files=''
675-<<<<<<< TREE
676-ac_user_opts='
677-enable_option_checking
678-enable_lvs_syncd
679-enable_lvs
680-enable_vrrp
681-with_kernel_dir
682-enable_debug
683-enable_profile
684-'
685- ac_precious_vars='build_alias
686-host_alias
687-target_alias
688-CC
689-CFLAGS
690-LDFLAGS
691-LIBS
692-CPPFLAGS
693-CPP'
694-
695-=======
696- ac_precious_vars='build_alias
697-host_alias
698-target_alias
699-CC
700-CFLAGS
701-LDFLAGS
702-LIBS
703-CPPFLAGS
704-CPP'
705-
706->>>>>>> MERGE-SOURCE
707+ ac_precious_vars='build_alias
708+host_alias
709+target_alias
710+CC
711+CFLAGS
712+LDFLAGS
713+LIBS
714+CPPFLAGS
715+CPP'
716+
717
718 # Initialize some variables set by options.
719 ac_init_help=
720 ac_init_version=false
721-ac_unrecognized_opts=
722-ac_unrecognized_sep=
723 # The variables have the same names as the options, with
724 # dashes changed to underlines.
725 cache_file=/dev/null
726@@ -1341,38 +787,11 @@
727 datarootdir=$ac_optarg ;;
728
729 -disable-* | --disable-*)
730- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
731+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
732 # Reject names that are not valid shell variable names.
733-<<<<<<< TREE
734- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
735- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
736-=======
737 expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
738 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
739->>>>>>> MERGE-SOURCE
740 { (exit 1); exit 1; }; }
741-<<<<<<< TREE
742- ac_useropt_orig=$ac_useropt
743- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
744- case $ac_user_opts in
745- *"
746-"enable_$ac_useropt"
747-"*) ;;
748- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
749- ac_unrecognized_sep=', ';;
750- esac
751- eval enable_$ac_useropt=no ;;
752-
753- -docdir | --docdir | --docdi | --doc | --do)
754- ac_prev=docdir ;;
755- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
756- docdir=$ac_optarg ;;
757-
758- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
759- ac_prev=dvidir ;;
760- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
761- dvidir=$ac_optarg ;;
762-=======
763 ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
764 eval enable_$ac_feature=no ;;
765
766@@ -1385,34 +804,15 @@
767 ac_prev=dvidir ;;
768 -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
769 dvidir=$ac_optarg ;;
770->>>>>>> MERGE-SOURCE
771
772 -enable-* | --enable-*)
773- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
774+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
775 # Reject names that are not valid shell variable names.
776-<<<<<<< TREE
777- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
778- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
779-=======
780 expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
781 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
782->>>>>>> MERGE-SOURCE
783 { (exit 1); exit 1; }; }
784-<<<<<<< TREE
785- ac_useropt_orig=$ac_useropt
786- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
787- case $ac_user_opts in
788- *"
789-"enable_$ac_useropt"
790-"*) ;;
791- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
792- ac_unrecognized_sep=', ';;
793- esac
794- eval enable_$ac_useropt=\$ac_optarg ;;
795-=======
796 ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
797 eval enable_$ac_feature=\$ac_optarg ;;
798->>>>>>> MERGE-SOURCE
799
800 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
801 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
802@@ -1603,58 +1003,22 @@
803 ac_init_version=: ;;
804
805 -with-* | --with-*)
806- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
807+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
808 # Reject names that are not valid shell variable names.
809-<<<<<<< TREE
810- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
811- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
812-=======
813 expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
814 { echo "$as_me: error: invalid package name: $ac_package" >&2
815->>>>>>> MERGE-SOURCE
816 { (exit 1); exit 1; }; }
817-<<<<<<< TREE
818- ac_useropt_orig=$ac_useropt
819- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
820- case $ac_user_opts in
821- *"
822-"with_$ac_useropt"
823-"*) ;;
824- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
825- ac_unrecognized_sep=', ';;
826- esac
827- eval with_$ac_useropt=\$ac_optarg ;;
828-=======
829 ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
830 eval with_$ac_package=\$ac_optarg ;;
831->>>>>>> MERGE-SOURCE
832
833 -without-* | --without-*)
834- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
835+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
836 # Reject names that are not valid shell variable names.
837-<<<<<<< TREE
838- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
839- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
840-=======
841 expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
842 { echo "$as_me: error: invalid package name: $ac_package" >&2
843->>>>>>> MERGE-SOURCE
844 { (exit 1); exit 1; }; }
845-<<<<<<< TREE
846- ac_useropt_orig=$ac_useropt
847- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
848- case $ac_user_opts in
849- *"
850-"with_$ac_useropt"
851-"*) ;;
852- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
853- ac_unrecognized_sep=', ';;
854- esac
855- eval with_$ac_useropt=no ;;
856-=======
857 ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
858 eval with_$ac_package=no ;;
859->>>>>>> MERGE-SOURCE
860
861 --x)
862 # Obsolete; use --with-x.
863@@ -1674,7 +1038,7 @@
864 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
865 x_libraries=$ac_optarg ;;
866
867- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
868+ -*) { echo "$as_me: error: unrecognized option: $ac_option
869 Try \`$0 --help' for more information." >&2
870 { (exit 1); exit 1; }; }
871 ;;
872@@ -1683,16 +1047,16 @@
873 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
874 # Reject names that are not valid shell variable names.
875 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
876- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
877+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
878 { (exit 1); exit 1; }; }
879 eval $ac_envvar=\$ac_optarg
880 export $ac_envvar ;;
881
882 *)
883 # FIXME: should be removed in autoconf 3.0.
884- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
885+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
886 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
887- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
888+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
889 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
890 ;;
891
892@@ -1701,41 +1065,6 @@
893
894 if test -n "$ac_prev"; then
895 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
896-<<<<<<< TREE
897- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
898- { (exit 1); exit 1; }; }
899-fi
900-
901-if test -n "$ac_unrecognized_opts"; then
902- case $enable_option_checking in
903- no) ;;
904- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
905- { (exit 1); exit 1; }; } ;;
906- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
907- esac
908-fi
909-
910-# Check all directory arguments for consistency.
911-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
912- datadir sysconfdir sharedstatedir localstatedir includedir \
913- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
914- libdir localedir mandir
915-do
916- eval ac_val=\$$ac_var
917- # Remove trailing slashes.
918- case $ac_val in
919- */ )
920- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
921- eval $ac_var=\$ac_val;;
922- esac
923- # Be sure to have absolute directory names.
924- case $ac_val in
925- [\\/$]* | ?:[\\/]* ) continue;;
926- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
927- esac
928- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
929- { (exit 1); exit 1; }; }
930-=======
931 { echo "$as_me: error: missing argument to $ac_option" >&2
932 { (exit 1); exit 1; }; }
933 fi
934@@ -1753,7 +1082,6 @@
935 esac
936 { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
937 { (exit 1); exit 1; }; }
938->>>>>>> MERGE-SOURCE
939 done
940
941 # There might be people who depend on the old broken behavior: `$host'
942@@ -1767,7 +1095,7 @@
943 if test "x$host_alias" != x; then
944 if test "x$build_alias" = x; then
945 cross_compiling=maybe
946- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
947+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
948 If a cross compiler is detected then cross compile mode will be used." >&2
949 elif test "x$build_alias" != "x$host_alias"; then
950 cross_compiling=yes
951@@ -1780,18 +1108,6 @@
952 test "$silent" = yes && exec 6>/dev/null
953
954
955-<<<<<<< TREE
956-ac_pwd=`pwd` && test -n "$ac_pwd" &&
957-ac_ls_di=`ls -di .` &&
958-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
959- { $as_echo "$as_me: error: working directory cannot be determined" >&2
960- { (exit 1); exit 1; }; }
961-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
962- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
963- { (exit 1); exit 1; }; }
964-
965-
966-=======
967 ac_pwd=`pwd` && test -n "$ac_pwd" &&
968 ac_ls_di=`ls -di .` &&
969 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
970@@ -1802,36 +1118,9 @@
971 { (exit 1); exit 1; }; }
972
973
974->>>>>>> MERGE-SOURCE
975 # Find the source files, if location was not specified.
976 if test -z "$srcdir"; then
977 ac_srcdir_defaulted=yes
978-<<<<<<< TREE
979- # Try the directory containing this script, then the parent directory.
980- ac_confdir=`$as_dirname -- "$as_myself" ||
981-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
982- X"$as_myself" : 'X\(//\)[^/]' \| \
983- X"$as_myself" : 'X\(//\)$' \| \
984- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
985-$as_echo X"$as_myself" |
986- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
987- s//\1/
988- q
989- }
990- /^X\(\/\/\)[^/].*/{
991- s//\1/
992- q
993- }
994- /^X\(\/\/\)$/{
995- s//\1/
996- q
997- }
998- /^X\(\/\).*/{
999- s//\1/
1000- q
1001- }
1002- s/.*/./; q'`
1003-=======
1004 # Try the directory containing this script, then the parent directory.
1005 ac_confdir=`$as_dirname -- "$0" ||
1006 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1007@@ -1856,7 +1145,6 @@
1008 q
1009 }
1010 s/.*/./; q'`
1011->>>>>>> MERGE-SOURCE
1012 srcdir=$ac_confdir
1013 if test ! -r "$srcdir/$ac_unique_file"; then
1014 srcdir=..
1015@@ -1864,34 +1152,6 @@
1016 else
1017 ac_srcdir_defaulted=no
1018 fi
1019-<<<<<<< TREE
1020-if test ! -r "$srcdir/$ac_unique_file"; then
1021- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1022- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1023- { (exit 1); exit 1; }; }
1024-fi
1025-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1026-ac_abs_confdir=`(
1027- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
1028- { (exit 1); exit 1; }; }
1029- pwd)`
1030-# When building in place, set srcdir=.
1031-if test "$ac_abs_confdir" = "$ac_pwd"; then
1032- srcdir=.
1033-fi
1034-# Remove unnecessary trailing slashes from srcdir.
1035-# Double slashes in file names in object file debugging info
1036-# mess up M-x gdb in Emacs.
1037-case $srcdir in
1038-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
1039-esac
1040-for ac_var in $ac_precious_vars; do
1041- eval ac_env_${ac_var}_set=\${${ac_var}+set}
1042- eval ac_env_${ac_var}_value=\$${ac_var}
1043- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1044- eval ac_cv_env_${ac_var}_value=\$${ac_var}
1045-done
1046-=======
1047 if test ! -r "$srcdir/$ac_unique_file"; then
1048 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1049 { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
1050@@ -1918,7 +1178,6 @@
1051 eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
1052 eval ac_cv_env_${ac_var}_value=\$${ac_var}
1053 done
1054->>>>>>> MERGE-SOURCE
1055
1056 #
1057 # Report the --help message.
1058@@ -1949,9 +1208,9 @@
1059
1060 Installation directories:
1061 --prefix=PREFIX install architecture-independent files in PREFIX
1062- [$ac_default_prefix]
1063+ [$ac_default_prefix]
1064 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
1065- [PREFIX]
1066+ [PREFIX]
1067
1068 By default, \`make install' will install all the files in
1069 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
1070@@ -1961,27 +1220,6 @@
1071 For better control, use the options below.
1072
1073 Fine tuning of the installation directories:
1074-<<<<<<< TREE
1075- --bindir=DIR user executables [EPREFIX/bin]
1076- --sbindir=DIR system admin executables [EPREFIX/sbin]
1077- --libexecdir=DIR program executables [EPREFIX/libexec]
1078- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1079- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1080- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1081- --libdir=DIR object code libraries [EPREFIX/lib]
1082- --includedir=DIR C header files [PREFIX/include]
1083- --oldincludedir=DIR C header files for non-gcc [/usr/include]
1084- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1085- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1086- --infodir=DIR info documentation [DATAROOTDIR/info]
1087- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
1088- --mandir=DIR man documentation [DATAROOTDIR/man]
1089- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
1090- --htmldir=DIR html documentation [DOCDIR]
1091- --dvidir=DIR dvi documentation [DOCDIR]
1092- --pdfdir=DIR pdf documentation [DOCDIR]
1093- --psdir=DIR ps documentation [DOCDIR]
1094-=======
1095 --bindir=DIR user executables [EPREFIX/bin]
1096 --sbindir=DIR system admin executables [EPREFIX/sbin]
1097 --libexecdir=DIR program executables [EPREFIX/libexec]
1098@@ -2001,7 +1239,6 @@
1099 --dvidir=DIR dvi documentation [DOCDIR]
1100 --pdfdir=DIR pdf documentation [DOCDIR]
1101 --psdir=DIR ps documentation [DOCDIR]
1102->>>>>>> MERGE-SOURCE
1103 _ACEOF
1104
1105 cat <<\_ACEOF
1106@@ -2013,7 +1250,6 @@
1107 cat <<\_ACEOF
1108
1109 Optional Features:
1110- --disable-option-checking ignore unrecognized --enable/--with options
1111 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1112 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1113 --disable-lvs-syncd do not use LVS synchronization daemon
1114@@ -2047,32 +1283,9 @@
1115 if test "$ac_init_help" = "recursive"; then
1116 # If there are subdirs, report their specific --help.
1117 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
1118-<<<<<<< TREE
1119- test -d "$ac_dir" ||
1120- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
1121- continue
1122-=======
1123 test -d "$ac_dir" || continue
1124->>>>>>> MERGE-SOURCE
1125 ac_builddir=.
1126
1127-<<<<<<< TREE
1128-case "$ac_dir" in
1129-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1130-*)
1131- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
1132- # A ".." for each directory in $ac_dir_suffix.
1133- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
1134- case $ac_top_builddir_sub in
1135- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1136- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
1137- esac ;;
1138-esac
1139-ac_abs_top_builddir=$ac_pwd
1140-ac_abs_builddir=$ac_pwd$ac_dir_suffix
1141-# for backward compatibility:
1142-ac_top_builddir=$ac_top_build_prefix
1143-=======
1144 case "$ac_dir" in
1145 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1146 *)
1147@@ -2088,7 +1301,6 @@
1148 ac_abs_builddir=$ac_pwd$ac_dir_suffix
1149 # for backward compatibility:
1150 ac_top_builddir=$ac_top_build_prefix
1151->>>>>>> MERGE-SOURCE
1152
1153 case $srcdir in
1154 .) # We are building in place.
1155@@ -2115,36 +1327,20 @@
1156 echo &&
1157 $SHELL "$ac_srcdir/configure" --help=recursive
1158 else
1159-<<<<<<< TREE
1160- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1161- fi || ac_status=$?
1162- cd "$ac_pwd" || { ac_status=$?; break; }
1163-=======
1164 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1165 fi || ac_status=$?
1166 cd "$ac_pwd" || { ac_status=$?; break; }
1167->>>>>>> MERGE-SOURCE
1168 done
1169 fi
1170
1171 test -n "$ac_init_help" && exit $ac_status
1172 if $ac_init_version; then
1173 cat <<\_ACEOF
1174-<<<<<<< TREE
1175-configure
1176-generated by GNU Autoconf 2.63
1177-=======
1178 configure
1179 generated by GNU Autoconf 2.61
1180->>>>>>> MERGE-SOURCE
1181
1182-<<<<<<< TREE
1183-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1184-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1185-=======
1186 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1187 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1188->>>>>>> MERGE-SOURCE
1189 This configure script is free software; the Free Software Foundation
1190 gives unlimited permission to copy, distribute and modify it.
1191 _ACEOF
1192@@ -2155,11 +1351,7 @@
1193 running configure, to aid debugging if configure makes a mistake.
1194
1195 It was created by $as_me, which was
1196-<<<<<<< TREE
1197-generated by GNU Autoconf 2.63. Invocation command line was
1198-=======
1199 generated by GNU Autoconf 2.61. Invocation command line was
1200->>>>>>> MERGE-SOURCE
1201
1202 $ $0 $@
1203
1204@@ -2195,7 +1387,7 @@
1205 do
1206 IFS=$as_save_IFS
1207 test -z "$as_dir" && as_dir=.
1208- $as_echo "PATH: $as_dir"
1209+ echo "PATH: $as_dir"
1210 done
1211 IFS=$as_save_IFS
1212
1213@@ -2229,13 +1421,8 @@
1214 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1215 | -silent | --silent | --silen | --sile | --sil)
1216 continue ;;
1217-<<<<<<< TREE
1218- *\'*)
1219- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1220-=======
1221 *\'*)
1222 ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1223->>>>>>> MERGE-SOURCE
1224 esac
1225 case $ac_pass in
1226 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1227@@ -2281,24 +1468,6 @@
1228 _ASBOX
1229 echo
1230 # The following way of writing the cache mishandles newlines in values,
1231-<<<<<<< TREE
1232-(
1233- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
1234- eval ac_val=\$$ac_var
1235- case $ac_val in #(
1236- *${as_nl}*)
1237- case $ac_var in #(
1238- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1239-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1240- esac
1241- case $ac_var in #(
1242- _ | IFS | as_nl) ;; #(
1243- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1244- *) $as_unset $ac_var ;;
1245- esac ;;
1246- esac
1247- done
1248-=======
1249 (
1250 for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
1251 eval ac_val=\$$ac_var
1252@@ -2314,7 +1483,6 @@
1253 esac ;;
1254 esac
1255 done
1256->>>>>>> MERGE-SOURCE
1257 (set) 2>&1 |
1258 case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
1259 *${as_nl}ac_space=\ *)
1260@@ -2338,19 +1506,11 @@
1261 echo
1262 for ac_var in $ac_subst_vars
1263 do
1264-<<<<<<< TREE
1265- eval ac_val=\$$ac_var
1266- case $ac_val in
1267- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1268- esac
1269- $as_echo "$ac_var='\''$ac_val'\''"
1270-=======
1271 eval ac_val=\$$ac_var
1272 case $ac_val in
1273 *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1274 esac
1275 echo "$ac_var='\''$ac_val'\''"
1276->>>>>>> MERGE-SOURCE
1277 done | sort
1278 echo
1279
1280@@ -2363,19 +1523,11 @@
1281 echo
1282 for ac_var in $ac_subst_files
1283 do
1284-<<<<<<< TREE
1285- eval ac_val=\$$ac_var
1286- case $ac_val in
1287- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1288- esac
1289- $as_echo "$ac_var='\''$ac_val'\''"
1290-=======
1291 eval ac_val=\$$ac_var
1292 case $ac_val in
1293 *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
1294 esac
1295 echo "$ac_var='\''$ac_val'\''"
1296->>>>>>> MERGE-SOURCE
1297 done | sort
1298 echo
1299 fi
1300@@ -2391,8 +1543,8 @@
1301 echo
1302 fi
1303 test "$ac_signal" != 0 &&
1304- $as_echo "$as_me: caught signal $ac_signal"
1305- $as_echo "$as_me: exit $exit_status"
1306+ echo "$as_me: caught signal $ac_signal"
1307+ echo "$as_me: exit $exit_status"
1308 } >&5
1309 rm -f core *.core core.conftest.* &&
1310 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
1311@@ -2434,19 +1586,6 @@
1312
1313
1314 # Let the site file select an alternate cache file if it wants to.
1315-<<<<<<< TREE
1316-# Prefer an explicitly selected file to automatically selected ones.
1317-ac_site_file1=NONE
1318-ac_site_file2=NONE
1319-if test -n "$CONFIG_SITE"; then
1320- ac_site_file1=$CONFIG_SITE
1321-elif test "x$prefix" != xNONE; then
1322- ac_site_file1=$prefix/share/config.site
1323- ac_site_file2=$prefix/etc/config.site
1324-else
1325- ac_site_file1=$ac_default_prefix/share/config.site
1326- ac_site_file2=$ac_default_prefix/etc/config.site
1327-=======
1328 # Prefer explicitly selected file to automatically selected ones.
1329 if test -n "$CONFIG_SITE"; then
1330 set x "$CONFIG_SITE"
1331@@ -2455,20 +1594,13 @@
1332 else
1333 set x "$ac_default_prefix/share/config.site" \
1334 "$ac_default_prefix/etc/config.site"
1335->>>>>>> MERGE-SOURCE
1336 fi
1337-<<<<<<< TREE
1338-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
1339-do
1340- test "x$ac_site_file" = xNONE && continue
1341-=======
1342 shift
1343 for ac_site_file
1344 do
1345->>>>>>> MERGE-SOURCE
1346 if test -r "$ac_site_file"; then
1347- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1348-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
1349+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1350+echo "$as_me: loading site script $ac_site_file" >&6;}
1351 sed 's/^/| /' "$ac_site_file" >&5
1352 . "$ac_site_file"
1353 fi
1354@@ -2478,16 +1610,16 @@
1355 # Some versions of bash will fail to source /dev/null (special
1356 # files actually), so we avoid doing that.
1357 if test -f "$cache_file"; then
1358- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1359-$as_echo "$as_me: loading cache $cache_file" >&6;}
1360+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
1361+echo "$as_me: loading cache $cache_file" >&6;}
1362 case $cache_file in
1363 [\\/]* | ?:[\\/]* ) . "$cache_file";;
1364 *) . "./$cache_file";;
1365 esac
1366 fi
1367 else
1368- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1369-$as_echo "$as_me: creating cache $cache_file" >&6;}
1370+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
1371+echo "$as_me: creating cache $cache_file" >&6;}
1372 >$cache_file
1373 fi
1374
1375@@ -2501,42 +1633,29 @@
1376 eval ac_new_val=\$ac_env_${ac_var}_value
1377 case $ac_old_set,$ac_new_set in
1378 set,)
1379- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1380-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1381+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1382+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1383 ac_cache_corrupted=: ;;
1384 ,set)
1385- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1386-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1387+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1388+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1389 ac_cache_corrupted=: ;;
1390 ,);;
1391 *)
1392 if test "x$ac_old_val" != "x$ac_new_val"; then
1393- # differences in whitespace do not lead to failure.
1394- ac_old_val_w=`echo x $ac_old_val`
1395- ac_new_val_w=`echo x $ac_new_val`
1396- if test "$ac_old_val_w" != "$ac_new_val_w"; then
1397- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1398-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1399- ac_cache_corrupted=:
1400- else
1401- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1402-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1403- eval $ac_var=\$ac_old_val
1404- fi
1405- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1406-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1407- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1408-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1409+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1410+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1411+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
1412+echo "$as_me: former value: $ac_old_val" >&2;}
1413+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
1414+echo "$as_me: current value: $ac_new_val" >&2;}
1415+ ac_cache_corrupted=:
1416 fi;;
1417 esac
1418 # Pass precious variables to config.status.
1419 if test "$ac_new_set" = set; then
1420 case $ac_new_val in
1421-<<<<<<< TREE
1422- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1423-=======
1424 *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1425->>>>>>> MERGE-SOURCE
1426 *) ac_arg=$ac_var=$ac_new_val ;;
1427 esac
1428 case " $ac_configure_args " in
1429@@ -2546,12 +1665,10 @@
1430 fi
1431 done
1432 if $ac_cache_corrupted; then
1433- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1434-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1435- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1436-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1437- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1438-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1439+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1440+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1441+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1442+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1443 { (exit 1); exit 1; }; }
1444 fi
1445
1446@@ -2590,15 +1707,10 @@
1447 if test -n "$ac_tool_prefix"; then
1448 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1449 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1450-<<<<<<< TREE
1451-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1452-$as_echo_n "checking for $ac_word... " >&6; }
1453-=======
1454 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1455 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1456->>>>>>> MERGE-SOURCE
1457 if test "${ac_cv_prog_CC+set}" = set; then
1458- $as_echo_n "(cached) " >&6
1459+ echo $ECHO_N "(cached) $ECHO_C" >&6
1460 else
1461 if test -n "$CC"; then
1462 ac_cv_prog_CC="$CC" # Let the user override the test.
1463@@ -2611,7 +1723,7 @@
1464 for ac_exec_ext in '' $ac_executable_extensions; do
1465 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1466 ac_cv_prog_CC="${ac_tool_prefix}gcc"
1467- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1468+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1469 break 2
1470 fi
1471 done
1472@@ -2622,21 +1734,11 @@
1473 fi
1474 CC=$ac_cv_prog_CC
1475 if test -n "$CC"; then
1476-<<<<<<< TREE
1477- { $as_echo "$as_me:$LINENO: result: $CC" >&5
1478-$as_echo "$CC" >&6; }
1479-=======
1480 { echo "$as_me:$LINENO: result: $CC" >&5
1481 echo "${ECHO_T}$CC" >&6; }
1482->>>>>>> MERGE-SOURCE
1483 else
1484-<<<<<<< TREE
1485- { $as_echo "$as_me:$LINENO: result: no" >&5
1486-$as_echo "no" >&6; }
1487-=======
1488 { echo "$as_me:$LINENO: result: no" >&5
1489 echo "${ECHO_T}no" >&6; }
1490->>>>>>> MERGE-SOURCE
1491 fi
1492
1493
1494@@ -2645,15 +1747,10 @@
1495 ac_ct_CC=$CC
1496 # Extract the first word of "gcc", so it can be a program name with args.
1497 set dummy gcc; ac_word=$2
1498-<<<<<<< TREE
1499-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1500-$as_echo_n "checking for $ac_word... " >&6; }
1501-=======
1502 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1503 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1504->>>>>>> MERGE-SOURCE
1505 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1506- $as_echo_n "(cached) " >&6
1507+ echo $ECHO_N "(cached) $ECHO_C" >&6
1508 else
1509 if test -n "$ac_ct_CC"; then
1510 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1511@@ -2666,7 +1763,7 @@
1512 for ac_exec_ext in '' $ac_executable_extensions; do
1513 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1514 ac_cv_prog_ac_ct_CC="gcc"
1515- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1516+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1517 break 2
1518 fi
1519 done
1520@@ -2677,36 +1774,13 @@
1521 fi
1522 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1523 if test -n "$ac_ct_CC"; then
1524-<<<<<<< TREE
1525- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1526-$as_echo "$ac_ct_CC" >&6; }
1527-=======
1528 { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1529 echo "${ECHO_T}$ac_ct_CC" >&6; }
1530->>>>>>> MERGE-SOURCE
1531 else
1532-<<<<<<< TREE
1533- { $as_echo "$as_me:$LINENO: result: no" >&5
1534-$as_echo "no" >&6; }
1535-=======
1536 { echo "$as_me:$LINENO: result: no" >&5
1537 echo "${ECHO_T}no" >&6; }
1538->>>>>>> MERGE-SOURCE
1539 fi
1540
1541-<<<<<<< TREE
1542- if test "x$ac_ct_CC" = x; then
1543- CC=""
1544- else
1545- case $cross_compiling:$ac_tool_warned in
1546-yes:)
1547-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1548-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1549-ac_tool_warned=yes ;;
1550-esac
1551- CC=$ac_ct_CC
1552- fi
1553-=======
1554 if test "x$ac_ct_CC" = x; then
1555 CC=""
1556 else
1557@@ -2722,7 +1796,6 @@
1558 esac
1559 CC=$ac_ct_CC
1560 fi
1561->>>>>>> MERGE-SOURCE
1562 else
1563 CC="$ac_cv_prog_CC"
1564 fi
1565@@ -2731,15 +1804,10 @@
1566 if test -n "$ac_tool_prefix"; then
1567 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1568 set dummy ${ac_tool_prefix}cc; ac_word=$2
1569-<<<<<<< TREE
1570-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1571-$as_echo_n "checking for $ac_word... " >&6; }
1572-=======
1573 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1574 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1575->>>>>>> MERGE-SOURCE
1576 if test "${ac_cv_prog_CC+set}" = set; then
1577- $as_echo_n "(cached) " >&6
1578+ echo $ECHO_N "(cached) $ECHO_C" >&6
1579 else
1580 if test -n "$CC"; then
1581 ac_cv_prog_CC="$CC" # Let the user override the test.
1582@@ -2752,7 +1820,7 @@
1583 for ac_exec_ext in '' $ac_executable_extensions; do
1584 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1585 ac_cv_prog_CC="${ac_tool_prefix}cc"
1586- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1587+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1588 break 2
1589 fi
1590 done
1591@@ -2763,16 +1831,6 @@
1592 fi
1593 CC=$ac_cv_prog_CC
1594 if test -n "$CC"; then
1595-<<<<<<< TREE
1596- { $as_echo "$as_me:$LINENO: result: $CC" >&5
1597-$as_echo "$CC" >&6; }
1598-else
1599- { $as_echo "$as_me:$LINENO: result: no" >&5
1600-$as_echo "no" >&6; }
1601-fi
1602-
1603-
1604-=======
1605 { echo "$as_me:$LINENO: result: $CC" >&5
1606 echo "${ECHO_T}$CC" >&6; }
1607 else
1608@@ -2781,21 +1839,15 @@
1609 fi
1610
1611
1612->>>>>>> MERGE-SOURCE
1613 fi
1614 fi
1615 if test -z "$CC"; then
1616 # Extract the first word of "cc", so it can be a program name with args.
1617 set dummy cc; ac_word=$2
1618-<<<<<<< TREE
1619-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1620-$as_echo_n "checking for $ac_word... " >&6; }
1621-=======
1622 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1623 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1624->>>>>>> MERGE-SOURCE
1625 if test "${ac_cv_prog_CC+set}" = set; then
1626- $as_echo_n "(cached) " >&6
1627+ echo $ECHO_N "(cached) $ECHO_C" >&6
1628 else
1629 if test -n "$CC"; then
1630 ac_cv_prog_CC="$CC" # Let the user override the test.
1631@@ -2813,7 +1865,7 @@
1632 continue
1633 fi
1634 ac_cv_prog_CC="cc"
1635- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1636+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1637 break 2
1638 fi
1639 done
1640@@ -2836,21 +1888,11 @@
1641 fi
1642 CC=$ac_cv_prog_CC
1643 if test -n "$CC"; then
1644-<<<<<<< TREE
1645- { $as_echo "$as_me:$LINENO: result: $CC" >&5
1646-$as_echo "$CC" >&6; }
1647-=======
1648 { echo "$as_me:$LINENO: result: $CC" >&5
1649 echo "${ECHO_T}$CC" >&6; }
1650->>>>>>> MERGE-SOURCE
1651 else
1652-<<<<<<< TREE
1653- { $as_echo "$as_me:$LINENO: result: no" >&5
1654-$as_echo "no" >&6; }
1655-=======
1656 { echo "$as_me:$LINENO: result: no" >&5
1657 echo "${ECHO_T}no" >&6; }
1658->>>>>>> MERGE-SOURCE
1659 fi
1660
1661
1662@@ -2861,15 +1903,10 @@
1663 do
1664 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1665 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1666-<<<<<<< TREE
1667-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1668-$as_echo_n "checking for $ac_word... " >&6; }
1669-=======
1670 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1671 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1672->>>>>>> MERGE-SOURCE
1673 if test "${ac_cv_prog_CC+set}" = set; then
1674- $as_echo_n "(cached) " >&6
1675+ echo $ECHO_N "(cached) $ECHO_C" >&6
1676 else
1677 if test -n "$CC"; then
1678 ac_cv_prog_CC="$CC" # Let the user override the test.
1679@@ -2882,7 +1919,7 @@
1680 for ac_exec_ext in '' $ac_executable_extensions; do
1681 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1682 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1683- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1684+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1685 break 2
1686 fi
1687 done
1688@@ -2893,21 +1930,11 @@
1689 fi
1690 CC=$ac_cv_prog_CC
1691 if test -n "$CC"; then
1692-<<<<<<< TREE
1693- { $as_echo "$as_me:$LINENO: result: $CC" >&5
1694-$as_echo "$CC" >&6; }
1695-=======
1696 { echo "$as_me:$LINENO: result: $CC" >&5
1697 echo "${ECHO_T}$CC" >&6; }
1698->>>>>>> MERGE-SOURCE
1699 else
1700-<<<<<<< TREE
1701- { $as_echo "$as_me:$LINENO: result: no" >&5
1702-$as_echo "no" >&6; }
1703-=======
1704 { echo "$as_me:$LINENO: result: no" >&5
1705 echo "${ECHO_T}no" >&6; }
1706->>>>>>> MERGE-SOURCE
1707 fi
1708
1709
1710@@ -2920,15 +1947,10 @@
1711 do
1712 # Extract the first word of "$ac_prog", so it can be a program name with args.
1713 set dummy $ac_prog; ac_word=$2
1714-<<<<<<< TREE
1715-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1716-$as_echo_n "checking for $ac_word... " >&6; }
1717-=======
1718 { echo "$as_me:$LINENO: checking for $ac_word" >&5
1719 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1720->>>>>>> MERGE-SOURCE
1721 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1722- $as_echo_n "(cached) " >&6
1723+ echo $ECHO_N "(cached) $ECHO_C" >&6
1724 else
1725 if test -n "$ac_ct_CC"; then
1726 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1727@@ -2941,7 +1963,7 @@
1728 for ac_exec_ext in '' $ac_executable_extensions; do
1729 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1730 ac_cv_prog_ac_ct_CC="$ac_prog"
1731- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1732+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1733 break 2
1734 fi
1735 done
1736@@ -2952,48 +1974,17 @@
1737 fi
1738 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1739 if test -n "$ac_ct_CC"; then
1740-<<<<<<< TREE
1741- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1742-$as_echo "$ac_ct_CC" >&6; }
1743-=======
1744 { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1745 echo "${ECHO_T}$ac_ct_CC" >&6; }
1746->>>>>>> MERGE-SOURCE
1747 else
1748-<<<<<<< TREE
1749- { $as_echo "$as_me:$LINENO: result: no" >&5
1750-$as_echo "no" >&6; }
1751-=======
1752 { echo "$as_me:$LINENO: result: no" >&5
1753 echo "${ECHO_T}no" >&6; }
1754->>>>>>> MERGE-SOURCE
1755 fi
1756
1757
1758 test -n "$ac_ct_CC" && break
1759 done
1760
1761-<<<<<<< TREE
1762- if test "x$ac_ct_CC" = x; then
1763- CC=""
1764- else
1765- case $cross_compiling:$ac_tool_warned in
1766-yes:)
1767-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1768-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1769-ac_tool_warned=yes ;;
1770-esac
1771- CC=$ac_ct_CC
1772- fi
1773-fi
1774-
1775-fi
1776-
1777-
1778-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1779-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1780-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1781-=======
1782 if test "x$ac_ct_CC" = x; then
1783 CC=""
1784 else
1785@@ -3015,50 +2006,12 @@
1786
1787
1788 test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1789->>>>>>> MERGE-SOURCE
1790 See \`config.log' for more details." >&5
1791-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1792+echo "$as_me: error: no acceptable C compiler found in \$PATH
1793 See \`config.log' for more details." >&2;}
1794- { (exit 1); exit 1; }; }; }
1795+ { (exit 1); exit 1; }; }
1796
1797 # Provide some information about the compiler.
1798-<<<<<<< TREE
1799-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1800-set X $ac_compile
1801-ac_compiler=$2
1802-{ (ac_try="$ac_compiler --version >&5"
1803-case "(($ac_try" in
1804- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1805- *) ac_try_echo=$ac_try;;
1806-esac
1807-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1808-$as_echo "$ac_try_echo") >&5
1809- (eval "$ac_compiler --version >&5") 2>&5
1810- ac_status=$?
1811- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1812- (exit $ac_status); }
1813-{ (ac_try="$ac_compiler -v >&5"
1814-case "(($ac_try" in
1815- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1816- *) ac_try_echo=$ac_try;;
1817-esac
1818-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1819-$as_echo "$ac_try_echo") >&5
1820- (eval "$ac_compiler -v >&5") 2>&5
1821- ac_status=$?
1822- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1823- (exit $ac_status); }
1824-{ (ac_try="$ac_compiler -V >&5"
1825-case "(($ac_try" in
1826- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1827- *) ac_try_echo=$ac_try;;
1828-esac
1829-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1830-$as_echo "$ac_try_echo") >&5
1831- (eval "$ac_compiler -V >&5") 2>&5
1832- ac_status=$?
1833- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1834-=======
1835 echo "$as_me:$LINENO: checking for C compiler version" >&5
1836 ac_compiler=`set X $ac_compile; echo $2`
1837 { (ac_try="$ac_compiler --version >&5"
1838@@ -3090,7 +2043,6 @@
1839 (eval "$ac_compiler -V >&5") 2>&5
1840 ac_status=$?
1841 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1842->>>>>>> MERGE-SOURCE
1843 (exit $ac_status); }
1844
1845 cat >conftest.$ac_ext <<_ACEOF
1846@@ -3109,37 +2061,10 @@
1847 }
1848 _ACEOF
1849 ac_clean_files_save=$ac_clean_files
1850-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
1851+ac_clean_files="$ac_clean_files a.out a.exe b.out"
1852 # Try to create an executable without -o first, disregard a.out.
1853 # It will help us diagnose broken compilers, and finding out an intuition
1854 # of exeext.
1855-<<<<<<< TREE
1856-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1857-$as_echo_n "checking for C compiler default output file name... " >&6; }
1858-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1859-
1860-# The possible output files:
1861-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
1862-
1863-ac_rmfiles=
1864-for ac_file in $ac_files
1865-do
1866- case $ac_file in
1867- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1868- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1869- esac
1870-done
1871-rm -f $ac_rmfiles
1872-
1873-if { (ac_try="$ac_link_default"
1874-case "(($ac_try" in
1875- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1876- *) ac_try_echo=$ac_try;;
1877-esac
1878-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1879-$as_echo "$ac_try_echo") >&5
1880- (eval "$ac_link_default") 2>&5
1881-=======
1882 { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1883 echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1884 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1885@@ -3169,9 +2094,8 @@
1886 esac
1887 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1888 (eval "$ac_link_default") 2>&5
1889->>>>>>> MERGE-SOURCE
1890 ac_status=$?
1891- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1892+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1893 (exit $ac_status); }; then
1894 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
1895 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
1896@@ -3182,11 +2106,7 @@
1897 do
1898 test -f "$ac_file" || continue
1899 case $ac_file in
1900-<<<<<<< TREE
1901- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
1902-=======
1903 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
1904->>>>>>> MERGE-SOURCE
1905 ;;
1906 [ab].out )
1907 # We found the default executable, but exeext='' is most
1908@@ -3210,15 +2130,6 @@
1909 test "$ac_cv_exeext" = no && ac_cv_exeext=
1910
1911 else
1912-<<<<<<< TREE
1913- ac_file=''
1914-fi
1915-
1916-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
1917-$as_echo "$ac_file" >&6; }
1918-if test -z "$ac_file"; then
1919- $as_echo "$as_me: failed program was:" >&5
1920-=======
1921 ac_file=''
1922 fi
1923
1924@@ -3226,105 +2137,61 @@
1925 echo "${ECHO_T}$ac_file" >&6; }
1926 if test -z "$ac_file"; then
1927 echo "$as_me: failed program was:" >&5
1928->>>>>>> MERGE-SOURCE
1929 sed 's/^/| /' conftest.$ac_ext >&5
1930
1931-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1932-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1933-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
1934+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
1935 See \`config.log' for more details." >&5
1936-$as_echo "$as_me: error: C compiler cannot create executables
1937+echo "$as_me: error: C compiler cannot create executables
1938 See \`config.log' for more details." >&2;}
1939- { (exit 77); exit 77; }; }; }
1940+ { (exit 77); exit 77; }; }
1941 fi
1942
1943 ac_exeext=$ac_cv_exeext
1944
1945 # Check that the compiler produces executables we can run. If not, either
1946 # the compiler is broken, or we cross compile.
1947-<<<<<<< TREE
1948-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1949-$as_echo_n "checking whether the C compiler works... " >&6; }
1950-=======
1951 { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1952 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
1953->>>>>>> MERGE-SOURCE
1954 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1955 # If not cross compiling, check that we can run a simple program.
1956 if test "$cross_compiling" != yes; then
1957 if { ac_try='./$ac_file'
1958-<<<<<<< TREE
1959- { (case "(($ac_try" in
1960- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1961- *) ac_try_echo=$ac_try;;
1962-esac
1963-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1964-$as_echo "$ac_try_echo") >&5
1965- (eval "$ac_try") 2>&5
1966-=======
1967 { (case "(($ac_try" in
1968 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1969 *) ac_try_echo=$ac_try;;
1970 esac
1971 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1972 (eval "$ac_try") 2>&5
1973->>>>>>> MERGE-SOURCE
1974 ac_status=$?
1975- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1976+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1977 (exit $ac_status); }; }; then
1978 cross_compiling=no
1979 else
1980 if test "$cross_compiling" = maybe; then
1981 cross_compiling=yes
1982 else
1983- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1984-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1985-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
1986+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
1987 If you meant to cross compile, use \`--host'.
1988 See \`config.log' for more details." >&5
1989-$as_echo "$as_me: error: cannot run C compiled programs.
1990+echo "$as_me: error: cannot run C compiled programs.
1991 If you meant to cross compile, use \`--host'.
1992 See \`config.log' for more details." >&2;}
1993- { (exit 1); exit 1; }; }; }
1994+ { (exit 1); exit 1; }; }
1995 fi
1996 fi
1997 fi
1998-<<<<<<< TREE
1999-{ $as_echo "$as_me:$LINENO: result: yes" >&5
2000-$as_echo "yes" >&6; }
2001-=======
2002 { echo "$as_me:$LINENO: result: yes" >&5
2003 echo "${ECHO_T}yes" >&6; }
2004->>>>>>> MERGE-SOURCE
2005
2006-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
2007+rm -f a.out a.exe conftest$ac_cv_exeext b.out
2008 ac_clean_files=$ac_clean_files_save
2009 # Check that the compiler produces executables we can run. If not, either
2010 # the compiler is broken, or we cross compile.
2011-<<<<<<< TREE
2012-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2013-$as_echo_n "checking whether we are cross compiling... " >&6; }
2014-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
2015-$as_echo "$cross_compiling" >&6; }
2016-=======
2017 { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
2018 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
2019 { echo "$as_me:$LINENO: result: $cross_compiling" >&5
2020 echo "${ECHO_T}$cross_compiling" >&6; }
2021->>>>>>> MERGE-SOURCE
2022
2023-<<<<<<< TREE
2024-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
2025-$as_echo_n "checking for suffix of executables... " >&6; }
2026-if { (ac_try="$ac_link"
2027-case "(($ac_try" in
2028- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2029- *) ac_try_echo=$ac_try;;
2030-esac
2031-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2032-$as_echo "$ac_try_echo") >&5
2033- (eval "$ac_link") 2>&5
2034-=======
2035 { echo "$as_me:$LINENO: checking for suffix of executables" >&5
2036 echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
2037 if { (ac_try="$ac_link"
2038@@ -3334,9 +2201,8 @@
2039 esac
2040 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2041 (eval "$ac_link") 2>&5
2042->>>>>>> MERGE-SOURCE
2043 ac_status=$?
2044- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2045+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2046 (exit $ac_status); }; then
2047 # If both `conftest.exe' and `conftest' are `present' (well, observable)
2048 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
2049@@ -3345,47 +2211,31 @@
2050 for ac_file in conftest.exe conftest conftest.*; do
2051 test -f "$ac_file" || continue
2052 case $ac_file in
2053-<<<<<<< TREE
2054- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
2055-=======
2056 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
2057->>>>>>> MERGE-SOURCE
2058 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2059 break;;
2060 * ) break;;
2061 esac
2062 done
2063 else
2064- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2065-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2066-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2067+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
2068 See \`config.log' for more details." >&5
2069-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2070+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
2071 See \`config.log' for more details." >&2;}
2072- { (exit 1); exit 1; }; }; }
2073+ { (exit 1); exit 1; }; }
2074 fi
2075
2076 rm -f conftest$ac_cv_exeext
2077-<<<<<<< TREE
2078-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2079-$as_echo "$ac_cv_exeext" >&6; }
2080-=======
2081 { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
2082 echo "${ECHO_T}$ac_cv_exeext" >&6; }
2083->>>>>>> MERGE-SOURCE
2084
2085 rm -f conftest.$ac_ext
2086 EXEEXT=$ac_cv_exeext
2087 ac_exeext=$EXEEXT
2088-<<<<<<< TREE
2089-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
2090-$as_echo_n "checking for suffix of object files... " >&6; }
2091-=======
2092 { echo "$as_me:$LINENO: checking for suffix of object files" >&5
2093 echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
2094->>>>>>> MERGE-SOURCE
2095 if test "${ac_cv_objext+set}" = set; then
2096- $as_echo_n "(cached) " >&6
2097+ echo $ECHO_N "(cached) $ECHO_C" >&6
2098 else
2099 cat >conftest.$ac_ext <<_ACEOF
2100 /* confdefs.h. */
2101@@ -3403,16 +2253,6 @@
2102 }
2103 _ACEOF
2104 rm -f conftest.o conftest.obj
2105-<<<<<<< TREE
2106-if { (ac_try="$ac_compile"
2107-case "(($ac_try" in
2108- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2109- *) ac_try_echo=$ac_try;;
2110-esac
2111-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2112-$as_echo "$ac_try_echo") >&5
2113- (eval "$ac_compile") 2>&5
2114-=======
2115 if { (ac_try="$ac_compile"
2116 case "(($ac_try" in
2117 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2118@@ -3420,55 +2260,38 @@
2119 esac
2120 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2121 (eval "$ac_compile") 2>&5
2122->>>>>>> MERGE-SOURCE
2123 ac_status=$?
2124- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2125+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2126 (exit $ac_status); }; then
2127 for ac_file in conftest.o conftest.obj conftest.*; do
2128 test -f "$ac_file" || continue;
2129 case $ac_file in
2130-<<<<<<< TREE
2131- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
2132-=======
2133 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
2134->>>>>>> MERGE-SOURCE
2135 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
2136 break;;
2137 esac
2138 done
2139 else
2140- $as_echo "$as_me: failed program was:" >&5
2141+ echo "$as_me: failed program was:" >&5
2142 sed 's/^/| /' conftest.$ac_ext >&5
2143
2144-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2145-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2146-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2147+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
2148 See \`config.log' for more details." >&5
2149-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
2150+echo "$as_me: error: cannot compute suffix of object files: cannot compile
2151 See \`config.log' for more details." >&2;}
2152- { (exit 1); exit 1; }; }; }
2153+ { (exit 1); exit 1; }; }
2154 fi
2155
2156 rm -f conftest.$ac_cv_objext conftest.$ac_ext
2157 fi
2158-<<<<<<< TREE
2159-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2160-$as_echo "$ac_cv_objext" >&6; }
2161-=======
2162 { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
2163 echo "${ECHO_T}$ac_cv_objext" >&6; }
2164->>>>>>> MERGE-SOURCE
2165 OBJEXT=$ac_cv_objext
2166 ac_objext=$OBJEXT
2167-<<<<<<< TREE
2168-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2169-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
2170-=======
2171 { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
2172 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
2173->>>>>>> MERGE-SOURCE
2174 if test "${ac_cv_c_compiler_gnu+set}" = set; then
2175- $as_echo_n "(cached) " >&6
2176+ echo $ECHO_N "(cached) $ECHO_C" >&6
2177 else
2178 cat >conftest.$ac_ext <<_ACEOF
2179 /* confdefs.h. */
2180@@ -3489,16 +2312,6 @@
2181 }
2182 _ACEOF
2183 rm -f conftest.$ac_objext
2184-<<<<<<< TREE
2185-if { (ac_try="$ac_compile"
2186-case "(($ac_try" in
2187- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2188- *) ac_try_echo=$ac_try;;
2189-esac
2190-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2191-$as_echo "$ac_try_echo") >&5
2192- (eval "$ac_compile") 2>conftest.er1
2193-=======
2194 if { (ac_try="$ac_compile"
2195 case "(($ac_try" in
2196 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2197@@ -3506,27 +2319,18 @@
2198 esac
2199 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2200 (eval "$ac_compile") 2>conftest.er1
2201->>>>>>> MERGE-SOURCE
2202 ac_status=$?
2203 grep -v '^ *+' conftest.er1 >conftest.err
2204 rm -f conftest.er1
2205 cat conftest.err >&5
2206-<<<<<<< TREE
2207- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2208- (exit $ac_status); } && {
2209- test -z "$ac_c_werror_flag" ||
2210- test ! -s conftest.err
2211- } && test -s conftest.$ac_objext; then
2212-=======
2213 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2214 (exit $ac_status); } && {
2215 test -z "$ac_c_werror_flag" ||
2216 test ! -s conftest.err
2217 } && test -s conftest.$ac_objext; then
2218->>>>>>> MERGE-SOURCE
2219 ac_compiler_gnu=yes
2220 else
2221- $as_echo "$as_me: failed program was:" >&5
2222+ echo "$as_me: failed program was:" >&5
2223 sed 's/^/| /' conftest.$ac_ext >&5
2224
2225 ac_compiler_gnu=no
2226@@ -3536,168 +2340,14 @@
2227 ac_cv_c_compiler_gnu=$ac_compiler_gnu
2228
2229 fi
2230-<<<<<<< TREE
2231-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2232-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
2233-if test $ac_compiler_gnu = yes; then
2234- GCC=yes
2235-else
2236- GCC=
2237-fi
2238-=======
2239 { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2240 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
2241 GCC=`test $ac_compiler_gnu = yes && echo yes`
2242->>>>>>> MERGE-SOURCE
2243 ac_test_CFLAGS=${CFLAGS+set}
2244 ac_save_CFLAGS=$CFLAGS
2245-<<<<<<< TREE
2246-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2247-$as_echo_n "checking whether $CC accepts -g... " >&6; }
2248-=======
2249 { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2250 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
2251->>>>>>> MERGE-SOURCE
2252 if test "${ac_cv_prog_cc_g+set}" = set; then
2253-<<<<<<< TREE
2254- $as_echo_n "(cached) " >&6
2255-else
2256- ac_save_c_werror_flag=$ac_c_werror_flag
2257- ac_c_werror_flag=yes
2258- ac_cv_prog_cc_g=no
2259- CFLAGS="-g"
2260- cat >conftest.$ac_ext <<_ACEOF
2261-/* confdefs.h. */
2262-_ACEOF
2263-cat confdefs.h >>conftest.$ac_ext
2264-cat >>conftest.$ac_ext <<_ACEOF
2265-/* end confdefs.h. */
2266-
2267-int
2268-main ()
2269-{
2270-
2271- ;
2272- return 0;
2273-}
2274-_ACEOF
2275-rm -f conftest.$ac_objext
2276-if { (ac_try="$ac_compile"
2277-case "(($ac_try" in
2278- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2279- *) ac_try_echo=$ac_try;;
2280-esac
2281-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2282-$as_echo "$ac_try_echo") >&5
2283- (eval "$ac_compile") 2>conftest.er1
2284- ac_status=$?
2285- grep -v '^ *+' conftest.er1 >conftest.err
2286- rm -f conftest.er1
2287- cat conftest.err >&5
2288- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2289- (exit $ac_status); } && {
2290- test -z "$ac_c_werror_flag" ||
2291- test ! -s conftest.err
2292- } && test -s conftest.$ac_objext; then
2293- ac_cv_prog_cc_g=yes
2294-else
2295- $as_echo "$as_me: failed program was:" >&5
2296-sed 's/^/| /' conftest.$ac_ext >&5
2297-
2298- CFLAGS=""
2299- cat >conftest.$ac_ext <<_ACEOF
2300-/* confdefs.h. */
2301-_ACEOF
2302-cat confdefs.h >>conftest.$ac_ext
2303-cat >>conftest.$ac_ext <<_ACEOF
2304-/* end confdefs.h. */
2305-
2306-int
2307-main ()
2308-{
2309-
2310- ;
2311- return 0;
2312-}
2313-_ACEOF
2314-rm -f conftest.$ac_objext
2315-if { (ac_try="$ac_compile"
2316-case "(($ac_try" in
2317- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2318- *) ac_try_echo=$ac_try;;
2319-esac
2320-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2321-$as_echo "$ac_try_echo") >&5
2322- (eval "$ac_compile") 2>conftest.er1
2323- ac_status=$?
2324- grep -v '^ *+' conftest.er1 >conftest.err
2325- rm -f conftest.er1
2326- cat conftest.err >&5
2327- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2328- (exit $ac_status); } && {
2329- test -z "$ac_c_werror_flag" ||
2330- test ! -s conftest.err
2331- } && test -s conftest.$ac_objext; then
2332- :
2333-else
2334- $as_echo "$as_me: failed program was:" >&5
2335-sed 's/^/| /' conftest.$ac_ext >&5
2336-
2337- ac_c_werror_flag=$ac_save_c_werror_flag
2338- CFLAGS="-g"
2339- cat >conftest.$ac_ext <<_ACEOF
2340-/* confdefs.h. */
2341-_ACEOF
2342-cat confdefs.h >>conftest.$ac_ext
2343-cat >>conftest.$ac_ext <<_ACEOF
2344-/* end confdefs.h. */
2345-
2346-int
2347-main ()
2348-{
2349-
2350- ;
2351- return 0;
2352-}
2353-_ACEOF
2354-rm -f conftest.$ac_objext
2355-if { (ac_try="$ac_compile"
2356-case "(($ac_try" in
2357- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2358- *) ac_try_echo=$ac_try;;
2359-esac
2360-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2361-$as_echo "$ac_try_echo") >&5
2362- (eval "$ac_compile") 2>conftest.er1
2363- ac_status=$?
2364- grep -v '^ *+' conftest.er1 >conftest.err
2365- rm -f conftest.er1
2366- cat conftest.err >&5
2367- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2368- (exit $ac_status); } && {
2369- test -z "$ac_c_werror_flag" ||
2370- test ! -s conftest.err
2371- } && test -s conftest.$ac_objext; then
2372- ac_cv_prog_cc_g=yes
2373-else
2374- $as_echo "$as_me: failed program was:" >&5
2375-sed 's/^/| /' conftest.$ac_ext >&5
2376-
2377-
2378-fi
2379-
2380-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2381-fi
2382-
2383-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2384-fi
2385-
2386-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2387- ac_c_werror_flag=$ac_save_c_werror_flag
2388-fi
2389-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2390-$as_echo "$ac_cv_prog_cc_g" >&6; }
2391-=======
2392 echo $ECHO_N "(cached) $ECHO_C" >&6
2393 else
2394 ac_save_c_werror_flag=$ac_c_werror_flag
2395@@ -3832,7 +2482,6 @@
2396 fi
2397 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2398 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
2399->>>>>>> MERGE-SOURCE
2400 if test "$ac_test_CFLAGS" = set; then
2401 CFLAGS=$ac_save_CFLAGS
2402 elif test $ac_cv_prog_cc_g = yes; then
2403@@ -3848,17 +2497,10 @@
2404 CFLAGS=
2405 fi
2406 fi
2407-<<<<<<< TREE
2408-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2409-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
2410-if test "${ac_cv_prog_cc_c89+set}" = set; then
2411- $as_echo_n "(cached) " >&6
2412-=======
2413 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2414 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
2415 if test "${ac_cv_prog_cc_c89+set}" = set; then
2416 echo $ECHO_N "(cached) $ECHO_C" >&6
2417->>>>>>> MERGE-SOURCE
2418 else
2419 ac_cv_prog_cc_c89=no
2420 ac_save_CC=$CC
2421@@ -3924,16 +2566,6 @@
2422 do
2423 CC="$ac_save_CC $ac_arg"
2424 rm -f conftest.$ac_objext
2425-<<<<<<< TREE
2426-if { (ac_try="$ac_compile"
2427-case "(($ac_try" in
2428- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2429- *) ac_try_echo=$ac_try;;
2430-esac
2431-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2432-$as_echo "$ac_try_echo") >&5
2433- (eval "$ac_compile") 2>conftest.er1
2434-=======
2435 if { (ac_try="$ac_compile"
2436 case "(($ac_try" in
2437 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2438@@ -3941,28 +2573,18 @@
2439 esac
2440 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2441 (eval "$ac_compile") 2>conftest.er1
2442->>>>>>> MERGE-SOURCE
2443 ac_status=$?
2444 grep -v '^ *+' conftest.er1 >conftest.err
2445 rm -f conftest.er1
2446 cat conftest.err >&5
2447-<<<<<<< TREE
2448- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2449- (exit $ac_status); } && {
2450- test -z "$ac_c_werror_flag" ||
2451- test ! -s conftest.err
2452- } && test -s conftest.$ac_objext; then
2453- ac_cv_prog_cc_c89=$ac_arg
2454-=======
2455 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2456 (exit $ac_status); } && {
2457 test -z "$ac_c_werror_flag" ||
2458 test ! -s conftest.err
2459 } && test -s conftest.$ac_objext; then
2460 ac_cv_prog_cc_c89=$ac_arg
2461->>>>>>> MERGE-SOURCE
2462 else
2463- $as_echo "$as_me: failed program was:" >&5
2464+ echo "$as_me: failed program was:" >&5
2465 sed 's/^/| /' conftest.$ac_ext >&5
2466
2467
2468@@ -3975,16 +2597,6 @@
2469 CC=$ac_save_CC
2470
2471 fi
2472-<<<<<<< TREE
2473-# AC_CACHE_VAL
2474-case "x$ac_cv_prog_cc_c89" in
2475- x)
2476- { $as_echo "$as_me:$LINENO: result: none needed" >&5
2477-$as_echo "none needed" >&6; } ;;
2478- xno)
2479- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
2480-$as_echo "unsupported" >&6; } ;;
2481-=======
2482 # AC_CACHE_VAL
2483 case "x$ac_cv_prog_cc_c89" in
2484 x)
2485@@ -3993,17 +2605,10 @@
2486 xno)
2487 { echo "$as_me:$LINENO: result: unsupported" >&5
2488 echo "${ECHO_T}unsupported" >&6; } ;;
2489->>>>>>> MERGE-SOURCE
2490 *)
2491-<<<<<<< TREE
2492- CC="$CC $ac_cv_prog_cc_c89"
2493- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2494-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
2495-=======
2496 CC="$CC $ac_cv_prog_cc_c89"
2497 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2498 echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
2499->>>>>>> MERGE-SOURCE
2500 esac
2501
2502
2503@@ -4030,13 +2635,8 @@
2504 fi
2505 done
2506 if test -z "$ac_aux_dir"; then
2507-<<<<<<< TREE
2508- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2509-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2510-=======
2511 { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
2512 echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
2513->>>>>>> MERGE-SOURCE
2514 { (exit 1); exit 1; }; }
2515 fi
2516
2517@@ -4062,17 +2662,11 @@
2518 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2519 # OS/2's system install, which has a completely different semantic
2520 # ./install, which can be erroneously created by make from ./install.sh.
2521-<<<<<<< TREE
2522-# Reject install programs that cannot install multiple files.
2523-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2524-$as_echo_n "checking for a BSD-compatible install... " >&6; }
2525-=======
2526 { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2527 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
2528->>>>>>> MERGE-SOURCE
2529 if test -z "$INSTALL"; then
2530 if test "${ac_cv_path_install+set}" = set; then
2531- $as_echo_n "(cached) " >&6
2532+ echo $ECHO_N "(cached) $ECHO_C" >&6
2533 else
2534 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2535 for as_dir in $PATH
2536@@ -4101,29 +2695,17 @@
2537 # program-specific install script used by HP pwplus--don't use.
2538 :
2539 else
2540- rm -rf conftest.one conftest.two conftest.dir
2541- echo one > conftest.one
2542- echo two > conftest.two
2543- mkdir conftest.dir
2544- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
2545- test -s conftest.one && test -s conftest.two &&
2546- test -s conftest.dir/conftest.one &&
2547- test -s conftest.dir/conftest.two
2548- then
2549- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2550- break 3
2551- fi
2552+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2553+ break 3
2554 fi
2555 fi
2556 done
2557 done
2558 ;;
2559 esac
2560-
2561 done
2562 IFS=$as_save_IFS
2563
2564-rm -rf conftest.one conftest.two conftest.dir
2565
2566 fi
2567 if test "${ac_cv_path_install+set}" = set; then
2568@@ -4136,13 +2718,8 @@
2569 INSTALL=$ac_install_sh
2570 fi
2571 fi
2572-<<<<<<< TREE
2573-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
2574-$as_echo "$INSTALL" >&6; }
2575-=======
2576 { echo "$as_me:$LINENO: result: $INSTALL" >&5
2577 echo "${ECHO_T}$INSTALL" >&6; }
2578->>>>>>> MERGE-SOURCE
2579
2580 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2581 # It thinks the first close brace ends the variable substitution.
2582@@ -4155,15 +2732,10 @@
2583 if test -n "$ac_tool_prefix"; then
2584 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2585 set dummy ${ac_tool_prefix}strip; ac_word=$2
2586-<<<<<<< TREE
2587-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2588-$as_echo_n "checking for $ac_word... " >&6; }
2589-=======
2590 { echo "$as_me:$LINENO: checking for $ac_word" >&5
2591 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2592->>>>>>> MERGE-SOURCE
2593 if test "${ac_cv_prog_STRIP+set}" = set; then
2594- $as_echo_n "(cached) " >&6
2595+ echo $ECHO_N "(cached) $ECHO_C" >&6
2596 else
2597 if test -n "$STRIP"; then
2598 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
2599@@ -4176,7 +2748,7 @@
2600 for ac_exec_ext in '' $ac_executable_extensions; do
2601 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2602 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2603- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2604+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2605 break 2
2606 fi
2607 done
2608@@ -4187,21 +2759,11 @@
2609 fi
2610 STRIP=$ac_cv_prog_STRIP
2611 if test -n "$STRIP"; then
2612-<<<<<<< TREE
2613- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
2614-$as_echo "$STRIP" >&6; }
2615-=======
2616 { echo "$as_me:$LINENO: result: $STRIP" >&5
2617 echo "${ECHO_T}$STRIP" >&6; }
2618->>>>>>> MERGE-SOURCE
2619 else
2620-<<<<<<< TREE
2621- { $as_echo "$as_me:$LINENO: result: no" >&5
2622-$as_echo "no" >&6; }
2623-=======
2624 { echo "$as_me:$LINENO: result: no" >&5
2625 echo "${ECHO_T}no" >&6; }
2626->>>>>>> MERGE-SOURCE
2627 fi
2628
2629
2630@@ -4210,15 +2772,10 @@
2631 ac_ct_STRIP=$STRIP
2632 # Extract the first word of "strip", so it can be a program name with args.
2633 set dummy strip; ac_word=$2
2634-<<<<<<< TREE
2635-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2636-$as_echo_n "checking for $ac_word... " >&6; }
2637-=======
2638 { echo "$as_me:$LINENO: checking for $ac_word" >&5
2639 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2640->>>>>>> MERGE-SOURCE
2641 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2642- $as_echo_n "(cached) " >&6
2643+ echo $ECHO_N "(cached) $ECHO_C" >&6
2644 else
2645 if test -n "$ac_ct_STRIP"; then
2646 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
2647@@ -4231,7 +2788,7 @@
2648 for ac_exec_ext in '' $ac_executable_extensions; do
2649 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2650 ac_cv_prog_ac_ct_STRIP="strip"
2651- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2652+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2653 break 2
2654 fi
2655 done
2656@@ -4242,36 +2799,13 @@
2657 fi
2658 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2659 if test -n "$ac_ct_STRIP"; then
2660-<<<<<<< TREE
2661- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2662-$as_echo "$ac_ct_STRIP" >&6; }
2663-=======
2664 { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2665 echo "${ECHO_T}$ac_ct_STRIP" >&6; }
2666->>>>>>> MERGE-SOURCE
2667 else
2668-<<<<<<< TREE
2669- { $as_echo "$as_me:$LINENO: result: no" >&5
2670-$as_echo "no" >&6; }
2671-=======
2672 { echo "$as_me:$LINENO: result: no" >&5
2673 echo "${ECHO_T}no" >&6; }
2674->>>>>>> MERGE-SOURCE
2675 fi
2676
2677-<<<<<<< TREE
2678- if test "x$ac_ct_STRIP" = x; then
2679- STRIP=""
2680- else
2681- case $cross_compiling:$ac_tool_warned in
2682-yes:)
2683-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2684-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2685-ac_tool_warned=yes ;;
2686-esac
2687- STRIP=$ac_ct_STRIP
2688- fi
2689-=======
2690 if test "x$ac_ct_STRIP" = x; then
2691 STRIP=""
2692 else
2693@@ -4287,7 +2821,6 @@
2694 esac
2695 STRIP=$ac_ct_STRIP
2696 fi
2697->>>>>>> MERGE-SOURCE
2698 else
2699 STRIP="$ac_cv_prog_STRIP"
2700 fi
2701@@ -4333,20 +2866,15 @@
2702 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2703 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2704 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2705-<<<<<<< TREE
2706-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
2707-$as_echo_n "checking how to run the C preprocessor... " >&6; }
2708-=======
2709 { echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
2710 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
2711->>>>>>> MERGE-SOURCE
2712 # On Suns, sometimes $CPP names a directory.
2713 if test -n "$CPP" && test -d "$CPP"; then
2714 CPP=
2715 fi
2716 if test -z "$CPP"; then
2717 if test "${ac_cv_prog_CPP+set}" = set; then
2718- $as_echo_n "(cached) " >&6
2719+ echo $ECHO_N "(cached) $ECHO_C" >&6
2720 else
2721 # Double quotes because CPP needs to be expanded
2722 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
2723@@ -4373,16 +2901,6 @@
2724 #endif
2725 Syntax error
2726 _ACEOF
2727-<<<<<<< TREE
2728-if { (ac_try="$ac_cpp conftest.$ac_ext"
2729-case "(($ac_try" in
2730- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2731- *) ac_try_echo=$ac_try;;
2732-esac
2733-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2734-$as_echo "$ac_try_echo") >&5
2735- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2736-=======
2737 if { (ac_try="$ac_cpp conftest.$ac_ext"
2738 case "(($ac_try" in
2739 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2740@@ -4390,27 +2908,18 @@
2741 esac
2742 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2743 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2744->>>>>>> MERGE-SOURCE
2745 ac_status=$?
2746 grep -v '^ *+' conftest.er1 >conftest.err
2747 rm -f conftest.er1
2748 cat conftest.err >&5
2749-<<<<<<< TREE
2750- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2751- (exit $ac_status); } >/dev/null && {
2752- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2753- test ! -s conftest.err
2754- }; then
2755-=======
2756 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2757 (exit $ac_status); } >/dev/null && {
2758 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2759 test ! -s conftest.err
2760 }; then
2761->>>>>>> MERGE-SOURCE
2762 :
2763 else
2764- $as_echo "$as_me: failed program was:" >&5
2765+ echo "$as_me: failed program was:" >&5
2766 sed 's/^/| /' conftest.$ac_ext >&5
2767
2768 # Broken: fails on valid input.
2769@@ -4429,16 +2938,6 @@
2770 /* end confdefs.h. */
2771 #include <ac_nonexistent.h>
2772 _ACEOF
2773-<<<<<<< TREE
2774-if { (ac_try="$ac_cpp conftest.$ac_ext"
2775-case "(($ac_try" in
2776- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2777- *) ac_try_echo=$ac_try;;
2778-esac
2779-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2780-$as_echo "$ac_try_echo") >&5
2781- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2782-=======
2783 if { (ac_try="$ac_cpp conftest.$ac_ext"
2784 case "(($ac_try" in
2785 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2786@@ -4446,28 +2945,19 @@
2787 esac
2788 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2789 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2790->>>>>>> MERGE-SOURCE
2791 ac_status=$?
2792 grep -v '^ *+' conftest.er1 >conftest.err
2793 rm -f conftest.er1
2794 cat conftest.err >&5
2795-<<<<<<< TREE
2796- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2797- (exit $ac_status); } >/dev/null && {
2798- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2799- test ! -s conftest.err
2800- }; then
2801-=======
2802 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2803 (exit $ac_status); } >/dev/null && {
2804 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2805 test ! -s conftest.err
2806 }; then
2807->>>>>>> MERGE-SOURCE
2808 # Broken: success on invalid input.
2809 continue
2810 else
2811- $as_echo "$as_me: failed program was:" >&5
2812+ echo "$as_me: failed program was:" >&5
2813 sed 's/^/| /' conftest.$ac_ext >&5
2814
2815 # Passes both tests.
2816@@ -4492,13 +2982,8 @@
2817 else
2818 ac_cv_prog_CPP=$CPP
2819 fi
2820-<<<<<<< TREE
2821-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
2822-$as_echo "$CPP" >&6; }
2823-=======
2824 { echo "$as_me:$LINENO: result: $CPP" >&5
2825 echo "${ECHO_T}$CPP" >&6; }
2826->>>>>>> MERGE-SOURCE
2827 ac_preproc_ok=false
2828 for ac_c_preproc_warn_flag in '' yes
2829 do
2830@@ -4521,16 +3006,6 @@
2831 #endif
2832 Syntax error
2833 _ACEOF
2834-<<<<<<< TREE
2835-if { (ac_try="$ac_cpp conftest.$ac_ext"
2836-case "(($ac_try" in
2837- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2838- *) ac_try_echo=$ac_try;;
2839-esac
2840-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2841-$as_echo "$ac_try_echo") >&5
2842- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2843-=======
2844 if { (ac_try="$ac_cpp conftest.$ac_ext"
2845 case "(($ac_try" in
2846 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2847@@ -4538,27 +3013,18 @@
2848 esac
2849 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2850 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2851->>>>>>> MERGE-SOURCE
2852 ac_status=$?
2853 grep -v '^ *+' conftest.er1 >conftest.err
2854 rm -f conftest.er1
2855 cat conftest.err >&5
2856-<<<<<<< TREE
2857- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2858- (exit $ac_status); } >/dev/null && {
2859- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2860- test ! -s conftest.err
2861- }; then
2862-=======
2863 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2864 (exit $ac_status); } >/dev/null && {
2865 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2866 test ! -s conftest.err
2867 }; then
2868->>>>>>> MERGE-SOURCE
2869 :
2870 else
2871- $as_echo "$as_me: failed program was:" >&5
2872+ echo "$as_me: failed program was:" >&5
2873 sed 's/^/| /' conftest.$ac_ext >&5
2874
2875 # Broken: fails on valid input.
2876@@ -4577,16 +3043,6 @@
2877 /* end confdefs.h. */
2878 #include <ac_nonexistent.h>
2879 _ACEOF
2880-<<<<<<< TREE
2881-if { (ac_try="$ac_cpp conftest.$ac_ext"
2882-case "(($ac_try" in
2883- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2884- *) ac_try_echo=$ac_try;;
2885-esac
2886-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2887-$as_echo "$ac_try_echo") >&5
2888- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2889-=======
2890 if { (ac_try="$ac_cpp conftest.$ac_ext"
2891 case "(($ac_try" in
2892 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2893@@ -4594,28 +3050,19 @@
2894 esac
2895 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2896 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2897->>>>>>> MERGE-SOURCE
2898 ac_status=$?
2899 grep -v '^ *+' conftest.er1 >conftest.err
2900 rm -f conftest.er1
2901 cat conftest.err >&5
2902-<<<<<<< TREE
2903- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2904- (exit $ac_status); } >/dev/null && {
2905- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2906- test ! -s conftest.err
2907- }; then
2908-=======
2909 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2910 (exit $ac_status); } >/dev/null && {
2911 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2912 test ! -s conftest.err
2913 }; then
2914->>>>>>> MERGE-SOURCE
2915 # Broken: success on invalid input.
2916 continue
2917 else
2918- $as_echo "$as_me: failed program was:" >&5
2919+ echo "$as_me: failed program was:" >&5
2920 sed 's/^/| /' conftest.$ac_ext >&5
2921
2922 # Passes both tests.
2923@@ -4631,13 +3078,11 @@
2924 if $ac_preproc_ok; then
2925 :
2926 else
2927- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2928-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2929-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
2930+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
2931 See \`config.log' for more details." >&5
2932-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
2933+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
2934 See \`config.log' for more details." >&2;}
2935- { (exit 1); exit 1; }; }; }
2936+ { (exit 1); exit 1; }; }
2937 fi
2938
2939 ac_ext=c
2940@@ -4647,144 +3092,6 @@
2941 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2942
2943
2944-<<<<<<< TREE
2945-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
2946-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
2947-if test "${ac_cv_path_GREP+set}" = set; then
2948- $as_echo_n "(cached) " >&6
2949-else
2950- if test -z "$GREP"; then
2951- ac_path_GREP_found=false
2952- # Loop through the user's path and test for each of PROGNAME-LIST
2953- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2954-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
2955-do
2956- IFS=$as_save_IFS
2957- test -z "$as_dir" && as_dir=.
2958- for ac_prog in grep ggrep; do
2959- for ac_exec_ext in '' $ac_executable_extensions; do
2960- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
2961- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
2962-# Check for GNU ac_path_GREP and select it if it is found.
2963- # Check for GNU $ac_path_GREP
2964-case `"$ac_path_GREP" --version 2>&1` in
2965-*GNU*)
2966- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
2967-*)
2968- ac_count=0
2969- $as_echo_n 0123456789 >"conftest.in"
2970- while :
2971- do
2972- cat "conftest.in" "conftest.in" >"conftest.tmp"
2973- mv "conftest.tmp" "conftest.in"
2974- cp "conftest.in" "conftest.nl"
2975- $as_echo 'GREP' >> "conftest.nl"
2976- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
2977- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
2978- ac_count=`expr $ac_count + 1`
2979- if test $ac_count -gt ${ac_path_GREP_max-0}; then
2980- # Best one so far, save it but keep looking for a better one
2981- ac_cv_path_GREP="$ac_path_GREP"
2982- ac_path_GREP_max=$ac_count
2983- fi
2984- # 10*(2^10) chars as input seems more than enough
2985- test $ac_count -gt 10 && break
2986- done
2987- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
2988-esac
2989-
2990- $ac_path_GREP_found && break 3
2991- done
2992- done
2993-done
2994-IFS=$as_save_IFS
2995- if test -z "$ac_cv_path_GREP"; then
2996- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
2997-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
2998- { (exit 1); exit 1; }; }
2999- fi
3000-else
3001- ac_cv_path_GREP=$GREP
3002-fi
3003-
3004-fi
3005-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
3006-$as_echo "$ac_cv_path_GREP" >&6; }
3007- GREP="$ac_cv_path_GREP"
3008-
3009-
3010-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
3011-$as_echo_n "checking for egrep... " >&6; }
3012-if test "${ac_cv_path_EGREP+set}" = set; then
3013- $as_echo_n "(cached) " >&6
3014-else
3015- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
3016- then ac_cv_path_EGREP="$GREP -E"
3017- else
3018- if test -z "$EGREP"; then
3019- ac_path_EGREP_found=false
3020- # Loop through the user's path and test for each of PROGNAME-LIST
3021- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3022-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
3023-do
3024- IFS=$as_save_IFS
3025- test -z "$as_dir" && as_dir=.
3026- for ac_prog in egrep; do
3027- for ac_exec_ext in '' $ac_executable_extensions; do
3028- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
3029- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
3030-# Check for GNU ac_path_EGREP and select it if it is found.
3031- # Check for GNU $ac_path_EGREP
3032-case `"$ac_path_EGREP" --version 2>&1` in
3033-*GNU*)
3034- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
3035-*)
3036- ac_count=0
3037- $as_echo_n 0123456789 >"conftest.in"
3038- while :
3039- do
3040- cat "conftest.in" "conftest.in" >"conftest.tmp"
3041- mv "conftest.tmp" "conftest.in"
3042- cp "conftest.in" "conftest.nl"
3043- $as_echo 'EGREP' >> "conftest.nl"
3044- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
3045- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
3046- ac_count=`expr $ac_count + 1`
3047- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
3048- # Best one so far, save it but keep looking for a better one
3049- ac_cv_path_EGREP="$ac_path_EGREP"
3050- ac_path_EGREP_max=$ac_count
3051- fi
3052- # 10*(2^10) chars as input seems more than enough
3053- test $ac_count -gt 10 && break
3054- done
3055- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
3056-esac
3057-
3058- $ac_path_EGREP_found && break 3
3059- done
3060- done
3061-done
3062-IFS=$as_save_IFS
3063- if test -z "$ac_cv_path_EGREP"; then
3064- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
3065-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
3066- { (exit 1); exit 1; }; }
3067- fi
3068-else
3069- ac_cv_path_EGREP=$EGREP
3070-fi
3071-
3072- fi
3073-fi
3074-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
3075-$as_echo "$ac_cv_path_EGREP" >&6; }
3076- EGREP="$ac_cv_path_EGREP"
3077-
3078-
3079-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
3080-$as_echo_n "checking for ANSI C header files... " >&6; }
3081-=======
3082 { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
3083 echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
3084 if test "${ac_cv_path_GREP+set}" = set; then
3085@@ -4949,9 +3256,8 @@
3086
3087 { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
3088 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
3089->>>>>>> MERGE-SOURCE
3090 if test "${ac_cv_header_stdc+set}" = set; then
3091- $as_echo_n "(cached) " >&6
3092+ echo $ECHO_N "(cached) $ECHO_C" >&6
3093 else
3094 cat >conftest.$ac_ext <<_ACEOF
3095 /* confdefs.h. */
3096@@ -4973,16 +3279,6 @@
3097 }
3098 _ACEOF
3099 rm -f conftest.$ac_objext
3100-<<<<<<< TREE
3101-if { (ac_try="$ac_compile"
3102-case "(($ac_try" in
3103- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3104- *) ac_try_echo=$ac_try;;
3105-esac
3106-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3107-$as_echo "$ac_try_echo") >&5
3108- (eval "$ac_compile") 2>conftest.er1
3109-=======
3110 if { (ac_try="$ac_compile"
3111 case "(($ac_try" in
3112 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3113@@ -4990,27 +3286,18 @@
3114 esac
3115 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3116 (eval "$ac_compile") 2>conftest.er1
3117->>>>>>> MERGE-SOURCE
3118 ac_status=$?
3119 grep -v '^ *+' conftest.er1 >conftest.err
3120 rm -f conftest.er1
3121 cat conftest.err >&5
3122-<<<<<<< TREE
3123- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3124- (exit $ac_status); } && {
3125- test -z "$ac_c_werror_flag" ||
3126- test ! -s conftest.err
3127- } && test -s conftest.$ac_objext; then
3128-=======
3129 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3130 (exit $ac_status); } && {
3131 test -z "$ac_c_werror_flag" ||
3132 test ! -s conftest.err
3133 } && test -s conftest.$ac_objext; then
3134->>>>>>> MERGE-SOURCE
3135 ac_cv_header_stdc=yes
3136 else
3137- $as_echo "$as_me: failed program was:" >&5
3138+ echo "$as_me: failed program was:" >&5
3139 sed 's/^/| /' conftest.$ac_ext >&5
3140
3141 ac_cv_header_stdc=no
3142@@ -5097,16 +3384,6 @@
3143 }
3144 _ACEOF
3145 rm -f conftest$ac_exeext
3146-<<<<<<< TREE
3147-if { (ac_try="$ac_link"
3148-case "(($ac_try" in
3149- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3150- *) ac_try_echo=$ac_try;;
3151-esac
3152-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3153-$as_echo "$ac_try_echo") >&5
3154- (eval "$ac_link") 2>&5
3155-=======
3156 if { (ac_try="$ac_link"
3157 case "(($ac_try" in
3158 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3159@@ -5114,49 +3391,27 @@
3160 esac
3161 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3162 (eval "$ac_link") 2>&5
3163->>>>>>> MERGE-SOURCE
3164 ac_status=$?
3165- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3166+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3167 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
3168-<<<<<<< TREE
3169- { (case "(($ac_try" in
3170- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3171- *) ac_try_echo=$ac_try;;
3172-esac
3173-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3174-$as_echo "$ac_try_echo") >&5
3175- (eval "$ac_try") 2>&5
3176-=======
3177 { (case "(($ac_try" in
3178 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3179 *) ac_try_echo=$ac_try;;
3180 esac
3181 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3182 (eval "$ac_try") 2>&5
3183->>>>>>> MERGE-SOURCE
3184 ac_status=$?
3185- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3186+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
3187 (exit $ac_status); }; }; then
3188 :
3189 else
3190- $as_echo "$as_me: program exited with status $ac_status" >&5
3191-$as_echo "$as_me: failed program was:" >&5
3192+ echo "$as_me: program exited with status $ac_status" >&5
3193+echo "$as_me: failed program was:" >&5
3194 sed 's/^/| /' conftest.$ac_ext >&5
3195
3196 ( exit $ac_status )
3197 ac_cv_header_stdc=no
3198 fi
3199-<<<<<<< TREE
3200-rm -rf conftest.dSYM
3201-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3202-fi
3203-
3204-
3205-fi
3206-fi
3207-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
3208-$as_echo "$ac_cv_header_stdc" >&6; }
3209-=======
3210 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3211 fi
3212
3213@@ -5165,7 +3420,6 @@
3214 fi
3215 { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
3216 echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
3217->>>>>>> MERGE-SOURCE
3218 if test $ac_cv_header_stdc = yes; then
3219
3220 cat >>confdefs.h <<\_ACEOF
3221@@ -5174,15 +3428,10 @@
3222
3223 fi
3224
3225-<<<<<<< TREE
3226-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
3227-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
3228-=======
3229 { echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
3230 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
3231->>>>>>> MERGE-SOURCE
3232 if test "${ac_cv_header_sys_wait_h+set}" = set; then
3233- $as_echo_n "(cached) " >&6
3234+ echo $ECHO_N "(cached) $ECHO_C" >&6
3235 else
3236 cat >conftest.$ac_ext <<_ACEOF
3237 /* confdefs.h. */
3238@@ -5210,16 +3459,6 @@
3239 }
3240 _ACEOF
3241 rm -f conftest.$ac_objext
3242-<<<<<<< TREE
3243-if { (ac_try="$ac_compile"
3244-case "(($ac_try" in
3245- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3246- *) ac_try_echo=$ac_try;;
3247-esac
3248-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3249-$as_echo "$ac_try_echo") >&5
3250- (eval "$ac_compile") 2>conftest.er1
3251-=======
3252 if { (ac_try="$ac_compile"
3253 case "(($ac_try" in
3254 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3255@@ -5227,38 +3466,20 @@
3256 esac
3257 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3258 (eval "$ac_compile") 2>conftest.er1
3259->>>>>>> MERGE-SOURCE
3260 ac_status=$?
3261 grep -v '^ *+' conftest.er1 >conftest.err
3262 rm -f conftest.er1
3263 cat conftest.err >&5
3264-<<<<<<< TREE
3265- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3266- (exit $ac_status); } && {
3267- test -z "$ac_c_werror_flag" ||
3268- test ! -s conftest.err
3269- } && test -s conftest.$ac_objext; then
3270-=======
3271 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3272 (exit $ac_status); } && {
3273 test -z "$ac_c_werror_flag" ||
3274 test ! -s conftest.err
3275 } && test -s conftest.$ac_objext; then
3276->>>>>>> MERGE-SOURCE
3277 ac_cv_header_sys_wait_h=yes
3278 else
3279- $as_echo "$as_me: failed program was:" >&5
3280+ echo "$as_me: failed program was:" >&5
3281 sed 's/^/| /' conftest.$ac_ext >&5
3282
3283-<<<<<<< TREE
3284- ac_cv_header_sys_wait_h=no
3285-fi
3286-
3287-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3288-fi
3289-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
3290-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
3291-=======
3292 ac_cv_header_sys_wait_h=no
3293 fi
3294
3295@@ -5266,7 +3487,6 @@
3296 fi
3297 { echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
3298 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
3299->>>>>>> MERGE-SOURCE
3300 if test $ac_cv_header_sys_wait_h = yes; then
3301
3302 cat >>confdefs.h <<\_ACEOF
3303@@ -5288,19 +3508,11 @@
3304 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
3305 inttypes.h stdint.h unistd.h
3306 do
3307-<<<<<<< TREE
3308-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3309-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3310-$as_echo_n "checking for $ac_header... " >&6; }
3311-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3312- $as_echo_n "(cached) " >&6
3313-=======
3314 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3315 { echo "$as_me:$LINENO: checking for $ac_header" >&5
3316 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3317 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3318 echo $ECHO_N "(cached) $ECHO_C" >&6
3319->>>>>>> MERGE-SOURCE
3320 else
3321 cat >conftest.$ac_ext <<_ACEOF
3322 /* confdefs.h. */
3323@@ -5313,16 +3525,6 @@
3324 #include <$ac_header>
3325 _ACEOF
3326 rm -f conftest.$ac_objext
3327-<<<<<<< TREE
3328-if { (ac_try="$ac_compile"
3329-case "(($ac_try" in
3330- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3331- *) ac_try_echo=$ac_try;;
3332-esac
3333-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3334-$as_echo "$ac_try_echo") >&5
3335- (eval "$ac_compile") 2>conftest.er1
3336-=======
3337 if { (ac_try="$ac_compile"
3338 case "(($ac_try" in
3339 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3340@@ -5330,43 +3532,20 @@
3341 esac
3342 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3343 (eval "$ac_compile") 2>conftest.er1
3344->>>>>>> MERGE-SOURCE
3345 ac_status=$?
3346 grep -v '^ *+' conftest.er1 >conftest.err
3347 rm -f conftest.er1
3348 cat conftest.err >&5
3349-<<<<<<< TREE
3350- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3351- (exit $ac_status); } && {
3352- test -z "$ac_c_werror_flag" ||
3353- test ! -s conftest.err
3354- } && test -s conftest.$ac_objext; then
3355-=======
3356 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3357 (exit $ac_status); } && {
3358 test -z "$ac_c_werror_flag" ||
3359 test ! -s conftest.err
3360 } && test -s conftest.$ac_objext; then
3361->>>>>>> MERGE-SOURCE
3362 eval "$as_ac_Header=yes"
3363 else
3364- $as_echo "$as_me: failed program was:" >&5
3365+ echo "$as_me: failed program was:" >&5
3366 sed 's/^/| /' conftest.$ac_ext >&5
3367
3368-<<<<<<< TREE
3369- eval "$as_ac_Header=no"
3370-fi
3371-
3372-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3373-fi
3374-ac_res=`eval 'as_val=${'$as_ac_Header'}
3375- $as_echo "$as_val"'`
3376- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3377-$as_echo "$ac_res" >&6; }
3378-as_val=`eval 'as_val=${'$as_ac_Header'}
3379- $as_echo "$as_val"'`
3380- if test "x$as_val" = x""yes; then
3381-=======
3382 eval "$as_ac_Header=no"
3383 fi
3384
3385@@ -5376,9 +3555,8 @@
3386 { echo "$as_me:$LINENO: result: $ac_res" >&5
3387 echo "${ECHO_T}$ac_res" >&6; }
3388 if test `eval echo '${'$as_ac_Header'}'` = yes; then
3389->>>>>>> MERGE-SOURCE
3390 cat >>confdefs.h <<_ACEOF
3391-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3392+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3393 _ACEOF
3394
3395 fi
3396@@ -5393,41 +3571,20 @@
3397
3398 for ac_header in fcntl.h syslog.h unistd.h sys/ioctl.h sys/time.h
3399 do
3400-<<<<<<< TREE
3401-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3402-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3403- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3404-$as_echo_n "checking for $ac_header... " >&6; }
3405-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3406- $as_echo_n "(cached) " >&6
3407-=======
3408 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3409 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3410 { echo "$as_me:$LINENO: checking for $ac_header" >&5
3411 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3412 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3413 echo $ECHO_N "(cached) $ECHO_C" >&6
3414->>>>>>> MERGE-SOURCE
3415 fi
3416-<<<<<<< TREE
3417-ac_res=`eval 'as_val=${'$as_ac_Header'}
3418- $as_echo "$as_val"'`
3419- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3420-$as_echo "$ac_res" >&6; }
3421-=======
3422 ac_res=`eval echo '${'$as_ac_Header'}'`
3423 { echo "$as_me:$LINENO: result: $ac_res" >&5
3424 echo "${ECHO_T}$ac_res" >&6; }
3425->>>>>>> MERGE-SOURCE
3426 else
3427 # Is the header compilable?
3428-<<<<<<< TREE
3429-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
3430-$as_echo_n "checking $ac_header usability... " >&6; }
3431-=======
3432 { echo "$as_me:$LINENO: checking $ac_header usability" >&5
3433 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
3434->>>>>>> MERGE-SOURCE
3435 cat >conftest.$ac_ext <<_ACEOF
3436 /* confdefs.h. */
3437 _ACEOF
3438@@ -5438,16 +3595,6 @@
3439 #include <$ac_header>
3440 _ACEOF
3441 rm -f conftest.$ac_objext
3442-<<<<<<< TREE
3443-if { (ac_try="$ac_compile"
3444-case "(($ac_try" in
3445- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3446- *) ac_try_echo=$ac_try;;
3447-esac
3448-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3449-$as_echo "$ac_try_echo") >&5
3450- (eval "$ac_compile") 2>conftest.er1
3451-=======
3452 if { (ac_try="$ac_compile"
3453 case "(($ac_try" in
3454 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3455@@ -5455,51 +3602,30 @@
3456 esac
3457 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3458 (eval "$ac_compile") 2>conftest.er1
3459->>>>>>> MERGE-SOURCE
3460 ac_status=$?
3461 grep -v '^ *+' conftest.er1 >conftest.err
3462 rm -f conftest.er1
3463 cat conftest.err >&5
3464-<<<<<<< TREE
3465- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3466- (exit $ac_status); } && {
3467- test -z "$ac_c_werror_flag" ||
3468- test ! -s conftest.err
3469- } && test -s conftest.$ac_objext; then
3470-=======
3471 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3472 (exit $ac_status); } && {
3473 test -z "$ac_c_werror_flag" ||
3474 test ! -s conftest.err
3475 } && test -s conftest.$ac_objext; then
3476->>>>>>> MERGE-SOURCE
3477 ac_header_compiler=yes
3478 else
3479- $as_echo "$as_me: failed program was:" >&5
3480+ echo "$as_me: failed program was:" >&5
3481 sed 's/^/| /' conftest.$ac_ext >&5
3482
3483 ac_header_compiler=no
3484 fi
3485-<<<<<<< TREE
3486-
3487-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3488-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3489-$as_echo "$ac_header_compiler" >&6; }
3490-=======
3491
3492 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3493 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3494 echo "${ECHO_T}$ac_header_compiler" >&6; }
3495->>>>>>> MERGE-SOURCE
3496
3497 # Is the header present?
3498-<<<<<<< TREE
3499-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
3500-$as_echo_n "checking $ac_header presence... " >&6; }
3501-=======
3502 { echo "$as_me:$LINENO: checking $ac_header presence" >&5
3503 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
3504->>>>>>> MERGE-SOURCE
3505 cat >conftest.$ac_ext <<_ACEOF
3506 /* confdefs.h. */
3507 _ACEOF
3508@@ -5508,16 +3634,6 @@
3509 /* end confdefs.h. */
3510 #include <$ac_header>
3511 _ACEOF
3512-<<<<<<< TREE
3513-if { (ac_try="$ac_cpp conftest.$ac_ext"
3514-case "(($ac_try" in
3515- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3516- *) ac_try_echo=$ac_try;;
3517-esac
3518-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3519-$as_echo "$ac_try_echo") >&5
3520- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3521-=======
3522 if { (ac_try="$ac_cpp conftest.$ac_ext"
3523 case "(($ac_try" in
3524 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3525@@ -5525,66 +3641,37 @@
3526 esac
3527 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3528 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3529->>>>>>> MERGE-SOURCE
3530 ac_status=$?
3531 grep -v '^ *+' conftest.er1 >conftest.err
3532 rm -f conftest.er1
3533 cat conftest.err >&5
3534-<<<<<<< TREE
3535- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3536- (exit $ac_status); } >/dev/null && {
3537- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3538- test ! -s conftest.err
3539- }; then
3540-=======
3541 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3542 (exit $ac_status); } >/dev/null && {
3543 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3544 test ! -s conftest.err
3545 }; then
3546->>>>>>> MERGE-SOURCE
3547 ac_header_preproc=yes
3548 else
3549- $as_echo "$as_me: failed program was:" >&5
3550+ echo "$as_me: failed program was:" >&5
3551 sed 's/^/| /' conftest.$ac_ext >&5
3552
3553 ac_header_preproc=no
3554 fi
3555
3556 rm -f conftest.err conftest.$ac_ext
3557-<<<<<<< TREE
3558-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3559-$as_echo "$ac_header_preproc" >&6; }
3560-=======
3561 { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3562 echo "${ECHO_T}$ac_header_preproc" >&6; }
3563->>>>>>> MERGE-SOURCE
3564
3565 # So? What about this header?
3566 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
3567 yes:no: )
3568- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3569-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3570- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3571-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3572+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3573+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3574+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3575+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3576 ac_header_preproc=yes
3577 ;;
3578 no:yes:* )
3579-<<<<<<< TREE
3580- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3581-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3582- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3583-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3584- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3585-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3586- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3587-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3588- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3589-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3590- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3591-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3592-
3593-=======
3594 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3595 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3596 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3597@@ -5598,40 +3685,23 @@
3598 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3599 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3600
3601->>>>>>> MERGE-SOURCE
3602 ;;
3603 esac
3604-<<<<<<< TREE
3605-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3606-$as_echo_n "checking for $ac_header... " >&6; }
3607-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3608- $as_echo_n "(cached) " >&6
3609-=======
3610 { echo "$as_me:$LINENO: checking for $ac_header" >&5
3611 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3612 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3613 echo $ECHO_N "(cached) $ECHO_C" >&6
3614->>>>>>> MERGE-SOURCE
3615 else
3616 eval "$as_ac_Header=\$ac_header_preproc"
3617 fi
3618-<<<<<<< TREE
3619-ac_res=`eval 'as_val=${'$as_ac_Header'}
3620- $as_echo "$as_val"'`
3621- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3622-$as_echo "$ac_res" >&6; }
3623-=======
3624 ac_res=`eval echo '${'$as_ac_Header'}'`
3625 { echo "$as_me:$LINENO: result: $ac_res" >&5
3626 echo "${ECHO_T}$ac_res" >&6; }
3627->>>>>>> MERGE-SOURCE
3628
3629 fi
3630-as_val=`eval 'as_val=${'$as_ac_Header'}
3631- $as_echo "$as_val"'`
3632- if test "x$as_val" = x""yes; then
3633+if test `eval echo '${'$as_ac_Header'}'` = yes; then
3634 cat >>confdefs.h <<_ACEOF
3635-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3636+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3637 _ACEOF
3638
3639 fi
3640@@ -5643,41 +3713,20 @@
3641
3642 for ac_header in openssl/ssl.h openssl/md5.h openssl/err.h
3643 do
3644-<<<<<<< TREE
3645-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
3646-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3647- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3648-$as_echo_n "checking for $ac_header... " >&6; }
3649-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3650- $as_echo_n "(cached) " >&6
3651-=======
3652 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
3653 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3654 { echo "$as_me:$LINENO: checking for $ac_header" >&5
3655 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3656 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3657 echo $ECHO_N "(cached) $ECHO_C" >&6
3658->>>>>>> MERGE-SOURCE
3659 fi
3660-<<<<<<< TREE
3661-ac_res=`eval 'as_val=${'$as_ac_Header'}
3662- $as_echo "$as_val"'`
3663- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3664-$as_echo "$ac_res" >&6; }
3665-=======
3666 ac_res=`eval echo '${'$as_ac_Header'}'`
3667 { echo "$as_me:$LINENO: result: $ac_res" >&5
3668 echo "${ECHO_T}$ac_res" >&6; }
3669->>>>>>> MERGE-SOURCE
3670 else
3671 # Is the header compilable?
3672-<<<<<<< TREE
3673-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
3674-$as_echo_n "checking $ac_header usability... " >&6; }
3675-=======
3676 { echo "$as_me:$LINENO: checking $ac_header usability" >&5
3677 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
3678->>>>>>> MERGE-SOURCE
3679 cat >conftest.$ac_ext <<_ACEOF
3680 /* confdefs.h. */
3681 _ACEOF
3682@@ -5688,16 +3737,6 @@
3683 #include <$ac_header>
3684 _ACEOF
3685 rm -f conftest.$ac_objext
3686-<<<<<<< TREE
3687-if { (ac_try="$ac_compile"
3688-case "(($ac_try" in
3689- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3690- *) ac_try_echo=$ac_try;;
3691-esac
3692-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3693-$as_echo "$ac_try_echo") >&5
3694- (eval "$ac_compile") 2>conftest.er1
3695-=======
3696 if { (ac_try="$ac_compile"
3697 case "(($ac_try" in
3698 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3699@@ -5705,51 +3744,30 @@
3700 esac
3701 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3702 (eval "$ac_compile") 2>conftest.er1
3703->>>>>>> MERGE-SOURCE
3704 ac_status=$?
3705 grep -v '^ *+' conftest.er1 >conftest.err
3706 rm -f conftest.er1
3707 cat conftest.err >&5
3708-<<<<<<< TREE
3709- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3710- (exit $ac_status); } && {
3711- test -z "$ac_c_werror_flag" ||
3712- test ! -s conftest.err
3713- } && test -s conftest.$ac_objext; then
3714-=======
3715 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3716 (exit $ac_status); } && {
3717 test -z "$ac_c_werror_flag" ||
3718 test ! -s conftest.err
3719 } && test -s conftest.$ac_objext; then
3720->>>>>>> MERGE-SOURCE
3721 ac_header_compiler=yes
3722 else
3723- $as_echo "$as_me: failed program was:" >&5
3724+ echo "$as_me: failed program was:" >&5
3725 sed 's/^/| /' conftest.$ac_ext >&5
3726
3727 ac_header_compiler=no
3728 fi
3729-<<<<<<< TREE
3730-
3731-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3732-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3733-$as_echo "$ac_header_compiler" >&6; }
3734-=======
3735
3736 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3737 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3738 echo "${ECHO_T}$ac_header_compiler" >&6; }
3739->>>>>>> MERGE-SOURCE
3740
3741 # Is the header present?
3742-<<<<<<< TREE
3743-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
3744-$as_echo_n "checking $ac_header presence... " >&6; }
3745-=======
3746 { echo "$as_me:$LINENO: checking $ac_header presence" >&5
3747 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
3748->>>>>>> MERGE-SOURCE
3749 cat >conftest.$ac_ext <<_ACEOF
3750 /* confdefs.h. */
3751 _ACEOF
3752@@ -5758,16 +3776,6 @@
3753 /* end confdefs.h. */
3754 #include <$ac_header>
3755 _ACEOF
3756-<<<<<<< TREE
3757-if { (ac_try="$ac_cpp conftest.$ac_ext"
3758-case "(($ac_try" in
3759- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3760- *) ac_try_echo=$ac_try;;
3761-esac
3762-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3763-$as_echo "$ac_try_echo") >&5
3764- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3765-=======
3766 if { (ac_try="$ac_cpp conftest.$ac_ext"
3767 case "(($ac_try" in
3768 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3769@@ -5775,66 +3783,37 @@
3770 esac
3771 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3772 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
3773->>>>>>> MERGE-SOURCE
3774 ac_status=$?
3775 grep -v '^ *+' conftest.er1 >conftest.err
3776 rm -f conftest.er1
3777 cat conftest.err >&5
3778-<<<<<<< TREE
3779- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3780- (exit $ac_status); } >/dev/null && {
3781- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3782- test ! -s conftest.err
3783- }; then
3784-=======
3785 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3786 (exit $ac_status); } >/dev/null && {
3787 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
3788 test ! -s conftest.err
3789 }; then
3790->>>>>>> MERGE-SOURCE
3791 ac_header_preproc=yes
3792 else
3793- $as_echo "$as_me: failed program was:" >&5
3794+ echo "$as_me: failed program was:" >&5
3795 sed 's/^/| /' conftest.$ac_ext >&5
3796
3797 ac_header_preproc=no
3798 fi
3799
3800 rm -f conftest.err conftest.$ac_ext
3801-<<<<<<< TREE
3802-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3803-$as_echo "$ac_header_preproc" >&6; }
3804-=======
3805 { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
3806 echo "${ECHO_T}$ac_header_preproc" >&6; }
3807->>>>>>> MERGE-SOURCE
3808
3809 # So? What about this header?
3810 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
3811 yes:no: )
3812- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3813-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3814- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3815-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3816+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3817+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3818+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3819+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3820 ac_header_preproc=yes
3821 ;;
3822 no:yes:* )
3823-<<<<<<< TREE
3824- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3825-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3826- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3827-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3828- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3829-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3830- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3831-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3832- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3833-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3834- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3835-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3836-
3837-=======
3838 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3839 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3840 { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3841@@ -5848,47 +3827,30 @@
3842 { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3843 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3844
3845->>>>>>> MERGE-SOURCE
3846 ;;
3847 esac
3848-<<<<<<< TREE
3849-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
3850-$as_echo_n "checking for $ac_header... " >&6; }
3851-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3852- $as_echo_n "(cached) " >&6
3853-=======
3854 { echo "$as_me:$LINENO: checking for $ac_header" >&5
3855 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
3856 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
3857 echo $ECHO_N "(cached) $ECHO_C" >&6
3858->>>>>>> MERGE-SOURCE
3859 else
3860 eval "$as_ac_Header=\$ac_header_preproc"
3861 fi
3862-<<<<<<< TREE
3863-ac_res=`eval 'as_val=${'$as_ac_Header'}
3864- $as_echo "$as_val"'`
3865- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
3866-$as_echo "$ac_res" >&6; }
3867-=======
3868 ac_res=`eval echo '${'$as_ac_Header'}'`
3869 { echo "$as_me:$LINENO: result: $ac_res" >&5
3870 echo "${ECHO_T}$ac_res" >&6; }
3871->>>>>>> MERGE-SOURCE
3872
3873 fi
3874-as_val=`eval 'as_val=${'$as_ac_Header'}
3875- $as_echo "$as_val"'`
3876- if test "x$as_val" = x""yes; then
3877+if test `eval echo '${'$as_ac_Header'}'` = yes; then
3878 cat >>confdefs.h <<_ACEOF
3879-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
3880+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
3881 _ACEOF
3882
3883 else
3884- { { $as_echo "$as_me:$LINENO: error:
3885+ { { echo "$as_me:$LINENO: error:
3886 !!! OpenSSL is not properly installed on your system. !!!
3887 !!! Can not include OpenSSL headers files. !!!" >&5
3888-$as_echo "$as_me: error:
3889+echo "$as_me: error:
3890 !!! OpenSSL is not properly installed on your system. !!!
3891 !!! Can not include OpenSSL headers files. !!!" >&2;}
3892 { (exit 1); exit 1; }; }
3893@@ -5898,15 +3860,10 @@
3894
3895
3896
3897-<<<<<<< TREE
3898-{ $as_echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5
3899-$as_echo_n "checking for MD5_Init in -lcrypto... " >&6; }
3900-=======
3901 { echo "$as_me:$LINENO: checking for MD5_Init in -lcrypto" >&5
3902 echo $ECHO_N "checking for MD5_Init in -lcrypto... $ECHO_C" >&6; }
3903->>>>>>> MERGE-SOURCE
3904 if test "${ac_cv_lib_crypto_MD5_Init+set}" = set; then
3905- $as_echo_n "(cached) " >&6
3906+ echo $ECHO_N "(cached) $ECHO_C" >&6
3907 else
3908 ac_check_lib_save_LIBS=$LIBS
3909 LIBS="-lcrypto $LIBS"
3910@@ -5933,16 +3890,6 @@
3911 }
3912 _ACEOF
3913 rm -f conftest.$ac_objext conftest$ac_exeext
3914-<<<<<<< TREE
3915-if { (ac_try="$ac_link"
3916-case "(($ac_try" in
3917- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3918- *) ac_try_echo=$ac_try;;
3919-esac
3920-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
3921-$as_echo "$ac_try_echo") >&5
3922- (eval "$ac_link") 2>conftest.er1
3923-=======
3924 if { (ac_try="$ac_link"
3925 case "(($ac_try" in
3926 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
3927@@ -5950,55 +3897,31 @@
3928 esac
3929 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
3930 (eval "$ac_link") 2>conftest.er1
3931->>>>>>> MERGE-SOURCE
3932 ac_status=$?
3933 grep -v '^ *+' conftest.er1 >conftest.err
3934 rm -f conftest.er1
3935 cat conftest.err >&5
3936-<<<<<<< TREE
3937- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3938- (exit $ac_status); } && {
3939- test -z "$ac_c_werror_flag" ||
3940- test ! -s conftest.err
3941- } && test -s conftest$ac_exeext && {
3942- test "$cross_compiling" = yes ||
3943- $as_test_x conftest$ac_exeext
3944- }; then
3945-=======
3946 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3947 (exit $ac_status); } && {
3948 test -z "$ac_c_werror_flag" ||
3949 test ! -s conftest.err
3950 } && test -s conftest$ac_exeext &&
3951 $as_test_x conftest$ac_exeext; then
3952->>>>>>> MERGE-SOURCE
3953 ac_cv_lib_crypto_MD5_Init=yes
3954 else
3955- $as_echo "$as_me: failed program was:" >&5
3956+ echo "$as_me: failed program was:" >&5
3957 sed 's/^/| /' conftest.$ac_ext >&5
3958
3959 ac_cv_lib_crypto_MD5_Init=no
3960 fi
3961-<<<<<<< TREE
3962-
3963-rm -rf conftest.dSYM
3964-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3965-=======
3966-
3967-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3968->>>>>>> MERGE-SOURCE
3969+
3970+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
3971 conftest$ac_exeext conftest.$ac_ext
3972 LIBS=$ac_check_lib_save_LIBS
3973 fi
3974-<<<<<<< TREE
3975-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5
3976-$as_echo "$ac_cv_lib_crypto_MD5_Init" >&6; }
3977-if test "x$ac_cv_lib_crypto_MD5_Init" = x""yes; then
3978-=======
3979 { echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_MD5_Init" >&5
3980 echo "${ECHO_T}$ac_cv_lib_crypto_MD5_Init" >&6; }
3981 if test $ac_cv_lib_crypto_MD5_Init = yes; then
3982->>>>>>> MERGE-SOURCE
3983 cat >>confdefs.h <<_ACEOF
3984 #define HAVE_LIBCRYPTO 1
3985 _ACEOF
3986@@ -6006,21 +3929,16 @@
3987 LIBS="-lcrypto $LIBS"
3988
3989 else
3990- { { $as_echo "$as_me:$LINENO: error: OpenSSL libraries are required" >&5
3991-$as_echo "$as_me: error: OpenSSL libraries are required" >&2;}
3992+ { { echo "$as_me:$LINENO: error: OpenSSL libraries are required" >&5
3993+echo "$as_me: error: OpenSSL libraries are required" >&2;}
3994 { (exit 1); exit 1; }; }
3995 fi
3996
3997
3998-<<<<<<< TREE
3999-{ $as_echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
4000-$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
4001-=======
4002 { echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
4003 echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; }
4004->>>>>>> MERGE-SOURCE
4005 if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
4006- $as_echo_n "(cached) " >&6
4007+ echo $ECHO_N "(cached) $ECHO_C" >&6
4008 else
4009 ac_check_lib_save_LIBS=$LIBS
4010 LIBS="-lssl $LIBS"
4011@@ -6047,16 +3965,6 @@
4012 }
4013 _ACEOF
4014 rm -f conftest.$ac_objext conftest$ac_exeext
4015-<<<<<<< TREE
4016-if { (ac_try="$ac_link"
4017-case "(($ac_try" in
4018- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4019- *) ac_try_echo=$ac_try;;
4020-esac
4021-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4022-$as_echo "$ac_try_echo") >&5
4023- (eval "$ac_link") 2>conftest.er1
4024-=======
4025 if { (ac_try="$ac_link"
4026 case "(($ac_try" in
4027 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4028@@ -6064,55 +3972,31 @@
4029 esac
4030 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4031 (eval "$ac_link") 2>conftest.er1
4032->>>>>>> MERGE-SOURCE
4033 ac_status=$?
4034 grep -v '^ *+' conftest.er1 >conftest.err
4035 rm -f conftest.er1
4036 cat conftest.err >&5
4037-<<<<<<< TREE
4038- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4039- (exit $ac_status); } && {
4040- test -z "$ac_c_werror_flag" ||
4041- test ! -s conftest.err
4042- } && test -s conftest$ac_exeext && {
4043- test "$cross_compiling" = yes ||
4044- $as_test_x conftest$ac_exeext
4045- }; then
4046-=======
4047 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4048 (exit $ac_status); } && {
4049 test -z "$ac_c_werror_flag" ||
4050 test ! -s conftest.err
4051 } && test -s conftest$ac_exeext &&
4052 $as_test_x conftest$ac_exeext; then
4053->>>>>>> MERGE-SOURCE
4054 ac_cv_lib_ssl_SSL_CTX_new=yes
4055 else
4056- $as_echo "$as_me: failed program was:" >&5
4057+ echo "$as_me: failed program was:" >&5
4058 sed 's/^/| /' conftest.$ac_ext >&5
4059
4060 ac_cv_lib_ssl_SSL_CTX_new=no
4061 fi
4062-<<<<<<< TREE
4063-
4064-rm -rf conftest.dSYM
4065-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4066-=======
4067-
4068-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4069->>>>>>> MERGE-SOURCE
4070+
4071+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4072 conftest$ac_exeext conftest.$ac_ext
4073 LIBS=$ac_check_lib_save_LIBS
4074 fi
4075-<<<<<<< TREE
4076-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
4077-$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
4078-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = x""yes; then
4079-=======
4080 { echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
4081 echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
4082 if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
4083->>>>>>> MERGE-SOURCE
4084 cat >>confdefs.h <<_ACEOF
4085 #define HAVE_LIBSSL 1
4086 _ACEOF
4087@@ -6120,21 +4004,16 @@
4088 LIBS="-lssl $LIBS"
4089
4090 else
4091- { { $as_echo "$as_me:$LINENO: error: OpenSSL libraries are required" >&5
4092-$as_echo "$as_me: error: OpenSSL libraries are required" >&2;}
4093+ { { echo "$as_me:$LINENO: error: OpenSSL libraries are required" >&5
4094+echo "$as_me: error: OpenSSL libraries are required" >&2;}
4095 { (exit 1); exit 1; }; }
4096 fi
4097
4098
4099-<<<<<<< TREE
4100-{ $as_echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5
4101-$as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
4102-=======
4103 { echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5
4104 echo $ECHO_N "checking for poptGetContext in -lpopt... $ECHO_C" >&6; }
4105->>>>>>> MERGE-SOURCE
4106 if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then
4107- $as_echo_n "(cached) " >&6
4108+ echo $ECHO_N "(cached) $ECHO_C" >&6
4109 else
4110 ac_check_lib_save_LIBS=$LIBS
4111 LIBS="-lpopt $LIBS"
4112@@ -6161,16 +4040,6 @@
4113 }
4114 _ACEOF
4115 rm -f conftest.$ac_objext conftest$ac_exeext
4116-<<<<<<< TREE
4117-if { (ac_try="$ac_link"
4118-case "(($ac_try" in
4119- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4120- *) ac_try_echo=$ac_try;;
4121-esac
4122-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4123-$as_echo "$ac_try_echo") >&5
4124- (eval "$ac_link") 2>conftest.er1
4125-=======
4126 if { (ac_try="$ac_link"
4127 case "(($ac_try" in
4128 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4129@@ -6178,55 +4047,31 @@
4130 esac
4131 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4132 (eval "$ac_link") 2>conftest.er1
4133->>>>>>> MERGE-SOURCE
4134 ac_status=$?
4135 grep -v '^ *+' conftest.er1 >conftest.err
4136 rm -f conftest.er1
4137 cat conftest.err >&5
4138-<<<<<<< TREE
4139- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4140- (exit $ac_status); } && {
4141- test -z "$ac_c_werror_flag" ||
4142- test ! -s conftest.err
4143- } && test -s conftest$ac_exeext && {
4144- test "$cross_compiling" = yes ||
4145- $as_test_x conftest$ac_exeext
4146- }; then
4147-=======
4148 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4149 (exit $ac_status); } && {
4150 test -z "$ac_c_werror_flag" ||
4151 test ! -s conftest.err
4152 } && test -s conftest$ac_exeext &&
4153 $as_test_x conftest$ac_exeext; then
4154->>>>>>> MERGE-SOURCE
4155 ac_cv_lib_popt_poptGetContext=yes
4156 else
4157- $as_echo "$as_me: failed program was:" >&5
4158+ echo "$as_me: failed program was:" >&5
4159 sed 's/^/| /' conftest.$ac_ext >&5
4160
4161 ac_cv_lib_popt_poptGetContext=no
4162 fi
4163-<<<<<<< TREE
4164-
4165-rm -rf conftest.dSYM
4166-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4167-=======
4168-
4169-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4170->>>>>>> MERGE-SOURCE
4171+
4172+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
4173 conftest$ac_exeext conftest.$ac_ext
4174 LIBS=$ac_check_lib_save_LIBS
4175 fi
4176-<<<<<<< TREE
4177-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetContext" >&5
4178-$as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
4179-if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then
4180-=======
4181 { echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetContext" >&5
4182 echo "${ECHO_T}$ac_cv_lib_popt_poptGetContext" >&6; }
4183 if test $ac_cv_lib_popt_poptGetContext = yes; then
4184->>>>>>> MERGE-SOURCE
4185 cat >>confdefs.h <<_ACEOF
4186 #define HAVE_LIBPOPT 1
4187 _ACEOF
4188@@ -6234,20 +4079,15 @@
4189 LIBS="-lpopt $LIBS"
4190
4191 else
4192- { { $as_echo "$as_me:$LINENO: error: Popt libraries is required" >&5
4193-$as_echo "$as_me: error: Popt libraries is required" >&2;}
4194+ { { echo "$as_me:$LINENO: error: Popt libraries is required" >&5
4195+echo "$as_me: error: Popt libraries is required" >&2;}
4196 { (exit 1); exit 1; }; }
4197 fi
4198
4199
4200 CPPFLAGS="$CPPFLAGS -I$kernelinc"
4201-<<<<<<< TREE
4202-{ $as_echo "$as_me:$LINENO: checking for kernel version" >&5
4203-$as_echo_n "checking for kernel version... " >&6; }
4204-=======
4205 { echo "$as_me:$LINENO: checking for kernel version" >&5
4206 echo $ECHO_N "checking for kernel version... $ECHO_C" >&6; }
4207->>>>>>> MERGE-SOURCE
4208 if test "$cross_compiling" = yes; then
4209
4210 LINUX_MAJOR="0"
4211@@ -6265,35 +4105,19 @@
4212 #include <stdlib.h>
4213 #include <stdio.h>
4214 #include <linux/version.h>
4215- #if !defined(UTS_RELEASE) && !defined(LINUX_VERSION_CODE)
4216+ #if !defined(UTS_RELEASE)
4217 #include <linux/utsrelease.h>
4218 #endif
4219 int main (void) {
4220 FILE *fp = fopen ("linuxinfo", "w");
4221 if (!fp) return 1;
4222- #if defined(UTS_RELEASE)
4223 fprintf (fp, "%s\n", UTS_RELEASE);
4224- #elif defined(LINUX_VERSION_CODE)
4225- fprintf (fp, "%d.%d.%d\n", LINUX_VERSION_CODE >> 16, (LINUX_VERSION_CODE >> 8) & 0xFF, LINUX_VERSION_CODE & 0xFF);
4226- #else
4227- fprintf (fp, "0.0.0\n"); /* Let's fail gently */
4228- #endif
4229 fclose (fp);
4230 return 0;
4231 }
4232
4233 _ACEOF
4234 rm -f conftest$ac_exeext
4235-<<<<<<< TREE
4236-if { (ac_try="$ac_link"
4237-case "(($ac_try" in
4238- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4239- *) ac_try_echo=$ac_try;;
4240-esac
4241-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4242-$as_echo "$ac_try_echo") >&5
4243- (eval "$ac_link") 2>&5
4244-=======
4245 if { (ac_try="$ac_link"
4246 case "(($ac_try" in
4247 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4248@@ -6301,28 +4125,17 @@
4249 esac
4250 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4251 (eval "$ac_link") 2>&5
4252->>>>>>> MERGE-SOURCE
4253 ac_status=$?
4254- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4255+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4256 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
4257-<<<<<<< TREE
4258- { (case "(($ac_try" in
4259- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4260- *) ac_try_echo=$ac_try;;
4261-esac
4262-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4263-$as_echo "$ac_try_echo") >&5
4264- (eval "$ac_try") 2>&5
4265-=======
4266 { (case "(($ac_try" in
4267 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4268 *) ac_try_echo=$ac_try;;
4269 esac
4270 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4271 (eval "$ac_try") 2>&5
4272->>>>>>> MERGE-SOURCE
4273 ac_status=$?
4274- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4275+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
4276 (exit $ac_status); }; }; then
4277
4278 LINUX_MAJOR=`cat linuxinfo | cut -d'.' -f1`
4279@@ -6330,8 +4143,8 @@
4280 LINUX_PATCH=`cat linuxinfo | cut -d'.' -f3`
4281
4282 else
4283- $as_echo "$as_me: program exited with status $ac_status" >&5
4284-$as_echo "$as_me: failed program was:" >&5
4285+ echo "$as_me: program exited with status $ac_status" >&5
4286+echo "$as_me: failed program was:" >&5
4287 sed 's/^/| /' conftest.$ac_ext >&5
4288
4289 ( exit $ac_status )
4290@@ -6341,23 +4154,13 @@
4291 LINUX_PATCH="0"
4292
4293 fi
4294-<<<<<<< TREE
4295-rm -rf conftest.dSYM
4296-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4297-=======
4298-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4299->>>>>>> MERGE-SOURCE
4300+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
4301 fi
4302
4303
4304 rm -f linuxinfo
4305-<<<<<<< TREE
4306- { $as_echo "$as_me:$LINENO: result: $LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH" >&5
4307-$as_echo "$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH" >&6; }
4308-=======
4309 { echo "$as_me:$LINENO: result: $LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH" >&5
4310 echo "${ECHO_T}$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH" >&6; }
4311->>>>>>> MERGE-SOURCE
4312 if test "$LINUX_MINOR" = "6"; then
4313 KERN="_KRNL_2_6_"
4314 elif test "$LINUX_MINOR" = "4"; then
4315@@ -6366,27 +4169,19 @@
4316 KERN="_KRNL_2_2_"
4317 fi
4318 if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then
4319- { $as_echo "$as_me:$LINENO: WARNING: Cannot determine Linux Kernel version." >&5
4320-$as_echo "$as_me: WARNING: Cannot determine Linux Kernel version." >&2;}
4321+ { echo "$as_me:$LINENO: WARNING: Cannot determine Linux Kernel version." >&5
4322+echo "$as_me: WARNING: Cannot determine Linux Kernel version." >&2;}
4323 fi
4324
4325-<<<<<<< TREE
4326-as_ac_File=`$as_echo "ac_cv_file_$kernelpath/net/core/link_watch.c" | $as_tr_sh`
4327-{ $as_echo "$as_me:$LINENO: checking for $kernelpath/net/core/link_watch.c" >&5
4328-$as_echo_n "checking for $kernelpath/net/core/link_watch.c... " >&6; }
4329-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
4330- $as_echo_n "(cached) " >&6
4331-=======
4332 as_ac_File=`echo "ac_cv_file_$kernelpath/net/core/link_watch.c" | $as_tr_sh`
4333 { echo "$as_me:$LINENO: checking for $kernelpath/net/core/link_watch.c" >&5
4334 echo $ECHO_N "checking for $kernelpath/net/core/link_watch.c... $ECHO_C" >&6; }
4335 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
4336 echo $ECHO_N "(cached) $ECHO_C" >&6
4337->>>>>>> MERGE-SOURCE
4338 else
4339 test "$cross_compiling" = yes &&
4340- { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
4341-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
4342+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
4343+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
4344 { (exit 1); exit 1; }; }
4345 if test -r "$kernelpath/net/core/link_watch.c"; then
4346 eval "$as_ac_File=yes"
4347@@ -6394,20 +4189,10 @@
4348 eval "$as_ac_File=no"
4349 fi
4350 fi
4351-<<<<<<< TREE
4352-ac_res=`eval 'as_val=${'$as_ac_File'}
4353- $as_echo "$as_val"'`
4354- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
4355-$as_echo "$ac_res" >&6; }
4356-as_val=`eval 'as_val=${'$as_ac_File'}
4357- $as_echo "$as_val"'`
4358- if test "x$as_val" = x""yes; then
4359-=======
4360 ac_res=`eval echo '${'$as_ac_File'}'`
4361 { echo "$as_me:$LINENO: result: $ac_res" >&5
4362 echo "${ECHO_T}$ac_res" >&6; }
4363 if test `eval echo '${'$as_ac_File'}'` = yes; then
4364->>>>>>> MERGE-SOURCE
4365
4366 LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
4367
4368@@ -6424,32 +4209,17 @@
4369 IPVS_SUPPORT="_WITHOUT_LVS_"
4370 if test "$enable_lvs" != "no"; then
4371 if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
4372-<<<<<<< TREE
4373- { $as_echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
4374-$as_echo_n "checking for net/ip_vs.h... " >&6; }
4375-=======
4376 { echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
4377 echo $ECHO_N "checking for net/ip_vs.h... $ECHO_C" >&6; }
4378->>>>>>> MERGE-SOURCE
4379 if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
4380- $as_echo_n "(cached) " >&6
4381+ echo $ECHO_N "(cached) $ECHO_C" >&6
4382 fi
4383-<<<<<<< TREE
4384-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_net_ip_vs_h" >&5
4385-$as_echo "$ac_cv_header_net_ip_vs_h" >&6; }
4386-=======
4387 { echo "$as_me:$LINENO: result: $ac_cv_header_net_ip_vs_h" >&5
4388 echo "${ECHO_T}$ac_cv_header_net_ip_vs_h" >&6; }
4389->>>>>>> MERGE-SOURCE
4390 else
4391 # Is the header compilable?
4392-<<<<<<< TREE
4393-{ $as_echo "$as_me:$LINENO: checking net/ip_vs.h usability" >&5
4394-$as_echo_n "checking net/ip_vs.h usability... " >&6; }
4395-=======
4396 { echo "$as_me:$LINENO: checking net/ip_vs.h usability" >&5
4397 echo $ECHO_N "checking net/ip_vs.h usability... $ECHO_C" >&6; }
4398->>>>>>> MERGE-SOURCE
4399 cat >conftest.$ac_ext <<_ACEOF
4400 /* confdefs.h. */
4401 _ACEOF
4402@@ -6460,16 +4230,6 @@
4403 #include <net/ip_vs.h>
4404 _ACEOF
4405 rm -f conftest.$ac_objext
4406-<<<<<<< TREE
4407-if { (ac_try="$ac_compile"
4408-case "(($ac_try" in
4409- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4410- *) ac_try_echo=$ac_try;;
4411-esac
4412-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4413-$as_echo "$ac_try_echo") >&5
4414- (eval "$ac_compile") 2>conftest.er1
4415-=======
4416 if { (ac_try="$ac_compile"
4417 case "(($ac_try" in
4418 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4419@@ -6477,51 +4237,30 @@
4420 esac
4421 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4422 (eval "$ac_compile") 2>conftest.er1
4423->>>>>>> MERGE-SOURCE
4424 ac_status=$?
4425 grep -v '^ *+' conftest.er1 >conftest.err
4426 rm -f conftest.er1
4427 cat conftest.err >&5
4428-<<<<<<< TREE
4429- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4430- (exit $ac_status); } && {
4431- test -z "$ac_c_werror_flag" ||
4432- test ! -s conftest.err
4433- } && test -s conftest.$ac_objext; then
4434-=======
4435 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4436 (exit $ac_status); } && {
4437 test -z "$ac_c_werror_flag" ||
4438 test ! -s conftest.err
4439 } && test -s conftest.$ac_objext; then
4440->>>>>>> MERGE-SOURCE
4441 ac_header_compiler=yes
4442 else
4443- $as_echo "$as_me: failed program was:" >&5
4444+ echo "$as_me: failed program was:" >&5
4445 sed 's/^/| /' conftest.$ac_ext >&5
4446
4447 ac_header_compiler=no
4448 fi
4449-<<<<<<< TREE
4450-
4451-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4452-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
4453-$as_echo "$ac_header_compiler" >&6; }
4454-=======
4455
4456 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4457 { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
4458 echo "${ECHO_T}$ac_header_compiler" >&6; }
4459->>>>>>> MERGE-SOURCE
4460
4461 # Is the header present?
4462-<<<<<<< TREE
4463-{ $as_echo "$as_me:$LINENO: checking net/ip_vs.h presence" >&5
4464-$as_echo_n "checking net/ip_vs.h presence... " >&6; }
4465-=======
4466 { echo "$as_me:$LINENO: checking net/ip_vs.h presence" >&5
4467 echo $ECHO_N "checking net/ip_vs.h presence... $ECHO_C" >&6; }
4468->>>>>>> MERGE-SOURCE
4469 cat >conftest.$ac_ext <<_ACEOF
4470 /* confdefs.h. */
4471 _ACEOF
4472@@ -6530,16 +4269,6 @@
4473 /* end confdefs.h. */
4474 #include <net/ip_vs.h>
4475 _ACEOF
4476-<<<<<<< TREE
4477-if { (ac_try="$ac_cpp conftest.$ac_ext"
4478-case "(($ac_try" in
4479- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4480- *) ac_try_echo=$ac_try;;
4481-esac
4482-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4483-$as_echo "$ac_try_echo") >&5
4484- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4485-=======
4486 if { (ac_try="$ac_cpp conftest.$ac_ext"
4487 case "(($ac_try" in
4488 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4489@@ -6547,66 +4276,37 @@
4490 esac
4491 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4492 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
4493->>>>>>> MERGE-SOURCE
4494 ac_status=$?
4495 grep -v '^ *+' conftest.er1 >conftest.err
4496 rm -f conftest.er1
4497 cat conftest.err >&5
4498-<<<<<<< TREE
4499- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4500- (exit $ac_status); } >/dev/null && {
4501- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4502- test ! -s conftest.err
4503- }; then
4504-=======
4505 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4506 (exit $ac_status); } >/dev/null && {
4507 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
4508 test ! -s conftest.err
4509 }; then
4510->>>>>>> MERGE-SOURCE
4511 ac_header_preproc=yes
4512 else
4513- $as_echo "$as_me: failed program was:" >&5
4514+ echo "$as_me: failed program was:" >&5
4515 sed 's/^/| /' conftest.$ac_ext >&5
4516
4517 ac_header_preproc=no
4518 fi
4519
4520 rm -f conftest.err conftest.$ac_ext
4521-<<<<<<< TREE
4522-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
4523-$as_echo "$ac_header_preproc" >&6; }
4524-=======
4525 { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
4526 echo "${ECHO_T}$ac_header_preproc" >&6; }
4527->>>>>>> MERGE-SOURCE
4528
4529 # So? What about this header?
4530 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
4531 yes:no: )
4532- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&5
4533-$as_echo "$as_me: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
4534- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&5
4535-$as_echo "$as_me: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&2;}
4536+ { echo "$as_me:$LINENO: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&5
4537+echo "$as_me: WARNING: net/ip_vs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
4538+ { echo "$as_me:$LINENO: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&5
4539+echo "$as_me: WARNING: net/ip_vs.h: proceeding with the compiler's result" >&2;}
4540 ac_header_preproc=yes
4541 ;;
4542 no:yes:* )
4543-<<<<<<< TREE
4544- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: present but cannot be compiled" >&5
4545-$as_echo "$as_me: WARNING: net/ip_vs.h: present but cannot be compiled" >&2;}
4546- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: check for missing prerequisite headers?" >&5
4547-$as_echo "$as_me: WARNING: net/ip_vs.h: check for missing prerequisite headers?" >&2;}
4548- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: see the Autoconf documentation" >&5
4549-$as_echo "$as_me: WARNING: net/ip_vs.h: see the Autoconf documentation" >&2;}
4550- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: section \"Present But Cannot Be Compiled\"" >&5
4551-$as_echo "$as_me: WARNING: net/ip_vs.h: section \"Present But Cannot Be Compiled\"" >&2;}
4552- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: proceeding with the preprocessor's result" >&5
4553-$as_echo "$as_me: WARNING: net/ip_vs.h: proceeding with the preprocessor's result" >&2;}
4554- { $as_echo "$as_me:$LINENO: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&5
4555-$as_echo "$as_me: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&2;}
4556-
4557-=======
4558 { echo "$as_me:$LINENO: WARNING: net/ip_vs.h: present but cannot be compiled" >&5
4559 echo "$as_me: WARNING: net/ip_vs.h: present but cannot be compiled" >&2;}
4560 { echo "$as_me:$LINENO: WARNING: net/ip_vs.h: check for missing prerequisite headers?" >&5
4561@@ -6620,45 +4320,24 @@
4562 { echo "$as_me:$LINENO: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&5
4563 echo "$as_me: WARNING: net/ip_vs.h: in the future, the compiler will take precedence" >&2;}
4564
4565->>>>>>> MERGE-SOURCE
4566 ;;
4567 esac
4568-<<<<<<< TREE
4569-{ $as_echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
4570-$as_echo_n "checking for net/ip_vs.h... " >&6; }
4571-=======
4572 { echo "$as_me:$LINENO: checking for net/ip_vs.h" >&5
4573 echo $ECHO_N "checking for net/ip_vs.h... $ECHO_C" >&6; }
4574->>>>>>> MERGE-SOURCE
4575 if test "${ac_cv_header_net_ip_vs_h+set}" = set; then
4576- $as_echo_n "(cached) " >&6
4577+ echo $ECHO_N "(cached) $ECHO_C" >&6
4578 else
4579 ac_cv_header_net_ip_vs_h=$ac_header_preproc
4580 fi
4581-<<<<<<< TREE
4582-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_net_ip_vs_h" >&5
4583-$as_echo "$ac_cv_header_net_ip_vs_h" >&6; }
4584-=======
4585 { echo "$as_me:$LINENO: result: $ac_cv_header_net_ip_vs_h" >&5
4586 echo "${ECHO_T}$ac_cv_header_net_ip_vs_h" >&6; }
4587->>>>>>> MERGE-SOURCE
4588
4589 fi
4590-if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then
4591+if test $ac_cv_header_net_ip_vs_h = yes; then
4592 IPVS_SUPPORT="_WITH_LVS_"
4593 else
4594
4595 IPVS_SUPPORT="_WITHOUT_LVS_"
4596-<<<<<<< TREE
4597- { $as_echo "$as_me:$LINENO: WARNING: keepalived will be built without LVS support." >&5
4598-$as_echo "$as_me: WARNING: keepalived will be built without LVS support." >&2;}
4599-
4600-fi
4601-
4602-
4603-fi
4604-
4605-=======
4606 { echo "$as_me:$LINENO: WARNING: keepalived will be built without LVS support." >&5
4607 echo "$as_me: WARNING: keepalived will be built without LVS support." >&2;}
4608
4609@@ -6667,22 +4346,16 @@
4610
4611 fi
4612
4613->>>>>>> MERGE-SOURCE
4614 if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
4615- { { $as_echo "$as_me:$LINENO: error: keepalived MUST be compiled at least with LVS or VRRP framework" >&5
4616-$as_echo "$as_me: error: keepalived MUST be compiled at least with LVS or VRRP framework" >&2;}
4617+ { { echo "$as_me:$LINENO: error: keepalived MUST be compiled at least with LVS or VRRP framework" >&5
4618+echo "$as_me: error: keepalived MUST be compiled at least with LVS or VRRP framework" >&2;}
4619 { (exit 1); exit 1; }; }
4620 fi
4621
4622 IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
4623 if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
4624-<<<<<<< TREE
4625- { $as_echo "$as_me:$LINENO: checking for IPVS syncd support" >&5
4626-$as_echo_n "checking for IPVS syncd support... " >&6; }
4627-=======
4628 { echo "$as_me:$LINENO: checking for IPVS syncd support" >&5
4629 echo $ECHO_N "checking for IPVS syncd support... $ECHO_C" >&6; }
4630->>>>>>> MERGE-SOURCE
4631 if test "$KERN" = "_KRNL_2_6_"; then
4632 IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
4633 elif test "_KRNL_2_4_"; then
4634@@ -6696,21 +4369,11 @@
4635 fi
4636
4637 if test "$IPVS_SYNCD" = "_HAVE_IPVS_SYNCD_"; then
4638-<<<<<<< TREE
4639- { $as_echo "$as_me:$LINENO: result: yes" >&5
4640-$as_echo "yes" >&6; }
4641-=======
4642 { echo "$as_me:$LINENO: result: yes" >&5
4643 echo "${ECHO_T}yes" >&6; }
4644->>>>>>> MERGE-SOURCE
4645 else
4646-<<<<<<< TREE
4647- { $as_echo "$as_me:$LINENO: result: no" >&5
4648-$as_echo "no" >&6; }
4649-=======
4650 { echo "$as_me:$LINENO: result: no" >&5
4651 echo "${ECHO_T}no" >&6; }
4652->>>>>>> MERGE-SOURCE
4653 fi
4654 fi
4655
4656@@ -6735,15 +4398,10 @@
4657
4658
4659
4660-<<<<<<< TREE
4661-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
4662-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
4663-=======
4664 { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
4665 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
4666->>>>>>> MERGE-SOURCE
4667 if test "${ac_cv_c_const+set}" = set; then
4668- $as_echo_n "(cached) " >&6
4669+ echo $ECHO_N "(cached) $ECHO_C" >&6
4670 else
4671 cat >conftest.$ac_ext <<_ACEOF
4672 /* confdefs.h. */
4673@@ -6810,16 +4468,6 @@
4674 }
4675 _ACEOF
4676 rm -f conftest.$ac_objext
4677-<<<<<<< TREE
4678-if { (ac_try="$ac_compile"
4679-case "(($ac_try" in
4680- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4681- *) ac_try_echo=$ac_try;;
4682-esac
4683-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4684-$as_echo "$ac_try_echo") >&5
4685- (eval "$ac_compile") 2>conftest.er1
4686-=======
4687 if { (ac_try="$ac_compile"
4688 case "(($ac_try" in
4689 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4690@@ -6827,38 +4475,20 @@
4691 esac
4692 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4693 (eval "$ac_compile") 2>conftest.er1
4694->>>>>>> MERGE-SOURCE
4695 ac_status=$?
4696 grep -v '^ *+' conftest.er1 >conftest.err
4697 rm -f conftest.er1
4698 cat conftest.err >&5
4699-<<<<<<< TREE
4700- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4701- (exit $ac_status); } && {
4702- test -z "$ac_c_werror_flag" ||
4703- test ! -s conftest.err
4704- } && test -s conftest.$ac_objext; then
4705-=======
4706 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4707 (exit $ac_status); } && {
4708 test -z "$ac_c_werror_flag" ||
4709 test ! -s conftest.err
4710 } && test -s conftest.$ac_objext; then
4711->>>>>>> MERGE-SOURCE
4712 ac_cv_c_const=yes
4713 else
4714- $as_echo "$as_me: failed program was:" >&5
4715+ echo "$as_me: failed program was:" >&5
4716 sed 's/^/| /' conftest.$ac_ext >&5
4717
4718-<<<<<<< TREE
4719- ac_cv_c_const=no
4720-fi
4721-
4722-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4723-fi
4724-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
4725-$as_echo "$ac_cv_c_const" >&6; }
4726-=======
4727 ac_cv_c_const=no
4728 fi
4729
4730@@ -6866,27 +4496,20 @@
4731 fi
4732 { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
4733 echo "${ECHO_T}$ac_cv_c_const" >&6; }
4734->>>>>>> MERGE-SOURCE
4735 if test $ac_cv_c_const = no; then
4736
4737 cat >>confdefs.h <<\_ACEOF
4738-#define const /**/
4739+#define const
4740 _ACEOF
4741
4742 fi
4743
4744-<<<<<<< TREE
4745-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
4746-$as_echo_n "checking for pid_t... " >&6; }
4747-=======
4748 { echo "$as_me:$LINENO: checking for pid_t" >&5
4749 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
4750->>>>>>> MERGE-SOURCE
4751 if test "${ac_cv_type_pid_t+set}" = set; then
4752- $as_echo_n "(cached) " >&6
4753+ echo $ECHO_N "(cached) $ECHO_C" >&6
4754 else
4755- ac_cv_type_pid_t=no
4756-cat >conftest.$ac_ext <<_ACEOF
4757+ cat >conftest.$ac_ext <<_ACEOF
4758 /* confdefs.h. */
4759 _ACEOF
4760 cat confdefs.h >>conftest.$ac_ext
4761@@ -6897,87 +4520,6 @@
4762 int
4763 main ()
4764 {
4765-<<<<<<< TREE
4766-if (sizeof (pid_t))
4767- return 0;
4768- ;
4769- return 0;
4770-}
4771-_ACEOF
4772-rm -f conftest.$ac_objext
4773-if { (ac_try="$ac_compile"
4774-case "(($ac_try" in
4775- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4776- *) ac_try_echo=$ac_try;;
4777-esac
4778-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4779-$as_echo "$ac_try_echo") >&5
4780- (eval "$ac_compile") 2>conftest.er1
4781- ac_status=$?
4782- grep -v '^ *+' conftest.er1 >conftest.err
4783- rm -f conftest.er1
4784- cat conftest.err >&5
4785- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4786- (exit $ac_status); } && {
4787- test -z "$ac_c_werror_flag" ||
4788- test ! -s conftest.err
4789- } && test -s conftest.$ac_objext; then
4790- cat >conftest.$ac_ext <<_ACEOF
4791-/* confdefs.h. */
4792-_ACEOF
4793-cat confdefs.h >>conftest.$ac_ext
4794-cat >>conftest.$ac_ext <<_ACEOF
4795-/* end confdefs.h. */
4796-$ac_includes_default
4797-int
4798-main ()
4799-{
4800-if (sizeof ((pid_t)))
4801- return 0;
4802- ;
4803- return 0;
4804-}
4805-_ACEOF
4806-rm -f conftest.$ac_objext
4807-if { (ac_try="$ac_compile"
4808-case "(($ac_try" in
4809- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4810- *) ac_try_echo=$ac_try;;
4811-esac
4812-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4813-$as_echo "$ac_try_echo") >&5
4814- (eval "$ac_compile") 2>conftest.er1
4815- ac_status=$?
4816- grep -v '^ *+' conftest.er1 >conftest.err
4817- rm -f conftest.er1
4818- cat conftest.err >&5
4819- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4820- (exit $ac_status); } && {
4821- test -z "$ac_c_werror_flag" ||
4822- test ! -s conftest.err
4823- } && test -s conftest.$ac_objext; then
4824- :
4825-else
4826- $as_echo "$as_me: failed program was:" >&5
4827-sed 's/^/| /' conftest.$ac_ext >&5
4828-
4829- ac_cv_type_pid_t=yes
4830-fi
4831-
4832-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4833-else
4834- $as_echo "$as_me: failed program was:" >&5
4835-sed 's/^/| /' conftest.$ac_ext >&5
4836-
4837-
4838-fi
4839-
4840-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4841-fi
4842-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
4843-$as_echo "$ac_cv_type_pid_t" >&6; }
4844-if test "x$ac_cv_type_pid_t" = x""yes; then
4845-=======
4846 if ((ac__type_new_ *) 0)
4847 return 0;
4848 if (sizeof (ac__type_new_))
4849@@ -7016,7 +4558,6 @@
4850 { echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
4851 echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
4852 if test $ac_cv_type_pid_t = yes; then
4853->>>>>>> MERGE-SOURCE
4854 :
4855 else
4856
4857@@ -7026,15 +4567,10 @@
4858
4859 fi
4860
4861-<<<<<<< TREE
4862-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
4863-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
4864-=======
4865 { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
4866 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
4867->>>>>>> MERGE-SOURCE
4868 if test "${ac_cv_header_time+set}" = set; then
4869- $as_echo_n "(cached) " >&6
4870+ echo $ECHO_N "(cached) $ECHO_C" >&6
4871 else
4872 cat >conftest.$ac_ext <<_ACEOF
4873 /* confdefs.h. */
4874@@ -7056,16 +4592,6 @@
4875 }
4876 _ACEOF
4877 rm -f conftest.$ac_objext
4878-<<<<<<< TREE
4879-if { (ac_try="$ac_compile"
4880-case "(($ac_try" in
4881- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4882- *) ac_try_echo=$ac_try;;
4883-esac
4884-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4885-$as_echo "$ac_try_echo") >&5
4886- (eval "$ac_compile") 2>conftest.er1
4887-=======
4888 if { (ac_try="$ac_compile"
4889 case "(($ac_try" in
4890 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4891@@ -7073,38 +4599,20 @@
4892 esac
4893 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
4894 (eval "$ac_compile") 2>conftest.er1
4895->>>>>>> MERGE-SOURCE
4896 ac_status=$?
4897 grep -v '^ *+' conftest.er1 >conftest.err
4898 rm -f conftest.er1
4899 cat conftest.err >&5
4900-<<<<<<< TREE
4901- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
4902- (exit $ac_status); } && {
4903- test -z "$ac_c_werror_flag" ||
4904- test ! -s conftest.err
4905- } && test -s conftest.$ac_objext; then
4906-=======
4907 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4908 (exit $ac_status); } && {
4909 test -z "$ac_c_werror_flag" ||
4910 test ! -s conftest.err
4911 } && test -s conftest.$ac_objext; then
4912->>>>>>> MERGE-SOURCE
4913 ac_cv_header_time=yes
4914 else
4915- $as_echo "$as_me: failed program was:" >&5
4916+ echo "$as_me: failed program was:" >&5
4917 sed 's/^/| /' conftest.$ac_ext >&5
4918
4919-<<<<<<< TREE
4920- ac_cv_header_time=no
4921-fi
4922-
4923-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4924-fi
4925-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
4926-$as_echo "$ac_cv_header_time" >&6; }
4927-=======
4928 ac_cv_header_time=no
4929 fi
4930
4931@@ -7112,7 +4620,6 @@
4932 fi
4933 { echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
4934 echo "${ECHO_T}$ac_cv_header_time" >&6; }
4935->>>>>>> MERGE-SOURCE
4936 if test $ac_cv_header_time = yes; then
4937
4938 cat >>confdefs.h <<\_ACEOF
4939@@ -7123,15 +4630,10 @@
4940
4941
4942 if test $ac_cv_c_compiler_gnu = yes; then
4943-<<<<<<< TREE
4944- { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
4945-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
4946-=======
4947 { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
4948 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; }
4949->>>>>>> MERGE-SOURCE
4950 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
4951- $as_echo_n "(cached) " >&6
4952+ echo $ECHO_N "(cached) $ECHO_C" >&6
4953 else
4954 ac_pattern="Autoconf.*'x'"
4955 cat >conftest.$ac_ext <<_ACEOF
4956@@ -7170,27 +4672,17 @@
4957
4958 fi
4959 fi
4960-<<<<<<< TREE
4961-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
4962-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
4963-=======
4964 { echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
4965 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; }
4966->>>>>>> MERGE-SOURCE
4967 if test $ac_cv_prog_gcc_traditional = yes; then
4968 CC="$CC -traditional"
4969 fi
4970 fi
4971
4972-<<<<<<< TREE
4973-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
4974-$as_echo_n "checking for working memcmp... " >&6; }
4975-=======
4976 { echo "$as_me:$LINENO: checking for working memcmp" >&5
4977 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
4978->>>>>>> MERGE-SOURCE
4979 if test "${ac_cv_func_memcmp_working+set}" = set; then
4980- $as_echo_n "(cached) " >&6
4981+ echo $ECHO_N "(cached) $ECHO_C" >&6
4982 else
4983 if test "$cross_compiling" = yes; then
4984 ac_cv_func_memcmp_working=no
4985@@ -7235,16 +4727,6 @@
4986 }
4987 _ACEOF
4988 rm -f conftest$ac_exeext
4989-<<<<<<< TREE
4990-if { (ac_try="$ac_link"
4991-case "(($ac_try" in
4992- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
4993- *) ac_try_echo=$ac_try;;
4994-esac
4995-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
4996-$as_echo "$ac_try_echo") >&5
4997- (eval "$ac_link") 2>&5
4998-=======
4999 if { (ac_try="$ac_link"
5000 case "(($ac_try" in
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: