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