Ticket #27253: macosx.2.patch

File macosx.2.patch, 153.2 KB (added by tlesher@…, 14 years ago)

Patch revised for the purpose of getting it submitted upstream to Fedora project

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