| 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
| 2 | ## 03_libtool.dpatch by <elacour@home-dn.net> |
| 3 | ## |
| 4 | ## All lines beginning with `## DP:' are a description of the patch. |
| 5 | ## DP: Libtool update |
| 6 | |
| 7 | @DPATCH@ |
| 8 | --- ./aclocal.m4 |
| 9 | +++ ./aclocal.m4 |
| 10 | @@ -1,7 +1,7 @@ |
| 11 | -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- |
| 12 | +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- |
| 13 | |
| 14 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 15 | -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 16 | +# 2005 Free Software Foundation, Inc. |
| 17 | # This file is free software; the Free Software Foundation |
| 18 | # gives unlimited permission to copy and/or distribute it, |
| 19 | # with or without modifications, as long as this notice is preserved. |
| 20 | @@ -11,17 +11,9 @@ |
| 21 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
| 22 | # PARTICULAR PURPOSE. |
| 23 | |
| 24 | -m4_ifndef([AC_AUTOCONF_VERSION], |
| 25 | - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 26 | -m4_if(AC_AUTOCONF_VERSION, [2.61],, |
| 27 | -[m4_warning([this file was generated for autoconf 2.61. |
| 28 | -You have another version of autoconf. It may work, but is not guaranteed to. |
| 29 | -If you have problems, you may need to regenerate the build system entirely. |
| 30 | -To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
| 31 | - |
| 32 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
| 33 | |
| 34 | -# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL |
| 35 | +# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL |
| 36 | |
| 37 | |
| 38 | # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) |
| 39 | @@ -6671,7 +6663,7 @@ AC_SUBST([SED]) |
| 40 | AC_MSG_RESULT([$SED]) |
| 41 | ]) |
| 42 | |
| 43 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. |
| 44 | +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. |
| 45 | # |
| 46 | # This file is free software; the Free Software Foundation |
| 47 | # gives unlimited permission to copy and/or distribute it, |
| 48 | @@ -6681,31 +6673,14 @@ AC_MSG_RESULT([$SED]) |
| 49 | # ---------------------------- |
| 50 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
| 51 | # generated from the m4 files accompanying Automake X.Y. |
| 52 | -# (This private macro should not be called outside this file.) |
| 53 | -AC_DEFUN([AM_AUTOMAKE_VERSION], |
| 54 | -[am__api_version='1.10' |
| 55 | -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
| 56 | -dnl require some minimum version. Point them to the right macro. |
| 57 | -m4_if([$1], [1.10.1], [], |
| 58 | - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
| 59 | -]) |
| 60 | - |
| 61 | -# _AM_AUTOCONF_VERSION(VERSION) |
| 62 | -# ----------------------------- |
| 63 | -# aclocal traces this macro to find the Autoconf version. |
| 64 | -# This is a private macro too. Using m4_define simplifies |
| 65 | -# the logic in aclocal, which can simply ignore this definition. |
| 66 | -m4_define([_AM_AUTOCONF_VERSION], []) |
| 67 | +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) |
| 68 | |
| 69 | # AM_SET_CURRENT_AUTOMAKE_VERSION |
| 70 | # ------------------------------- |
| 71 | -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
| 72 | +# Call AM_AUTOMAKE_VERSION so it can be traced. |
| 73 | # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. |
| 74 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
| 75 | -[AM_AUTOMAKE_VERSION([1.10.1])dnl |
| 76 | -m4_ifndef([AC_AUTOCONF_VERSION], |
| 77 | - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
| 78 | -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) |
| 79 | + [AM_AUTOMAKE_VERSION([1.9.6])]) |
| 80 | |
| 81 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
| 82 | |
| 83 | @@ -6762,14 +6737,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` |
| 84 | |
| 85 | # AM_CONDITIONAL -*- Autoconf -*- |
| 86 | |
| 87 | -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 |
| 88 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 |
| 89 | # Free Software Foundation, Inc. |
| 90 | # |
| 91 | # This file is free software; the Free Software Foundation |
| 92 | # gives unlimited permission to copy and/or distribute it, |
| 93 | # with or without modifications, as long as this notice is preserved. |
| 94 | |
| 95 | -# serial 8 |
| 96 | +# serial 7 |
| 97 | |
| 98 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
| 99 | # ------------------------------------- |
| 100 | @@ -6778,10 +6753,8 @@ AC_DEFUN([AM_CONDITIONAL], |
| 101 | [AC_PREREQ(2.52)dnl |
| 102 | ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
| 103 | [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
| 104 | -AC_SUBST([$1_TRUE])dnl |
| 105 | -AC_SUBST([$1_FALSE])dnl |
| 106 | -_AM_SUBST_NOTMAKE([$1_TRUE])dnl |
| 107 | -_AM_SUBST_NOTMAKE([$1_FALSE])dnl |
| 108 | +AC_SUBST([$1_TRUE]) |
| 109 | +AC_SUBST([$1_FALSE]) |
| 110 | if $2; then |
| 111 | $1_TRUE= |
| 112 | $1_FALSE='#' |
| 113 | @@ -6795,14 +6768,15 @@ AC_CONFIG_COMMANDS_PRE( |
| 114 | Usually this means the macro was only invoked conditionally.]]) |
| 115 | fi])]) |
| 116 | |
| 117 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 |
| 118 | + |
| 119 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
| 120 | # Free Software Foundation, Inc. |
| 121 | # |
| 122 | # This file is free software; the Free Software Foundation |
| 123 | # gives unlimited permission to copy and/or distribute it, |
| 124 | # with or without modifications, as long as this notice is preserved. |
| 125 | |
| 126 | -# serial 9 |
| 127 | +# serial 8 |
| 128 | |
| 129 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
| 130 | # written in clear, in which case automake, when reading aclocal.m4, |
| 131 | @@ -6830,7 +6804,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl |
| 132 | ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
| 133 | [$1], CXX, [depcc="$CXX" am_compiler_list=], |
| 134 | [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
| 135 | - [$1], UPC, [depcc="$UPC" am_compiler_list=], |
| 136 | [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
| 137 | [depcc="$$1" am_compiler_list=]) |
| 138 | |
| 139 | @@ -6896,7 +6869,6 @@ AC_CACHE_CHECK([dependency style of $depcc], |
| 140 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
| 141 | $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
| 142 | >/dev/null 2>conftest.err && |
| 143 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
| 144 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
| 145 | grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
| 146 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
| 147 | @@ -6949,8 +6921,7 @@ if test "x$enable_dependency_tracking" != xno; then |
| 148 | AMDEPBACKSLASH='\' |
| 149 | fi |
| 150 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
| 151 | -AC_SUBST([AMDEPBACKSLASH])dnl |
| 152 | -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
| 153 | +AC_SUBST([AMDEPBACKSLASH]) |
| 154 | ]) |
| 155 | |
| 156 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
| 157 | @@ -6975,9 +6946,8 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
| 158 | # some people rename them; so instead we look at the file content. |
| 159 | # Grep'ing the first line is not enough: some people post-process |
| 160 | # each Makefile.in and add a new line on top of each file to say so. |
| 161 | - # Grep'ing the whole file is not good either: AIX grep has a line |
| 162 | - # limit of 2048, but all sed's we know have understand at least 4000. |
| 163 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
| 164 | + # So let's grep whole file. |
| 165 | + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then |
| 166 | dirpart=`AS_DIRNAME("$mf")` |
| 167 | else |
| 168 | continue |
| 169 | @@ -7036,14 +7006,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
| 170 | |
| 171 | # Do all the work for Automake. -*- Autoconf -*- |
| 172 | |
| 173 | -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 174 | -# 2005, 2006, 2008 Free Software Foundation, Inc. |
| 175 | +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
| 176 | +# Free Software Foundation, Inc. |
| 177 | # |
| 178 | # This file is free software; the Free Software Foundation |
| 179 | # gives unlimited permission to copy and/or distribute it, |
| 180 | # with or without modifications, as long as this notice is preserved. |
| 181 | |
| 182 | -# serial 13 |
| 183 | +# serial 12 |
| 184 | |
| 185 | # This macro actually does too much. Some checks are only needed if |
| 186 | # your package does certain things. But this isn't really a big deal. |
| 187 | @@ -7060,20 +7030,16 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
| 188 | # arguments mandatory, and then we can depend on a new Autoconf |
| 189 | # release and drop the old call support. |
| 190 | AC_DEFUN([AM_INIT_AUTOMAKE], |
| 191 | -[AC_PREREQ([2.60])dnl |
| 192 | +[AC_PREREQ([2.58])dnl |
| 193 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
| 194 | dnl the ones we care about. |
| 195 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
| 196 | AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl |
| 197 | AC_REQUIRE([AC_PROG_INSTALL])dnl |
| 198 | -if test "`cd $srcdir && pwd`" != "`pwd`"; then |
| 199 | - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
| 200 | - # is not polluted with repeated "-I." |
| 201 | - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl |
| 202 | - # test to see if srcdir already configured |
| 203 | - if test -f $srcdir/config.status; then |
| 204 | - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
| 205 | - fi |
| 206 | +# test to see if srcdir already configured |
| 207 | +if test "`cd $srcdir && pwd`" != "`pwd`" && |
| 208 | + test -f $srcdir/config.status; then |
| 209 | + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) |
| 210 | fi |
| 211 | |
| 212 | # test whether we have cygpath |
| 213 | @@ -7093,9 +7059,6 @@ m4_ifval([$2], |
| 214 | AC_SUBST([PACKAGE], [$1])dnl |
| 215 | AC_SUBST([VERSION], [$2])], |
| 216 | [_AM_SET_OPTIONS([$1])dnl |
| 217 | -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. |
| 218 | -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, |
| 219 | - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl |
| 220 | AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl |
| 221 | AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl |
| 222 | |
| 223 | @@ -7131,10 +7094,6 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], |
| 224 | [_AM_DEPENDENCIES(CXX)], |
| 225 | [define([AC_PROG_CXX], |
| 226 | defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl |
| 227 | -AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
| 228 | - [_AM_DEPENDENCIES(OBJC)], |
| 229 | - [define([AC_PROG_OBJC], |
| 230 | - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl |
| 231 | ]) |
| 232 | ]) |
| 233 | |
| 234 | @@ -7148,17 +7107,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], |
| 235 | # our stamp files there. |
| 236 | AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], |
| 237 | [# Compute $1's index in $config_headers. |
| 238 | -_am_arg=$1 |
| 239 | _am_stamp_count=1 |
| 240 | for _am_header in $config_headers :; do |
| 241 | case $_am_header in |
| 242 | - $_am_arg | $_am_arg:* ) |
| 243 | + $1 | $1:* ) |
| 244 | break ;; |
| 245 | * ) |
| 246 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
| 247 | esac |
| 248 | done |
| 249 | -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
| 250 | +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) |
| 251 | |
| 252 | # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
| 253 | # |
| 254 | @@ -7171,7 +7129,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co |
| 255 | # Define $install_sh. |
| 256 | AC_DEFUN([AM_PROG_INSTALL_SH], |
| 257 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
| 258 | -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} |
| 259 | +install_sh=${install_sh-"$am_aux_dir/install-sh"} |
| 260 | AC_SUBST(install_sh)]) |
| 261 | |
| 262 | # Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
| 263 | @@ -7249,14 +7207,14 @@ rm -f confinc confmf |
| 264 | |
| 265 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
| 266 | |
| 267 | -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 |
| 268 | +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 |
| 269 | # Free Software Foundation, Inc. |
| 270 | # |
| 271 | # This file is free software; the Free Software Foundation |
| 272 | # gives unlimited permission to copy and/or distribute it, |
| 273 | # with or without modifications, as long as this notice is preserved. |
| 274 | |
| 275 | -# serial 5 |
| 276 | +# serial 4 |
| 277 | |
| 278 | # AM_MISSING_PROG(NAME, PROGRAM) |
| 279 | # ------------------------------ |
| 280 | @@ -7272,7 +7230,6 @@ AC_SUBST($1)]) |
| 281 | # If it does, set am_missing_run to use it, otherwise, to nothing. |
| 282 | AC_DEFUN([AM_MISSING_HAS_RUN], |
| 283 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
| 284 | -AC_REQUIRE_AUX_FILE([missing])dnl |
| 285 | test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" |
| 286 | # Use eval to expand $SHELL |
| 287 | if eval "$MISSING --run true"; then |
| 288 | @@ -7283,7 +7240,7 @@ else |
| 289 | fi |
| 290 | ]) |
| 291 | |
| 292 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| 293 | +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. |
| 294 | # |
| 295 | # This file is free software; the Free Software Foundation |
| 296 | # gives unlimited permission to copy and/or distribute it, |
| 297 | @@ -7291,23 +7248,60 @@ fi |
| 298 | |
| 299 | # AM_PROG_MKDIR_P |
| 300 | # --------------- |
| 301 | -# Check for `mkdir -p'. |
| 302 | +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. |
| 303 | +# |
| 304 | +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories |
| 305 | +# created by `make install' are always world readable, even if the |
| 306 | +# installer happens to have an overly restrictive umask (e.g. 077). |
| 307 | +# This was a mistake. There are at least two reasons why we must not |
| 308 | +# use `-m 0755': |
| 309 | +# - it causes special bits like SGID to be ignored, |
| 310 | +# - it may be too restrictive (some setups expect 775 directories). |
| 311 | +# |
| 312 | +# Do not use -m 0755 and let people choose whatever they expect by |
| 313 | +# setting umask. |
| 314 | +# |
| 315 | +# We cannot accept any implementation of `mkdir' that recognizes `-p'. |
| 316 | +# Some implementations (such as Solaris 8's) are not thread-safe: if a |
| 317 | +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' |
| 318 | +# concurrently, both version can detect that a/ is missing, but only |
| 319 | +# one can create it and the other will error out. Consequently we |
| 320 | +# restrict ourselves to GNU make (using the --version option ensures |
| 321 | +# this.) |
| 322 | AC_DEFUN([AM_PROG_MKDIR_P], |
| 323 | -[AC_PREREQ([2.60])dnl |
| 324 | -AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
| 325 | -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, |
| 326 | -dnl while keeping a definition of mkdir_p for backward compatibility. |
| 327 | -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. |
| 328 | -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of |
| 329 | -dnl Makefile.ins that do not define MKDIR_P, so we do our own |
| 330 | -dnl adjustment using top_builddir (which is defined more often than |
| 331 | -dnl MKDIR_P). |
| 332 | -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl |
| 333 | -case $mkdir_p in |
| 334 | - [[\\/$]]* | ?:[[\\/]]*) ;; |
| 335 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
| 336 | -esac |
| 337 | -]) |
| 338 | +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
| 339 | + # We used to keeping the `.' as first argument, in order to |
| 340 | + # allow $(mkdir_p) to be used without argument. As in |
| 341 | + # $(mkdir_p) $(somedir) |
| 342 | + # where $(somedir) is conditionally defined. However this is wrong |
| 343 | + # for two reasons: |
| 344 | + # 1. if the package is installed by a user who cannot write `.' |
| 345 | + # make install will fail, |
| 346 | + # 2. the above comment should most certainly read |
| 347 | + # $(mkdir_p) $(DESTDIR)$(somedir) |
| 348 | + # so it does not work when $(somedir) is undefined and |
| 349 | + # $(DESTDIR) is not. |
| 350 | + # To support the latter case, we have to write |
| 351 | + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), |
| 352 | + # so the `.' trick is pointless. |
| 353 | + mkdir_p='mkdir -p --' |
| 354 | +else |
| 355 | + # On NextStep and OpenStep, the `mkdir' command does not |
| 356 | + # recognize any option. It will interpret all options as |
| 357 | + # directories to create, and then abort because `.' already |
| 358 | + # exists. |
| 359 | + for d in ./-p ./--version; |
| 360 | + do |
| 361 | + test -d $d && rmdir $d |
| 362 | + done |
| 363 | + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. |
| 364 | + if test -f "$ac_aux_dir/mkinstalldirs"; then |
| 365 | + mkdir_p='$(mkinstalldirs)' |
| 366 | + else |
| 367 | + mkdir_p='$(install_sh) -d' |
| 368 | + fi |
| 369 | +fi |
| 370 | +AC_SUBST([mkdir_p])]) |
| 371 | |
| 372 | # Helper functions for option handling. -*- Autoconf -*- |
| 373 | |
| 374 | @@ -7419,21 +7413,9 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. |
| 375 | if test "$cross_compiling" != no; then |
| 376 | AC_CHECK_TOOL([STRIP], [strip], :) |
| 377 | fi |
| 378 | -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| 379 | +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
| 380 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
| 381 | |
| 382 | -# Copyright (C) 2006 Free Software Foundation, Inc. |
| 383 | -# |
| 384 | -# This file is free software; the Free Software Foundation |
| 385 | -# gives unlimited permission to copy and/or distribute it, |
| 386 | -# with or without modifications, as long as this notice is preserved. |
| 387 | - |
| 388 | -# _AM_SUBST_NOTMAKE(VARIABLE) |
| 389 | -# --------------------------- |
| 390 | -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
| 391 | -# This macro is traced by Automake. |
| 392 | -AC_DEFUN([_AM_SUBST_NOTMAKE]) |
| 393 | - |
| 394 | # Check how to create a tarball. -*- Autoconf -*- |
| 395 | |
| 396 | # Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
| 397 | --- ./config/config.guess |
| 398 | +++ ./config/config.guess |
| 399 | @@ -1,10 +1,10 @@ |
| 400 | #! /bin/sh |
| 401 | # Attempt to guess a canonical system name. |
| 402 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
| 403 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, |
| 404 | -# Inc. |
| 405 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
| 406 | +# Free Software Foundation, Inc. |
| 407 | |
| 408 | -timestamp='2007-07-22' |
| 409 | +timestamp='2008-01-23' |
| 410 | |
| 411 | # This file is free software; you can redistribute it and/or modify it |
| 412 | # under the terms of the GNU General Public License as published by |
| 413 | @@ -56,8 +56,8 @@ version="\ |
| 414 | GNU config.guess ($timestamp) |
| 415 | |
| 416 | Originally written by Per Bothner. |
| 417 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
| 418 | -Free Software Foundation, Inc. |
| 419 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 420 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 421 | |
| 422 | This is free software; see the source for copying conditions. There is NO |
| 423 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
| 424 | @@ -532,7 +532,7 @@ EOF |
| 425 | echo rs6000-ibm-aix3.2 |
| 426 | fi |
| 427 | exit ;; |
| 428 | - *:AIX:*:[45]) |
| 429 | + *:AIX:*:[456]) |
| 430 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
| 431 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
| 432 | IBM_ARCH=rs6000 |
| 433 | @@ -799,6 +799,9 @@ EOF |
| 434 | EM64T | authenticamd) |
| 435 | echo x86_64-unknown-interix${UNAME_RELEASE} |
| 436 | exit ;; |
| 437 | + IA64) |
| 438 | + echo ia64-unknown-interix${UNAME_RELEASE} |
| 439 | + exit ;; |
| 440 | esac ;; |
| 441 | [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
| 442 | echo i${UNAME_MACHINE}-pc-mks |
| 443 | @@ -833,7 +836,14 @@ EOF |
| 444 | echo ${UNAME_MACHINE}-pc-minix |
| 445 | exit ;; |
| 446 | arm*:Linux:*:*) |
| 447 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 448 | + eval $set_cc_for_build |
| 449 | + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
| 450 | + | grep -q __ARM_EABI__ |
| 451 | + then |
| 452 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 453 | + else |
| 454 | + echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
| 455 | + fi |
| 456 | exit ;; |
| 457 | avr32*:Linux:*:*) |
| 458 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 459 | @@ -954,8 +964,8 @@ EOF |
| 460 | x86_64:Linux:*:*) |
| 461 | echo x86_64-unknown-linux-gnu |
| 462 | exit ;; |
| 463 | - xtensa:Linux:*:*) |
| 464 | - echo xtensa-unknown-linux-gnu |
| 465 | + xtensa*:Linux:*:*) |
| 466 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
| 467 | exit ;; |
| 468 | i*86:Linux:*:*) |
| 469 | # The BFD linker knows what the default object file format is, so |
| 470 | @@ -1474,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize |
| 471 | the operating system you are using. It is advised that you |
| 472 | download the most up to date version of the config scripts from |
| 473 | |
| 474 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess |
| 475 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
| 476 | and |
| 477 | - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub |
| 478 | + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
| 479 | |
| 480 | If the version you run ($0) is already up to date, please |
| 481 | send the following data and any information you think might be |
| 482 | --- ./config/config.sub |
| 483 | +++ ./config/config.sub |
| 484 | @@ -1,10 +1,10 @@ |
| 485 | #! /bin/sh |
| 486 | # Configuration validation subroutine script. |
| 487 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
| 488 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, |
| 489 | -# Inc. |
| 490 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
| 491 | +# Free Software Foundation, Inc. |
| 492 | |
| 493 | -timestamp='2007-06-28' |
| 494 | +timestamp='2008-01-16' |
| 495 | |
| 496 | # This file is (in principle) common to ALL GNU software. |
| 497 | # The presence of a machine in this file suggests that SOME GNU software |
| 498 | @@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>." |
| 499 | version="\ |
| 500 | GNU config.sub ($timestamp) |
| 501 | |
| 502 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
| 503 | -Free Software Foundation, Inc. |
| 504 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
| 505 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 506 | |
| 507 | This is free software; see the source for copying conditions. There is NO |
| 508 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
| 509 | @@ -369,10 +369,14 @@ case $basic_machine in |
| 510 | | v850-* | v850e-* | vax-* \ |
| 511 | | we32k-* \ |
| 512 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
| 513 | - | xstormy16-* | xtensa-* \ |
| 514 | + | xstormy16-* | xtensa*-* \ |
| 515 | | ymp-* \ |
| 516 | | z8k-*) |
| 517 | ;; |
| 518 | + # Recognize the basic CPU types without company name, with glob match. |
| 519 | + xtensa*) |
| 520 | + basic_machine=$basic_machine-unknown |
| 521 | + ;; |
| 522 | # Recognize the various machine names and aliases which stand |
| 523 | # for a CPU type and a company and sometimes even an OS. |
| 524 | 386bsd) |
| 525 | @@ -443,6 +447,14 @@ case $basic_machine in |
| 526 | basic_machine=ns32k-sequent |
| 527 | os=-dynix |
| 528 | ;; |
| 529 | + blackfin) |
| 530 | + basic_machine=bfin-unknown |
| 531 | + os=-linux |
| 532 | + ;; |
| 533 | + blackfin-*) |
| 534 | + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 535 | + os=-linux |
| 536 | + ;; |
| 537 | c90) |
| 538 | basic_machine=c90-cray |
| 539 | os=-unicos |
| 540 | @@ -668,6 +680,14 @@ case $basic_machine in |
| 541 | basic_machine=m68k-isi |
| 542 | os=-sysv |
| 543 | ;; |
| 544 | + m68knommu) |
| 545 | + basic_machine=m68k-unknown |
| 546 | + os=-linux |
| 547 | + ;; |
| 548 | + m68knommu-*) |
| 549 | + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 550 | + os=-linux |
| 551 | + ;; |
| 552 | m88k-omron*) |
| 553 | basic_machine=m88k-omron |
| 554 | ;; |
| 555 | @@ -813,6 +833,14 @@ case $basic_machine in |
| 556 | basic_machine=i860-intel |
| 557 | os=-osf |
| 558 | ;; |
| 559 | + parisc) |
| 560 | + basic_machine=hppa-unknown |
| 561 | + os=-linux |
| 562 | + ;; |
| 563 | + parisc-*) |
| 564 | + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
| 565 | + os=-linux |
| 566 | + ;; |
| 567 | pbd) |
| 568 | basic_machine=sparc-tti |
| 569 | ;; |
| 570 | @@ -1021,6 +1049,10 @@ case $basic_machine in |
| 571 | basic_machine=tic6x-unknown |
| 572 | os=-coff |
| 573 | ;; |
| 574 | + tile*) |
| 575 | + basic_machine=tile-unknown |
| 576 | + os=-linux-gnu |
| 577 | + ;; |
| 578 | tx39) |
| 579 | basic_machine=mipstx39-unknown |
| 580 | ;; |
| 581 | --- ./config/ltmain.sh |
| 582 | +++ ./config/ltmain.sh |
| 583 | @@ -43,7 +43,7 @@ EXIT_FAILURE=1 |
| 584 | |
| 585 | PROGRAM=ltmain.sh |
| 586 | PACKAGE=libtool |
| 587 | -VERSION="1.5.26 Debian 1.5.26-1ubuntu1" |
| 588 | +VERSION="1.5.26 Debian 1.5.26-4" |
| 589 | TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" |
| 590 | |
| 591 | # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). |
| 592 | --- ./configure |
| 593 | +++ ./configure |
| 594 | @@ -1,11 +1,11 @@ |
| 595 | #! /bin/sh |
| 596 | # Guess values for system-dependent variables and create Makefiles. |
| 597 | -# Generated by GNU Autoconf 2.61 for suPHP 0.7.1. |
| 598 | +# Generated by GNU Autoconf 2.63 for suPHP 0.7.1. |
| 599 | # |
| 600 | # Report bugs to <sebastian.marsching@suphp.org>. |
| 601 | # |
| 602 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| 603 | -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| 604 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 605 | # This configure script is free software; the Free Software Foundation |
| 606 | # gives unlimited permission to copy, distribute and modify it. |
| 607 | ## --------------------- ## |
| 608 | @@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh |
| 609 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 610 | emulate sh |
| 611 | NULLCMD=: |
| 612 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
| 613 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
| 614 | # is contrary to our usage. Disable this feature. |
| 615 | alias -g '${1+"$@"}'='"$@"' |
| 616 | setopt NO_GLOB_SUBST |
| 617 | @@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
| 618 | as_cr_digits='0123456789' |
| 619 | as_cr_alnum=$as_cr_Letters$as_cr_digits |
| 620 | |
| 621 | -# The user is always right. |
| 622 | -if test "${PATH_SEPARATOR+set}" != set; then |
| 623 | - echo "#! /bin/sh" >conf$$.sh |
| 624 | - echo "exit 0" >>conf$$.sh |
| 625 | - chmod +x conf$$.sh |
| 626 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
| 627 | - PATH_SEPARATOR=';' |
| 628 | +as_nl=' |
| 629 | +' |
| 630 | +export as_nl |
| 631 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. |
| 632 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
| 633 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
| 634 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
| 635 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
| 636 | + as_echo='printf %s\n' |
| 637 | + as_echo_n='printf %s' |
| 638 | +else |
| 639 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then |
| 640 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' |
| 641 | + as_echo_n='/usr/ucb/echo -n' |
| 642 | else |
| 643 | - PATH_SEPARATOR=: |
| 644 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
| 645 | + as_echo_n_body='eval |
| 646 | + arg=$1; |
| 647 | + case $arg in |
| 648 | + *"$as_nl"*) |
| 649 | + expr "X$arg" : "X\\(.*\\)$as_nl"; |
| 650 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
| 651 | + esac; |
| 652 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" |
| 653 | + ' |
| 654 | + export as_echo_n_body |
| 655 | + as_echo_n='sh -c $as_echo_n_body as_echo' |
| 656 | fi |
| 657 | - rm -f conf$$.sh |
| 658 | + export as_echo_body |
| 659 | + as_echo='sh -c $as_echo_body as_echo' |
| 660 | +fi |
| 661 | + |
| 662 | +# The user is always right. |
| 663 | +if test "${PATH_SEPARATOR+set}" != set; then |
| 664 | + PATH_SEPARATOR=: |
| 665 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
| 666 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
| 667 | + PATH_SEPARATOR=';' |
| 668 | + } |
| 669 | fi |
| 670 | |
| 671 | # Support unset when possible. |
| 672 | @@ -65,8 +93,6 @@ fi |
| 673 | # there to prevent editors from complaining about space-tab. |
| 674 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
| 675 | # splitting by setting IFS to empty value.) |
| 676 | -as_nl=' |
| 677 | -' |
| 678 | IFS=" "" $as_nl" |
| 679 | |
| 680 | # Find who we are. Look in the path if we contain no directory separator. |
| 681 | @@ -89,7 +115,7 @@ if test "x$as_myself" = x; then |
| 682 | as_myself=$0 |
| 683 | fi |
| 684 | if test ! -f "$as_myself"; then |
| 685 | - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
| 686 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
| 687 | { (exit 1); exit 1; } |
| 688 | fi |
| 689 | |
| 690 | @@ -102,17 +128,10 @@ PS2='> ' |
| 691 | PS4='+ ' |
| 692 | |
| 693 | # NLS nuisances. |
| 694 | -for as_var in \ |
| 695 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
| 696 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
| 697 | - LC_TELEPHONE LC_TIME |
| 698 | -do |
| 699 | - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
| 700 | - eval $as_var=C; export $as_var |
| 701 | - else |
| 702 | - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
| 703 | - fi |
| 704 | -done |
| 705 | +LC_ALL=C |
| 706 | +export LC_ALL |
| 707 | +LANGUAGE=C |
| 708 | +export LANGUAGE |
| 709 | |
| 710 | # Required to use basename. |
| 711 | if expr a : '\(a\)' >/dev/null 2>&1 && |
| 712 | @@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" || |
| 713 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
| 714 | X"$0" : 'X\(//\)$' \| \ |
| 715 | X"$0" : 'X\(/\)' \| . 2>/dev/null || |
| 716 | -echo X/"$0" | |
| 717 | +$as_echo X/"$0" | |
| 718 | sed '/^.*\/\([^/][^/]*\)\/*$/{ |
| 719 | s//\1/ |
| 720 | q |
| 721 | @@ -160,7 +179,7 @@ else |
| 722 | as_have_required=no |
| 723 | fi |
| 724 | |
| 725 | - if test $as_have_required = yes && (eval ": |
| 726 | + if test $as_have_required = yes && (eval ": |
| 727 | (as_func_return () { |
| 728 | (exit \$1) |
| 729 | } |
| 730 | @@ -242,7 +261,7 @@ IFS=$as_save_IFS |
| 731 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 732 | emulate sh |
| 733 | NULLCMD=: |
| 734 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
| 735 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
| 736 | # is contrary to our usage. Disable this feature. |
| 737 | alias -g '${1+"$@"}'='"$@"' |
| 738 | setopt NO_GLOB_SUBST |
| 739 | @@ -263,7 +282,7 @@ _ASEOF |
| 740 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 741 | emulate sh |
| 742 | NULLCMD=: |
| 743 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
| 744 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
| 745 | # is contrary to our usage. Disable this feature. |
| 746 | alias -g '${1+"$@"}'='"$@"' |
| 747 | setopt NO_GLOB_SUBST |
| 748 | @@ -343,10 +362,10 @@ fi |
| 749 | |
| 750 | if test "x$CONFIG_SHELL" != x; then |
| 751 | for as_var in BASH_ENV ENV |
| 752 | - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
| 753 | - done |
| 754 | - export CONFIG_SHELL |
| 755 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
| 756 | + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
| 757 | + done |
| 758 | + export CONFIG_SHELL |
| 759 | + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
| 760 | fi |
| 761 | |
| 762 | |
| 763 | @@ -415,9 +434,10 @@ fi |
| 764 | |
| 765 | test \$exitcode = 0") || { |
| 766 | echo No shell found that supports shell functions. |
| 767 | - echo Please tell autoconf@gnu.org about your system, |
| 768 | - echo including any error possibly output before this |
| 769 | - echo message |
| 770 | + echo Please tell bug-autoconf@gnu.org about your system, |
| 771 | + echo including any error possibly output before this message. |
| 772 | + echo This can help us improve future autoconf versions. |
| 773 | + echo Configuration will now proceed without shell functions. |
| 774 | } |
| 775 | |
| 776 | |
| 777 | @@ -453,7 +473,7 @@ test \$exitcode = 0") || { |
| 778 | s/-\n.*// |
| 779 | ' >$as_me.lineno && |
| 780 | chmod +x "$as_me.lineno" || |
| 781 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
| 782 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
| 783 | { (exit 1); exit 1; }; } |
| 784 | |
| 785 | # Don't try to exec as it changes $[0], causing all sort of problems |
| 786 | @@ -481,7 +501,6 @@ case `echo -n x` in |
| 787 | *) |
| 788 | ECHO_N='-n';; |
| 789 | esac |
| 790 | - |
| 791 | if expr a : '\(a\)' >/dev/null 2>&1 && |
| 792 | test "X`expr 00001 : '.*\(...\)'`" = X001; then |
| 793 | as_expr=expr |
| 794 | @@ -494,19 +513,22 @@ if test -d conf$$.dir; then |
| 795 | rm -f conf$$.dir/conf$$.file |
| 796 | else |
| 797 | rm -f conf$$.dir |
| 798 | - mkdir conf$$.dir |
| 799 | -fi |
| 800 | -echo >conf$$.file |
| 801 | -if ln -s conf$$.file conf$$ 2>/dev/null; then |
| 802 | - as_ln_s='ln -s' |
| 803 | - # ... but there are two gotchas: |
| 804 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 805 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 806 | - # In both cases, we have to default to `cp -p'. |
| 807 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 808 | + mkdir conf$$.dir 2>/dev/null |
| 809 | +fi |
| 810 | +if (echo >conf$$.file) 2>/dev/null; then |
| 811 | + if ln -s conf$$.file conf$$ 2>/dev/null; then |
| 812 | + as_ln_s='ln -s' |
| 813 | + # ... but there are two gotchas: |
| 814 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 815 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 816 | + # In both cases, we have to default to `cp -p'. |
| 817 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 818 | + as_ln_s='cp -p' |
| 819 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
| 820 | + as_ln_s=ln |
| 821 | + else |
| 822 | as_ln_s='cp -p' |
| 823 | -elif ln conf$$.file conf$$ 2>/dev/null; then |
| 824 | - as_ln_s=ln |
| 825 | + fi |
| 826 | else |
| 827 | as_ln_s='cp -p' |
| 828 | fi |
| 829 | @@ -531,10 +553,10 @@ else |
| 830 | as_test_x=' |
| 831 | eval sh -c '\'' |
| 832 | if test -d "$1"; then |
| 833 | - test -d "$1/."; |
| 834 | + test -d "$1/."; |
| 835 | else |
| 836 | case $1 in |
| 837 | - -*)set "./$1";; |
| 838 | + -*)set "./$1";; |
| 839 | esac; |
| 840 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in |
| 841 | ???[sx]*):;;*)false;;esac;fi |
| 842 | @@ -769,128 +791,146 @@ ac_includes_default="\ |
| 843 | # include <unistd.h> |
| 844 | #endif" |
| 845 | |
| 846 | -ac_subst_vars='SHELL |
| 847 | -PATH_SEPARATOR |
| 848 | -PACKAGE_NAME |
| 849 | -PACKAGE_TARNAME |
| 850 | -PACKAGE_VERSION |
| 851 | -PACKAGE_STRING |
| 852 | -PACKAGE_BUGREPORT |
| 853 | -exec_prefix |
| 854 | -prefix |
| 855 | -program_transform_name |
| 856 | -bindir |
| 857 | -sbindir |
| 858 | -libexecdir |
| 859 | -datarootdir |
| 860 | -datadir |
| 861 | -sysconfdir |
| 862 | -sharedstatedir |
| 863 | -localstatedir |
| 864 | -includedir |
| 865 | -oldincludedir |
| 866 | -docdir |
| 867 | -infodir |
| 868 | -htmldir |
| 869 | -dvidir |
| 870 | -pdfdir |
| 871 | -psdir |
| 872 | -libdir |
| 873 | -localedir |
| 874 | -mandir |
| 875 | -DEFS |
| 876 | -ECHO_C |
| 877 | -ECHO_N |
| 878 | -ECHO_T |
| 879 | -LIBS |
| 880 | -build_alias |
| 881 | -host_alias |
| 882 | -target_alias |
| 883 | -INSTALL_PROGRAM |
| 884 | -INSTALL_SCRIPT |
| 885 | -INSTALL_DATA |
| 886 | -am__isrc |
| 887 | -CYGPATH_W |
| 888 | -PACKAGE |
| 889 | -VERSION |
| 890 | -ACLOCAL |
| 891 | -AUTOCONF |
| 892 | -AUTOMAKE |
| 893 | -AUTOHEADER |
| 894 | -MAKEINFO |
| 895 | -install_sh |
| 896 | -STRIP |
| 897 | -INSTALL_STRIP_PROGRAM |
| 898 | -mkdir_p |
| 899 | -AWK |
| 900 | -SET_MAKE |
| 901 | -am__leading_dot |
| 902 | -AMTAR |
| 903 | -am__tar |
| 904 | -am__untar |
| 905 | -CC |
| 906 | -CFLAGS |
| 907 | -LDFLAGS |
| 908 | -CPPFLAGS |
| 909 | -ac_ct_CC |
| 910 | -EXEEXT |
| 911 | -OBJEXT |
| 912 | -DEPDIR |
| 913 | -am__include |
| 914 | -am__quote |
| 915 | -AMDEP_TRUE |
| 916 | -AMDEP_FALSE |
| 917 | -AMDEPBACKSLASH |
| 918 | -CCDEPMODE |
| 919 | -am__fastdepCC_TRUE |
| 920 | -am__fastdepCC_FALSE |
| 921 | -CXX |
| 922 | -CXXFLAGS |
| 923 | -ac_ct_CXX |
| 924 | -CXXDEPMODE |
| 925 | -am__fastdepCXX_TRUE |
| 926 | -am__fastdepCXX_FALSE |
| 927 | -build |
| 928 | -build_cpu |
| 929 | -build_vendor |
| 930 | -build_os |
| 931 | -host |
| 932 | -host_cpu |
| 933 | -host_vendor |
| 934 | -host_os |
| 935 | -SED |
| 936 | -GREP |
| 937 | -EGREP |
| 938 | -LN_S |
| 939 | -ECHO |
| 940 | -AR |
| 941 | -RANLIB |
| 942 | -DSYMUTIL |
| 943 | -NMEDIT |
| 944 | -CPP |
| 945 | -CXXCPP |
| 946 | -F77 |
| 947 | -FFLAGS |
| 948 | -ac_ct_F77 |
| 949 | -LIBTOOL |
| 950 | -APXS |
| 951 | -APACHE_VERSION_1_3 |
| 952 | -APACHE_VERSION_2 |
| 953 | -APXS_INCLUDEDIR |
| 954 | -APXS_LIBEXECDIR |
| 955 | -APXS_EXTRA_CFLAGS |
| 956 | -APR_INCLUDEDIR |
| 957 | -APR_CPPFLAGS |
| 958 | -OPT_APACHEMOD_USERGROUP_DEF |
| 959 | -COND_AP13_TRUE |
| 960 | -COND_AP13_FALSE |
| 961 | -COND_AP20_TRUE |
| 962 | -COND_AP20_FALSE |
| 963 | -COND_APUSERGROUP_TRUE |
| 964 | -COND_APUSERGROUP_FALSE |
| 965 | +ac_subst_vars='LTLIBOBJS |
| 966 | LIBOBJS |
| 967 | -LTLIBOBJS' |
| 968 | +COND_APUSERGROUP_FALSE |
| 969 | +COND_APUSERGROUP_TRUE |
| 970 | +COND_AP20_FALSE |
| 971 | +COND_AP20_TRUE |
| 972 | +COND_AP13_FALSE |
| 973 | +COND_AP13_TRUE |
| 974 | +OPT_APACHEMOD_USERGROUP_DEF |
| 975 | +APR_CPPFLAGS |
| 976 | +APR_INCLUDEDIR |
| 977 | +APXS_EXTRA_CFLAGS |
| 978 | +APXS_LIBEXECDIR |
| 979 | +APXS_INCLUDEDIR |
| 980 | +APACHE_VERSION_2 |
| 981 | +APACHE_VERSION_1_3 |
| 982 | +APXS |
| 983 | +LIBTOOL |
| 984 | +ac_ct_F77 |
| 985 | +FFLAGS |
| 986 | +F77 |
| 987 | +CXXCPP |
| 988 | +CPP |
| 989 | +NMEDIT |
| 990 | +DSYMUTIL |
| 991 | +RANLIB |
| 992 | +AR |
| 993 | +ECHO |
| 994 | +LN_S |
| 995 | +EGREP |
| 996 | +GREP |
| 997 | +SED |
| 998 | +host_os |
| 999 | +host_vendor |
| 1000 | +host_cpu |
| 1001 | +host |
| 1002 | +build_os |
| 1003 | +build_vendor |
| 1004 | +build_cpu |
| 1005 | +build |
| 1006 | +am__fastdepCXX_FALSE |
| 1007 | +am__fastdepCXX_TRUE |
| 1008 | +CXXDEPMODE |
| 1009 | +ac_ct_CXX |
| 1010 | +CXXFLAGS |
| 1011 | +CXX |
| 1012 | +am__fastdepCC_FALSE |
| 1013 | +am__fastdepCC_TRUE |
| 1014 | +CCDEPMODE |
| 1015 | +AMDEPBACKSLASH |
| 1016 | +AMDEP_FALSE |
| 1017 | +AMDEP_TRUE |
| 1018 | +am__quote |
| 1019 | +am__include |
| 1020 | +DEPDIR |
| 1021 | +OBJEXT |
| 1022 | +EXEEXT |
| 1023 | +ac_ct_CC |
| 1024 | +CPPFLAGS |
| 1025 | +LDFLAGS |
| 1026 | +CFLAGS |
| 1027 | +CC |
| 1028 | +am__untar |
| 1029 | +am__tar |
| 1030 | +AMTAR |
| 1031 | +am__leading_dot |
| 1032 | +SET_MAKE |
| 1033 | +AWK |
| 1034 | +mkdir_p |
| 1035 | +INSTALL_STRIP_PROGRAM |
| 1036 | +STRIP |
| 1037 | +install_sh |
| 1038 | +MAKEINFO |
| 1039 | +AUTOHEADER |
| 1040 | +AUTOMAKE |
| 1041 | +AUTOCONF |
| 1042 | +ACLOCAL |
| 1043 | +VERSION |
| 1044 | +PACKAGE |
| 1045 | +CYGPATH_W |
| 1046 | +INSTALL_DATA |
| 1047 | +INSTALL_SCRIPT |
| 1048 | +INSTALL_PROGRAM |
| 1049 | +target_alias |
| 1050 | +host_alias |
| 1051 | +build_alias |
| 1052 | +LIBS |
| 1053 | +ECHO_T |
| 1054 | +ECHO_N |
| 1055 | +ECHO_C |
| 1056 | +DEFS |
| 1057 | +mandir |
| 1058 | +localedir |
| 1059 | +libdir |
| 1060 | +psdir |
| 1061 | +pdfdir |
| 1062 | +dvidir |
| 1063 | +htmldir |
| 1064 | +infodir |
| 1065 | +docdir |
| 1066 | +oldincludedir |
| 1067 | +includedir |
| 1068 | +localstatedir |
| 1069 | +sharedstatedir |
| 1070 | +sysconfdir |
| 1071 | +datadir |
| 1072 | +datarootdir |
| 1073 | +libexecdir |
| 1074 | +sbindir |
| 1075 | +bindir |
| 1076 | +program_transform_name |
| 1077 | +prefix |
| 1078 | +exec_prefix |
| 1079 | +PACKAGE_BUGREPORT |
| 1080 | +PACKAGE_STRING |
| 1081 | +PACKAGE_VERSION |
| 1082 | +PACKAGE_TARNAME |
| 1083 | +PACKAGE_NAME |
| 1084 | +PATH_SEPARATOR |
| 1085 | +SHELL' |
| 1086 | ac_subst_files='' |
| 1087 | +ac_user_opts=' |
| 1088 | +enable_option_checking |
| 1089 | +enable_dependency_tracking |
| 1090 | +enable_shared |
| 1091 | +enable_static |
| 1092 | +enable_fast_install |
| 1093 | +with_gnu_ld |
| 1094 | +enable_libtool_lock |
| 1095 | +with_pic |
| 1096 | +with_tags |
| 1097 | +with_apr |
| 1098 | +with_apxs |
| 1099 | +with_setid_mode |
| 1100 | +enable_checkpath |
| 1101 | +with_min_uid |
| 1102 | +with_min_gid |
| 1103 | +with_apache_user |
| 1104 | +with_logfile |
| 1105 | +' |
| 1106 | ac_precious_vars='build_alias |
| 1107 | host_alias |
| 1108 | target_alias |
| 1109 | @@ -911,6 +951,8 @@ FFLAGS' |
| 1110 | # Initialize some variables set by options. |
| 1111 | ac_init_help= |
| 1112 | ac_init_version=false |
| 1113 | +ac_unrecognized_opts= |
| 1114 | +ac_unrecognized_sep= |
| 1115 | # The variables have the same names as the options, with |
| 1116 | # dashes changed to underlines. |
| 1117 | cache_file=/dev/null |
| 1118 | @@ -1009,13 +1051,21 @@ do |
| 1119 | datarootdir=$ac_optarg ;; |
| 1120 | |
| 1121 | -disable-* | --disable-*) |
| 1122 | - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
| 1123 | + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
| 1124 | # Reject names that are not valid shell variable names. |
| 1125 | - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1126 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
| 1127 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| 1128 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 |
| 1129 | { (exit 1); exit 1; }; } |
| 1130 | - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` |
| 1131 | - eval enable_$ac_feature=no ;; |
| 1132 | + ac_useropt_orig=$ac_useropt |
| 1133 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| 1134 | + case $ac_user_opts in |
| 1135 | + *" |
| 1136 | +"enable_$ac_useropt" |
| 1137 | +"*) ;; |
| 1138 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" |
| 1139 | + ac_unrecognized_sep=', ';; |
| 1140 | + esac |
| 1141 | + eval enable_$ac_useropt=no ;; |
| 1142 | |
| 1143 | -docdir | --docdir | --docdi | --doc | --do) |
| 1144 | ac_prev=docdir ;; |
| 1145 | @@ -1028,13 +1078,21 @@ do |
| 1146 | dvidir=$ac_optarg ;; |
| 1147 | |
| 1148 | -enable-* | --enable-*) |
| 1149 | - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
| 1150 | + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
| 1151 | # Reject names that are not valid shell variable names. |
| 1152 | - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1153 | - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 |
| 1154 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| 1155 | + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 |
| 1156 | { (exit 1); exit 1; }; } |
| 1157 | - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` |
| 1158 | - eval enable_$ac_feature=\$ac_optarg ;; |
| 1159 | + ac_useropt_orig=$ac_useropt |
| 1160 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| 1161 | + case $ac_user_opts in |
| 1162 | + *" |
| 1163 | +"enable_$ac_useropt" |
| 1164 | +"*) ;; |
| 1165 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" |
| 1166 | + ac_unrecognized_sep=', ';; |
| 1167 | + esac |
| 1168 | + eval enable_$ac_useropt=\$ac_optarg ;; |
| 1169 | |
| 1170 | -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ |
| 1171 | | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ |
| 1172 | @@ -1225,22 +1283,38 @@ do |
| 1173 | ac_init_version=: ;; |
| 1174 | |
| 1175 | -with-* | --with-*) |
| 1176 | - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
| 1177 | + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
| 1178 | # Reject names that are not valid shell variable names. |
| 1179 | - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1180 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 |
| 1181 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| 1182 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 |
| 1183 | { (exit 1); exit 1; }; } |
| 1184 | - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` |
| 1185 | - eval with_$ac_package=\$ac_optarg ;; |
| 1186 | + ac_useropt_orig=$ac_useropt |
| 1187 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| 1188 | + case $ac_user_opts in |
| 1189 | + *" |
| 1190 | +"with_$ac_useropt" |
| 1191 | +"*) ;; |
| 1192 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" |
| 1193 | + ac_unrecognized_sep=', ';; |
| 1194 | + esac |
| 1195 | + eval with_$ac_useropt=\$ac_optarg ;; |
| 1196 | |
| 1197 | -without-* | --without-*) |
| 1198 | - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
| 1199 | + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
| 1200 | # Reject names that are not valid shell variable names. |
| 1201 | - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1202 | - { echo "$as_me: error: invalid package name: $ac_package" >&2 |
| 1203 | + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
| 1204 | + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 |
| 1205 | { (exit 1); exit 1; }; } |
| 1206 | - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` |
| 1207 | - eval with_$ac_package=no ;; |
| 1208 | + ac_useropt_orig=$ac_useropt |
| 1209 | + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
| 1210 | + case $ac_user_opts in |
| 1211 | + *" |
| 1212 | +"with_$ac_useropt" |
| 1213 | +"*) ;; |
| 1214 | + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" |
| 1215 | + ac_unrecognized_sep=', ';; |
| 1216 | + esac |
| 1217 | + eval with_$ac_useropt=no ;; |
| 1218 | |
| 1219 | --x) |
| 1220 | # Obsolete; use --with-x. |
| 1221 | @@ -1260,7 +1334,7 @@ do |
| 1222 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
| 1223 | x_libraries=$ac_optarg ;; |
| 1224 | |
| 1225 | - -*) { echo "$as_me: error: unrecognized option: $ac_option |
| 1226 | + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option |
| 1227 | Try \`$0 --help' for more information." >&2 |
| 1228 | { (exit 1); exit 1; }; } |
| 1229 | ;; |
| 1230 | @@ -1269,16 +1343,16 @@ Try \`$0 --help' for more information." >&2 |
| 1231 | ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` |
| 1232 | # Reject names that are not valid shell variable names. |
| 1233 | expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && |
| 1234 | - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
| 1235 | + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 |
| 1236 | { (exit 1); exit 1; }; } |
| 1237 | eval $ac_envvar=\$ac_optarg |
| 1238 | export $ac_envvar ;; |
| 1239 | |
| 1240 | *) |
| 1241 | # FIXME: should be removed in autoconf 3.0. |
| 1242 | - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
| 1243 | + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
| 1244 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
| 1245 | - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
| 1246 | + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
| 1247 | : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
| 1248 | ;; |
| 1249 | |
| 1250 | @@ -1287,22 +1361,38 @@ done |
| 1251 | |
| 1252 | if test -n "$ac_prev"; then |
| 1253 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
| 1254 | - { echo "$as_me: error: missing argument to $ac_option" >&2 |
| 1255 | + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 |
| 1256 | { (exit 1); exit 1; }; } |
| 1257 | fi |
| 1258 | |
| 1259 | -# Be sure to have absolute directory names. |
| 1260 | +if test -n "$ac_unrecognized_opts"; then |
| 1261 | + case $enable_option_checking in |
| 1262 | + no) ;; |
| 1263 | + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 |
| 1264 | + { (exit 1); exit 1; }; } ;; |
| 1265 | + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
| 1266 | + esac |
| 1267 | +fi |
| 1268 | + |
| 1269 | +# Check all directory arguments for consistency. |
| 1270 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
| 1271 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
| 1272 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
| 1273 | libdir localedir mandir |
| 1274 | do |
| 1275 | eval ac_val=\$$ac_var |
| 1276 | + # Remove trailing slashes. |
| 1277 | + case $ac_val in |
| 1278 | + */ ) |
| 1279 | + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` |
| 1280 | + eval $ac_var=\$ac_val;; |
| 1281 | + esac |
| 1282 | + # Be sure to have absolute directory names. |
| 1283 | case $ac_val in |
| 1284 | [\\/$]* | ?:[\\/]* ) continue;; |
| 1285 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
| 1286 | esac |
| 1287 | - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
| 1288 | + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 |
| 1289 | { (exit 1); exit 1; }; } |
| 1290 | done |
| 1291 | |
| 1292 | @@ -1317,7 +1407,7 @@ target=$target_alias |
| 1293 | if test "x$host_alias" != x; then |
| 1294 | if test "x$build_alias" = x; then |
| 1295 | cross_compiling=maybe |
| 1296 | - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
| 1297 | + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
| 1298 | If a cross compiler is detected then cross compile mode will be used." >&2 |
| 1299 | elif test "x$build_alias" != "x$host_alias"; then |
| 1300 | cross_compiling=yes |
| 1301 | @@ -1333,10 +1423,10 @@ test "$silent" = yes && exec 6>/dev/null |
| 1302 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
| 1303 | ac_ls_di=`ls -di .` && |
| 1304 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
| 1305 | - { echo "$as_me: error: Working directory cannot be determined" >&2 |
| 1306 | + { $as_echo "$as_me: error: working directory cannot be determined" >&2 |
| 1307 | { (exit 1); exit 1; }; } |
| 1308 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
| 1309 | - { echo "$as_me: error: pwd does not report name of working directory" >&2 |
| 1310 | + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 |
| 1311 | { (exit 1); exit 1; }; } |
| 1312 | |
| 1313 | |
| 1314 | @@ -1344,12 +1434,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
| 1315 | if test -z "$srcdir"; then |
| 1316 | ac_srcdir_defaulted=yes |
| 1317 | # Try the directory containing this script, then the parent directory. |
| 1318 | - ac_confdir=`$as_dirname -- "$0" || |
| 1319 | -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 1320 | - X"$0" : 'X\(//\)[^/]' \| \ |
| 1321 | - X"$0" : 'X\(//\)$' \| \ |
| 1322 | - X"$0" : 'X\(/\)' \| . 2>/dev/null || |
| 1323 | -echo X"$0" | |
| 1324 | + ac_confdir=`$as_dirname -- "$as_myself" || |
| 1325 | +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 1326 | + X"$as_myself" : 'X\(//\)[^/]' \| \ |
| 1327 | + X"$as_myself" : 'X\(//\)$' \| \ |
| 1328 | + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || |
| 1329 | +$as_echo X"$as_myself" | |
| 1330 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 1331 | s//\1/ |
| 1332 | q |
| 1333 | @@ -1376,12 +1466,12 @@ else |
| 1334 | fi |
| 1335 | if test ! -r "$srcdir/$ac_unique_file"; then |
| 1336 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
| 1337 | - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 |
| 1338 | + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 |
| 1339 | { (exit 1); exit 1; }; } |
| 1340 | fi |
| 1341 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
| 1342 | ac_abs_confdir=`( |
| 1343 | - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 |
| 1344 | + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 |
| 1345 | { (exit 1); exit 1; }; } |
| 1346 | pwd)` |
| 1347 | # When building in place, set srcdir=. |
| 1348 | @@ -1430,9 +1520,9 @@ Configuration: |
| 1349 | |
| 1350 | Installation directories: |
| 1351 | --prefix=PREFIX install architecture-independent files in PREFIX |
| 1352 | - [$ac_default_prefix] |
| 1353 | + [$ac_default_prefix] |
| 1354 | --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX |
| 1355 | - [PREFIX] |
| 1356 | + [PREFIX] |
| 1357 | |
| 1358 | By default, \`make install' will install all the files in |
| 1359 | \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify |
| 1360 | @@ -1442,25 +1532,25 @@ for instance \`--prefix=\$HOME'. |
| 1361 | For better control, use the options below. |
| 1362 | |
| 1363 | Fine tuning of the installation directories: |
| 1364 | - --bindir=DIR user executables [EPREFIX/bin] |
| 1365 | - --sbindir=DIR system admin executables [EPREFIX/sbin] |
| 1366 | - --libexecdir=DIR program executables [EPREFIX/libexec] |
| 1367 | - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
| 1368 | - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
| 1369 | - --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
| 1370 | - --libdir=DIR object code libraries [EPREFIX/lib] |
| 1371 | - --includedir=DIR C header files [PREFIX/include] |
| 1372 | - --oldincludedir=DIR C header files for non-gcc [/usr/include] |
| 1373 | - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] |
| 1374 | - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] |
| 1375 | - --infodir=DIR info documentation [DATAROOTDIR/info] |
| 1376 | - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] |
| 1377 | - --mandir=DIR man documentation [DATAROOTDIR/man] |
| 1378 | - --docdir=DIR documentation root [DATAROOTDIR/doc/suphp] |
| 1379 | - --htmldir=DIR html documentation [DOCDIR] |
| 1380 | - --dvidir=DIR dvi documentation [DOCDIR] |
| 1381 | - --pdfdir=DIR pdf documentation [DOCDIR] |
| 1382 | - --psdir=DIR ps documentation [DOCDIR] |
| 1383 | + --bindir=DIR user executables [EPREFIX/bin] |
| 1384 | + --sbindir=DIR system admin executables [EPREFIX/sbin] |
| 1385 | + --libexecdir=DIR program executables [EPREFIX/libexec] |
| 1386 | + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
| 1387 | + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
| 1388 | + --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
| 1389 | + --libdir=DIR object code libraries [EPREFIX/lib] |
| 1390 | + --includedir=DIR C header files [PREFIX/include] |
| 1391 | + --oldincludedir=DIR C header files for non-gcc [/usr/include] |
| 1392 | + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] |
| 1393 | + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] |
| 1394 | + --infodir=DIR info documentation [DATAROOTDIR/info] |
| 1395 | + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] |
| 1396 | + --mandir=DIR man documentation [DATAROOTDIR/man] |
| 1397 | + --docdir=DIR documentation root [DATAROOTDIR/doc/suphp] |
| 1398 | + --htmldir=DIR html documentation [DOCDIR] |
| 1399 | + --dvidir=DIR dvi documentation [DOCDIR] |
| 1400 | + --pdfdir=DIR pdf documentation [DOCDIR] |
| 1401 | + --psdir=DIR ps documentation [DOCDIR] |
| 1402 | _ACEOF |
| 1403 | |
| 1404 | cat <<\_ACEOF |
| 1405 | @@ -1483,6 +1573,7 @@ if test -n "$ac_init_help"; then |
| 1406 | cat <<\_ACEOF |
| 1407 | |
| 1408 | Optional Features: |
| 1409 | + --disable-option-checking ignore unrecognized --enable/--with options |
| 1410 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
| 1411 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
| 1412 | --disable-dependency-tracking speeds up one-time build |
| 1413 | @@ -1546,15 +1637,17 @@ fi |
| 1414 | if test "$ac_init_help" = "recursive"; then |
| 1415 | # If there are subdirs, report their specific --help. |
| 1416 | for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue |
| 1417 | - test -d "$ac_dir" || continue |
| 1418 | + test -d "$ac_dir" || |
| 1419 | + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || |
| 1420 | + continue |
| 1421 | ac_builddir=. |
| 1422 | |
| 1423 | case "$ac_dir" in |
| 1424 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; |
| 1425 | *) |
| 1426 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
| 1427 | + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` |
| 1428 | # A ".." for each directory in $ac_dir_suffix. |
| 1429 | - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` |
| 1430 | + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` |
| 1431 | case $ac_top_builddir_sub in |
| 1432 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; |
| 1433 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; |
| 1434 | @@ -1590,7 +1683,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix |
| 1435 | echo && |
| 1436 | $SHELL "$ac_srcdir/configure" --help=recursive |
| 1437 | else |
| 1438 | - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
| 1439 | + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 |
| 1440 | fi || ac_status=$? |
| 1441 | cd "$ac_pwd" || { ac_status=$?; break; } |
| 1442 | done |
| 1443 | @@ -1600,10 +1693,10 @@ test -n "$ac_init_help" && exit $ac_status |
| 1444 | if $ac_init_version; then |
| 1445 | cat <<\_ACEOF |
| 1446 | suPHP configure 0.7.1 |
| 1447 | -generated by GNU Autoconf 2.61 |
| 1448 | +generated by GNU Autoconf 2.63 |
| 1449 | |
| 1450 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| 1451 | -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
| 1452 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 1453 | This configure script is free software; the Free Software Foundation |
| 1454 | gives unlimited permission to copy, distribute and modify it. |
| 1455 | _ACEOF |
| 1456 | @@ -1614,7 +1707,7 @@ This file contains any messages produced by compilers while |
| 1457 | running configure, to aid debugging if configure makes a mistake. |
| 1458 | |
| 1459 | It was created by suPHP $as_me 0.7.1, which was |
| 1460 | -generated by GNU Autoconf 2.61. Invocation command line was |
| 1461 | +generated by GNU Autoconf 2.63. Invocation command line was |
| 1462 | |
| 1463 | $ $0 $@ |
| 1464 | |
| 1465 | @@ -1650,7 +1743,7 @@ for as_dir in $PATH |
| 1466 | do |
| 1467 | IFS=$as_save_IFS |
| 1468 | test -z "$as_dir" && as_dir=. |
| 1469 | - echo "PATH: $as_dir" |
| 1470 | + $as_echo "PATH: $as_dir" |
| 1471 | done |
| 1472 | IFS=$as_save_IFS |
| 1473 | |
| 1474 | @@ -1685,7 +1778,7 @@ do |
| 1475 | | -silent | --silent | --silen | --sile | --sil) |
| 1476 | continue ;; |
| 1477 | *\'*) |
| 1478 | - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 1479 | + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 1480 | esac |
| 1481 | case $ac_pass in |
| 1482 | 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; |
| 1483 | @@ -1737,11 +1830,12 @@ _ASBOX |
| 1484 | case $ac_val in #( |
| 1485 | *${as_nl}*) |
| 1486 | case $ac_var in #( |
| 1487 | - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 |
| 1488 | -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; |
| 1489 | + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 |
| 1490 | +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
| 1491 | esac |
| 1492 | case $ac_var in #( |
| 1493 | _ | IFS | as_nl) ;; #( |
| 1494 | + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( |
| 1495 | *) $as_unset $ac_var ;; |
| 1496 | esac ;; |
| 1497 | esac |
| 1498 | @@ -1771,9 +1865,9 @@ _ASBOX |
| 1499 | do |
| 1500 | eval ac_val=\$$ac_var |
| 1501 | case $ac_val in |
| 1502 | - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| 1503 | + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| 1504 | esac |
| 1505 | - echo "$ac_var='\''$ac_val'\''" |
| 1506 | + $as_echo "$ac_var='\''$ac_val'\''" |
| 1507 | done | sort |
| 1508 | echo |
| 1509 | |
| 1510 | @@ -1788,9 +1882,9 @@ _ASBOX |
| 1511 | do |
| 1512 | eval ac_val=\$$ac_var |
| 1513 | case $ac_val in |
| 1514 | - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| 1515 | + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; |
| 1516 | esac |
| 1517 | - echo "$ac_var='\''$ac_val'\''" |
| 1518 | + $as_echo "$ac_var='\''$ac_val'\''" |
| 1519 | done | sort |
| 1520 | echo |
| 1521 | fi |
| 1522 | @@ -1806,8 +1900,8 @@ _ASBOX |
| 1523 | echo |
| 1524 | fi |
| 1525 | test "$ac_signal" != 0 && |
| 1526 | - echo "$as_me: caught signal $ac_signal" |
| 1527 | - echo "$as_me: exit $exit_status" |
| 1528 | + $as_echo "$as_me: caught signal $ac_signal" |
| 1529 | + $as_echo "$as_me: exit $exit_status" |
| 1530 | } >&5 |
| 1531 | rm -f core *.core core.conftest.* && |
| 1532 | rm -f -r conftest* confdefs* conf$$* $ac_clean_files && |
| 1533 | @@ -1849,21 +1943,24 @@ _ACEOF |
| 1534 | |
| 1535 | |
| 1536 | # Let the site file select an alternate cache file if it wants to. |
| 1537 | -# Prefer explicitly selected file to automatically selected ones. |
| 1538 | +# Prefer an explicitly selected file to automatically selected ones. |
| 1539 | +ac_site_file1=NONE |
| 1540 | +ac_site_file2=NONE |
| 1541 | if test -n "$CONFIG_SITE"; then |
| 1542 | - set x "$CONFIG_SITE" |
| 1543 | + ac_site_file1=$CONFIG_SITE |
| 1544 | elif test "x$prefix" != xNONE; then |
| 1545 | - set x "$prefix/share/config.site" "$prefix/etc/config.site" |
| 1546 | + ac_site_file1=$prefix/share/config.site |
| 1547 | + ac_site_file2=$prefix/etc/config.site |
| 1548 | else |
| 1549 | - set x "$ac_default_prefix/share/config.site" \ |
| 1550 | - "$ac_default_prefix/etc/config.site" |
| 1551 | + ac_site_file1=$ac_default_prefix/share/config.site |
| 1552 | + ac_site_file2=$ac_default_prefix/etc/config.site |
| 1553 | fi |
| 1554 | -shift |
| 1555 | -for ac_site_file |
| 1556 | +for ac_site_file in "$ac_site_file1" "$ac_site_file2" |
| 1557 | do |
| 1558 | + test "x$ac_site_file" = xNONE && continue |
| 1559 | if test -r "$ac_site_file"; then |
| 1560 | - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
| 1561 | -echo "$as_me: loading site script $ac_site_file" >&6;} |
| 1562 | + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 |
| 1563 | +$as_echo "$as_me: loading site script $ac_site_file" >&6;} |
| 1564 | sed 's/^/| /' "$ac_site_file" >&5 |
| 1565 | . "$ac_site_file" |
| 1566 | fi |
| 1567 | @@ -1873,16 +1970,16 @@ if test -r "$cache_file"; then |
| 1568 | # Some versions of bash will fail to source /dev/null (special |
| 1569 | # files actually), so we avoid doing that. |
| 1570 | if test -f "$cache_file"; then |
| 1571 | - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
| 1572 | -echo "$as_me: loading cache $cache_file" >&6;} |
| 1573 | + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 |
| 1574 | +$as_echo "$as_me: loading cache $cache_file" >&6;} |
| 1575 | case $cache_file in |
| 1576 | [\\/]* | ?:[\\/]* ) . "$cache_file";; |
| 1577 | *) . "./$cache_file";; |
| 1578 | esac |
| 1579 | fi |
| 1580 | else |
| 1581 | - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 |
| 1582 | -echo "$as_me: creating cache $cache_file" >&6;} |
| 1583 | + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 |
| 1584 | +$as_echo "$as_me: creating cache $cache_file" >&6;} |
| 1585 | >$cache_file |
| 1586 | fi |
| 1587 | |
| 1588 | @@ -1896,29 +1993,38 @@ for ac_var in $ac_precious_vars; do |
| 1589 | eval ac_new_val=\$ac_env_${ac_var}_value |
| 1590 | case $ac_old_set,$ac_new_set in |
| 1591 | set,) |
| 1592 | - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
| 1593 | -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
| 1594 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 |
| 1595 | +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} |
| 1596 | ac_cache_corrupted=: ;; |
| 1597 | ,set) |
| 1598 | - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 |
| 1599 | -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
| 1600 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 |
| 1601 | +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} |
| 1602 | ac_cache_corrupted=: ;; |
| 1603 | ,);; |
| 1604 | *) |
| 1605 | if test "x$ac_old_val" != "x$ac_new_val"; then |
| 1606 | - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 |
| 1607 | -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
| 1608 | - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 |
| 1609 | -echo "$as_me: former value: $ac_old_val" >&2;} |
| 1610 | - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 |
| 1611 | -echo "$as_me: current value: $ac_new_val" >&2;} |
| 1612 | - ac_cache_corrupted=: |
| 1613 | + # differences in whitespace do not lead to failure. |
| 1614 | + ac_old_val_w=`echo x $ac_old_val` |
| 1615 | + ac_new_val_w=`echo x $ac_new_val` |
| 1616 | + if test "$ac_old_val_w" != "$ac_new_val_w"; then |
| 1617 | + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 |
| 1618 | +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} |
| 1619 | + ac_cache_corrupted=: |
| 1620 | + else |
| 1621 | + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 |
| 1622 | +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} |
| 1623 | + eval $ac_var=\$ac_old_val |
| 1624 | + fi |
| 1625 | + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 |
| 1626 | +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} |
| 1627 | + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 |
| 1628 | +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} |
| 1629 | fi;; |
| 1630 | esac |
| 1631 | # Pass precious variables to config.status. |
| 1632 | if test "$ac_new_set" = set; then |
| 1633 | case $ac_new_val in |
| 1634 | - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 1635 | + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 1636 | *) ac_arg=$ac_var=$ac_new_val ;; |
| 1637 | esac |
| 1638 | case " $ac_configure_args " in |
| 1639 | @@ -1928,10 +2034,12 @@ echo "$as_me: current value: $ac_new_val" >&2;} |
| 1640 | fi |
| 1641 | done |
| 1642 | if $ac_cache_corrupted; then |
| 1643 | - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
| 1644 | -echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
| 1645 | - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
| 1646 | -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} |
| 1647 | + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 1648 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 1649 | + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 |
| 1650 | +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
| 1651 | + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 |
| 1652 | +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} |
| 1653 | { (exit 1); exit 1; }; } |
| 1654 | fi |
| 1655 | |
| 1656 | @@ -1985,8 +2093,8 @@ for ac_dir in config "$srcdir"/config; do |
| 1657 | fi |
| 1658 | done |
| 1659 | if test -z "$ac_aux_dir"; then |
| 1660 | - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 |
| 1661 | -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} |
| 1662 | + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 |
| 1663 | +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} |
| 1664 | { (exit 1); exit 1; }; } |
| 1665 | fi |
| 1666 | |
| 1667 | @@ -2000,8 +2108,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. |
| 1668 | |
| 1669 | |
| 1670 | |
| 1671 | -am__api_version='1.10' |
| 1672 | - |
| 1673 | +am__api_version="1.9" |
| 1674 | # Find a good install program. We prefer a C program (faster), |
| 1675 | # so one script is as good as another. But avoid the broken or |
| 1676 | # incompatible versions: |
| 1677 | @@ -2015,11 +2122,12 @@ am__api_version='1.10' |
| 1678 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
| 1679 | # OS/2's system install, which has a completely different semantic |
| 1680 | # ./install, which can be erroneously created by make from ./install.sh. |
| 1681 | -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
| 1682 | -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } |
| 1683 | +# Reject install programs that cannot install multiple files. |
| 1684 | +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
| 1685 | +$as_echo_n "checking for a BSD-compatible install... " >&6; } |
| 1686 | if test -z "$INSTALL"; then |
| 1687 | if test "${ac_cv_path_install+set}" = set; then |
| 1688 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 1689 | + $as_echo_n "(cached) " >&6 |
| 1690 | else |
| 1691 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 1692 | for as_dir in $PATH |
| 1693 | @@ -2048,17 +2156,29 @@ case $as_dir/ in |
| 1694 | # program-specific install script used by HP pwplus--don't use. |
| 1695 | : |
| 1696 | else |
| 1697 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
| 1698 | - break 3 |
| 1699 | + rm -rf conftest.one conftest.two conftest.dir |
| 1700 | + echo one > conftest.one |
| 1701 | + echo two > conftest.two |
| 1702 | + mkdir conftest.dir |
| 1703 | + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && |
| 1704 | + test -s conftest.one && test -s conftest.two && |
| 1705 | + test -s conftest.dir/conftest.one && |
| 1706 | + test -s conftest.dir/conftest.two |
| 1707 | + then |
| 1708 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
| 1709 | + break 3 |
| 1710 | + fi |
| 1711 | fi |
| 1712 | fi |
| 1713 | done |
| 1714 | done |
| 1715 | ;; |
| 1716 | esac |
| 1717 | + |
| 1718 | done |
| 1719 | IFS=$as_save_IFS |
| 1720 | |
| 1721 | +rm -rf conftest.one conftest.two conftest.dir |
| 1722 | |
| 1723 | fi |
| 1724 | if test "${ac_cv_path_install+set}" = set; then |
| 1725 | @@ -2071,8 +2191,8 @@ fi |
| 1726 | INSTALL=$ac_install_sh |
| 1727 | fi |
| 1728 | fi |
| 1729 | -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 |
| 1730 | -echo "${ECHO_T}$INSTALL" >&6; } |
| 1731 | +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 |
| 1732 | +$as_echo "$INSTALL" >&6; } |
| 1733 | |
| 1734 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
| 1735 | # It thinks the first close brace ends the variable substitution. |
| 1736 | @@ -2082,8 +2202,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
| 1737 | |
| 1738 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
| 1739 | |
| 1740 | -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
| 1741 | -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } |
| 1742 | +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
| 1743 | +$as_echo_n "checking whether build environment is sane... " >&6; } |
| 1744 | # Just in case |
| 1745 | sleep 1 |
| 1746 | echo timestamp > conftest.file |
| 1747 | @@ -2106,9 +2226,9 @@ if ( |
| 1748 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
| 1749 | # broken ls alias from the environment. This has actually |
| 1750 | # happened. Such a system could not be considered "sane". |
| 1751 | - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken |
| 1752 | + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken |
| 1753 | alias in your environment" >&5 |
| 1754 | -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken |
| 1755 | +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken |
| 1756 | alias in your environment" >&2;} |
| 1757 | { (exit 1); exit 1; }; } |
| 1758 | fi |
| 1759 | @@ -2119,26 +2239,23 @@ then |
| 1760 | # Ok. |
| 1761 | : |
| 1762 | else |
| 1763 | - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! |
| 1764 | + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! |
| 1765 | Check your system clock" >&5 |
| 1766 | -echo "$as_me: error: newly created file is older than distributed files! |
| 1767 | +$as_echo "$as_me: error: newly created file is older than distributed files! |
| 1768 | Check your system clock" >&2;} |
| 1769 | { (exit 1); exit 1; }; } |
| 1770 | fi |
| 1771 | -{ echo "$as_me:$LINENO: result: yes" >&5 |
| 1772 | -echo "${ECHO_T}yes" >&6; } |
| 1773 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 1774 | +$as_echo "yes" >&6; } |
| 1775 | test "$program_prefix" != NONE && |
| 1776 | program_transform_name="s&^&$program_prefix&;$program_transform_name" |
| 1777 | # Use a double $ so make ignores it. |
| 1778 | test "$program_suffix" != NONE && |
| 1779 | program_transform_name="s&\$&$program_suffix&;$program_transform_name" |
| 1780 | -# Double any \ or $. echo might interpret backslashes. |
| 1781 | +# Double any \ or $. |
| 1782 | # By default was `s,x,x', remove it if useless. |
| 1783 | -cat <<\_ACEOF >conftest.sed |
| 1784 | -s/[\\$]/&&/g;s/;s,x,x,$// |
| 1785 | -_ACEOF |
| 1786 | -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` |
| 1787 | -rm -f conftest.sed |
| 1788 | +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' |
| 1789 | +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` |
| 1790 | |
| 1791 | # expand $ac_aux_dir to an absolute path |
| 1792 | am_aux_dir=`cd $ac_aux_dir && pwd` |
| 1793 | @@ -2149,66 +2266,51 @@ if eval "$MISSING --run true"; then |
| 1794 | am_missing_run="$MISSING --run " |
| 1795 | else |
| 1796 | am_missing_run= |
| 1797 | - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 |
| 1798 | -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
| 1799 | -fi |
| 1800 | - |
| 1801 | -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 |
| 1802 | -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } |
| 1803 | -if test -z "$MKDIR_P"; then |
| 1804 | - if test "${ac_cv_path_mkdir+set}" = set; then |
| 1805 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 1806 | -else |
| 1807 | - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 1808 | -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin |
| 1809 | -do |
| 1810 | - IFS=$as_save_IFS |
| 1811 | - test -z "$as_dir" && as_dir=. |
| 1812 | - for ac_prog in mkdir gmkdir; do |
| 1813 | - for ac_exec_ext in '' $ac_executable_extensions; do |
| 1814 | - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
| 1815 | - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
| 1816 | - 'mkdir (GNU coreutils) '* | \ |
| 1817 | - 'mkdir (coreutils) '* | \ |
| 1818 | - 'mkdir (fileutils) '4.1*) |
| 1819 | - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext |
| 1820 | - break 3;; |
| 1821 | - esac |
| 1822 | - done |
| 1823 | - done |
| 1824 | -done |
| 1825 | -IFS=$as_save_IFS |
| 1826 | - |
| 1827 | -fi |
| 1828 | - |
| 1829 | - if test "${ac_cv_path_mkdir+set}" = set; then |
| 1830 | - MKDIR_P="$ac_cv_path_mkdir -p" |
| 1831 | + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 |
| 1832 | +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} |
| 1833 | +fi |
| 1834 | + |
| 1835 | +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then |
| 1836 | + # We used to keeping the `.' as first argument, in order to |
| 1837 | + # allow $(mkdir_p) to be used without argument. As in |
| 1838 | + # $(mkdir_p) $(somedir) |
| 1839 | + # where $(somedir) is conditionally defined. However this is wrong |
| 1840 | + # for two reasons: |
| 1841 | + # 1. if the package is installed by a user who cannot write `.' |
| 1842 | + # make install will fail, |
| 1843 | + # 2. the above comment should most certainly read |
| 1844 | + # $(mkdir_p) $(DESTDIR)$(somedir) |
| 1845 | + # so it does not work when $(somedir) is undefined and |
| 1846 | + # $(DESTDIR) is not. |
| 1847 | + # To support the latter case, we have to write |
| 1848 | + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), |
| 1849 | + # so the `.' trick is pointless. |
| 1850 | + mkdir_p='mkdir -p --' |
| 1851 | +else |
| 1852 | + # On NextStep and OpenStep, the `mkdir' command does not |
| 1853 | + # recognize any option. It will interpret all options as |
| 1854 | + # directories to create, and then abort because `.' already |
| 1855 | + # exists. |
| 1856 | + for d in ./-p ./--version; |
| 1857 | + do |
| 1858 | + test -d $d && rmdir $d |
| 1859 | + done |
| 1860 | + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. |
| 1861 | + if test -f "$ac_aux_dir/mkinstalldirs"; then |
| 1862 | + mkdir_p='$(mkinstalldirs)' |
| 1863 | else |
| 1864 | - # As a last resort, use the slow shell script. Don't cache a |
| 1865 | - # value for MKDIR_P within a source directory, because that will |
| 1866 | - # break other packages using the cache if that directory is |
| 1867 | - # removed, or if the value is a relative name. |
| 1868 | - test -d ./--version && rmdir ./--version |
| 1869 | - MKDIR_P="$ac_install_sh -d" |
| 1870 | + mkdir_p='$(install_sh) -d' |
| 1871 | fi |
| 1872 | fi |
| 1873 | -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 |
| 1874 | -echo "${ECHO_T}$MKDIR_P" >&6; } |
| 1875 | - |
| 1876 | -mkdir_p="$MKDIR_P" |
| 1877 | -case $mkdir_p in |
| 1878 | - [\\/$]* | ?:[\\/]*) ;; |
| 1879 | - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; |
| 1880 | -esac |
| 1881 | |
| 1882 | for ac_prog in gawk mawk nawk awk |
| 1883 | do |
| 1884 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 1885 | set dummy $ac_prog; ac_word=$2 |
| 1886 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 1887 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 1888 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 1889 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 1890 | if test "${ac_cv_prog_AWK+set}" = set; then |
| 1891 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 1892 | + $as_echo_n "(cached) " >&6 |
| 1893 | else |
| 1894 | if test -n "$AWK"; then |
| 1895 | ac_cv_prog_AWK="$AWK" # Let the user override the test. |
| 1896 | @@ -2221,7 +2323,7 @@ do |
| 1897 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 1898 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 1899 | ac_cv_prog_AWK="$ac_prog" |
| 1900 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 1901 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 1902 | break 2 |
| 1903 | fi |
| 1904 | done |
| 1905 | @@ -2232,22 +2334,23 @@ fi |
| 1906 | fi |
| 1907 | AWK=$ac_cv_prog_AWK |
| 1908 | if test -n "$AWK"; then |
| 1909 | - { echo "$as_me:$LINENO: result: $AWK" >&5 |
| 1910 | -echo "${ECHO_T}$AWK" >&6; } |
| 1911 | + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 |
| 1912 | +$as_echo "$AWK" >&6; } |
| 1913 | else |
| 1914 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 1915 | -echo "${ECHO_T}no" >&6; } |
| 1916 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 1917 | +$as_echo "no" >&6; } |
| 1918 | fi |
| 1919 | |
| 1920 | |
| 1921 | test -n "$AWK" && break |
| 1922 | done |
| 1923 | |
| 1924 | -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
| 1925 | -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } |
| 1926 | -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
| 1927 | +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 |
| 1928 | +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
| 1929 | +set x ${MAKE-make} |
| 1930 | +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
| 1931 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then |
| 1932 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 1933 | + $as_echo_n "(cached) " >&6 |
| 1934 | else |
| 1935 | cat >conftest.make <<\_ACEOF |
| 1936 | SHELL = /bin/sh |
| 1937 | @@ -2264,12 +2367,12 @@ esac |
| 1938 | rm -f conftest.make |
| 1939 | fi |
| 1940 | if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then |
| 1941 | - { echo "$as_me:$LINENO: result: yes" >&5 |
| 1942 | -echo "${ECHO_T}yes" >&6; } |
| 1943 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 1944 | +$as_echo "yes" >&6; } |
| 1945 | SET_MAKE= |
| 1946 | else |
| 1947 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 1948 | -echo "${ECHO_T}no" >&6; } |
| 1949 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 1950 | +$as_echo "no" >&6; } |
| 1951 | SET_MAKE="MAKE=${MAKE-make}" |
| 1952 | fi |
| 1953 | |
| 1954 | @@ -2282,16 +2385,12 @@ else |
| 1955 | fi |
| 1956 | rmdir .tst 2>/dev/null |
| 1957 | |
| 1958 | -if test "`cd $srcdir && pwd`" != "`pwd`"; then |
| 1959 | - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
| 1960 | - # is not polluted with repeated "-I." |
| 1961 | - am__isrc=' -I$(srcdir)' |
| 1962 | - # test to see if srcdir already configured |
| 1963 | - if test -f $srcdir/config.status; then |
| 1964 | - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 |
| 1965 | -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} |
| 1966 | +# test to see if srcdir already configured |
| 1967 | +if test "`cd $srcdir && pwd`" != "`pwd`" && |
| 1968 | + test -f $srcdir/config.status; then |
| 1969 | + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 |
| 1970 | +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} |
| 1971 | { (exit 1); exit 1; }; } |
| 1972 | - fi |
| 1973 | fi |
| 1974 | |
| 1975 | # test whether we have cygpath |
| 1976 | @@ -2334,7 +2433,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} |
| 1977 | |
| 1978 | MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} |
| 1979 | |
| 1980 | -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} |
| 1981 | +install_sh=${install_sh-"$am_aux_dir/install-sh"} |
| 1982 | |
| 1983 | # Installed binaries are usually stripped using `strip' when the user |
| 1984 | # run `make install-strip'. However `strip' might not be the right |
| 1985 | @@ -2344,10 +2443,10 @@ if test "$cross_compiling" != no; then |
| 1986 | if test -n "$ac_tool_prefix"; then |
| 1987 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 1988 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 1989 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 1990 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 1991 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 1992 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 1993 | if test "${ac_cv_prog_STRIP+set}" = set; then |
| 1994 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 1995 | + $as_echo_n "(cached) " >&6 |
| 1996 | else |
| 1997 | if test -n "$STRIP"; then |
| 1998 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. |
| 1999 | @@ -2360,7 +2459,7 @@ do |
| 2000 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2001 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2002 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
| 2003 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2004 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2005 | break 2 |
| 2006 | fi |
| 2007 | done |
| 2008 | @@ -2371,11 +2470,11 @@ fi |
| 2009 | fi |
| 2010 | STRIP=$ac_cv_prog_STRIP |
| 2011 | if test -n "$STRIP"; then |
| 2012 | - { echo "$as_me:$LINENO: result: $STRIP" >&5 |
| 2013 | -echo "${ECHO_T}$STRIP" >&6; } |
| 2014 | + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 |
| 2015 | +$as_echo "$STRIP" >&6; } |
| 2016 | else |
| 2017 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2018 | -echo "${ECHO_T}no" >&6; } |
| 2019 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2020 | +$as_echo "no" >&6; } |
| 2021 | fi |
| 2022 | |
| 2023 | |
| 2024 | @@ -2384,10 +2483,10 @@ if test -z "$ac_cv_prog_STRIP"; then |
| 2025 | ac_ct_STRIP=$STRIP |
| 2026 | # Extract the first word of "strip", so it can be a program name with args. |
| 2027 | set dummy strip; ac_word=$2 |
| 2028 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2029 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2030 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2031 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2032 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then |
| 2033 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2034 | + $as_echo_n "(cached) " >&6 |
| 2035 | else |
| 2036 | if test -n "$ac_ct_STRIP"; then |
| 2037 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. |
| 2038 | @@ -2400,7 +2499,7 @@ do |
| 2039 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2040 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2041 | ac_cv_prog_ac_ct_STRIP="strip" |
| 2042 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2043 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2044 | break 2 |
| 2045 | fi |
| 2046 | done |
| 2047 | @@ -2411,11 +2510,11 @@ fi |
| 2048 | fi |
| 2049 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP |
| 2050 | if test -n "$ac_ct_STRIP"; then |
| 2051 | - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
| 2052 | -echo "${ECHO_T}$ac_ct_STRIP" >&6; } |
| 2053 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
| 2054 | +$as_echo "$ac_ct_STRIP" >&6; } |
| 2055 | else |
| 2056 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2057 | -echo "${ECHO_T}no" >&6; } |
| 2058 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2059 | +$as_echo "no" >&6; } |
| 2060 | fi |
| 2061 | |
| 2062 | if test "x$ac_ct_STRIP" = x; then |
| 2063 | @@ -2423,12 +2522,8 @@ fi |
| 2064 | else |
| 2065 | case $cross_compiling:$ac_tool_warned in |
| 2066 | yes:) |
| 2067 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 2068 | -whose name does not start with the host triplet. If you think this |
| 2069 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 2070 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 2071 | -whose name does not start with the host triplet. If you think this |
| 2072 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 2073 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2074 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2075 | ac_tool_warned=yes ;; |
| 2076 | esac |
| 2077 | STRIP=$ac_ct_STRIP |
| 2078 | @@ -2438,7 +2533,7 @@ else |
| 2079 | fi |
| 2080 | |
| 2081 | fi |
| 2082 | -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
| 2083 | +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
| 2084 | |
| 2085 | # We need awk for the "check" target. The system "awk" is bad on |
| 2086 | # some platforms. |
| 2087 | @@ -2459,8 +2554,8 @@ ac_config_headers="$ac_config_headers src/config.h" |
| 2088 | |
| 2089 | |
| 2090 | # Build time sanity check |
| 2091 | -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
| 2092 | -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } |
| 2093 | +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 |
| 2094 | +$as_echo_n "checking whether build environment is sane... " >&6; } |
| 2095 | # Just in case |
| 2096 | sleep 1 |
| 2097 | echo timestamp > conftest.file |
| 2098 | @@ -2483,9 +2578,9 @@ if ( |
| 2099 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
| 2100 | # broken ls alias from the environment. This has actually |
| 2101 | # happened. Such a system could not be considered "sane". |
| 2102 | - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken |
| 2103 | + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken |
| 2104 | alias in your environment" >&5 |
| 2105 | -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken |
| 2106 | +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken |
| 2107 | alias in your environment" >&2;} |
| 2108 | { (exit 1); exit 1; }; } |
| 2109 | fi |
| 2110 | @@ -2496,14 +2591,14 @@ then |
| 2111 | # Ok. |
| 2112 | : |
| 2113 | else |
| 2114 | - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! |
| 2115 | + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! |
| 2116 | Check your system clock" >&5 |
| 2117 | -echo "$as_me: error: newly created file is older than distributed files! |
| 2118 | +$as_echo "$as_me: error: newly created file is older than distributed files! |
| 2119 | Check your system clock" >&2;} |
| 2120 | { (exit 1); exit 1; }; } |
| 2121 | fi |
| 2122 | -{ echo "$as_me:$LINENO: result: yes" >&5 |
| 2123 | -echo "${ECHO_T}yes" >&6; } |
| 2124 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 2125 | +$as_echo "yes" >&6; } |
| 2126 | |
| 2127 | # Look for install program |
| 2128 | # Find a good install program. We prefer a C program (faster), |
| 2129 | @@ -2519,11 +2614,12 @@ echo "${ECHO_T}yes" >&6; } |
| 2130 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" |
| 2131 | # OS/2's system install, which has a completely different semantic |
| 2132 | # ./install, which can be erroneously created by make from ./install.sh. |
| 2133 | -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
| 2134 | -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } |
| 2135 | +# Reject install programs that cannot install multiple files. |
| 2136 | +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 |
| 2137 | +$as_echo_n "checking for a BSD-compatible install... " >&6; } |
| 2138 | if test -z "$INSTALL"; then |
| 2139 | if test "${ac_cv_path_install+set}" = set; then |
| 2140 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2141 | + $as_echo_n "(cached) " >&6 |
| 2142 | else |
| 2143 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 2144 | for as_dir in $PATH |
| 2145 | @@ -2552,17 +2648,29 @@ case $as_dir/ in |
| 2146 | # program-specific install script used by HP pwplus--don't use. |
| 2147 | : |
| 2148 | else |
| 2149 | - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
| 2150 | - break 3 |
| 2151 | + rm -rf conftest.one conftest.two conftest.dir |
| 2152 | + echo one > conftest.one |
| 2153 | + echo two > conftest.two |
| 2154 | + mkdir conftest.dir |
| 2155 | + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && |
| 2156 | + test -s conftest.one && test -s conftest.two && |
| 2157 | + test -s conftest.dir/conftest.one && |
| 2158 | + test -s conftest.dir/conftest.two |
| 2159 | + then |
| 2160 | + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" |
| 2161 | + break 3 |
| 2162 | + fi |
| 2163 | fi |
| 2164 | fi |
| 2165 | done |
| 2166 | done |
| 2167 | ;; |
| 2168 | esac |
| 2169 | + |
| 2170 | done |
| 2171 | IFS=$as_save_IFS |
| 2172 | |
| 2173 | +rm -rf conftest.one conftest.two conftest.dir |
| 2174 | |
| 2175 | fi |
| 2176 | if test "${ac_cv_path_install+set}" = set; then |
| 2177 | @@ -2575,8 +2683,8 @@ fi |
| 2178 | INSTALL=$ac_install_sh |
| 2179 | fi |
| 2180 | fi |
| 2181 | -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 |
| 2182 | -echo "${ECHO_T}$INSTALL" >&6; } |
| 2183 | +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 |
| 2184 | +$as_echo "$INSTALL" >&6; } |
| 2185 | |
| 2186 | # Use test -z because SunOS4 sh mishandles braces in ${var-val}. |
| 2187 | # It thinks the first close brace ends the variable substitution. |
| 2188 | @@ -2596,10 +2704,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 2189 | if test -n "$ac_tool_prefix"; then |
| 2190 | # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
| 2191 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
| 2192 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2193 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2194 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2195 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2196 | if test "${ac_cv_prog_CC+set}" = set; then |
| 2197 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2198 | + $as_echo_n "(cached) " >&6 |
| 2199 | else |
| 2200 | if test -n "$CC"; then |
| 2201 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| 2202 | @@ -2612,7 +2720,7 @@ do |
| 2203 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2204 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2205 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
| 2206 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2207 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2208 | break 2 |
| 2209 | fi |
| 2210 | done |
| 2211 | @@ -2623,11 +2731,11 @@ fi |
| 2212 | fi |
| 2213 | CC=$ac_cv_prog_CC |
| 2214 | if test -n "$CC"; then |
| 2215 | - { echo "$as_me:$LINENO: result: $CC" >&5 |
| 2216 | -echo "${ECHO_T}$CC" >&6; } |
| 2217 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
| 2218 | +$as_echo "$CC" >&6; } |
| 2219 | else |
| 2220 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2221 | -echo "${ECHO_T}no" >&6; } |
| 2222 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2223 | +$as_echo "no" >&6; } |
| 2224 | fi |
| 2225 | |
| 2226 | |
| 2227 | @@ -2636,10 +2744,10 @@ if test -z "$ac_cv_prog_CC"; then |
| 2228 | ac_ct_CC=$CC |
| 2229 | # Extract the first word of "gcc", so it can be a program name with args. |
| 2230 | set dummy gcc; ac_word=$2 |
| 2231 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2232 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2233 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2234 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2235 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
| 2236 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2237 | + $as_echo_n "(cached) " >&6 |
| 2238 | else |
| 2239 | if test -n "$ac_ct_CC"; then |
| 2240 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| 2241 | @@ -2652,7 +2760,7 @@ do |
| 2242 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2243 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2244 | ac_cv_prog_ac_ct_CC="gcc" |
| 2245 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2246 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2247 | break 2 |
| 2248 | fi |
| 2249 | done |
| 2250 | @@ -2663,11 +2771,11 @@ fi |
| 2251 | fi |
| 2252 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
| 2253 | if test -n "$ac_ct_CC"; then |
| 2254 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
| 2255 | -echo "${ECHO_T}$ac_ct_CC" >&6; } |
| 2256 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
| 2257 | +$as_echo "$ac_ct_CC" >&6; } |
| 2258 | else |
| 2259 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2260 | -echo "${ECHO_T}no" >&6; } |
| 2261 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2262 | +$as_echo "no" >&6; } |
| 2263 | fi |
| 2264 | |
| 2265 | if test "x$ac_ct_CC" = x; then |
| 2266 | @@ -2675,12 +2783,8 @@ fi |
| 2267 | else |
| 2268 | case $cross_compiling:$ac_tool_warned in |
| 2269 | yes:) |
| 2270 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 2271 | -whose name does not start with the host triplet. If you think this |
| 2272 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 2273 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 2274 | -whose name does not start with the host triplet. If you think this |
| 2275 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 2276 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2277 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2278 | ac_tool_warned=yes ;; |
| 2279 | esac |
| 2280 | CC=$ac_ct_CC |
| 2281 | @@ -2693,10 +2797,10 @@ if test -z "$CC"; then |
| 2282 | if test -n "$ac_tool_prefix"; then |
| 2283 | # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
| 2284 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
| 2285 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2286 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2287 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2288 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2289 | if test "${ac_cv_prog_CC+set}" = set; then |
| 2290 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2291 | + $as_echo_n "(cached) " >&6 |
| 2292 | else |
| 2293 | if test -n "$CC"; then |
| 2294 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| 2295 | @@ -2709,7 +2813,7 @@ do |
| 2296 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2297 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2298 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
| 2299 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2300 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2301 | break 2 |
| 2302 | fi |
| 2303 | done |
| 2304 | @@ -2720,11 +2824,11 @@ fi |
| 2305 | fi |
| 2306 | CC=$ac_cv_prog_CC |
| 2307 | if test -n "$CC"; then |
| 2308 | - { echo "$as_me:$LINENO: result: $CC" >&5 |
| 2309 | -echo "${ECHO_T}$CC" >&6; } |
| 2310 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
| 2311 | +$as_echo "$CC" >&6; } |
| 2312 | else |
| 2313 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2314 | -echo "${ECHO_T}no" >&6; } |
| 2315 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2316 | +$as_echo "no" >&6; } |
| 2317 | fi |
| 2318 | |
| 2319 | |
| 2320 | @@ -2733,10 +2837,10 @@ fi |
| 2321 | if test -z "$CC"; then |
| 2322 | # Extract the first word of "cc", so it can be a program name with args. |
| 2323 | set dummy cc; ac_word=$2 |
| 2324 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2325 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2326 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2327 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2328 | if test "${ac_cv_prog_CC+set}" = set; then |
| 2329 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2330 | + $as_echo_n "(cached) " >&6 |
| 2331 | else |
| 2332 | if test -n "$CC"; then |
| 2333 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| 2334 | @@ -2754,7 +2858,7 @@ do |
| 2335 | continue |
| 2336 | fi |
| 2337 | ac_cv_prog_CC="cc" |
| 2338 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2339 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2340 | break 2 |
| 2341 | fi |
| 2342 | done |
| 2343 | @@ -2777,11 +2881,11 @@ fi |
| 2344 | fi |
| 2345 | CC=$ac_cv_prog_CC |
| 2346 | if test -n "$CC"; then |
| 2347 | - { echo "$as_me:$LINENO: result: $CC" >&5 |
| 2348 | -echo "${ECHO_T}$CC" >&6; } |
| 2349 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
| 2350 | +$as_echo "$CC" >&6; } |
| 2351 | else |
| 2352 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2353 | -echo "${ECHO_T}no" >&6; } |
| 2354 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2355 | +$as_echo "no" >&6; } |
| 2356 | fi |
| 2357 | |
| 2358 | |
| 2359 | @@ -2792,10 +2896,10 @@ if test -z "$CC"; then |
| 2360 | do |
| 2361 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 2362 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 2363 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2364 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2365 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2366 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2367 | if test "${ac_cv_prog_CC+set}" = set; then |
| 2368 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2369 | + $as_echo_n "(cached) " >&6 |
| 2370 | else |
| 2371 | if test -n "$CC"; then |
| 2372 | ac_cv_prog_CC="$CC" # Let the user override the test. |
| 2373 | @@ -2808,7 +2912,7 @@ do |
| 2374 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2375 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2376 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
| 2377 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2378 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2379 | break 2 |
| 2380 | fi |
| 2381 | done |
| 2382 | @@ -2819,11 +2923,11 @@ fi |
| 2383 | fi |
| 2384 | CC=$ac_cv_prog_CC |
| 2385 | if test -n "$CC"; then |
| 2386 | - { echo "$as_me:$LINENO: result: $CC" >&5 |
| 2387 | -echo "${ECHO_T}$CC" >&6; } |
| 2388 | + { $as_echo "$as_me:$LINENO: result: $CC" >&5 |
| 2389 | +$as_echo "$CC" >&6; } |
| 2390 | else |
| 2391 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2392 | -echo "${ECHO_T}no" >&6; } |
| 2393 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2394 | +$as_echo "no" >&6; } |
| 2395 | fi |
| 2396 | |
| 2397 | |
| 2398 | @@ -2836,10 +2940,10 @@ if test -z "$CC"; then |
| 2399 | do |
| 2400 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 2401 | set dummy $ac_prog; ac_word=$2 |
| 2402 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2403 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 2404 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 2405 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 2406 | if test "${ac_cv_prog_ac_ct_CC+set}" = set; then |
| 2407 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2408 | + $as_echo_n "(cached) " >&6 |
| 2409 | else |
| 2410 | if test -n "$ac_ct_CC"; then |
| 2411 | ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
| 2412 | @@ -2852,7 +2956,7 @@ do |
| 2413 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 2414 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 2415 | ac_cv_prog_ac_ct_CC="$ac_prog" |
| 2416 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2417 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 2418 | break 2 |
| 2419 | fi |
| 2420 | done |
| 2421 | @@ -2863,11 +2967,11 @@ fi |
| 2422 | fi |
| 2423 | ac_ct_CC=$ac_cv_prog_ac_ct_CC |
| 2424 | if test -n "$ac_ct_CC"; then |
| 2425 | - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
| 2426 | -echo "${ECHO_T}$ac_ct_CC" >&6; } |
| 2427 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 |
| 2428 | +$as_echo "$ac_ct_CC" >&6; } |
| 2429 | else |
| 2430 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 2431 | -echo "${ECHO_T}no" >&6; } |
| 2432 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 2433 | +$as_echo "no" >&6; } |
| 2434 | fi |
| 2435 | |
| 2436 | |
| 2437 | @@ -2879,12 +2983,8 @@ done |
| 2438 | else |
| 2439 | case $cross_compiling:$ac_tool_warned in |
| 2440 | yes:) |
| 2441 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 2442 | -whose name does not start with the host triplet. If you think this |
| 2443 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 2444 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 2445 | -whose name does not start with the host triplet. If you think this |
| 2446 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 2447 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 2448 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 2449 | ac_tool_warned=yes ;; |
| 2450 | esac |
| 2451 | CC=$ac_ct_CC |
| 2452 | @@ -2894,44 +2994,50 @@ fi |
| 2453 | fi |
| 2454 | |
| 2455 | |
| 2456 | -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
| 2457 | +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 2458 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2459 | +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH |
| 2460 | See \`config.log' for more details." >&5 |
| 2461 | -echo "$as_me: error: no acceptable C compiler found in \$PATH |
| 2462 | +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH |
| 2463 | See \`config.log' for more details." >&2;} |
| 2464 | - { (exit 1); exit 1; }; } |
| 2465 | + { (exit 1); exit 1; }; }; } |
| 2466 | |
| 2467 | # Provide some information about the compiler. |
| 2468 | -echo "$as_me:$LINENO: checking for C compiler version" >&5 |
| 2469 | -ac_compiler=`set X $ac_compile; echo $2` |
| 2470 | +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 |
| 2471 | +set X $ac_compile |
| 2472 | +ac_compiler=$2 |
| 2473 | { (ac_try="$ac_compiler --version >&5" |
| 2474 | case "(($ac_try" in |
| 2475 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2476 | *) ac_try_echo=$ac_try;; |
| 2477 | esac |
| 2478 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2479 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2480 | +$as_echo "$ac_try_echo") >&5 |
| 2481 | (eval "$ac_compiler --version >&5") 2>&5 |
| 2482 | ac_status=$? |
| 2483 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2484 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2485 | (exit $ac_status); } |
| 2486 | { (ac_try="$ac_compiler -v >&5" |
| 2487 | case "(($ac_try" in |
| 2488 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2489 | *) ac_try_echo=$ac_try;; |
| 2490 | esac |
| 2491 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2492 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2493 | +$as_echo "$ac_try_echo") >&5 |
| 2494 | (eval "$ac_compiler -v >&5") 2>&5 |
| 2495 | ac_status=$? |
| 2496 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2497 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2498 | (exit $ac_status); } |
| 2499 | { (ac_try="$ac_compiler -V >&5" |
| 2500 | case "(($ac_try" in |
| 2501 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2502 | *) ac_try_echo=$ac_try;; |
| 2503 | esac |
| 2504 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2505 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2506 | +$as_echo "$ac_try_echo") >&5 |
| 2507 | (eval "$ac_compiler -V >&5") 2>&5 |
| 2508 | ac_status=$? |
| 2509 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2510 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2511 | (exit $ac_status); } |
| 2512 | |
| 2513 | cat >conftest.$ac_ext <<_ACEOF |
| 2514 | @@ -2950,27 +3056,22 @@ main () |
| 2515 | } |
| 2516 | _ACEOF |
| 2517 | ac_clean_files_save=$ac_clean_files |
| 2518 | -ac_clean_files="$ac_clean_files a.out a.exe b.out" |
| 2519 | +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
| 2520 | # Try to create an executable without -o first, disregard a.out. |
| 2521 | # It will help us diagnose broken compilers, and finding out an intuition |
| 2522 | # of exeext. |
| 2523 | -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 |
| 2524 | -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } |
| 2525 | -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
| 2526 | -# |
| 2527 | -# List of possible output files, starting from the most likely. |
| 2528 | -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) |
| 2529 | -# only as a last resort. b.out is created by i960 compilers. |
| 2530 | -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' |
| 2531 | -# |
| 2532 | -# The IRIX 6 linker writes into existing files which may not be |
| 2533 | -# executable, retaining their permissions. Remove them first so a |
| 2534 | -# subsequent execution test works. |
| 2535 | +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 |
| 2536 | +$as_echo_n "checking for C compiler default output file name... " >&6; } |
| 2537 | +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
| 2538 | + |
| 2539 | +# The possible output files: |
| 2540 | +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" |
| 2541 | + |
| 2542 | ac_rmfiles= |
| 2543 | for ac_file in $ac_files |
| 2544 | do |
| 2545 | case $ac_file in |
| 2546 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; |
| 2547 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
| 2548 | * ) ac_rmfiles="$ac_rmfiles $ac_file";; |
| 2549 | esac |
| 2550 | done |
| 2551 | @@ -2981,10 +3082,11 @@ case "(($ac_try" in |
| 2552 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2553 | *) ac_try_echo=$ac_try;; |
| 2554 | esac |
| 2555 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2556 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2557 | +$as_echo "$ac_try_echo") >&5 |
| 2558 | (eval "$ac_link_default") 2>&5 |
| 2559 | ac_status=$? |
| 2560 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2561 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2562 | (exit $ac_status); }; then |
| 2563 | # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. |
| 2564 | # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' |
| 2565 | @@ -2995,7 +3097,7 @@ for ac_file in $ac_files '' |
| 2566 | do |
| 2567 | test -f "$ac_file" || continue |
| 2568 | case $ac_file in |
| 2569 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) |
| 2570 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) |
| 2571 | ;; |
| 2572 | [ab].out ) |
| 2573 | # We found the default executable, but exeext='' is most |
| 2574 | @@ -3022,25 +3124,27 @@ else |
| 2575 | ac_file='' |
| 2576 | fi |
| 2577 | |
| 2578 | -{ echo "$as_me:$LINENO: result: $ac_file" >&5 |
| 2579 | -echo "${ECHO_T}$ac_file" >&6; } |
| 2580 | +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 |
| 2581 | +$as_echo "$ac_file" >&6; } |
| 2582 | if test -z "$ac_file"; then |
| 2583 | - echo "$as_me: failed program was:" >&5 |
| 2584 | + $as_echo "$as_me: failed program was:" >&5 |
| 2585 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2586 | |
| 2587 | -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables |
| 2588 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 2589 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2590 | +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables |
| 2591 | See \`config.log' for more details." >&5 |
| 2592 | -echo "$as_me: error: C compiler cannot create executables |
| 2593 | +$as_echo "$as_me: error: C compiler cannot create executables |
| 2594 | See \`config.log' for more details." >&2;} |
| 2595 | - { (exit 77); exit 77; }; } |
| 2596 | + { (exit 77); exit 77; }; }; } |
| 2597 | fi |
| 2598 | |
| 2599 | ac_exeext=$ac_cv_exeext |
| 2600 | |
| 2601 | # Check that the compiler produces executables we can run. If not, either |
| 2602 | # the compiler is broken, or we cross compile. |
| 2603 | -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
| 2604 | -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } |
| 2605 | +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 |
| 2606 | +$as_echo_n "checking whether the C compiler works... " >&6; } |
| 2607 | # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 |
| 2608 | # If not cross compiling, check that we can run a simple program. |
| 2609 | if test "$cross_compiling" != yes; then |
| 2610 | @@ -3049,49 +3153,53 @@ if test "$cross_compiling" != yes; then |
| 2611 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2612 | *) ac_try_echo=$ac_try;; |
| 2613 | esac |
| 2614 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2615 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2616 | +$as_echo "$ac_try_echo") >&5 |
| 2617 | (eval "$ac_try") 2>&5 |
| 2618 | ac_status=$? |
| 2619 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2620 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2621 | (exit $ac_status); }; }; then |
| 2622 | cross_compiling=no |
| 2623 | else |
| 2624 | if test "$cross_compiling" = maybe; then |
| 2625 | cross_compiling=yes |
| 2626 | else |
| 2627 | - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. |
| 2628 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 2629 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2630 | +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. |
| 2631 | If you meant to cross compile, use \`--host'. |
| 2632 | See \`config.log' for more details." >&5 |
| 2633 | -echo "$as_me: error: cannot run C compiled programs. |
| 2634 | +$as_echo "$as_me: error: cannot run C compiled programs. |
| 2635 | If you meant to cross compile, use \`--host'. |
| 2636 | See \`config.log' for more details." >&2;} |
| 2637 | - { (exit 1); exit 1; }; } |
| 2638 | + { (exit 1); exit 1; }; }; } |
| 2639 | fi |
| 2640 | fi |
| 2641 | fi |
| 2642 | -{ echo "$as_me:$LINENO: result: yes" >&5 |
| 2643 | -echo "${ECHO_T}yes" >&6; } |
| 2644 | +{ $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 2645 | +$as_echo "yes" >&6; } |
| 2646 | |
| 2647 | -rm -f a.out a.exe conftest$ac_cv_exeext b.out |
| 2648 | +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
| 2649 | ac_clean_files=$ac_clean_files_save |
| 2650 | # Check that the compiler produces executables we can run. If not, either |
| 2651 | # the compiler is broken, or we cross compile. |
| 2652 | -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
| 2653 | -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } |
| 2654 | -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
| 2655 | -echo "${ECHO_T}$cross_compiling" >&6; } |
| 2656 | +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 |
| 2657 | +$as_echo_n "checking whether we are cross compiling... " >&6; } |
| 2658 | +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 |
| 2659 | +$as_echo "$cross_compiling" >&6; } |
| 2660 | |
| 2661 | -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
| 2662 | -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } |
| 2663 | +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 |
| 2664 | +$as_echo_n "checking for suffix of executables... " >&6; } |
| 2665 | if { (ac_try="$ac_link" |
| 2666 | case "(($ac_try" in |
| 2667 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2668 | *) ac_try_echo=$ac_try;; |
| 2669 | esac |
| 2670 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2671 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2672 | +$as_echo "$ac_try_echo") >&5 |
| 2673 | (eval "$ac_link") 2>&5 |
| 2674 | ac_status=$? |
| 2675 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2676 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2677 | (exit $ac_status); }; then |
| 2678 | # If both `conftest.exe' and `conftest' are `present' (well, observable) |
| 2679 | # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
| 2680 | @@ -3100,31 +3208,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2681 | for ac_file in conftest.exe conftest conftest.*; do |
| 2682 | test -f "$ac_file" || continue |
| 2683 | case $ac_file in |
| 2684 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; |
| 2685 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
| 2686 | *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
| 2687 | break;; |
| 2688 | * ) break;; |
| 2689 | esac |
| 2690 | done |
| 2691 | else |
| 2692 | - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link |
| 2693 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 2694 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2695 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link |
| 2696 | See \`config.log' for more details." >&5 |
| 2697 | -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link |
| 2698 | +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link |
| 2699 | See \`config.log' for more details." >&2;} |
| 2700 | - { (exit 1); exit 1; }; } |
| 2701 | + { (exit 1); exit 1; }; }; } |
| 2702 | fi |
| 2703 | |
| 2704 | rm -f conftest$ac_cv_exeext |
| 2705 | -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
| 2706 | -echo "${ECHO_T}$ac_cv_exeext" >&6; } |
| 2707 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 |
| 2708 | +$as_echo "$ac_cv_exeext" >&6; } |
| 2709 | |
| 2710 | rm -f conftest.$ac_ext |
| 2711 | EXEEXT=$ac_cv_exeext |
| 2712 | ac_exeext=$EXEEXT |
| 2713 | -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
| 2714 | -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } |
| 2715 | +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 |
| 2716 | +$as_echo_n "checking for suffix of object files... " >&6; } |
| 2717 | if test "${ac_cv_objext+set}" = set; then |
| 2718 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2719 | + $as_echo_n "(cached) " >&6 |
| 2720 | else |
| 2721 | cat >conftest.$ac_ext <<_ACEOF |
| 2722 | /* confdefs.h. */ |
| 2723 | @@ -3147,40 +3257,43 @@ case "(($ac_try" in |
| 2724 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2725 | *) ac_try_echo=$ac_try;; |
| 2726 | esac |
| 2727 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2728 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2729 | +$as_echo "$ac_try_echo") >&5 |
| 2730 | (eval "$ac_compile") 2>&5 |
| 2731 | ac_status=$? |
| 2732 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2733 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2734 | (exit $ac_status); }; then |
| 2735 | for ac_file in conftest.o conftest.obj conftest.*; do |
| 2736 | test -f "$ac_file" || continue; |
| 2737 | case $ac_file in |
| 2738 | - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; |
| 2739 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; |
| 2740 | *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
| 2741 | break;; |
| 2742 | esac |
| 2743 | done |
| 2744 | else |
| 2745 | - echo "$as_me: failed program was:" >&5 |
| 2746 | + $as_echo "$as_me: failed program was:" >&5 |
| 2747 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2748 | |
| 2749 | -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
| 2750 | +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 2751 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 2752 | +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile |
| 2753 | See \`config.log' for more details." >&5 |
| 2754 | -echo "$as_me: error: cannot compute suffix of object files: cannot compile |
| 2755 | +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile |
| 2756 | See \`config.log' for more details." >&2;} |
| 2757 | - { (exit 1); exit 1; }; } |
| 2758 | + { (exit 1); exit 1; }; }; } |
| 2759 | fi |
| 2760 | |
| 2761 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
| 2762 | fi |
| 2763 | -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
| 2764 | -echo "${ECHO_T}$ac_cv_objext" >&6; } |
| 2765 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 |
| 2766 | +$as_echo "$ac_cv_objext" >&6; } |
| 2767 | OBJEXT=$ac_cv_objext |
| 2768 | ac_objext=$OBJEXT |
| 2769 | -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
| 2770 | -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } |
| 2771 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 |
| 2772 | +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
| 2773 | if test "${ac_cv_c_compiler_gnu+set}" = set; then |
| 2774 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2775 | + $as_echo_n "(cached) " >&6 |
| 2776 | else |
| 2777 | cat >conftest.$ac_ext <<_ACEOF |
| 2778 | /* confdefs.h. */ |
| 2779 | @@ -3206,20 +3319,21 @@ case "(($ac_try" in |
| 2780 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2781 | *) ac_try_echo=$ac_try;; |
| 2782 | esac |
| 2783 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2784 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2785 | +$as_echo "$ac_try_echo") >&5 |
| 2786 | (eval "$ac_compile") 2>conftest.er1 |
| 2787 | ac_status=$? |
| 2788 | grep -v '^ *+' conftest.er1 >conftest.err |
| 2789 | rm -f conftest.er1 |
| 2790 | cat conftest.err >&5 |
| 2791 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2792 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2793 | (exit $ac_status); } && { |
| 2794 | test -z "$ac_c_werror_flag" || |
| 2795 | test ! -s conftest.err |
| 2796 | } && test -s conftest.$ac_objext; then |
| 2797 | ac_compiler_gnu=yes |
| 2798 | else |
| 2799 | - echo "$as_me: failed program was:" >&5 |
| 2800 | + $as_echo "$as_me: failed program was:" >&5 |
| 2801 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2802 | |
| 2803 | ac_compiler_gnu=no |
| 2804 | @@ -3229,15 +3343,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 2805 | ac_cv_c_compiler_gnu=$ac_compiler_gnu |
| 2806 | |
| 2807 | fi |
| 2808 | -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
| 2809 | -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } |
| 2810 | -GCC=`test $ac_compiler_gnu = yes && echo yes` |
| 2811 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 |
| 2812 | +$as_echo "$ac_cv_c_compiler_gnu" >&6; } |
| 2813 | +if test $ac_compiler_gnu = yes; then |
| 2814 | + GCC=yes |
| 2815 | +else |
| 2816 | + GCC= |
| 2817 | +fi |
| 2818 | ac_test_CFLAGS=${CFLAGS+set} |
| 2819 | ac_save_CFLAGS=$CFLAGS |
| 2820 | -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
| 2821 | -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } |
| 2822 | +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 |
| 2823 | +$as_echo_n "checking whether $CC accepts -g... " >&6; } |
| 2824 | if test "${ac_cv_prog_cc_g+set}" = set; then |
| 2825 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2826 | + $as_echo_n "(cached) " >&6 |
| 2827 | else |
| 2828 | ac_save_c_werror_flag=$ac_c_werror_flag |
| 2829 | ac_c_werror_flag=yes |
| 2830 | @@ -3264,20 +3382,21 @@ case "(($ac_try" in |
| 2831 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2832 | *) ac_try_echo=$ac_try;; |
| 2833 | esac |
| 2834 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2835 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2836 | +$as_echo "$ac_try_echo") >&5 |
| 2837 | (eval "$ac_compile") 2>conftest.er1 |
| 2838 | ac_status=$? |
| 2839 | grep -v '^ *+' conftest.er1 >conftest.err |
| 2840 | rm -f conftest.er1 |
| 2841 | cat conftest.err >&5 |
| 2842 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2843 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2844 | (exit $ac_status); } && { |
| 2845 | test -z "$ac_c_werror_flag" || |
| 2846 | test ! -s conftest.err |
| 2847 | } && test -s conftest.$ac_objext; then |
| 2848 | ac_cv_prog_cc_g=yes |
| 2849 | else |
| 2850 | - echo "$as_me: failed program was:" >&5 |
| 2851 | + $as_echo "$as_me: failed program was:" >&5 |
| 2852 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2853 | |
| 2854 | CFLAGS="" |
| 2855 | @@ -3302,20 +3421,21 @@ case "(($ac_try" in |
| 2856 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2857 | *) ac_try_echo=$ac_try;; |
| 2858 | esac |
| 2859 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2860 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2861 | +$as_echo "$ac_try_echo") >&5 |
| 2862 | (eval "$ac_compile") 2>conftest.er1 |
| 2863 | ac_status=$? |
| 2864 | grep -v '^ *+' conftest.er1 >conftest.err |
| 2865 | rm -f conftest.er1 |
| 2866 | cat conftest.err >&5 |
| 2867 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2868 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2869 | (exit $ac_status); } && { |
| 2870 | test -z "$ac_c_werror_flag" || |
| 2871 | test ! -s conftest.err |
| 2872 | } && test -s conftest.$ac_objext; then |
| 2873 | : |
| 2874 | else |
| 2875 | - echo "$as_me: failed program was:" >&5 |
| 2876 | + $as_echo "$as_me: failed program was:" >&5 |
| 2877 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2878 | |
| 2879 | ac_c_werror_flag=$ac_save_c_werror_flag |
| 2880 | @@ -3341,20 +3461,21 @@ case "(($ac_try" in |
| 2881 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2882 | *) ac_try_echo=$ac_try;; |
| 2883 | esac |
| 2884 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2885 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2886 | +$as_echo "$ac_try_echo") >&5 |
| 2887 | (eval "$ac_compile") 2>conftest.er1 |
| 2888 | ac_status=$? |
| 2889 | grep -v '^ *+' conftest.er1 >conftest.err |
| 2890 | rm -f conftest.er1 |
| 2891 | cat conftest.err >&5 |
| 2892 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2893 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2894 | (exit $ac_status); } && { |
| 2895 | test -z "$ac_c_werror_flag" || |
| 2896 | test ! -s conftest.err |
| 2897 | } && test -s conftest.$ac_objext; then |
| 2898 | ac_cv_prog_cc_g=yes |
| 2899 | else |
| 2900 | - echo "$as_me: failed program was:" >&5 |
| 2901 | + $as_echo "$as_me: failed program was:" >&5 |
| 2902 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2903 | |
| 2904 | |
| 2905 | @@ -3369,8 +3490,8 @@ fi |
| 2906 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 2907 | ac_c_werror_flag=$ac_save_c_werror_flag |
| 2908 | fi |
| 2909 | -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
| 2910 | -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } |
| 2911 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 |
| 2912 | +$as_echo "$ac_cv_prog_cc_g" >&6; } |
| 2913 | if test "$ac_test_CFLAGS" = set; then |
| 2914 | CFLAGS=$ac_save_CFLAGS |
| 2915 | elif test $ac_cv_prog_cc_g = yes; then |
| 2916 | @@ -3386,10 +3507,10 @@ else |
| 2917 | CFLAGS= |
| 2918 | fi |
| 2919 | fi |
| 2920 | -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 |
| 2921 | -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } |
| 2922 | +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 |
| 2923 | +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
| 2924 | if test "${ac_cv_prog_cc_c89+set}" = set; then |
| 2925 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 2926 | + $as_echo_n "(cached) " >&6 |
| 2927 | else |
| 2928 | ac_cv_prog_cc_c89=no |
| 2929 | ac_save_CC=$CC |
| 2930 | @@ -3460,20 +3581,21 @@ case "(($ac_try" in |
| 2931 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 2932 | *) ac_try_echo=$ac_try;; |
| 2933 | esac |
| 2934 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 2935 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 2936 | +$as_echo "$ac_try_echo") >&5 |
| 2937 | (eval "$ac_compile") 2>conftest.er1 |
| 2938 | ac_status=$? |
| 2939 | grep -v '^ *+' conftest.er1 >conftest.err |
| 2940 | rm -f conftest.er1 |
| 2941 | cat conftest.err >&5 |
| 2942 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2943 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 2944 | (exit $ac_status); } && { |
| 2945 | test -z "$ac_c_werror_flag" || |
| 2946 | test ! -s conftest.err |
| 2947 | } && test -s conftest.$ac_objext; then |
| 2948 | ac_cv_prog_cc_c89=$ac_arg |
| 2949 | else |
| 2950 | - echo "$as_me: failed program was:" >&5 |
| 2951 | + $as_echo "$as_me: failed program was:" >&5 |
| 2952 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 2953 | |
| 2954 | |
| 2955 | @@ -3489,15 +3611,15 @@ fi |
| 2956 | # AC_CACHE_VAL |
| 2957 | case "x$ac_cv_prog_cc_c89" in |
| 2958 | x) |
| 2959 | - { echo "$as_me:$LINENO: result: none needed" >&5 |
| 2960 | -echo "${ECHO_T}none needed" >&6; } ;; |
| 2961 | + { $as_echo "$as_me:$LINENO: result: none needed" >&5 |
| 2962 | +$as_echo "none needed" >&6; } ;; |
| 2963 | xno) |
| 2964 | - { echo "$as_me:$LINENO: result: unsupported" >&5 |
| 2965 | -echo "${ECHO_T}unsupported" >&6; } ;; |
| 2966 | + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 |
| 2967 | +$as_echo "unsupported" >&6; } ;; |
| 2968 | *) |
| 2969 | CC="$CC $ac_cv_prog_cc_c89" |
| 2970 | - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 |
| 2971 | -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; |
| 2972 | + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 |
| 2973 | +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
| 2974 | esac |
| 2975 | |
| 2976 | |
| 2977 | @@ -3518,8 +3640,8 @@ am__doit: |
| 2978 | .PHONY: am__doit |
| 2979 | END |
| 2980 | # If we don't find an include directive, just comment out the code. |
| 2981 | -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 |
| 2982 | -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } |
| 2983 | +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 |
| 2984 | +$as_echo_n "checking for style of include used by $am_make... " >&6; } |
| 2985 | am__include="#" |
| 2986 | am__quote= |
| 2987 | _am_result=none |
| 2988 | @@ -3546,8 +3668,8 @@ if test "$am__include" = "#"; then |
| 2989 | fi |
| 2990 | |
| 2991 | |
| 2992 | -{ echo "$as_me:$LINENO: result: $_am_result" >&5 |
| 2993 | -echo "${ECHO_T}$_am_result" >&6; } |
| 2994 | +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 |
| 2995 | +$as_echo "$_am_result" >&6; } |
| 2996 | rm -f confinc confmf |
| 2997 | |
| 2998 | # Check whether --enable-dependency-tracking was given. |
| 2999 | @@ -3559,7 +3681,9 @@ if test "x$enable_dependency_tracking" != xno; then |
| 3000 | am_depcomp="$ac_aux_dir/depcomp" |
| 3001 | AMDEPBACKSLASH='\' |
| 3002 | fi |
| 3003 | - if test "x$enable_dependency_tracking" != xno; then |
| 3004 | + |
| 3005 | + |
| 3006 | +if test "x$enable_dependency_tracking" != xno; then |
| 3007 | AMDEP_TRUE= |
| 3008 | AMDEP_FALSE='#' |
| 3009 | else |
| 3010 | @@ -3569,12 +3693,13 @@ fi |
| 3011 | |
| 3012 | |
| 3013 | |
| 3014 | + |
| 3015 | depcc="$CC" am_compiler_list= |
| 3016 | |
| 3017 | -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
| 3018 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } |
| 3019 | +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
| 3020 | +$as_echo_n "checking dependency style of $depcc... " >&6; } |
| 3021 | if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then |
| 3022 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3023 | + $as_echo_n "(cached) " >&6 |
| 3024 | else |
| 3025 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| 3026 | # We make a subdir and do the tests there. Otherwise we can end up |
| 3027 | @@ -3636,7 +3761,6 @@ else |
| 3028 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
| 3029 | $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
| 3030 | >/dev/null 2>conftest.err && |
| 3031 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
| 3032 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
| 3033 | grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
| 3034 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
| 3035 | @@ -3662,11 +3786,13 @@ else |
| 3036 | fi |
| 3037 | |
| 3038 | fi |
| 3039 | -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 |
| 3040 | -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } |
| 3041 | +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 |
| 3042 | +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } |
| 3043 | CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type |
| 3044 | |
| 3045 | - if |
| 3046 | + |
| 3047 | + |
| 3048 | +if |
| 3049 | test "x$enable_dependency_tracking" != xno \ |
| 3050 | && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then |
| 3051 | am__fastdepCC_TRUE= |
| 3052 | @@ -3691,10 +3817,10 @@ if test -z "$CXX"; then |
| 3053 | do |
| 3054 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 3055 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 3056 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 3057 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 3058 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 3059 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 3060 | if test "${ac_cv_prog_CXX+set}" = set; then |
| 3061 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3062 | + $as_echo_n "(cached) " >&6 |
| 3063 | else |
| 3064 | if test -n "$CXX"; then |
| 3065 | ac_cv_prog_CXX="$CXX" # Let the user override the test. |
| 3066 | @@ -3707,7 +3833,7 @@ do |
| 3067 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 3068 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 3069 | ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
| 3070 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 3071 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 3072 | break 2 |
| 3073 | fi |
| 3074 | done |
| 3075 | @@ -3718,11 +3844,11 @@ fi |
| 3076 | fi |
| 3077 | CXX=$ac_cv_prog_CXX |
| 3078 | if test -n "$CXX"; then |
| 3079 | - { echo "$as_me:$LINENO: result: $CXX" >&5 |
| 3080 | -echo "${ECHO_T}$CXX" >&6; } |
| 3081 | + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 |
| 3082 | +$as_echo "$CXX" >&6; } |
| 3083 | else |
| 3084 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 3085 | -echo "${ECHO_T}no" >&6; } |
| 3086 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 3087 | +$as_echo "no" >&6; } |
| 3088 | fi |
| 3089 | |
| 3090 | |
| 3091 | @@ -3735,10 +3861,10 @@ if test -z "$CXX"; then |
| 3092 | do |
| 3093 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 3094 | set dummy $ac_prog; ac_word=$2 |
| 3095 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 3096 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 3097 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 3098 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 3099 | if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then |
| 3100 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3101 | + $as_echo_n "(cached) " >&6 |
| 3102 | else |
| 3103 | if test -n "$ac_ct_CXX"; then |
| 3104 | ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. |
| 3105 | @@ -3751,7 +3877,7 @@ do |
| 3106 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 3107 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 3108 | ac_cv_prog_ac_ct_CXX="$ac_prog" |
| 3109 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 3110 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 3111 | break 2 |
| 3112 | fi |
| 3113 | done |
| 3114 | @@ -3762,11 +3888,11 @@ fi |
| 3115 | fi |
| 3116 | ac_ct_CXX=$ac_cv_prog_ac_ct_CXX |
| 3117 | if test -n "$ac_ct_CXX"; then |
| 3118 | - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 |
| 3119 | -echo "${ECHO_T}$ac_ct_CXX" >&6; } |
| 3120 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 |
| 3121 | +$as_echo "$ac_ct_CXX" >&6; } |
| 3122 | else |
| 3123 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 3124 | -echo "${ECHO_T}no" >&6; } |
| 3125 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 3126 | +$as_echo "no" >&6; } |
| 3127 | fi |
| 3128 | |
| 3129 | |
| 3130 | @@ -3778,12 +3904,8 @@ done |
| 3131 | else |
| 3132 | case $cross_compiling:$ac_tool_warned in |
| 3133 | yes:) |
| 3134 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 3135 | -whose name does not start with the host triplet. If you think this |
| 3136 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 3137 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 3138 | -whose name does not start with the host triplet. If you think this |
| 3139 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 3140 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 3141 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 3142 | ac_tool_warned=yes ;; |
| 3143 | esac |
| 3144 | CXX=$ac_ct_CXX |
| 3145 | @@ -3793,43 +3915,47 @@ fi |
| 3146 | fi |
| 3147 | fi |
| 3148 | # Provide some information about the compiler. |
| 3149 | -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 |
| 3150 | -ac_compiler=`set X $ac_compile; echo $2` |
| 3151 | +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 |
| 3152 | +set X $ac_compile |
| 3153 | +ac_compiler=$2 |
| 3154 | { (ac_try="$ac_compiler --version >&5" |
| 3155 | case "(($ac_try" in |
| 3156 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3157 | *) ac_try_echo=$ac_try;; |
| 3158 | esac |
| 3159 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3160 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3161 | +$as_echo "$ac_try_echo") >&5 |
| 3162 | (eval "$ac_compiler --version >&5") 2>&5 |
| 3163 | ac_status=$? |
| 3164 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3165 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3166 | (exit $ac_status); } |
| 3167 | { (ac_try="$ac_compiler -v >&5" |
| 3168 | case "(($ac_try" in |
| 3169 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3170 | *) ac_try_echo=$ac_try;; |
| 3171 | esac |
| 3172 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3173 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3174 | +$as_echo "$ac_try_echo") >&5 |
| 3175 | (eval "$ac_compiler -v >&5") 2>&5 |
| 3176 | ac_status=$? |
| 3177 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3178 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3179 | (exit $ac_status); } |
| 3180 | { (ac_try="$ac_compiler -V >&5" |
| 3181 | case "(($ac_try" in |
| 3182 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3183 | *) ac_try_echo=$ac_try;; |
| 3184 | esac |
| 3185 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3186 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3187 | +$as_echo "$ac_try_echo") >&5 |
| 3188 | (eval "$ac_compiler -V >&5") 2>&5 |
| 3189 | ac_status=$? |
| 3190 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3191 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3192 | (exit $ac_status); } |
| 3193 | |
| 3194 | -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 |
| 3195 | -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } |
| 3196 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 |
| 3197 | +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } |
| 3198 | if test "${ac_cv_cxx_compiler_gnu+set}" = set; then |
| 3199 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3200 | + $as_echo_n "(cached) " >&6 |
| 3201 | else |
| 3202 | cat >conftest.$ac_ext <<_ACEOF |
| 3203 | /* confdefs.h. */ |
| 3204 | @@ -3855,20 +3981,21 @@ case "(($ac_try" in |
| 3205 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3206 | *) ac_try_echo=$ac_try;; |
| 3207 | esac |
| 3208 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3209 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3210 | +$as_echo "$ac_try_echo") >&5 |
| 3211 | (eval "$ac_compile") 2>conftest.er1 |
| 3212 | ac_status=$? |
| 3213 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3214 | rm -f conftest.er1 |
| 3215 | cat conftest.err >&5 |
| 3216 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3217 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3218 | (exit $ac_status); } && { |
| 3219 | test -z "$ac_cxx_werror_flag" || |
| 3220 | test ! -s conftest.err |
| 3221 | } && test -s conftest.$ac_objext; then |
| 3222 | ac_compiler_gnu=yes |
| 3223 | else |
| 3224 | - echo "$as_me: failed program was:" >&5 |
| 3225 | + $as_echo "$as_me: failed program was:" >&5 |
| 3226 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3227 | |
| 3228 | ac_compiler_gnu=no |
| 3229 | @@ -3878,15 +4005,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 3230 | ac_cv_cxx_compiler_gnu=$ac_compiler_gnu |
| 3231 | |
| 3232 | fi |
| 3233 | -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 |
| 3234 | -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } |
| 3235 | -GXX=`test $ac_compiler_gnu = yes && echo yes` |
| 3236 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 |
| 3237 | +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } |
| 3238 | +if test $ac_compiler_gnu = yes; then |
| 3239 | + GXX=yes |
| 3240 | +else |
| 3241 | + GXX= |
| 3242 | +fi |
| 3243 | ac_test_CXXFLAGS=${CXXFLAGS+set} |
| 3244 | ac_save_CXXFLAGS=$CXXFLAGS |
| 3245 | -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 |
| 3246 | -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } |
| 3247 | +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 |
| 3248 | +$as_echo_n "checking whether $CXX accepts -g... " >&6; } |
| 3249 | if test "${ac_cv_prog_cxx_g+set}" = set; then |
| 3250 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3251 | + $as_echo_n "(cached) " >&6 |
| 3252 | else |
| 3253 | ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
| 3254 | ac_cxx_werror_flag=yes |
| 3255 | @@ -3913,20 +4044,21 @@ case "(($ac_try" in |
| 3256 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3257 | *) ac_try_echo=$ac_try;; |
| 3258 | esac |
| 3259 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3260 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3261 | +$as_echo "$ac_try_echo") >&5 |
| 3262 | (eval "$ac_compile") 2>conftest.er1 |
| 3263 | ac_status=$? |
| 3264 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3265 | rm -f conftest.er1 |
| 3266 | cat conftest.err >&5 |
| 3267 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3268 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3269 | (exit $ac_status); } && { |
| 3270 | test -z "$ac_cxx_werror_flag" || |
| 3271 | test ! -s conftest.err |
| 3272 | } && test -s conftest.$ac_objext; then |
| 3273 | ac_cv_prog_cxx_g=yes |
| 3274 | else |
| 3275 | - echo "$as_me: failed program was:" >&5 |
| 3276 | + $as_echo "$as_me: failed program was:" >&5 |
| 3277 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3278 | |
| 3279 | CXXFLAGS="" |
| 3280 | @@ -3951,20 +4083,21 @@ case "(($ac_try" in |
| 3281 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3282 | *) ac_try_echo=$ac_try;; |
| 3283 | esac |
| 3284 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3285 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3286 | +$as_echo "$ac_try_echo") >&5 |
| 3287 | (eval "$ac_compile") 2>conftest.er1 |
| 3288 | ac_status=$? |
| 3289 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3290 | rm -f conftest.er1 |
| 3291 | cat conftest.err >&5 |
| 3292 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3293 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3294 | (exit $ac_status); } && { |
| 3295 | test -z "$ac_cxx_werror_flag" || |
| 3296 | test ! -s conftest.err |
| 3297 | } && test -s conftest.$ac_objext; then |
| 3298 | : |
| 3299 | else |
| 3300 | - echo "$as_me: failed program was:" >&5 |
| 3301 | + $as_echo "$as_me: failed program was:" >&5 |
| 3302 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3303 | |
| 3304 | ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
| 3305 | @@ -3990,20 +4123,21 @@ case "(($ac_try" in |
| 3306 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3307 | *) ac_try_echo=$ac_try;; |
| 3308 | esac |
| 3309 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3310 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3311 | +$as_echo "$ac_try_echo") >&5 |
| 3312 | (eval "$ac_compile") 2>conftest.er1 |
| 3313 | ac_status=$? |
| 3314 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3315 | rm -f conftest.er1 |
| 3316 | cat conftest.err >&5 |
| 3317 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3318 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3319 | (exit $ac_status); } && { |
| 3320 | test -z "$ac_cxx_werror_flag" || |
| 3321 | test ! -s conftest.err |
| 3322 | } && test -s conftest.$ac_objext; then |
| 3323 | ac_cv_prog_cxx_g=yes |
| 3324 | else |
| 3325 | - echo "$as_me: failed program was:" >&5 |
| 3326 | + $as_echo "$as_me: failed program was:" >&5 |
| 3327 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3328 | |
| 3329 | |
| 3330 | @@ -4018,8 +4152,8 @@ fi |
| 3331 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 3332 | ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
| 3333 | fi |
| 3334 | -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 |
| 3335 | -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } |
| 3336 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 |
| 3337 | +$as_echo "$ac_cv_prog_cxx_g" >&6; } |
| 3338 | if test "$ac_test_CXXFLAGS" = set; then |
| 3339 | CXXFLAGS=$ac_save_CXXFLAGS |
| 3340 | elif test $ac_cv_prog_cxx_g = yes; then |
| 3341 | @@ -4043,10 +4177,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 3342 | |
| 3343 | depcc="$CXX" am_compiler_list= |
| 3344 | |
| 3345 | -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
| 3346 | -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } |
| 3347 | +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 |
| 3348 | +$as_echo_n "checking dependency style of $depcc... " >&6; } |
| 3349 | if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then |
| 3350 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3351 | + $as_echo_n "(cached) " >&6 |
| 3352 | else |
| 3353 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
| 3354 | # We make a subdir and do the tests there. Otherwise we can end up |
| 3355 | @@ -4108,7 +4242,6 @@ else |
| 3356 | depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
| 3357 | $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ |
| 3358 | >/dev/null 2>conftest.err && |
| 3359 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
| 3360 | grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
| 3361 | grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && |
| 3362 | ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
| 3363 | @@ -4134,11 +4267,13 @@ else |
| 3364 | fi |
| 3365 | |
| 3366 | fi |
| 3367 | -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 |
| 3368 | -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } |
| 3369 | +{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 |
| 3370 | +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } |
| 3371 | CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type |
| 3372 | |
| 3373 | - if |
| 3374 | + |
| 3375 | + |
| 3376 | +if |
| 3377 | test "x$enable_dependency_tracking" != xno \ |
| 3378 | && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then |
| 3379 | am__fastdepCXX_TRUE= |
| 3380 | @@ -4223,34 +4358,34 @@ fi |
| 3381 | |
| 3382 | # Make sure we can run config.sub. |
| 3383 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
| 3384 | - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 |
| 3385 | -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} |
| 3386 | + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 |
| 3387 | +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} |
| 3388 | { (exit 1); exit 1; }; } |
| 3389 | |
| 3390 | -{ echo "$as_me:$LINENO: checking build system type" >&5 |
| 3391 | -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } |
| 3392 | +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 |
| 3393 | +$as_echo_n "checking build system type... " >&6; } |
| 3394 | if test "${ac_cv_build+set}" = set; then |
| 3395 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3396 | + $as_echo_n "(cached) " >&6 |
| 3397 | else |
| 3398 | ac_build_alias=$build_alias |
| 3399 | test "x$ac_build_alias" = x && |
| 3400 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
| 3401 | test "x$ac_build_alias" = x && |
| 3402 | - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 |
| 3403 | -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} |
| 3404 | + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 |
| 3405 | +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} |
| 3406 | { (exit 1); exit 1; }; } |
| 3407 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
| 3408 | - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 |
| 3409 | -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} |
| 3410 | + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 |
| 3411 | +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} |
| 3412 | { (exit 1); exit 1; }; } |
| 3413 | |
| 3414 | fi |
| 3415 | -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 |
| 3416 | -echo "${ECHO_T}$ac_cv_build" >&6; } |
| 3417 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 |
| 3418 | +$as_echo "$ac_cv_build" >&6; } |
| 3419 | case $ac_cv_build in |
| 3420 | *-*-*) ;; |
| 3421 | -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 |
| 3422 | -echo "$as_me: error: invalid value of canonical build" >&2;} |
| 3423 | +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 |
| 3424 | +$as_echo "$as_me: error: invalid value of canonical build" >&2;} |
| 3425 | { (exit 1); exit 1; }; };; |
| 3426 | esac |
| 3427 | build=$ac_cv_build |
| 3428 | @@ -4267,27 +4402,27 @@ IFS=$ac_save_IFS |
| 3429 | case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac |
| 3430 | |
| 3431 | |
| 3432 | -{ echo "$as_me:$LINENO: checking host system type" >&5 |
| 3433 | -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } |
| 3434 | +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 |
| 3435 | +$as_echo_n "checking host system type... " >&6; } |
| 3436 | if test "${ac_cv_host+set}" = set; then |
| 3437 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3438 | + $as_echo_n "(cached) " >&6 |
| 3439 | else |
| 3440 | if test "x$host_alias" = x; then |
| 3441 | ac_cv_host=$ac_cv_build |
| 3442 | else |
| 3443 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
| 3444 | - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 |
| 3445 | -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} |
| 3446 | + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 |
| 3447 | +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} |
| 3448 | { (exit 1); exit 1; }; } |
| 3449 | fi |
| 3450 | |
| 3451 | fi |
| 3452 | -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 |
| 3453 | -echo "${ECHO_T}$ac_cv_host" >&6; } |
| 3454 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 |
| 3455 | +$as_echo "$ac_cv_host" >&6; } |
| 3456 | case $ac_cv_host in |
| 3457 | *-*-*) ;; |
| 3458 | -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 |
| 3459 | -echo "$as_me: error: invalid value of canonical host" >&2;} |
| 3460 | +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 |
| 3461 | +$as_echo "$as_me: error: invalid value of canonical host" >&2;} |
| 3462 | { (exit 1); exit 1; }; };; |
| 3463 | esac |
| 3464 | host=$ac_cv_host |
| 3465 | @@ -4304,10 +4439,10 @@ IFS=$ac_save_IFS |
| 3466 | case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac |
| 3467 | |
| 3468 | |
| 3469 | -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 |
| 3470 | -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } |
| 3471 | +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 |
| 3472 | +$as_echo_n "checking for a sed that does not truncate output... " >&6; } |
| 3473 | if test "${lt_cv_path_SED+set}" = set; then |
| 3474 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3475 | + $as_echo_n "(cached) " >&6 |
| 3476 | else |
| 3477 | # Loop through the user's path and test for sed and gsed. |
| 3478 | # Then use that list of sed's as ones to test for truncation. |
| 3479 | @@ -4360,45 +4495,40 @@ fi |
| 3480 | |
| 3481 | SED=$lt_cv_path_SED |
| 3482 | |
| 3483 | -{ echo "$as_me:$LINENO: result: $SED" >&5 |
| 3484 | -echo "${ECHO_T}$SED" >&6; } |
| 3485 | +{ $as_echo "$as_me:$LINENO: result: $SED" >&5 |
| 3486 | +$as_echo "$SED" >&6; } |
| 3487 | |
| 3488 | -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 |
| 3489 | -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } |
| 3490 | -if test "${ac_cv_path_GREP+set}" = set; then |
| 3491 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3492 | -else |
| 3493 | - # Extract the first word of "grep ggrep" to use in msg output |
| 3494 | -if test -z "$GREP"; then |
| 3495 | -set dummy grep ggrep; ac_prog_name=$2 |
| 3496 | +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 |
| 3497 | +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
| 3498 | if test "${ac_cv_path_GREP+set}" = set; then |
| 3499 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3500 | + $as_echo_n "(cached) " >&6 |
| 3501 | else |
| 3502 | + if test -z "$GREP"; then |
| 3503 | ac_path_GREP_found=false |
| 3504 | -# Loop through the user's path and test for each of PROGNAME-LIST |
| 3505 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 3506 | + # Loop through the user's path and test for each of PROGNAME-LIST |
| 3507 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 3508 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin |
| 3509 | do |
| 3510 | IFS=$as_save_IFS |
| 3511 | test -z "$as_dir" && as_dir=. |
| 3512 | for ac_prog in grep ggrep; do |
| 3513 | - for ac_exec_ext in '' $ac_executable_extensions; do |
| 3514 | - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
| 3515 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
| 3516 | - # Check for GNU ac_path_GREP and select it if it is found. |
| 3517 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 3518 | + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
| 3519 | + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
| 3520 | +# Check for GNU ac_path_GREP and select it if it is found. |
| 3521 | # Check for GNU $ac_path_GREP |
| 3522 | case `"$ac_path_GREP" --version 2>&1` in |
| 3523 | *GNU*) |
| 3524 | ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; |
| 3525 | *) |
| 3526 | ac_count=0 |
| 3527 | - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" |
| 3528 | + $as_echo_n 0123456789 >"conftest.in" |
| 3529 | while : |
| 3530 | do |
| 3531 | cat "conftest.in" "conftest.in" >"conftest.tmp" |
| 3532 | mv "conftest.tmp" "conftest.in" |
| 3533 | cp "conftest.in" "conftest.nl" |
| 3534 | - echo 'GREP' >> "conftest.nl" |
| 3535 | + $as_echo 'GREP' >> "conftest.nl" |
| 3536 | "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break |
| 3537 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
| 3538 | ac_count=`expr $ac_count + 1` |
| 3539 | @@ -4413,74 +4543,60 @@ case `"$ac_path_GREP" --version 2>&1` in |
| 3540 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; |
| 3541 | esac |
| 3542 | |
| 3543 | - |
| 3544 | - $ac_path_GREP_found && break 3 |
| 3545 | + $ac_path_GREP_found && break 3 |
| 3546 | + done |
| 3547 | done |
| 3548 | done |
| 3549 | - |
| 3550 | -done |
| 3551 | IFS=$as_save_IFS |
| 3552 | - |
| 3553 | - |
| 3554 | -fi |
| 3555 | - |
| 3556 | -GREP="$ac_cv_path_GREP" |
| 3557 | -if test -z "$GREP"; then |
| 3558 | - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 |
| 3559 | -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} |
| 3560 | + if test -z "$ac_cv_path_GREP"; then |
| 3561 | + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 |
| 3562 | +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} |
| 3563 | { (exit 1); exit 1; }; } |
| 3564 | -fi |
| 3565 | - |
| 3566 | + fi |
| 3567 | else |
| 3568 | ac_cv_path_GREP=$GREP |
| 3569 | fi |
| 3570 | |
| 3571 | - |
| 3572 | fi |
| 3573 | -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 |
| 3574 | -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } |
| 3575 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 |
| 3576 | +$as_echo "$ac_cv_path_GREP" >&6; } |
| 3577 | GREP="$ac_cv_path_GREP" |
| 3578 | |
| 3579 | |
| 3580 | -{ echo "$as_me:$LINENO: checking for egrep" >&5 |
| 3581 | -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } |
| 3582 | +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 |
| 3583 | +$as_echo_n "checking for egrep... " >&6; } |
| 3584 | if test "${ac_cv_path_EGREP+set}" = set; then |
| 3585 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3586 | + $as_echo_n "(cached) " >&6 |
| 3587 | else |
| 3588 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
| 3589 | then ac_cv_path_EGREP="$GREP -E" |
| 3590 | else |
| 3591 | - # Extract the first word of "egrep" to use in msg output |
| 3592 | -if test -z "$EGREP"; then |
| 3593 | -set dummy egrep; ac_prog_name=$2 |
| 3594 | -if test "${ac_cv_path_EGREP+set}" = set; then |
| 3595 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3596 | -else |
| 3597 | + if test -z "$EGREP"; then |
| 3598 | ac_path_EGREP_found=false |
| 3599 | -# Loop through the user's path and test for each of PROGNAME-LIST |
| 3600 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 3601 | + # Loop through the user's path and test for each of PROGNAME-LIST |
| 3602 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
| 3603 | for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin |
| 3604 | do |
| 3605 | IFS=$as_save_IFS |
| 3606 | test -z "$as_dir" && as_dir=. |
| 3607 | for ac_prog in egrep; do |
| 3608 | - for ac_exec_ext in '' $ac_executable_extensions; do |
| 3609 | - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
| 3610 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
| 3611 | - # Check for GNU ac_path_EGREP and select it if it is found. |
| 3612 | + for ac_exec_ext in '' $ac_executable_extensions; do |
| 3613 | + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
| 3614 | + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
| 3615 | +# Check for GNU ac_path_EGREP and select it if it is found. |
| 3616 | # Check for GNU $ac_path_EGREP |
| 3617 | case `"$ac_path_EGREP" --version 2>&1` in |
| 3618 | *GNU*) |
| 3619 | ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; |
| 3620 | *) |
| 3621 | ac_count=0 |
| 3622 | - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" |
| 3623 | + $as_echo_n 0123456789 >"conftest.in" |
| 3624 | while : |
| 3625 | do |
| 3626 | cat "conftest.in" "conftest.in" >"conftest.tmp" |
| 3627 | mv "conftest.tmp" "conftest.in" |
| 3628 | cp "conftest.in" "conftest.nl" |
| 3629 | - echo 'EGREP' >> "conftest.nl" |
| 3630 | + $as_echo 'EGREP' >> "conftest.nl" |
| 3631 | "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break |
| 3632 | diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break |
| 3633 | ac_count=`expr $ac_count + 1` |
| 3634 | @@ -4495,33 +4611,24 @@ case `"$ac_path_EGREP" --version 2>&1` in |
| 3635 | rm -f conftest.in conftest.tmp conftest.nl conftest.out;; |
| 3636 | esac |
| 3637 | |
| 3638 | - |
| 3639 | - $ac_path_EGREP_found && break 3 |
| 3640 | + $ac_path_EGREP_found && break 3 |
| 3641 | + done |
| 3642 | done |
| 3643 | done |
| 3644 | - |
| 3645 | -done |
| 3646 | IFS=$as_save_IFS |
| 3647 | - |
| 3648 | - |
| 3649 | -fi |
| 3650 | - |
| 3651 | -EGREP="$ac_cv_path_EGREP" |
| 3652 | -if test -z "$EGREP"; then |
| 3653 | - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 |
| 3654 | -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} |
| 3655 | + if test -z "$ac_cv_path_EGREP"; then |
| 3656 | + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 |
| 3657 | +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} |
| 3658 | { (exit 1); exit 1; }; } |
| 3659 | -fi |
| 3660 | - |
| 3661 | + fi |
| 3662 | else |
| 3663 | ac_cv_path_EGREP=$EGREP |
| 3664 | fi |
| 3665 | |
| 3666 | - |
| 3667 | fi |
| 3668 | fi |
| 3669 | -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 |
| 3670 | -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } |
| 3671 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 |
| 3672 | +$as_echo "$ac_cv_path_EGREP" >&6; } |
| 3673 | EGREP="$ac_cv_path_EGREP" |
| 3674 | |
| 3675 | |
| 3676 | @@ -4536,8 +4643,8 @@ fi |
| 3677 | ac_prog=ld |
| 3678 | if test "$GCC" = yes; then |
| 3679 | # Check if gcc -print-prog-name=ld gives a path. |
| 3680 | - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
| 3681 | -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } |
| 3682 | + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
| 3683 | +$as_echo_n "checking for ld used by $CC... " >&6; } |
| 3684 | case $host in |
| 3685 | *-*-mingw*) |
| 3686 | # gcc leaves a trailing carriage return which upsets mingw |
| 3687 | @@ -4566,14 +4673,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } |
| 3688 | ;; |
| 3689 | esac |
| 3690 | elif test "$with_gnu_ld" = yes; then |
| 3691 | - { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
| 3692 | -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
| 3693 | + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 |
| 3694 | +$as_echo_n "checking for GNU ld... " >&6; } |
| 3695 | else |
| 3696 | - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
| 3697 | -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
| 3698 | + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
| 3699 | +$as_echo_n "checking for non-GNU ld... " >&6; } |
| 3700 | fi |
| 3701 | if test "${lt_cv_path_LD+set}" = set; then |
| 3702 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3703 | + $as_echo_n "(cached) " >&6 |
| 3704 | else |
| 3705 | if test -z "$LD"; then |
| 3706 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
| 3707 | @@ -4603,19 +4710,19 @@ fi |
| 3708 | |
| 3709 | LD="$lt_cv_path_LD" |
| 3710 | if test -n "$LD"; then |
| 3711 | - { echo "$as_me:$LINENO: result: $LD" >&5 |
| 3712 | -echo "${ECHO_T}$LD" >&6; } |
| 3713 | + { $as_echo "$as_me:$LINENO: result: $LD" >&5 |
| 3714 | +$as_echo "$LD" >&6; } |
| 3715 | else |
| 3716 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 3717 | -echo "${ECHO_T}no" >&6; } |
| 3718 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 3719 | +$as_echo "no" >&6; } |
| 3720 | fi |
| 3721 | -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
| 3722 | -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
| 3723 | +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
| 3724 | +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
| 3725 | { (exit 1); exit 1; }; } |
| 3726 | -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
| 3727 | -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
| 3728 | +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
| 3729 | +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
| 3730 | if test "${lt_cv_prog_gnu_ld+set}" = set; then |
| 3731 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3732 | + $as_echo_n "(cached) " >&6 |
| 3733 | else |
| 3734 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
| 3735 | case `$LD -v 2>&1 </dev/null` in |
| 3736 | @@ -4627,20 +4734,20 @@ case `$LD -v 2>&1 </dev/null` in |
| 3737 | ;; |
| 3738 | esac |
| 3739 | fi |
| 3740 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
| 3741 | -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } |
| 3742 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
| 3743 | +$as_echo "$lt_cv_prog_gnu_ld" >&6; } |
| 3744 | with_gnu_ld=$lt_cv_prog_gnu_ld |
| 3745 | |
| 3746 | |
| 3747 | -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 |
| 3748 | -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } |
| 3749 | +{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 |
| 3750 | +$as_echo_n "checking for $LD option to reload object files... " >&6; } |
| 3751 | if test "${lt_cv_ld_reload_flag+set}" = set; then |
| 3752 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3753 | + $as_echo_n "(cached) " >&6 |
| 3754 | else |
| 3755 | lt_cv_ld_reload_flag='-r' |
| 3756 | fi |
| 3757 | -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 |
| 3758 | -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } |
| 3759 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 |
| 3760 | +$as_echo "$lt_cv_ld_reload_flag" >&6; } |
| 3761 | reload_flag=$lt_cv_ld_reload_flag |
| 3762 | case $reload_flag in |
| 3763 | "" | " "*) ;; |
| 3764 | @@ -4657,10 +4764,10 @@ case $host_os in |
| 3765 | ;; |
| 3766 | esac |
| 3767 | |
| 3768 | -{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 |
| 3769 | -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } |
| 3770 | +{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 |
| 3771 | +$as_echo_n "checking for BSD-compatible nm... " >&6; } |
| 3772 | if test "${lt_cv_path_NM+set}" = set; then |
| 3773 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3774 | + $as_echo_n "(cached) " >&6 |
| 3775 | else |
| 3776 | if test -n "$NM"; then |
| 3777 | # Let the user override the test. |
| 3778 | @@ -4706,25 +4813,25 @@ else |
| 3779 | test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm |
| 3780 | fi |
| 3781 | fi |
| 3782 | -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 |
| 3783 | -echo "${ECHO_T}$lt_cv_path_NM" >&6; } |
| 3784 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 |
| 3785 | +$as_echo "$lt_cv_path_NM" >&6; } |
| 3786 | NM="$lt_cv_path_NM" |
| 3787 | |
| 3788 | -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 |
| 3789 | -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } |
| 3790 | +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 |
| 3791 | +$as_echo_n "checking whether ln -s works... " >&6; } |
| 3792 | LN_S=$as_ln_s |
| 3793 | if test "$LN_S" = "ln -s"; then |
| 3794 | - { echo "$as_me:$LINENO: result: yes" >&5 |
| 3795 | -echo "${ECHO_T}yes" >&6; } |
| 3796 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 3797 | +$as_echo "yes" >&6; } |
| 3798 | else |
| 3799 | - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 |
| 3800 | -echo "${ECHO_T}no, using $LN_S" >&6; } |
| 3801 | + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 |
| 3802 | +$as_echo "no, using $LN_S" >&6; } |
| 3803 | fi |
| 3804 | |
| 3805 | -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 |
| 3806 | -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } |
| 3807 | +{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 |
| 3808 | +$as_echo_n "checking how to recognize dependent libraries... " >&6; } |
| 3809 | if test "${lt_cv_deplibs_check_method+set}" = set; then |
| 3810 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3811 | + $as_echo_n "(cached) " >&6 |
| 3812 | else |
| 3813 | lt_cv_file_magic_cmd='$MAGIC_CMD' |
| 3814 | lt_cv_file_magic_test_file= |
| 3815 | @@ -4907,8 +5014,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
| 3816 | esac |
| 3817 | |
| 3818 | fi |
| 3819 | -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 |
| 3820 | -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } |
| 3821 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 |
| 3822 | +$as_echo "$lt_cv_deplibs_check_method" >&6; } |
| 3823 | file_magic_cmd=$lt_cv_file_magic_cmd |
| 3824 | deplibs_check_method=$lt_cv_deplibs_check_method |
| 3825 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
| 3826 | @@ -4942,7 +5049,7 @@ ia64-*-hpux*) |
| 3827 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 3828 | (eval $ac_compile) 2>&5 |
| 3829 | ac_status=$? |
| 3830 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3831 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3832 | (exit $ac_status); }; then |
| 3833 | case `/usr/bin/file conftest.$ac_objext` in |
| 3834 | *ELF-32*) |
| 3835 | @@ -4957,11 +5064,11 @@ ia64-*-hpux*) |
| 3836 | ;; |
| 3837 | *-*-irix6*) |
| 3838 | # Find out which ABI we are using. |
| 3839 | - echo '#line 4960 "configure"' > conftest.$ac_ext |
| 3840 | + echo '#line 5067 "configure"' > conftest.$ac_ext |
| 3841 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 3842 | (eval $ac_compile) 2>&5 |
| 3843 | ac_status=$? |
| 3844 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3845 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3846 | (exit $ac_status); }; then |
| 3847 | if test "$lt_cv_prog_gnu_ld" = yes; then |
| 3848 | case `/usr/bin/file conftest.$ac_objext` in |
| 3849 | @@ -4999,7 +5106,7 @@ s390*-*linux*|sparc*-*linux*) |
| 3850 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 3851 | (eval $ac_compile) 2>&5 |
| 3852 | ac_status=$? |
| 3853 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3854 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3855 | (exit $ac_status); }; then |
| 3856 | case `/usr/bin/file conftest.o` in |
| 3857 | *32-bit*) |
| 3858 | @@ -5049,10 +5156,10 @@ s390*-*linux*|sparc*-*linux*) |
| 3859 | # On SCO OpenServer 5, we need -belf to get full-featured binaries. |
| 3860 | SAVE_CFLAGS="$CFLAGS" |
| 3861 | CFLAGS="$CFLAGS -belf" |
| 3862 | - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 |
| 3863 | -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } |
| 3864 | + { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 |
| 3865 | +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
| 3866 | if test "${lt_cv_cc_needs_belf+set}" = set; then |
| 3867 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3868 | + $as_echo_n "(cached) " >&6 |
| 3869 | else |
| 3870 | ac_ext=c |
| 3871 | ac_cpp='$CPP $CPPFLAGS' |
| 3872 | @@ -5081,26 +5188,30 @@ case "(($ac_try" in |
| 3873 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3874 | *) ac_try_echo=$ac_try;; |
| 3875 | esac |
| 3876 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3877 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3878 | +$as_echo "$ac_try_echo") >&5 |
| 3879 | (eval "$ac_link") 2>conftest.er1 |
| 3880 | ac_status=$? |
| 3881 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3882 | rm -f conftest.er1 |
| 3883 | cat conftest.err >&5 |
| 3884 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3885 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3886 | (exit $ac_status); } && { |
| 3887 | test -z "$ac_c_werror_flag" || |
| 3888 | test ! -s conftest.err |
| 3889 | - } && test -s conftest$ac_exeext && |
| 3890 | - $as_test_x conftest$ac_exeext; then |
| 3891 | + } && test -s conftest$ac_exeext && { |
| 3892 | + test "$cross_compiling" = yes || |
| 3893 | + $as_test_x conftest$ac_exeext |
| 3894 | + }; then |
| 3895 | lt_cv_cc_needs_belf=yes |
| 3896 | else |
| 3897 | - echo "$as_me: failed program was:" >&5 |
| 3898 | + $as_echo "$as_me: failed program was:" >&5 |
| 3899 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3900 | |
| 3901 | lt_cv_cc_needs_belf=no |
| 3902 | fi |
| 3903 | |
| 3904 | +rm -rf conftest.dSYM |
| 3905 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 3906 | conftest$ac_exeext conftest.$ac_ext |
| 3907 | ac_ext=c |
| 3908 | @@ -5110,8 +5221,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ |
| 3909 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 3910 | |
| 3911 | fi |
| 3912 | -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 |
| 3913 | -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } |
| 3914 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 |
| 3915 | +$as_echo "$lt_cv_cc_needs_belf" >&6; } |
| 3916 | if test x"$lt_cv_cc_needs_belf" != x"yes"; then |
| 3917 | # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf |
| 3918 | CFLAGS="$SAVE_CFLAGS" |
| 3919 | @@ -5123,7 +5234,7 @@ sparc*-*solaris*) |
| 3920 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 3921 | (eval $ac_compile) 2>&5 |
| 3922 | ac_status=$? |
| 3923 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3924 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3925 | (exit $ac_status); }; then |
| 3926 | case `/usr/bin/file conftest.o` in |
| 3927 | *64-bit*) |
| 3928 | @@ -5152,15 +5263,15 @@ ac_cpp='$CPP $CPPFLAGS' |
| 3929 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| 3930 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| 3931 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 3932 | -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 |
| 3933 | -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } |
| 3934 | +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 |
| 3935 | +$as_echo_n "checking how to run the C preprocessor... " >&6; } |
| 3936 | # On Suns, sometimes $CPP names a directory. |
| 3937 | if test -n "$CPP" && test -d "$CPP"; then |
| 3938 | CPP= |
| 3939 | fi |
| 3940 | if test -z "$CPP"; then |
| 3941 | if test "${ac_cv_prog_CPP+set}" = set; then |
| 3942 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 3943 | + $as_echo_n "(cached) " >&6 |
| 3944 | else |
| 3945 | # Double quotes because CPP needs to be expanded |
| 3946 | for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" |
| 3947 | @@ -5192,20 +5303,21 @@ case "(($ac_try" in |
| 3948 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3949 | *) ac_try_echo=$ac_try;; |
| 3950 | esac |
| 3951 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3952 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3953 | +$as_echo "$ac_try_echo") >&5 |
| 3954 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 3955 | ac_status=$? |
| 3956 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3957 | rm -f conftest.er1 |
| 3958 | cat conftest.err >&5 |
| 3959 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3960 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3961 | (exit $ac_status); } >/dev/null && { |
| 3962 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 3963 | test ! -s conftest.err |
| 3964 | }; then |
| 3965 | : |
| 3966 | else |
| 3967 | - echo "$as_me: failed program was:" >&5 |
| 3968 | + $as_echo "$as_me: failed program was:" >&5 |
| 3969 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3970 | |
| 3971 | # Broken: fails on valid input. |
| 3972 | @@ -5229,13 +5341,14 @@ case "(($ac_try" in |
| 3973 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 3974 | *) ac_try_echo=$ac_try;; |
| 3975 | esac |
| 3976 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3977 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 3978 | +$as_echo "$ac_try_echo") >&5 |
| 3979 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 3980 | ac_status=$? |
| 3981 | grep -v '^ *+' conftest.er1 >conftest.err |
| 3982 | rm -f conftest.er1 |
| 3983 | cat conftest.err >&5 |
| 3984 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3985 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 3986 | (exit $ac_status); } >/dev/null && { |
| 3987 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 3988 | test ! -s conftest.err |
| 3989 | @@ -5243,7 +5356,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 3990 | # Broken: success on invalid input. |
| 3991 | continue |
| 3992 | else |
| 3993 | - echo "$as_me: failed program was:" >&5 |
| 3994 | + $as_echo "$as_me: failed program was:" >&5 |
| 3995 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 3996 | |
| 3997 | # Passes both tests. |
| 3998 | @@ -5268,8 +5381,8 @@ fi |
| 3999 | else |
| 4000 | ac_cv_prog_CPP=$CPP |
| 4001 | fi |
| 4002 | -{ echo "$as_me:$LINENO: result: $CPP" >&5 |
| 4003 | -echo "${ECHO_T}$CPP" >&6; } |
| 4004 | +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 |
| 4005 | +$as_echo "$CPP" >&6; } |
| 4006 | ac_preproc_ok=false |
| 4007 | for ac_c_preproc_warn_flag in '' yes |
| 4008 | do |
| 4009 | @@ -5297,20 +5410,21 @@ case "(($ac_try" in |
| 4010 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4011 | *) ac_try_echo=$ac_try;; |
| 4012 | esac |
| 4013 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4014 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4015 | +$as_echo "$ac_try_echo") >&5 |
| 4016 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4017 | ac_status=$? |
| 4018 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4019 | rm -f conftest.er1 |
| 4020 | cat conftest.err >&5 |
| 4021 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4022 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4023 | (exit $ac_status); } >/dev/null && { |
| 4024 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 4025 | test ! -s conftest.err |
| 4026 | }; then |
| 4027 | : |
| 4028 | else |
| 4029 | - echo "$as_me: failed program was:" >&5 |
| 4030 | + $as_echo "$as_me: failed program was:" >&5 |
| 4031 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4032 | |
| 4033 | # Broken: fails on valid input. |
| 4034 | @@ -5334,13 +5448,14 @@ case "(($ac_try" in |
| 4035 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4036 | *) ac_try_echo=$ac_try;; |
| 4037 | esac |
| 4038 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4039 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4040 | +$as_echo "$ac_try_echo") >&5 |
| 4041 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4042 | ac_status=$? |
| 4043 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4044 | rm -f conftest.er1 |
| 4045 | cat conftest.err >&5 |
| 4046 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4047 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4048 | (exit $ac_status); } >/dev/null && { |
| 4049 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 4050 | test ! -s conftest.err |
| 4051 | @@ -5348,7 +5463,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4052 | # Broken: success on invalid input. |
| 4053 | continue |
| 4054 | else |
| 4055 | - echo "$as_me: failed program was:" >&5 |
| 4056 | + $as_echo "$as_me: failed program was:" >&5 |
| 4057 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4058 | |
| 4059 | # Passes both tests. |
| 4060 | @@ -5364,11 +5479,13 @@ rm -f conftest.err conftest.$ac_ext |
| 4061 | if $ac_preproc_ok; then |
| 4062 | : |
| 4063 | else |
| 4064 | - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check |
| 4065 | + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 |
| 4066 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| 4067 | +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check |
| 4068 | See \`config.log' for more details." >&5 |
| 4069 | -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check |
| 4070 | +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check |
| 4071 | See \`config.log' for more details." >&2;} |
| 4072 | - { (exit 1); exit 1; }; } |
| 4073 | + { (exit 1); exit 1; }; }; } |
| 4074 | fi |
| 4075 | |
| 4076 | ac_ext=c |
| 4077 | @@ -5378,10 +5495,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ |
| 4078 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 4079 | |
| 4080 | |
| 4081 | -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
| 4082 | -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } |
| 4083 | +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
| 4084 | +$as_echo_n "checking for ANSI C header files... " >&6; } |
| 4085 | if test "${ac_cv_header_stdc+set}" = set; then |
| 4086 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4087 | + $as_echo_n "(cached) " >&6 |
| 4088 | else |
| 4089 | cat >conftest.$ac_ext <<_ACEOF |
| 4090 | /* confdefs.h. */ |
| 4091 | @@ -5408,20 +5525,21 @@ case "(($ac_try" in |
| 4092 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4093 | *) ac_try_echo=$ac_try;; |
| 4094 | esac |
| 4095 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4096 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4097 | +$as_echo "$ac_try_echo") >&5 |
| 4098 | (eval "$ac_compile") 2>conftest.er1 |
| 4099 | ac_status=$? |
| 4100 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4101 | rm -f conftest.er1 |
| 4102 | cat conftest.err >&5 |
| 4103 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4104 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4105 | (exit $ac_status); } && { |
| 4106 | test -z "$ac_c_werror_flag" || |
| 4107 | test ! -s conftest.err |
| 4108 | } && test -s conftest.$ac_objext; then |
| 4109 | ac_cv_header_stdc=yes |
| 4110 | else |
| 4111 | - echo "$as_me: failed program was:" >&5 |
| 4112 | + $as_echo "$as_me: failed program was:" >&5 |
| 4113 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4114 | |
| 4115 | ac_cv_header_stdc=no |
| 4116 | @@ -5513,37 +5631,40 @@ case "(($ac_try" in |
| 4117 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4118 | *) ac_try_echo=$ac_try;; |
| 4119 | esac |
| 4120 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4121 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4122 | +$as_echo "$ac_try_echo") >&5 |
| 4123 | (eval "$ac_link") 2>&5 |
| 4124 | ac_status=$? |
| 4125 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4126 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4127 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
| 4128 | { (case "(($ac_try" in |
| 4129 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4130 | *) ac_try_echo=$ac_try;; |
| 4131 | esac |
| 4132 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4133 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4134 | +$as_echo "$ac_try_echo") >&5 |
| 4135 | (eval "$ac_try") 2>&5 |
| 4136 | ac_status=$? |
| 4137 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4138 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4139 | (exit $ac_status); }; }; then |
| 4140 | : |
| 4141 | else |
| 4142 | - echo "$as_me: program exited with status $ac_status" >&5 |
| 4143 | -echo "$as_me: failed program was:" >&5 |
| 4144 | + $as_echo "$as_me: program exited with status $ac_status" >&5 |
| 4145 | +$as_echo "$as_me: failed program was:" >&5 |
| 4146 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4147 | |
| 4148 | ( exit $ac_status ) |
| 4149 | ac_cv_header_stdc=no |
| 4150 | fi |
| 4151 | +rm -rf conftest.dSYM |
| 4152 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
| 4153 | fi |
| 4154 | |
| 4155 | |
| 4156 | fi |
| 4157 | fi |
| 4158 | -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 |
| 4159 | -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } |
| 4160 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 |
| 4161 | +$as_echo "$ac_cv_header_stdc" >&6; } |
| 4162 | if test $ac_cv_header_stdc = yes; then |
| 4163 | |
| 4164 | cat >>confdefs.h <<\_ACEOF |
| 4165 | @@ -5565,11 +5686,11 @@ fi |
| 4166 | for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ |
| 4167 | inttypes.h stdint.h unistd.h |
| 4168 | do |
| 4169 | -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 4170 | -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4171 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 4172 | +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 4173 | +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4174 | +$as_echo_n "checking for $ac_header... " >&6; } |
| 4175 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 4176 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4177 | + $as_echo_n "(cached) " >&6 |
| 4178 | else |
| 4179 | cat >conftest.$ac_ext <<_ACEOF |
| 4180 | /* confdefs.h. */ |
| 4181 | @@ -5587,20 +5708,21 @@ case "(($ac_try" in |
| 4182 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4183 | *) ac_try_echo=$ac_try;; |
| 4184 | esac |
| 4185 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4186 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4187 | +$as_echo "$ac_try_echo") >&5 |
| 4188 | (eval "$ac_compile") 2>conftest.er1 |
| 4189 | ac_status=$? |
| 4190 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4191 | rm -f conftest.er1 |
| 4192 | cat conftest.err >&5 |
| 4193 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4194 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4195 | (exit $ac_status); } && { |
| 4196 | test -z "$ac_c_werror_flag" || |
| 4197 | test ! -s conftest.err |
| 4198 | } && test -s conftest.$ac_objext; then |
| 4199 | eval "$as_ac_Header=yes" |
| 4200 | else |
| 4201 | - echo "$as_me: failed program was:" >&5 |
| 4202 | + $as_echo "$as_me: failed program was:" >&5 |
| 4203 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4204 | |
| 4205 | eval "$as_ac_Header=no" |
| 4206 | @@ -5608,12 +5730,15 @@ fi |
| 4207 | |
| 4208 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4209 | fi |
| 4210 | -ac_res=`eval echo '${'$as_ac_Header'}'` |
| 4211 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4212 | -echo "${ECHO_T}$ac_res" >&6; } |
| 4213 | -if test `eval echo '${'$as_ac_Header'}'` = yes; then |
| 4214 | +ac_res=`eval 'as_val=${'$as_ac_Header'} |
| 4215 | + $as_echo "$as_val"'` |
| 4216 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4217 | +$as_echo "$ac_res" >&6; } |
| 4218 | +as_val=`eval 'as_val=${'$as_ac_Header'} |
| 4219 | + $as_echo "$as_val"'` |
| 4220 | + if test "x$as_val" = x""yes; then |
| 4221 | cat >>confdefs.h <<_ACEOF |
| 4222 | -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 4223 | +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 4224 | _ACEOF |
| 4225 | |
| 4226 | fi |
| 4227 | @@ -5624,20 +5749,21 @@ done |
| 4228 | |
| 4229 | for ac_header in dlfcn.h |
| 4230 | do |
| 4231 | -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 4232 | +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 4233 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 4234 | - { echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4235 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 4236 | + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4237 | +$as_echo_n "checking for $ac_header... " >&6; } |
| 4238 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 4239 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4240 | + $as_echo_n "(cached) " >&6 |
| 4241 | fi |
| 4242 | -ac_res=`eval echo '${'$as_ac_Header'}'` |
| 4243 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4244 | -echo "${ECHO_T}$ac_res" >&6; } |
| 4245 | +ac_res=`eval 'as_val=${'$as_ac_Header'} |
| 4246 | + $as_echo "$as_val"'` |
| 4247 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4248 | +$as_echo "$ac_res" >&6; } |
| 4249 | else |
| 4250 | # Is the header compilable? |
| 4251 | -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 4252 | -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } |
| 4253 | +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 4254 | +$as_echo_n "checking $ac_header usability... " >&6; } |
| 4255 | cat >conftest.$ac_ext <<_ACEOF |
| 4256 | /* confdefs.h. */ |
| 4257 | _ACEOF |
| 4258 | @@ -5653,32 +5779,33 @@ case "(($ac_try" in |
| 4259 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4260 | *) ac_try_echo=$ac_try;; |
| 4261 | esac |
| 4262 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4263 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4264 | +$as_echo "$ac_try_echo") >&5 |
| 4265 | (eval "$ac_compile") 2>conftest.er1 |
| 4266 | ac_status=$? |
| 4267 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4268 | rm -f conftest.er1 |
| 4269 | cat conftest.err >&5 |
| 4270 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4271 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4272 | (exit $ac_status); } && { |
| 4273 | test -z "$ac_c_werror_flag" || |
| 4274 | test ! -s conftest.err |
| 4275 | } && test -s conftest.$ac_objext; then |
| 4276 | ac_header_compiler=yes |
| 4277 | else |
| 4278 | - echo "$as_me: failed program was:" >&5 |
| 4279 | + $as_echo "$as_me: failed program was:" >&5 |
| 4280 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4281 | |
| 4282 | ac_header_compiler=no |
| 4283 | fi |
| 4284 | |
| 4285 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4286 | -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 4287 | -echo "${ECHO_T}$ac_header_compiler" >&6; } |
| 4288 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 4289 | +$as_echo "$ac_header_compiler" >&6; } |
| 4290 | |
| 4291 | # Is the header present? |
| 4292 | -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 4293 | -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } |
| 4294 | +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 4295 | +$as_echo_n "checking $ac_header presence... " >&6; } |
| 4296 | cat >conftest.$ac_ext <<_ACEOF |
| 4297 | /* confdefs.h. */ |
| 4298 | _ACEOF |
| 4299 | @@ -5692,51 +5819,52 @@ case "(($ac_try" in |
| 4300 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4301 | *) ac_try_echo=$ac_try;; |
| 4302 | esac |
| 4303 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4304 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4305 | +$as_echo "$ac_try_echo") >&5 |
| 4306 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4307 | ac_status=$? |
| 4308 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4309 | rm -f conftest.er1 |
| 4310 | cat conftest.err >&5 |
| 4311 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4312 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4313 | (exit $ac_status); } >/dev/null && { |
| 4314 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 4315 | test ! -s conftest.err |
| 4316 | }; then |
| 4317 | ac_header_preproc=yes |
| 4318 | else |
| 4319 | - echo "$as_me: failed program was:" >&5 |
| 4320 | + $as_echo "$as_me: failed program was:" >&5 |
| 4321 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4322 | |
| 4323 | ac_header_preproc=no |
| 4324 | fi |
| 4325 | |
| 4326 | rm -f conftest.err conftest.$ac_ext |
| 4327 | -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 4328 | -echo "${ECHO_T}$ac_header_preproc" >&6; } |
| 4329 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 4330 | +$as_echo "$ac_header_preproc" >&6; } |
| 4331 | |
| 4332 | # So? What about this header? |
| 4333 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
| 4334 | yes:no: ) |
| 4335 | - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 4336 | -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 4337 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 4338 | -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 4339 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 4340 | +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 4341 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 4342 | +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 4343 | ac_header_preproc=yes |
| 4344 | ;; |
| 4345 | no:yes:* ) |
| 4346 | - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 4347 | -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 4348 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 4349 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 4350 | - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 4351 | -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 4352 | - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 4353 | -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 4354 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 4355 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 4356 | - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 4357 | -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 4358 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 4359 | +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 4360 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 4361 | +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 4362 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 4363 | +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 4364 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 4365 | +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 4366 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 4367 | +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 4368 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 4369 | +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 4370 | ( cat <<\_ASBOX |
| 4371 | ## -------------------------------------------- ## |
| 4372 | ## Report this to sebastian.marsching@suphp.org ## |
| 4373 | @@ -5745,21 +5873,24 @@ _ASBOX |
| 4374 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
| 4375 | ;; |
| 4376 | esac |
| 4377 | -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4378 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 4379 | +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 4380 | +$as_echo_n "checking for $ac_header... " >&6; } |
| 4381 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 4382 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4383 | + $as_echo_n "(cached) " >&6 |
| 4384 | else |
| 4385 | eval "$as_ac_Header=\$ac_header_preproc" |
| 4386 | fi |
| 4387 | -ac_res=`eval echo '${'$as_ac_Header'}'` |
| 4388 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4389 | -echo "${ECHO_T}$ac_res" >&6; } |
| 4390 | +ac_res=`eval 'as_val=${'$as_ac_Header'} |
| 4391 | + $as_echo "$as_val"'` |
| 4392 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 4393 | +$as_echo "$ac_res" >&6; } |
| 4394 | |
| 4395 | fi |
| 4396 | -if test `eval echo '${'$as_ac_Header'}'` = yes; then |
| 4397 | +as_val=`eval 'as_val=${'$as_ac_Header'} |
| 4398 | + $as_echo "$as_val"'` |
| 4399 | + if test "x$as_val" = x""yes; then |
| 4400 | cat >>confdefs.h <<_ACEOF |
| 4401 | -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 4402 | +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 4403 | _ACEOF |
| 4404 | |
| 4405 | fi |
| 4406 | @@ -5776,11 +5907,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' |
| 4407 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| 4408 | ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
| 4409 | ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
| 4410 | -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 |
| 4411 | -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } |
| 4412 | +{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 |
| 4413 | +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } |
| 4414 | if test -z "$CXXCPP"; then |
| 4415 | if test "${ac_cv_prog_CXXCPP+set}" = set; then |
| 4416 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4417 | + $as_echo_n "(cached) " >&6 |
| 4418 | else |
| 4419 | # Double quotes because CXXCPP needs to be expanded |
| 4420 | for CXXCPP in "$CXX -E" "/lib/cpp" |
| 4421 | @@ -5812,20 +5943,21 @@ case "(($ac_try" in |
| 4422 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4423 | *) ac_try_echo=$ac_try;; |
| 4424 | esac |
| 4425 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4426 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4427 | +$as_echo "$ac_try_echo") >&5 |
| 4428 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4429 | ac_status=$? |
| 4430 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4431 | rm -f conftest.er1 |
| 4432 | cat conftest.err >&5 |
| 4433 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4434 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4435 | (exit $ac_status); } >/dev/null && { |
| 4436 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
| 4437 | test ! -s conftest.err |
| 4438 | }; then |
| 4439 | : |
| 4440 | else |
| 4441 | - echo "$as_me: failed program was:" >&5 |
| 4442 | + $as_echo "$as_me: failed program was:" >&5 |
| 4443 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4444 | |
| 4445 | # Broken: fails on valid input. |
| 4446 | @@ -5849,13 +5981,14 @@ case "(($ac_try" in |
| 4447 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4448 | *) ac_try_echo=$ac_try;; |
| 4449 | esac |
| 4450 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4451 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4452 | +$as_echo "$ac_try_echo") >&5 |
| 4453 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4454 | ac_status=$? |
| 4455 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4456 | rm -f conftest.er1 |
| 4457 | cat conftest.err >&5 |
| 4458 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4459 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4460 | (exit $ac_status); } >/dev/null && { |
| 4461 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
| 4462 | test ! -s conftest.err |
| 4463 | @@ -5863,7 +5996,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4464 | # Broken: success on invalid input. |
| 4465 | continue |
| 4466 | else |
| 4467 | - echo "$as_me: failed program was:" >&5 |
| 4468 | + $as_echo "$as_me: failed program was:" >&5 |
| 4469 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4470 | |
| 4471 | # Passes both tests. |
| 4472 | @@ -5888,8 +6021,8 @@ fi |
| 4473 | else |
| 4474 | ac_cv_prog_CXXCPP=$CXXCPP |
| 4475 | fi |
| 4476 | -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 |
| 4477 | -echo "${ECHO_T}$CXXCPP" >&6; } |
| 4478 | +{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 |
| 4479 | +$as_echo "$CXXCPP" >&6; } |
| 4480 | ac_preproc_ok=false |
| 4481 | for ac_cxx_preproc_warn_flag in '' yes |
| 4482 | do |
| 4483 | @@ -5917,20 +6050,21 @@ case "(($ac_try" in |
| 4484 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4485 | *) ac_try_echo=$ac_try;; |
| 4486 | esac |
| 4487 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4488 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4489 | +$as_echo "$ac_try_echo") >&5 |
| 4490 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4491 | ac_status=$? |
| 4492 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4493 | rm -f conftest.er1 |
| 4494 | cat conftest.err >&5 |
| 4495 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4496 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4497 | (exit $ac_status); } >/dev/null && { |
| 4498 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
| 4499 | test ! -s conftest.err |
| 4500 | }; then |
| 4501 | : |
| 4502 | else |
| 4503 | - echo "$as_me: failed program was:" >&5 |
| 4504 | + $as_echo "$as_me: failed program was:" >&5 |
| 4505 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4506 | |
| 4507 | # Broken: fails on valid input. |
| 4508 | @@ -5954,13 +6088,14 @@ case "(($ac_try" in |
| 4509 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4510 | *) ac_try_echo=$ac_try;; |
| 4511 | esac |
| 4512 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4513 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4514 | +$as_echo "$ac_try_echo") >&5 |
| 4515 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 4516 | ac_status=$? |
| 4517 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4518 | rm -f conftest.er1 |
| 4519 | cat conftest.err >&5 |
| 4520 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4521 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4522 | (exit $ac_status); } >/dev/null && { |
| 4523 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
| 4524 | test ! -s conftest.err |
| 4525 | @@ -5968,7 +6103,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4526 | # Broken: success on invalid input. |
| 4527 | continue |
| 4528 | else |
| 4529 | - echo "$as_me: failed program was:" >&5 |
| 4530 | + $as_echo "$as_me: failed program was:" >&5 |
| 4531 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4532 | |
| 4533 | # Passes both tests. |
| 4534 | @@ -5984,11 +6119,13 @@ rm -f conftest.err conftest.$ac_ext |
| 4535 | if $ac_preproc_ok; then |
| 4536 | : |
| 4537 | else |
| 4538 | - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check |
| 4539 | + { { $as_echo "$as_me:$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 \"$CXXCPP\" fails sanity check |
| 4542 | See \`config.log' for more details." >&5 |
| 4543 | -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check |
| 4544 | +$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check |
| 4545 | See \`config.log' for more details." >&2;} |
| 4546 | - { (exit 1); exit 1; }; } |
| 4547 | + { (exit 1); exit 1; }; }; } |
| 4548 | fi |
| 4549 | |
| 4550 | ac_ext=cpp |
| 4551 | @@ -6009,10 +6146,10 @@ if test -n "$ac_tool_prefix"; then |
| 4552 | do |
| 4553 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
| 4554 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
| 4555 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4556 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 4557 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4558 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4559 | if test "${ac_cv_prog_F77+set}" = set; then |
| 4560 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4561 | + $as_echo_n "(cached) " >&6 |
| 4562 | else |
| 4563 | if test -n "$F77"; then |
| 4564 | ac_cv_prog_F77="$F77" # Let the user override the test. |
| 4565 | @@ -6025,7 +6162,7 @@ do |
| 4566 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4567 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4568 | ac_cv_prog_F77="$ac_tool_prefix$ac_prog" |
| 4569 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4570 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4571 | break 2 |
| 4572 | fi |
| 4573 | done |
| 4574 | @@ -6036,11 +6173,11 @@ fi |
| 4575 | fi |
| 4576 | F77=$ac_cv_prog_F77 |
| 4577 | if test -n "$F77"; then |
| 4578 | - { echo "$as_me:$LINENO: result: $F77" >&5 |
| 4579 | -echo "${ECHO_T}$F77" >&6; } |
| 4580 | + { $as_echo "$as_me:$LINENO: result: $F77" >&5 |
| 4581 | +$as_echo "$F77" >&6; } |
| 4582 | else |
| 4583 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 4584 | -echo "${ECHO_T}no" >&6; } |
| 4585 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 4586 | +$as_echo "no" >&6; } |
| 4587 | fi |
| 4588 | |
| 4589 | |
| 4590 | @@ -6053,10 +6190,10 @@ if test -z "$F77"; then |
| 4591 | do |
| 4592 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
| 4593 | set dummy $ac_prog; ac_word=$2 |
| 4594 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4595 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 4596 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4597 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4598 | if test "${ac_cv_prog_ac_ct_F77+set}" = set; then |
| 4599 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4600 | + $as_echo_n "(cached) " >&6 |
| 4601 | else |
| 4602 | if test -n "$ac_ct_F77"; then |
| 4603 | ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. |
| 4604 | @@ -6069,7 +6206,7 @@ do |
| 4605 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4606 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4607 | ac_cv_prog_ac_ct_F77="$ac_prog" |
| 4608 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4609 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4610 | break 2 |
| 4611 | fi |
| 4612 | done |
| 4613 | @@ -6080,11 +6217,11 @@ fi |
| 4614 | fi |
| 4615 | ac_ct_F77=$ac_cv_prog_ac_ct_F77 |
| 4616 | if test -n "$ac_ct_F77"; then |
| 4617 | - { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 |
| 4618 | -echo "${ECHO_T}$ac_ct_F77" >&6; } |
| 4619 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 |
| 4620 | +$as_echo "$ac_ct_F77" >&6; } |
| 4621 | else |
| 4622 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 4623 | -echo "${ECHO_T}no" >&6; } |
| 4624 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 4625 | +$as_echo "no" >&6; } |
| 4626 | fi |
| 4627 | |
| 4628 | |
| 4629 | @@ -6096,12 +6233,8 @@ done |
| 4630 | else |
| 4631 | case $cross_compiling:$ac_tool_warned in |
| 4632 | yes:) |
| 4633 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 4634 | -whose name does not start with the host triplet. If you think this |
| 4635 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 4636 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 4637 | -whose name does not start with the host triplet. If you think this |
| 4638 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 4639 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4640 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 4641 | ac_tool_warned=yes ;; |
| 4642 | esac |
| 4643 | F77=$ac_ct_F77 |
| 4644 | @@ -6110,37 +6243,41 @@ fi |
| 4645 | |
| 4646 | |
| 4647 | # Provide some information about the compiler. |
| 4648 | -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 |
| 4649 | -ac_compiler=`set X $ac_compile; echo $2` |
| 4650 | +$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 |
| 4651 | +set X $ac_compile |
| 4652 | +ac_compiler=$2 |
| 4653 | { (ac_try="$ac_compiler --version >&5" |
| 4654 | case "(($ac_try" in |
| 4655 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4656 | *) ac_try_echo=$ac_try;; |
| 4657 | esac |
| 4658 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4659 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4660 | +$as_echo "$ac_try_echo") >&5 |
| 4661 | (eval "$ac_compiler --version >&5") 2>&5 |
| 4662 | ac_status=$? |
| 4663 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4664 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4665 | (exit $ac_status); } |
| 4666 | { (ac_try="$ac_compiler -v >&5" |
| 4667 | case "(($ac_try" in |
| 4668 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4669 | *) ac_try_echo=$ac_try;; |
| 4670 | esac |
| 4671 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4672 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4673 | +$as_echo "$ac_try_echo") >&5 |
| 4674 | (eval "$ac_compiler -v >&5") 2>&5 |
| 4675 | ac_status=$? |
| 4676 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4677 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4678 | (exit $ac_status); } |
| 4679 | { (ac_try="$ac_compiler -V >&5" |
| 4680 | case "(($ac_try" in |
| 4681 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4682 | *) ac_try_echo=$ac_try;; |
| 4683 | esac |
| 4684 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4685 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4686 | +$as_echo "$ac_try_echo") >&5 |
| 4687 | (eval "$ac_compiler -V >&5") 2>&5 |
| 4688 | ac_status=$? |
| 4689 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4690 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4691 | (exit $ac_status); } |
| 4692 | rm -f a.out |
| 4693 | |
| 4694 | @@ -6148,10 +6285,10 @@ rm -f a.out |
| 4695 | # input file. (Note that this only needs to work for GNU compilers.) |
| 4696 | ac_save_ext=$ac_ext |
| 4697 | ac_ext=F |
| 4698 | -{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 |
| 4699 | -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } |
| 4700 | +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 |
| 4701 | +$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } |
| 4702 | if test "${ac_cv_f77_compiler_gnu+set}" = set; then |
| 4703 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4704 | + $as_echo_n "(cached) " >&6 |
| 4705 | else |
| 4706 | cat >conftest.$ac_ext <<_ACEOF |
| 4707 | program main |
| 4708 | @@ -6167,20 +6304,21 @@ case "(($ac_try" in |
| 4709 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4710 | *) ac_try_echo=$ac_try;; |
| 4711 | esac |
| 4712 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4713 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4714 | +$as_echo "$ac_try_echo") >&5 |
| 4715 | (eval "$ac_compile") 2>conftest.er1 |
| 4716 | ac_status=$? |
| 4717 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4718 | rm -f conftest.er1 |
| 4719 | cat conftest.err >&5 |
| 4720 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4721 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4722 | (exit $ac_status); } && { |
| 4723 | test -z "$ac_f77_werror_flag" || |
| 4724 | test ! -s conftest.err |
| 4725 | } && test -s conftest.$ac_objext; then |
| 4726 | ac_compiler_gnu=yes |
| 4727 | else |
| 4728 | - echo "$as_me: failed program was:" >&5 |
| 4729 | + $as_echo "$as_me: failed program was:" >&5 |
| 4730 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4731 | |
| 4732 | ac_compiler_gnu=no |
| 4733 | @@ -6190,16 +6328,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4734 | ac_cv_f77_compiler_gnu=$ac_compiler_gnu |
| 4735 | |
| 4736 | fi |
| 4737 | -{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 |
| 4738 | -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } |
| 4739 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 |
| 4740 | +$as_echo "$ac_cv_f77_compiler_gnu" >&6; } |
| 4741 | ac_ext=$ac_save_ext |
| 4742 | ac_test_FFLAGS=${FFLAGS+set} |
| 4743 | ac_save_FFLAGS=$FFLAGS |
| 4744 | FFLAGS= |
| 4745 | -{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 |
| 4746 | -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } |
| 4747 | +{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 |
| 4748 | +$as_echo_n "checking whether $F77 accepts -g... " >&6; } |
| 4749 | if test "${ac_cv_prog_f77_g+set}" = set; then |
| 4750 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4751 | + $as_echo_n "(cached) " >&6 |
| 4752 | else |
| 4753 | FFLAGS=-g |
| 4754 | cat >conftest.$ac_ext <<_ACEOF |
| 4755 | @@ -6213,20 +6351,21 @@ case "(($ac_try" in |
| 4756 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 4757 | *) ac_try_echo=$ac_try;; |
| 4758 | esac |
| 4759 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 4760 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 4761 | +$as_echo "$ac_try_echo") >&5 |
| 4762 | (eval "$ac_compile") 2>conftest.er1 |
| 4763 | ac_status=$? |
| 4764 | grep -v '^ *+' conftest.er1 >conftest.err |
| 4765 | rm -f conftest.er1 |
| 4766 | cat conftest.err >&5 |
| 4767 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4768 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4769 | (exit $ac_status); } && { |
| 4770 | test -z "$ac_f77_werror_flag" || |
| 4771 | test ! -s conftest.err |
| 4772 | } && test -s conftest.$ac_objext; then |
| 4773 | ac_cv_prog_f77_g=yes |
| 4774 | else |
| 4775 | - echo "$as_me: failed program was:" >&5 |
| 4776 | + $as_echo "$as_me: failed program was:" >&5 |
| 4777 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 4778 | |
| 4779 | ac_cv_prog_f77_g=no |
| 4780 | @@ -6235,8 +6374,8 @@ fi |
| 4781 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 4782 | |
| 4783 | fi |
| 4784 | -{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 |
| 4785 | -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } |
| 4786 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 |
| 4787 | +$as_echo "$ac_cv_prog_f77_g" >&6; } |
| 4788 | if test "$ac_test_FFLAGS" = set; then |
| 4789 | FFLAGS=$ac_save_FFLAGS |
| 4790 | elif test $ac_cv_prog_f77_g = yes; then |
| 4791 | @@ -6253,7 +6392,11 @@ else |
| 4792 | fi |
| 4793 | fi |
| 4794 | |
| 4795 | -G77=`test $ac_compiler_gnu = yes && echo yes` |
| 4796 | +if test $ac_compiler_gnu = yes; then |
| 4797 | + G77=yes |
| 4798 | +else |
| 4799 | + G77= |
| 4800 | +fi |
| 4801 | ac_ext=c |
| 4802 | ac_cpp='$CPP $CPPFLAGS' |
| 4803 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| 4804 | @@ -6264,10 +6407,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu |
| 4805 | |
| 4806 | # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! |
| 4807 | # find the maximum length of command line arguments |
| 4808 | -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 |
| 4809 | -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } |
| 4810 | +{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 |
| 4811 | +$as_echo_n "checking the maximum length of command line arguments... " >&6; } |
| 4812 | if test "${lt_cv_sys_max_cmd_len+set}" = set; then |
| 4813 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4814 | + $as_echo_n "(cached) " >&6 |
| 4815 | else |
| 4816 | i=0 |
| 4817 | teststring="ABCD" |
| 4818 | @@ -6376,11 +6519,11 @@ else |
| 4819 | fi |
| 4820 | |
| 4821 | if test -n $lt_cv_sys_max_cmd_len ; then |
| 4822 | - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 |
| 4823 | -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } |
| 4824 | + { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 |
| 4825 | +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } |
| 4826 | else |
| 4827 | - { echo "$as_me:$LINENO: result: none" >&5 |
| 4828 | -echo "${ECHO_T}none" >&6; } |
| 4829 | + { $as_echo "$as_me:$LINENO: result: none" >&5 |
| 4830 | +$as_echo "none" >&6; } |
| 4831 | fi |
| 4832 | |
| 4833 | |
| 4834 | @@ -6388,10 +6531,10 @@ fi |
| 4835 | |
| 4836 | |
| 4837 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
| 4838 | -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 |
| 4839 | -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } |
| 4840 | +{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 |
| 4841 | +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } |
| 4842 | if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then |
| 4843 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4844 | + $as_echo_n "(cached) " >&6 |
| 4845 | else |
| 4846 | |
| 4847 | # These are sane defaults that work on at least a few old systems. |
| 4848 | @@ -6496,14 +6639,14 @@ EOF |
| 4849 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 4850 | (eval $ac_compile) 2>&5 |
| 4851 | ac_status=$? |
| 4852 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4853 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4854 | (exit $ac_status); }; then |
| 4855 | # Now try to grab the symbols. |
| 4856 | nlist=conftest.nm |
| 4857 | if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 |
| 4858 | (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 |
| 4859 | ac_status=$? |
| 4860 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4861 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4862 | (exit $ac_status); } && test -s "$nlist"; then |
| 4863 | # Try sorting and uniquifying the output. |
| 4864 | if sort "$nlist" | uniq > "$nlist"T; then |
| 4865 | @@ -6558,7 +6701,7 @@ EOF |
| 4866 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
| 4867 | (eval $ac_link) 2>&5 |
| 4868 | ac_status=$? |
| 4869 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4870 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 4871 | (exit $ac_status); } && test -s conftest${ac_exeext}; then |
| 4872 | pipe_works=yes |
| 4873 | fi |
| 4874 | @@ -6593,17 +6736,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then |
| 4875 | lt_cv_sys_global_symbol_to_cdecl= |
| 4876 | fi |
| 4877 | if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then |
| 4878 | - { echo "$as_me:$LINENO: result: failed" >&5 |
| 4879 | -echo "${ECHO_T}failed" >&6; } |
| 4880 | + { $as_echo "$as_me:$LINENO: result: failed" >&5 |
| 4881 | +$as_echo "failed" >&6; } |
| 4882 | else |
| 4883 | - { echo "$as_me:$LINENO: result: ok" >&5 |
| 4884 | -echo "${ECHO_T}ok" >&6; } |
| 4885 | + { $as_echo "$as_me:$LINENO: result: ok" >&5 |
| 4886 | +$as_echo "ok" >&6; } |
| 4887 | fi |
| 4888 | |
| 4889 | -{ echo "$as_me:$LINENO: checking for objdir" >&5 |
| 4890 | -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } |
| 4891 | +{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 |
| 4892 | +$as_echo_n "checking for objdir... " >&6; } |
| 4893 | if test "${lt_cv_objdir+set}" = set; then |
| 4894 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4895 | + $as_echo_n "(cached) " >&6 |
| 4896 | else |
| 4897 | rm -f .libs 2>/dev/null |
| 4898 | mkdir .libs 2>/dev/null |
| 4899 | @@ -6615,8 +6758,8 @@ else |
| 4900 | fi |
| 4901 | rmdir .libs 2>/dev/null |
| 4902 | fi |
| 4903 | -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 |
| 4904 | -echo "${ECHO_T}$lt_cv_objdir" >&6; } |
| 4905 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 |
| 4906 | +$as_echo "$lt_cv_objdir" >&6; } |
| 4907 | objdir=$lt_cv_objdir |
| 4908 | |
| 4909 | |
| 4910 | @@ -6667,10 +6810,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" |
| 4911 | if test -n "$ac_tool_prefix"; then |
| 4912 | # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
| 4913 | set dummy ${ac_tool_prefix}ar; ac_word=$2 |
| 4914 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4915 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 4916 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4917 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4918 | if test "${ac_cv_prog_AR+set}" = set; then |
| 4919 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4920 | + $as_echo_n "(cached) " >&6 |
| 4921 | else |
| 4922 | if test -n "$AR"; then |
| 4923 | ac_cv_prog_AR="$AR" # Let the user override the test. |
| 4924 | @@ -6683,7 +6826,7 @@ do |
| 4925 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4926 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4927 | ac_cv_prog_AR="${ac_tool_prefix}ar" |
| 4928 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4929 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4930 | break 2 |
| 4931 | fi |
| 4932 | done |
| 4933 | @@ -6694,11 +6837,11 @@ fi |
| 4934 | fi |
| 4935 | AR=$ac_cv_prog_AR |
| 4936 | if test -n "$AR"; then |
| 4937 | - { echo "$as_me:$LINENO: result: $AR" >&5 |
| 4938 | -echo "${ECHO_T}$AR" >&6; } |
| 4939 | + { $as_echo "$as_me:$LINENO: result: $AR" >&5 |
| 4940 | +$as_echo "$AR" >&6; } |
| 4941 | else |
| 4942 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 4943 | -echo "${ECHO_T}no" >&6; } |
| 4944 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 4945 | +$as_echo "no" >&6; } |
| 4946 | fi |
| 4947 | |
| 4948 | |
| 4949 | @@ -6707,10 +6850,10 @@ if test -z "$ac_cv_prog_AR"; then |
| 4950 | ac_ct_AR=$AR |
| 4951 | # Extract the first word of "ar", so it can be a program name with args. |
| 4952 | set dummy ar; ac_word=$2 |
| 4953 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4954 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 4955 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 4956 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 4957 | if test "${ac_cv_prog_ac_ct_AR+set}" = set; then |
| 4958 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 4959 | + $as_echo_n "(cached) " >&6 |
| 4960 | else |
| 4961 | if test -n "$ac_ct_AR"; then |
| 4962 | ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. |
| 4963 | @@ -6723,7 +6866,7 @@ do |
| 4964 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 4965 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 4966 | ac_cv_prog_ac_ct_AR="ar" |
| 4967 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4968 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 4969 | break 2 |
| 4970 | fi |
| 4971 | done |
| 4972 | @@ -6734,11 +6877,11 @@ fi |
| 4973 | fi |
| 4974 | ac_ct_AR=$ac_cv_prog_ac_ct_AR |
| 4975 | if test -n "$ac_ct_AR"; then |
| 4976 | - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 |
| 4977 | -echo "${ECHO_T}$ac_ct_AR" >&6; } |
| 4978 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 |
| 4979 | +$as_echo "$ac_ct_AR" >&6; } |
| 4980 | else |
| 4981 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 4982 | -echo "${ECHO_T}no" >&6; } |
| 4983 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 4984 | +$as_echo "no" >&6; } |
| 4985 | fi |
| 4986 | |
| 4987 | if test "x$ac_ct_AR" = x; then |
| 4988 | @@ -6746,12 +6889,8 @@ fi |
| 4989 | else |
| 4990 | case $cross_compiling:$ac_tool_warned in |
| 4991 | yes:) |
| 4992 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 4993 | -whose name does not start with the host triplet. If you think this |
| 4994 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 4995 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 4996 | -whose name does not start with the host triplet. If you think this |
| 4997 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 4998 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 4999 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5000 | ac_tool_warned=yes ;; |
| 5001 | esac |
| 5002 | AR=$ac_ct_AR |
| 5003 | @@ -6763,10 +6902,10 @@ fi |
| 5004 | if test -n "$ac_tool_prefix"; then |
| 5005 | # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. |
| 5006 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
| 5007 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5008 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5009 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5010 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5011 | if test "${ac_cv_prog_RANLIB+set}" = set; then |
| 5012 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5013 | + $as_echo_n "(cached) " >&6 |
| 5014 | else |
| 5015 | if test -n "$RANLIB"; then |
| 5016 | ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. |
| 5017 | @@ -6779,7 +6918,7 @@ do |
| 5018 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5019 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5020 | ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" |
| 5021 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5022 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5023 | break 2 |
| 5024 | fi |
| 5025 | done |
| 5026 | @@ -6790,11 +6929,11 @@ fi |
| 5027 | fi |
| 5028 | RANLIB=$ac_cv_prog_RANLIB |
| 5029 | if test -n "$RANLIB"; then |
| 5030 | - { echo "$as_me:$LINENO: result: $RANLIB" >&5 |
| 5031 | -echo "${ECHO_T}$RANLIB" >&6; } |
| 5032 | + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 |
| 5033 | +$as_echo "$RANLIB" >&6; } |
| 5034 | else |
| 5035 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5036 | -echo "${ECHO_T}no" >&6; } |
| 5037 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5038 | +$as_echo "no" >&6; } |
| 5039 | fi |
| 5040 | |
| 5041 | |
| 5042 | @@ -6803,10 +6942,10 @@ if test -z "$ac_cv_prog_RANLIB"; then |
| 5043 | ac_ct_RANLIB=$RANLIB |
| 5044 | # Extract the first word of "ranlib", so it can be a program name with args. |
| 5045 | set dummy ranlib; ac_word=$2 |
| 5046 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5047 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5048 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5049 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5050 | if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then |
| 5051 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5052 | + $as_echo_n "(cached) " >&6 |
| 5053 | else |
| 5054 | if test -n "$ac_ct_RANLIB"; then |
| 5055 | ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. |
| 5056 | @@ -6819,7 +6958,7 @@ do |
| 5057 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5058 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5059 | ac_cv_prog_ac_ct_RANLIB="ranlib" |
| 5060 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5061 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5062 | break 2 |
| 5063 | fi |
| 5064 | done |
| 5065 | @@ -6830,11 +6969,11 @@ fi |
| 5066 | fi |
| 5067 | ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB |
| 5068 | if test -n "$ac_ct_RANLIB"; then |
| 5069 | - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 |
| 5070 | -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } |
| 5071 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 |
| 5072 | +$as_echo "$ac_ct_RANLIB" >&6; } |
| 5073 | else |
| 5074 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5075 | -echo "${ECHO_T}no" >&6; } |
| 5076 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5077 | +$as_echo "no" >&6; } |
| 5078 | fi |
| 5079 | |
| 5080 | if test "x$ac_ct_RANLIB" = x; then |
| 5081 | @@ -6842,12 +6981,8 @@ fi |
| 5082 | else |
| 5083 | case $cross_compiling:$ac_tool_warned in |
| 5084 | yes:) |
| 5085 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 5086 | -whose name does not start with the host triplet. If you think this |
| 5087 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 5088 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 5089 | -whose name does not start with the host triplet. If you think this |
| 5090 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 5091 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 5092 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5093 | ac_tool_warned=yes ;; |
| 5094 | esac |
| 5095 | RANLIB=$ac_ct_RANLIB |
| 5096 | @@ -6859,10 +6994,10 @@ fi |
| 5097 | if test -n "$ac_tool_prefix"; then |
| 5098 | # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. |
| 5099 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
| 5100 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5101 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5102 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5103 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5104 | if test "${ac_cv_prog_STRIP+set}" = set; then |
| 5105 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5106 | + $as_echo_n "(cached) " >&6 |
| 5107 | else |
| 5108 | if test -n "$STRIP"; then |
| 5109 | ac_cv_prog_STRIP="$STRIP" # Let the user override the test. |
| 5110 | @@ -6875,7 +7010,7 @@ do |
| 5111 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5112 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5113 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
| 5114 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5115 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5116 | break 2 |
| 5117 | fi |
| 5118 | done |
| 5119 | @@ -6886,11 +7021,11 @@ fi |
| 5120 | fi |
| 5121 | STRIP=$ac_cv_prog_STRIP |
| 5122 | if test -n "$STRIP"; then |
| 5123 | - { echo "$as_me:$LINENO: result: $STRIP" >&5 |
| 5124 | -echo "${ECHO_T}$STRIP" >&6; } |
| 5125 | + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 |
| 5126 | +$as_echo "$STRIP" >&6; } |
| 5127 | else |
| 5128 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5129 | -echo "${ECHO_T}no" >&6; } |
| 5130 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5131 | +$as_echo "no" >&6; } |
| 5132 | fi |
| 5133 | |
| 5134 | |
| 5135 | @@ -6899,10 +7034,10 @@ if test -z "$ac_cv_prog_STRIP"; then |
| 5136 | ac_ct_STRIP=$STRIP |
| 5137 | # Extract the first word of "strip", so it can be a program name with args. |
| 5138 | set dummy strip; ac_word=$2 |
| 5139 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5140 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5141 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5142 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5143 | if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then |
| 5144 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5145 | + $as_echo_n "(cached) " >&6 |
| 5146 | else |
| 5147 | if test -n "$ac_ct_STRIP"; then |
| 5148 | ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. |
| 5149 | @@ -6915,7 +7050,7 @@ do |
| 5150 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5151 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5152 | ac_cv_prog_ac_ct_STRIP="strip" |
| 5153 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5154 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5155 | break 2 |
| 5156 | fi |
| 5157 | done |
| 5158 | @@ -6926,11 +7061,11 @@ fi |
| 5159 | fi |
| 5160 | ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP |
| 5161 | if test -n "$ac_ct_STRIP"; then |
| 5162 | - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
| 5163 | -echo "${ECHO_T}$ac_ct_STRIP" >&6; } |
| 5164 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 |
| 5165 | +$as_echo "$ac_ct_STRIP" >&6; } |
| 5166 | else |
| 5167 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5168 | -echo "${ECHO_T}no" >&6; } |
| 5169 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5170 | +$as_echo "no" >&6; } |
| 5171 | fi |
| 5172 | |
| 5173 | if test "x$ac_ct_STRIP" = x; then |
| 5174 | @@ -6938,12 +7073,8 @@ fi |
| 5175 | else |
| 5176 | case $cross_compiling:$ac_tool_warned in |
| 5177 | yes:) |
| 5178 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 5179 | -whose name does not start with the host triplet. If you think this |
| 5180 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 5181 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 5182 | -whose name does not start with the host triplet. If you think this |
| 5183 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 5184 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 5185 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5186 | ac_tool_warned=yes ;; |
| 5187 | esac |
| 5188 | STRIP=$ac_ct_STRIP |
| 5189 | @@ -7006,10 +7137,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
| 5190 | case $deplibs_check_method in |
| 5191 | file_magic*) |
| 5192 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
| 5193 | - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 |
| 5194 | -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } |
| 5195 | + { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 |
| 5196 | +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } |
| 5197 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then |
| 5198 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5199 | + $as_echo_n "(cached) " >&6 |
| 5200 | else |
| 5201 | case $MAGIC_CMD in |
| 5202 | [\\/*] | ?:[\\/]*) |
| 5203 | @@ -7059,19 +7190,19 @@ fi |
| 5204 | |
| 5205 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
| 5206 | if test -n "$MAGIC_CMD"; then |
| 5207 | - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
| 5208 | -echo "${ECHO_T}$MAGIC_CMD" >&6; } |
| 5209 | + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
| 5210 | +$as_echo "$MAGIC_CMD" >&6; } |
| 5211 | else |
| 5212 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5213 | -echo "${ECHO_T}no" >&6; } |
| 5214 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5215 | +$as_echo "no" >&6; } |
| 5216 | fi |
| 5217 | |
| 5218 | if test -z "$lt_cv_path_MAGIC_CMD"; then |
| 5219 | if test -n "$ac_tool_prefix"; then |
| 5220 | - { echo "$as_me:$LINENO: checking for file" >&5 |
| 5221 | -echo $ECHO_N "checking for file... $ECHO_C" >&6; } |
| 5222 | + { $as_echo "$as_me:$LINENO: checking for file" >&5 |
| 5223 | +$as_echo_n "checking for file... " >&6; } |
| 5224 | if test "${lt_cv_path_MAGIC_CMD+set}" = set; then |
| 5225 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5226 | + $as_echo_n "(cached) " >&6 |
| 5227 | else |
| 5228 | case $MAGIC_CMD in |
| 5229 | [\\/*] | ?:[\\/]*) |
| 5230 | @@ -7121,11 +7252,11 @@ fi |
| 5231 | |
| 5232 | MAGIC_CMD="$lt_cv_path_MAGIC_CMD" |
| 5233 | if test -n "$MAGIC_CMD"; then |
| 5234 | - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
| 5235 | -echo "${ECHO_T}$MAGIC_CMD" >&6; } |
| 5236 | + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 |
| 5237 | +$as_echo "$MAGIC_CMD" >&6; } |
| 5238 | else |
| 5239 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5240 | -echo "${ECHO_T}no" >&6; } |
| 5241 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5242 | +$as_echo "no" >&6; } |
| 5243 | fi |
| 5244 | |
| 5245 | else |
| 5246 | @@ -7143,10 +7274,10 @@ esac |
| 5247 | if test -n "$ac_tool_prefix"; then |
| 5248 | # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. |
| 5249 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 |
| 5250 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5251 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5252 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5253 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5254 | if test "${ac_cv_prog_DSYMUTIL+set}" = set; then |
| 5255 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5256 | + $as_echo_n "(cached) " >&6 |
| 5257 | else |
| 5258 | if test -n "$DSYMUTIL"; then |
| 5259 | ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. |
| 5260 | @@ -7159,7 +7290,7 @@ do |
| 5261 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5262 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5263 | ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" |
| 5264 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5265 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5266 | break 2 |
| 5267 | fi |
| 5268 | done |
| 5269 | @@ -7170,11 +7301,11 @@ fi |
| 5270 | fi |
| 5271 | DSYMUTIL=$ac_cv_prog_DSYMUTIL |
| 5272 | if test -n "$DSYMUTIL"; then |
| 5273 | - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 |
| 5274 | -echo "${ECHO_T}$DSYMUTIL" >&6; } |
| 5275 | + { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 |
| 5276 | +$as_echo "$DSYMUTIL" >&6; } |
| 5277 | else |
| 5278 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5279 | -echo "${ECHO_T}no" >&6; } |
| 5280 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5281 | +$as_echo "no" >&6; } |
| 5282 | fi |
| 5283 | |
| 5284 | |
| 5285 | @@ -7183,10 +7314,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then |
| 5286 | ac_ct_DSYMUTIL=$DSYMUTIL |
| 5287 | # Extract the first word of "dsymutil", so it can be a program name with args. |
| 5288 | set dummy dsymutil; ac_word=$2 |
| 5289 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5290 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5291 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5292 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5293 | if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then |
| 5294 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5295 | + $as_echo_n "(cached) " >&6 |
| 5296 | else |
| 5297 | if test -n "$ac_ct_DSYMUTIL"; then |
| 5298 | ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. |
| 5299 | @@ -7199,7 +7330,7 @@ do |
| 5300 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5301 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5302 | ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" |
| 5303 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5304 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5305 | break 2 |
| 5306 | fi |
| 5307 | done |
| 5308 | @@ -7210,11 +7341,11 @@ fi |
| 5309 | fi |
| 5310 | ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL |
| 5311 | if test -n "$ac_ct_DSYMUTIL"; then |
| 5312 | - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 |
| 5313 | -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } |
| 5314 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 |
| 5315 | +$as_echo "$ac_ct_DSYMUTIL" >&6; } |
| 5316 | else |
| 5317 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5318 | -echo "${ECHO_T}no" >&6; } |
| 5319 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5320 | +$as_echo "no" >&6; } |
| 5321 | fi |
| 5322 | |
| 5323 | if test "x$ac_ct_DSYMUTIL" = x; then |
| 5324 | @@ -7222,12 +7353,8 @@ fi |
| 5325 | else |
| 5326 | case $cross_compiling:$ac_tool_warned in |
| 5327 | yes:) |
| 5328 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 5329 | -whose name does not start with the host triplet. If you think this |
| 5330 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 5331 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 5332 | -whose name does not start with the host triplet. If you think this |
| 5333 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 5334 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 5335 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5336 | ac_tool_warned=yes ;; |
| 5337 | esac |
| 5338 | DSYMUTIL=$ac_ct_DSYMUTIL |
| 5339 | @@ -7239,10 +7366,10 @@ fi |
| 5340 | if test -n "$ac_tool_prefix"; then |
| 5341 | # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. |
| 5342 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 |
| 5343 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5344 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5345 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5346 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5347 | if test "${ac_cv_prog_NMEDIT+set}" = set; then |
| 5348 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5349 | + $as_echo_n "(cached) " >&6 |
| 5350 | else |
| 5351 | if test -n "$NMEDIT"; then |
| 5352 | ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. |
| 5353 | @@ -7255,7 +7382,7 @@ do |
| 5354 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5355 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5356 | ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" |
| 5357 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5358 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5359 | break 2 |
| 5360 | fi |
| 5361 | done |
| 5362 | @@ -7266,11 +7393,11 @@ fi |
| 5363 | fi |
| 5364 | NMEDIT=$ac_cv_prog_NMEDIT |
| 5365 | if test -n "$NMEDIT"; then |
| 5366 | - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 |
| 5367 | -echo "${ECHO_T}$NMEDIT" >&6; } |
| 5368 | + { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 |
| 5369 | +$as_echo "$NMEDIT" >&6; } |
| 5370 | else |
| 5371 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5372 | -echo "${ECHO_T}no" >&6; } |
| 5373 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5374 | +$as_echo "no" >&6; } |
| 5375 | fi |
| 5376 | |
| 5377 | |
| 5378 | @@ -7279,10 +7406,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then |
| 5379 | ac_ct_NMEDIT=$NMEDIT |
| 5380 | # Extract the first word of "nmedit", so it can be a program name with args. |
| 5381 | set dummy nmedit; ac_word=$2 |
| 5382 | -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5383 | -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } |
| 5384 | +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 |
| 5385 | +$as_echo_n "checking for $ac_word... " >&6; } |
| 5386 | if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then |
| 5387 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5388 | + $as_echo_n "(cached) " >&6 |
| 5389 | else |
| 5390 | if test -n "$ac_ct_NMEDIT"; then |
| 5391 | ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. |
| 5392 | @@ -7295,7 +7422,7 @@ do |
| 5393 | for ac_exec_ext in '' $ac_executable_extensions; do |
| 5394 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
| 5395 | ac_cv_prog_ac_ct_NMEDIT="nmedit" |
| 5396 | - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5397 | + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
| 5398 | break 2 |
| 5399 | fi |
| 5400 | done |
| 5401 | @@ -7306,11 +7433,11 @@ fi |
| 5402 | fi |
| 5403 | ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT |
| 5404 | if test -n "$ac_ct_NMEDIT"; then |
| 5405 | - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 |
| 5406 | -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } |
| 5407 | + { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 |
| 5408 | +$as_echo "$ac_ct_NMEDIT" >&6; } |
| 5409 | else |
| 5410 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5411 | -echo "${ECHO_T}no" >&6; } |
| 5412 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5413 | +$as_echo "no" >&6; } |
| 5414 | fi |
| 5415 | |
| 5416 | if test "x$ac_ct_NMEDIT" = x; then |
| 5417 | @@ -7318,12 +7445,8 @@ fi |
| 5418 | else |
| 5419 | case $cross_compiling:$ac_tool_warned in |
| 5420 | yes:) |
| 5421 | -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools |
| 5422 | -whose name does not start with the host triplet. If you think this |
| 5423 | -configuration is useful to you, please write to autoconf@gnu.org." >&5 |
| 5424 | -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools |
| 5425 | -whose name does not start with the host triplet. If you think this |
| 5426 | -configuration is useful to you, please write to autoconf@gnu.org." >&2;} |
| 5427 | +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 |
| 5428 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
| 5429 | ac_tool_warned=yes ;; |
| 5430 | esac |
| 5431 | NMEDIT=$ac_ct_NMEDIT |
| 5432 | @@ -7333,10 +7456,10 @@ else |
| 5433 | fi |
| 5434 | |
| 5435 | |
| 5436 | - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 |
| 5437 | -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } |
| 5438 | + { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 |
| 5439 | +$as_echo_n "checking for -single_module linker flag... " >&6; } |
| 5440 | if test "${lt_cv_apple_cc_single_mod+set}" = set; then |
| 5441 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5442 | + $as_echo_n "(cached) " >&6 |
| 5443 | else |
| 5444 | lt_cv_apple_cc_single_mod=no |
| 5445 | if test -z "${LT_MULTI_MODULE}"; then |
| 5446 | @@ -7354,12 +7477,12 @@ else |
| 5447 | rm conftest.c |
| 5448 | fi |
| 5449 | fi |
| 5450 | -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 |
| 5451 | -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } |
| 5452 | - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 |
| 5453 | -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } |
| 5454 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 |
| 5455 | +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
| 5456 | + { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 |
| 5457 | +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
| 5458 | if test "${lt_cv_ld_exported_symbols_list+set}" = set; then |
| 5459 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5460 | + $as_echo_n "(cached) " >&6 |
| 5461 | else |
| 5462 | lt_cv_ld_exported_symbols_list=no |
| 5463 | save_LDFLAGS=$LDFLAGS |
| 5464 | @@ -7386,33 +7509,37 @@ case "(($ac_try" in |
| 5465 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 5466 | *) ac_try_echo=$ac_try;; |
| 5467 | esac |
| 5468 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 5469 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 5470 | +$as_echo "$ac_try_echo") >&5 |
| 5471 | (eval "$ac_link") 2>conftest.er1 |
| 5472 | ac_status=$? |
| 5473 | grep -v '^ *+' conftest.er1 >conftest.err |
| 5474 | rm -f conftest.er1 |
| 5475 | cat conftest.err >&5 |
| 5476 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5477 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5478 | (exit $ac_status); } && { |
| 5479 | test -z "$ac_c_werror_flag" || |
| 5480 | test ! -s conftest.err |
| 5481 | - } && test -s conftest$ac_exeext && |
| 5482 | - $as_test_x conftest$ac_exeext; then |
| 5483 | + } && test -s conftest$ac_exeext && { |
| 5484 | + test "$cross_compiling" = yes || |
| 5485 | + $as_test_x conftest$ac_exeext |
| 5486 | + }; then |
| 5487 | lt_cv_ld_exported_symbols_list=yes |
| 5488 | else |
| 5489 | - echo "$as_me: failed program was:" >&5 |
| 5490 | + $as_echo "$as_me: failed program was:" >&5 |
| 5491 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 5492 | |
| 5493 | lt_cv_ld_exported_symbols_list=no |
| 5494 | fi |
| 5495 | |
| 5496 | +rm -rf conftest.dSYM |
| 5497 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 5498 | conftest$ac_exeext conftest.$ac_ext |
| 5499 | LDFLAGS="$save_LDFLAGS" |
| 5500 | |
| 5501 | fi |
| 5502 | -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 |
| 5503 | -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } |
| 5504 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 |
| 5505 | +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
| 5506 | case $host_os in |
| 5507 | rhapsody* | darwin1.[0123]) |
| 5508 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
| 5509 | @@ -7524,10 +7651,10 @@ if test "$GCC" = yes; then |
| 5510 | lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
| 5511 | |
| 5512 | |
| 5513 | -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
| 5514 | -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } |
| 5515 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
| 5516 | +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
| 5517 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
| 5518 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5519 | + $as_echo_n "(cached) " >&6 |
| 5520 | else |
| 5521 | lt_cv_prog_compiler_rtti_exceptions=no |
| 5522 | ac_outfile=conftest.$ac_objext |
| 5523 | @@ -7542,11 +7669,11 @@ else |
| 5524 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 5525 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 5526 | -e 's:$: $lt_compiler_flag:'` |
| 5527 | - (eval echo "\"\$as_me:7545: $lt_compile\"" >&5) |
| 5528 | + (eval echo "\"\$as_me:7672: $lt_compile\"" >&5) |
| 5529 | (eval "$lt_compile" 2>conftest.err) |
| 5530 | ac_status=$? |
| 5531 | cat conftest.err >&5 |
| 5532 | - echo "$as_me:7549: \$? = $ac_status" >&5 |
| 5533 | + echo "$as_me:7676: \$? = $ac_status" >&5 |
| 5534 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 5535 | # The compiler can only warn and ignore the option if not recognized |
| 5536 | # So say no if there are warnings other than the usual output. |
| 5537 | @@ -7559,8 +7686,8 @@ else |
| 5538 | $rm conftest* |
| 5539 | |
| 5540 | fi |
| 5541 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
| 5542 | -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
| 5543 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
| 5544 | +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
| 5545 | |
| 5546 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then |
| 5547 | lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" |
| 5548 | @@ -7574,8 +7701,8 @@ lt_prog_compiler_wl= |
| 5549 | lt_prog_compiler_pic= |
| 5550 | lt_prog_compiler_static= |
| 5551 | |
| 5552 | -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 5553 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 5554 | +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 5555 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 5556 | |
| 5557 | if test "$GCC" = yes; then |
| 5558 | lt_prog_compiler_wl='-Wl,' |
| 5559 | @@ -7806,18 +7933,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 5560 | esac |
| 5561 | fi |
| 5562 | |
| 5563 | -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 |
| 5564 | -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } |
| 5565 | +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 |
| 5566 | +$as_echo "$lt_prog_compiler_pic" >&6; } |
| 5567 | |
| 5568 | # |
| 5569 | # Check to make sure the PIC flag actually works. |
| 5570 | # |
| 5571 | if test -n "$lt_prog_compiler_pic"; then |
| 5572 | |
| 5573 | -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
| 5574 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } |
| 5575 | +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
| 5576 | +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } |
| 5577 | if test "${lt_cv_prog_compiler_pic_works+set}" = set; then |
| 5578 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5579 | + $as_echo_n "(cached) " >&6 |
| 5580 | else |
| 5581 | lt_cv_prog_compiler_pic_works=no |
| 5582 | ac_outfile=conftest.$ac_objext |
| 5583 | @@ -7832,11 +7959,11 @@ else |
| 5584 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 5585 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 5586 | -e 's:$: $lt_compiler_flag:'` |
| 5587 | - (eval echo "\"\$as_me:7835: $lt_compile\"" >&5) |
| 5588 | + (eval echo "\"\$as_me:7962: $lt_compile\"" >&5) |
| 5589 | (eval "$lt_compile" 2>conftest.err) |
| 5590 | ac_status=$? |
| 5591 | cat conftest.err >&5 |
| 5592 | - echo "$as_me:7839: \$? = $ac_status" >&5 |
| 5593 | + echo "$as_me:7966: \$? = $ac_status" >&5 |
| 5594 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 5595 | # The compiler can only warn and ignore the option if not recognized |
| 5596 | # So say no if there are warnings other than the usual output. |
| 5597 | @@ -7849,8 +7976,8 @@ else |
| 5598 | $rm conftest* |
| 5599 | |
| 5600 | fi |
| 5601 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 |
| 5602 | -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } |
| 5603 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 |
| 5604 | +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } |
| 5605 | |
| 5606 | if test x"$lt_cv_prog_compiler_pic_works" = xyes; then |
| 5607 | case $lt_prog_compiler_pic in |
| 5608 | @@ -7877,10 +8004,10 @@ esac |
| 5609 | # Check to make sure the static flag actually works. |
| 5610 | # |
| 5611 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
| 5612 | -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 5613 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } |
| 5614 | +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 5615 | +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
| 5616 | if test "${lt_cv_prog_compiler_static_works+set}" = set; then |
| 5617 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5618 | + $as_echo_n "(cached) " >&6 |
| 5619 | else |
| 5620 | lt_cv_prog_compiler_static_works=no |
| 5621 | save_LDFLAGS="$LDFLAGS" |
| 5622 | @@ -7905,8 +8032,8 @@ else |
| 5623 | LDFLAGS="$save_LDFLAGS" |
| 5624 | |
| 5625 | fi |
| 5626 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 |
| 5627 | -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } |
| 5628 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 |
| 5629 | +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } |
| 5630 | |
| 5631 | if test x"$lt_cv_prog_compiler_static_works" = xyes; then |
| 5632 | : |
| 5633 | @@ -7915,10 +8042,10 @@ else |
| 5634 | fi |
| 5635 | |
| 5636 | |
| 5637 | -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 5638 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } |
| 5639 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 5640 | +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
| 5641 | if test "${lt_cv_prog_compiler_c_o+set}" = set; then |
| 5642 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5643 | + $as_echo_n "(cached) " >&6 |
| 5644 | else |
| 5645 | lt_cv_prog_compiler_c_o=no |
| 5646 | $rm -r conftest 2>/dev/null |
| 5647 | @@ -7936,11 +8063,11 @@ else |
| 5648 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 5649 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 5650 | -e 's:$: $lt_compiler_flag:'` |
| 5651 | - (eval echo "\"\$as_me:7939: $lt_compile\"" >&5) |
| 5652 | + (eval echo "\"\$as_me:8066: $lt_compile\"" >&5) |
| 5653 | (eval "$lt_compile" 2>out/conftest.err) |
| 5654 | ac_status=$? |
| 5655 | cat out/conftest.err >&5 |
| 5656 | - echo "$as_me:7943: \$? = $ac_status" >&5 |
| 5657 | + echo "$as_me:8070: \$? = $ac_status" >&5 |
| 5658 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 5659 | then |
| 5660 | # The compiler can only warn and ignore the option if not recognized |
| 5661 | @@ -7962,34 +8089,34 @@ else |
| 5662 | $rm conftest* |
| 5663 | |
| 5664 | fi |
| 5665 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 |
| 5666 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } |
| 5667 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 |
| 5668 | +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } |
| 5669 | |
| 5670 | |
| 5671 | hard_links="nottested" |
| 5672 | if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then |
| 5673 | # do not overwrite the value of need_locks provided by the user |
| 5674 | - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 5675 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } |
| 5676 | + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 5677 | +$as_echo_n "checking if we can lock with hard links... " >&6; } |
| 5678 | hard_links=yes |
| 5679 | $rm conftest* |
| 5680 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 5681 | touch conftest.a |
| 5682 | ln conftest.a conftest.b 2>&5 || hard_links=no |
| 5683 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 5684 | - { echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 5685 | -echo "${ECHO_T}$hard_links" >&6; } |
| 5686 | + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 5687 | +$as_echo "$hard_links" >&6; } |
| 5688 | if test "$hard_links" = no; then |
| 5689 | - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 5690 | -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 5691 | + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 5692 | +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 5693 | need_locks=warn |
| 5694 | fi |
| 5695 | else |
| 5696 | need_locks=no |
| 5697 | fi |
| 5698 | |
| 5699 | -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 5700 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } |
| 5701 | +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 5702 | +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 5703 | |
| 5704 | runpath_var= |
| 5705 | allow_undefined_flag= |
| 5706 | @@ -8420,18 +8547,21 @@ case "(($ac_try" in |
| 5707 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 5708 | *) ac_try_echo=$ac_try;; |
| 5709 | esac |
| 5710 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 5711 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 5712 | +$as_echo "$ac_try_echo") >&5 |
| 5713 | (eval "$ac_link") 2>conftest.er1 |
| 5714 | ac_status=$? |
| 5715 | grep -v '^ *+' conftest.er1 >conftest.err |
| 5716 | rm -f conftest.er1 |
| 5717 | cat conftest.err >&5 |
| 5718 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5719 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5720 | (exit $ac_status); } && { |
| 5721 | test -z "$ac_c_werror_flag" || |
| 5722 | test ! -s conftest.err |
| 5723 | - } && test -s conftest$ac_exeext && |
| 5724 | - $as_test_x conftest$ac_exeext; then |
| 5725 | + } && test -s conftest$ac_exeext && { |
| 5726 | + test "$cross_compiling" = yes || |
| 5727 | + $as_test_x conftest$ac_exeext |
| 5728 | + }; then |
| 5729 | |
| 5730 | lt_aix_libpath_sed=' |
| 5731 | /Import File Strings/,/^$/ { |
| 5732 | @@ -8446,12 +8576,13 @@ if test -z "$aix_libpath"; then |
| 5733 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 5734 | fi |
| 5735 | else |
| 5736 | - echo "$as_me: failed program was:" >&5 |
| 5737 | + $as_echo "$as_me: failed program was:" >&5 |
| 5738 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 5739 | |
| 5740 | |
| 5741 | fi |
| 5742 | |
| 5743 | +rm -rf conftest.dSYM |
| 5744 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 5745 | conftest$ac_exeext conftest.$ac_ext |
| 5746 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5747 | @@ -8486,18 +8617,21 @@ case "(($ac_try" in |
| 5748 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 5749 | *) ac_try_echo=$ac_try;; |
| 5750 | esac |
| 5751 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 5752 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 5753 | +$as_echo "$ac_try_echo") >&5 |
| 5754 | (eval "$ac_link") 2>conftest.er1 |
| 5755 | ac_status=$? |
| 5756 | grep -v '^ *+' conftest.er1 >conftest.err |
| 5757 | rm -f conftest.er1 |
| 5758 | cat conftest.err >&5 |
| 5759 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5760 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5761 | (exit $ac_status); } && { |
| 5762 | test -z "$ac_c_werror_flag" || |
| 5763 | test ! -s conftest.err |
| 5764 | - } && test -s conftest$ac_exeext && |
| 5765 | - $as_test_x conftest$ac_exeext; then |
| 5766 | + } && test -s conftest$ac_exeext && { |
| 5767 | + test "$cross_compiling" = yes || |
| 5768 | + $as_test_x conftest$ac_exeext |
| 5769 | + }; then |
| 5770 | |
| 5771 | lt_aix_libpath_sed=' |
| 5772 | /Import File Strings/,/^$/ { |
| 5773 | @@ -8512,12 +8646,13 @@ if test -z "$aix_libpath"; then |
| 5774 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 5775 | fi |
| 5776 | else |
| 5777 | - echo "$as_me: failed program was:" >&5 |
| 5778 | + $as_echo "$as_me: failed program was:" >&5 |
| 5779 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 5780 | |
| 5781 | |
| 5782 | fi |
| 5783 | |
| 5784 | +rm -rf conftest.dSYM |
| 5785 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 5786 | conftest$ac_exeext conftest.$ac_ext |
| 5787 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5788 | @@ -8969,8 +9104,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 5789 | esac |
| 5790 | fi |
| 5791 | |
| 5792 | -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 |
| 5793 | -echo "${ECHO_T}$ld_shlibs" >&6; } |
| 5794 | +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 |
| 5795 | +$as_echo "$ld_shlibs" >&6; } |
| 5796 | test "$ld_shlibs" = no && can_build_shared=no |
| 5797 | |
| 5798 | # |
| 5799 | @@ -8990,15 +9125,15 @@ x|xyes) |
| 5800 | # Test whether the compiler implicitly links with -lc since on some |
| 5801 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
| 5802 | # to ld, don't add -lc before -lgcc. |
| 5803 | - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 5804 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } |
| 5805 | + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 5806 | +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
| 5807 | $rm conftest* |
| 5808 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 5809 | |
| 5810 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 5811 | (eval $ac_compile) 2>&5 |
| 5812 | ac_status=$? |
| 5813 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5814 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5815 | (exit $ac_status); } 2>conftest.err; then |
| 5816 | soname=conftest |
| 5817 | lib=conftest |
| 5818 | @@ -9016,7 +9151,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 5819 | if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 |
| 5820 | (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
| 5821 | ac_status=$? |
| 5822 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5823 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5824 | (exit $ac_status); } |
| 5825 | then |
| 5826 | archive_cmds_need_lc=no |
| 5827 | @@ -9028,16 +9163,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 5828 | cat conftest.err 1>&5 |
| 5829 | fi |
| 5830 | $rm conftest* |
| 5831 | - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 |
| 5832 | -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } |
| 5833 | + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 |
| 5834 | +$as_echo "$archive_cmds_need_lc" >&6; } |
| 5835 | ;; |
| 5836 | esac |
| 5837 | fi |
| 5838 | ;; |
| 5839 | esac |
| 5840 | |
| 5841 | -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 5842 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } |
| 5843 | +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 5844 | +$as_echo_n "checking dynamic linker characteristics... " >&6; } |
| 5845 | library_names_spec= |
| 5846 | libname_spec='lib$name' |
| 5847 | soname_spec= |
| 5848 | @@ -9650,19 +9785,19 @@ uts4*) |
| 5849 | dynamic_linker=no |
| 5850 | ;; |
| 5851 | esac |
| 5852 | -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 5853 | -echo "${ECHO_T}$dynamic_linker" >&6; } |
| 5854 | +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 5855 | +$as_echo "$dynamic_linker" >&6; } |
| 5856 | test "$dynamic_linker" = no && can_build_shared=no |
| 5857 | |
| 5858 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
| 5859 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5860 | + $as_echo_n "(cached) " >&6 |
| 5861 | else |
| 5862 | lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" |
| 5863 | fi |
| 5864 | |
| 5865 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
| 5866 | if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
| 5867 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5868 | + $as_echo_n "(cached) " >&6 |
| 5869 | else |
| 5870 | lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" |
| 5871 | fi |
| 5872 | @@ -9674,8 +9809,8 @@ if test "$GCC" = yes; then |
| 5873 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
| 5874 | fi |
| 5875 | |
| 5876 | -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 5877 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } |
| 5878 | +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 5879 | +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
| 5880 | hardcode_action= |
| 5881 | if test -n "$hardcode_libdir_flag_spec" || \ |
| 5882 | test -n "$runpath_var" || \ |
| 5883 | @@ -9699,8 +9834,8 @@ else |
| 5884 | # directories. |
| 5885 | hardcode_action=unsupported |
| 5886 | fi |
| 5887 | -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 |
| 5888 | -echo "${ECHO_T}$hardcode_action" >&6; } |
| 5889 | +{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 |
| 5890 | +$as_echo "$hardcode_action" >&6; } |
| 5891 | |
| 5892 | if test "$hardcode_action" = relink; then |
| 5893 | # Fast installation is not supported |
| 5894 | @@ -9713,13 +9848,13 @@ fi |
| 5895 | |
| 5896 | striplib= |
| 5897 | old_striplib= |
| 5898 | -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
| 5899 | -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } |
| 5900 | +{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 |
| 5901 | +$as_echo_n "checking whether stripping libraries is possible... " >&6; } |
| 5902 | if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then |
| 5903 | test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" |
| 5904 | test -z "$striplib" && striplib="$STRIP --strip-unneeded" |
| 5905 | - { echo "$as_me:$LINENO: result: yes" >&5 |
| 5906 | -echo "${ECHO_T}yes" >&6; } |
| 5907 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 5908 | +$as_echo "yes" >&6; } |
| 5909 | else |
| 5910 | # FIXME - insert some real tests, host_os isn't really good enough |
| 5911 | case $host_os in |
| 5912 | @@ -9727,16 +9862,16 @@ else |
| 5913 | if test -n "$STRIP" ; then |
| 5914 | striplib="$STRIP -x" |
| 5915 | old_striplib="$STRIP -S" |
| 5916 | - { echo "$as_me:$LINENO: result: yes" >&5 |
| 5917 | -echo "${ECHO_T}yes" >&6; } |
| 5918 | + { $as_echo "$as_me:$LINENO: result: yes" >&5 |
| 5919 | +$as_echo "yes" >&6; } |
| 5920 | else |
| 5921 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5922 | -echo "${ECHO_T}no" >&6; } |
| 5923 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5924 | +$as_echo "no" >&6; } |
| 5925 | fi |
| 5926 | ;; |
| 5927 | *) |
| 5928 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 5929 | -echo "${ECHO_T}no" >&6; } |
| 5930 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 5931 | +$as_echo "no" >&6; } |
| 5932 | ;; |
| 5933 | esac |
| 5934 | fi |
| 5935 | @@ -9768,10 +9903,10 @@ else |
| 5936 | |
| 5937 | darwin*) |
| 5938 | # if libdl is installed we need to link against it |
| 5939 | - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
| 5940 | -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } |
| 5941 | + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
| 5942 | +$as_echo_n "checking for dlopen in -ldl... " >&6; } |
| 5943 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
| 5944 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 5945 | + $as_echo_n "(cached) " >&6 |
| 5946 | else |
| 5947 | ac_check_lib_save_LIBS=$LIBS |
| 5948 | LIBS="-ldl $LIBS" |
| 5949 | @@ -9803,33 +9938,37 @@ case "(($ac_try" in |
| 5950 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 5951 | *) ac_try_echo=$ac_try;; |
| 5952 | esac |
| 5953 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 5954 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 5955 | +$as_echo "$ac_try_echo") >&5 |
| 5956 | (eval "$ac_link") 2>conftest.er1 |
| 5957 | ac_status=$? |
| 5958 | grep -v '^ *+' conftest.er1 >conftest.err |
| 5959 | rm -f conftest.er1 |
| 5960 | cat conftest.err >&5 |
| 5961 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5962 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 5963 | (exit $ac_status); } && { |
| 5964 | test -z "$ac_c_werror_flag" || |
| 5965 | test ! -s conftest.err |
| 5966 | - } && test -s conftest$ac_exeext && |
| 5967 | - $as_test_x conftest$ac_exeext; then |
| 5968 | + } && test -s conftest$ac_exeext && { |
| 5969 | + test "$cross_compiling" = yes || |
| 5970 | + $as_test_x conftest$ac_exeext |
| 5971 | + }; then |
| 5972 | ac_cv_lib_dl_dlopen=yes |
| 5973 | else |
| 5974 | - echo "$as_me: failed program was:" >&5 |
| 5975 | + $as_echo "$as_me: failed program was:" >&5 |
| 5976 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 5977 | |
| 5978 | ac_cv_lib_dl_dlopen=no |
| 5979 | fi |
| 5980 | |
| 5981 | +rm -rf conftest.dSYM |
| 5982 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 5983 | conftest$ac_exeext conftest.$ac_ext |
| 5984 | LIBS=$ac_check_lib_save_LIBS |
| 5985 | fi |
| 5986 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
| 5987 | -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } |
| 5988 | -if test $ac_cv_lib_dl_dlopen = yes; then |
| 5989 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
| 5990 | +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
| 5991 | +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then |
| 5992 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
| 5993 | else |
| 5994 | |
| 5995 | @@ -9842,10 +9981,10 @@ fi |
| 5996 | ;; |
| 5997 | |
| 5998 | *) |
| 5999 | - { echo "$as_me:$LINENO: checking for shl_load" >&5 |
| 6000 | -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } |
| 6001 | + { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 |
| 6002 | +$as_echo_n "checking for shl_load... " >&6; } |
| 6003 | if test "${ac_cv_func_shl_load+set}" = set; then |
| 6004 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6005 | + $as_echo_n "(cached) " >&6 |
| 6006 | else |
| 6007 | cat >conftest.$ac_ext <<_ACEOF |
| 6008 | /* confdefs.h. */ |
| 6009 | @@ -9898,38 +10037,42 @@ case "(($ac_try" in |
| 6010 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6011 | *) ac_try_echo=$ac_try;; |
| 6012 | esac |
| 6013 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6014 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6015 | +$as_echo "$ac_try_echo") >&5 |
| 6016 | (eval "$ac_link") 2>conftest.er1 |
| 6017 | ac_status=$? |
| 6018 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6019 | rm -f conftest.er1 |
| 6020 | cat conftest.err >&5 |
| 6021 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6022 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6023 | (exit $ac_status); } && { |
| 6024 | test -z "$ac_c_werror_flag" || |
| 6025 | test ! -s conftest.err |
| 6026 | - } && test -s conftest$ac_exeext && |
| 6027 | - $as_test_x conftest$ac_exeext; then |
| 6028 | + } && test -s conftest$ac_exeext && { |
| 6029 | + test "$cross_compiling" = yes || |
| 6030 | + $as_test_x conftest$ac_exeext |
| 6031 | + }; then |
| 6032 | ac_cv_func_shl_load=yes |
| 6033 | else |
| 6034 | - echo "$as_me: failed program was:" >&5 |
| 6035 | + $as_echo "$as_me: failed program was:" >&5 |
| 6036 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6037 | |
| 6038 | ac_cv_func_shl_load=no |
| 6039 | fi |
| 6040 | |
| 6041 | +rm -rf conftest.dSYM |
| 6042 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6043 | conftest$ac_exeext conftest.$ac_ext |
| 6044 | fi |
| 6045 | -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
| 6046 | -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } |
| 6047 | -if test $ac_cv_func_shl_load = yes; then |
| 6048 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 |
| 6049 | +$as_echo "$ac_cv_func_shl_load" >&6; } |
| 6050 | +if test "x$ac_cv_func_shl_load" = x""yes; then |
| 6051 | lt_cv_dlopen="shl_load" |
| 6052 | else |
| 6053 | - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
| 6054 | -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } |
| 6055 | + { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 |
| 6056 | +$as_echo_n "checking for shl_load in -ldld... " >&6; } |
| 6057 | if test "${ac_cv_lib_dld_shl_load+set}" = set; then |
| 6058 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6059 | + $as_echo_n "(cached) " >&6 |
| 6060 | else |
| 6061 | ac_check_lib_save_LIBS=$LIBS |
| 6062 | LIBS="-ldld $LIBS" |
| 6063 | @@ -9961,39 +10104,43 @@ case "(($ac_try" in |
| 6064 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6065 | *) ac_try_echo=$ac_try;; |
| 6066 | esac |
| 6067 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6068 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6069 | +$as_echo "$ac_try_echo") >&5 |
| 6070 | (eval "$ac_link") 2>conftest.er1 |
| 6071 | ac_status=$? |
| 6072 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6073 | rm -f conftest.er1 |
| 6074 | cat conftest.err >&5 |
| 6075 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6076 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6077 | (exit $ac_status); } && { |
| 6078 | test -z "$ac_c_werror_flag" || |
| 6079 | test ! -s conftest.err |
| 6080 | - } && test -s conftest$ac_exeext && |
| 6081 | - $as_test_x conftest$ac_exeext; then |
| 6082 | + } && test -s conftest$ac_exeext && { |
| 6083 | + test "$cross_compiling" = yes || |
| 6084 | + $as_test_x conftest$ac_exeext |
| 6085 | + }; then |
| 6086 | ac_cv_lib_dld_shl_load=yes |
| 6087 | else |
| 6088 | - echo "$as_me: failed program was:" >&5 |
| 6089 | + $as_echo "$as_me: failed program was:" >&5 |
| 6090 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6091 | |
| 6092 | ac_cv_lib_dld_shl_load=no |
| 6093 | fi |
| 6094 | |
| 6095 | +rm -rf conftest.dSYM |
| 6096 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6097 | conftest$ac_exeext conftest.$ac_ext |
| 6098 | LIBS=$ac_check_lib_save_LIBS |
| 6099 | fi |
| 6100 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
| 6101 | -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } |
| 6102 | -if test $ac_cv_lib_dld_shl_load = yes; then |
| 6103 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 |
| 6104 | +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } |
| 6105 | +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then |
| 6106 | lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" |
| 6107 | else |
| 6108 | - { echo "$as_me:$LINENO: checking for dlopen" >&5 |
| 6109 | -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } |
| 6110 | + { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 |
| 6111 | +$as_echo_n "checking for dlopen... " >&6; } |
| 6112 | if test "${ac_cv_func_dlopen+set}" = set; then |
| 6113 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6114 | + $as_echo_n "(cached) " >&6 |
| 6115 | else |
| 6116 | cat >conftest.$ac_ext <<_ACEOF |
| 6117 | /* confdefs.h. */ |
| 6118 | @@ -10046,38 +10193,42 @@ case "(($ac_try" in |
| 6119 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6120 | *) ac_try_echo=$ac_try;; |
| 6121 | esac |
| 6122 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6123 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6124 | +$as_echo "$ac_try_echo") >&5 |
| 6125 | (eval "$ac_link") 2>conftest.er1 |
| 6126 | ac_status=$? |
| 6127 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6128 | rm -f conftest.er1 |
| 6129 | cat conftest.err >&5 |
| 6130 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6131 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6132 | (exit $ac_status); } && { |
| 6133 | test -z "$ac_c_werror_flag" || |
| 6134 | test ! -s conftest.err |
| 6135 | - } && test -s conftest$ac_exeext && |
| 6136 | - $as_test_x conftest$ac_exeext; then |
| 6137 | + } && test -s conftest$ac_exeext && { |
| 6138 | + test "$cross_compiling" = yes || |
| 6139 | + $as_test_x conftest$ac_exeext |
| 6140 | + }; then |
| 6141 | ac_cv_func_dlopen=yes |
| 6142 | else |
| 6143 | - echo "$as_me: failed program was:" >&5 |
| 6144 | + $as_echo "$as_me: failed program was:" >&5 |
| 6145 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6146 | |
| 6147 | ac_cv_func_dlopen=no |
| 6148 | fi |
| 6149 | |
| 6150 | +rm -rf conftest.dSYM |
| 6151 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6152 | conftest$ac_exeext conftest.$ac_ext |
| 6153 | fi |
| 6154 | -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
| 6155 | -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } |
| 6156 | -if test $ac_cv_func_dlopen = yes; then |
| 6157 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 |
| 6158 | +$as_echo "$ac_cv_func_dlopen" >&6; } |
| 6159 | +if test "x$ac_cv_func_dlopen" = x""yes; then |
| 6160 | lt_cv_dlopen="dlopen" |
| 6161 | else |
| 6162 | - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
| 6163 | -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } |
| 6164 | + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 |
| 6165 | +$as_echo_n "checking for dlopen in -ldl... " >&6; } |
| 6166 | if test "${ac_cv_lib_dl_dlopen+set}" = set; then |
| 6167 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6168 | + $as_echo_n "(cached) " >&6 |
| 6169 | else |
| 6170 | ac_check_lib_save_LIBS=$LIBS |
| 6171 | LIBS="-ldl $LIBS" |
| 6172 | @@ -10109,39 +10260,43 @@ case "(($ac_try" in |
| 6173 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6174 | *) ac_try_echo=$ac_try;; |
| 6175 | esac |
| 6176 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6177 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6178 | +$as_echo "$ac_try_echo") >&5 |
| 6179 | (eval "$ac_link") 2>conftest.er1 |
| 6180 | ac_status=$? |
| 6181 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6182 | rm -f conftest.er1 |
| 6183 | cat conftest.err >&5 |
| 6184 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6185 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6186 | (exit $ac_status); } && { |
| 6187 | test -z "$ac_c_werror_flag" || |
| 6188 | test ! -s conftest.err |
| 6189 | - } && test -s conftest$ac_exeext && |
| 6190 | - $as_test_x conftest$ac_exeext; then |
| 6191 | + } && test -s conftest$ac_exeext && { |
| 6192 | + test "$cross_compiling" = yes || |
| 6193 | + $as_test_x conftest$ac_exeext |
| 6194 | + }; then |
| 6195 | ac_cv_lib_dl_dlopen=yes |
| 6196 | else |
| 6197 | - echo "$as_me: failed program was:" >&5 |
| 6198 | + $as_echo "$as_me: failed program was:" >&5 |
| 6199 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6200 | |
| 6201 | ac_cv_lib_dl_dlopen=no |
| 6202 | fi |
| 6203 | |
| 6204 | +rm -rf conftest.dSYM |
| 6205 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6206 | conftest$ac_exeext conftest.$ac_ext |
| 6207 | LIBS=$ac_check_lib_save_LIBS |
| 6208 | fi |
| 6209 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
| 6210 | -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } |
| 6211 | -if test $ac_cv_lib_dl_dlopen = yes; then |
| 6212 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 |
| 6213 | +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } |
| 6214 | +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then |
| 6215 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" |
| 6216 | else |
| 6217 | - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
| 6218 | -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } |
| 6219 | + { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 |
| 6220 | +$as_echo_n "checking for dlopen in -lsvld... " >&6; } |
| 6221 | if test "${ac_cv_lib_svld_dlopen+set}" = set; then |
| 6222 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6223 | + $as_echo_n "(cached) " >&6 |
| 6224 | else |
| 6225 | ac_check_lib_save_LIBS=$LIBS |
| 6226 | LIBS="-lsvld $LIBS" |
| 6227 | @@ -10173,39 +10328,43 @@ case "(($ac_try" in |
| 6228 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6229 | *) ac_try_echo=$ac_try;; |
| 6230 | esac |
| 6231 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6232 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6233 | +$as_echo "$ac_try_echo") >&5 |
| 6234 | (eval "$ac_link") 2>conftest.er1 |
| 6235 | ac_status=$? |
| 6236 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6237 | rm -f conftest.er1 |
| 6238 | cat conftest.err >&5 |
| 6239 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6240 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6241 | (exit $ac_status); } && { |
| 6242 | test -z "$ac_c_werror_flag" || |
| 6243 | test ! -s conftest.err |
| 6244 | - } && test -s conftest$ac_exeext && |
| 6245 | - $as_test_x conftest$ac_exeext; then |
| 6246 | + } && test -s conftest$ac_exeext && { |
| 6247 | + test "$cross_compiling" = yes || |
| 6248 | + $as_test_x conftest$ac_exeext |
| 6249 | + }; then |
| 6250 | ac_cv_lib_svld_dlopen=yes |
| 6251 | else |
| 6252 | - echo "$as_me: failed program was:" >&5 |
| 6253 | + $as_echo "$as_me: failed program was:" >&5 |
| 6254 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6255 | |
| 6256 | ac_cv_lib_svld_dlopen=no |
| 6257 | fi |
| 6258 | |
| 6259 | +rm -rf conftest.dSYM |
| 6260 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6261 | conftest$ac_exeext conftest.$ac_ext |
| 6262 | LIBS=$ac_check_lib_save_LIBS |
| 6263 | fi |
| 6264 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
| 6265 | -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } |
| 6266 | -if test $ac_cv_lib_svld_dlopen = yes; then |
| 6267 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 |
| 6268 | +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } |
| 6269 | +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then |
| 6270 | lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" |
| 6271 | else |
| 6272 | - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
| 6273 | -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } |
| 6274 | + { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 |
| 6275 | +$as_echo_n "checking for dld_link in -ldld... " >&6; } |
| 6276 | if test "${ac_cv_lib_dld_dld_link+set}" = set; then |
| 6277 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6278 | + $as_echo_n "(cached) " >&6 |
| 6279 | else |
| 6280 | ac_check_lib_save_LIBS=$LIBS |
| 6281 | LIBS="-ldld $LIBS" |
| 6282 | @@ -10237,33 +10396,37 @@ case "(($ac_try" in |
| 6283 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6284 | *) ac_try_echo=$ac_try;; |
| 6285 | esac |
| 6286 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6287 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6288 | +$as_echo "$ac_try_echo") >&5 |
| 6289 | (eval "$ac_link") 2>conftest.er1 |
| 6290 | ac_status=$? |
| 6291 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6292 | rm -f conftest.er1 |
| 6293 | cat conftest.err >&5 |
| 6294 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6295 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6296 | (exit $ac_status); } && { |
| 6297 | test -z "$ac_c_werror_flag" || |
| 6298 | test ! -s conftest.err |
| 6299 | - } && test -s conftest$ac_exeext && |
| 6300 | - $as_test_x conftest$ac_exeext; then |
| 6301 | + } && test -s conftest$ac_exeext && { |
| 6302 | + test "$cross_compiling" = yes || |
| 6303 | + $as_test_x conftest$ac_exeext |
| 6304 | + }; then |
| 6305 | ac_cv_lib_dld_dld_link=yes |
| 6306 | else |
| 6307 | - echo "$as_me: failed program was:" >&5 |
| 6308 | + $as_echo "$as_me: failed program was:" >&5 |
| 6309 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6310 | |
| 6311 | ac_cv_lib_dld_dld_link=no |
| 6312 | fi |
| 6313 | |
| 6314 | +rm -rf conftest.dSYM |
| 6315 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6316 | conftest$ac_exeext conftest.$ac_ext |
| 6317 | LIBS=$ac_check_lib_save_LIBS |
| 6318 | fi |
| 6319 | -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
| 6320 | -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } |
| 6321 | -if test $ac_cv_lib_dld_dld_link = yes; then |
| 6322 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 |
| 6323 | +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } |
| 6324 | +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then |
| 6325 | lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" |
| 6326 | fi |
| 6327 | |
| 6328 | @@ -10302,10 +10465,10 @@ fi |
| 6329 | save_LIBS="$LIBS" |
| 6330 | LIBS="$lt_cv_dlopen_libs $LIBS" |
| 6331 | |
| 6332 | - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 |
| 6333 | -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } |
| 6334 | + { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 |
| 6335 | +$as_echo_n "checking whether a program can dlopen itself... " >&6; } |
| 6336 | if test "${lt_cv_dlopen_self+set}" = set; then |
| 6337 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6338 | + $as_echo_n "(cached) " >&6 |
| 6339 | else |
| 6340 | if test "$cross_compiling" = yes; then : |
| 6341 | lt_cv_dlopen_self=cross |
| 6342 | @@ -10313,7 +10476,7 @@ else |
| 6343 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 6344 | lt_status=$lt_dlunknown |
| 6345 | cat > conftest.$ac_ext <<EOF |
| 6346 | -#line 10316 "configure" |
| 6347 | +#line 10479 "configure" |
| 6348 | #include "confdefs.h" |
| 6349 | |
| 6350 | #if HAVE_DLFCN_H |
| 6351 | @@ -10379,7 +10542,7 @@ EOF |
| 6352 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
| 6353 | (eval $ac_link) 2>&5 |
| 6354 | ac_status=$? |
| 6355 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6356 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6357 | (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
| 6358 | (./conftest; exit; ) >&5 2>/dev/null |
| 6359 | lt_status=$? |
| 6360 | @@ -10397,15 +10560,15 @@ rm -fr conftest* |
| 6361 | |
| 6362 | |
| 6363 | fi |
| 6364 | -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 |
| 6365 | -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } |
| 6366 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 |
| 6367 | +$as_echo "$lt_cv_dlopen_self" >&6; } |
| 6368 | |
| 6369 | if test "x$lt_cv_dlopen_self" = xyes; then |
| 6370 | wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" |
| 6371 | - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
| 6372 | -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } |
| 6373 | + { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 |
| 6374 | +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } |
| 6375 | if test "${lt_cv_dlopen_self_static+set}" = set; then |
| 6376 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6377 | + $as_echo_n "(cached) " >&6 |
| 6378 | else |
| 6379 | if test "$cross_compiling" = yes; then : |
| 6380 | lt_cv_dlopen_self_static=cross |
| 6381 | @@ -10413,7 +10576,7 @@ else |
| 6382 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
| 6383 | lt_status=$lt_dlunknown |
| 6384 | cat > conftest.$ac_ext <<EOF |
| 6385 | -#line 10416 "configure" |
| 6386 | +#line 10579 "configure" |
| 6387 | #include "confdefs.h" |
| 6388 | |
| 6389 | #if HAVE_DLFCN_H |
| 6390 | @@ -10479,7 +10642,7 @@ EOF |
| 6391 | if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
| 6392 | (eval $ac_link) 2>&5 |
| 6393 | ac_status=$? |
| 6394 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6395 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6396 | (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then |
| 6397 | (./conftest; exit; ) >&5 2>/dev/null |
| 6398 | lt_status=$? |
| 6399 | @@ -10497,8 +10660,8 @@ rm -fr conftest* |
| 6400 | |
| 6401 | |
| 6402 | fi |
| 6403 | -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 |
| 6404 | -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } |
| 6405 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 |
| 6406 | +$as_echo "$lt_cv_dlopen_self_static" >&6; } |
| 6407 | fi |
| 6408 | |
| 6409 | CPPFLAGS="$save_CPPFLAGS" |
| 6410 | @@ -10520,13 +10683,13 @@ fi |
| 6411 | |
| 6412 | |
| 6413 | # Report which library types will actually be built |
| 6414 | -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
| 6415 | -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } |
| 6416 | -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
| 6417 | -echo "${ECHO_T}$can_build_shared" >&6; } |
| 6418 | +{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
| 6419 | +$as_echo_n "checking if libtool supports shared libraries... " >&6; } |
| 6420 | +{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
| 6421 | +$as_echo "$can_build_shared" >&6; } |
| 6422 | |
| 6423 | -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
| 6424 | -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } |
| 6425 | +{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
| 6426 | +$as_echo_n "checking whether to build shared libraries... " >&6; } |
| 6427 | test "$can_build_shared" = "no" && enable_shared=no |
| 6428 | |
| 6429 | # On AIX, shared libraries and static libraries use the same namespace, and |
| 6430 | @@ -10546,15 +10709,15 @@ aix[4-9]*) |
| 6431 | fi |
| 6432 | ;; |
| 6433 | esac |
| 6434 | -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 |
| 6435 | -echo "${ECHO_T}$enable_shared" >&6; } |
| 6436 | +{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 |
| 6437 | +$as_echo "$enable_shared" >&6; } |
| 6438 | |
| 6439 | -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
| 6440 | -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } |
| 6441 | +{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
| 6442 | +$as_echo_n "checking whether to build static libraries... " >&6; } |
| 6443 | # Make sure either enable_shared or enable_static is yes. |
| 6444 | test "$enable_shared" = yes || enable_static=yes |
| 6445 | -{ echo "$as_me:$LINENO: result: $enable_static" >&5 |
| 6446 | -echo "${ECHO_T}$enable_static" >&6; } |
| 6447 | +{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 |
| 6448 | +$as_echo "$enable_static" >&6; } |
| 6449 | |
| 6450 | # The else clause should only fire when bootstrapping the |
| 6451 | # libtool distribution, otherwise you forgot to ship ltmain.sh |
| 6452 | @@ -10647,8 +10810,8 @@ if test -f "$ltmain"; then |
| 6453 | cfgfile="${ofile}T" |
| 6454 | trap "$rm \"$cfgfile\"; exit 1" 1 2 15 |
| 6455 | $rm -f "$cfgfile" |
| 6456 | - { echo "$as_me:$LINENO: creating $ofile" >&5 |
| 6457 | -echo "$as_me: creating $ofile" >&6;} |
| 6458 | + { $as_echo "$as_me:$LINENO: creating $ofile" >&5 |
| 6459 | +$as_echo "$as_me: creating $ofile" >&6;} |
| 6460 | |
| 6461 | cat <<__EOF__ >> "$cfgfile" |
| 6462 | #! $SHELL |
| 6463 | @@ -11060,18 +11223,18 @@ fi |
| 6464 | |
| 6465 | if test -f "$ltmain" && test -n "$tagnames"; then |
| 6466 | if test ! -f "${ofile}"; then |
| 6467 | - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 |
| 6468 | -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} |
| 6469 | + { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 |
| 6470 | +$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} |
| 6471 | fi |
| 6472 | |
| 6473 | if test -z "$LTCC"; then |
| 6474 | eval "`$SHELL ${ofile} --config | grep '^LTCC='`" |
| 6475 | if test -z "$LTCC"; then |
| 6476 | - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 |
| 6477 | -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} |
| 6478 | + { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 |
| 6479 | +$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} |
| 6480 | else |
| 6481 | - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 |
| 6482 | -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} |
| 6483 | + { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 |
| 6484 | +$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} |
| 6485 | fi |
| 6486 | fi |
| 6487 | if test -z "$LTCFLAGS"; then |
| 6488 | @@ -11088,16 +11251,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} |
| 6489 | # Check whether tagname contains only valid characters |
| 6490 | case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in |
| 6491 | "") ;; |
| 6492 | - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 |
| 6493 | -echo "$as_me: error: invalid tag name: $tagname" >&2;} |
| 6494 | + *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 |
| 6495 | +$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} |
| 6496 | { (exit 1); exit 1; }; } |
| 6497 | ;; |
| 6498 | esac |
| 6499 | |
| 6500 | if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null |
| 6501 | then |
| 6502 | - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 |
| 6503 | -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} |
| 6504 | + { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 |
| 6505 | +$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} |
| 6506 | { (exit 1); exit 1; }; } |
| 6507 | fi |
| 6508 | |
| 6509 | @@ -11240,8 +11403,8 @@ fi |
| 6510 | ac_prog=ld |
| 6511 | if test "$GCC" = yes; then |
| 6512 | # Check if gcc -print-prog-name=ld gives a path. |
| 6513 | - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
| 6514 | -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } |
| 6515 | + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 |
| 6516 | +$as_echo_n "checking for ld used by $CC... " >&6; } |
| 6517 | case $host in |
| 6518 | *-*-mingw*) |
| 6519 | # gcc leaves a trailing carriage return which upsets mingw |
| 6520 | @@ -11270,14 +11433,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } |
| 6521 | ;; |
| 6522 | esac |
| 6523 | elif test "$with_gnu_ld" = yes; then |
| 6524 | - { echo "$as_me:$LINENO: checking for GNU ld" >&5 |
| 6525 | -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } |
| 6526 | + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 |
| 6527 | +$as_echo_n "checking for GNU ld... " >&6; } |
| 6528 | else |
| 6529 | - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
| 6530 | -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } |
| 6531 | + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 |
| 6532 | +$as_echo_n "checking for non-GNU ld... " >&6; } |
| 6533 | fi |
| 6534 | if test "${lt_cv_path_LD+set}" = set; then |
| 6535 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6536 | + $as_echo_n "(cached) " >&6 |
| 6537 | else |
| 6538 | if test -z "$LD"; then |
| 6539 | lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
| 6540 | @@ -11307,19 +11470,19 @@ fi |
| 6541 | |
| 6542 | LD="$lt_cv_path_LD" |
| 6543 | if test -n "$LD"; then |
| 6544 | - { echo "$as_me:$LINENO: result: $LD" >&5 |
| 6545 | -echo "${ECHO_T}$LD" >&6; } |
| 6546 | + { $as_echo "$as_me:$LINENO: result: $LD" >&5 |
| 6547 | +$as_echo "$LD" >&6; } |
| 6548 | else |
| 6549 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 6550 | -echo "${ECHO_T}no" >&6; } |
| 6551 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 6552 | +$as_echo "no" >&6; } |
| 6553 | fi |
| 6554 | -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
| 6555 | -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
| 6556 | +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 |
| 6557 | +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} |
| 6558 | { (exit 1); exit 1; }; } |
| 6559 | -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
| 6560 | -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } |
| 6561 | +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 |
| 6562 | +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
| 6563 | if test "${lt_cv_prog_gnu_ld+set}" = set; then |
| 6564 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6565 | + $as_echo_n "(cached) " >&6 |
| 6566 | else |
| 6567 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
| 6568 | case `$LD -v 2>&1 </dev/null` in |
| 6569 | @@ -11331,8 +11494,8 @@ case `$LD -v 2>&1 </dev/null` in |
| 6570 | ;; |
| 6571 | esac |
| 6572 | fi |
| 6573 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
| 6574 | -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } |
| 6575 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 |
| 6576 | +$as_echo "$lt_cv_prog_gnu_ld" >&6; } |
| 6577 | with_gnu_ld=$lt_cv_prog_gnu_ld |
| 6578 | |
| 6579 | |
| 6580 | @@ -11382,8 +11545,8 @@ else |
| 6581 | fi |
| 6582 | |
| 6583 | # PORTME: fill in a description of your system's C++ link characteristics |
| 6584 | -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 6585 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } |
| 6586 | +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 6587 | +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 6588 | ld_shlibs_CXX=yes |
| 6589 | case $host_os in |
| 6590 | aix3*) |
| 6591 | @@ -11500,18 +11663,21 @@ case "(($ac_try" in |
| 6592 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6593 | *) ac_try_echo=$ac_try;; |
| 6594 | esac |
| 6595 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6596 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6597 | +$as_echo "$ac_try_echo") >&5 |
| 6598 | (eval "$ac_link") 2>conftest.er1 |
| 6599 | ac_status=$? |
| 6600 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6601 | rm -f conftest.er1 |
| 6602 | cat conftest.err >&5 |
| 6603 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6604 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6605 | (exit $ac_status); } && { |
| 6606 | test -z "$ac_cxx_werror_flag" || |
| 6607 | test ! -s conftest.err |
| 6608 | - } && test -s conftest$ac_exeext && |
| 6609 | - $as_test_x conftest$ac_exeext; then |
| 6610 | + } && test -s conftest$ac_exeext && { |
| 6611 | + test "$cross_compiling" = yes || |
| 6612 | + $as_test_x conftest$ac_exeext |
| 6613 | + }; then |
| 6614 | |
| 6615 | lt_aix_libpath_sed=' |
| 6616 | /Import File Strings/,/^$/ { |
| 6617 | @@ -11526,12 +11692,13 @@ if test -z "$aix_libpath"; then |
| 6618 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6619 | fi |
| 6620 | else |
| 6621 | - echo "$as_me: failed program was:" >&5 |
| 6622 | + $as_echo "$as_me: failed program was:" >&5 |
| 6623 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6624 | |
| 6625 | |
| 6626 | fi |
| 6627 | |
| 6628 | +rm -rf conftest.dSYM |
| 6629 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6630 | conftest$ac_exeext conftest.$ac_ext |
| 6631 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6632 | @@ -11567,18 +11734,21 @@ case "(($ac_try" in |
| 6633 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 6634 | *) ac_try_echo=$ac_try;; |
| 6635 | esac |
| 6636 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 6637 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 6638 | +$as_echo "$ac_try_echo") >&5 |
| 6639 | (eval "$ac_link") 2>conftest.er1 |
| 6640 | ac_status=$? |
| 6641 | grep -v '^ *+' conftest.er1 >conftest.err |
| 6642 | rm -f conftest.er1 |
| 6643 | cat conftest.err >&5 |
| 6644 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6645 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6646 | (exit $ac_status); } && { |
| 6647 | test -z "$ac_cxx_werror_flag" || |
| 6648 | test ! -s conftest.err |
| 6649 | - } && test -s conftest$ac_exeext && |
| 6650 | - $as_test_x conftest$ac_exeext; then |
| 6651 | + } && test -s conftest$ac_exeext && { |
| 6652 | + test "$cross_compiling" = yes || |
| 6653 | + $as_test_x conftest$ac_exeext |
| 6654 | + }; then |
| 6655 | |
| 6656 | lt_aix_libpath_sed=' |
| 6657 | /Import File Strings/,/^$/ { |
| 6658 | @@ -11593,12 +11763,13 @@ if test -z "$aix_libpath"; then |
| 6659 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 6660 | fi |
| 6661 | else |
| 6662 | - echo "$as_me: failed program was:" >&5 |
| 6663 | + $as_echo "$as_me: failed program was:" >&5 |
| 6664 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 6665 | |
| 6666 | |
| 6667 | fi |
| 6668 | |
| 6669 | +rm -rf conftest.dSYM |
| 6670 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 6671 | conftest$ac_exeext conftest.$ac_ext |
| 6672 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6673 | @@ -12328,8 +12499,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 6674 | ld_shlibs_CXX=no |
| 6675 | ;; |
| 6676 | esac |
| 6677 | -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
| 6678 | -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } |
| 6679 | +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
| 6680 | +$as_echo "$ld_shlibs_CXX" >&6; } |
| 6681 | test "$ld_shlibs_CXX" = no && can_build_shared=no |
| 6682 | |
| 6683 | GCC_CXX="$GXX" |
| 6684 | @@ -12348,7 +12519,7 @@ EOF |
| 6685 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 6686 | (eval $ac_compile) 2>&5 |
| 6687 | ac_status=$? |
| 6688 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6689 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6690 | (exit $ac_status); }; then |
| 6691 | # Parse the compiler output and extract the necessary |
| 6692 | # objects, libraries and library flags. |
| 6693 | @@ -12504,8 +12675,8 @@ lt_prog_compiler_wl_CXX= |
| 6694 | lt_prog_compiler_pic_CXX= |
| 6695 | lt_prog_compiler_static_CXX= |
| 6696 | |
| 6697 | -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 6698 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 6699 | +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 6700 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 6701 | |
| 6702 | # C++ specific cases for pic, static, wl, etc. |
| 6703 | if test "$GXX" = yes; then |
| 6704 | @@ -12788,18 +12959,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 6705 | esac |
| 6706 | fi |
| 6707 | |
| 6708 | -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 |
| 6709 | -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } |
| 6710 | +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 |
| 6711 | +$as_echo "$lt_prog_compiler_pic_CXX" >&6; } |
| 6712 | |
| 6713 | # |
| 6714 | # Check to make sure the PIC flag actually works. |
| 6715 | # |
| 6716 | if test -n "$lt_prog_compiler_pic_CXX"; then |
| 6717 | |
| 6718 | -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 |
| 6719 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } |
| 6720 | +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 |
| 6721 | +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } |
| 6722 | if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then |
| 6723 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6724 | + $as_echo_n "(cached) " >&6 |
| 6725 | else |
| 6726 | lt_cv_prog_compiler_pic_works_CXX=no |
| 6727 | ac_outfile=conftest.$ac_objext |
| 6728 | @@ -12814,11 +12985,11 @@ else |
| 6729 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 6730 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 6731 | -e 's:$: $lt_compiler_flag:'` |
| 6732 | - (eval echo "\"\$as_me:12817: $lt_compile\"" >&5) |
| 6733 | + (eval echo "\"\$as_me:12988: $lt_compile\"" >&5) |
| 6734 | (eval "$lt_compile" 2>conftest.err) |
| 6735 | ac_status=$? |
| 6736 | cat conftest.err >&5 |
| 6737 | - echo "$as_me:12821: \$? = $ac_status" >&5 |
| 6738 | + echo "$as_me:12992: \$? = $ac_status" >&5 |
| 6739 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 6740 | # The compiler can only warn and ignore the option if not recognized |
| 6741 | # So say no if there are warnings other than the usual output. |
| 6742 | @@ -12831,8 +13002,8 @@ else |
| 6743 | $rm conftest* |
| 6744 | |
| 6745 | fi |
| 6746 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 |
| 6747 | -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } |
| 6748 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 |
| 6749 | +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } |
| 6750 | |
| 6751 | if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then |
| 6752 | case $lt_prog_compiler_pic_CXX in |
| 6753 | @@ -12859,10 +13030,10 @@ esac |
| 6754 | # Check to make sure the static flag actually works. |
| 6755 | # |
| 6756 | wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" |
| 6757 | -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 6758 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } |
| 6759 | +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 6760 | +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
| 6761 | if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then |
| 6762 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6763 | + $as_echo_n "(cached) " >&6 |
| 6764 | else |
| 6765 | lt_cv_prog_compiler_static_works_CXX=no |
| 6766 | save_LDFLAGS="$LDFLAGS" |
| 6767 | @@ -12887,8 +13058,8 @@ else |
| 6768 | LDFLAGS="$save_LDFLAGS" |
| 6769 | |
| 6770 | fi |
| 6771 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 |
| 6772 | -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } |
| 6773 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 |
| 6774 | +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } |
| 6775 | |
| 6776 | if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then |
| 6777 | : |
| 6778 | @@ -12897,10 +13068,10 @@ else |
| 6779 | fi |
| 6780 | |
| 6781 | |
| 6782 | -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 6783 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } |
| 6784 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 6785 | +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
| 6786 | if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then |
| 6787 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6788 | + $as_echo_n "(cached) " >&6 |
| 6789 | else |
| 6790 | lt_cv_prog_compiler_c_o_CXX=no |
| 6791 | $rm -r conftest 2>/dev/null |
| 6792 | @@ -12918,11 +13089,11 @@ else |
| 6793 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 6794 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 6795 | -e 's:$: $lt_compiler_flag:'` |
| 6796 | - (eval echo "\"\$as_me:12921: $lt_compile\"" >&5) |
| 6797 | + (eval echo "\"\$as_me:13092: $lt_compile\"" >&5) |
| 6798 | (eval "$lt_compile" 2>out/conftest.err) |
| 6799 | ac_status=$? |
| 6800 | cat out/conftest.err >&5 |
| 6801 | - echo "$as_me:12925: \$? = $ac_status" >&5 |
| 6802 | + echo "$as_me:13096: \$? = $ac_status" >&5 |
| 6803 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 6804 | then |
| 6805 | # The compiler can only warn and ignore the option if not recognized |
| 6806 | @@ -12944,34 +13115,34 @@ else |
| 6807 | $rm conftest* |
| 6808 | |
| 6809 | fi |
| 6810 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 |
| 6811 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } |
| 6812 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 |
| 6813 | +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } |
| 6814 | |
| 6815 | |
| 6816 | hard_links="nottested" |
| 6817 | if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then |
| 6818 | # do not overwrite the value of need_locks provided by the user |
| 6819 | - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 6820 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } |
| 6821 | + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 6822 | +$as_echo_n "checking if we can lock with hard links... " >&6; } |
| 6823 | hard_links=yes |
| 6824 | $rm conftest* |
| 6825 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 6826 | touch conftest.a |
| 6827 | ln conftest.a conftest.b 2>&5 || hard_links=no |
| 6828 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 6829 | - { echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 6830 | -echo "${ECHO_T}$hard_links" >&6; } |
| 6831 | + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 6832 | +$as_echo "$hard_links" >&6; } |
| 6833 | if test "$hard_links" = no; then |
| 6834 | - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 6835 | -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 6836 | + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 6837 | +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 6838 | need_locks=warn |
| 6839 | fi |
| 6840 | else |
| 6841 | need_locks=no |
| 6842 | fi |
| 6843 | |
| 6844 | -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 6845 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } |
| 6846 | +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 6847 | +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 6848 | |
| 6849 | export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 6850 | case $host_os in |
| 6851 | @@ -12999,8 +13170,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar |
| 6852 | esac |
| 6853 | exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' |
| 6854 | |
| 6855 | -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
| 6856 | -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } |
| 6857 | +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 |
| 6858 | +$as_echo "$ld_shlibs_CXX" >&6; } |
| 6859 | test "$ld_shlibs_CXX" = no && can_build_shared=no |
| 6860 | |
| 6861 | # |
| 6862 | @@ -13020,15 +13191,15 @@ x|xyes) |
| 6863 | # Test whether the compiler implicitly links with -lc since on some |
| 6864 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
| 6865 | # to ld, don't add -lc before -lgcc. |
| 6866 | - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 6867 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } |
| 6868 | + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 6869 | +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
| 6870 | $rm conftest* |
| 6871 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 6872 | |
| 6873 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 6874 | (eval $ac_compile) 2>&5 |
| 6875 | ac_status=$? |
| 6876 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6877 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6878 | (exit $ac_status); } 2>conftest.err; then |
| 6879 | soname=conftest |
| 6880 | lib=conftest |
| 6881 | @@ -13046,7 +13217,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 6882 | if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 |
| 6883 | (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
| 6884 | ac_status=$? |
| 6885 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6886 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 6887 | (exit $ac_status); } |
| 6888 | then |
| 6889 | archive_cmds_need_lc_CXX=no |
| 6890 | @@ -13058,16 +13229,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 6891 | cat conftest.err 1>&5 |
| 6892 | fi |
| 6893 | $rm conftest* |
| 6894 | - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 |
| 6895 | -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } |
| 6896 | + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 |
| 6897 | +$as_echo "$archive_cmds_need_lc_CXX" >&6; } |
| 6898 | ;; |
| 6899 | esac |
| 6900 | fi |
| 6901 | ;; |
| 6902 | esac |
| 6903 | |
| 6904 | -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 6905 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } |
| 6906 | +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 6907 | +$as_echo_n "checking dynamic linker characteristics... " >&6; } |
| 6908 | library_names_spec= |
| 6909 | libname_spec='lib$name' |
| 6910 | soname_spec= |
| 6911 | @@ -13628,19 +13799,19 @@ uts4*) |
| 6912 | dynamic_linker=no |
| 6913 | ;; |
| 6914 | esac |
| 6915 | -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 6916 | -echo "${ECHO_T}$dynamic_linker" >&6; } |
| 6917 | +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 6918 | +$as_echo "$dynamic_linker" >&6; } |
| 6919 | test "$dynamic_linker" = no && can_build_shared=no |
| 6920 | |
| 6921 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
| 6922 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6923 | + $as_echo_n "(cached) " >&6 |
| 6924 | else |
| 6925 | lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" |
| 6926 | fi |
| 6927 | |
| 6928 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
| 6929 | if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
| 6930 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 6931 | + $as_echo_n "(cached) " >&6 |
| 6932 | else |
| 6933 | lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" |
| 6934 | fi |
| 6935 | @@ -13652,8 +13823,8 @@ if test "$GCC" = yes; then |
| 6936 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
| 6937 | fi |
| 6938 | |
| 6939 | -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 6940 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } |
| 6941 | +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 6942 | +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
| 6943 | hardcode_action_CXX= |
| 6944 | if test -n "$hardcode_libdir_flag_spec_CXX" || \ |
| 6945 | test -n "$runpath_var_CXX" || \ |
| 6946 | @@ -13677,8 +13848,8 @@ else |
| 6947 | # directories. |
| 6948 | hardcode_action_CXX=unsupported |
| 6949 | fi |
| 6950 | -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 |
| 6951 | -echo "${ECHO_T}$hardcode_action_CXX" >&6; } |
| 6952 | +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 |
| 6953 | +$as_echo "$hardcode_action_CXX" >&6; } |
| 6954 | |
| 6955 | if test "$hardcode_action_CXX" = relink; then |
| 6956 | # Fast installation is not supported |
| 6957 | @@ -14216,13 +14387,13 @@ done |
| 6958 | cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
| 6959 | |
| 6960 | |
| 6961 | -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
| 6962 | -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } |
| 6963 | -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
| 6964 | -echo "${ECHO_T}$can_build_shared" >&6; } |
| 6965 | +{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 |
| 6966 | +$as_echo_n "checking if libtool supports shared libraries... " >&6; } |
| 6967 | +{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 |
| 6968 | +$as_echo "$can_build_shared" >&6; } |
| 6969 | |
| 6970 | -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
| 6971 | -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } |
| 6972 | +{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 |
| 6973 | +$as_echo_n "checking whether to build shared libraries... " >&6; } |
| 6974 | test "$can_build_shared" = "no" && enable_shared=no |
| 6975 | |
| 6976 | # On AIX, shared libraries and static libraries use the same namespace, and |
| 6977 | @@ -14241,15 +14412,15 @@ aix[4-9]*) |
| 6978 | fi |
| 6979 | ;; |
| 6980 | esac |
| 6981 | -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 |
| 6982 | -echo "${ECHO_T}$enable_shared" >&6; } |
| 6983 | +{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 |
| 6984 | +$as_echo "$enable_shared" >&6; } |
| 6985 | |
| 6986 | -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
| 6987 | -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } |
| 6988 | +{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 |
| 6989 | +$as_echo_n "checking whether to build static libraries... " >&6; } |
| 6990 | # Make sure either enable_shared or enable_static is yes. |
| 6991 | test "$enable_shared" = yes || enable_static=yes |
| 6992 | -{ echo "$as_me:$LINENO: result: $enable_static" >&5 |
| 6993 | -echo "${ECHO_T}$enable_static" >&6; } |
| 6994 | +{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 |
| 6995 | +$as_echo "$enable_static" >&6; } |
| 6996 | |
| 6997 | GCC_F77="$G77" |
| 6998 | LD_F77="$LD" |
| 6999 | @@ -14258,8 +14429,8 @@ lt_prog_compiler_wl_F77= |
| 7000 | lt_prog_compiler_pic_F77= |
| 7001 | lt_prog_compiler_static_F77= |
| 7002 | |
| 7003 | -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 7004 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 7005 | +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 7006 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 7007 | |
| 7008 | if test "$GCC" = yes; then |
| 7009 | lt_prog_compiler_wl_F77='-Wl,' |
| 7010 | @@ -14490,18 +14661,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 7011 | esac |
| 7012 | fi |
| 7013 | |
| 7014 | -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 |
| 7015 | -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } |
| 7016 | +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 |
| 7017 | +$as_echo "$lt_prog_compiler_pic_F77" >&6; } |
| 7018 | |
| 7019 | # |
| 7020 | # Check to make sure the PIC flag actually works. |
| 7021 | # |
| 7022 | if test -n "$lt_prog_compiler_pic_F77"; then |
| 7023 | |
| 7024 | -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 |
| 7025 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } |
| 7026 | +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 |
| 7027 | +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } |
| 7028 | if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then |
| 7029 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7030 | + $as_echo_n "(cached) " >&6 |
| 7031 | else |
| 7032 | lt_cv_prog_compiler_pic_works_F77=no |
| 7033 | ac_outfile=conftest.$ac_objext |
| 7034 | @@ -14516,11 +14687,11 @@ else |
| 7035 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 7036 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 7037 | -e 's:$: $lt_compiler_flag:'` |
| 7038 | - (eval echo "\"\$as_me:14519: $lt_compile\"" >&5) |
| 7039 | + (eval echo "\"\$as_me:14690: $lt_compile\"" >&5) |
| 7040 | (eval "$lt_compile" 2>conftest.err) |
| 7041 | ac_status=$? |
| 7042 | cat conftest.err >&5 |
| 7043 | - echo "$as_me:14523: \$? = $ac_status" >&5 |
| 7044 | + echo "$as_me:14694: \$? = $ac_status" >&5 |
| 7045 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 7046 | # The compiler can only warn and ignore the option if not recognized |
| 7047 | # So say no if there are warnings other than the usual output. |
| 7048 | @@ -14533,8 +14704,8 @@ else |
| 7049 | $rm conftest* |
| 7050 | |
| 7051 | fi |
| 7052 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 |
| 7053 | -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } |
| 7054 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 |
| 7055 | +$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } |
| 7056 | |
| 7057 | if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then |
| 7058 | case $lt_prog_compiler_pic_F77 in |
| 7059 | @@ -14561,10 +14732,10 @@ esac |
| 7060 | # Check to make sure the static flag actually works. |
| 7061 | # |
| 7062 | wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" |
| 7063 | -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 7064 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } |
| 7065 | +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 7066 | +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
| 7067 | if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then |
| 7068 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7069 | + $as_echo_n "(cached) " >&6 |
| 7070 | else |
| 7071 | lt_cv_prog_compiler_static_works_F77=no |
| 7072 | save_LDFLAGS="$LDFLAGS" |
| 7073 | @@ -14589,8 +14760,8 @@ else |
| 7074 | LDFLAGS="$save_LDFLAGS" |
| 7075 | |
| 7076 | fi |
| 7077 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 |
| 7078 | -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } |
| 7079 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 |
| 7080 | +$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } |
| 7081 | |
| 7082 | if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then |
| 7083 | : |
| 7084 | @@ -14599,10 +14770,10 @@ else |
| 7085 | fi |
| 7086 | |
| 7087 | |
| 7088 | -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 7089 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } |
| 7090 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 7091 | +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
| 7092 | if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then |
| 7093 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7094 | + $as_echo_n "(cached) " >&6 |
| 7095 | else |
| 7096 | lt_cv_prog_compiler_c_o_F77=no |
| 7097 | $rm -r conftest 2>/dev/null |
| 7098 | @@ -14620,11 +14791,11 @@ else |
| 7099 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 7100 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 7101 | -e 's:$: $lt_compiler_flag:'` |
| 7102 | - (eval echo "\"\$as_me:14623: $lt_compile\"" >&5) |
| 7103 | + (eval echo "\"\$as_me:14794: $lt_compile\"" >&5) |
| 7104 | (eval "$lt_compile" 2>out/conftest.err) |
| 7105 | ac_status=$? |
| 7106 | cat out/conftest.err >&5 |
| 7107 | - echo "$as_me:14627: \$? = $ac_status" >&5 |
| 7108 | + echo "$as_me:14798: \$? = $ac_status" >&5 |
| 7109 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 7110 | then |
| 7111 | # The compiler can only warn and ignore the option if not recognized |
| 7112 | @@ -14646,34 +14817,34 @@ else |
| 7113 | $rm conftest* |
| 7114 | |
| 7115 | fi |
| 7116 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 |
| 7117 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } |
| 7118 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 |
| 7119 | +$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } |
| 7120 | |
| 7121 | |
| 7122 | hard_links="nottested" |
| 7123 | if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then |
| 7124 | # do not overwrite the value of need_locks provided by the user |
| 7125 | - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 7126 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } |
| 7127 | + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 7128 | +$as_echo_n "checking if we can lock with hard links... " >&6; } |
| 7129 | hard_links=yes |
| 7130 | $rm conftest* |
| 7131 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 7132 | touch conftest.a |
| 7133 | ln conftest.a conftest.b 2>&5 || hard_links=no |
| 7134 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 7135 | - { echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 7136 | -echo "${ECHO_T}$hard_links" >&6; } |
| 7137 | + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 7138 | +$as_echo "$hard_links" >&6; } |
| 7139 | if test "$hard_links" = no; then |
| 7140 | - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 7141 | -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 7142 | + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 7143 | +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 7144 | need_locks=warn |
| 7145 | fi |
| 7146 | else |
| 7147 | need_locks=no |
| 7148 | fi |
| 7149 | |
| 7150 | -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 7151 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } |
| 7152 | +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 7153 | +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 7154 | |
| 7155 | runpath_var= |
| 7156 | allow_undefined_flag_F77= |
| 7157 | @@ -15094,18 +15265,21 @@ case "(($ac_try" in |
| 7158 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7159 | *) ac_try_echo=$ac_try;; |
| 7160 | esac |
| 7161 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7162 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7163 | +$as_echo "$ac_try_echo") >&5 |
| 7164 | (eval "$ac_link") 2>conftest.er1 |
| 7165 | ac_status=$? |
| 7166 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7167 | rm -f conftest.er1 |
| 7168 | cat conftest.err >&5 |
| 7169 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7170 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7171 | (exit $ac_status); } && { |
| 7172 | test -z "$ac_f77_werror_flag" || |
| 7173 | test ! -s conftest.err |
| 7174 | - } && test -s conftest$ac_exeext && |
| 7175 | - $as_test_x conftest$ac_exeext; then |
| 7176 | + } && test -s conftest$ac_exeext && { |
| 7177 | + test "$cross_compiling" = yes || |
| 7178 | + $as_test_x conftest$ac_exeext |
| 7179 | + }; then |
| 7180 | |
| 7181 | lt_aix_libpath_sed=' |
| 7182 | /Import File Strings/,/^$/ { |
| 7183 | @@ -15120,12 +15294,13 @@ if test -z "$aix_libpath"; then |
| 7184 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 7185 | fi |
| 7186 | else |
| 7187 | - echo "$as_me: failed program was:" >&5 |
| 7188 | + $as_echo "$as_me: failed program was:" >&5 |
| 7189 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7190 | |
| 7191 | |
| 7192 | fi |
| 7193 | |
| 7194 | +rm -rf conftest.dSYM |
| 7195 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 7196 | conftest$ac_exeext conftest.$ac_ext |
| 7197 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7198 | @@ -15150,18 +15325,21 @@ case "(($ac_try" in |
| 7199 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7200 | *) ac_try_echo=$ac_try;; |
| 7201 | esac |
| 7202 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7203 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7204 | +$as_echo "$ac_try_echo") >&5 |
| 7205 | (eval "$ac_link") 2>conftest.er1 |
| 7206 | ac_status=$? |
| 7207 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7208 | rm -f conftest.er1 |
| 7209 | cat conftest.err >&5 |
| 7210 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7211 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7212 | (exit $ac_status); } && { |
| 7213 | test -z "$ac_f77_werror_flag" || |
| 7214 | test ! -s conftest.err |
| 7215 | - } && test -s conftest$ac_exeext && |
| 7216 | - $as_test_x conftest$ac_exeext; then |
| 7217 | + } && test -s conftest$ac_exeext && { |
| 7218 | + test "$cross_compiling" = yes || |
| 7219 | + $as_test_x conftest$ac_exeext |
| 7220 | + }; then |
| 7221 | |
| 7222 | lt_aix_libpath_sed=' |
| 7223 | /Import File Strings/,/^$/ { |
| 7224 | @@ -15176,12 +15354,13 @@ if test -z "$aix_libpath"; then |
| 7225 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 7226 | fi |
| 7227 | else |
| 7228 | - echo "$as_me: failed program was:" >&5 |
| 7229 | + $as_echo "$as_me: failed program was:" >&5 |
| 7230 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7231 | |
| 7232 | |
| 7233 | fi |
| 7234 | |
| 7235 | +rm -rf conftest.dSYM |
| 7236 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 7237 | conftest$ac_exeext conftest.$ac_ext |
| 7238 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7239 | @@ -15633,8 +15812,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7240 | esac |
| 7241 | fi |
| 7242 | |
| 7243 | -{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 |
| 7244 | -echo "${ECHO_T}$ld_shlibs_F77" >&6; } |
| 7245 | +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 |
| 7246 | +$as_echo "$ld_shlibs_F77" >&6; } |
| 7247 | test "$ld_shlibs_F77" = no && can_build_shared=no |
| 7248 | |
| 7249 | # |
| 7250 | @@ -15654,15 +15833,15 @@ x|xyes) |
| 7251 | # Test whether the compiler implicitly links with -lc since on some |
| 7252 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
| 7253 | # to ld, don't add -lc before -lgcc. |
| 7254 | - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 7255 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } |
| 7256 | + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 7257 | +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
| 7258 | $rm conftest* |
| 7259 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 7260 | |
| 7261 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 7262 | (eval $ac_compile) 2>&5 |
| 7263 | ac_status=$? |
| 7264 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7265 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7266 | (exit $ac_status); } 2>conftest.err; then |
| 7267 | soname=conftest |
| 7268 | lib=conftest |
| 7269 | @@ -15680,7 +15859,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 7270 | if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 |
| 7271 | (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
| 7272 | ac_status=$? |
| 7273 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7274 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7275 | (exit $ac_status); } |
| 7276 | then |
| 7277 | archive_cmds_need_lc_F77=no |
| 7278 | @@ -15692,16 +15871,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 7279 | cat conftest.err 1>&5 |
| 7280 | fi |
| 7281 | $rm conftest* |
| 7282 | - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 |
| 7283 | -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } |
| 7284 | + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 |
| 7285 | +$as_echo "$archive_cmds_need_lc_F77" >&6; } |
| 7286 | ;; |
| 7287 | esac |
| 7288 | fi |
| 7289 | ;; |
| 7290 | esac |
| 7291 | |
| 7292 | -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 7293 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } |
| 7294 | +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 7295 | +$as_echo_n "checking dynamic linker characteristics... " >&6; } |
| 7296 | library_names_spec= |
| 7297 | libname_spec='lib$name' |
| 7298 | soname_spec= |
| 7299 | @@ -16262,19 +16441,19 @@ uts4*) |
| 7300 | dynamic_linker=no |
| 7301 | ;; |
| 7302 | esac |
| 7303 | -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 7304 | -echo "${ECHO_T}$dynamic_linker" >&6; } |
| 7305 | +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 7306 | +$as_echo "$dynamic_linker" >&6; } |
| 7307 | test "$dynamic_linker" = no && can_build_shared=no |
| 7308 | |
| 7309 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
| 7310 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7311 | + $as_echo_n "(cached) " >&6 |
| 7312 | else |
| 7313 | lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" |
| 7314 | fi |
| 7315 | |
| 7316 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
| 7317 | if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
| 7318 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7319 | + $as_echo_n "(cached) " >&6 |
| 7320 | else |
| 7321 | lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" |
| 7322 | fi |
| 7323 | @@ -16286,8 +16465,8 @@ if test "$GCC" = yes; then |
| 7324 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
| 7325 | fi |
| 7326 | |
| 7327 | -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 7328 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } |
| 7329 | +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 7330 | +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
| 7331 | hardcode_action_F77= |
| 7332 | if test -n "$hardcode_libdir_flag_spec_F77" || \ |
| 7333 | test -n "$runpath_var_F77" || \ |
| 7334 | @@ -16311,8 +16490,8 @@ else |
| 7335 | # directories. |
| 7336 | hardcode_action_F77=unsupported |
| 7337 | fi |
| 7338 | -{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 |
| 7339 | -echo "${ECHO_T}$hardcode_action_F77" >&6; } |
| 7340 | +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 |
| 7341 | +$as_echo "$hardcode_action_F77" >&6; } |
| 7342 | |
| 7343 | if test "$hardcode_action_F77" = relink; then |
| 7344 | # Fast installation is not supported |
| 7345 | @@ -16822,10 +17001,10 @@ if test "$GCC" = yes; then |
| 7346 | lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' |
| 7347 | |
| 7348 | |
| 7349 | -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
| 7350 | -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } |
| 7351 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
| 7352 | +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
| 7353 | if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then |
| 7354 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7355 | + $as_echo_n "(cached) " >&6 |
| 7356 | else |
| 7357 | lt_cv_prog_compiler_rtti_exceptions=no |
| 7358 | ac_outfile=conftest.$ac_objext |
| 7359 | @@ -16840,11 +17019,11 @@ else |
| 7360 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 7361 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 7362 | -e 's:$: $lt_compiler_flag:'` |
| 7363 | - (eval echo "\"\$as_me:16843: $lt_compile\"" >&5) |
| 7364 | + (eval echo "\"\$as_me:17022: $lt_compile\"" >&5) |
| 7365 | (eval "$lt_compile" 2>conftest.err) |
| 7366 | ac_status=$? |
| 7367 | cat conftest.err >&5 |
| 7368 | - echo "$as_me:16847: \$? = $ac_status" >&5 |
| 7369 | + echo "$as_me:17026: \$? = $ac_status" >&5 |
| 7370 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 7371 | # The compiler can only warn and ignore the option if not recognized |
| 7372 | # So say no if there are warnings other than the usual output. |
| 7373 | @@ -16857,8 +17036,8 @@ else |
| 7374 | $rm conftest* |
| 7375 | |
| 7376 | fi |
| 7377 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
| 7378 | -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
| 7379 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 |
| 7380 | +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
| 7381 | |
| 7382 | if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then |
| 7383 | lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" |
| 7384 | @@ -16872,8 +17051,8 @@ lt_prog_compiler_wl_GCJ= |
| 7385 | lt_prog_compiler_pic_GCJ= |
| 7386 | lt_prog_compiler_static_GCJ= |
| 7387 | |
| 7388 | -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 7389 | -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 7390 | +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 |
| 7391 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
| 7392 | |
| 7393 | if test "$GCC" = yes; then |
| 7394 | lt_prog_compiler_wl_GCJ='-Wl,' |
| 7395 | @@ -17104,18 +17283,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } |
| 7396 | esac |
| 7397 | fi |
| 7398 | |
| 7399 | -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 |
| 7400 | -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } |
| 7401 | +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 |
| 7402 | +$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } |
| 7403 | |
| 7404 | # |
| 7405 | # Check to make sure the PIC flag actually works. |
| 7406 | # |
| 7407 | if test -n "$lt_prog_compiler_pic_GCJ"; then |
| 7408 | |
| 7409 | -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 |
| 7410 | -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } |
| 7411 | +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 |
| 7412 | +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } |
| 7413 | if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then |
| 7414 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7415 | + $as_echo_n "(cached) " >&6 |
| 7416 | else |
| 7417 | lt_cv_prog_compiler_pic_works_GCJ=no |
| 7418 | ac_outfile=conftest.$ac_objext |
| 7419 | @@ -17130,11 +17309,11 @@ else |
| 7420 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 7421 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 7422 | -e 's:$: $lt_compiler_flag:'` |
| 7423 | - (eval echo "\"\$as_me:17133: $lt_compile\"" >&5) |
| 7424 | + (eval echo "\"\$as_me:17312: $lt_compile\"" >&5) |
| 7425 | (eval "$lt_compile" 2>conftest.err) |
| 7426 | ac_status=$? |
| 7427 | cat conftest.err >&5 |
| 7428 | - echo "$as_me:17137: \$? = $ac_status" >&5 |
| 7429 | + echo "$as_me:17316: \$? = $ac_status" >&5 |
| 7430 | if (exit $ac_status) && test -s "$ac_outfile"; then |
| 7431 | # The compiler can only warn and ignore the option if not recognized |
| 7432 | # So say no if there are warnings other than the usual output. |
| 7433 | @@ -17147,8 +17326,8 @@ else |
| 7434 | $rm conftest* |
| 7435 | |
| 7436 | fi |
| 7437 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 |
| 7438 | -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } |
| 7439 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 |
| 7440 | +$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } |
| 7441 | |
| 7442 | if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then |
| 7443 | case $lt_prog_compiler_pic_GCJ in |
| 7444 | @@ -17175,10 +17354,10 @@ esac |
| 7445 | # Check to make sure the static flag actually works. |
| 7446 | # |
| 7447 | wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" |
| 7448 | -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 7449 | -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } |
| 7450 | +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
| 7451 | +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
| 7452 | if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then |
| 7453 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7454 | + $as_echo_n "(cached) " >&6 |
| 7455 | else |
| 7456 | lt_cv_prog_compiler_static_works_GCJ=no |
| 7457 | save_LDFLAGS="$LDFLAGS" |
| 7458 | @@ -17203,8 +17382,8 @@ else |
| 7459 | LDFLAGS="$save_LDFLAGS" |
| 7460 | |
| 7461 | fi |
| 7462 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 |
| 7463 | -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } |
| 7464 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 |
| 7465 | +$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } |
| 7466 | |
| 7467 | if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then |
| 7468 | : |
| 7469 | @@ -17213,10 +17392,10 @@ else |
| 7470 | fi |
| 7471 | |
| 7472 | |
| 7473 | -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 7474 | -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } |
| 7475 | +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 |
| 7476 | +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
| 7477 | if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then |
| 7478 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7479 | + $as_echo_n "(cached) " >&6 |
| 7480 | else |
| 7481 | lt_cv_prog_compiler_c_o_GCJ=no |
| 7482 | $rm -r conftest 2>/dev/null |
| 7483 | @@ -17234,11 +17413,11 @@ else |
| 7484 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
| 7485 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
| 7486 | -e 's:$: $lt_compiler_flag:'` |
| 7487 | - (eval echo "\"\$as_me:17237: $lt_compile\"" >&5) |
| 7488 | + (eval echo "\"\$as_me:17416: $lt_compile\"" >&5) |
| 7489 | (eval "$lt_compile" 2>out/conftest.err) |
| 7490 | ac_status=$? |
| 7491 | cat out/conftest.err >&5 |
| 7492 | - echo "$as_me:17241: \$? = $ac_status" >&5 |
| 7493 | + echo "$as_me:17420: \$? = $ac_status" >&5 |
| 7494 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
| 7495 | then |
| 7496 | # The compiler can only warn and ignore the option if not recognized |
| 7497 | @@ -17260,34 +17439,34 @@ else |
| 7498 | $rm conftest* |
| 7499 | |
| 7500 | fi |
| 7501 | -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 |
| 7502 | -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } |
| 7503 | +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 |
| 7504 | +$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } |
| 7505 | |
| 7506 | |
| 7507 | hard_links="nottested" |
| 7508 | if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then |
| 7509 | # do not overwrite the value of need_locks provided by the user |
| 7510 | - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 7511 | -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } |
| 7512 | + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 |
| 7513 | +$as_echo_n "checking if we can lock with hard links... " >&6; } |
| 7514 | hard_links=yes |
| 7515 | $rm conftest* |
| 7516 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 7517 | touch conftest.a |
| 7518 | ln conftest.a conftest.b 2>&5 || hard_links=no |
| 7519 | ln conftest.a conftest.b 2>/dev/null && hard_links=no |
| 7520 | - { echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 7521 | -echo "${ECHO_T}$hard_links" >&6; } |
| 7522 | + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 |
| 7523 | +$as_echo "$hard_links" >&6; } |
| 7524 | if test "$hard_links" = no; then |
| 7525 | - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 7526 | -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 7527 | + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 |
| 7528 | +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} |
| 7529 | need_locks=warn |
| 7530 | fi |
| 7531 | else |
| 7532 | need_locks=no |
| 7533 | fi |
| 7534 | |
| 7535 | -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 7536 | -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } |
| 7537 | +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 |
| 7538 | +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } |
| 7539 | |
| 7540 | runpath_var= |
| 7541 | allow_undefined_flag_GCJ= |
| 7542 | @@ -17718,18 +17897,21 @@ case "(($ac_try" in |
| 7543 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7544 | *) ac_try_echo=$ac_try;; |
| 7545 | esac |
| 7546 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7547 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7548 | +$as_echo "$ac_try_echo") >&5 |
| 7549 | (eval "$ac_link") 2>conftest.er1 |
| 7550 | ac_status=$? |
| 7551 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7552 | rm -f conftest.er1 |
| 7553 | cat conftest.err >&5 |
| 7554 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7555 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7556 | (exit $ac_status); } && { |
| 7557 | test -z "$ac_c_werror_flag" || |
| 7558 | test ! -s conftest.err |
| 7559 | - } && test -s conftest$ac_exeext && |
| 7560 | - $as_test_x conftest$ac_exeext; then |
| 7561 | + } && test -s conftest$ac_exeext && { |
| 7562 | + test "$cross_compiling" = yes || |
| 7563 | + $as_test_x conftest$ac_exeext |
| 7564 | + }; then |
| 7565 | |
| 7566 | lt_aix_libpath_sed=' |
| 7567 | /Import File Strings/,/^$/ { |
| 7568 | @@ -17744,12 +17926,13 @@ if test -z "$aix_libpath"; then |
| 7569 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 7570 | fi |
| 7571 | else |
| 7572 | - echo "$as_me: failed program was:" >&5 |
| 7573 | + $as_echo "$as_me: failed program was:" >&5 |
| 7574 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7575 | |
| 7576 | |
| 7577 | fi |
| 7578 | |
| 7579 | +rm -rf conftest.dSYM |
| 7580 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 7581 | conftest$ac_exeext conftest.$ac_ext |
| 7582 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7583 | @@ -17784,18 +17967,21 @@ case "(($ac_try" in |
| 7584 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7585 | *) ac_try_echo=$ac_try;; |
| 7586 | esac |
| 7587 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7588 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7589 | +$as_echo "$ac_try_echo") >&5 |
| 7590 | (eval "$ac_link") 2>conftest.er1 |
| 7591 | ac_status=$? |
| 7592 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7593 | rm -f conftest.er1 |
| 7594 | cat conftest.err >&5 |
| 7595 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7596 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7597 | (exit $ac_status); } && { |
| 7598 | test -z "$ac_c_werror_flag" || |
| 7599 | test ! -s conftest.err |
| 7600 | - } && test -s conftest$ac_exeext && |
| 7601 | - $as_test_x conftest$ac_exeext; then |
| 7602 | + } && test -s conftest$ac_exeext && { |
| 7603 | + test "$cross_compiling" = yes || |
| 7604 | + $as_test_x conftest$ac_exeext |
| 7605 | + }; then |
| 7606 | |
| 7607 | lt_aix_libpath_sed=' |
| 7608 | /Import File Strings/,/^$/ { |
| 7609 | @@ -17810,12 +17996,13 @@ if test -z "$aix_libpath"; then |
| 7610 | aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
| 7611 | fi |
| 7612 | else |
| 7613 | - echo "$as_me: failed program was:" >&5 |
| 7614 | + $as_echo "$as_me: failed program was:" >&5 |
| 7615 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7616 | |
| 7617 | |
| 7618 | fi |
| 7619 | |
| 7620 | +rm -rf conftest.dSYM |
| 7621 | rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ |
| 7622 | conftest$ac_exeext conftest.$ac_ext |
| 7623 | if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7624 | @@ -18267,8 +18454,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
| 7625 | esac |
| 7626 | fi |
| 7627 | |
| 7628 | -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 |
| 7629 | -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } |
| 7630 | +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 |
| 7631 | +$as_echo "$ld_shlibs_GCJ" >&6; } |
| 7632 | test "$ld_shlibs_GCJ" = no && can_build_shared=no |
| 7633 | |
| 7634 | # |
| 7635 | @@ -18288,15 +18475,15 @@ x|xyes) |
| 7636 | # Test whether the compiler implicitly links with -lc since on some |
| 7637 | # systems, -lgcc has to come before -lc. If gcc already passes -lc |
| 7638 | # to ld, don't add -lc before -lgcc. |
| 7639 | - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 7640 | -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } |
| 7641 | + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 |
| 7642 | +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } |
| 7643 | $rm conftest* |
| 7644 | echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
| 7645 | |
| 7646 | if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
| 7647 | (eval $ac_compile) 2>&5 |
| 7648 | ac_status=$? |
| 7649 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7650 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7651 | (exit $ac_status); } 2>conftest.err; then |
| 7652 | soname=conftest |
| 7653 | lib=conftest |
| 7654 | @@ -18314,7 +18501,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 7655 | if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 |
| 7656 | (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 |
| 7657 | ac_status=$? |
| 7658 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7659 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7660 | (exit $ac_status); } |
| 7661 | then |
| 7662 | archive_cmds_need_lc_GCJ=no |
| 7663 | @@ -18326,16 +18513,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& |
| 7664 | cat conftest.err 1>&5 |
| 7665 | fi |
| 7666 | $rm conftest* |
| 7667 | - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 |
| 7668 | -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } |
| 7669 | + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 |
| 7670 | +$as_echo "$archive_cmds_need_lc_GCJ" >&6; } |
| 7671 | ;; |
| 7672 | esac |
| 7673 | fi |
| 7674 | ;; |
| 7675 | esac |
| 7676 | |
| 7677 | -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 7678 | -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } |
| 7679 | +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 |
| 7680 | +$as_echo_n "checking dynamic linker characteristics... " >&6; } |
| 7681 | library_names_spec= |
| 7682 | libname_spec='lib$name' |
| 7683 | soname_spec= |
| 7684 | @@ -18896,19 +19083,19 @@ uts4*) |
| 7685 | dynamic_linker=no |
| 7686 | ;; |
| 7687 | esac |
| 7688 | -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 7689 | -echo "${ECHO_T}$dynamic_linker" >&6; } |
| 7690 | +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 |
| 7691 | +$as_echo "$dynamic_linker" >&6; } |
| 7692 | test "$dynamic_linker" = no && can_build_shared=no |
| 7693 | |
| 7694 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
| 7695 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7696 | + $as_echo_n "(cached) " >&6 |
| 7697 | else |
| 7698 | lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" |
| 7699 | fi |
| 7700 | |
| 7701 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
| 7702 | if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then |
| 7703 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7704 | + $as_echo_n "(cached) " >&6 |
| 7705 | else |
| 7706 | lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" |
| 7707 | fi |
| 7708 | @@ -18920,8 +19107,8 @@ if test "$GCC" = yes; then |
| 7709 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
| 7710 | fi |
| 7711 | |
| 7712 | -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 7713 | -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } |
| 7714 | +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 |
| 7715 | +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } |
| 7716 | hardcode_action_GCJ= |
| 7717 | if test -n "$hardcode_libdir_flag_spec_GCJ" || \ |
| 7718 | test -n "$runpath_var_GCJ" || \ |
| 7719 | @@ -18945,8 +19132,8 @@ else |
| 7720 | # directories. |
| 7721 | hardcode_action_GCJ=unsupported |
| 7722 | fi |
| 7723 | -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 |
| 7724 | -echo "${ECHO_T}$hardcode_action_GCJ" >&6; } |
| 7725 | +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 |
| 7726 | +$as_echo "$hardcode_action_GCJ" >&6; } |
| 7727 | |
| 7728 | if test "$hardcode_action_GCJ" = relink; then |
| 7729 | # Fast installation is not supported |
| 7730 | @@ -19869,8 +20056,8 @@ CC="$lt_save_CC" |
| 7731 | ;; |
| 7732 | |
| 7733 | *) |
| 7734 | - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 |
| 7735 | -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} |
| 7736 | + { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 |
| 7737 | +$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} |
| 7738 | { (exit 1); exit 1; }; } |
| 7739 | ;; |
| 7740 | esac |
| 7741 | @@ -19889,8 +20076,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;} |
| 7742 | chmod +x "$ofile" |
| 7743 | else |
| 7744 | rm -f "${ofile}T" |
| 7745 | - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 |
| 7746 | -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} |
| 7747 | + { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 |
| 7748 | +$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} |
| 7749 | { (exit 1); exit 1; }; } |
| 7750 | fi |
| 7751 | fi |
| 7752 | @@ -19926,10 +20113,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
| 7753 | |
| 7754 | |
| 7755 | # Checks for header files. |
| 7756 | -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
| 7757 | -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } |
| 7758 | +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
| 7759 | +$as_echo_n "checking for ANSI C header files... " >&6; } |
| 7760 | if test "${ac_cv_header_stdc+set}" = set; then |
| 7761 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7762 | + $as_echo_n "(cached) " >&6 |
| 7763 | else |
| 7764 | cat >conftest.$ac_ext <<_ACEOF |
| 7765 | /* confdefs.h. */ |
| 7766 | @@ -19956,20 +20143,21 @@ case "(($ac_try" in |
| 7767 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7768 | *) ac_try_echo=$ac_try;; |
| 7769 | esac |
| 7770 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7771 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7772 | +$as_echo "$ac_try_echo") >&5 |
| 7773 | (eval "$ac_compile") 2>conftest.er1 |
| 7774 | ac_status=$? |
| 7775 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7776 | rm -f conftest.er1 |
| 7777 | cat conftest.err >&5 |
| 7778 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7779 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7780 | (exit $ac_status); } && { |
| 7781 | test -z "$ac_c_werror_flag" || |
| 7782 | test ! -s conftest.err |
| 7783 | } && test -s conftest.$ac_objext; then |
| 7784 | ac_cv_header_stdc=yes |
| 7785 | else |
| 7786 | - echo "$as_me: failed program was:" >&5 |
| 7787 | + $as_echo "$as_me: failed program was:" >&5 |
| 7788 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7789 | |
| 7790 | ac_cv_header_stdc=no |
| 7791 | @@ -20061,37 +20249,40 @@ case "(($ac_try" in |
| 7792 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7793 | *) ac_try_echo=$ac_try;; |
| 7794 | esac |
| 7795 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7796 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7797 | +$as_echo "$ac_try_echo") >&5 |
| 7798 | (eval "$ac_link") 2>&5 |
| 7799 | ac_status=$? |
| 7800 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7801 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7802 | (exit $ac_status); } && { ac_try='./conftest$ac_exeext' |
| 7803 | { (case "(($ac_try" in |
| 7804 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7805 | *) ac_try_echo=$ac_try;; |
| 7806 | esac |
| 7807 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7808 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7809 | +$as_echo "$ac_try_echo") >&5 |
| 7810 | (eval "$ac_try") 2>&5 |
| 7811 | ac_status=$? |
| 7812 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7813 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7814 | (exit $ac_status); }; }; then |
| 7815 | : |
| 7816 | else |
| 7817 | - echo "$as_me: program exited with status $ac_status" >&5 |
| 7818 | -echo "$as_me: failed program was:" >&5 |
| 7819 | + $as_echo "$as_me: program exited with status $ac_status" >&5 |
| 7820 | +$as_echo "$as_me: failed program was:" >&5 |
| 7821 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7822 | |
| 7823 | ( exit $ac_status ) |
| 7824 | ac_cv_header_stdc=no |
| 7825 | fi |
| 7826 | +rm -rf conftest.dSYM |
| 7827 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext |
| 7828 | fi |
| 7829 | |
| 7830 | |
| 7831 | fi |
| 7832 | fi |
| 7833 | -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 |
| 7834 | -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } |
| 7835 | +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 |
| 7836 | +$as_echo "$ac_cv_header_stdc" >&6; } |
| 7837 | if test $ac_cv_header_stdc = yes; then |
| 7838 | |
| 7839 | cat >>confdefs.h <<\_ACEOF |
| 7840 | @@ -20106,20 +20297,21 @@ fi |
| 7841 | |
| 7842 | for ac_header in fcntl.h stdlib.h string.h unistd.h |
| 7843 | do |
| 7844 | -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 7845 | +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 7846 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 7847 | - { echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 7848 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 7849 | + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 7850 | +$as_echo_n "checking for $ac_header... " >&6; } |
| 7851 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 7852 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7853 | + $as_echo_n "(cached) " >&6 |
| 7854 | fi |
| 7855 | -ac_res=`eval echo '${'$as_ac_Header'}'` |
| 7856 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 7857 | -echo "${ECHO_T}$ac_res" >&6; } |
| 7858 | +ac_res=`eval 'as_val=${'$as_ac_Header'} |
| 7859 | + $as_echo "$as_val"'` |
| 7860 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 7861 | +$as_echo "$ac_res" >&6; } |
| 7862 | else |
| 7863 | # Is the header compilable? |
| 7864 | -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 7865 | -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } |
| 7866 | +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 |
| 7867 | +$as_echo_n "checking $ac_header usability... " >&6; } |
| 7868 | cat >conftest.$ac_ext <<_ACEOF |
| 7869 | /* confdefs.h. */ |
| 7870 | _ACEOF |
| 7871 | @@ -20135,32 +20327,33 @@ case "(($ac_try" in |
| 7872 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7873 | *) ac_try_echo=$ac_try;; |
| 7874 | esac |
| 7875 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7876 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7877 | +$as_echo "$ac_try_echo") >&5 |
| 7878 | (eval "$ac_compile") 2>conftest.er1 |
| 7879 | ac_status=$? |
| 7880 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7881 | rm -f conftest.er1 |
| 7882 | cat conftest.err >&5 |
| 7883 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7884 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7885 | (exit $ac_status); } && { |
| 7886 | test -z "$ac_c_werror_flag" || |
| 7887 | test ! -s conftest.err |
| 7888 | } && test -s conftest.$ac_objext; then |
| 7889 | ac_header_compiler=yes |
| 7890 | else |
| 7891 | - echo "$as_me: failed program was:" >&5 |
| 7892 | + $as_echo "$as_me: failed program was:" >&5 |
| 7893 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7894 | |
| 7895 | ac_header_compiler=no |
| 7896 | fi |
| 7897 | |
| 7898 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| 7899 | -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 7900 | -echo "${ECHO_T}$ac_header_compiler" >&6; } |
| 7901 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 |
| 7902 | +$as_echo "$ac_header_compiler" >&6; } |
| 7903 | |
| 7904 | # Is the header present? |
| 7905 | -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 7906 | -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } |
| 7907 | +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 |
| 7908 | +$as_echo_n "checking $ac_header presence... " >&6; } |
| 7909 | cat >conftest.$ac_ext <<_ACEOF |
| 7910 | /* confdefs.h. */ |
| 7911 | _ACEOF |
| 7912 | @@ -20174,51 +20367,52 @@ case "(($ac_try" in |
| 7913 | *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
| 7914 | *) ac_try_echo=$ac_try;; |
| 7915 | esac |
| 7916 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 |
| 7917 | +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" |
| 7918 | +$as_echo "$ac_try_echo") >&5 |
| 7919 | (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 |
| 7920 | ac_status=$? |
| 7921 | grep -v '^ *+' conftest.er1 >conftest.err |
| 7922 | rm -f conftest.er1 |
| 7923 | cat conftest.err >&5 |
| 7924 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7925 | + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
| 7926 | (exit $ac_status); } >/dev/null && { |
| 7927 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
| 7928 | test ! -s conftest.err |
| 7929 | }; then |
| 7930 | ac_header_preproc=yes |
| 7931 | else |
| 7932 | - echo "$as_me: failed program was:" >&5 |
| 7933 | + $as_echo "$as_me: failed program was:" >&5 |
| 7934 | sed 's/^/| /' conftest.$ac_ext >&5 |
| 7935 | |
| 7936 | ac_header_preproc=no |
| 7937 | fi |
| 7938 | |
| 7939 | rm -f conftest.err conftest.$ac_ext |
| 7940 | -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 7941 | -echo "${ECHO_T}$ac_header_preproc" >&6; } |
| 7942 | +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 |
| 7943 | +$as_echo "$ac_header_preproc" >&6; } |
| 7944 | |
| 7945 | # So? What about this header? |
| 7946 | case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
| 7947 | yes:no: ) |
| 7948 | - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 7949 | -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 7950 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 7951 | -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 7952 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 |
| 7953 | +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} |
| 7954 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 |
| 7955 | +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} |
| 7956 | ac_header_preproc=yes |
| 7957 | ;; |
| 7958 | no:yes:* ) |
| 7959 | - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 7960 | -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 7961 | - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 7962 | -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 7963 | - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 7964 | -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 7965 | - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 7966 | -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 7967 | - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 7968 | -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 7969 | - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 7970 | -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 7971 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 |
| 7972 | +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} |
| 7973 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 |
| 7974 | +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} |
| 7975 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 |
| 7976 | +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} |
| 7977 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 |
| 7978 | +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} |
| 7979 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 |
| 7980 | +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} |
| 7981 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 |
| 7982 | +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} |
| 7983 | ( cat <<\_ASBOX |
| 7984 | ## -------------------------------------------- ## |
| 7985 | ## Report this to sebastian.marsching@suphp.org ## |
| 7986 | @@ -20227,21 +20421,24 @@ _ASBOX |
| 7987 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
| 7988 | ;; |
| 7989 | esac |
| 7990 | -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 7991 | -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } |
| 7992 | +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 |
| 7993 | +$as_echo_n "checking for $ac_header... " >&6; } |
| 7994 | if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then |
| 7995 | - echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 7996 | + $as_echo_n "(cached) " >&6 |
| 7997 | else |
| 7998 | eval "$as_ac_Header=\$ac_header_preproc" |
| 7999 | fi |
| 8000 | -ac_res=`eval echo '${'$as_ac_Header'}'` |
| 8001 | - { echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 8002 | -echo "${ECHO_T}$ac_res" >&6; } |
| 8003 | +ac_res=`eval 'as_val=${'$as_ac_Header'} |
| 8004 | + $as_echo "$as_val"'` |
| 8005 | + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 |
| 8006 | +$as_echo "$ac_res" >&6; } |
| 8007 | |
| 8008 | fi |
| 8009 | -if test `eval echo '${'$as_ac_Header'}'` = yes; then |
| 8010 | +as_val=`eval 'as_val=${'$as_ac_Header'} |
| 8011 | + $as_echo "$as_val"'` |
| 8012 | + if test "x$as_val" = x""yes; then |
| 8013 | cat >>confdefs.h <<_ACEOF |
| 8014 | -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 8015 | +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
| 8016 | _ACEOF |
| 8017 | |
| 8018 | fi |
| 8019 | @@ -20261,15 +20458,15 @@ done |
| 8020 | TEST_X="test -x" |
| 8021 | fi |
| 8022 | |
| 8023 | - { echo "$as_me:$LINENO: checking for APR" >&5 |
| 8024 | -echo $ECHO_N "checking for APR... $ECHO_C" >&6; } |
| 8025 | + { $as_echo "$as_me:$LINENO: checking for APR" >&5 |
| 8026 | +$as_echo_n "checking for APR... " >&6; } |
| 8027 | |
| 8028 | # Check whether --with-apr was given. |
| 8029 | if test "${with_apr+set}" = set; then |
| 8030 | withval=$with_apr; |
| 8031 | if test "$withval" = "no" || test "$withval" = "yes"; then |
| 8032 | - { { echo "$as_me:$LINENO: error: --with-apr requires a directory to be provided" >&5 |
| 8033 | -echo "$as_me: error: --with-apr requires a directory to be provided" >&2;} |
| 8034 | + { { $as_echo "$as_me:$LINENO: error: --with-apr requires a directory to be provided" >&5 |
| 8035 | +$as_echo "$as_me: error: --with-apr requires a directory to be provided" >&2;} |
| 8036 | { (exit 1); exit 1; }; } |
| 8037 | fi |
| 8038 | |
| 8039 | @@ -20291,9 +20488,9 @@ echo "$as_me: error: --with-apr requires a directory to be provided" >&2;} |
| 8040 | fi |
| 8041 | |
| 8042 | if test "$apr_found" != "yes"; then |
| 8043 | - { { echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a |
| 8044 | + { { $as_echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a |
| 8045 | build directory, or an apr-config file." >&5 |
| 8046 | -echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a |
| 8047 | +$as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a |
| 8048 | build directory, or an apr-config file." >&2;} |
| 8049 | { (exit 1); exit 1; }; } |
| 8050 | fi |
| 8051 | @@ -20327,14 +20524,14 @@ else |
| 8052 | fi |
| 8053 | |
| 8054 | |
| 8055 | - { echo "$as_me:$LINENO: result: $apr_found" >&5 |
| 8056 | -echo "${ECHO_T}$apr_found" >&6; } |
| 8057 | + { $as_echo "$as_me:$LINENO: result: $apr_found" >&5 |
| 8058 | +$as_echo "$apr_found" >&6; } |
| 8059 | |
| 8060 | |
| 8061 | # Determine Apache version and find apxs |
| 8062 | |
| 8063 | -{ echo "$as_me:$LINENO: checking for dynamic Apache module support (via APXS)" >&5 |
| 8064 | -echo $ECHO_N "checking for dynamic Apache module support (via APXS)... $ECHO_C" >&6; } |
| 8065 | +{ $as_echo "$as_me:$LINENO: checking for dynamic Apache module support (via APXS)" >&5 |
| 8066 | +$as_echo_n "checking for dynamic Apache module support (via APXS)... " >&6; } |
| 8067 | |
| 8068 | # Check whether --with-apxs was given. |
| 8069 | if test "${with_apxs+set}" = set; then |
| 8070 | @@ -20391,14 +20588,14 @@ if test -n "$APXS"; then |
| 8071 | |
| 8072 | |
| 8073 | |
| 8074 | - { echo "$as_me:$LINENO: result: found at $APXS (version $APACHE_VERSION)" >&5 |
| 8075 | -echo "${ECHO_T}found at $APXS (version $APACHE_VERSION)" >&6; } |
| 8076 | + { $as_echo "$as_me:$LINENO: result: found at $APXS (version $APACHE_VERSION)" >&5 |
| 8077 | +$as_echo "found at $APXS (version $APACHE_VERSION)" >&6; } |
| 8078 | else |
| 8079 | APXS="/notfound/" |
| 8080 | |
| 8081 | |
| 8082 | - { echo "$as_me:$LINENO: result: no" >&5 |
| 8083 | -echo "${ECHO_T}no" >&6; } |
| 8084 | + { $as_echo "$as_me:$LINENO: result: no" >&5 |
| 8085 | +$as_echo "no" >&6; } |
| 8086 | fi |
| 8087 | |
| 8088 | if test x"${APACHE_VERSION_2}" = xtrue ; then \ |
| 8089 | @@ -20408,16 +20605,16 @@ if test x"${APACHE_VERSION_2}" = xtrue ; then \ |
| 8090 | APR_CPPFLAGS=`${apr_config} --cppflags` |
| 8091 | |
| 8092 | else |
| 8093 | - { { echo "$as_me:$LINENO: error: APR is needed to build mod_suphp for Apache 2.x but was not found" >&5 |
| 8094 | -echo "$as_me: error: APR is needed to build mod_suphp for Apache 2.x but was not found" >&2;} |
| 8095 | + { { $as_echo "$as_me:$LINENO: error: APR is needed to build mod_suphp for Apache 2.x but was not found" >&5 |
| 8096 | +$as_echo "$as_me: error: APR is needed to build mod_suphp for Apache 2.x but was not found" >&2;} |
| 8097 | { (exit 1); exit 1; }; } |
| 8098 | fi |
| 8099 | fi |
| 8100 | |
| 8101 | # Get uid/gid mode |
| 8102 | |
| 8103 | -{ echo "$as_me:$LINENO: checking for set-UID/set-GID mode" >&5 |
| 8104 | -echo $ECHO_N "checking for set-UID/set-GID mode... $ECHO_C" >&6; } |
| 8105 | +{ $as_echo "$as_me:$LINENO: checking for set-UID/set-GID mode" >&5 |
| 8106 | +$as_echo_n "checking for set-UID/set-GID mode... " >&6; } |
| 8107 | |
| 8108 | # Check whether --with-setid-mode was given. |
| 8109 | if test "${with_setid_mode+set}" = set; then |
| 8110 | @@ -20465,13 +20662,13 @@ _ACEOF |
| 8111 | |
| 8112 | ;; |
| 8113 | *) |
| 8114 | - { { echo "$as_me:$LINENO: error: --with-setid-mode has to be set to one of \"owner\", \"force\" or \"paranoid\"" >&5 |
| 8115 | -echo "$as_me: error: --with-setid-mode has to be set to one of \"owner\", \"force\" or \"paranoid\"" >&2;} |
| 8116 | + { { $as_echo "$as_me:$LINENO: error: --with-setid-mode has to be set to one of \"owner\", \"force\" or \"paranoid\"" >&5 |
| 8117 | +$as_echo "$as_me: error: --with-setid-mode has to be set to one of \"owner\", \"force\" or \"paranoid\"" >&2;} |
| 8118 | { (exit 1); exit 1; }; } |
| 8119 | ;; |
| 8120 | esac |
| 8121 | - { echo "$as_me:$LINENO: result: ok - using $SETID_MODE" >&5 |
| 8122 | -echo "${ECHO_T}ok - using $SETID_MODE" >&6; } |
| 8123 | + { $as_echo "$as_me:$LINENO: result: ok - using $SETID_MODE" >&5 |
| 8124 | +$as_echo "ok - using $SETID_MODE" >&6; } |
| 8125 | fi |
| 8126 | |
| 8127 | |
| 8128 | @@ -20597,7 +20794,9 @@ fi |
| 8129 | |
| 8130 | |
| 8131 | # Conditional building of Apache module |
| 8132 | - if test x"$APACHE_VERSION_1_3" = xtrue; then |
| 8133 | + |
| 8134 | + |
| 8135 | +if test x"$APACHE_VERSION_1_3" = xtrue; then |
| 8136 | COND_AP13_TRUE= |
| 8137 | COND_AP13_FALSE='#' |
| 8138 | else |
| 8139 | @@ -20605,7 +20804,9 @@ else |
| 8140 | COND_AP13_FALSE= |
| 8141 | fi |
| 8142 | |
| 8143 | - if test x"$APACHE_VERSION_2" = xtrue; then |
| 8144 | + |
| 8145 | + |
| 8146 | +if test x"$APACHE_VERSION_2" = xtrue; then |
| 8147 | COND_AP20_TRUE= |
| 8148 | COND_AP20_FALSE='#' |
| 8149 | else |
| 8150 | @@ -20615,7 +20816,9 @@ fi |
| 8151 | |
| 8152 | |
| 8153 | # Conditionally include UserGroup support |
| 8154 | - if test \( x"$SETID_MODE" = xparanoid \) -o \( x"$SETID_MODE" = xforce \) ; then |
| 8155 | + |
| 8156 | + |
| 8157 | +if test \( x"$SETID_MODE" = xparanoid \) -o \( x"$SETID_MODE" = xforce \) ; then |
| 8158 | COND_APUSERGROUP_TRUE= |
| 8159 | COND_APUSERGROUP_FALSE='#' |
| 8160 | else |
| 8161 | @@ -20653,11 +20856,12 @@ _ACEOF |
| 8162 | case $ac_val in #( |
| 8163 | *${as_nl}*) |
| 8164 | case $ac_var in #( |
| 8165 | - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 |
| 8166 | -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; |
| 8167 | + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 |
| 8168 | +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; |
| 8169 | esac |
| 8170 | case $ac_var in #( |
| 8171 | _ | IFS | as_nl) ;; #( |
| 8172 | + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( |
| 8173 | *) $as_unset $ac_var ;; |
| 8174 | esac ;; |
| 8175 | esac |
| 8176 | @@ -20690,12 +20894,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; |
| 8177 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else |
| 8178 | if test -w "$cache_file"; then |
| 8179 | test "x$cache_file" != "x/dev/null" && |
| 8180 | - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 |
| 8181 | -echo "$as_me: updating cache $cache_file" >&6;} |
| 8182 | + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 |
| 8183 | +$as_echo "$as_me: updating cache $cache_file" >&6;} |
| 8184 | cat confcache >$cache_file |
| 8185 | else |
| 8186 | - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 |
| 8187 | -echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
| 8188 | + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 |
| 8189 | +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
| 8190 | fi |
| 8191 | fi |
| 8192 | rm -f confcache |
| 8193 | @@ -20711,7 +20915,7 @@ ac_ltlibobjs= |
| 8194 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
| 8195 | # 1. Remove the extension, and $U if already installed. |
| 8196 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
| 8197 | - ac_i=`echo "$ac_i" | sed "$ac_script"` |
| 8198 | + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` |
| 8199 | # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR |
| 8200 | # will be set to the directory where LIBOBJS objects are built. |
| 8201 | ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" |
| 8202 | @@ -20723,54 +20927,55 @@ LTLIBOBJS=$ac_ltlibobjs |
| 8203 | |
| 8204 | |
| 8205 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
| 8206 | - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. |
| 8207 | + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. |
| 8208 | Usually this means the macro was only invoked conditionally." >&5 |
| 8209 | -echo "$as_me: error: conditional \"AMDEP\" was never defined. |
| 8210 | +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. |
| 8211 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8212 | { (exit 1); exit 1; }; } |
| 8213 | fi |
| 8214 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
| 8215 | - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. |
| 8216 | + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. |
| 8217 | Usually this means the macro was only invoked conditionally." >&5 |
| 8218 | -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. |
| 8219 | +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. |
| 8220 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8221 | { (exit 1); exit 1; }; } |
| 8222 | fi |
| 8223 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then |
| 8224 | - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. |
| 8225 | + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. |
| 8226 | Usually this means the macro was only invoked conditionally." >&5 |
| 8227 | -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. |
| 8228 | +$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. |
| 8229 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8230 | { (exit 1); exit 1; }; } |
| 8231 | fi |
| 8232 | if test -z "${COND_AP13_TRUE}" && test -z "${COND_AP13_FALSE}"; then |
| 8233 | - { { echo "$as_me:$LINENO: error: conditional \"COND_AP13\" was never defined. |
| 8234 | + { { $as_echo "$as_me:$LINENO: error: conditional \"COND_AP13\" was never defined. |
| 8235 | Usually this means the macro was only invoked conditionally." >&5 |
| 8236 | -echo "$as_me: error: conditional \"COND_AP13\" was never defined. |
| 8237 | +$as_echo "$as_me: error: conditional \"COND_AP13\" was never defined. |
| 8238 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8239 | { (exit 1); exit 1; }; } |
| 8240 | fi |
| 8241 | if test -z "${COND_AP20_TRUE}" && test -z "${COND_AP20_FALSE}"; then |
| 8242 | - { { echo "$as_me:$LINENO: error: conditional \"COND_AP20\" was never defined. |
| 8243 | + { { $as_echo "$as_me:$LINENO: error: conditional \"COND_AP20\" was never defined. |
| 8244 | Usually this means the macro was only invoked conditionally." >&5 |
| 8245 | -echo "$as_me: error: conditional \"COND_AP20\" was never defined. |
| 8246 | +$as_echo "$as_me: error: conditional \"COND_AP20\" was never defined. |
| 8247 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8248 | { (exit 1); exit 1; }; } |
| 8249 | fi |
| 8250 | if test -z "${COND_APUSERGROUP_TRUE}" && test -z "${COND_APUSERGROUP_FALSE}"; then |
| 8251 | - { { echo "$as_me:$LINENO: error: conditional \"COND_APUSERGROUP\" was never defined. |
| 8252 | + { { $as_echo "$as_me:$LINENO: error: conditional \"COND_APUSERGROUP\" was never defined. |
| 8253 | Usually this means the macro was only invoked conditionally." >&5 |
| 8254 | -echo "$as_me: error: conditional \"COND_APUSERGROUP\" was never defined. |
| 8255 | +$as_echo "$as_me: error: conditional \"COND_APUSERGROUP\" was never defined. |
| 8256 | Usually this means the macro was only invoked conditionally." >&2;} |
| 8257 | { (exit 1); exit 1; }; } |
| 8258 | fi |
| 8259 | |
| 8260 | : ${CONFIG_STATUS=./config.status} |
| 8261 | +ac_write_fail=0 |
| 8262 | ac_clean_files_save=$ac_clean_files |
| 8263 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
| 8264 | -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 |
| 8265 | -echo "$as_me: creating $CONFIG_STATUS" >&6;} |
| 8266 | -cat >$CONFIG_STATUS <<_ACEOF |
| 8267 | +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 |
| 8268 | +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} |
| 8269 | +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8270 | #! $SHELL |
| 8271 | # Generated by $as_me. |
| 8272 | # Run this file to recreate the current configuration. |
| 8273 | @@ -20783,7 +20988,7 @@ ac_cs_silent=false |
| 8274 | SHELL=\${CONFIG_SHELL-$SHELL} |
| 8275 | _ACEOF |
| 8276 | |
| 8277 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8278 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8279 | ## --------------------- ## |
| 8280 | ## M4sh Initialization. ## |
| 8281 | ## --------------------- ## |
| 8282 | @@ -20793,7 +20998,7 @@ DUALCASE=1; export DUALCASE # for MKS sh |
| 8283 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
| 8284 | emulate sh |
| 8285 | NULLCMD=: |
| 8286 | - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which |
| 8287 | + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which |
| 8288 | # is contrary to our usage. Disable this feature. |
| 8289 | alias -g '${1+"$@"}'='"$@"' |
| 8290 | setopt NO_GLOB_SUBST |
| 8291 | @@ -20815,17 +21020,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS |
| 8292 | as_cr_digits='0123456789' |
| 8293 | as_cr_alnum=$as_cr_Letters$as_cr_digits |
| 8294 | |
| 8295 | -# The user is always right. |
| 8296 | -if test "${PATH_SEPARATOR+set}" != set; then |
| 8297 | - echo "#! /bin/sh" >conf$$.sh |
| 8298 | - echo "exit 0" >>conf$$.sh |
| 8299 | - chmod +x conf$$.sh |
| 8300 | - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then |
| 8301 | - PATH_SEPARATOR=';' |
| 8302 | +as_nl=' |
| 8303 | +' |
| 8304 | +export as_nl |
| 8305 | +# Printing a long string crashes Solaris 7 /usr/bin/printf. |
| 8306 | +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
| 8307 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo |
| 8308 | +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo |
| 8309 | +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then |
| 8310 | + as_echo='printf %s\n' |
| 8311 | + as_echo_n='printf %s' |
| 8312 | +else |
| 8313 | + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then |
| 8314 | + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' |
| 8315 | + as_echo_n='/usr/ucb/echo -n' |
| 8316 | else |
| 8317 | - PATH_SEPARATOR=: |
| 8318 | + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' |
| 8319 | + as_echo_n_body='eval |
| 8320 | + arg=$1; |
| 8321 | + case $arg in |
| 8322 | + *"$as_nl"*) |
| 8323 | + expr "X$arg" : "X\\(.*\\)$as_nl"; |
| 8324 | + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; |
| 8325 | + esac; |
| 8326 | + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" |
| 8327 | + ' |
| 8328 | + export as_echo_n_body |
| 8329 | + as_echo_n='sh -c $as_echo_n_body as_echo' |
| 8330 | fi |
| 8331 | - rm -f conf$$.sh |
| 8332 | + export as_echo_body |
| 8333 | + as_echo='sh -c $as_echo_body as_echo' |
| 8334 | +fi |
| 8335 | + |
| 8336 | +# The user is always right. |
| 8337 | +if test "${PATH_SEPARATOR+set}" != set; then |
| 8338 | + PATH_SEPARATOR=: |
| 8339 | + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { |
| 8340 | + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || |
| 8341 | + PATH_SEPARATOR=';' |
| 8342 | + } |
| 8343 | fi |
| 8344 | |
| 8345 | # Support unset when possible. |
| 8346 | @@ -20841,8 +21074,6 @@ fi |
| 8347 | # there to prevent editors from complaining about space-tab. |
| 8348 | # (If _AS_PATH_WALK were called with IFS unset, it would disable word |
| 8349 | # splitting by setting IFS to empty value.) |
| 8350 | -as_nl=' |
| 8351 | -' |
| 8352 | IFS=" "" $as_nl" |
| 8353 | |
| 8354 | # Find who we are. Look in the path if we contain no directory separator. |
| 8355 | @@ -20865,7 +21096,7 @@ if test "x$as_myself" = x; then |
| 8356 | as_myself=$0 |
| 8357 | fi |
| 8358 | if test ! -f "$as_myself"; then |
| 8359 | - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
| 8360 | + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 |
| 8361 | { (exit 1); exit 1; } |
| 8362 | fi |
| 8363 | |
| 8364 | @@ -20878,17 +21109,10 @@ PS2='> ' |
| 8365 | PS4='+ ' |
| 8366 | |
| 8367 | # NLS nuisances. |
| 8368 | -for as_var in \ |
| 8369 | - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ |
| 8370 | - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ |
| 8371 | - LC_TELEPHONE LC_TIME |
| 8372 | -do |
| 8373 | - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then |
| 8374 | - eval $as_var=C; export $as_var |
| 8375 | - else |
| 8376 | - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var |
| 8377 | - fi |
| 8378 | -done |
| 8379 | +LC_ALL=C |
| 8380 | +export LC_ALL |
| 8381 | +LANGUAGE=C |
| 8382 | +export LANGUAGE |
| 8383 | |
| 8384 | # Required to use basename. |
| 8385 | if expr a : '\(a\)' >/dev/null 2>&1 && |
| 8386 | @@ -20910,7 +21134,7 @@ as_me=`$as_basename -- "$0" || |
| 8387 | $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ |
| 8388 | X"$0" : 'X\(//\)$' \| \ |
| 8389 | X"$0" : 'X\(/\)' \| . 2>/dev/null || |
| 8390 | -echo X/"$0" | |
| 8391 | +$as_echo X/"$0" | |
| 8392 | sed '/^.*\/\([^/][^/]*\)\/*$/{ |
| 8393 | s//\1/ |
| 8394 | q |
| 8395 | @@ -20961,7 +21185,7 @@ $as_unset CDPATH |
| 8396 | s/-\n.*// |
| 8397 | ' >$as_me.lineno && |
| 8398 | chmod +x "$as_me.lineno" || |
| 8399 | - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
| 8400 | + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 |
| 8401 | { (exit 1); exit 1; }; } |
| 8402 | |
| 8403 | # Don't try to exec as it changes $[0], causing all sort of problems |
| 8404 | @@ -20989,7 +21213,6 @@ case `echo -n x` in |
| 8405 | *) |
| 8406 | ECHO_N='-n';; |
| 8407 | esac |
| 8408 | - |
| 8409 | if expr a : '\(a\)' >/dev/null 2>&1 && |
| 8410 | test "X`expr 00001 : '.*\(...\)'`" = X001; then |
| 8411 | as_expr=expr |
| 8412 | @@ -21002,19 +21225,22 @@ if test -d conf$$.dir; then |
| 8413 | rm -f conf$$.dir/conf$$.file |
| 8414 | else |
| 8415 | rm -f conf$$.dir |
| 8416 | - mkdir conf$$.dir |
| 8417 | -fi |
| 8418 | -echo >conf$$.file |
| 8419 | -if ln -s conf$$.file conf$$ 2>/dev/null; then |
| 8420 | - as_ln_s='ln -s' |
| 8421 | - # ... but there are two gotchas: |
| 8422 | - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 8423 | - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 8424 | - # In both cases, we have to default to `cp -p'. |
| 8425 | - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 8426 | + mkdir conf$$.dir 2>/dev/null |
| 8427 | +fi |
| 8428 | +if (echo >conf$$.file) 2>/dev/null; then |
| 8429 | + if ln -s conf$$.file conf$$ 2>/dev/null; then |
| 8430 | + as_ln_s='ln -s' |
| 8431 | + # ... but there are two gotchas: |
| 8432 | + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
| 8433 | + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
| 8434 | + # In both cases, we have to default to `cp -p'. |
| 8435 | + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
| 8436 | + as_ln_s='cp -p' |
| 8437 | + elif ln conf$$.file conf$$ 2>/dev/null; then |
| 8438 | + as_ln_s=ln |
| 8439 | + else |
| 8440 | as_ln_s='cp -p' |
| 8441 | -elif ln conf$$.file conf$$ 2>/dev/null; then |
| 8442 | - as_ln_s=ln |
| 8443 | + fi |
| 8444 | else |
| 8445 | as_ln_s='cp -p' |
| 8446 | fi |
| 8447 | @@ -21039,10 +21265,10 @@ else |
| 8448 | as_test_x=' |
| 8449 | eval sh -c '\'' |
| 8450 | if test -d "$1"; then |
| 8451 | - test -d "$1/."; |
| 8452 | + test -d "$1/."; |
| 8453 | else |
| 8454 | case $1 in |
| 8455 | - -*)set "./$1";; |
| 8456 | + -*)set "./$1";; |
| 8457 | esac; |
| 8458 | case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in |
| 8459 | ???[sx]*):;;*)false;;esac;fi |
| 8460 | @@ -21065,7 +21291,7 @@ exec 6>&1 |
| 8461 | # values after options handling. |
| 8462 | ac_log=" |
| 8463 | This file was extended by suPHP $as_me 0.7.1, which was |
| 8464 | -generated by GNU Autoconf 2.61. Invocation command line was |
| 8465 | +generated by GNU Autoconf 2.63. Invocation command line was |
| 8466 | |
| 8467 | CONFIG_FILES = $CONFIG_FILES |
| 8468 | CONFIG_HEADERS = $CONFIG_HEADERS |
| 8469 | @@ -21078,7 +21304,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` |
| 8470 | |
| 8471 | _ACEOF |
| 8472 | |
| 8473 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8474 | +case $ac_config_files in *" |
| 8475 | +"*) set x $ac_config_files; shift; ac_config_files=$*;; |
| 8476 | +esac |
| 8477 | + |
| 8478 | +case $ac_config_headers in *" |
| 8479 | +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; |
| 8480 | +esac |
| 8481 | + |
| 8482 | + |
| 8483 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8484 | # Files that config.status was made for. |
| 8485 | config_files="$ac_config_files" |
| 8486 | config_headers="$ac_config_headers" |
| 8487 | @@ -21086,22 +21321,23 @@ config_commands="$ac_config_commands" |
| 8488 | |
| 8489 | _ACEOF |
| 8490 | |
| 8491 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8492 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8493 | ac_cs_usage="\ |
| 8494 | \`$as_me' instantiates files from templates according to the |
| 8495 | current configuration. |
| 8496 | |
| 8497 | -Usage: $0 [OPTIONS] [FILE]... |
| 8498 | +Usage: $0 [OPTION]... [FILE]... |
| 8499 | |
| 8500 | -h, --help print this help, then exit |
| 8501 | -V, --version print version number and configuration settings, then exit |
| 8502 | - -q, --quiet do not print progress messages |
| 8503 | + -q, --quiet, --silent |
| 8504 | + do not print progress messages |
| 8505 | -d, --debug don't remove temporary files |
| 8506 | --recheck update $as_me by reconfiguring in the same conditions |
| 8507 | - --file=FILE[:TEMPLATE] |
| 8508 | - instantiate the configuration file FILE |
| 8509 | - --header=FILE[:TEMPLATE] |
| 8510 | - instantiate the configuration header FILE |
| 8511 | + --file=FILE[:TEMPLATE] |
| 8512 | + instantiate the configuration file FILE |
| 8513 | + --header=FILE[:TEMPLATE] |
| 8514 | + instantiate the configuration header FILE |
| 8515 | |
| 8516 | Configuration files: |
| 8517 | $config_files |
| 8518 | @@ -21115,25 +21351,25 @@ $config_commands |
| 8519 | Report bugs to <bug-autoconf@gnu.org>." |
| 8520 | |
| 8521 | _ACEOF |
| 8522 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8523 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8524 | ac_cs_version="\\ |
| 8525 | suPHP config.status 0.7.1 |
| 8526 | -configured by $0, generated by GNU Autoconf 2.61, |
| 8527 | - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
| 8528 | +configured by $0, generated by GNU Autoconf 2.63, |
| 8529 | + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |
| 8530 | |
| 8531 | -Copyright (C) 2006 Free Software Foundation, Inc. |
| 8532 | +Copyright (C) 2008 Free Software Foundation, Inc. |
| 8533 | This config.status script is free software; the Free Software Foundation |
| 8534 | gives unlimited permission to copy, distribute and modify it." |
| 8535 | |
| 8536 | ac_pwd='$ac_pwd' |
| 8537 | srcdir='$srcdir' |
| 8538 | INSTALL='$INSTALL' |
| 8539 | -MKDIR_P='$MKDIR_P' |
| 8540 | +AWK='$AWK' |
| 8541 | +test -n "\$AWK" || AWK=awk |
| 8542 | _ACEOF |
| 8543 | |
| 8544 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8545 | -# If no file are specified by the user, then we need to provide default |
| 8546 | -# value. By we need to know if files were specified by the user. |
| 8547 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8548 | +# The default lists apply if the user does not specify any file. |
| 8549 | ac_need_defaults=: |
| 8550 | while test $# != 0 |
| 8551 | do |
| 8552 | @@ -21155,30 +21391,36 @@ do |
| 8553 | -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) |
| 8554 | ac_cs_recheck=: ;; |
| 8555 | --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) |
| 8556 | - echo "$ac_cs_version"; exit ;; |
| 8557 | + $as_echo "$ac_cs_version"; exit ;; |
| 8558 | --debug | --debu | --deb | --de | --d | -d ) |
| 8559 | debug=: ;; |
| 8560 | --file | --fil | --fi | --f ) |
| 8561 | $ac_shift |
| 8562 | - CONFIG_FILES="$CONFIG_FILES $ac_optarg" |
| 8563 | + case $ac_optarg in |
| 8564 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 8565 | + esac |
| 8566 | + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" |
| 8567 | ac_need_defaults=false;; |
| 8568 | --header | --heade | --head | --hea ) |
| 8569 | $ac_shift |
| 8570 | - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" |
| 8571 | + case $ac_optarg in |
| 8572 | + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
| 8573 | + esac |
| 8574 | + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" |
| 8575 | ac_need_defaults=false;; |
| 8576 | --he | --h) |
| 8577 | # Conflict between --help and --header |
| 8578 | - { echo "$as_me: error: ambiguous option: $1 |
| 8579 | + { $as_echo "$as_me: error: ambiguous option: $1 |
| 8580 | Try \`$0 --help' for more information." >&2 |
| 8581 | { (exit 1); exit 1; }; };; |
| 8582 | --help | --hel | -h ) |
| 8583 | - echo "$ac_cs_usage"; exit ;; |
| 8584 | + $as_echo "$ac_cs_usage"; exit ;; |
| 8585 | -q | -quiet | --quiet | --quie | --qui | --qu | --q \ |
| 8586 | | -silent | --silent | --silen | --sile | --sil | --si | --s) |
| 8587 | ac_cs_silent=: ;; |
| 8588 | |
| 8589 | # This is an error. |
| 8590 | - -*) { echo "$as_me: error: unrecognized option: $1 |
| 8591 | + -*) { $as_echo "$as_me: error: unrecognized option: $1 |
| 8592 | Try \`$0 --help' for more information." >&2 |
| 8593 | { (exit 1); exit 1; }; } ;; |
| 8594 | |
| 8595 | @@ -21197,27 +21439,29 @@ if $ac_cs_silent; then |
| 8596 | fi |
| 8597 | |
| 8598 | _ACEOF |
| 8599 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8600 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8601 | if \$ac_cs_recheck; then |
| 8602 | - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 |
| 8603 | - CONFIG_SHELL=$SHELL |
| 8604 | + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
| 8605 | + shift |
| 8606 | + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
| 8607 | + CONFIG_SHELL='$SHELL' |
| 8608 | export CONFIG_SHELL |
| 8609 | - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
| 8610 | + exec "\$@" |
| 8611 | fi |
| 8612 | |
| 8613 | _ACEOF |
| 8614 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8615 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8616 | exec 5>>config.log |
| 8617 | { |
| 8618 | echo |
| 8619 | sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX |
| 8620 | ## Running $as_me. ## |
| 8621 | _ASBOX |
| 8622 | - echo "$ac_log" |
| 8623 | + $as_echo "$ac_log" |
| 8624 | } >&5 |
| 8625 | |
| 8626 | _ACEOF |
| 8627 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8628 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8629 | # |
| 8630 | # INIT-COMMANDS |
| 8631 | # |
| 8632 | @@ -21225,7 +21469,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" |
| 8633 | |
| 8634 | _ACEOF |
| 8635 | |
| 8636 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8637 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8638 | |
| 8639 | # Handling of arguments. |
| 8640 | for ac_config_target in $ac_config_targets |
| 8641 | @@ -21238,8 +21482,8 @@ do |
| 8642 | "src/apache/Makefile") CONFIG_FILES="$CONFIG_FILES src/apache/Makefile" ;; |
| 8643 | "src/apache2/Makefile") CONFIG_FILES="$CONFIG_FILES src/apache2/Makefile" ;; |
| 8644 | |
| 8645 | - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
| 8646 | -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
| 8647 | + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
| 8648 | +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
| 8649 | { (exit 1); exit 1; }; };; |
| 8650 | esac |
| 8651 | done |
| 8652 | @@ -21280,227 +21524,144 @@ $debug || |
| 8653 | (umask 077 && mkdir "$tmp") |
| 8654 | } || |
| 8655 | { |
| 8656 | - echo "$me: cannot create a temporary directory in ." >&2 |
| 8657 | + $as_echo "$as_me: cannot create a temporary directory in ." >&2 |
| 8658 | { (exit 1); exit 1; } |
| 8659 | } |
| 8660 | |
| 8661 | -# |
| 8662 | -# Set up the sed scripts for CONFIG_FILES section. |
| 8663 | -# |
| 8664 | - |
| 8665 | -# No need to generate the scripts if there are no CONFIG_FILES. |
| 8666 | -# This happens for instance when ./config.status config.h |
| 8667 | +# Set up the scripts for CONFIG_FILES section. |
| 8668 | +# No need to generate them if there are no CONFIG_FILES. |
| 8669 | +# This happens for instance with `./config.status config.h'. |
| 8670 | if test -n "$CONFIG_FILES"; then |
| 8671 | |
| 8672 | -_ACEOF |
| 8673 | - |
| 8674 | |
| 8675 | - |
| 8676 | -ac_delim='%!_!# ' |
| 8677 | -for ac_last_try in false false false false false :; do |
| 8678 | - cat >conf$$subs.sed <<_ACEOF |
| 8679 | -SHELL!$SHELL$ac_delim |
| 8680 | -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim |
| 8681 | -PACKAGE_NAME!$PACKAGE_NAME$ac_delim |
| 8682 | -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim |
| 8683 | -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim |
| 8684 | -PACKAGE_STRING!$PACKAGE_STRING$ac_delim |
| 8685 | -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim |
| 8686 | -exec_prefix!$exec_prefix$ac_delim |
| 8687 | -prefix!$prefix$ac_delim |
| 8688 | -program_transform_name!$program_transform_name$ac_delim |
| 8689 | -bindir!$bindir$ac_delim |
| 8690 | -sbindir!$sbindir$ac_delim |
| 8691 | -libexecdir!$libexecdir$ac_delim |
| 8692 | -datarootdir!$datarootdir$ac_delim |
| 8693 | -datadir!$datadir$ac_delim |
| 8694 | -sysconfdir!$sysconfdir$ac_delim |
| 8695 | -sharedstatedir!$sharedstatedir$ac_delim |
| 8696 | -localstatedir!$localstatedir$ac_delim |
| 8697 | -includedir!$includedir$ac_delim |
| 8698 | -oldincludedir!$oldincludedir$ac_delim |
| 8699 | -docdir!$docdir$ac_delim |
| 8700 | -infodir!$infodir$ac_delim |
| 8701 | -htmldir!$htmldir$ac_delim |
| 8702 | -dvidir!$dvidir$ac_delim |
| 8703 | -pdfdir!$pdfdir$ac_delim |
| 8704 | -psdir!$psdir$ac_delim |
| 8705 | -libdir!$libdir$ac_delim |
| 8706 | -localedir!$localedir$ac_delim |
| 8707 | -mandir!$mandir$ac_delim |
| 8708 | -DEFS!$DEFS$ac_delim |
| 8709 | -ECHO_C!$ECHO_C$ac_delim |
| 8710 | -ECHO_N!$ECHO_N$ac_delim |
| 8711 | -ECHO_T!$ECHO_T$ac_delim |
| 8712 | -LIBS!$LIBS$ac_delim |
| 8713 | -build_alias!$build_alias$ac_delim |
| 8714 | -host_alias!$host_alias$ac_delim |
| 8715 | -target_alias!$target_alias$ac_delim |
| 8716 | -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim |
| 8717 | -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim |
| 8718 | -INSTALL_DATA!$INSTALL_DATA$ac_delim |
| 8719 | -am__isrc!$am__isrc$ac_delim |
| 8720 | -CYGPATH_W!$CYGPATH_W$ac_delim |
| 8721 | -PACKAGE!$PACKAGE$ac_delim |
| 8722 | -VERSION!$VERSION$ac_delim |
| 8723 | -ACLOCAL!$ACLOCAL$ac_delim |
| 8724 | -AUTOCONF!$AUTOCONF$ac_delim |
| 8725 | -AUTOMAKE!$AUTOMAKE$ac_delim |
| 8726 | -AUTOHEADER!$AUTOHEADER$ac_delim |
| 8727 | -MAKEINFO!$MAKEINFO$ac_delim |
| 8728 | -install_sh!$install_sh$ac_delim |
| 8729 | -STRIP!$STRIP$ac_delim |
| 8730 | -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim |
| 8731 | -mkdir_p!$mkdir_p$ac_delim |
| 8732 | -AWK!$AWK$ac_delim |
| 8733 | -SET_MAKE!$SET_MAKE$ac_delim |
| 8734 | -am__leading_dot!$am__leading_dot$ac_delim |
| 8735 | -AMTAR!$AMTAR$ac_delim |
| 8736 | -am__tar!$am__tar$ac_delim |
| 8737 | -am__untar!$am__untar$ac_delim |
| 8738 | -CC!$CC$ac_delim |
| 8739 | -CFLAGS!$CFLAGS$ac_delim |
| 8740 | -LDFLAGS!$LDFLAGS$ac_delim |
| 8741 | -CPPFLAGS!$CPPFLAGS$ac_delim |
| 8742 | -ac_ct_CC!$ac_ct_CC$ac_delim |
| 8743 | -EXEEXT!$EXEEXT$ac_delim |
| 8744 | -OBJEXT!$OBJEXT$ac_delim |
| 8745 | -DEPDIR!$DEPDIR$ac_delim |
| 8746 | -am__include!$am__include$ac_delim |
| 8747 | -am__quote!$am__quote$ac_delim |
| 8748 | -AMDEP_TRUE!$AMDEP_TRUE$ac_delim |
| 8749 | -AMDEP_FALSE!$AMDEP_FALSE$ac_delim |
| 8750 | -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim |
| 8751 | -CCDEPMODE!$CCDEPMODE$ac_delim |
| 8752 | -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim |
| 8753 | -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim |
| 8754 | -CXX!$CXX$ac_delim |
| 8755 | -CXXFLAGS!$CXXFLAGS$ac_delim |
| 8756 | -ac_ct_CXX!$ac_ct_CXX$ac_delim |
| 8757 | -CXXDEPMODE!$CXXDEPMODE$ac_delim |
| 8758 | -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim |
| 8759 | -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim |
| 8760 | -build!$build$ac_delim |
| 8761 | -build_cpu!$build_cpu$ac_delim |
| 8762 | -build_vendor!$build_vendor$ac_delim |
| 8763 | -build_os!$build_os$ac_delim |
| 8764 | -host!$host$ac_delim |
| 8765 | -host_cpu!$host_cpu$ac_delim |
| 8766 | -host_vendor!$host_vendor$ac_delim |
| 8767 | -host_os!$host_os$ac_delim |
| 8768 | -SED!$SED$ac_delim |
| 8769 | -GREP!$GREP$ac_delim |
| 8770 | -EGREP!$EGREP$ac_delim |
| 8771 | -LN_S!$LN_S$ac_delim |
| 8772 | -ECHO!$ECHO$ac_delim |
| 8773 | -AR!$AR$ac_delim |
| 8774 | -RANLIB!$RANLIB$ac_delim |
| 8775 | -DSYMUTIL!$DSYMUTIL$ac_delim |
| 8776 | -_ACEOF |
| 8777 | - |
| 8778 | - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then |
| 8779 | - break |
| 8780 | - elif $ac_last_try; then |
| 8781 | - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 8782 | -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 8783 | - { (exit 1); exit 1; }; } |
| 8784 | - else |
| 8785 | - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| 8786 | - fi |
| 8787 | -done |
| 8788 | - |
| 8789 | -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` |
| 8790 | -if test -n "$ac_eof"; then |
| 8791 | - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` |
| 8792 | - ac_eof=`expr $ac_eof + 1` |
| 8793 | +ac_cr='\r' |
| 8794 | +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
| 8795 | +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
| 8796 | + ac_cs_awk_cr='\\r' |
| 8797 | +else |
| 8798 | + ac_cs_awk_cr=$ac_cr |
| 8799 | fi |
| 8800 | |
| 8801 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8802 | -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof |
| 8803 | -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b |
| 8804 | -_ACEOF |
| 8805 | -sed ' |
| 8806 | -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g |
| 8807 | -s/^/s,@/; s/!/@,|#_!!_#|/ |
| 8808 | -:n |
| 8809 | -t n |
| 8810 | -s/'"$ac_delim"'$/,g/; t |
| 8811 | -s/$/\\/; p |
| 8812 | -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n |
| 8813 | -' >>$CONFIG_STATUS <conf$$subs.sed |
| 8814 | -rm -f conf$$subs.sed |
| 8815 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8816 | -CEOF$ac_eof |
| 8817 | +echo 'BEGIN {' >"$tmp/subs1.awk" && |
| 8818 | _ACEOF |
| 8819 | |
| 8820 | |
| 8821 | +{ |
| 8822 | + echo "cat >conf$$subs.awk <<_ACEOF" && |
| 8823 | + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
| 8824 | + echo "_ACEOF" |
| 8825 | +} >conf$$subs.sh || |
| 8826 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 8827 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 8828 | + { (exit 1); exit 1; }; } |
| 8829 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` |
| 8830 | ac_delim='%!_!# ' |
| 8831 | for ac_last_try in false false false false false :; do |
| 8832 | - cat >conf$$subs.sed <<_ACEOF |
| 8833 | -NMEDIT!$NMEDIT$ac_delim |
| 8834 | -CPP!$CPP$ac_delim |
| 8835 | -CXXCPP!$CXXCPP$ac_delim |
| 8836 | -F77!$F77$ac_delim |
| 8837 | -FFLAGS!$FFLAGS$ac_delim |
| 8838 | -ac_ct_F77!$ac_ct_F77$ac_delim |
| 8839 | -LIBTOOL!$LIBTOOL$ac_delim |
| 8840 | -APXS!$APXS$ac_delim |
| 8841 | -APACHE_VERSION_1_3!$APACHE_VERSION_1_3$ac_delim |
| 8842 | -APACHE_VERSION_2!$APACHE_VERSION_2$ac_delim |
| 8843 | -APXS_INCLUDEDIR!$APXS_INCLUDEDIR$ac_delim |
| 8844 | -APXS_LIBEXECDIR!$APXS_LIBEXECDIR$ac_delim |
| 8845 | -APXS_EXTRA_CFLAGS!$APXS_EXTRA_CFLAGS$ac_delim |
| 8846 | -APR_INCLUDEDIR!$APR_INCLUDEDIR$ac_delim |
| 8847 | -APR_CPPFLAGS!$APR_CPPFLAGS$ac_delim |
| 8848 | -OPT_APACHEMOD_USERGROUP_DEF!$OPT_APACHEMOD_USERGROUP_DEF$ac_delim |
| 8849 | -COND_AP13_TRUE!$COND_AP13_TRUE$ac_delim |
| 8850 | -COND_AP13_FALSE!$COND_AP13_FALSE$ac_delim |
| 8851 | -COND_AP20_TRUE!$COND_AP20_TRUE$ac_delim |
| 8852 | -COND_AP20_FALSE!$COND_AP20_FALSE$ac_delim |
| 8853 | -COND_APUSERGROUP_TRUE!$COND_APUSERGROUP_TRUE$ac_delim |
| 8854 | -COND_APUSERGROUP_FALSE!$COND_APUSERGROUP_FALSE$ac_delim |
| 8855 | -LIBOBJS!$LIBOBJS$ac_delim |
| 8856 | -LTLIBOBJS!$LTLIBOBJS$ac_delim |
| 8857 | -_ACEOF |
| 8858 | + . ./conf$$subs.sh || |
| 8859 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 8860 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 8861 | + { (exit 1); exit 1; }; } |
| 8862 | |
| 8863 | - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then |
| 8864 | + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
| 8865 | + if test $ac_delim_n = $ac_delim_num; then |
| 8866 | break |
| 8867 | elif $ac_last_try; then |
| 8868 | - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 8869 | -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 8870 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |
| 8871 | +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} |
| 8872 | { (exit 1); exit 1; }; } |
| 8873 | else |
| 8874 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| 8875 | fi |
| 8876 | done |
| 8877 | +rm -f conf$$subs.sh |
| 8878 | |
| 8879 | -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` |
| 8880 | -if test -n "$ac_eof"; then |
| 8881 | - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` |
| 8882 | - ac_eof=`expr $ac_eof + 1` |
| 8883 | -fi |
| 8884 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8885 | +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && |
| 8886 | +_ACEOF |
| 8887 | +sed -n ' |
| 8888 | +h |
| 8889 | +s/^/S["/; s/!.*/"]=/ |
| 8890 | +p |
| 8891 | +g |
| 8892 | +s/^[^!]*!// |
| 8893 | +:repl |
| 8894 | +t repl |
| 8895 | +s/'"$ac_delim"'$// |
| 8896 | +t delim |
| 8897 | +:nl |
| 8898 | +h |
| 8899 | +s/\(.\{148\}\).*/\1/ |
| 8900 | +t more1 |
| 8901 | +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ |
| 8902 | +p |
| 8903 | +n |
| 8904 | +b repl |
| 8905 | +:more1 |
| 8906 | +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ |
| 8907 | +p |
| 8908 | +g |
| 8909 | +s/.\{148\}// |
| 8910 | +t nl |
| 8911 | +:delim |
| 8912 | +h |
| 8913 | +s/\(.\{148\}\).*/\1/ |
| 8914 | +t more2 |
| 8915 | +s/["\\]/\\&/g; s/^/"/; s/$/"/ |
| 8916 | +p |
| 8917 | +b |
| 8918 | +:more2 |
| 8919 | +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ |
| 8920 | +p |
| 8921 | +g |
| 8922 | +s/.\{148\}// |
| 8923 | +t delim |
| 8924 | +' <conf$$subs.awk | sed ' |
| 8925 | +/^[^""]/{ |
| 8926 | + N |
| 8927 | + s/\n// |
| 8928 | +} |
| 8929 | +' >>$CONFIG_STATUS || ac_write_fail=1 |
| 8930 | +rm -f conf$$subs.awk |
| 8931 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 8932 | +_ACAWK |
| 8933 | +cat >>"\$tmp/subs1.awk" <<_ACAWK && |
| 8934 | + for (key in S) S_is_set[key] = 1 |
| 8935 | + FS = "\a" |
| 8936 | + |
| 8937 | +} |
| 8938 | +{ |
| 8939 | + line = $ 0 |
| 8940 | + nfields = split(line, field, "@") |
| 8941 | + substed = 0 |
| 8942 | + len = length(field[1]) |
| 8943 | + for (i = 2; i < nfields; i++) { |
| 8944 | + key = field[i] |
| 8945 | + keylen = length(key) |
| 8946 | + if (S_is_set[key]) { |
| 8947 | + value = S[key] |
| 8948 | + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) |
| 8949 | + len += length(value) + length(field[++i]) |
| 8950 | + substed = 1 |
| 8951 | + } else |
| 8952 | + len += 1 + keylen |
| 8953 | + } |
| 8954 | + |
| 8955 | + print line |
| 8956 | +} |
| 8957 | |
| 8958 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8959 | -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof |
| 8960 | -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end |
| 8961 | +_ACAWK |
| 8962 | _ACEOF |
| 8963 | -sed ' |
| 8964 | -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g |
| 8965 | -s/^/s,@/; s/!/@,|#_!!_#|/ |
| 8966 | -:n |
| 8967 | -t n |
| 8968 | -s/'"$ac_delim"'$/,g/; t |
| 8969 | -s/$/\\/; p |
| 8970 | -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n |
| 8971 | -' >>$CONFIG_STATUS <conf$$subs.sed |
| 8972 | -rm -f conf$$subs.sed |
| 8973 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 8974 | -:end |
| 8975 | -s/|#_!!_#|//g |
| 8976 | -CEOF$ac_eof |
| 8977 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8978 | +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then |
| 8979 | + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" |
| 8980 | +else |
| 8981 | + cat |
| 8982 | +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
| 8983 | + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 |
| 8984 | +$as_echo "$as_me: error: could not setup config files machinery" >&2;} |
| 8985 | + { (exit 1); exit 1; }; } |
| 8986 | _ACEOF |
| 8987 | |
| 8988 | - |
| 8989 | # VPATH may cause trouble with some makes, so we remove $(srcdir), |
| 8990 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
| 8991 | # trailing colons and then remove the whole line if VPATH becomes empty |
| 8992 | @@ -21516,19 +21677,133 @@ s/^[^=]*=[ ]*$// |
| 8993 | }' |
| 8994 | fi |
| 8995 | |
| 8996 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 8997 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 8998 | fi # test -n "$CONFIG_FILES" |
| 8999 | |
| 9000 | +# Set up the scripts for CONFIG_HEADERS section. |
| 9001 | +# No need to generate them if there are no CONFIG_HEADERS. |
| 9002 | +# This happens for instance with `./config.status Makefile'. |
| 9003 | +if test -n "$CONFIG_HEADERS"; then |
| 9004 | +cat >"$tmp/defines.awk" <<\_ACAWK || |
| 9005 | +BEGIN { |
| 9006 | +_ACEOF |
| 9007 | + |
| 9008 | +# Transform confdefs.h into an awk script `defines.awk', embedded as |
| 9009 | +# here-document in config.status, that substitutes the proper values into |
| 9010 | +# config.h.in to produce config.h. |
| 9011 | + |
| 9012 | +# Create a delimiter string that does not exist in confdefs.h, to ease |
| 9013 | +# handling of long lines. |
| 9014 | +ac_delim='%!_!# ' |
| 9015 | +for ac_last_try in false false :; do |
| 9016 | + ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
| 9017 | + if test -z "$ac_t"; then |
| 9018 | + break |
| 9019 | + elif $ac_last_try; then |
| 9020 | + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 |
| 9021 | +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} |
| 9022 | + { (exit 1); exit 1; }; } |
| 9023 | + else |
| 9024 | + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
| 9025 | + fi |
| 9026 | +done |
| 9027 | + |
| 9028 | +# For the awk script, D is an array of macro values keyed by name, |
| 9029 | +# likewise P contains macro parameters if any. Preserve backslash |
| 9030 | +# newline sequences. |
| 9031 | + |
| 9032 | +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* |
| 9033 | +sed -n ' |
| 9034 | +s/.\{148\}/&'"$ac_delim"'/g |
| 9035 | +t rset |
| 9036 | +:rset |
| 9037 | +s/^[ ]*#[ ]*define[ ][ ]*/ / |
| 9038 | +t def |
| 9039 | +d |
| 9040 | +:def |
| 9041 | +s/\\$// |
| 9042 | +t bsnl |
| 9043 | +s/["\\]/\\&/g |
| 9044 | +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
| 9045 | +D["\1"]=" \3"/p |
| 9046 | +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p |
| 9047 | +d |
| 9048 | +:bsnl |
| 9049 | +s/["\\]/\\&/g |
| 9050 | +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ |
| 9051 | +D["\1"]=" \3\\\\\\n"\\/p |
| 9052 | +t cont |
| 9053 | +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p |
| 9054 | +t cont |
| 9055 | +d |
| 9056 | +:cont |
| 9057 | +n |
| 9058 | +s/.\{148\}/&'"$ac_delim"'/g |
| 9059 | +t clear |
| 9060 | +:clear |
| 9061 | +s/\\$// |
| 9062 | +t bsnlc |
| 9063 | +s/["\\]/\\&/g; s/^/"/; s/$/"/p |
| 9064 | +d |
| 9065 | +:bsnlc |
| 9066 | +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p |
| 9067 | +b cont |
| 9068 | +' <confdefs.h | sed ' |
| 9069 | +s/'"$ac_delim"'/"\\\ |
| 9070 | +"/g' >>$CONFIG_STATUS || ac_write_fail=1 |
| 9071 | + |
| 9072 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 9073 | + for (key in D) D_is_set[key] = 1 |
| 9074 | + FS = "\a" |
| 9075 | +} |
| 9076 | +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { |
| 9077 | + line = \$ 0 |
| 9078 | + split(line, arg, " ") |
| 9079 | + if (arg[1] == "#") { |
| 9080 | + defundef = arg[2] |
| 9081 | + mac1 = arg[3] |
| 9082 | + } else { |
| 9083 | + defundef = substr(arg[1], 2) |
| 9084 | + mac1 = arg[2] |
| 9085 | + } |
| 9086 | + split(mac1, mac2, "(") #) |
| 9087 | + macro = mac2[1] |
| 9088 | + prefix = substr(line, 1, index(line, defundef) - 1) |
| 9089 | + if (D_is_set[macro]) { |
| 9090 | + # Preserve the white space surrounding the "#". |
| 9091 | + print prefix "define", macro P[macro] D[macro] |
| 9092 | + next |
| 9093 | + } else { |
| 9094 | + # Replace #undef with comments. This is necessary, for example, |
| 9095 | + # in the case of _POSIX_SOURCE, which is predefined and required |
| 9096 | + # on some systems where configure will not decide to define it. |
| 9097 | + if (defundef == "undef") { |
| 9098 | + print "/*", prefix defundef, macro, "*/" |
| 9099 | + next |
| 9100 | + } |
| 9101 | + } |
| 9102 | +} |
| 9103 | +{ print } |
| 9104 | +_ACAWK |
| 9105 | +_ACEOF |
| 9106 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 9107 | + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 |
| 9108 | +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} |
| 9109 | + { (exit 1); exit 1; }; } |
| 9110 | +fi # test -n "$CONFIG_HEADERS" |
| 9111 | + |
| 9112 | |
| 9113 | -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS |
| 9114 | +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" |
| 9115 | +shift |
| 9116 | +for ac_tag |
| 9117 | do |
| 9118 | case $ac_tag in |
| 9119 | :[FHLC]) ac_mode=$ac_tag; continue;; |
| 9120 | esac |
| 9121 | case $ac_mode$ac_tag in |
| 9122 | :[FHL]*:*);; |
| 9123 | - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 |
| 9124 | -echo "$as_me: error: Invalid tag $ac_tag." >&2;} |
| 9125 | + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 |
| 9126 | +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} |
| 9127 | { (exit 1); exit 1; }; };; |
| 9128 | :[FH]-) ac_tag=-:-;; |
| 9129 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
| 9130 | @@ -21557,26 +21832,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} |
| 9131 | [\\/$]*) false;; |
| 9132 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
| 9133 | esac || |
| 9134 | - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 |
| 9135 | -echo "$as_me: error: cannot find input file: $ac_f" >&2;} |
| 9136 | + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 |
| 9137 | +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} |
| 9138 | { (exit 1); exit 1; }; };; |
| 9139 | esac |
| 9140 | - ac_file_inputs="$ac_file_inputs $ac_f" |
| 9141 | + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
| 9142 | + ac_file_inputs="$ac_file_inputs '$ac_f'" |
| 9143 | done |
| 9144 | |
| 9145 | # Let's still pretend it is `configure' which instantiates (i.e., don't |
| 9146 | # use $as_me), people would be surprised to read: |
| 9147 | # /* config.h. Generated by config.status. */ |
| 9148 | - configure_input="Generated from "`IFS=: |
| 9149 | - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." |
| 9150 | + configure_input='Generated from '` |
| 9151 | + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' |
| 9152 | + `' by configure.' |
| 9153 | if test x"$ac_file" != x-; then |
| 9154 | configure_input="$ac_file. $configure_input" |
| 9155 | - { echo "$as_me:$LINENO: creating $ac_file" >&5 |
| 9156 | -echo "$as_me: creating $ac_file" >&6;} |
| 9157 | + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 |
| 9158 | +$as_echo "$as_me: creating $ac_file" >&6;} |
| 9159 | fi |
| 9160 | + # Neutralize special characters interpreted by sed in replacement strings. |
| 9161 | + case $configure_input in #( |
| 9162 | + *\&* | *\|* | *\\* ) |
| 9163 | + ac_sed_conf_input=`$as_echo "$configure_input" | |
| 9164 | + sed 's/[\\\\&|]/\\\\&/g'`;; #( |
| 9165 | + *) ac_sed_conf_input=$configure_input;; |
| 9166 | + esac |
| 9167 | |
| 9168 | case $ac_tag in |
| 9169 | - *:-:* | *:-) cat >"$tmp/stdin";; |
| 9170 | + *:-:* | *:-) cat >"$tmp/stdin" \ |
| 9171 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 |
| 9172 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} |
| 9173 | + { (exit 1); exit 1; }; } ;; |
| 9174 | esac |
| 9175 | ;; |
| 9176 | esac |
| 9177 | @@ -21586,7 +21873,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9178 | X"$ac_file" : 'X\(//\)[^/]' \| \ |
| 9179 | X"$ac_file" : 'X\(//\)$' \| \ |
| 9180 | X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || |
| 9181 | -echo X"$ac_file" | |
| 9182 | +$as_echo X"$ac_file" | |
| 9183 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9184 | s//\1/ |
| 9185 | q |
| 9186 | @@ -21612,7 +21899,7 @@ echo X"$ac_file" | |
| 9187 | as_dirs= |
| 9188 | while :; do |
| 9189 | case $as_dir in #( |
| 9190 | - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( |
| 9191 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( |
| 9192 | *) as_qdir=$as_dir;; |
| 9193 | esac |
| 9194 | as_dirs="'$as_qdir' $as_dirs" |
| 9195 | @@ -21621,7 +21908,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9196 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
| 9197 | X"$as_dir" : 'X\(//\)$' \| \ |
| 9198 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
| 9199 | -echo X"$as_dir" | |
| 9200 | +$as_echo X"$as_dir" | |
| 9201 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9202 | s//\1/ |
| 9203 | q |
| 9204 | @@ -21642,17 +21929,17 @@ echo X"$as_dir" | |
| 9205 | test -d "$as_dir" && break |
| 9206 | done |
| 9207 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
| 9208 | - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 |
| 9209 | -echo "$as_me: error: cannot create directory $as_dir" >&2;} |
| 9210 | + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 |
| 9211 | +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} |
| 9212 | { (exit 1); exit 1; }; }; } |
| 9213 | ac_builddir=. |
| 9214 | |
| 9215 | case "$ac_dir" in |
| 9216 | .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; |
| 9217 | *) |
| 9218 | - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` |
| 9219 | + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` |
| 9220 | # A ".." for each directory in $ac_dir_suffix. |
| 9221 | - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` |
| 9222 | + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` |
| 9223 | case $ac_top_builddir_sub in |
| 9224 | "") ac_top_builddir_sub=. ac_top_build_prefix= ;; |
| 9225 | *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; |
| 9226 | @@ -21690,19 +21977,15 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix |
| 9227 | [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; |
| 9228 | *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; |
| 9229 | esac |
| 9230 | - ac_MKDIR_P=$MKDIR_P |
| 9231 | - case $MKDIR_P in |
| 9232 | - [\\/$]* | ?:[\\/]* ) ;; |
| 9233 | - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; |
| 9234 | - esac |
| 9235 | _ACEOF |
| 9236 | |
| 9237 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 9238 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 9239 | # If the template does not know about datarootdir, expand it. |
| 9240 | # FIXME: This hack should be removed a few years after 2.60. |
| 9241 | ac_datarootdir_hack=; ac_datarootdir_seen= |
| 9242 | |
| 9243 | -case `sed -n '/datarootdir/ { |
| 9244 | +ac_sed_dataroot=' |
| 9245 | +/datarootdir/ { |
| 9246 | p |
| 9247 | q |
| 9248 | } |
| 9249 | @@ -21711,13 +21994,14 @@ case `sed -n '/datarootdir/ { |
| 9250 | /@infodir@/p |
| 9251 | /@localedir@/p |
| 9252 | /@mandir@/p |
| 9253 | -' $ac_file_inputs` in |
| 9254 | +' |
| 9255 | +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in |
| 9256 | *datarootdir*) ac_datarootdir_seen=yes;; |
| 9257 | *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) |
| 9258 | - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 |
| 9259 | -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} |
| 9260 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 |
| 9261 | +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} |
| 9262 | _ACEOF |
| 9263 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 9264 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 9265 | ac_datarootdir_hack=' |
| 9266 | s&@datadir@&$datadir&g |
| 9267 | s&@docdir@&$docdir&g |
| 9268 | @@ -21731,15 +22015,16 @@ _ACEOF |
| 9269 | # Neutralize VPATH when `$srcdir' = `.'. |
| 9270 | # Shell code in configure.ac might set extrasub. |
| 9271 | # FIXME: do we really want to maintain this feature? |
| 9272 | -cat >>$CONFIG_STATUS <<_ACEOF |
| 9273 | - sed "$ac_vpsub |
| 9274 | +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 9275 | +ac_sed_extra="$ac_vpsub |
| 9276 | $extrasub |
| 9277 | _ACEOF |
| 9278 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 9279 | +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
| 9280 | :t |
| 9281 | /@[a-zA-Z_][a-zA-Z_0-9]*@/!b |
| 9282 | -s&@configure_input@&$configure_input&;t t |
| 9283 | +s|@configure_input@|$ac_sed_conf_input|;t t |
| 9284 | s&@top_builddir@&$ac_top_builddir_sub&;t t |
| 9285 | +s&@top_build_prefix@&$ac_top_build_prefix&;t t |
| 9286 | s&@srcdir@&$ac_srcdir&;t t |
| 9287 | s&@abs_srcdir@&$ac_abs_srcdir&;t t |
| 9288 | s&@top_srcdir@&$ac_top_srcdir&;t t |
| 9289 | @@ -21748,138 +22033,75 @@ s&@builddir@&$ac_builddir&;t t |
| 9290 | s&@abs_builddir@&$ac_abs_builddir&;t t |
| 9291 | s&@abs_top_builddir@&$ac_abs_top_builddir&;t t |
| 9292 | s&@INSTALL@&$ac_INSTALL&;t t |
| 9293 | -s&@MKDIR_P@&$ac_MKDIR_P&;t t |
| 9294 | $ac_datarootdir_hack |
| 9295 | -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out |
| 9296 | +" |
| 9297 | +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
| 9298 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 |
| 9299 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} |
| 9300 | + { (exit 1); exit 1; }; } |
| 9301 | |
| 9302 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
| 9303 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
| 9304 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
| 9305 | - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 9306 | + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 9307 | which seems to be undefined. Please make sure it is defined." >&5 |
| 9308 | -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 9309 | +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
| 9310 | which seems to be undefined. Please make sure it is defined." >&2;} |
| 9311 | |
| 9312 | rm -f "$tmp/stdin" |
| 9313 | case $ac_file in |
| 9314 | - -) cat "$tmp/out"; rm -f "$tmp/out";; |
| 9315 | - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; |
| 9316 | - esac |
| 9317 | + -) cat "$tmp/out" && rm -f "$tmp/out";; |
| 9318 | + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
| 9319 | + esac \ |
| 9320 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 |
| 9321 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} |
| 9322 | + { (exit 1); exit 1; }; } |
| 9323 | ;; |
| 9324 | :H) |
| 9325 | # |
| 9326 | # CONFIG_HEADER |
| 9327 | # |
| 9328 | -_ACEOF |
| 9329 | - |
| 9330 | -# Transform confdefs.h into a sed script `conftest.defines', that |
| 9331 | -# substitutes the proper values into config.h.in to produce config.h. |
| 9332 | -rm -f conftest.defines conftest.tail |
| 9333 | -# First, append a space to every undef/define line, to ease matching. |
| 9334 | -echo 's/$/ /' >conftest.defines |
| 9335 | -# Then, protect against being on the right side of a sed subst, or in |
| 9336 | -# an unquoted here document, in config.status. If some macros were |
| 9337 | -# called several times there might be several #defines for the same |
| 9338 | -# symbol, which is useless. But do not sort them, since the last |
| 9339 | -# AC_DEFINE must be honored. |
| 9340 | -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* |
| 9341 | -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where |
| 9342 | -# NAME is the cpp macro being defined, VALUE is the value it is being given. |
| 9343 | -# PARAMS is the parameter list in the macro definition--in most cases, it's |
| 9344 | -# just an empty string. |
| 9345 | -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' |
| 9346 | -ac_dB='\\)[ (].*,\\1define\\2' |
| 9347 | -ac_dC=' ' |
| 9348 | -ac_dD=' ,' |
| 9349 | - |
| 9350 | -uniq confdefs.h | |
| 9351 | - sed -n ' |
| 9352 | - t rset |
| 9353 | - :rset |
| 9354 | - s/^[ ]*#[ ]*define[ ][ ]*// |
| 9355 | - t ok |
| 9356 | - d |
| 9357 | - :ok |
| 9358 | - s/[\\&,]/\\&/g |
| 9359 | - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p |
| 9360 | - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p |
| 9361 | - ' >>conftest.defines |
| 9362 | - |
| 9363 | -# Remove the space that was appended to ease matching. |
| 9364 | -# Then replace #undef with comments. This is necessary, for |
| 9365 | -# example, in the case of _POSIX_SOURCE, which is predefined and required |
| 9366 | -# on some systems where configure will not decide to define it. |
| 9367 | -# (The regexp can be short, since the line contains either #define or #undef.) |
| 9368 | -echo 's/ $// |
| 9369 | -s,^[ #]*u.*,/* & */,' >>conftest.defines |
| 9370 | - |
| 9371 | -# Break up conftest.defines: |
| 9372 | -ac_max_sed_lines=50 |
| 9373 | - |
| 9374 | -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" |
| 9375 | -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" |
| 9376 | -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" |
| 9377 | -# et cetera. |
| 9378 | -ac_in='$ac_file_inputs' |
| 9379 | -ac_out='"$tmp/out1"' |
| 9380 | -ac_nxt='"$tmp/out2"' |
| 9381 | - |
| 9382 | -while : |
| 9383 | -do |
| 9384 | - # Write a here document: |
| 9385 | - cat >>$CONFIG_STATUS <<_ACEOF |
| 9386 | - # First, check the format of the line: |
| 9387 | - cat >"\$tmp/defines.sed" <<\\CEOF |
| 9388 | -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def |
| 9389 | -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def |
| 9390 | -b |
| 9391 | -:def |
| 9392 | -_ACEOF |
| 9393 | - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS |
| 9394 | - echo 'CEOF |
| 9395 | - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS |
| 9396 | - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in |
| 9397 | - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail |
| 9398 | - grep . conftest.tail >/dev/null || break |
| 9399 | - rm -f conftest.defines |
| 9400 | - mv conftest.tail conftest.defines |
| 9401 | -done |
| 9402 | -rm -f conftest.defines conftest.tail |
| 9403 | - |
| 9404 | -echo "ac_result=$ac_in" >>$CONFIG_STATUS |
| 9405 | -cat >>$CONFIG_STATUS <<\_ACEOF |
| 9406 | if test x"$ac_file" != x-; then |
| 9407 | - echo "/* $configure_input */" >"$tmp/config.h" |
| 9408 | - cat "$ac_result" >>"$tmp/config.h" |
| 9409 | - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then |
| 9410 | - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 |
| 9411 | -echo "$as_me: $ac_file is unchanged" >&6;} |
| 9412 | + { |
| 9413 | + $as_echo "/* $configure_input */" \ |
| 9414 | + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
| 9415 | + } >"$tmp/config.h" \ |
| 9416 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 |
| 9417 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} |
| 9418 | + { (exit 1); exit 1; }; } |
| 9419 | + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
| 9420 | + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 |
| 9421 | +$as_echo "$as_me: $ac_file is unchanged" >&6;} |
| 9422 | else |
| 9423 | - rm -f $ac_file |
| 9424 | - mv "$tmp/config.h" $ac_file |
| 9425 | + rm -f "$ac_file" |
| 9426 | + mv "$tmp/config.h" "$ac_file" \ |
| 9427 | + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 |
| 9428 | +$as_echo "$as_me: error: could not create $ac_file" >&2;} |
| 9429 | + { (exit 1); exit 1; }; } |
| 9430 | fi |
| 9431 | else |
| 9432 | - echo "/* $configure_input */" |
| 9433 | - cat "$ac_result" |
| 9434 | + $as_echo "/* $configure_input */" \ |
| 9435 | + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
| 9436 | + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 |
| 9437 | +$as_echo "$as_me: error: could not create -" >&2;} |
| 9438 | + { (exit 1); exit 1; }; } |
| 9439 | fi |
| 9440 | - rm -f "$tmp/out12" |
| 9441 | -# Compute $ac_file's index in $config_headers. |
| 9442 | -_am_arg=$ac_file |
| 9443 | +# Compute "$ac_file"'s index in $config_headers. |
| 9444 | _am_stamp_count=1 |
| 9445 | for _am_header in $config_headers :; do |
| 9446 | case $_am_header in |
| 9447 | - $_am_arg | $_am_arg:* ) |
| 9448 | + "$ac_file" | "$ac_file":* ) |
| 9449 | break ;; |
| 9450 | * ) |
| 9451 | _am_stamp_count=`expr $_am_stamp_count + 1` ;; |
| 9452 | esac |
| 9453 | done |
| 9454 | -echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || |
| 9455 | -$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9456 | - X"$_am_arg" : 'X\(//\)[^/]' \| \ |
| 9457 | - X"$_am_arg" : 'X\(//\)$' \| \ |
| 9458 | - X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || |
| 9459 | -echo X"$_am_arg" | |
| 9460 | +echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || |
| 9461 | +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9462 | + X"$ac_file" : 'X\(//\)[^/]' \| \ |
| 9463 | + X"$ac_file" : 'X\(//\)$' \| \ |
| 9464 | + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || |
| 9465 | +$as_echo X"$ac_file" | |
| 9466 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9467 | s//\1/ |
| 9468 | q |
| 9469 | @@ -21899,8 +22121,8 @@ echo X"$_am_arg" | |
| 9470 | s/.*/./; q'`/stamp-h$_am_stamp_count |
| 9471 | ;; |
| 9472 | |
| 9473 | - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 |
| 9474 | -echo "$as_me: executing $ac_file commands" >&6;} |
| 9475 | + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 |
| 9476 | +$as_echo "$as_me: executing $ac_file commands" >&6;} |
| 9477 | ;; |
| 9478 | esac |
| 9479 | |
| 9480 | @@ -21914,15 +22136,14 @@ echo "$as_me: executing $ac_file commands" >&6;} |
| 9481 | # some people rename them; so instead we look at the file content. |
| 9482 | # Grep'ing the first line is not enough: some people post-process |
| 9483 | # each Makefile.in and add a new line on top of each file to say so. |
| 9484 | - # Grep'ing the whole file is not good either: AIX grep has a line |
| 9485 | - # limit of 2048, but all sed's we know have understand at least 4000. |
| 9486 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
| 9487 | + # So let's grep whole file. |
| 9488 | + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then |
| 9489 | dirpart=`$as_dirname -- "$mf" || |
| 9490 | $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9491 | X"$mf" : 'X\(//\)[^/]' \| \ |
| 9492 | X"$mf" : 'X\(//\)$' \| \ |
| 9493 | X"$mf" : 'X\(/\)' \| . 2>/dev/null || |
| 9494 | -echo X"$mf" | |
| 9495 | +$as_echo X"$mf" | |
| 9496 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9497 | s//\1/ |
| 9498 | q |
| 9499 | @@ -21966,7 +22187,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9500 | X"$file" : 'X\(//\)[^/]' \| \ |
| 9501 | X"$file" : 'X\(//\)$' \| \ |
| 9502 | X"$file" : 'X\(/\)' \| . 2>/dev/null || |
| 9503 | -echo X"$file" | |
| 9504 | +$as_echo X"$file" | |
| 9505 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9506 | s//\1/ |
| 9507 | q |
| 9508 | @@ -21992,7 +22213,7 @@ echo X"$file" | |
| 9509 | as_dirs= |
| 9510 | while :; do |
| 9511 | case $as_dir in #( |
| 9512 | - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( |
| 9513 | + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( |
| 9514 | *) as_qdir=$as_dir;; |
| 9515 | esac |
| 9516 | as_dirs="'$as_qdir' $as_dirs" |
| 9517 | @@ -22001,7 +22222,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
| 9518 | X"$as_dir" : 'X\(//\)[^/]' \| \ |
| 9519 | X"$as_dir" : 'X\(//\)$' \| \ |
| 9520 | X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || |
| 9521 | -echo X"$as_dir" | |
| 9522 | +$as_echo X"$as_dir" | |
| 9523 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
| 9524 | s//\1/ |
| 9525 | q |
| 9526 | @@ -22022,8 +22243,8 @@ echo X"$as_dir" | |
| 9527 | test -d "$as_dir" && break |
| 9528 | done |
| 9529 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
| 9530 | - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 |
| 9531 | -echo "$as_me: error: cannot create directory $as_dir" >&2;} |
| 9532 | + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 |
| 9533 | +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} |
| 9534 | { (exit 1); exit 1; }; }; } |
| 9535 | # echo "creating $dirpart/$file" |
| 9536 | echo '# dummy' > "$dirpart/$file" |
| 9537 | @@ -22040,6 +22261,11 @@ _ACEOF |
| 9538 | chmod +x $CONFIG_STATUS |
| 9539 | ac_clean_files=$ac_clean_files_save |
| 9540 | |
| 9541 | +test $ac_write_fail = 0 || |
| 9542 | + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 |
| 9543 | +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} |
| 9544 | + { (exit 1); exit 1; }; } |
| 9545 | + |
| 9546 | |
| 9547 | # configure is writing to config.log, and then calls config.status. |
| 9548 | # config.status does its own redirection, appending to config.log. |
| 9549 | @@ -22061,15 +22287,19 @@ if test "$no_create" != yes; then |
| 9550 | # would make configure fail if this is the last instruction. |
| 9551 | $ac_cs_success || { (exit 1); exit 1; } |
| 9552 | fi |
| 9553 | +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
| 9554 | + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
| 9555 | +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
| 9556 | +fi |
| 9557 | |
| 9558 | |
| 9559 | if test "$APXS" = "/notfound/"; then |
| 9560 | - { echo "$as_me:$LINENO: WARNING: |
| 9561 | + { $as_echo "$as_me:$LINENO: WARNING: |
| 9562 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 9563 | !!*** APXS was not found, so mod_suphp will not be built! ***!! |
| 9564 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 9565 | " >&5 |
| 9566 | -echo "$as_me: WARNING: |
| 9567 | +$as_echo "$as_me: WARNING: |
| 9568 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 9569 | !!*** APXS was not found, so mod_suphp will not be built! ***!! |
| 9570 | !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |