PBXT

Merge lp:~vkolesnikov/pbxt/pbxt-1.1-23.06.2011 into lp:pbxt/1.1

  1. pbxt-1.1-23.06.2011
  2. Merge into 1.1
Proposed by Vladimir Kolesnikov
Status: Needs review
Proposed branch: lp:~vkolesnikov/pbxt/pbxt-1.1-23.06.2011
Merge into: lp:pbxt/1.1
Diff against target: 552996 lines
To merge this branch: bzr merge lp:~vkolesnikov/pbxt/pbxt-1.1-23.06.2011
Reviewer Review Type Date Requested Status
PBXT Core Pending
Review via email: mp+67126@code.launchpad.net

Description of the change

port of

lp:~vkolesnikov/pbxt/pbxt-1.0-17.06.2011

to pbxt 1.1

To post a comment you must log in.
lp:~vkolesnikov/pbxt/pbxt-1.1-23.06.2011 updated
874. By Vladimir Kolesnikov

automerge from PBXT 1.0

Unmerged revisions

874. By Vladimir Kolesnikov

automerge from PBXT 1.0

873. By Vladimir Kolesnikov

removed temporary comments after merge with PBXT 1.0

872. By Vladimir Kolesnikov

merged changes from PBXT 1.0

Preview Diff

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

Subscribers

People subscribed via source and target branches