1diff -Naur php-5.3.23-patch1/Makefile.global php-5.3.23-patch2/Makefile.global 2--- php-5.3.23-patch1/Makefile.global 2013-04-04 21:27:15.000000000 -0700 3+++ php-5.3.23-patch2/Makefile.global 2013-04-04 21:36:54.000000000 -0700 4@@ -13,6 +13,8 @@ 5 6 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) 7 8+build-binaries: $(PHP_BINARIES) 9+ 10 libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 11 $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ 12 -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 13@@ -35,6 +37,8 @@ 14 fi 15 @$(INSTALL_IT) 16 17+install-binaries: build-binaries $(install_binary_targets) 18+ 19 install-modules: build-modules 20 @test -d modules && \ 21 $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) 22diff -Naur php-5.3.23-patch1/acconfig.h php-5.3.23-patch2/acconfig.h 23--- php-5.3.23-patch1/acconfig.h 2013-04-04 21:28:22.000000000 -0700 24+++ php-5.3.23-patch2/acconfig.h 2013-04-04 21:36:54.000000000 -0700 25@@ -20,8 +20,6 @@ 26 27 /* $Id$ */ 28 29-#ifndef ZEND_API 30- 31 #if defined(__GNUC__) && __GNUC__ >= 4 32 # define ZEND_API __attribute__ ((visibility("default"))) 33 # define ZEND_DLEXPORT __attribute__ ((visibility("default"))) 34@@ -122,29 +120,6 @@ 35 #endif 36 37 /* 38- * Darwin's GCC can generate multiple architectures in a single pass so the size and 39- * byte order will only be accurate for the one architecture that happened to invoke 40- * configure. 41- */ 42-#ifdef __DARWIN_BYTE_ORDER 43-#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN 44-# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN) 45-# define WORDS_BIGENDIAN 1 46-# endif 47-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG 48-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T 49-# ifdef __LP64__ 50-#/* This symbol should not be modified by configure. */ define SIZEOF_LONG 8 51-#/* This symbol should not be modified by configure. */ define SIZEOF_SIZE_T 8 52-# else 53-#/* This symbol should not be modified by configure. */ define SIZEOF_LONG 4 54-#/* This symbol should not be modified by configure. */ define SIZEOF_SIZE_T 4 55-# endif 56-#endif 57- 58-#endif /* ZEND_API */ 59- 60-/* 61 * Local variables: 62 * tab-width: 4 63 * c-basic-offset: 4 64diff -Naur php-5.3.23-patch1/acinclude.m4 php-5.3.23-patch2/acinclude.m4 65--- php-5.3.23-patch1/acinclude.m4 2013-04-04 21:26:53.000000000 -0700 66+++ php-5.3.23-patch2/acinclude.m4 2013-04-04 21:36:54.000000000 -0700 67@@ -194,7 +194,7 @@ 68 dnl 69 dnl which array to append to? 70 AC_DEFUN([PHP_ADD_SOURCES],[ 71- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) 72+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)) 73 ]) 74 75 dnl 76@@ -772,7 +772,7 @@ 77 AC_DEFUN([PHP_BUILD_SHARED],[ 78 PHP_BUILD_PROGRAM 79 OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] 80- php_build_target=shared 81+ php_sapi_module=shared 82 83 php_c_pre=$shared_c_pre 84 php_c_meta=$shared_c_meta 85@@ -789,7 +789,7 @@ 86 AC_DEFUN([PHP_BUILD_STATIC],[ 87 PHP_BUILD_PROGRAM 88 OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] 89- php_build_target=static 90+ php_sapi_module=static 91 ]) 92 93 dnl 94@@ -798,14 +798,13 @@ 95 AC_DEFUN([PHP_BUILD_BUNDLE],[ 96 PHP_BUILD_PROGRAM 97 OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] 98- php_build_target=static 99+ php_sapi_module=static 100 ]) 101 102 dnl 103 dnl PHP_BUILD_PROGRAM 104 dnl 105 AC_DEFUN([PHP_BUILD_PROGRAM],[ 106- OVERALL_TARGET=[]ifelse($1,,php,$1) 107 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 108 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 109 php_c_post= 110@@ -826,8 +825,6 @@ 111 shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 112 shared_cxx_post= 113 shared_lo=lo 114- 115- php_build_target=program 116 ]) 117 118 dnl 119@@ -873,32 +870,45 @@ 120 dnl 121 dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]]) 122 dnl 123-dnl Selects the SAPI name and type (static, shared, programm) 124+dnl Selects the SAPI name and type (static, shared, bundle, program) 125 dnl and optionally also the source-files for the SAPI-specific 126 dnl objects. 127 dnl 128 AC_DEFUN([PHP_SELECT_SAPI],[ 129- if test "$PHP_SAPI" != "default"; then 130-AC_MSG_ERROR([ 131+ if test "$2" = "program"; then 132+ PHP_BINARIES="$PHP_BINARIES $1" 133+ elif test "$PHP_SAPI" != "none"; then 134+ AC_MSG_ERROR([ 135 +--------------------------------------------------------------------+ 136 | *** ATTENTION *** | 137 | | 138 | You've configured multiple SAPIs to be build. You can build only | 139-| one SAPI module and CLI binary at the same time. | 140+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 141 +--------------------------------------------------------------------+ 142 ]) 143- fi 144+ else 145+ PHP_SAPI=$1 146+ fi 147 148- PHP_SAPI=$1 149- 150- case "$2" in 151- static[)] PHP_BUILD_STATIC;; 152- shared[)] PHP_BUILD_SHARED;; 153- bundle[)] PHP_BUILD_BUNDLE;; 154- program[)] PHP_BUILD_PROGRAM($5);; 155- esac 156- 157- ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])]) 158+ PHP_ADD_BUILD_DIR([sapi/$1]) 159+ 160+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1" 161+ 162+ ifelse($2,program,[ 163+ PHP_BUILD_PROGRAM 164+ install_binaries="install-binaries" 165+ install_binary_targets="$install_binary_targets install-$1" 166+ PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS) 167+ ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)]) 168+ ],[ 169+ case "$2" in 170+ static[)] PHP_BUILD_STATIC;; 171+ shared[)] PHP_BUILD_SHARED;; 172+ bundle[)] PHP_BUILD_BUNDLE;; 173+ esac 174+ install_sapi="install-sapi" 175+ ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])]) 176+ ]) 177 ]) 178 179 dnl deprecated 180diff -Naur php-5.3.23-patch1/aclocal.m4 php-5.3.23-patch2/aclocal.m4 181--- php-5.3.23-patch1/aclocal.m4 2013-04-04 21:26:53.000000000 -0700 182+++ php-5.3.23-patch2/aclocal.m4 2013-04-04 21:36:54.000000000 -0700 183@@ -194,7 +194,7 @@ 184 dnl 185 dnl which array to append to? 186 AC_DEFUN([PHP_ADD_SOURCES],[ 187- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) 188+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)) 189 ]) 190 191 dnl 192@@ -772,7 +772,7 @@ 193 AC_DEFUN([PHP_BUILD_SHARED],[ 194 PHP_BUILD_PROGRAM 195 OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] 196- php_build_target=shared 197+ php_sapi_module=shared 198 199 php_c_pre=$shared_c_pre 200 php_c_meta=$shared_c_meta 201@@ -789,7 +789,7 @@ 202 AC_DEFUN([PHP_BUILD_STATIC],[ 203 PHP_BUILD_PROGRAM 204 OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] 205- php_build_target=static 206+ php_sapi_module=static 207 ]) 208 209 dnl 210@@ -798,14 +798,13 @@ 211 AC_DEFUN([PHP_BUILD_BUNDLE],[ 212 PHP_BUILD_PROGRAM 213 OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] 214- php_build_target=static 215+ php_sapi_module=static 216 ]) 217 218 dnl 219 dnl PHP_BUILD_PROGRAM 220 dnl 221 AC_DEFUN([PHP_BUILD_PROGRAM],[ 222- OVERALL_TARGET=[]ifelse($1,,php,$1) 223 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 224 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 225 php_c_post= 226@@ -826,8 +825,6 @@ 227 shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 228 shared_cxx_post= 229 shared_lo=lo 230- 231- php_build_target=program 232 ]) 233 234 dnl 235@@ -873,32 +870,45 @@ 236 dnl 237 dnl PHP_SELECT_SAPI(name, type[, sources [, extra-cflags [, build-target]]]) 238 dnl 239-dnl Selects the SAPI name and type (static, shared, programm) 240+dnl Selects the SAPI name and type (static, shared, bundle, program) 241 dnl and optionally also the source-files for the SAPI-specific 242 dnl objects. 243 dnl 244 AC_DEFUN([PHP_SELECT_SAPI],[ 245- if test "$PHP_SAPI" != "default"; then 246-AC_MSG_ERROR([ 247+ if test "$2" = "program"; then 248+ PHP_BINARIES="$PHP_BINARIES $1" 249+ elif test "$PHP_SAPI" != "none"; then 250+ AC_MSG_ERROR([ 251 +--------------------------------------------------------------------+ 252 | *** ATTENTION *** | 253 | | 254 | You've configured multiple SAPIs to be build. You can build only | 255-| one SAPI module and CLI binary at the same time. | 256+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 257 +--------------------------------------------------------------------+ 258 ]) 259- fi 260+ else 261+ PHP_SAPI=$1 262+ fi 263 264- PHP_SAPI=$1 265- 266- case "$2" in 267- static[)] PHP_BUILD_STATIC;; 268- shared[)] PHP_BUILD_SHARED;; 269- bundle[)] PHP_BUILD_BUNDLE;; 270- program[)] PHP_BUILD_PROGRAM($5);; 271- esac 272- 273- ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])]) 274+ PHP_ADD_BUILD_DIR([sapi/$1]) 275+ 276+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS $1" 277+ 278+ ifelse($2,program,[ 279+ PHP_BUILD_PROGRAM 280+ install_binaries="install-binaries" 281+ install_binary_targets="$install_binary_targets install-$1" 282+ PHP_SUBST(PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS) 283+ ifelse($3,,,[PHP_ADD_SOURCES_X([sapi/$1],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_)[]_OBJS)]) 284+ ],[ 285+ case "$2" in 286+ static[)] PHP_BUILD_STATIC;; 287+ shared[)] PHP_BUILD_SHARED;; 288+ bundle[)] PHP_BUILD_BUNDLE;; 289+ esac 290+ install_sapi="install-sapi" 291+ ifelse($3,,,[PHP_ADD_SOURCES([sapi/$1],[$3],[$4],[sapi])]) 292+ ]) 293 ]) 294 295 dnl deprecated 296diff -Naur php-5.3.23-patch1/configure php-5.3.23-patch2/configure 297--- php-5.3.23-patch1/configure 2013-04-04 21:27:40.000000000 -0700 298+++ php-5.3.23-patch2/configure 2013-04-04 21:38:08.000000000 -0700 299@@ -22,273 +22,1202 @@ 300 301 302 303-# Forbidden tokens and exceptions. 304 305 306 307-# Actually reserved by M4sh. 308 309-# All the M4sugar macros start with `m4_', except `dnl' kept as is 310-# for sake of simplicity. 311 312 313 314-# Check the divert push/pop perfect balance. 315 316 317-# Guess values for system-dependent variables and create Makefiles. 318-# Generated by GNU Autoconf 2.59. 319 320 321 322 323-# 324-# Copyright (C) 2003 Free Software Foundation, Inc. 325-# This configure script is free software; the Free Software Foundation 326-# gives unlimited permission to copy, distribute and modify it. 327 328 329 330 331 332-## --------------------- ## 333-## M4sh Initialization. ## 334-## --------------------- ## 335- 336-# Be Bourne compatible 337-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 338- emulate sh 339- NULLCMD=: 340- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which 341- # is contrary to our usage. Disable this feature. 342- alias -g '${1+"$@"}'='"$@"' 343-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then 344- set -o posix 345-fi 346-DUALCASE=1; export DUALCASE # for MKS sh 347- 348-# Support unset when possible. 349-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then 350- as_unset=unset 351-else 352- as_unset=false 353-fi 354 355 356-# Work around bugs in pre-3.0 UWIN ksh. 357-$as_unset ENV MAIL MAILPATH 358-PS1='$ ' 359-PS2='> ' 360-PS4='+ ' 361 362-# NLS nuisances. 363-for as_var in \ 364- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ 365- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ 366- LC_TELEPHONE LC_TIME 367-do 368- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then 369- eval $as_var=C; export $as_var 370- else 371- $as_unset $as_var 372- fi 373-done 374 375-# Required to use basename. 376-if expr a : '\(a\)' >/dev/null 2>&1; then 377- as_expr=expr 378-else 379- as_expr=false 380-fi 381 382-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then 383- as_basename=basename 384-else 385- as_basename=false 386-fi 387 388 389-# Name of the executable. 390-as_me=`$as_basename "$0" || 391-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ 392- X"$0" : 'X\(//\)$' \| \ 393- X"$0" : 'X\(/\)$' \| \ 394- . : '\(.\)' 2>/dev/null || 395-echo X/"$0" | 396- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } 397- /^X\/\(\/\/\)$/{ s//\1/; q; } 398- /^X\/\(\/\).*/{ s//\1/; q; } 399- s/.*/./; q'` 400 401 402-# PATH needs CR, and LINENO needs CR and PATH. 403-# Avoid depending upon Character Ranges. 404-as_cr_letters='abcdefghijklmnopqrstuvwxyz' 405-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' 406-as_cr_Letters=$as_cr_letters$as_cr_LETTERS 407-as_cr_digits='0123456789' 408-as_cr_alnum=$as_cr_Letters$as_cr_digits 409 410-# The user is always right. 411-if test "${PATH_SEPARATOR+set}" != set; then 412- echo "#! /bin/sh" >conf$$.sh 413- echo "exit 0" >>conf$$.sh 414- chmod +x conf$$.sh 415- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 416- PATH_SEPARATOR=';' 417- else 418- PATH_SEPARATOR=: 419- fi 420- rm -f conf$$.sh 421-fi 422 423 424- as_lineno_1=$LINENO 425- as_lineno_2=$LINENO 426- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 427- test "x$as_lineno_1" != "x$as_lineno_2" && 428- test "x$as_lineno_3" = "x$as_lineno_2" || { 429- # Find who we are. Look in the path if we contain no path at all 430- # relative or not. 431- case $0 in 432- *[\\/]* ) as_myself=$0 ;; 433- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 434-for as_dir in $PATH 435-do 436- IFS=$as_save_IFS 437- test -z "$as_dir" && as_dir=. 438- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 439-done 440 441- ;; 442- esac 443- # We did not find ourselves, most probably we were run as `sh COMMAND' 444- # in which case we are not to be found in the path. 445- if test "x$as_myself" = x; then 446- as_myself=$0 447- fi 448- if test ! -f "$as_myself"; then 449- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 450- { (exit 1); exit 1; }; } 451- fi 452- case $CONFIG_SHELL in 453- '') 454- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 455-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 456-do 457- IFS=$as_save_IFS 458- test -z "$as_dir" && as_dir=. 459- for as_base in sh bash ksh sh5; do 460- case $as_dir in 461- /*) 462- if ("$as_dir/$as_base" -c ' 463- as_lineno_1=$LINENO 464- as_lineno_2=$LINENO 465- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 466- test "x$as_lineno_1" != "x$as_lineno_2" && 467- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then 468- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } 469- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } 470- CONFIG_SHELL=$as_dir/$as_base 471- export CONFIG_SHELL 472- exec "$CONFIG_SHELL" "$0" ${1+"$@"} 473- fi;; 474- esac 475- done 476-done 477-;; 478- esac 479 480- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO 481- # uniformly replaced by the line number. The first 'sed' inserts a 482- # line-number line before each line; the second 'sed' does the real 483- # work. The second script uses 'N' to pair each line-number line 484- # with the numbered line, and appends trailing '-' during 485- # substitution so that $LINENO is not a special case at line end. 486- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the 487- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) 488- sed '=' <$as_myself | 489- sed ' 490- N 491- s,$,-, 492- : loop 493- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, 494- t loop 495- s,-$,, 496- s,^['$as_cr_digits']*\n,, 497- ' >$as_me.lineno && 498- chmod +x $as_me.lineno || 499- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 500- { (exit 1); exit 1; }; } 501- 502- # Don't try to exec as it changes $[0], causing all sort of problems 503- # (the dirname of $[0] is not the place where we might find the 504- # original and so on. Autoconf is especially sensible to this). 505- . ./$as_me.lineno 506- # Exit status is that of the last command. 507- exit 508-} 509 510 511-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in 512- *c*,-n*) ECHO_N= ECHO_C=' 513-' ECHO_T=' ' ;; 514- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; 515- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; 516-esac 517 518-if expr a : '\(a\)' >/dev/null 2>&1; then 519- as_expr=expr 520-else 521- as_expr=false 522-fi 523 524-rm -f conf$$ conf$$.exe conf$$.file 525-echo >conf$$.file 526-if ln -s conf$$.file conf$$ 2>/dev/null; then 527- # We could just check for DJGPP; but this test a) works b) is more generic 528- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). 529- if test -f conf$$.exe; then 530- # Don't use ln at all; we don't have any links 531- as_ln_s='cp -p' 532- else 533- as_ln_s='ln -s' 534- fi 535-elif ln conf$$.file conf$$ 2>/dev/null; then 536- as_ln_s=ln 537-else 538- as_ln_s='cp -p' 539-fi 540-rm -f conf$$ conf$$.exe conf$$.file 541 542-if mkdir -p . 2>/dev/null; then 543- as_mkdir_p=: 544-else 545- test -d ./-p && rmdir ./-p 546- as_mkdir_p=false 547+ 548+ 549+ 550+ 551+ 552+ 553+ 554+ 555+ 556+ 557+ 558+ 559+ 560+ 561+ 562+ 563+ 564+ 565+ 566+ 567+ 568+ 569+ 570+ 571+ 572+ 573+ 574+ 575+ 576+ 577+ 578+ 579+ 580+ 581+ 582+ 583+ 584+ 585+ 586+ 587+ 588+ 589+ 590+ 591+ 592+ 593+ 594+ 595+ 596+ 597+ 598+ 599+ 600+ 601+ 602+ 603+ 604+ 605+ 606+ 607+ 608+ 609+ 610+ 611+ 612+ 613+ 614+ 615+ 616+ 617+ 618+ 619+ 620+ 621+ 622+ 623+ 624+ 625+ 626+ 627+ 628+ 629+ 630+ 631+ 632+ 633+ 634+ 635+ 636+ 637+ 638+ 639+ 640+ 641+ 642+ 643+ 644+ 645+ 646+ 647+ 648+ 649+ 650+ 651+ 652+ 653+ 654+ 655+ 656+ 657+ 658+ 659+ 660+ 661+ 662+ 663+ 664+ 665+ 666+ 667+ 668+ 669+ 670+ 671+ 672+ 673+ 674+ 675+ 676+ 677+ 678+ 679+ 680+ 681+ 682+ 683+ 684+ 685+ 686+ 687+ 688+ 689+ 690+ 691+ 692+ 693+ 694+ 695+ 696+ 697+ 698+ 699+ 700+ 701+ 702+ 703+ 704+ 705+ 706+ 707+ 708+ 709+ 710+ 711+ 712+ 713+ 714+ 715+ 716+ 717+ 718+ 719+ 720+ 721+ 722+ 723+ 724+ 725+ 726+ 727+ 728+ 729+ 730+ 731+ 732+ 733+ 734+ 735+ 736+ 737+ 738+ 739+ 740+ 741+ 742+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 743+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 744+## 2008 Free Software Foundation, Inc. 745+## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 746+## 747+## This file is free software; the Free Software Foundation gives 748+## unlimited permission to copy and/or distribute it, with or without 749+## modifications, as long as this notice is preserved. 750+ 751+# serial 52 AC_PROG_LIBTOOL 752+ 753+ 754+# autoconf 2.13 compatibility 755+# Set PATH_SEPARATOR variable 756+# --------------------------------- 757+# Find the correct PATH separator. Usually this is :', but 758+# DJGPP uses ;' like DOS. 759+if test "X${PATH_SEPARATOR+set}" != Xset; then 760+ UNAME=${UNAME-`uname 2>/dev/null`} 761+ case X$UNAME in 762+ *-DOS) lt_cv_sys_path_separator=';' ;; 763+ *) lt_cv_sys_path_separator=':' ;; 764+ esac 765+ PATH_SEPARATOR=$lt_cv_sys_path_separator 766 fi 767 768-as_executable_p="test -f" 769 770-# Sed expression to map a string onto a valid CPP name. 771-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 772+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) 773+# ----------------------------------------------------------- 774+# If this macro is not defined by Autoconf, define it here. 775+ 776+ 777+# AC_PROG_LIBTOOL 778+# --------------- 779+# AC_PROG_LIBTOOL 780+ 781+ 782+# _AC_PROG_LIBTOOL 783+# ---------------- 784+# _AC_PROG_LIBTOOL 785+ 786+ 787+# AC_LIBTOOL_SETUP 788+# ---------------- 789+# AC_LIBTOOL_SETUP 790+ 791+ 792+# _LT_AC_SYS_COMPILER 793+# ------------------- 794+# _LT_AC_SYS_COMPILER 795+ 796+ 797+# _LT_CC_BASENAME(CC) 798+# ------------------- 799+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. 800+ 801+ 802+ 803+# _LT_COMPILER_BOILERPLATE 804+# ------------------------ 805+# Check for compiler boilerplate output or warnings with 806+# the simple compiler test code. 807+# _LT_COMPILER_BOILERPLATE 808+ 809+ 810+# _LT_LINKER_BOILERPLATE 811+# ---------------------- 812+# Check for linker boilerplate output or warnings with 813+# the simple link test code. 814+# _LT_LINKER_BOILERPLATE 815+ 816+ 817 818-# Sed expression to map a string onto a valid variable name. 819-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" 820 821+# _LT_REQUIRED_DARWIN_CHECKS 822+# -------------------------- 823+# Check for some things on darwin 824 825-# IFS 826-# We need space, tab and new line, in precisely that order. 827-as_nl=' 828-' 829-IFS=" $as_nl" 830 831-# CDPATH. 832-$as_unset CDPATH 833+# _LT_AC_SYS_LIBPATH_AIX 834+# ---------------------- 835+# Links a minimal program and checks the executable 836+# for the system default hardcoded library path. In most cases, 837+# this is /usr/lib:/lib, but when the MPI compilers are used 838+# the location of the communication and MPI libs are included too. 839+# If we don't find anything, use the default library path according 840+# to the aix ld manual. 841+# _LT_AC_SYS_LIBPATH_AIX 842 843 844+# _LT_AC_SHELL_INIT(ARG) 845+# ---------------------- 846+# _LT_AC_SHELL_INIT 847 848 849+# _LT_AC_PROG_ECHO_BACKSLASH 850+# -------------------------- 851+# Add some code to the start of the generated configure script which 852+# will find an echo command which doesn't interpret backslashes. 853+# _LT_AC_PROG_ECHO_BACKSLASH 854+ 855+ 856+# _LT_AC_LOCK 857+# ----------- 858+# _LT_AC_LOCK 859+ 860+ 861+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, 862+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) 863+# ---------------------------------------------------------------- 864+# Check whether the given compiler option works 865+# AC_LIBTOOL_COMPILER_OPTION 866+ 867+ 868+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, 869+# [ACTION-SUCCESS], [ACTION-FAILURE]) 870+# ------------------------------------------------------------ 871+# Check whether the given compiler option works 872+# AC_LIBTOOL_LINKER_OPTION 873+ 874+ 875+# AC_LIBTOOL_SYS_MAX_CMD_LEN 876+# -------------------------- 877+# AC_LIBTOOL_SYS_MAX_CMD_LEN 878+ 879+ 880+# _LT_AC_CHECK_DLFCN 881+# ------------------ 882+# _LT_AC_CHECK_DLFCN 883+ 884+ 885+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, 886+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) 887+# --------------------------------------------------------------------- 888+# _LT_AC_TRY_DLOPEN_SELF 889+ 890+ 891+# AC_LIBTOOL_DLOPEN_SELF 892+# ---------------------- 893+# AC_LIBTOOL_DLOPEN_SELF 894+ 895+ 896+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) 897+# --------------------------------- 898+# Check to see if options -c and -o are simultaneously supported by compiler 899+# AC_LIBTOOL_PROG_CC_C_O 900+ 901+ 902+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) 903+# ----------------------------------------- 904+# Check to see if we can do hard links to lock some files if needed 905+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS 906+ 907+ 908+# AC_LIBTOOL_OBJDIR 909+# ----------------- 910+# AC_LIBTOOL_OBJDIR 911+ 912+ 913+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) 914+# ---------------------------------------------- 915+# Check hardcoding attributes. 916+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH 917+ 918+ 919+# AC_LIBTOOL_SYS_LIB_STRIP 920+# ------------------------ 921+# AC_LIBTOOL_SYS_LIB_STRIP 922+ 923+ 924+# AC_LIBTOOL_SYS_DYNAMIC_LINKER 925+# ----------------------------- 926+# PORTME Fill in your ld.so characteristics 927+# AC_LIBTOOL_SYS_DYNAMIC_LINKER 928+ 929+ 930+# _LT_AC_TAGCONFIG 931+# ---------------- 932+# _LT_AC_TAGCONFIG 933+ 934+ 935+# AC_LIBTOOL_DLOPEN 936+# ----------------- 937+# enable checks for dlopen support 938+# AC_LIBTOOL_DLOPEN 939+ 940+ 941+# AC_LIBTOOL_WIN32_DLL 942+# -------------------- 943+# declare package support for building win32 DLLs 944+# AC_LIBTOOL_WIN32_DLL 945+ 946+ 947+# AC_ENABLE_SHARED([DEFAULT]) 948+# --------------------------- 949+# implement the --enable-shared flag 950+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. 951+# AC_ENABLE_SHARED 952+ 953+ 954+# AC_DISABLE_SHARED 955+# ----------------- 956+# set the default shared flag to --disable-shared 957+# AC_DISABLE_SHARED 958+ 959+ 960+# AC_ENABLE_STATIC([DEFAULT]) 961+# --------------------------- 962+# implement the --enable-static flag 963+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. 964+# AC_ENABLE_STATIC 965+ 966+ 967+# AC_DISABLE_STATIC 968+# ----------------- 969+# set the default static flag to --disable-static 970+# AC_DISABLE_STATIC 971+ 972+ 973+# AC_ENABLE_FAST_INSTALL([DEFAULT]) 974+# --------------------------------- 975+# implement the --enable-fast-install flag 976+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. 977+# AC_ENABLE_FAST_INSTALL 978+ 979+ 980+# AC_DISABLE_FAST_INSTALL 981+# ----------------------- 982+# set the default to --disable-fast-install 983+# AC_DISABLE_FAST_INSTALL 984+ 985+ 986+# AC_LIBTOOL_PICMODE([MODE]) 987+# -------------------------- 988+# implement the --with-pic flag 989+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. 990+# AC_LIBTOOL_PICMODE 991+ 992+ 993+# AC_PROG_EGREP 994+# ------------- 995+ 996+ 997+ 998+# AC_PATH_TOOL_PREFIX 999+# ------------------- 1000+# find a file program which can recognize shared library 1001+# AC_PATH_TOOL_PREFIX 1002+ 1003+ 1004+# AC_PATH_MAGIC 1005+# ------------- 1006+# find a file program which can recognize a shared library 1007+# AC_PATH_MAGIC 1008+ 1009+ 1010+# AC_PROG_LD 1011+# ---------- 1012+# find the pathname to the GNU or non-GNU linker 1013+# AC_PROG_LD 1014+ 1015+ 1016+# AC_PROG_LD_GNU 1017+# -------------- 1018+# AC_PROG_LD_GNU 1019+ 1020+ 1021+# AC_PROG_LD_RELOAD_FLAG 1022+# ---------------------- 1023+# find reload flag for linker 1024+# -- PORTME Some linkers may need a different reload flag. 1025+# AC_PROG_LD_RELOAD_FLAG 1026+ 1027+ 1028+# AC_DEPLIBS_CHECK_METHOD 1029+# ----------------------- 1030+# how to check for library dependencies 1031+# -- PORTME fill in with the dynamic library characteristics 1032+# AC_DEPLIBS_CHECK_METHOD 1033+ 1034+ 1035+# AC_PROG_NM 1036+# ---------- 1037+# find the pathname to a BSD-compatible name lister 1038+# AC_PROG_NM 1039+ 1040+ 1041+# AC_CHECK_LIBM 1042+# ------------- 1043+# check for math library 1044+# AC_CHECK_LIBM 1045+ 1046+ 1047+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) 1048+# ----------------------------------- 1049+# sets LIBLTDL to the link flags for the libltdl convenience library and 1050+# LTDLINCL to the include flags for the libltdl header and adds 1051+# --enable-ltdl-convenience to the configure arguments. Note that 1052+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, 1053+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with 1054+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' 1055+# (note the single quotes!). If your package is not flat and you're not 1056+# using automake, define top_builddir and top_srcdir appropriately in 1057+# the Makefiles. 1058+# AC_LIBLTDL_CONVENIENCE 1059+ 1060+ 1061+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) 1062+# ----------------------------------- 1063+# sets LIBLTDL to the link flags for the libltdl installable library and 1064+# LTDLINCL to the include flags for the libltdl header and adds 1065+# --enable-ltdl-install to the configure arguments. Note that 1066+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, 1067+# and an installed libltdl is not found, it is assumed to be `libltdl'. 1068+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with 1069+# '${top_srcdir}/' (note the single quotes!). If your package is not 1070+# flat and you're not using automake, define top_builddir and top_srcdir 1071+# appropriately in the Makefiles. 1072+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. 1073+# AC_LIBLTDL_INSTALLABLE 1074+ 1075+ 1076+# AC_LIBTOOL_CXX 1077+# -------------- 1078+# enable support for C++ libraries 1079+# AC_LIBTOOL_CXX 1080+ 1081+ 1082+# _LT_AC_LANG_CXX 1083+# --------------- 1084+# _LT_AC_LANG_CXX 1085+ 1086+# _LT_AC_PROG_CXXCPP 1087+# ------------------ 1088+# _LT_AC_PROG_CXXCPP 1089+ 1090+# AC_LIBTOOL_LANG_C_CONFIG 1091+# ------------------------ 1092+# Ensure that the configuration vars for the C compiler are 1093+# suitably defined. Those variables are subsequently used by 1094+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. 1095+ 1096+# AC_LIBTOOL_LANG_C_CONFIG 1097+ 1098+ 1099+# AC_LIBTOOL_LANG_CXX_CONFIG 1100+# -------------------------- 1101+# Ensure that the configuration vars for the C compiler are 1102+# suitably defined. Those variables are subsequently used by 1103+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. 1104+ 1105+# AC_LIBTOOL_LANG_CXX_CONFIG 1106+ 1107+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) 1108+# ------------------------------------ 1109+# Figure out "hidden" library dependencies from verbose 1110+# compiler output when linking a shared library. 1111+# Parse the compiler output and extract the necessary 1112+# objects, libraries and library flags. 1113+# AC_LIBTOOL_POSTDEP_PREDEP 1114+ 1115+# AC_LIBTOOL_CONFIG([TAGNAME]) 1116+# ---------------------------- 1117+# If TAGNAME is not passed, then create an initial libtool script 1118+# with a default configuration from the untagged config vars. Otherwise 1119+# add code to config.status for appending the configuration named by 1120+# TAGNAME from the matching tagged config vars. 1121+# AC_LIBTOOL_CONFIG 1122+ 1123+ 1124+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) 1125+# ------------------------------------------- 1126+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI 1127+ 1128+ 1129+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE 1130+# --------------------------------- 1131+ # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE 1132+ 1133+ 1134+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) 1135+# --------------------------------------- 1136+ 1137+ 1138+ 1139+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) 1140+# ------------------------------------ 1141+# See if the linker supports building shared libraries. 1142+# AC_LIBTOOL_PROG_LD_SHLIBS 1143+ 1144+ 1145+# _LT_AC_FILE_LTDLL_C 1146+# ------------------- 1147+# Be careful that the start marker always follows a newline. 1148+# _LT_AC_FILE_LTDLL_C 1149+ 1150+ 1151+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) 1152+# --------------------------------- 1153+ 1154+ 1155+ 1156+# old names 1157+ 1158+ 1159+ 1160+ 1161+ 1162+ 1163+ 1164+ 1165+# This is just to silence aclocal about the macro not being used 1166+ 1167+ 1168+############################################################ 1169+# NOTE: This macro has been submitted for inclusion into # 1170+# GNU Autoconf as AC_PROG_SED. When it is available in # 1171+# a released version of Autoconf we should remove this # 1172+# macro and use it instead. # 1173+############################################################ 1174+# LT_AC_PROG_SED 1175+# -------------- 1176+# Check for a fully-functional sed program, that truncates 1177+# as few characters as possible. Prefer GNU sed if found. 1178+ 1179+# Guess values for system-dependent variables and create Makefiles. 1180+# Generated automatically using autoconf version 2.13 1181+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. 1182+# 1183+# This configure script is free software; the Free Software Foundation 1184+# gives unlimited permission to copy, distribute and modify it. 1185+ 1186+# Defaults: 1187+ac_help= 1188+ac_default_prefix=/usr/local 1189+# Any additions from configure.in: 1190+ac_help="$ac_help 1191+ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib" 1192+ac_help="$ac_help 1193+ --disable-rpath Disable passing additional runtime library 1194+ search paths" 1195+ac_help="$ac_help 1196+ --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension" 1197+ac_help="$ac_help 1198+ 1199+SAPI modules: 1200+" 1201+ac_help="$ac_help 1202+ --with-aolserver=DIR Specify path to the installed AOLserver" 1203+ac_help="$ac_help 1204+ --with-apxs[=FILE] Build shared Apache 1.x module. FILE is the optional 1205+ pathname to the Apache apxs tool [apxs]" 1206+ac_help="$ac_help 1207+ --with-apache[=DIR] Build Apache 1.x module. DIR is the top-level Apache 1208+ build directory [/usr/local/apache]" 1209+ac_help="$ac_help 1210+ --enable-mod-charset APACHE: Enable transfer tables for mod_charset (Rus Apache)" 1211+ac_help="$ac_help 1212+ --with-apxs2filter[=FILE] 1213+ EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional 1214+ pathname to the Apache apxs tool [apxs]" 1215+ac_help="$ac_help 1216+ --with-apxs2[=FILE] Build shared Apache 2.0 Handler module. FILE is the optional 1217+ pathname to the Apache apxs tool [apxs]" 1218+ac_help="$ac_help 1219+ --with-apache-hooks[=FILE] 1220+ EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional 1221+ pathname to the Apache apxs tool [apxs]" 1222+ac_help="$ac_help 1223+ --with-apache-hooks-static[=DIR] 1224+ EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache 1225+ build directory [/usr/local/apache]" 1226+ac_help="$ac_help 1227+ --enable-mod-charset APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)" 1228+ac_help="$ac_help 1229+ --with-caudium[=DIR] Build PHP as a Pike module for use with Caudium. 1230+ DIR is the Caudium server dir [/usr/local/caudium/server]" 1231+ac_help="$ac_help 1232+ --disable-cli Disable building CLI version of PHP 1233+ (this forces --without-pear)" 1234+ac_help="$ac_help 1235+ --with-continuity=DIR Build PHP as Continuity Server module. 1236+ DIR is path to the installed Continuity Server root" 1237+ac_help="$ac_help 1238+ --enable-embed[=TYPE] EXPERIMENTAL: Enable building of embedded SAPI library 1239+ TYPE is either 'shared' or 'static'. [TYPE=shared]" 1240+ac_help="$ac_help 1241+ --enable-fpm EXPERIMENTAL: Enable building of the fpm SAPI executable" 1242+ac_help="$ac_help 1243+ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)" 1244+ac_help="$ac_help 1245+ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user, this 1246+ should usually be set to match the fpm username (default: nobody)" 1247+ac_help="$ac_help 1248+ --with-isapi[=DIR] Build PHP as an ISAPI module for use with Zeus" 1249+ac_help="$ac_help 1250+ --with-litespeed Build PHP as litespeed module" 1251+ac_help="$ac_help 1252+ --with-milter[=DIR] Build PHP as Milter application" 1253+ac_help="$ac_help 1254+ --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver" 1255+ac_help="$ac_help 1256+ --with-phttpd=DIR Build PHP as phttpd module" 1257+ac_help="$ac_help 1258+ --with-pi3web[=DIR] Build PHP as Pi3Web module" 1259+ac_help="$ac_help 1260+ --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen 1261+ directory, normally /usr/local/roxen/server" 1262+ac_help="$ac_help 1263+ --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety" 1264+ac_help="$ac_help 1265+ --with-thttpd=SRCDIR Build PHP as thttpd module" 1266+ac_help="$ac_help 1267+ --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)" 1268+ac_help="$ac_help 1269+ --with-webjames=SRCDIR Build PHP as a WebJames module (RISC OS only)" 1270+ac_help="$ac_help 1271+ --disable-cgi Disable building CGI version of PHP" 1272+ac_help="$ac_help 1273+ 1274+General settings: 1275+" 1276+ac_help="$ac_help 1277+ --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!!" 1278+ac_help="$ac_help 1279+ --enable-debug Compile with debugging symbols" 1280+ac_help="$ac_help 1281+ --with-layout=TYPE Set how installed files will be laid out. Type can 1282+ be either PHP or GNU [PHP]" 1283+ac_help="$ac_help 1284+ --with-config-file-path=PATH 1285+ Set the path in which to look for php.ini [PREFIX/lib]" 1286+ac_help="$ac_help 1287+ --with-config-file-scan-dir=PATH 1288+ Set the path where to scan for configuration files" 1289+ac_help="$ac_help 1290+ --enable-safe-mode Enable safe mode by default" 1291+ac_help="$ac_help 1292+ --with-exec-dir[=DIR] Only allow executables in DIR under safe-mode 1293+ [/usr/local/php/bin]" 1294+ac_help="$ac_help 1295+ --enable-sigchild Enable PHP's own SIGCHLD handler" 1296+ac_help="$ac_help 1297+ --enable-magic-quotes Enable magic quotes by default." 1298+ac_help="$ac_help 1299+ --enable-libgcc Enable explicitly linking against libgcc" 1300+ac_help="$ac_help 1301+ --disable-short-tags Disable the short-form <? start tag by default" 1302+ac_help="$ac_help 1303+ --enable-dmalloc Enable dmalloc" 1304+ac_help="$ac_help 1305+ --disable-ipv6 Disable IPv6 support" 1306+ac_help="$ac_help 1307+ --enable-fd-setsize Set size of descriptor sets" 1308+ac_help="$ac_help 1309+ 1310+Extensions: 1311+ 1312+ --with-EXTENSION=[shared[,PATH]] 1313+ 1314+ NOTE: Not all extensions can be build as 'shared'. 1315+ 1316+ Example: --with-foobar=shared,/usr/local/foobar/ 1317+ 1318+ o Builds the foobar extension as shared extension. 1319+ o foobar package install prefix is /usr/local/foobar/ 1320+ 1321+" 1322+ac_help="$ac_help 1323+ --disable-all Disable all extensions which are enabled by default 1324+" 1325+ac_help="$ac_help 1326+ --with-regex=TYPE regex library type: system, php. [TYPE=php] 1327+ WARNING: Do NOT use unless you know what you are doing!" 1328+ac_help="$ac_help 1329+ --disable-libxml Disable LIBXML support" 1330+ac_help="$ac_help 1331+ --with-libxml-dir[=DIR] LIBXML: libxml2 install prefix" 1332+ac_help="$ac_help 1333+ --with-openssl[=DIR] Include OpenSSL support (requires OpenSSL >= 0.9.6)" 1334+ac_help="$ac_help 1335+ --with-kerberos[=DIR] OPENSSL: Include Kerberos support" 1336+ac_help="$ac_help 1337+ --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support. 1338+ DIR is the PCRE install prefix [BUNDLED]" 1339+ac_help="$ac_help 1340+ --without-sqlite3[=DIR] Do not include SQLite3 support. DIR is the prefix to 1341+ SQLite3 installation directory." 1342+ac_help="$ac_help 1343+ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9)" 1344+ac_help="$ac_help 1345+ --with-zlib-dir=<DIR> Define the location of zlib install directory" 1346+ac_help="$ac_help 1347+ --enable-bcmath Enable bc style precision math functions" 1348+ac_help="$ac_help 1349+ --with-bz2[=DIR] Include BZip2 support" 1350+ac_help="$ac_help 1351+ --enable-calendar Enable support for calendar conversion" 1352+ac_help="$ac_help 1353+ --disable-ctype Disable ctype functions" 1354+ac_help="$ac_help 1355+ --with-curl[=DIR] Include cURL support" 1356+ac_help="$ac_help 1357+ --with-curlwrappers EXPERIMENTAL: Use cURL for url streams" 1358+ac_help="$ac_help 1359+ --enable-dba Build DBA with bundled modules. To build shared DBA 1360+ extension use --enable-dba=shared" 1361+ac_help="$ac_help 1362+ --with-qdbm[=DIR] DBA: QDBM support" 1363+ac_help="$ac_help 1364+ --with-gdbm[=DIR] DBA: GDBM support" 1365+ac_help="$ac_help 1366+ --with-ndbm[=DIR] DBA: NDBM support" 1367+ac_help="$ac_help 1368+ --with-db4[=DIR] DBA: Oracle Berkeley DB 4.x or 5.x support" 1369+ac_help="$ac_help 1370+ --with-db3[=DIR] DBA: Oracle Berkeley DB 3.x support" 1371+ac_help="$ac_help 1372+ --with-db2[=DIR] DBA: Oracle Berkeley DB 2.x support" 1373+ac_help="$ac_help 1374+ --with-db1[=DIR] DBA: Oracle Berkeley DB 1.x support/emulation" 1375+ac_help="$ac_help 1376+ --with-dbm[=DIR] DBA: DBM support" 1377+ac_help="$ac_help 1378+ --without-cdb[=DIR] DBA: CDB support (bundled)" 1379+ac_help="$ac_help 1380+ --disable-inifile DBA: INI support (bundled)" 1381+ac_help="$ac_help 1382+ --disable-flatfile DBA: FlatFile support (bundled)" 1383+ac_help="$ac_help 1384+ --disable-dom Disable DOM support" 1385+ac_help="$ac_help 1386+ --with-libxml-dir[=DIR] DOM: libxml2 install prefix" 1387+ac_help="$ac_help 1388+ --with-enchant[=DIR] Include enchant support. 1389+ GNU Aspell version 1.1.3 or higher required." 1390+ac_help="$ac_help 1391+ --enable-exif Enable EXIF (metadata from images) support" 1392+ac_help="$ac_help 1393+ --disable-fileinfo Disable fileinfo support" 1394+ac_help="$ac_help 1395+ --disable-filter Disable input filter support" 1396+ac_help="$ac_help 1397+ --with-pcre-dir FILTER: pcre install prefix" 1398+ac_help="$ac_help 1399+ --enable-ftp Enable FTP support" 1400+ac_help="$ac_help 1401+ --with-openssl-dir[=DIR] FTP: openssl install prefix" 1402+ac_help="$ac_help 1403+ --with-gd[=DIR] Include GD support. DIR is the GD library base 1404+ install directory [BUNDLED]" 1405+ac_help="$ac_help 1406+ --with-jpeg-dir[=DIR] GD: Set the path to libjpeg install prefix" 1407+ac_help="$ac_help 1408+ --with-png-dir[=DIR] GD: Set the path to libpng install prefix" 1409+ac_help="$ac_help 1410+ --with-zlib-dir[=DIR] GD: Set the path to libz install prefix" 1411+ac_help="$ac_help 1412+ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix" 1413+ac_help="$ac_help 1414+ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix" 1415+ac_help="$ac_help 1416+ --with-t1lib[=DIR] GD: Include T1lib support. T1lib version >= 5.0.0 required" 1417+ac_help="$ac_help 1418+ --enable-gd-native-ttf GD: Enable TrueType string function" 1419+ac_help="$ac_help 1420+ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support" 1421+ac_help="$ac_help 1422+ --with-gettext[=DIR] Include GNU gettext support" 1423+ac_help="$ac_help 1424+ --with-gmp[=DIR] Include GNU MP support" 1425+ac_help="$ac_help 1426+ --with-mhash[=DIR] Include mhash support" 1427+ac_help="$ac_help 1428+ --disable-hash Disable hash support" 1429+ac_help="$ac_help 1430+ --without-iconv[=DIR] Exclude iconv support" 1431+ac_help="$ac_help 1432+ --with-imap[=DIR] Include IMAP support. DIR is the c-client install prefix" 1433+ac_help="$ac_help 1434+ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install prefix" 1435+ac_help="$ac_help 1436+ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix" 1437+ac_help="$ac_help 1438+ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base 1439+ install directory [/usr/interbase]" 1440+ac_help="$ac_help 1441+ --enable-intl Enable internationalization support" 1442+ac_help="$ac_help 1443+ --with-icu-dir=DIR Specify where ICU libraries and headers can be found" 1444+ac_help="$ac_help 1445+ --disable-json Disable JavaScript Object Serialization support" 1446+ac_help="$ac_help 1447+ --with-ldap[=DIR] Include LDAP support" 1448+ac_help="$ac_help 1449+ --with-ldap-sasl[=DIR] LDAP: Include Cyrus SASL support" 1450+ac_help="$ac_help 1451+ --enable-mbstring Enable multibyte string support" 1452+ac_help="$ac_help 1453+ --disable-mbregex MBSTRING: Disable multibyte regex support" 1454+ac_help="$ac_help 1455+ --disable-mbregex-backtrack 1456+ MBSTRING: Disable multibyte regex backtrack check" 1457+ac_help="$ac_help 1458+ --with-libmbfl[=DIR] MBSTRING: Use external libmbfl. DIR is the libmbfl base 1459+ install directory [BUNDLED]" 1460+ac_help="$ac_help 1461+ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. 1462+ If DIR is not set, the bundled oniguruma will be used" 1463+ac_help="$ac_help 1464+ --with-mcrypt[=DIR] Include mcrypt support" 1465+ac_help="$ac_help 1466+ --with-mssql[=DIR] Include MSSQL-DB support. DIR is the FreeTDS home 1467+ directory [/usr/local/freetds]" 1468+ac_help="$ac_help 1469+ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base 1470+ directory. If mysqlnd is passed as DIR, 1471+ the MySQL native driver will be used [/usr/local]" 1472+ac_help="$ac_help 1473+ --with-mysql-sock[=DIR] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. 1474+ If unspecified, the default locations are searched" 1475+ac_help="$ac_help 1476+ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix" 1477+ac_help="$ac_help 1478+ --with-mysqli[=FILE] Include MySQLi support. FILE is the path 1479+ to mysql_config. If mysqlnd is passed as FILE, 1480+ the MySQL native driver will be used [mysql_config]" 1481+ac_help="$ac_help 1482+ --enable-embedded-mysqli MYSQLi: Enable embedded support 1483+ Note: Does not work with MySQL native driver!" 1484+ac_help="$ac_help 1485+ --with-oci8[=DIR] Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME. 1486+ Use --with-oci8=instantclient,/path/to/instant/client/lib 1487+ to use an Oracle Instant Client installation" 1488+ac_help="$ac_help 1489+ --with-adabas[=DIR] Include Adabas D support [/usr/local]" 1490+ac_help="$ac_help 1491+ --with-sapdb[=DIR] Include SAP DB support [/usr/local]" 1492+ac_help="$ac_help 1493+ --with-solid[=DIR] Include Solid support [/usr/local/solid]" 1494+ac_help="$ac_help 1495+ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]" 1496+ac_help="$ac_help 1497+ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]" 1498+ac_help="$ac_help 1499+ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] 1500+ (Empress Version >= 8.60 required)" 1501+ac_help="$ac_help 1502+ --with-empress-bcs[=DIR] 1503+ Include Empress Local Access support [\$EMPRESSPATH] 1504+ (Empress Version >= 8.60 required)" 1505+ac_help="$ac_help 1506+ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]" 1507+ac_help="$ac_help 1508+ --with-custom-odbc[=DIR] 1509+ Include user defined ODBC support. DIR is ODBC install base 1510+ directory [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and 1511+ have some odbc.h in your include dirs. f.e. you should define 1512+ following for Sybase SQL Anywhere 5.5.00 on QNX, prior to 1513+ running this configure script: 1514+ CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" 1515+ LDFLAGS=-lunix 1516+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"" 1517+ac_help="$ac_help 1518+ --with-iodbc[=DIR] Include iODBC support [/usr/local]" 1519+ac_help="$ac_help 1520+ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]" 1521+ac_help="$ac_help 1522+ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]" 1523+ac_help="$ac_help 1524+ --with-dbmaker[=DIR] Include DBMaker support" 1525+ac_help="$ac_help 1526+ --enable-pcntl Enable pcntl support (CLI/CGI only)" 1527+ac_help="$ac_help 1528+ --disable-pdo Disable PHP Data Objects support" 1529+ac_help="$ac_help 1530+ --with-pdo-dblib[=DIR] PDO: DBLIB-DB support. DIR is the FreeTDS home directory" 1531+ac_help="$ac_help 1532+ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base 1533+ install directory [/opt/firebird]" 1534+ac_help="$ac_help 1535+ --with-pdo-mysql[=DIR] PDO: MySQL support. DIR is the MySQL base directory 1536+ If mysqlnd is passed as DIR, the MySQL native 1537+ native driver will be used [/usr/local]" 1538+ac_help="$ac_help 1539+ --with-zlib-dir[=DIR] PDO_MySQL: Set the path to libz install prefix" 1540+ac_help="$ac_help 1541+ --with-pdo-oci[=DIR] PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME. 1542+ Use --with-pdo-oci=instantclient,prefix,version 1543+ for an Oracle Instant Client SDK. 1544+ For example on Linux with 11.2 RPMs use: 1545+ --with-pdo-oci=instantclient,/usr,11.2 1546+ With 10.2 RPMs use: 1547+ --with-pdo-oci=instantclient,/usr,10.2.0.4" 1548+ac_help="$ac_help 1549+ --with-pdo-odbc=flavour,dir 1550+ PDO: Support for 'flavour' ODBC driver. 1551+ include and lib dirs are looked for under 'dir'. 1552+ 1553+ 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic 1554+ If ',dir' part is omitted, default for the flavour 1555+ you have selected will used. e.g.: 1556+ 1557+ --with-pdo-odbc=unixODBC 1558+ 1559+ will check for unixODBC under /usr/local. You may attempt 1560+ to use an otherwise unsupported driver using the \"generic\" 1561+ flavour. The syntax for generic ODBC support is: 1562+ 1563+ --with-pdo-odbc=generic,dir,libname,ldflags,cflags 1564+ 1565+ When build as shared the extension filename is always pdo_odbc.so" 1566+ac_help="$ac_help 1567+ --with-pdo-pgsql[=DIR] PDO: PostgreSQL support. DIR is the PostgreSQL base 1568+ install directory or the path to pg_config" 1569+ac_help="$ac_help 1570+ --without-pdo-sqlite[=DIR] 1571+ PDO: sqlite 3 support. DIR is the sqlite base 1572+ install directory [BUNDLED]" 1573+ac_help="$ac_help 1574+ --with-pgsql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL 1575+ base install directory or the path to pg_config" 1576+ac_help="$ac_help 1577+ --disable-phar Disable phar support" 1578+ac_help="$ac_help 1579+ --disable-posix Disable POSIX-like functions" 1580+ac_help="$ac_help 1581+ --with-pspell[=DIR] Include PSPELL support. 1582+ GNU Aspell version 0.50.0 or higher required" 1583+ac_help="$ac_help 1584+ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)" 1585+ac_help="$ac_help 1586+ --with-readline[=DIR] Include readline support (CLI/CGI only)" 1587+ac_help="$ac_help 1588+ --with-recode[=DIR] Include recode support" 1589+ac_help="$ac_help 1590+ --disable-session Disable session support" 1591+ac_help="$ac_help 1592+ --with-mm[=DIR] SESSION: Include mm support for session storage" 1593+ac_help="$ac_help 1594+ --enable-shmop Enable shmop support" 1595+ac_help="$ac_help 1596+ --disable-simplexml Disable SimpleXML support" 1597+ac_help="$ac_help 1598+ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix" 1599+ac_help="$ac_help 1600+ --with-snmp[=DIR] Include SNMP support" 1601+ac_help="$ac_help 1602+ --with-openssl-dir[=DIR] SNMP: openssl install prefix" 1603+ac_help="$ac_help 1604+ --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack" 1605+ac_help="$ac_help 1606+ --enable-soap Enable SOAP support" 1607+ac_help="$ac_help 1608+ --with-libxml-dir=DIR SOAP: libxml2 install prefix" 1609+ac_help="$ac_help 1610+ --enable-sockets Enable sockets support" 1611+ac_help="$ac_help 1612+ --without-sqlite=DIR Do not include sqlite support. DIR is the sqlite base 1613+ install directory [BUNDLED]" 1614+ac_help="$ac_help 1615+ --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite" 1616+ac_help="$ac_help 1617+ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home 1618+ directory [/home/sybase]" 1619+ac_help="$ac_help 1620+ --enable-sysvmsg Enable sysvmsg support" 1621+ac_help="$ac_help 1622+ --enable-sysvsem Enable System V semaphore support" 1623+ac_help="$ac_help 1624+ --enable-sysvshm Enable the System V shared memory support" 1625+ac_help="$ac_help 1626+ --with-tidy[=DIR] Include TIDY support" 1627+ac_help="$ac_help 1628+ --disable-tokenizer Disable tokenizer support" 1629+ac_help="$ac_help 1630+ --enable-wddx Enable WDDX support" 1631+ac_help="$ac_help 1632+ --with-libxml-dir=DIR WDDX: libxml2 install prefix" 1633+ac_help="$ac_help 1634+ --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated)" 1635+ac_help="$ac_help 1636+ --disable-xml Disable XML support" 1637+ac_help="$ac_help 1638+ --with-libxml-dir=DIR XML: libxml2 install prefix" 1639+ac_help="$ac_help 1640+ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)" 1641+ac_help="$ac_help 1642+ --disable-xmlreader Disable XMLReader support" 1643+ac_help="$ac_help 1644+ --with-libxml-dir=DIR XMLReader: libxml2 install prefix" 1645+ac_help="$ac_help 1646+ --with-xmlrpc[=DIR] Include XMLRPC-EPI support" 1647+ac_help="$ac_help 1648+ --with-libxml-dir=DIR XMLRPC-EPI: libxml2 install prefix" 1649+ac_help="$ac_help 1650+ --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)" 1651+ac_help="$ac_help 1652+ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI" 1653+ac_help="$ac_help 1654+ --disable-xmlwriter Disable XMLWriter support" 1655+ac_help="$ac_help 1656+ --with-libxml-dir=DIR XMLWriter: libxml2 install prefix" 1657+ac_help="$ac_help 1658+ --with-xsl[=DIR] Include XSL support. DIR is the libxslt base 1659+ install directory (libxslt >= 1.1.0 required)" 1660+ac_help="$ac_help 1661+ --enable-zip Include Zip read/write support" 1662+ac_help="$ac_help 1663+ --with-zlib-dir[=DIR] ZIP: Set the path to libz install prefix" 1664+ac_help="$ac_help 1665+ --with-pcre-dir ZIP: pcre install prefix" 1666+ac_help="$ac_help 1667+ --enable-mysqlnd Enable mysqlnd explicitly, will be done implicitly 1668+ when required by other extensions" 1669+ac_help="$ac_help 1670+ --disable-mysqlnd-compression-support 1671+ Disable support for the MySQL compressed protocol in mysqlnd" 1672+ac_help="$ac_help 1673+ --with-zlib-dir[=DIR] mysqlnd: Set the path to libz install prefix" 1674+ac_help="$ac_help 1675+ 1676+PEAR: 1677+" 1678+ac_help="$ac_help 1679+ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php] 1680+ --without-pear Do not install PEAR" 1681+ac_help="$ac_help 1682+ 1683+Zend: 1684+" 1685+ac_help="$ac_help 1686+ --with-zend-vm=TYPE Set virtual machine dispatch method. Type is 1687+ one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]" 1688+ac_help="$ac_help 1689+ --enable-maintainer-zts Enable thread safety - for code maintainers only!!" 1690+ac_help="$ac_help 1691+ --disable-inline-optimization 1692+ If building zend_execute.lo fails, try this switch" 1693+ac_help="$ac_help 1694+ --enable-zend-multibyte Compile with zend multibyte support" 1695+ac_help="$ac_help 1696+ 1697+TSRM: 1698+" 1699+ac_help="$ac_help 1700+ --with-tsrm-pth[=pth-config] 1701+ Use GNU Pth" 1702+ac_help="$ac_help 1703+ --with-tsrm-st Use SGI's State Threads" 1704+ac_help="$ac_help 1705+ --with-tsrm-pthreads Use POSIX threads (default)" 1706+ac_help="$ac_help 1707+ 1708+Libtool: 1709+" 1710+ac_help="$ac_help 1711+ --enable-shared[=PKGS] build shared libraries [default=yes]" 1712+ac_help="$ac_help 1713+ --enable-static[=PKGS] build static libraries [default=yes]" 1714+ac_help="$ac_help 1715+ --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" 1716+ac_help="$ac_help 1717+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]" 1718 1719 1720 # Check that we are running under the correct shell. 1721@@ -439,93 +1368,27 @@ 1722 1723 1724 1725+ac_help="$ac_help 1726+ --disable-libtool-lock avoid locking (might break parallel builds)" 1727+ac_help="$ac_help 1728+ --with-pic try to use only PIC/non-PIC objects [default=use both]" 1729+ac_help="$ac_help 1730+ --with-tags[=TAGS] include additional configurations [automatic] 1731+" 1732+ac_help="$ac_help 1733+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]" 1734 1735 tagnames=${tagnames+${tagnames},}CXX 1736 1737- 1738- 1739- 1740- 1741- 1742-# Name of the host. 1743-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 1744-# so uname gets run too. 1745-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 1746- 1747-exec 6>&1 1748- 1749-# 1750-# Initializations. 1751-# 1752-ac_default_prefix=/usr/local 1753-ac_config_libobj_dir=. 1754-cross_compiling=no 1755-subdirs= 1756-MFLAGS= 1757-MAKEFLAGS= 1758-SHELL=${CONFIG_SHELL-/bin/sh} 1759- 1760-# Maximum number of lines to put in a shell here document. 1761-# This variable seems obsolete. It should probably be removed, and 1762-# only ac_max_sed_lines should be used. 1763-: ${ac_max_here_lines=38} 1764- 1765-# Identity of this package. 1766-PACKAGE_NAME= 1767-PACKAGE_TARNAME= 1768-PACKAGE_VERSION= 1769-PACKAGE_STRING= 1770-PACKAGE_BUGREPORT= 1771- 1772-ac_unique_file="README.GIT-RULES" 1773-# Factoring default headers for most tests. 1774-ac_includes_default="\ 1775-#include <stdio.h> 1776-#if HAVE_SYS_TYPES_H 1777-# include <sys/types.h> 1778-#endif 1779-#if HAVE_SYS_STAT_H 1780-# include <sys/stat.h> 1781-#endif 1782-#if STDC_HEADERS 1783-# include <stdlib.h> 1784-# include <stddef.h> 1785-#else 1786-# if HAVE_STDLIB_H 1787-# include <stdlib.h> 1788-# endif 1789-#endif 1790-#if HAVE_STRING_H 1791-# if !STDC_HEADERS && HAVE_MEMORY_H 1792-# include <memory.h> 1793-# endif 1794-# include <string.h> 1795-#endif 1796-#if HAVE_STRINGS_H 1797-# include <strings.h> 1798-#endif 1799-#if HAVE_INTTYPES_H 1800-# include <inttypes.h> 1801-#else 1802-# if HAVE_STDINT_H 1803-# include <stdint.h> 1804-# endif 1805-#endif 1806-#if HAVE_UNISTD_H 1807-# include <unistd.h> 1808-#endif" 1809- 1810-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP SED CONFIGURE_COMMAND CONFIGURE_OPTIONS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP LN_S AWK YACC RE2C SHLIB_SUFFIX_NAME SHLIB_DL_SUFFIX_NAME php_fpm_user php_fpm_group php_fpm_sysconfdir php_fpm_localstatedir php_fpm_prefix PROG_SENDMAIL LIBOBJS ALLOCA LTP LTP_GENHTML KRB5_CONFIG PKG_CONFIG OPENSSL_INCDIR_OPT ICU_CONFIG CXX CXXFLAGS ac_ct_CXX CXXCPP MYSQL_MODULE_TYPE MYSQL_LIBS MYSQL_INCLUDE OCI8_SHARED_LIBADD OCI8_DIR OCI8_ORACLE_VERSION ODBC_INCLUDE ODBC_LIBS ODBC_LFLAGS ODBC_TYPE PDO_MYSQL_MODULE_TYPE PDO_OCI_SHARED_LIBADD PDO_OCI_DIR PDO_OCI_VERSION SNMP_CONFIG LEMON RANLIB ac_ct_RANLIB INLINE_CFLAGS INCLUDE_PATH EXPANDED_PEAR_INSTALLDIR EXPANDED_EXTENSION_DIR EXPANDED_BINDIR EXPANDED_SBINDIR EXPANDED_MANDIR EXPANDED_LIBDIR EXPANDED_DATADIR EXPANDED_SYSCONFDIR EXPANDED_LOCALSTATEDIR EXPANDED_PHP_CONFIG_FILE_PATH EXPANDED_PHP_CONFIG_FILE_SCAN_DIR PHP_INSTALLED_SAPIS abs_builddir abs_srcdir php_abs_top_builddir php_abs_top_srcdir program_prefix program_suffix DEBUG_CFLAGS EXTENSION_DIR EXTRA_LDFLAGS EXTRA_LDFLAGS_PROGRAM EXTRA_LIBS ZEND_EXTRA_LIBS INCLUDES EXTRA_INCLUDES INSTALL_IT NATIVE_RPATHS PEAR_INSTALLDIR PHP_LDFLAGS PHP_LIBS PHP_VERSION PHP_VERSION_ID ECHO AR ac_ct_AR STRIP ac_ct_STRIP DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIBTOOL LTLIBOBJS' 1811-ac_subst_files='' 1812- 1813 # Initialize some variables set by options. 1814-ac_init_help= 1815-ac_init_version=false 1816 # The variables have the same names as the options, with 1817 # dashes changed to underlines. 1818-cache_file=/dev/null 1819+build=NONE 1820+cache_file=./config.cache 1821 exec_prefix=NONE 1822+host=NONE 1823 no_create= 1824+nonopt=NONE 1825 no_recursion= 1826 prefix=NONE 1827 program_prefix=NONE 1828@@ -534,15 +1397,10 @@ 1829 silent= 1830 site= 1831 srcdir= 1832+target=NONE 1833 verbose= 1834 x_includes=NONE 1835 x_libraries=NONE 1836- 1837-# Installation directory options. 1838-# These are left unexpanded so users can "make install exec_prefix=/foo" 1839-# and all the variables that are supposed to be based on exec_prefix 1840-# by default will actually change. 1841-# Use braces instead of parens because sh, perl, etc. also accept them. 1842 bindir='${exec_prefix}/bin' 1843 sbindir='${exec_prefix}/sbin' 1844 libexecdir='${exec_prefix}/libexec' 1845@@ -556,9 +1414,17 @@ 1846 infodir='${prefix}/info' 1847 mandir='${prefix}/man' 1848 1849+# Initialize some other variables. 1850+subdirs= 1851+MFLAGS= MAKEFLAGS= 1852+SHELL=${CONFIG_SHELL-/bin/sh} 1853+# Maximum number of lines to put in a shell here document. 1854+ac_max_here_lines=12 1855+ 1856 ac_prev= 1857 for ac_option 1858 do 1859+ 1860 # If the previous option needs an argument, assign it. 1861 if test -n "$ac_prev"; then 1862 eval "$ac_prev=\$ac_option" 1863@@ -566,59 +1432,59 @@ 1864 continue 1865 fi 1866 1867- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` 1868+ case "$ac_option" in 1869+ -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; 1870+ *) ac_optarg= ;; 1871+ esac 1872 1873 # Accept the important Cygnus configure options, so we can diagnose typos. 1874 1875- case $ac_option in 1876+ case "$ac_option" in 1877 1878 -bindir | --bindir | --bindi | --bind | --bin | --bi) 1879 ac_prev=bindir ;; 1880 -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) 1881- bindir=$ac_optarg ;; 1882+ bindir="$ac_optarg" ;; 1883 1884 -build | --build | --buil | --bui | --bu) 1885- ac_prev=build_alias ;; 1886+ ac_prev=build ;; 1887 -build=* | --build=* | --buil=* | --bui=* | --bu=*) 1888- build_alias=$ac_optarg ;; 1889+ build="$ac_optarg" ;; 1890 1891 -cache-file | --cache-file | --cache-fil | --cache-fi \ 1892 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) 1893 ac_prev=cache_file ;; 1894 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ 1895 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) 1896- cache_file=$ac_optarg ;; 1897- 1898- --config-cache | -C) 1899- cache_file=config.cache ;; 1900+ cache_file="$ac_optarg" ;; 1901 1902 -datadir | --datadir | --datadi | --datad | --data | --dat | --da) 1903 ac_prev=datadir ;; 1904 -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ 1905 | --da=*) 1906- datadir=$ac_optarg ;; 1907+ datadir="$ac_optarg" ;; 1908 1909 -disable-* | --disable-*) 1910- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1911+ ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` 1912 # Reject names that are not valid shell variable names. 1913- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 1914- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 1915- { (exit 1); exit 1; }; } 1916- ac_feature=`echo $ac_feature | sed 's/-/_/g'` 1917- eval "enable_$ac_feature=no" ;; 1918+ if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then 1919+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } 1920+ fi 1921+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` 1922+ eval "enable_${ac_feature}=no" ;; 1923 1924 -enable-* | --enable-*) 1925- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1926+ ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` 1927 # Reject names that are not valid shell variable names. 1928- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && 1929- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 1930- { (exit 1); exit 1; }; } 1931- ac_feature=`echo $ac_feature | sed 's/-/_/g'` 1932- case $ac_option in 1933- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 1934+ if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then 1935+ { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } 1936+ fi 1937+ ac_feature=`echo $ac_feature| sed 's/-/_/g'` 1938+ case "$ac_option" in 1939+ *=*) ;; 1940 *) ac_optarg=yes ;; 1941 esac 1942- eval "enable_$ac_feature='$ac_optarg'" ;; 1943+ eval "enable_${ac_feature}='$ac_optarg'" ;; 1944 1945 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ 1946 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ 1947@@ -627,47 +1493,95 @@ 1948 -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ 1949 | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ 1950 | --exec=* | --exe=* | --ex=*) 1951- exec_prefix=$ac_optarg ;; 1952+ exec_prefix="$ac_optarg" ;; 1953 1954 -gas | --gas | --ga | --g) 1955 # Obsolete; use --with-gas. 1956 with_gas=yes ;; 1957 1958- -help | --help | --hel | --he | -h) 1959- ac_init_help=long ;; 1960- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) 1961- ac_init_help=recursive ;; 1962- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) 1963- ac_init_help=short ;; 1964+ -help | --help | --hel | --he) 1965+ # Omit some internal or obsolete options to make the list less imposing. 1966+ # This message is too long to be a string in the A/UX 3.1 sh. 1967+ cat << EOF 1968+Usage: configure [options] [host] 1969+Options: [defaults in brackets after descriptions] 1970+Configuration: 1971+ --cache-file=FILE cache test results in FILE 1972+ --help print this message 1973+ --no-create do not create output files 1974+ --quiet, --silent do not print \`checking...' messages 1975+ --version print the version of autoconf that created configure 1976+Directory and file names: 1977+ --prefix=PREFIX install architecture-independent files in PREFIX 1978+ [$ac_default_prefix] 1979+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX 1980+ [same as prefix] 1981+ --bindir=DIR user executables in DIR [EPREFIX/bin] 1982+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] 1983+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec] 1984+ --datadir=DIR read-only architecture-independent data in DIR 1985+ [PREFIX/share] 1986+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] 1987+ --sharedstatedir=DIR modifiable architecture-independent data in DIR 1988+ [PREFIX/com] 1989+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] 1990+ --libdir=DIR object code libraries in DIR [EPREFIX/lib] 1991+ --includedir=DIR C header files in DIR [PREFIX/include] 1992+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] 1993+ --infodir=DIR info documentation in DIR [PREFIX/info] 1994+ --mandir=DIR man documentation in DIR [PREFIX/man] 1995+ --srcdir=DIR find the sources in DIR [configure dir or ..] 1996+ --program-prefix=PREFIX prepend PREFIX to installed program names 1997+ --program-suffix=SUFFIX append SUFFIX to installed program names 1998+ --program-transform-name=PROGRAM 1999+ run sed PROGRAM on installed program names 2000+EOF 2001+ cat << EOF 2002+Host type: 2003+ --build=BUILD configure for building on BUILD [BUILD=HOST] 2004+ --host=HOST configure for HOST [guessed] 2005+ --target=TARGET configure for TARGET [TARGET=HOST] 2006+Features and packages: 2007+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 2008+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 2009+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 2010+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 2011+ --x-includes=DIR X include files are in DIR 2012+ --x-libraries=DIR X library files are in DIR 2013+EOF 2014+ if test -n "$ac_help"; then 2015+ echo "--enable and --with options recognized:$ac_help" 2016+ fi 2017+ exit 0 ;; 2018 2019 -host | --host | --hos | --ho) 2020- ac_prev=host_alias ;; 2021+ ac_prev=host ;; 2022 -host=* | --host=* | --hos=* | --ho=*) 2023- host_alias=$ac_optarg ;; 2024+ host="$ac_optarg" ;; 2025 2026 -includedir | --includedir | --includedi | --included | --include \ 2027 | --includ | --inclu | --incl | --inc) 2028 ac_prev=includedir ;; 2029 -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ 2030 | --includ=* | --inclu=* | --incl=* | --inc=*) 2031- includedir=$ac_optarg ;; 2032+ includedir="$ac_optarg" ;; 2033 2034 -infodir | --infodir | --infodi | --infod | --info | --inf) 2035 ac_prev=infodir ;; 2036 -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) 2037- infodir=$ac_optarg ;; 2038+ infodir="$ac_optarg" ;; 2039 2040 -libdir | --libdir | --libdi | --libd) 2041 ac_prev=libdir ;; 2042 -libdir=* | --libdir=* | --libdi=* | --libd=*) 2043- libdir=$ac_optarg ;; 2044+ libdir="$ac_optarg" ;; 2045 2046 -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ 2047 | --libexe | --libex | --libe) 2048 ac_prev=libexecdir ;; 2049 -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ 2050 | --libexe=* | --libex=* | --libe=*) 2051- libexecdir=$ac_optarg ;; 2052+ libexecdir="$ac_optarg" ;; 2053 2054 -localstatedir | --localstatedir | --localstatedi | --localstated \ 2055 | --localstate | --localstat | --localsta | --localst \ 2056@@ -676,19 +1590,19 @@ 2057 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ 2058 | --localstate=* | --localstat=* | --localsta=* | --localst=* \ 2059 | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) 2060- localstatedir=$ac_optarg ;; 2061+ localstatedir="$ac_optarg" ;; 2062 2063 -mandir | --mandir | --mandi | --mand | --man | --ma | --m) 2064 ac_prev=mandir ;; 2065 -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) 2066- mandir=$ac_optarg ;; 2067+ mandir="$ac_optarg" ;; 2068 2069 -nfp | --nfp | --nf) 2070 # Obsolete; use --without-fp. 2071 with_fp=no ;; 2072 2073 -no-create | --no-create | --no-creat | --no-crea | --no-cre \ 2074- | --no-cr | --no-c | -n) 2075+ | --no-cr | --no-c) 2076 no_create=yes ;; 2077 2078 -no-recursion | --no-recursion | --no-recursio | --no-recursi \ 2079@@ -702,26 +1616,26 @@ 2080 -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ 2081 | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ 2082 | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) 2083- oldincludedir=$ac_optarg ;; 2084+ oldincludedir="$ac_optarg" ;; 2085 2086 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) 2087 ac_prev=prefix ;; 2088 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) 2089- prefix=$ac_optarg ;; 2090+ prefix="$ac_optarg" ;; 2091 2092 -program-prefix | --program-prefix | --program-prefi | --program-pref \ 2093 | --program-pre | --program-pr | --program-p) 2094 ac_prev=program_prefix ;; 2095 -program-prefix=* | --program-prefix=* | --program-prefi=* \ 2096 | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) 2097- program_prefix=$ac_optarg ;; 2098+ program_prefix="$ac_optarg" ;; 2099 2100 -program-suffix | --program-suffix | --program-suffi | --program-suff \ 2101 | --program-suf | --program-su | --program-s) 2102 ac_prev=program_suffix ;; 2103 -program-suffix=* | --program-suffix=* | --program-suffi=* \ 2104 | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) 2105- program_suffix=$ac_optarg ;; 2106+ program_suffix="$ac_optarg" ;; 2107 2108 -program-transform-name | --program-transform-name \ 2109 | --program-transform-nam | --program-transform-na \ 2110@@ -738,7 +1652,7 @@ 2111 | --program-transfo=* | --program-transf=* \ 2112 | --program-trans=* | --program-tran=* \ 2113 | --progr-tra=* | --program-tr=* | --program-t=*) 2114- program_transform_name=$ac_optarg ;; 2115+ program_transform_name="$ac_optarg" ;; 2116 2117 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 2118 | -silent | --silent | --silen | --sile | --sil) 2119@@ -748,7 +1662,7 @@ 2120 ac_prev=sbindir ;; 2121 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 2122 | --sbi=* | --sb=*) 2123- sbindir=$ac_optarg ;; 2124+ sbindir="$ac_optarg" ;; 2125 2126 -sharedstatedir | --sharedstatedir | --sharedstatedi \ 2127 | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ 2128@@ -759,57 +1673,58 @@ 2129 | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ 2130 | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ 2131 | --sha=* | --sh=*) 2132- sharedstatedir=$ac_optarg ;; 2133+ sharedstatedir="$ac_optarg" ;; 2134 2135 -site | --site | --sit) 2136 ac_prev=site ;; 2137 -site=* | --site=* | --sit=*) 2138- site=$ac_optarg ;; 2139+ site="$ac_optarg" ;; 2140 2141 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) 2142 ac_prev=srcdir ;; 2143 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) 2144- srcdir=$ac_optarg ;; 2145+ srcdir="$ac_optarg" ;; 2146 2147 -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ 2148 | --syscon | --sysco | --sysc | --sys | --sy) 2149 ac_prev=sysconfdir ;; 2150 -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ 2151 | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) 2152- sysconfdir=$ac_optarg ;; 2153+ sysconfdir="$ac_optarg" ;; 2154 2155 -target | --target | --targe | --targ | --tar | --ta | --t) 2156- ac_prev=target_alias ;; 2157+ ac_prev=target ;; 2158 -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) 2159- target_alias=$ac_optarg ;; 2160+ target="$ac_optarg" ;; 2161 2162 -v | -verbose | --verbose | --verbos | --verbo | --verb) 2163 verbose=yes ;; 2164 2165- -version | --version | --versio | --versi | --vers | -V) 2166- ac_init_version=: ;; 2167+ -version | --version | --versio | --versi | --vers) 2168+ echo "configure generated by autoconf version 2.13" 2169+ exit 0 ;; 2170 2171 -with-* | --with-*) 2172- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 2173+ ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` 2174 # Reject names that are not valid shell variable names. 2175- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 2176- { echo "$as_me: error: invalid package name: $ac_package" >&2 2177- { (exit 1); exit 1; }; } 2178+ if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then 2179+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } 2180+ fi 2181 ac_package=`echo $ac_package| sed 's/-/_/g'` 2182- case $ac_option in 2183- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; 2184+ case "$ac_option" in 2185+ *=*) ;; 2186 *) ac_optarg=yes ;; 2187 esac 2188- eval "with_$ac_package='$ac_optarg'" ;; 2189+ eval "with_${ac_package}='$ac_optarg'" ;; 2190 2191 -without-* | --without-*) 2192- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` 2193+ ac_package=`echo $ac_option|sed -e 's/-*without-//'` 2194 # Reject names that are not valid shell variable names. 2195- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && 2196- { echo "$as_me: error: invalid package name: $ac_package" >&2 2197- { (exit 1); exit 1; }; } 2198- ac_package=`echo $ac_package | sed 's/-/_/g'` 2199- eval "with_$ac_package=no" ;; 2200+ if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then 2201+ { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } 2202+ fi 2203+ ac_package=`echo $ac_package| sed 's/-/_/g'` 2204+ eval "with_${ac_package}=no" ;; 2205 2206 --x) 2207 # Obsolete; use --with-x. 2208@@ -820,110 +1735,99 @@ 2209 ac_prev=x_includes ;; 2210 -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ 2211 | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) 2212- x_includes=$ac_optarg ;; 2213+ x_includes="$ac_optarg" ;; 2214 2215 -x-libraries | --x-libraries | --x-librarie | --x-librari \ 2216 | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) 2217 ac_prev=x_libraries ;; 2218 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ 2219 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 2220- x_libraries=$ac_optarg ;; 2221+ x_libraries="$ac_optarg" ;; 2222 2223- -*) { echo "$as_me: error: unrecognized option: $ac_option 2224-Try \`$0 --help' for more information." >&2 2225- { (exit 1); exit 1; }; } 2226+ -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } 2227 ;; 2228 2229- *=*) 2230- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` 2231- # Reject names that are not valid shell variable names. 2232- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && 2233- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 2234- { (exit 1); exit 1; }; } 2235- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` 2236- eval "$ac_envvar='$ac_optarg'" 2237- export $ac_envvar ;; 2238- 2239 *) 2240- # FIXME: should be removed in autoconf 3.0. 2241- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 2242- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 2243- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 2244- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 2245+ if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then 2246+ echo "configure: warning: $ac_option: invalid host type" 1>&2 2247+ fi 2248+ if test "x$nonopt" != xNONE; then 2249+ { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } 2250+ fi 2251+ nonopt="$ac_option" 2252 ;; 2253 2254 esac 2255 done 2256 2257 if test -n "$ac_prev"; then 2258- ac_option=--`echo $ac_prev | sed 's/_/-/g'` 2259- { echo "$as_me: error: missing argument to $ac_option" >&2 2260- { (exit 1); exit 1; }; } 2261+ { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } 2262 fi 2263 2264-# Be sure to have absolute paths. 2265-for ac_var in exec_prefix prefix 2266-do 2267- eval ac_val=$`echo $ac_var` 2268- case $ac_val in 2269- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; 2270- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 2271- { (exit 1); exit 1; }; };; 2272- esac 2273-done 2274- 2275-# Be sure to have absolute paths. 2276-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ 2277- localstatedir libdir includedir oldincludedir infodir mandir 2278-do 2279- eval ac_val=$`echo $ac_var` 2280- case $ac_val in 2281- [\\/$]* | ?:[\\/]* ) ;; 2282- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 2283- { (exit 1); exit 1; }; };; 2284- esac 2285-done 2286+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 2287 2288-# There might be people who depend on the old broken behavior: `$host' 2289-# used to hold the argument of --host etc. 2290-# FIXME: To remove some day. 2291-build=$build_alias 2292-host=$host_alias 2293-target=$target_alias 2294- 2295-# FIXME: To remove some day. 2296-if test "x$host_alias" != x; then 2297- if test "x$build_alias" = x; then 2298- cross_compiling=maybe 2299- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 2300- If a cross compiler is detected then cross compile mode will be used." >&2 2301- elif test "x$build_alias" != "x$host_alias"; then 2302- cross_compiling=yes 2303- fi 2304+# File descriptor usage: 2305+# 0 standard input 2306+# 1 file creation 2307+# 2 errors and warnings 2308+# 3 some systems may open it to /dev/tty 2309+# 4 used on the Kubota Titan 2310+# 6 checking for... messages and results 2311+# 5 compiler messages saved in config.log 2312+if test "$silent" = yes; then 2313+ exec 6>/dev/null 2314+else 2315+ exec 6>&1 2316 fi 2317+exec 5>./config.log 2318 2319-ac_tool_prefix= 2320-test -n "$host_alias" && ac_tool_prefix=$host_alias- 2321- 2322-test "$silent" = yes && exec 6>/dev/null 2323+echo "\ 2324+This file contains any messages produced by compilers while 2325+running configure, to aid debugging if configure makes a mistake. 2326+" 1>&5 2327 2328+# Strip out --no-create and --no-recursion so they do not pile up. 2329+# Also quote any args containing shell metacharacters. 2330+ac_configure_args= 2331+for ac_arg 2332+do 2333+ case "$ac_arg" in 2334+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ 2335+ | --no-cr | --no-c) ;; 2336+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ 2337+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; 2338+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) 2339+ ac_configure_args="$ac_configure_args '$ac_arg'" ;; 2340+ *) ac_configure_args="$ac_configure_args $ac_arg" ;; 2341+ esac 2342+done 2343+ 2344+# NLS nuisances. 2345+# Only set these to C if already set. These must not be set unconditionally 2346+# because not all systems understand e.g. LANG=C (notably SCO). 2347+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! 2348+# Non-C LC_CTYPE values break the ctype check. 2349+if test "${LANG+set}" = set; then LANG=C; export LANG; fi 2350+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi 2351+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi 2352+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi 2353+ 2354+# confdefs.h avoids OS command line length limits that DEFS can exceed. 2355+rm -rf conftest* confdefs.h 2356+# AIX cpp loses on an empty file, so make sure it contains at least a newline. 2357+echo > confdefs.h 2358+ 2359+# A filename unique to this package, relative to the directory that 2360+# configure is in, which we can look for to find out if srcdir is correct. 2361+ac_unique_file=README.GIT-RULES 2362 2363 # Find the source files, if location was not specified. 2364 if test -z "$srcdir"; then 2365 ac_srcdir_defaulted=yes 2366 # Try the directory containing this script, then its parent. 2367- ac_confdir=`(dirname "$0") 2>/dev/null || 2368-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 2369- X"$0" : 'X\(//\)[^/]' \| \ 2370- X"$0" : 'X\(//\)$' \| \ 2371- X"$0" : 'X\(/\)' \| \ 2372- . : '\(.\)' 2>/dev/null || 2373-echo X"$0" | 2374- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 2375- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 2376- /^X\(\/\/\)$/{ s//\1/; q; } 2377- /^X\(\/\).*/{ s//\1/; q; } 2378- s/.*/./; q'` 2379+ ac_prog=$0 2380+ ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` 2381+ test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. 2382 srcdir=$ac_confdir 2383 if test ! -r $srcdir/$ac_unique_file; then 2384 srcdir=.. 2385@@ -933,807 +1837,13 @@ 2386 fi 2387 if test ! -r $srcdir/$ac_unique_file; then 2388 if test "$ac_srcdir_defaulted" = yes; then 2389- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 2390- { (exit 1); exit 1; }; } 2391+ { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } 2392 else 2393- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 2394- { (exit 1); exit 1; }; } 2395+ { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } 2396 fi 2397 fi 2398-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || 2399- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 2400- { (exit 1); exit 1; }; } 2401-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` 2402-ac_env_build_alias_set=${build_alias+set} 2403-ac_env_build_alias_value=$build_alias 2404-ac_cv_env_build_alias_set=${build_alias+set} 2405-ac_cv_env_build_alias_value=$build_alias 2406-ac_env_host_alias_set=${host_alias+set} 2407-ac_env_host_alias_value=$host_alias 2408-ac_cv_env_host_alias_set=${host_alias+set} 2409-ac_cv_env_host_alias_value=$host_alias 2410-ac_env_target_alias_set=${target_alias+set} 2411-ac_env_target_alias_value=$target_alias 2412-ac_cv_env_target_alias_set=${target_alias+set} 2413-ac_cv_env_target_alias_value=$target_alias 2414-ac_env_CC_set=${CC+set} 2415-ac_env_CC_value=$CC 2416-ac_cv_env_CC_set=${CC+set} 2417-ac_cv_env_CC_value=$CC 2418-ac_env_CFLAGS_set=${CFLAGS+set} 2419-ac_env_CFLAGS_value=$CFLAGS 2420-ac_cv_env_CFLAGS_set=${CFLAGS+set} 2421-ac_cv_env_CFLAGS_value=$CFLAGS 2422-ac_env_LDFLAGS_set=${LDFLAGS+set} 2423-ac_env_LDFLAGS_value=$LDFLAGS 2424-ac_cv_env_LDFLAGS_set=${LDFLAGS+set} 2425-ac_cv_env_LDFLAGS_value=$LDFLAGS 2426-ac_env_CPPFLAGS_set=${CPPFLAGS+set} 2427-ac_env_CPPFLAGS_value=$CPPFLAGS 2428-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} 2429-ac_cv_env_CPPFLAGS_value=$CPPFLAGS 2430-ac_env_CPP_set=${CPP+set} 2431-ac_env_CPP_value=$CPP 2432-ac_cv_env_CPP_set=${CPP+set} 2433-ac_cv_env_CPP_value=$CPP 2434-ac_env_CXX_set=${CXX+set} 2435-ac_env_CXX_value=$CXX 2436-ac_cv_env_CXX_set=${CXX+set} 2437-ac_cv_env_CXX_value=$CXX 2438-ac_env_CXXFLAGS_set=${CXXFLAGS+set} 2439-ac_env_CXXFLAGS_value=$CXXFLAGS 2440-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} 2441-ac_cv_env_CXXFLAGS_value=$CXXFLAGS 2442-ac_env_CXXCPP_set=${CXXCPP+set} 2443-ac_env_CXXCPP_value=$CXXCPP 2444-ac_cv_env_CXXCPP_set=${CXXCPP+set} 2445-ac_cv_env_CXXCPP_value=$CXXCPP 2446- 2447-# 2448-# Report the --help message. 2449-# 2450-if test "$ac_init_help" = "long"; then 2451- # Omit some internal or obsolete options to make the list less imposing. 2452- # This message is too long to be a string in the A/UX 3.1 sh. 2453- cat <<_ACEOF 2454-\`configure' configures this package to adapt to many kinds of systems. 2455- 2456-Usage: $0 [OPTION]... [VAR=VALUE]... 2457- 2458-To assign environment variables (e.g., CC, CFLAGS...), specify them as 2459-VAR=VALUE. See below for descriptions of some of the useful variables. 2460- 2461-Defaults for the options are specified in brackets. 2462- 2463-Configuration: 2464- -h, --help display this help and exit 2465- --help=short display options specific to this package 2466- --help=recursive display the short help of all the included packages 2467- -V, --version display version information and exit 2468- -q, --quiet, --silent do not print \`checking...' messages 2469- --cache-file=FILE cache test results in FILE [disabled] 2470- -C, --config-cache alias for \`--cache-file=config.cache' 2471- -n, --no-create do not create output files 2472- --srcdir=DIR find the sources in DIR [configure dir or \`..'] 2473- 2474-_ACEOF 2475- 2476- cat <<_ACEOF 2477-Installation directories: 2478- --prefix=PREFIX install architecture-independent files in PREFIX 2479- [$ac_default_prefix] 2480- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX 2481- [PREFIX] 2482- 2483-By default, \`make install' will install all the files in 2484-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify 2485-an installation prefix other than \`$ac_default_prefix' using \`--prefix', 2486-for instance \`--prefix=\$HOME'. 2487- 2488-For better control, use the options below. 2489- 2490-Fine tuning of the installation directories: 2491- --bindir=DIR user executables [EPREFIX/bin] 2492- --sbindir=DIR system admin executables [EPREFIX/sbin] 2493- --libexecdir=DIR program executables [EPREFIX/libexec] 2494- --datadir=DIR read-only architecture-independent data [PREFIX/share] 2495- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 2496- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 2497- --localstatedir=DIR modifiable single-machine data [PREFIX/var] 2498- --libdir=DIR object code libraries [EPREFIX/lib] 2499- --includedir=DIR C header files [PREFIX/include] 2500- --oldincludedir=DIR C header files for non-gcc [/usr/include] 2501- --infodir=DIR info documentation [PREFIX/info] 2502- --mandir=DIR man documentation [PREFIX/man] 2503-_ACEOF 2504- 2505- cat <<\_ACEOF 2506- 2507-System types: 2508- --build=BUILD configure for building on BUILD [guessed] 2509- --host=HOST cross-compile to build programs to run on HOST [BUILD] 2510- --target=TARGET configure for building compilers for TARGET [HOST] 2511-_ACEOF 2512-fi 2513- 2514-if test -n "$ac_init_help"; then 2515- 2516- cat <<\_ACEOF 2517- 2518-Optional Features: 2519- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 2520- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 2521- --disable-rpath Disable passing additional runtime library 2522- search paths 2523- --enable-re2c-cgoto Enable -g flag to re2c to use computed goto gcc extension 2524- 2525-SAPI modules: 2526- 2527- --enable-mod-charset APACHE: Enable transfer tables for mod_charset (Rus Apache) 2528- --enable-mod-charset APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache) 2529- --disable-cli Disable building CLI version of PHP 2530- (this forces --without-pear) 2531- --enable-embed=TYPE EXPERIMENTAL: Enable building of embedded SAPI library 2532- TYPE is either 'shared' or 'static'. TYPE=shared 2533- --enable-fpm EXPERIMENTAL: Enable building of the fpm SAPI executable 2534- --enable-roxen-zts ROXEN: Build the Roxen module using Zend Thread Safety 2535- --disable-cgi Disable building CGI version of PHP 2536- 2537-General settings: 2538- 2539- --enable-gcov Enable GCOV code coverage (requires LTP) - FOR DEVELOPERS ONLY!! 2540- --enable-debug Compile with debugging symbols 2541- --enable-safe-mode Enable safe mode by default 2542- --enable-sigchild Enable PHP's own SIGCHLD handler 2543- --enable-magic-quotes Enable magic quotes by default. 2544- --enable-libgcc Enable explicitly linking against libgcc 2545- --disable-short-tags Disable the short-form <? start tag by default 2546- --enable-dmalloc Enable dmalloc 2547- --disable-ipv6 Disable IPv6 support 2548- --enable-fd-setsize Set size of descriptor sets 2549- 2550-Extensions: 2551- 2552- --with-EXTENSION=shared[,PATH] 2553- 2554- NOTE: Not all extensions can be build as 'shared'. 2555- 2556- Example: --with-foobar=shared,/usr/local/foobar/ 2557- 2558- o Builds the foobar extension as shared extension. 2559- o foobar package install prefix is /usr/local/foobar/ 2560- 2561- 2562- --disable-all Disable all extensions which are enabled by default 2563- 2564- --disable-libxml Disable LIBXML support 2565- --enable-bcmath Enable bc style precision math functions 2566- --enable-calendar Enable support for calendar conversion 2567- --disable-ctype Disable ctype functions 2568- --enable-dba Build DBA with bundled modules. To build shared DBA 2569- extension use --enable-dba=shared 2570- --disable-inifile DBA: INI support (bundled) 2571- --disable-flatfile DBA: FlatFile support (bundled) 2572- --disable-dom Disable DOM support 2573- --enable-exif Enable EXIF (metadata from images) support 2574- --disable-fileinfo Disable fileinfo support 2575- --disable-filter Disable input filter support 2576- --enable-ftp Enable FTP support 2577- --enable-gd-native-ttf GD: Enable TrueType string function 2578- --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support 2579- --disable-hash Disable hash support 2580- --enable-intl Enable internationalization support 2581- --disable-json Disable JavaScript Object Serialization support 2582- --enable-mbstring Enable multibyte string support 2583- --disable-mbregex MBSTRING: Disable multibyte regex support 2584- --disable-mbregex-backtrack 2585- MBSTRING: Disable multibyte regex backtrack check 2586- --enable-embedded-mysqli MYSQLi: Enable embedded support 2587- Note: Does not work with MySQL native driver! 2588- --enable-pcntl Enable pcntl support (CLI/CGI only) 2589- --disable-pdo Disable PHP Data Objects support 2590- --disable-phar Disable phar support 2591- --disable-posix Disable POSIX-like functions 2592- --disable-session Disable session support 2593- --enable-shmop Enable shmop support 2594- --disable-simplexml Disable SimpleXML support 2595- --enable-ucd-snmp-hack SNMP: Enable UCD SNMP hack 2596- --enable-soap Enable SOAP support 2597- --enable-sockets Enable sockets support 2598- --enable-sqlite-utf8 SQLite: Enable UTF-8 support for SQLite 2599- --enable-sysvmsg Enable sysvmsg support 2600- --enable-sysvsem Enable System V semaphore support 2601- --enable-sysvshm Enable the System V shared memory support 2602- --disable-tokenizer Disable tokenizer support 2603- --enable-wddx Enable WDDX support 2604- --disable-xml Disable XML support 2605- --disable-xmlreader Disable XMLReader support 2606- --disable-xmlwriter Disable XMLWriter support 2607- --enable-zip Include Zip read/write support 2608- --enable-mysqlnd Enable mysqlnd explicitly, will be done implicitly 2609- when required by other extensions 2610- --disable-mysqlnd-compression-support 2611- Disable support for the MySQL compressed protocol in mysqlnd 2612- 2613-PEAR: 2614- 2615- 2616-Zend: 2617- 2618- --enable-maintainer-zts Enable thread safety - for code maintainers only!! 2619- --disable-inline-optimization 2620- If building zend_execute.lo fails, try this switch 2621- --enable-zend-multibyte Compile with zend multibyte support 2622- 2623-TSRM: 2624- 2625- 2626-Libtool: 2627- 2628- --enable-shared=PKGS build shared libraries default=yes 2629- --enable-static=PKGS build static libraries default=yes 2630- --enable-fast-install=PKGS optimize for fast installation default=yes 2631- --disable-libtool-lock avoid locking (might break parallel builds) 2632- 2633-Optional Packages: 2634- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 2635- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 2636- --with-libdir=NAME Look for libraries in .../NAME rather than .../lib 2637- --with-aolserver=DIR Specify path to the installed AOLserver 2638- --with-apxs=FILE Build shared Apache 1.x module. FILE is the optional 2639- pathname to the Apache apxs tool apxs 2640- --with-apache=DIR Build Apache 1.x module. DIR is the top-level Apache 2641- build directory /usr/local/apache 2642- --with-apxs2filter=FILE 2643- EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional 2644- pathname to the Apache apxs tool apxs 2645- --with-apxs2=FILE Build shared Apache 2.0 Handler module. FILE is the optional 2646- pathname to the Apache apxs tool apxs 2647- --with-apache-hooks=FILE 2648- EXPERIMENTAL: Build shared Apache 1.x module. FILE is the optional 2649- pathname to the Apache apxs tool apxs 2650- --with-apache-hooks-static=DIR 2651- EXPERIMENTAL: Build Apache 1.x module. DIR is the top-level Apache 2652- build directory /usr/local/apache 2653- --with-caudium=DIR Build PHP as a Pike module for use with Caudium. 2654- DIR is the Caudium server dir /usr/local/caudium/server 2655- --with-continuity=DIR Build PHP as Continuity Server module. 2656- DIR is path to the installed Continuity Server root 2657- --with-fpm-user=USER Set the user for php-fpm to run as. (default: nobody) 2658- --with-fpm-group=GRP Set the group for php-fpm to run as. For a system user, this 2659- should usually be set to match the fpm username (default: nobody) 2660- --with-isapi=DIR Build PHP as an ISAPI module for use with Zeus 2661- --with-litespeed Build PHP as litespeed module 2662- --with-milter=DIR Build PHP as Milter application 2663- --with-nsapi=DIR Build PHP as NSAPI module for Netscape/iPlanet/Sun Webserver 2664- --with-phttpd=DIR Build PHP as phttpd module 2665- --with-pi3web=DIR Build PHP as Pi3Web module 2666- --with-roxen=DIR Build PHP as a Pike module. DIR is the base Roxen 2667- directory, normally /usr/local/roxen/server 2668- --with-thttpd=SRCDIR Build PHP as thttpd module 2669- --with-tux=MODULEDIR Build PHP as a TUX module (Linux only) 2670- --with-webjames=SRCDIR Build PHP as a WebJames module (RISC OS only) 2671- --with-layout=TYPE Set how installed files will be laid out. Type can 2672- be either PHP or GNU PHP 2673- --with-config-file-path=PATH 2674- Set the path in which to look for php.ini PREFIX/lib 2675- --with-config-file-scan-dir=PATH 2676- Set the path where to scan for configuration files 2677- --with-exec-dir=DIR Only allow executables in DIR under safe-mode 2678- /usr/local/php/bin 2679- --with-regex=TYPE regex library type: system, php. TYPE=php 2680- WARNING: Do NOT use unless you know what you are doing! 2681- --with-libxml-dir=DIR LIBXML: libxml2 install prefix 2682- --with-openssl=DIR Include OpenSSL support (requires OpenSSL >= 0.9.6) 2683- --with-kerberos=DIR OPENSSL: Include Kerberos support 2684- --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support. 2685- DIR is the PCRE install prefix BUNDLED 2686- --without-sqlite3=DIR Do not include SQLite3 support. DIR is the prefix to 2687- SQLite3 installation directory. 2688- --with-zlib=DIR Include ZLIB support (requires zlib >= 1.0.9) 2689- --with-zlib-dir=<DIR> Define the location of zlib install directory 2690- --with-bz2=DIR Include BZip2 support 2691- --with-curl=DIR Include cURL support 2692- --with-curlwrappers EXPERIMENTAL: Use cURL for url streams 2693- --with-qdbm=DIR DBA: QDBM support 2694- --with-gdbm=DIR DBA: GDBM support 2695- --with-ndbm=DIR DBA: NDBM support 2696- --with-db4=DIR DBA: Oracle Berkeley DB 4.x or 5.x support 2697- --with-db3=DIR DBA: Oracle Berkeley DB 3.x support 2698- --with-db2=DIR DBA: Oracle Berkeley DB 2.x support 2699- --with-db1=DIR DBA: Oracle Berkeley DB 1.x support/emulation 2700- --with-dbm=DIR DBA: DBM support 2701- --without-cdb=DIR DBA: CDB support (bundled) 2702- --with-libxml-dir=DIR DOM: libxml2 install prefix 2703- --with-enchant=DIR Include enchant support. 2704- GNU Aspell version 1.1.3 or higher required. 2705- --with-pcre-dir FILTER: pcre install prefix 2706- --with-openssl-dir=DIR FTP: openssl install prefix 2707- --with-gd=DIR Include GD support. DIR is the GD library base 2708- install directory BUNDLED 2709- --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix 2710- --with-png-dir=DIR GD: Set the path to libpng install prefix 2711- --with-zlib-dir=DIR GD: Set the path to libz install prefix 2712- --with-xpm-dir=DIR GD: Set the path to libXpm install prefix 2713- --with-freetype-dir=DIR GD: Set the path to FreeType 2 install prefix 2714- --with-t1lib=DIR GD: Include T1lib support. T1lib version >= 5.0.0 required 2715- --with-gettext=DIR Include GNU gettext support 2716- --with-gmp=DIR Include GNU MP support 2717- --with-mhash=DIR Include mhash support 2718- --without-iconv=DIR Exclude iconv support 2719- --with-imap=DIR Include IMAP support. DIR is the c-client install prefix 2720- --with-kerberos=DIR IMAP: Include Kerberos support. DIR is the Kerberos install prefix 2721- --with-imap-ssl=DIR IMAP: Include SSL support. DIR is the OpenSSL install prefix 2722- --with-interbase=DIR Include InterBase support. DIR is the InterBase base 2723- install directory /usr/interbase 2724- --with-icu-dir=DIR Specify where ICU libraries and headers can be found 2725- --with-ldap=DIR Include LDAP support 2726- --with-ldap-sasl=DIR LDAP: Include Cyrus SASL support 2727- --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base 2728- install directory BUNDLED 2729- --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. 2730- If DIR is not set, the bundled oniguruma will be used 2731- --with-mcrypt=DIR Include mcrypt support 2732- --with-mssql=DIR Include MSSQL-DB support. DIR is the FreeTDS home 2733- directory /usr/local/freetds 2734- --with-mysql=DIR Include MySQL support. DIR is the MySQL base 2735- directory. If mysqlnd is passed as DIR, 2736- the MySQL native driver will be used /usr/local 2737- --with-mysql-sock=DIR MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. 2738- If unspecified, the default locations are searched 2739- --with-zlib-dir=DIR MySQL: Set the path to libz install prefix 2740- --with-mysqli=FILE Include MySQLi support. FILE is the path 2741- to mysql_config. If mysqlnd is passed as FILE, 2742- the MySQL native driver will be used mysql_config 2743- --with-oci8=DIR Include Oracle Database OCI8 support. DIR defaults to \$ORACLE_HOME. 2744- Use --with-oci8=instantclient,/path/to/instant/client/lib 2745- to use an Oracle Instant Client installation 2746- --with-adabas=DIR Include Adabas D support /usr/local 2747- --with-sapdb=DIR Include SAP DB support /usr/local 2748- --with-solid=DIR Include Solid support /usr/local/solid 2749- --with-ibm-db2=DIR Include IBM DB2 support /home/db2inst1/sqllib 2750- --with-ODBCRouter=DIR Include ODBCRouter.com support /usr 2751- --with-empress=DIR Include Empress support \$EMPRESSPATH 2752- (Empress Version >= 8.60 required) 2753- --with-empress-bcs=DIR 2754- Include Empress Local Access support \$EMPRESSPATH 2755- (Empress Version >= 8.60 required) 2756- --with-birdstep=DIR Include Birdstep support /usr/local/birdstep 2757- --with-custom-odbc=DIR 2758- Include user defined ODBC support. DIR is ODBC install base 2759- directory /usr/local. Make sure to define CUSTOM_ODBC_LIBS and 2760- have some odbc.h in your include dirs. f.e. you should define 2761- following for Sybase SQL Anywhere 5.5.00 on QNX, prior to 2762- running this configure script: 2763- CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" 2764- LDFLAGS=-lunix 2765- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\" 2766- --with-iodbc=DIR Include iODBC support /usr/local 2767- --with-esoob=DIR Include Easysoft OOB support /usr/local/easysoft/oob/client 2768- --with-unixODBC=DIR Include unixODBC support /usr/local 2769- --with-dbmaker=DIR Include DBMaker support 2770- --with-pdo-dblib=DIR PDO: DBLIB-DB support. DIR is the FreeTDS home directory 2771- --with-pdo-firebird=DIR PDO: Firebird support. DIR is the Firebird base 2772- install directory /opt/firebird 2773- --with-pdo-mysql=DIR PDO: MySQL support. DIR is the MySQL base directory 2774- If mysqlnd is passed as DIR, the MySQL native 2775- native driver will be used /usr/local 2776- --with-zlib-dir=DIR PDO_MySQL: Set the path to libz install prefix 2777- --with-pdo-oci=DIR PDO: Oracle OCI support. DIR defaults to \$ORACLE_HOME. 2778- Use --with-pdo-oci=instantclient,prefix,version 2779- for an Oracle Instant Client SDK. 2780- For example on Linux with 11.2 RPMs use: 2781- --with-pdo-oci=instantclient,/usr,11.2 2782- With 10.2 RPMs use: 2783- --with-pdo-oci=instantclient,/usr,10.2.0.4 2784- --with-pdo-odbc=flavour,dir 2785- PDO: Support for 'flavour' ODBC driver. 2786- include and lib dirs are looked for under 'dir'. 2787- 2788- 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic 2789- If ',dir' part is omitted, default for the flavour 2790- you have selected will used. e.g.: 2791- 2792- --with-pdo-odbc=unixODBC 2793- 2794- will check for unixODBC under /usr/local. You may attempt 2795- to use an otherwise unsupported driver using the \"generic\" 2796- flavour. The syntax for generic ODBC support is: 2797- 2798- --with-pdo-odbc=generic,dir,libname,ldflags,cflags 2799- 2800- When build as shared the extension filename is always pdo_odbc.so 2801- --with-pdo-pgsql=DIR PDO: PostgreSQL support. DIR is the PostgreSQL base 2802- install directory or the path to pg_config 2803- --without-pdo-sqlite=DIR 2804- PDO: sqlite 3 support. DIR is the sqlite base 2805- install directory BUNDLED 2806- --with-pgsql=DIR Include PostgreSQL support. DIR is the PostgreSQL 2807- base install directory or the path to pg_config 2808- --with-pspell=DIR Include PSPELL support. 2809- GNU Aspell version 0.50.0 or higher required 2810- --with-libedit=DIR Include libedit readline replacement (CLI/CGI only) 2811- --with-readline=DIR Include readline support (CLI/CGI only) 2812- --with-recode=DIR Include recode support 2813- --with-mm=DIR SESSION: Include mm support for session storage 2814- --with-libxml-dir=DIR SimpleXML: libxml2 install prefix 2815- --with-snmp=DIR Include SNMP support 2816- --with-openssl-dir=DIR SNMP: openssl install prefix 2817- --with-libxml-dir=DIR SOAP: libxml2 install prefix 2818- --without-sqlite=DIR Do not include sqlite support. DIR is the sqlite base 2819- install directory BUNDLED 2820- --with-sybase-ct=DIR Include Sybase-CT support. DIR is the Sybase home 2821- directory /home/sybase 2822- --with-tidy=DIR Include TIDY support 2823- --with-libxml-dir=DIR WDDX: libxml2 install prefix 2824- --with-libexpat-dir=DIR WDDX: libexpat dir for XMLRPC-EPI (deprecated) 2825- --with-libxml-dir=DIR XML: libxml2 install prefix 2826- --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated) 2827- --with-libxml-dir=DIR XMLReader: libxml2 install prefix 2828- --with-xmlrpc=DIR Include XMLRPC-EPI support 2829- --with-libxml-dir=DIR XMLRPC-EPI: libxml2 install prefix 2830- --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated) 2831- --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI 2832- --with-libxml-dir=DIR XMLWriter: libxml2 install prefix 2833- --with-xsl=DIR Include XSL support. DIR is the libxslt base 2834- install directory (libxslt >= 1.1.0 required) 2835- --with-zlib-dir=DIR ZIP: Set the path to libz install prefix 2836- --with-pcre-dir ZIP: pcre install prefix 2837- --with-zlib-dir=DIR mysqlnd: Set the path to libz install prefix 2838- --with-pear=DIR Install PEAR in DIR PREFIX/lib/php 2839- --without-pear Do not install PEAR 2840- --with-zend-vm=TYPE Set virtual machine dispatch method. Type is 2841- one of "CALL", "SWITCH" or "GOTO" TYPE=CALL 2842- --with-tsrm-pth=pth-config 2843- Use GNU Pth 2844- --with-tsrm-st Use SGI's State Threads 2845- --with-tsrm-pthreads Use POSIX threads (default) 2846- --with-gnu-ld assume the C compiler uses GNU ld default=no 2847- --with-pic try to use only PIC/non-PIC objects default=use both 2848- --with-tags=TAGS include additional configurations automatic 2849- 2850- 2851-Some influential environment variables: 2852- CC C compiler command 2853- CFLAGS C compiler flags 2854- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a 2855- nonstandard directory <lib dir> 2856- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have 2857- headers in a nonstandard directory <include dir> 2858- CPP C preprocessor 2859- CXX C++ compiler command 2860- CXXFLAGS C++ compiler flags 2861- CXXCPP C++ preprocessor 2862- 2863-Use these variables to override the choices made by `configure' or to help 2864-it to find libraries and programs with nonstandard names/locations. 2865- 2866-_ACEOF 2867-fi 2868- 2869-if test "$ac_init_help" = "recursive"; then 2870- # If there are subdirs, report their specific --help. 2871- ac_popdir=`pwd` 2872- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue 2873- test -d $ac_dir || continue 2874- ac_builddir=. 2875- 2876-if test "$ac_dir" != .; then 2877- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` 2878- # A "../" for each directory in $ac_dir_suffix. 2879- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` 2880-else 2881- ac_dir_suffix= ac_top_builddir= 2882-fi 2883- 2884-case $srcdir in 2885- .) # No --srcdir option. We are building in place. 2886- ac_srcdir=. 2887- if test -z "$ac_top_builddir"; then 2888- ac_top_srcdir=. 2889- else 2890- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` 2891- fi ;; 2892- [\\/]* | ?:[\\/]* ) # Absolute path. 2893- ac_srcdir=$srcdir$ac_dir_suffix; 2894- ac_top_srcdir=$srcdir ;; 2895- *) # Relative path. 2896- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix 2897- ac_top_srcdir=$ac_top_builddir$srcdir ;; 2898-esac 2899- 2900-# Do not use `cd foo && pwd` to compute absolute paths, because 2901-# the directories may not exist. 2902-case `pwd` in 2903-.) ac_abs_builddir="$ac_dir";; 2904-*) 2905- case "$ac_dir" in 2906- .) ac_abs_builddir=`pwd`;; 2907- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; 2908- *) ac_abs_builddir=`pwd`/"$ac_dir";; 2909- esac;; 2910-esac 2911-case $ac_abs_builddir in 2912-.) ac_abs_top_builddir=${ac_top_builddir}.;; 2913-*) 2914- case ${ac_top_builddir}. in 2915- .) ac_abs_top_builddir=$ac_abs_builddir;; 2916- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; 2917- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; 2918- esac;; 2919-esac 2920-case $ac_abs_builddir in 2921-.) ac_abs_srcdir=$ac_srcdir;; 2922-*) 2923- case $ac_srcdir in 2924- .) ac_abs_srcdir=$ac_abs_builddir;; 2925- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; 2926- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; 2927- esac;; 2928-esac 2929-case $ac_abs_builddir in 2930-.) ac_abs_top_srcdir=$ac_top_srcdir;; 2931-*) 2932- case $ac_top_srcdir in 2933- .) ac_abs_top_srcdir=$ac_abs_builddir;; 2934- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; 2935- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; 2936- esac;; 2937-esac 2938- 2939- cd $ac_dir 2940- # Check for guested configure; otherwise get Cygnus style configure. 2941- if test -f $ac_srcdir/configure.gnu; then 2942- echo 2943- $SHELL $ac_srcdir/configure.gnu --help=recursive 2944- elif test -f $ac_srcdir/configure; then 2945- echo 2946- $SHELL $ac_srcdir/configure --help=recursive 2947- elif test -f $ac_srcdir/configure.ac || 2948- test -f $ac_srcdir/configure.in; then 2949- echo 2950- $ac_configure --help 2951- else 2952- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 2953- fi 2954- cd $ac_popdir 2955- done 2956-fi 2957- 2958-test -n "$ac_init_help" && exit 0 2959-if $ac_init_version; then 2960- cat <<\_ACEOF 2961- 2962-Copyright (C) 2003 Free Software Foundation, Inc. 2963-This configure script is free software; the Free Software Foundation 2964-gives unlimited permission to copy, distribute and modify it. 2965-_ACEOF 2966- exit 0 2967-fi 2968-exec 5>config.log 2969-cat >&5 <<_ACEOF 2970-This file contains any messages produced by compilers while 2971-running configure, to aid debugging if configure makes a mistake. 2972- 2973-It was created by $as_me, which was 2974-generated by GNU Autoconf 2.59. Invocation command line was 2975- 2976- $ $0 $@ 2977- 2978-_ACEOF 2979-{ 2980-cat <<_ASUNAME 2981-## --------- ## 2982-## Platform. ## 2983-## --------- ## 2984- 2985-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` 2986-uname -m = `(uname -m) 2>/dev/null || echo unknown` 2987-uname -r = `(uname -r) 2>/dev/null || echo unknown` 2988-uname -s = `(uname -s) 2>/dev/null || echo unknown` 2989-uname -v = `(uname -v) 2>/dev/null || echo unknown` 2990- 2991-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` 2992-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` 2993- 2994-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` 2995-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` 2996-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` 2997-hostinfo = `(hostinfo) 2>/dev/null || echo unknown` 2998-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` 2999-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` 3000-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` 3001- 3002-_ASUNAME 3003- 3004-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3005-for as_dir in $PATH 3006-do 3007- IFS=$as_save_IFS 3008- test -z "$as_dir" && as_dir=. 3009- echo "PATH: $as_dir" 3010-done 3011- 3012-} >&5 3013- 3014-cat >&5 <<_ACEOF 3015- 3016- 3017-## ----------- ## 3018-## Core tests. ## 3019-## ----------- ## 3020- 3021-_ACEOF 3022- 3023- 3024-# Keep a trace of the command line. 3025-# Strip out --no-create and --no-recursion so they do not pile up. 3026-# Strip out --silent because we don't want to record it for future runs. 3027-# Also quote any args containing shell meta-characters. 3028-# Make two passes to allow for proper duplicate-argument suppression. 3029-ac_configure_args= 3030-ac_configure_args0= 3031-ac_configure_args1= 3032-ac_sep= 3033-ac_must_keep_next=false 3034-for ac_pass in 1 2 3035-do 3036- for ac_arg 3037- do 3038- case $ac_arg in 3039- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; 3040- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 3041- | -silent | --silent | --silen | --sile | --sil) 3042- continue ;; 3043- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) 3044- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; 3045- esac 3046- case $ac_pass in 3047- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; 3048- 2) 3049- ac_configure_args1="$ac_configure_args1 '$ac_arg'" 3050- if test $ac_must_keep_next = true; then 3051- ac_must_keep_next=false # Got value, back to normal. 3052- else 3053- case $ac_arg in 3054- *=* | --config-cache | -C | -disable-* | --disable-* \ 3055- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ 3056- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ 3057- | -with-* | --with-* | -without-* | --without-* | --x) 3058- case "$ac_configure_args0 " in 3059- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; 3060- esac 3061- ;; 3062- -* ) ac_must_keep_next=true ;; 3063- esac 3064- fi 3065- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" 3066- # Get rid of the leading space. 3067- ac_sep=" " 3068- ;; 3069- esac 3070- done 3071-done 3072-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } 3073-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } 3074+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` 3075 3076-# When interrupted or exit'd, cleanup temporary files, and complete 3077-# config.log. We remove comments because anyway the quotes in there 3078-# would cause problems or look ugly. 3079-# WARNING: Be sure not to use single quotes in there, as some shells, 3080-# such as our DU 5.0 friend, will then `close' the trap. 3081-trap 'exit_status=$? 3082- # Save into config.log some information that might help in debugging. 3083- { 3084- echo 3085- 3086- cat <<\_ASBOX 3087-## ---------------- ## 3088-## Cache variables. ## 3089-## ---------------- ## 3090-_ASBOX 3091- echo 3092- # The following way of writing the cache mishandles newlines in values, 3093-{ 3094- (set) 2>&1 | 3095- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in 3096- *ac_space=\ *) 3097- sed -n \ 3098- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; 3099- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" 3100- ;; 3101- *) 3102- sed -n \ 3103- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" 3104- ;; 3105- esac; 3106-} 3107- echo 3108- 3109- cat <<\_ASBOX 3110-## ----------------- ## 3111-## Output variables. ## 3112-## ----------------- ## 3113-_ASBOX 3114- echo 3115- for ac_var in $ac_subst_vars 3116- do 3117- eval ac_val=$`echo $ac_var` 3118- echo "$ac_var='"'"'$ac_val'"'"'" 3119- done | sort 3120- echo 3121- 3122- if test -n "$ac_subst_files"; then 3123- cat <<\_ASBOX 3124-## ------------- ## 3125-## Output files. ## 3126-## ------------- ## 3127-_ASBOX 3128- echo 3129- for ac_var in $ac_subst_files 3130- do 3131- eval ac_val=$`echo $ac_var` 3132- echo "$ac_var='"'"'$ac_val'"'"'" 3133- done | sort 3134- echo 3135- fi 3136- 3137- if test -s confdefs.h; then 3138- cat <<\_ASBOX 3139-## ----------- ## 3140-## confdefs.h. ## 3141-## ----------- ## 3142-_ASBOX 3143- echo 3144- sed "/^$/d" confdefs.h | sort 3145- echo 3146- fi 3147- test "$ac_signal" != 0 && 3148- echo "$as_me: caught signal $ac_signal" 3149- echo "$as_me: exit $exit_status" 3150- } >&5 3151- rm -f core *.core && 3152- rm -rf conftest* confdefs* conf$$* $ac_clean_files && 3153- exit $exit_status 3154- ' 0 3155-for ac_signal in 1 2 13 15; do 3156- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal 3157-done 3158-ac_signal=0 3159- 3160-# confdefs.h avoids OS command line length limits that DEFS can exceed. 3161-rm -rf conftest* confdefs.h 3162-# AIX cpp loses on an empty file, so make sure it contains at least a newline. 3163-echo >confdefs.h 3164- 3165-# Predefined preprocessor variables. 3166- 3167-cat >>confdefs.h <<_ACEOF 3168-#define PACKAGE_NAME "$PACKAGE_NAME" 3169-_ACEOF 3170- 3171- 3172-cat >>confdefs.h <<_ACEOF 3173-#define PACKAGE_TARNAME "$PACKAGE_TARNAME" 3174-_ACEOF 3175- 3176- 3177-cat >>confdefs.h <<_ACEOF 3178-#define PACKAGE_VERSION "$PACKAGE_VERSION" 3179-_ACEOF 3180- 3181- 3182-cat >>confdefs.h <<_ACEOF 3183-#define PACKAGE_STRING "$PACKAGE_STRING" 3184-_ACEOF 3185- 3186- 3187-cat >>confdefs.h <<_ACEOF 3188-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" 3189-_ACEOF 3190- 3191- 3192-# Let the site file select an alternate cache file if it wants to. 3193 # Prefer explicitly selected file to automatically selected ones. 3194 if test -z "$CONFIG_SITE"; then 3195 if test "x$prefix" != xNONE; then 3196@@ -1744,125 +1854,127 @@ 3197 fi 3198 for ac_site_file in $CONFIG_SITE; do 3199 if test -r "$ac_site_file"; then 3200- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 3201-echo "$as_me: loading site script $ac_site_file" >&6;} 3202- sed 's/^/| /' "$ac_site_file" >&5 3203+ echo "loading site script $ac_site_file" 3204 . "$ac_site_file" 3205 fi 3206 done 3207 3208 if test -r "$cache_file"; then 3209- # Some versions of bash will fail to source /dev/null (special 3210- # files actually), so we avoid doing that. 3211- if test -f "$cache_file"; then 3212- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 3213-echo "$as_me: loading cache $cache_file" >&6;} 3214- case $cache_file in 3215- [\\/]* | ?:[\\/]* ) . $cache_file;; 3216- *) . ./$cache_file;; 3217- esac 3218- fi 3219+ echo "loading cache $cache_file" 3220+ . $cache_file 3221 else 3222- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 3223-echo "$as_me: creating cache $cache_file" >&6;} 3224- >$cache_file 3225-fi 3226- 3227-# Check that the precious variables saved in the cache have kept the same 3228-# value. 3229-ac_cache_corrupted=false 3230-for ac_var in `(set) 2>&1 | 3231- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do 3232- eval ac_old_set=\$ac_cv_env_${ac_var}_set 3233- eval ac_new_set=\$ac_env_${ac_var}_set 3234- eval ac_old_val="\$ac_cv_env_${ac_var}_value" 3235- eval ac_new_val="\$ac_env_${ac_var}_value" 3236- case $ac_old_set,$ac_new_set in 3237- set,) 3238- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 3239-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} 3240- ac_cache_corrupted=: ;; 3241- ,set) 3242- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 3243-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} 3244- ac_cache_corrupted=: ;; 3245- ,);; 3246- *) 3247- if test "x$ac_old_val" != "x$ac_new_val"; then 3248- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 3249-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} 3250- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 3251-echo "$as_me: former value: $ac_old_val" >&2;} 3252- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 3253-echo "$as_me: current value: $ac_new_val" >&2;} 3254- ac_cache_corrupted=: 3255- fi;; 3256- esac 3257- # Pass precious variables to config.status. 3258- if test "$ac_new_set" = set; then 3259- case $ac_new_val in 3260- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) 3261- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; 3262- *) ac_arg=$ac_var=$ac_new_val ;; 3263- esac 3264- case " $ac_configure_args " in 3265- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. 3266- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; 3267- esac 3268- fi 3269-done 3270-if $ac_cache_corrupted; then 3271- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 3272-echo "$as_me: error: changes in the environment can compromise the build" >&2;} 3273- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 3274-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} 3275- { (exit 1); exit 1; }; } 3276+ echo "creating cache $cache_file" 3277+ > $cache_file 3278 fi 3279 3280 ac_ext=c 3281+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 3282 ac_cpp='$CPP $CPPFLAGS' 3283-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3284-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3285-ac_compiler_gnu=$ac_cv_c_compiler_gnu 3286- 3287- 3288- 3289- 3290- 3291- 3292- 3293+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 3294+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 3295+cross_compiling=$ac_cv_prog_cc_cross 3296 3297+ac_exeext= 3298+ac_objext=o 3299+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then 3300+ # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. 3301+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then 3302+ ac_n= ac_c=' 3303+' ac_t=' ' 3304+ else 3305+ ac_n=-n ac_c= ac_t= 3306+ fi 3307+else 3308+ ac_n= ac_c='\c' ac_t= 3309+fi 3310 3311 3312 3313 3314 3315+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 3316+echo "configure:1897: checking for Cygwin environment" >&5 3317+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then 3318+ echo $ac_n "(cached) $ac_c" 1>&6 3319+else 3320+ cat > conftest.$ac_ext <<EOF 3321+#line 1902 "configure" 3322+#include "confdefs.h" 3323 3324+int main() { 3325 3326+#ifndef __CYGWIN__ 3327+#define __CYGWIN__ __CYGWIN32__ 3328+#endif 3329+return __CYGWIN__; 3330+; return 0; } 3331+EOF 3332+if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3333+ rm -rf conftest* 3334+ ac_cv_cygwin=yes 3335+else 3336+ echo "configure: failed program was:" >&5 3337+ cat conftest.$ac_ext >&5 3338+ rm -rf conftest* 3339+ ac_cv_cygwin=no 3340+fi 3341+rm -f conftest* 3342+rm -f conftest* 3343+fi 3344 3345+echo "$ac_t""$ac_cv_cygwin" 1>&6 3346+CYGWIN= 3347+test "$ac_cv_cygwin" = yes && CYGWIN=yes 3348+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 3349+echo "configure:1930: checking for mingw32 environment" >&5 3350+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then 3351+ echo $ac_n "(cached) $ac_c" 1>&6 3352+else 3353+ cat > conftest.$ac_ext <<EOF 3354+#line 1935 "configure" 3355+#include "confdefs.h" 3356 3357+int main() { 3358+return __MINGW32__; 3359+; return 0; } 3360+EOF 3361+if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3362+ rm -rf conftest* 3363+ ac_cv_mingw32=yes 3364+else 3365+ echo "configure: failed program was:" >&5 3366+ cat conftest.$ac_ext >&5 3367+ rm -rf conftest* 3368+ ac_cv_mingw32=no 3369+fi 3370+rm -f conftest* 3371+rm -f conftest* 3372+fi 3373 3374+echo "$ac_t""$ac_cv_mingw32" 1>&6 3375+MINGW32= 3376+test "$ac_cv_mingw32" = yes && MINGW32=yes 3377 3378 3379-echo "$as_me:$LINENO: checking for egrep" >&5 3380-echo $ECHO_N "checking for egrep... $ECHO_C" >&6 3381-if test "${ac_cv_prog_egrep+set}" = set; then 3382- echo $ECHO_N "(cached) $ECHO_C" >&6 3383+echo $ac_n "checking for egrep""... $ac_c" 1>&6 3384+echo "configure:1961: checking for egrep" >&5 3385+if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then 3386+ echo $ac_n "(cached) $ac_c" 1>&6 3387 else 3388 if echo a | (grep -E '(a|b)') >/dev/null 2>&1 3389 then ac_cv_prog_egrep='grep -E' 3390 else ac_cv_prog_egrep='egrep' 3391 fi 3392 fi 3393-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 3394-echo "${ECHO_T}$ac_cv_prog_egrep" >&6 3395- EGREP=$ac_cv_prog_egrep 3396 3397+echo "$ac_t""$ac_cv_prog_egrep" 1>&6 3398+ EGREP=$ac_cv_prog_egrep 3399+ 3400 3401-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 3402-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 3403-if test "${lt_cv_path_SED+set}" = set; then 3404- echo $ECHO_N "(cached) $ECHO_C" >&6 3405+echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 3406+echo "configure:1976: checking for a sed that does not truncate output" >&5 3407+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then 3408+ echo $ac_n "(cached) $ac_c" 1>&6 3409 else 3410 # Loop through the user's path and test for sed and gsed. 3411 # Then use that list of sed's as ones to test for truncation. 3412@@ -1913,23 +2025,22 @@ 3413 fi 3414 3415 SED=$lt_cv_path_SED 3416-echo "$as_me:$LINENO: result: $SED" >&5 3417-echo "${ECHO_T}$SED" >&6 3418- 3419- 3420- 3421- 3422+echo "$ac_t""$SED" 1>&6 3423 3424 3425+ 3426+ 3427+ 3428+ 3429 PHP_VAR_SUBST="$PHP_VAR_SUBST EGREP" 3430 3431+ 3432 3433- 3434- 3435- 3436+ 3437+ 3438 PHP_VAR_SUBST="$PHP_VAR_SUBST SED" 3439 3440- 3441+ 3442 3443 test -f config.nice && mv config.nice config.nice.old 3444 rm -f config.nice.old 3445@@ -1950,7 +2061,7 @@ 3446 echo "'$0' \\" >> config.nice 3447 if test `expr -- $0 : "'.*"` = 0; then 3448 CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$0'" 3449- else 3450+ else 3451 CONFIGURE_COMMAND="$CONFIGURE_COMMAND $0" 3452 fi 3453 for arg in $ac_configure_args; do 3454@@ -1971,17 +2082,17 @@ 3455 echo '"$@"' >> config.nice 3456 chmod +x config.nice 3457 CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS" 3458- 3459- 3460+ 3461+ 3462 PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_COMMAND" 3463 3464+ 3465 3466- 3467- 3468- 3469+ 3470+ 3471 PHP_VAR_SUBST="$PHP_VAR_SUBST CONFIGURE_OPTIONS" 3472 3473- 3474+ 3475 3476 3477 3478@@ -1995,115 +2106,69 @@ 3479 ac_aux_dir=$ac_dir 3480 ac_install_sh="$ac_aux_dir/install.sh -c" 3481 break 3482- elif test -f $ac_dir/shtool; then 3483- ac_aux_dir=$ac_dir 3484- ac_install_sh="$ac_aux_dir/shtool install -c" 3485- break 3486 fi 3487 done 3488 if test -z "$ac_aux_dir"; then 3489- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 3490-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} 3491- { (exit 1); exit 1; }; } 3492-fi 3493-ac_config_guess="$SHELL $ac_aux_dir/config.guess" 3494-ac_config_sub="$SHELL $ac_aux_dir/config.sub" 3495-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. 3496+ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } 3497+fi 3498+ac_config_guess=$ac_aux_dir/config.guess 3499+ac_config_sub=$ac_aux_dir/config.sub 3500+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. 3501+ 3502 3503 # Make sure we can run config.sub. 3504-$ac_config_sub sun4 >/dev/null 2>&1 || 3505- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 3506-echo "$as_me: error: cannot run $ac_config_sub" >&2;} 3507- { (exit 1); exit 1; }; } 3508- 3509-echo "$as_me:$LINENO: checking build system type" >&5 3510-echo $ECHO_N "checking build system type... $ECHO_C" >&6 3511-if test "${ac_cv_build+set}" = set; then 3512- echo $ECHO_N "(cached) $ECHO_C" >&6 3513-else 3514- ac_cv_build_alias=$build_alias 3515-test -z "$ac_cv_build_alias" && 3516- ac_cv_build_alias=`$ac_config_guess` 3517-test -z "$ac_cv_build_alias" && 3518- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 3519-echo "$as_me: error: cannot guess build type; you must specify one" >&2;} 3520- { (exit 1); exit 1; }; } 3521-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || 3522- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 3523-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} 3524- { (exit 1); exit 1; }; } 3525- 3526-fi 3527-echo "$as_me:$LINENO: result: $ac_cv_build" >&5 3528-echo "${ECHO_T}$ac_cv_build" >&6 3529-build=$ac_cv_build 3530-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 3531-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 3532-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 3533- 3534- 3535-echo "$as_me:$LINENO: checking host system type" >&5 3536-echo $ECHO_N "checking host system type... $ECHO_C" >&6 3537-if test "${ac_cv_host+set}" = set; then 3538- echo $ECHO_N "(cached) $ECHO_C" >&6 3539-else 3540- ac_cv_host_alias=$host_alias 3541-test -z "$ac_cv_host_alias" && 3542- ac_cv_host_alias=$ac_cv_build_alias 3543-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || 3544- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 3545-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} 3546- { (exit 1); exit 1; }; } 3547- 3548-fi 3549-echo "$as_me:$LINENO: result: $ac_cv_host" >&5 3550-echo "${ECHO_T}$ac_cv_host" >&6 3551-host=$ac_cv_host 3552-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 3553-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 3554-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 3555- 3556- 3557-echo "$as_me:$LINENO: checking target system type" >&5 3558-echo $ECHO_N "checking target system type... $ECHO_C" >&6 3559-if test "${ac_cv_target+set}" = set; then 3560- echo $ECHO_N "(cached) $ECHO_C" >&6 3561-else 3562- ac_cv_target_alias=$target_alias 3563-test "x$ac_cv_target_alias" = "x" && 3564- ac_cv_target_alias=$ac_cv_host_alias 3565-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || 3566- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 3567-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} 3568- { (exit 1); exit 1; }; } 3569- 3570-fi 3571-echo "$as_me:$LINENO: result: $ac_cv_target" >&5 3572-echo "${ECHO_T}$ac_cv_target" >&6 3573-target=$ac_cv_target 3574-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 3575-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 3576-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 3577- 3578- 3579-# The aliases save the names the user supplied, while $host etc. 3580-# will get canonicalized. 3581-test -n "$target_alias" && 3582- test "$program_prefix$program_suffix$program_transform_name" = \ 3583- NONENONEs,x,x, && 3584- program_prefix=${target_alias}- 3585+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : 3586+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } 3587+fi 3588+ 3589+echo $ac_n "checking host system type""... $ac_c" 1>&6 3590+echo "configure:2126: checking host system type" >&5 3591+ 3592+host_alias=$host 3593+case "$host_alias" in 3594+NONE) 3595+ case $nonopt in 3596+ NONE) 3597+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : 3598+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } 3599+ fi ;; 3600+ *) host_alias=$nonopt ;; 3601+ esac ;; 3602+esac 3603+ 3604+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` 3605+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 3606+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 3607+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 3608+echo "$ac_t""$host" 1>&6 3609+ 3610+echo $ac_n "checking target system type""... $ac_c" 1>&6 3611+echo "configure:2147: checking target system type" >&5 3612+ 3613+target_alias=$target 3614+case "$target_alias" in 3615+NONE) 3616+ case $nonopt in 3617+ NONE) target_alias=$host_alias ;; 3618+ *) target_alias=$nonopt ;; 3619+ esac ;; 3620+esac 3621+ 3622+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` 3623+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 3624+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 3625+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 3626+echo "$ac_t""$target" 1>&6 3627+ 3628 3629 if test -z "$host_alias" && test -n "$host"; then 3630 host_alias=$host 3631 fi 3632 if test -z "$host_alias"; then 3633- { { echo "$as_me:$LINENO: error: host_alias is not set!" >&5 3634-echo "$as_me: error: host_alias is not set!" >&2;} 3635- { (exit 1); exit 1; }; } 3636+ { echo "configure: error: host_alias is not set!" 1>&2; exit 1; } 3637 fi 3638 3639 3640- ac_config_headers="$ac_config_headers main/php_config.h" 3641 3642 3643 PHP_MAJOR_VERSION=5 3644@@ -2147,24 +2212,18 @@ 3645 3646 3647 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then 3648- { { echo "$as_me:$LINENO: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&5 3649-echo "$as_me: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&2;} 3650- { (exit 1); exit 1; }; } 3651+ { echo "configure: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" 1>&2; exit 1; } 3652 fi 3653 3654 if test -n "$with_apache" && test -n "$with_apxs"; then 3655- { { echo "$as_me:$LINENO: error: --with-apache and --with-apxs cannot be used together" >&5 3656-echo "$as_me: error: --with-apache and --with-apxs cannot be used together" >&2;} 3657- { (exit 1); exit 1; }; } 3658+ { echo "configure: error: --with-apache and --with-apxs cannot be used together" 1>&2; exit 1; } 3659 fi 3660 3661 if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then 3662- { { echo "$as_me:$LINENO: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&5 3663-echo "$as_me: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&2;} 3664- { (exit 1); exit 1; }; } 3665+ { echo "configure: error: --with-apxs2filter and --with-apxs2 cannot be used together" 1>&2; exit 1; } 3666 fi 3667 3668- 3669+ 3670 3671 cwd=`pwd` 3672 3673@@ -2193,442 +2252,214 @@ 3674 rm -f libs/* 3675 3676 3677-ac_ext=c 3678-ac_cpp='$CPP $CPPFLAGS' 3679-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 3680-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3681-ac_compiler_gnu=$ac_cv_c_compiler_gnu 3682-if test -n "$ac_tool_prefix"; then 3683- for ac_prog in cc gcc 3684- do 3685- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 3686-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3687-echo "$as_me:$LINENO: checking for $ac_word" >&5 3688-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3689-if test "${ac_cv_prog_CC+set}" = set; then 3690- echo $ECHO_N "(cached) $ECHO_C" >&6 3691+# Extract the first word of "gcc", so it can be a program name with args. 3692+set dummy gcc; ac_word=$2 3693+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 3694+echo "configure:2259: checking for $ac_word" >&5 3695+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 3696+ echo $ac_n "(cached) $ac_c" 1>&6 3697 else 3698 if test -n "$CC"; then 3699 ac_cv_prog_CC="$CC" # Let the user override the test. 3700 else 3701-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3702-for as_dir in $PATH 3703-do 3704- IFS=$as_save_IFS 3705- test -z "$as_dir" && as_dir=. 3706- for ac_exec_ext in '' $ac_executable_extensions; do 3707- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3708- ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 3709- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 3710- break 2 3711- fi 3712-done 3713-done 3714- 3715+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 3716+ ac_dummy="$PATH" 3717+ for ac_dir in $ac_dummy; do 3718+ test -z "$ac_dir" && ac_dir=. 3719+ if test -f $ac_dir/$ac_word; then 3720+ ac_cv_prog_CC="gcc" 3721+ break 3722+ fi 3723+ done 3724+ IFS="$ac_save_ifs" 3725 fi 3726 fi 3727-CC=$ac_cv_prog_CC 3728+CC="$ac_cv_prog_CC" 3729 if test -n "$CC"; then 3730- echo "$as_me:$LINENO: result: $CC" >&5 3731-echo "${ECHO_T}$CC" >&6 3732+ echo "$ac_t""$CC" 1>&6 3733 else 3734- echo "$as_me:$LINENO: result: no" >&5 3735-echo "${ECHO_T}no" >&6 3736+ echo "$ac_t""no" 1>&6 3737 fi 3738 3739- test -n "$CC" && break 3740- done 3741-fi 3742 if test -z "$CC"; then 3743- ac_ct_CC=$CC 3744- for ac_prog in cc gcc 3745-do 3746- # Extract the first word of "$ac_prog", so it can be a program name with args. 3747-set dummy $ac_prog; ac_word=$2 3748-echo "$as_me:$LINENO: checking for $ac_word" >&5 3749-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 3750-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then 3751- echo $ECHO_N "(cached) $ECHO_C" >&6 3752+ # Extract the first word of "cc", so it can be a program name with args. 3753+set dummy cc; ac_word=$2 3754+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 3755+echo "configure:2289: checking for $ac_word" >&5 3756+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 3757+ echo $ac_n "(cached) $ac_c" 1>&6 3758 else 3759- if test -n "$ac_ct_CC"; then 3760- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. 3761+ if test -n "$CC"; then 3762+ ac_cv_prog_CC="$CC" # Let the user override the test. 3763 else 3764-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3765-for as_dir in $PATH 3766-do 3767- IFS=$as_save_IFS 3768- test -z "$as_dir" && as_dir=. 3769- for ac_exec_ext in '' $ac_executable_extensions; do 3770- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 3771- ac_cv_prog_ac_ct_CC="$ac_prog" 3772- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 3773- break 2 3774+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 3775+ ac_prog_rejected=no 3776+ ac_dummy="$PATH" 3777+ for ac_dir in $ac_dummy; do 3778+ test -z "$ac_dir" && ac_dir=. 3779+ if test -f $ac_dir/$ac_word; then 3780+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then 3781+ ac_prog_rejected=yes 3782+ continue 3783+ fi 3784+ ac_cv_prog_CC="cc" 3785+ break 3786+ fi 3787+ done 3788+ IFS="$ac_save_ifs" 3789+if test $ac_prog_rejected = yes; then 3790+ # We found a bogon in the path, so make sure we never use it. 3791+ set dummy $ac_cv_prog_CC 3792+ shift 3793+ if test $# -gt 0; then 3794+ # We chose a different compiler from the bogus one. 3795+ # However, it has the same basename, so the bogon will be chosen 3796+ # first if we set CC to just the basename; use the full file name. 3797+ shift 3798+ set dummy "$ac_dir/$ac_word" "$@" 3799+ shift 3800+ ac_cv_prog_CC="$@" 3801 fi 3802-done 3803-done 3804- 3805 fi 3806 fi 3807-ac_ct_CC=$ac_cv_prog_ac_ct_CC 3808-if test -n "$ac_ct_CC"; then 3809- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 3810-echo "${ECHO_T}$ac_ct_CC" >&6 3811+fi 3812+CC="$ac_cv_prog_CC" 3813+if test -n "$CC"; then 3814+ echo "$ac_t""$CC" 1>&6 3815 else 3816- echo "$as_me:$LINENO: result: no" >&5 3817-echo "${ECHO_T}no" >&6 3818+ echo "$ac_t""no" 1>&6 3819 fi 3820 3821- test -n "$ac_ct_CC" && break 3822-done 3823- 3824- CC=$ac_ct_CC 3825+ if test -z "$CC"; then 3826+ case "`uname -s`" in 3827+ *win32* | *WIN32*) 3828+ # Extract the first word of "cl", so it can be a program name with args. 3829+set dummy cl; ac_word=$2 3830+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 3831+echo "configure:2340: checking for $ac_word" >&5 3832+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 3833+ echo $ac_n "(cached) $ac_c" 1>&6 3834+else 3835+ if test -n "$CC"; then 3836+ ac_cv_prog_CC="$CC" # Let the user override the test. 3837+else 3838+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 3839+ ac_dummy="$PATH" 3840+ for ac_dir in $ac_dummy; do 3841+ test -z "$ac_dir" && ac_dir=. 3842+ if test -f $ac_dir/$ac_word; then 3843+ ac_cv_prog_CC="cl" 3844+ break 3845+ fi 3846+ done 3847+ IFS="$ac_save_ifs" 3848+fi 3849+fi 3850+CC="$ac_cv_prog_CC" 3851+if test -n "$CC"; then 3852+ echo "$ac_t""$CC" 1>&6 3853+else 3854+ echo "$ac_t""no" 1>&6 3855+fi 3856+ ;; 3857+ esac 3858+ fi 3859+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } 3860 fi 3861 3862+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 3863+echo "configure:2372: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 3864 3865-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH 3866-See \`config.log' for more details." >&5 3867-echo "$as_me: error: no acceptable C compiler found in \$PATH 3868-See \`config.log' for more details." >&2;} 3869- { (exit 1); exit 1; }; } 3870- 3871-# Provide some information about the compiler. 3872-echo "$as_me:$LINENO:" \ 3873- "checking for C compiler version" >&5 3874-ac_compiler=`set X $ac_compile; echo $2` 3875-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 3876- (eval $ac_compiler --version </dev/null >&5) 2>&5 3877- ac_status=$? 3878- echo "$as_me:$LINENO: \$? = $ac_status" >&5 3879- (exit $ac_status); } 3880-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 3881- (eval $ac_compiler -v </dev/null >&5) 2>&5 3882- ac_status=$? 3883- echo "$as_me:$LINENO: \$? = $ac_status" >&5 3884- (exit $ac_status); } 3885-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 3886- (eval $ac_compiler -V </dev/null >&5) 2>&5 3887- ac_status=$? 3888- echo "$as_me:$LINENO: \$? = $ac_status" >&5 3889- (exit $ac_status); } 3890- 3891-cat >conftest.$ac_ext <<_ACEOF 3892-/* confdefs.h. */ 3893-_ACEOF 3894-cat confdefs.h >>conftest.$ac_ext 3895-cat >>conftest.$ac_ext <<_ACEOF 3896-/* end confdefs.h. */ 3897+ac_ext=c 3898+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 3899+ac_cpp='$CPP $CPPFLAGS' 3900+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 3901+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 3902+cross_compiling=$ac_cv_prog_cc_cross 3903 3904-int 3905-main () 3906-{ 3907+cat > conftest.$ac_ext << EOF 3908 3909- ; 3910- return 0; 3911-} 3912-_ACEOF 3913-ac_clean_files_save=$ac_clean_files 3914-ac_clean_files="$ac_clean_files a.out a.exe b.out" 3915-# Try to create an executable without -o first, disregard a.out. 3916-# It will help us diagnose broken compilers, and finding out an intuition 3917-# of exeext. 3918-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 3919-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 3920-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 3921-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 3922- (eval $ac_link_default) 2>&5 3923- ac_status=$? 3924- echo "$as_me:$LINENO: \$? = $ac_status" >&5 3925- (exit $ac_status); }; then 3926- # Find the output, starting from the most likely. This scheme is 3927-# not robust to junk in `.', hence go to wildcards (a.*) only as a last 3928-# resort. 3929- 3930-# Be careful to initialize this variable, since it used to be cached. 3931-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. 3932-ac_cv_exeext= 3933-# b.out is created by i960 compilers. 3934-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out 3935-do 3936- test -f "$ac_file" || continue 3937- case $ac_file in 3938- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) 3939- ;; 3940- conftest.$ac_ext ) 3941- # This is the source file. 3942- ;; 3943- [ab].out ) 3944- # We found the default executable, but exeext='' is most 3945- # certainly right. 3946- break;; 3947- *.* ) 3948- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` 3949- # FIXME: I believe we export ac_cv_exeext for Libtool, 3950- # but it would be cool to find out if it's true. Does anybody 3951- # maintain Libtool? --akim. 3952- export ac_cv_exeext 3953- break;; 3954- * ) 3955- break;; 3956- esac 3957-done 3958-else 3959- echo "$as_me: failed program was:" >&5 3960-sed 's/^/| /' conftest.$ac_ext >&5 3961+#line 2383 "configure" 3962+#include "confdefs.h" 3963 3964-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables 3965-See \`config.log' for more details." >&5 3966-echo "$as_me: error: C compiler cannot create executables 3967-See \`config.log' for more details." >&2;} 3968- { (exit 77); exit 77; }; } 3969-fi 3970- 3971-ac_exeext=$ac_cv_exeext 3972-echo "$as_me:$LINENO: result: $ac_file" >&5 3973-echo "${ECHO_T}$ac_file" >&6 3974- 3975-# Check the compiler produces executables we can run. If not, either 3976-# the compiler is broken, or we cross compile. 3977-echo "$as_me:$LINENO: checking whether the C compiler works" >&5 3978-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 3979-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 3980-# If not cross compiling, check that we can run a simple program. 3981-if test "$cross_compiling" != yes; then 3982- if { ac_try='./$ac_file' 3983- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3984- (eval $ac_try) 2>&5 3985- ac_status=$? 3986- echo "$as_me:$LINENO: \$? = $ac_status" >&5 3987- (exit $ac_status); }; }; then 3988- cross_compiling=no 3989- else 3990- if test "$cross_compiling" = maybe; then 3991- cross_compiling=yes 3992- else 3993- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. 3994-If you meant to cross compile, use \`--host'. 3995-See \`config.log' for more details." >&5 3996-echo "$as_me: error: cannot run C compiled programs. 3997-If you meant to cross compile, use \`--host'. 3998-See \`config.log' for more details." >&2;} 3999- { (exit 1); exit 1; }; } 4000- fi 4001- fi 4002-fi 4003-echo "$as_me:$LINENO: result: yes" >&5 4004-echo "${ECHO_T}yes" >&6 4005- 4006-rm -f a.out a.exe conftest$ac_cv_exeext b.out 4007-ac_clean_files=$ac_clean_files_save 4008-# Check the compiler produces executables we can run. If not, either 4009-# the compiler is broken, or we cross compile. 4010-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 4011-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 4012-echo "$as_me:$LINENO: result: $cross_compiling" >&5 4013-echo "${ECHO_T}$cross_compiling" >&6 4014- 4015-echo "$as_me:$LINENO: checking for suffix of executables" >&5 4016-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 4017-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 4018- (eval $ac_link) 2>&5 4019- ac_status=$? 4020- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4021- (exit $ac_status); }; then 4022- # If both `conftest.exe' and `conftest' are `present' (well, observable) 4023-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will 4024-# work properly (i.e., refer to `conftest.exe'), while it won't with 4025-# `rm'. 4026-for ac_file in conftest.exe conftest conftest.*; do 4027- test -f "$ac_file" || continue 4028- case $ac_file in 4029- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; 4030- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` 4031- export ac_cv_exeext 4032- break;; 4033- * ) break;; 4034- esac 4035-done 4036+main(){return(0);} 4037+EOF 4038+if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 4039+ ac_cv_prog_cc_works=yes 4040+ # If we can't run a trivial program, we are probably using a cross compiler. 4041+ if (./conftest; exit) 2>/dev/null; then 4042+ ac_cv_prog_cc_cross=no 4043+ else 4044+ ac_cv_prog_cc_cross=yes 4045+ fi 4046 else 4047- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link 4048-See \`config.log' for more details." >&5 4049-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link 4050-See \`config.log' for more details." >&2;} 4051- { (exit 1); exit 1; }; } 4052+ echo "configure: failed program was:" >&5 4053+ cat conftest.$ac_ext >&5 4054+ ac_cv_prog_cc_works=no 4055 fi 4056- 4057-rm -f conftest$ac_cv_exeext 4058-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 4059-echo "${ECHO_T}$ac_cv_exeext" >&6 4060- 4061-rm -f conftest.$ac_ext 4062-EXEEXT=$ac_cv_exeext 4063-ac_exeext=$EXEEXT 4064-echo "$as_me:$LINENO: checking for suffix of object files" >&5 4065-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 4066-if test "${ac_cv_objext+set}" = set; then 4067- echo $ECHO_N "(cached) $ECHO_C" >&6 4068-else 4069- cat >conftest.$ac_ext <<_ACEOF 4070-/* confdefs.h. */ 4071-_ACEOF 4072-cat confdefs.h >>conftest.$ac_ext 4073-cat >>conftest.$ac_ext <<_ACEOF 4074-/* end confdefs.h. */ 4075- 4076-int 4077-main () 4078-{ 4079- 4080- ; 4081- return 0; 4082-} 4083-_ACEOF 4084-rm -f conftest.o conftest.obj 4085-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4086- (eval $ac_compile) 2>&5 4087- ac_status=$? 4088- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4089- (exit $ac_status); }; then 4090- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do 4091- case $ac_file in 4092- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; 4093- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` 4094- break;; 4095- esac 4096-done 4097+rm -fr conftest* 4098+ac_ext=c 4099+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 4100+ac_cpp='$CPP $CPPFLAGS' 4101+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 4102+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 4103+cross_compiling=$ac_cv_prog_cc_cross 4104+ 4105+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 4106+if test $ac_cv_prog_cc_works = no; then 4107+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } 4108+fi 4109+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 4110+echo "configure:2414: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 4111+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 4112+cross_compiling=$ac_cv_prog_cc_cross 4113+ 4114+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 4115+echo "configure:2419: checking whether we are using GNU C" >&5 4116+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then 4117+ echo $ac_n "(cached) $ac_c" 1>&6 4118 else 4119- echo "$as_me: failed program was:" >&5 4120-sed 's/^/| /' conftest.$ac_ext >&5 4121- 4122-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile 4123-See \`config.log' for more details." >&5 4124-echo "$as_me: error: cannot compute suffix of object files: cannot compile 4125-See \`config.log' for more details." >&2;} 4126- { (exit 1); exit 1; }; } 4127+ cat > conftest.c <<EOF 4128+#ifdef __GNUC__ 4129+ yes; 4130+#endif 4131+EOF 4132+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 4133+ ac_cv_prog_gcc=yes 4134+else 4135+ ac_cv_prog_gcc=no 4136 fi 4137- 4138-rm -f conftest.$ac_cv_objext conftest.$ac_ext 4139 fi 4140-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 4141-echo "${ECHO_T}$ac_cv_objext" >&6 4142-OBJEXT=$ac_cv_objext 4143-ac_objext=$OBJEXT 4144-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 4145-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 4146-if test "${ac_cv_c_compiler_gnu+set}" = set; then 4147- echo $ECHO_N "(cached) $ECHO_C" >&6 4148-else 4149- cat >conftest.$ac_ext <<_ACEOF 4150-/* confdefs.h. */ 4151-_ACEOF 4152-cat confdefs.h >>conftest.$ac_ext 4153-cat >>conftest.$ac_ext <<_ACEOF 4154-/* end confdefs.h. */ 4155 4156-int 4157-main () 4158-{ 4159-#ifndef __GNUC__ 4160- choke me 4161-#endif 4162- 4163- ; 4164- return 0; 4165-} 4166-_ACEOF 4167-rm -f conftest.$ac_objext 4168-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4169- (eval $ac_compile) 2>conftest.er1 4170- ac_status=$? 4171- grep -v '^ *+' conftest.er1 >conftest.err 4172- rm -f conftest.er1 4173- cat conftest.err >&5 4174- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4175- (exit $ac_status); } && 4176- { ac_try='test -z "$ac_c_werror_flag" 4177- || test ! -s conftest.err' 4178- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4179- (eval $ac_try) 2>&5 4180- ac_status=$? 4181- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4182- (exit $ac_status); }; } && 4183- { ac_try='test -s conftest.$ac_objext' 4184- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4185- (eval $ac_try) 2>&5 4186- ac_status=$? 4187- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4188- (exit $ac_status); }; }; then 4189- ac_compiler_gnu=yes 4190-else 4191- echo "$as_me: failed program was:" >&5 4192-sed 's/^/| /' conftest.$ac_ext >&5 4193- 4194-ac_compiler_gnu=no 4195-fi 4196-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4197-ac_cv_c_compiler_gnu=$ac_compiler_gnu 4198- 4199-fi 4200-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 4201-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 4202-GCC=`test $ac_compiler_gnu = yes && echo yes` 4203-ac_test_CFLAGS=${CFLAGS+set} 4204-ac_save_CFLAGS=$CFLAGS 4205-CFLAGS="-g" 4206-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 4207-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 4208-if test "${ac_cv_prog_cc_g+set}" = set; then 4209- echo $ECHO_N "(cached) $ECHO_C" >&6 4210-else 4211- cat >conftest.$ac_ext <<_ACEOF 4212-/* confdefs.h. */ 4213-_ACEOF 4214-cat confdefs.h >>conftest.$ac_ext 4215-cat >>conftest.$ac_ext <<_ACEOF 4216-/* end confdefs.h. */ 4217+echo "$ac_t""$ac_cv_prog_gcc" 1>&6 4218 4219-int 4220-main () 4221-{ 4222+if test $ac_cv_prog_gcc = yes; then 4223+ GCC=yes 4224+else 4225+ GCC= 4226+fi 4227 4228- ; 4229- return 0; 4230-} 4231-_ACEOF 4232-rm -f conftest.$ac_objext 4233-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4234- (eval $ac_compile) 2>conftest.er1 4235- ac_status=$? 4236- grep -v '^ *+' conftest.er1 >conftest.err 4237- rm -f conftest.er1 4238- cat conftest.err >&5 4239- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4240- (exit $ac_status); } && 4241- { ac_try='test -z "$ac_c_werror_flag" 4242- || test ! -s conftest.err' 4243- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4244- (eval $ac_try) 2>&5 4245- ac_status=$? 4246- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4247- (exit $ac_status); }; } && 4248- { ac_try='test -s conftest.$ac_objext' 4249- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4250- (eval $ac_try) 2>&5 4251- ac_status=$? 4252- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4253- (exit $ac_status); }; }; then 4254+ac_test_CFLAGS="${CFLAGS+set}" 4255+ac_save_CFLAGS="$CFLAGS" 4256+CFLAGS= 4257+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 4258+echo "configure:2447: checking whether ${CC-cc} accepts -g" >&5 4259+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then 4260+ echo $ac_n "(cached) $ac_c" 1>&6 4261+else 4262+ echo 'void f(){}' > conftest.c 4263+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then 4264 ac_cv_prog_cc_g=yes 4265 else 4266- echo "$as_me: failed program was:" >&5 4267-sed 's/^/| /' conftest.$ac_ext >&5 4268- 4269-ac_cv_prog_cc_g=no 4270+ ac_cv_prog_cc_g=no 4271 fi 4272-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4273+rm -f conftest* 4274+ 4275 fi 4276-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 4277-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 4278+ 4279+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 4280 if test "$ac_test_CFLAGS" = set; then 4281- CFLAGS=$ac_save_CFLAGS 4282+ CFLAGS="$ac_save_CFLAGS" 4283 elif test $ac_cv_prog_cc_g = yes; then 4284 if test "$GCC" = yes; then 4285 CFLAGS="-g -O2" 4286@@ -2642,630 +2473,170 @@ 4287 CFLAGS= 4288 fi 4289 fi 4290-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 4291-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 4292-if test "${ac_cv_prog_cc_stdc+set}" = set; then 4293- echo $ECHO_N "(cached) $ECHO_C" >&6 4294-else 4295- ac_cv_prog_cc_stdc=no 4296-ac_save_CC=$CC 4297-cat >conftest.$ac_ext <<_ACEOF 4298-/* confdefs.h. */ 4299-_ACEOF 4300-cat confdefs.h >>conftest.$ac_ext 4301-cat >>conftest.$ac_ext <<_ACEOF 4302-/* end confdefs.h. */ 4303-#include <stdarg.h> 4304-#include <stdio.h> 4305-#include <sys/types.h> 4306-#include <sys/stat.h> 4307-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ 4308-struct buf { int x; }; 4309-FILE * (*rcsopen) (struct buf *, struct stat *, int); 4310-static char *e (p, i) 4311- char **p; 4312- int i; 4313-{ 4314- return p[i]; 4315-} 4316-static char *f (char * (*g) (char **, int), char **p, ...) 4317-{ 4318- char *s; 4319- va_list v; 4320- va_start (v,p); 4321- s = g (p, va_arg (v,int)); 4322- va_end (v); 4323- return s; 4324-} 4325- 4326-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has 4327- function prototypes and stuff, but not '\xHH' hex character constants. 4328- These don't provoke an error unfortunately, instead are silently treated 4329- as 'x'. The following induces an error, until -std1 is added to get 4330- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an 4331- array size at least. It's necessary to write '\x00'==0 to get something 4332- that's true only with -std1. */ 4333-int osf4_cc_array ['\x00' == 0 ? 1 : -1]; 4334- 4335-int test (int i, double x); 4336-struct s1 {int (*f) (int a);}; 4337-struct s2 {int (*f) (double a);}; 4338-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); 4339-int argc; 4340-char **argv; 4341-int 4342-main () 4343-{ 4344-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; 4345- ; 4346- return 0; 4347-} 4348-_ACEOF 4349-# Don't try gcc -ansi; that turns off useful extensions and 4350-# breaks some systems' header files. 4351-# AIX -qlanglvl=ansi 4352-# Ultrix and OSF/1 -std1 4353-# HP-UX 10.20 and later -Ae 4354-# HP-UX older versions -Aa -D_HPUX_SOURCE 4355-# SVR4 -Xc -D__EXTENSIONS__ 4356-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 4357-do 4358- CC="$ac_save_CC $ac_arg" 4359- rm -f conftest.$ac_objext 4360-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4361- (eval $ac_compile) 2>conftest.er1 4362- ac_status=$? 4363- grep -v '^ *+' conftest.er1 >conftest.err 4364- rm -f conftest.er1 4365- cat conftest.err >&5 4366- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4367- (exit $ac_status); } && 4368- { ac_try='test -z "$ac_c_werror_flag" 4369- || test ! -s conftest.err' 4370- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4371- (eval $ac_try) 2>&5 4372- ac_status=$? 4373- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4374- (exit $ac_status); }; } && 4375- { ac_try='test -s conftest.$ac_objext' 4376- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4377- (eval $ac_try) 2>&5 4378- ac_status=$? 4379- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4380- (exit $ac_status); }; }; then 4381- ac_cv_prog_cc_stdc=$ac_arg 4382-break 4383-else 4384- echo "$as_me: failed program was:" >&5 4385-sed 's/^/| /' conftest.$ac_ext >&5 4386- 4387-fi 4388-rm -f conftest.err conftest.$ac_objext 4389-done 4390-rm -f conftest.$ac_ext conftest.$ac_objext 4391-CC=$ac_save_CC 4392- 4393-fi 4394- 4395-case "x$ac_cv_prog_cc_stdc" in 4396- x|xno) 4397- echo "$as_me:$LINENO: result: none needed" >&5 4398-echo "${ECHO_T}none needed" >&6 ;; 4399- *) 4400- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 4401-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 4402- CC="$CC $ac_cv_prog_cc_stdc" ;; 4403-esac 4404- 4405-# Some people use a C++ compiler to compile C. Since we use `exit', 4406-# in C++ we need to declare it. In case someone uses the same compiler 4407-# for both compiling C and C++ we need to have the C++ compiler decide 4408-# the declaration of exit, since it's the most demanding environment. 4409-cat >conftest.$ac_ext <<_ACEOF 4410-#ifndef __cplusplus 4411- choke me 4412-#endif 4413-_ACEOF 4414-rm -f conftest.$ac_objext 4415-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4416- (eval $ac_compile) 2>conftest.er1 4417- ac_status=$? 4418- grep -v '^ *+' conftest.er1 >conftest.err 4419- rm -f conftest.er1 4420- cat conftest.err >&5 4421- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4422- (exit $ac_status); } && 4423- { ac_try='test -z "$ac_c_werror_flag" 4424- || test ! -s conftest.err' 4425- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4426- (eval $ac_try) 2>&5 4427- ac_status=$? 4428- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4429- (exit $ac_status); }; } && 4430- { ac_try='test -s conftest.$ac_objext' 4431- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4432- (eval $ac_try) 2>&5 4433- ac_status=$? 4434- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4435- (exit $ac_status); }; }; then 4436- for ac_declaration in \ 4437- '' \ 4438- 'extern "C" void std::exit (int) throw (); using std::exit;' \ 4439- 'extern "C" void std::exit (int); using std::exit;' \ 4440- 'extern "C" void exit (int) throw ();' \ 4441- 'extern "C" void exit (int);' \ 4442- 'void exit (int);' 4443-do 4444- cat >conftest.$ac_ext <<_ACEOF 4445-/* confdefs.h. */ 4446-_ACEOF 4447-cat confdefs.h >>conftest.$ac_ext 4448-cat >>conftest.$ac_ext <<_ACEOF 4449-/* end confdefs.h. */ 4450-$ac_declaration 4451-#include <stdlib.h> 4452-int 4453-main () 4454-{ 4455-exit (42); 4456- ; 4457- return 0; 4458-} 4459-_ACEOF 4460-rm -f conftest.$ac_objext 4461-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4462- (eval $ac_compile) 2>conftest.er1 4463- ac_status=$? 4464- grep -v '^ *+' conftest.er1 >conftest.err 4465- rm -f conftest.er1 4466- cat conftest.err >&5 4467- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4468- (exit $ac_status); } && 4469- { ac_try='test -z "$ac_c_werror_flag" 4470- || test ! -s conftest.err' 4471- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4472- (eval $ac_try) 2>&5 4473- ac_status=$? 4474- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4475- (exit $ac_status); }; } && 4476- { ac_try='test -s conftest.$ac_objext' 4477- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4478- (eval $ac_try) 2>&5 4479- ac_status=$? 4480- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4481- (exit $ac_status); }; }; then 4482- : 4483-else 4484- echo "$as_me: failed program was:" >&5 4485-sed 's/^/| /' conftest.$ac_ext >&5 4486- 4487-continue 4488-fi 4489-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4490- cat >conftest.$ac_ext <<_ACEOF 4491-/* confdefs.h. */ 4492-_ACEOF 4493-cat confdefs.h >>conftest.$ac_ext 4494-cat >>conftest.$ac_ext <<_ACEOF 4495-/* end confdefs.h. */ 4496-$ac_declaration 4497-int 4498-main () 4499-{ 4500-exit (42); 4501- ; 4502- return 0; 4503-} 4504-_ACEOF 4505-rm -f conftest.$ac_objext 4506-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 4507- (eval $ac_compile) 2>conftest.er1 4508- ac_status=$? 4509- grep -v '^ *+' conftest.er1 >conftest.err 4510- rm -f conftest.er1 4511- cat conftest.err >&5 4512- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4513- (exit $ac_status); } && 4514- { ac_try='test -z "$ac_c_werror_flag" 4515- || test ! -s conftest.err' 4516- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4517- (eval $ac_try) 2>&5 4518- ac_status=$? 4519- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4520- (exit $ac_status); }; } && 4521- { ac_try='test -s conftest.$ac_objext' 4522- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4523- (eval $ac_try) 2>&5 4524- ac_status=$? 4525- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4526- (exit $ac_status); }; }; then 4527- break 4528-else 4529- echo "$as_me: failed program was:" >&5 4530-sed 's/^/| /' conftest.$ac_ext >&5 4531- 4532-fi 4533-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4534-done 4535-rm -f conftest* 4536-if test -n "$ac_declaration"; then 4537- echo '#ifdef __cplusplus' >>confdefs.h 4538- echo $ac_declaration >>confdefs.h 4539- echo '#endif' >>confdefs.h 4540-fi 4541- 4542-else 4543- echo "$as_me: failed program was:" >&5 4544-sed 's/^/| /' conftest.$ac_ext >&5 4545- 4546-fi 4547-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 4548-ac_ext=c 4549-ac_cpp='$CPP $CPPFLAGS' 4550-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4551-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4552-ac_compiler_gnu=$ac_cv_c_compiler_gnu 4553- 4554 4555-ac_ext=c 4556-ac_cpp='$CPP $CPPFLAGS' 4557-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4558-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4559-ac_compiler_gnu=$ac_cv_c_compiler_gnu 4560-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 4561-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 4562+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 4563+echo "configure:2479: checking how to run the C preprocessor" >&5 4564 # On Suns, sometimes $CPP names a directory. 4565 if test -n "$CPP" && test -d "$CPP"; then 4566 CPP= 4567 fi 4568 if test -z "$CPP"; then 4569- if test "${ac_cv_prog_CPP+set}" = set; then 4570- echo $ECHO_N "(cached) $ECHO_C" >&6 4571+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then 4572+ echo $ac_n "(cached) $ac_c" 1>&6 4573 else 4574- # Double quotes because CPP needs to be expanded 4575- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" 4576- do 4577- ac_preproc_ok=false 4578-for ac_c_preproc_warn_flag in '' yes 4579-do 4580- # Use a header file that comes with gcc, so configuring glibc 4581- # with a fresh cross-compiler works. 4582- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4583- # <limits.h> exists even on freestanding compilers. 4584+ # This must be in double quotes, not single quotes, because CPP may get 4585+ # substituted into the Makefile and "${CC-cc}" will confuse make. 4586+ CPP="${CC-cc} -E" 4587 # On the NeXT, cc -E runs the code through the compiler's parser, 4588- # not just through cpp. "Syntax error" is here to catch this case. 4589- cat >conftest.$ac_ext <<_ACEOF 4590-/* confdefs.h. */ 4591-_ACEOF 4592-cat confdefs.h >>conftest.$ac_ext 4593-cat >>conftest.$ac_ext <<_ACEOF 4594-/* end confdefs.h. */ 4595-#ifdef __STDC__ 4596-# include <limits.h> 4597-#else 4598-# include <assert.h> 4599-#endif 4600- Syntax error 4601-_ACEOF 4602-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 4603- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4604- ac_status=$? 4605- grep -v '^ *+' conftest.er1 >conftest.err 4606- rm -f conftest.er1 4607- cat conftest.err >&5 4608- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4609- (exit $ac_status); } >/dev/null; then 4610- if test -s conftest.err; then 4611- ac_cpp_err=$ac_c_preproc_warn_flag 4612- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 4613- else 4614- ac_cpp_err= 4615- fi 4616-else 4617- ac_cpp_err=yes 4618-fi 4619-if test -z "$ac_cpp_err"; then 4620+ # not just through cpp. 4621+ cat > conftest.$ac_ext <<EOF 4622+#line 2494 "configure" 4623+#include "confdefs.h" 4624+#include <assert.h> 4625+Syntax Error 4626+EOF 4627+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 4628+{ (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 4629+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 4630+if test -z "$ac_err"; then 4631 : 4632 else 4633- echo "$as_me: failed program was:" >&5 4634-sed 's/^/| /' conftest.$ac_ext >&5 4635- 4636- # Broken: fails on valid input. 4637-continue 4638-fi 4639-rm -f conftest.err conftest.$ac_ext 4640- 4641- # OK, works on sane cases. Now check whether non-existent headers 4642- # can be detected and how. 4643- cat >conftest.$ac_ext <<_ACEOF 4644-/* confdefs.h. */ 4645-_ACEOF 4646-cat confdefs.h >>conftest.$ac_ext 4647-cat >>conftest.$ac_ext <<_ACEOF 4648-/* end confdefs.h. */ 4649-#include <ac_nonexistent.h> 4650-_ACEOF 4651-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 4652- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4653- ac_status=$? 4654- grep -v '^ *+' conftest.er1 >conftest.err 4655- rm -f conftest.er1 4656- cat conftest.err >&5 4657- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4658- (exit $ac_status); } >/dev/null; then 4659- if test -s conftest.err; then 4660- ac_cpp_err=$ac_c_preproc_warn_flag 4661- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 4662- else 4663- ac_cpp_err= 4664- fi 4665-else 4666- ac_cpp_err=yes 4667-fi 4668-if test -z "$ac_cpp_err"; then 4669- # Broken: success on invalid input. 4670-continue 4671+ echo "$ac_err" >&5 4672+ echo "configure: failed program was:" >&5 4673+ cat conftest.$ac_ext >&5 4674+ rm -rf conftest* 4675+ CPP="${CC-cc} -E -traditional-cpp" 4676+ cat > conftest.$ac_ext <<EOF 4677+#line 2511 "configure" 4678+#include "confdefs.h" 4679+#include <assert.h> 4680+Syntax Error 4681+EOF 4682+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 4683+{ (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 4684+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 4685+if test -z "$ac_err"; then 4686+ : 4687 else 4688- echo "$as_me: failed program was:" >&5 4689-sed 's/^/| /' conftest.$ac_ext >&5 4690- 4691- # Passes both tests. 4692-ac_preproc_ok=: 4693-break 4694-fi 4695-rm -f conftest.err conftest.$ac_ext 4696- 4697-done 4698-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4699-rm -f conftest.err conftest.$ac_ext 4700-if $ac_preproc_ok; then 4701- break 4702-fi 4703- 4704- done 4705- ac_cv_prog_CPP=$CPP 4706- 4707-fi 4708- CPP=$ac_cv_prog_CPP 4709+ echo "$ac_err" >&5 4710+ echo "configure: failed program was:" >&5 4711+ cat conftest.$ac_ext >&5 4712+ rm -rf conftest* 4713+ CPP="${CC-cc} -nologo -E" 4714+ cat > conftest.$ac_ext <<EOF 4715+#line 2528 "configure" 4716+#include "confdefs.h" 4717+#include <assert.h> 4718+Syntax Error 4719+EOF 4720+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 4721+{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 4722+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 4723+if test -z "$ac_err"; then 4724+ : 4725 else 4726- ac_cv_prog_CPP=$CPP 4727+ echo "$ac_err" >&5 4728+ echo "configure: failed program was:" >&5 4729+ cat conftest.$ac_ext >&5 4730+ rm -rf conftest* 4731+ CPP=/lib/cpp 4732 fi 4733-echo "$as_me:$LINENO: result: $CPP" >&5 4734-echo "${ECHO_T}$CPP" >&6 4735-ac_preproc_ok=false 4736-for ac_c_preproc_warn_flag in '' yes 4737-do 4738- # Use a header file that comes with gcc, so configuring glibc 4739- # with a fresh cross-compiler works. 4740- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 4741- # <limits.h> exists even on freestanding compilers. 4742- # On the NeXT, cc -E runs the code through the compiler's parser, 4743- # not just through cpp. "Syntax error" is here to catch this case. 4744- cat >conftest.$ac_ext <<_ACEOF 4745-/* confdefs.h. */ 4746-_ACEOF 4747-cat confdefs.h >>conftest.$ac_ext 4748-cat >>conftest.$ac_ext <<_ACEOF 4749-/* end confdefs.h. */ 4750-#ifdef __STDC__ 4751-# include <limits.h> 4752-#else 4753-# include <assert.h> 4754-#endif 4755- Syntax error 4756-_ACEOF 4757-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 4758- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4759- ac_status=$? 4760- grep -v '^ *+' conftest.er1 >conftest.err 4761- rm -f conftest.er1 4762- cat conftest.err >&5 4763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4764- (exit $ac_status); } >/dev/null; then 4765- if test -s conftest.err; then 4766- ac_cpp_err=$ac_c_preproc_warn_flag 4767- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 4768- else 4769- ac_cpp_err= 4770- fi 4771-else 4772- ac_cpp_err=yes 4773+rm -f conftest* 4774 fi 4775-if test -z "$ac_cpp_err"; then 4776- : 4777-else 4778- echo "$as_me: failed program was:" >&5 4779-sed 's/^/| /' conftest.$ac_ext >&5 4780- 4781- # Broken: fails on valid input. 4782-continue 4783+rm -f conftest* 4784 fi 4785-rm -f conftest.err conftest.$ac_ext 4786- 4787- # OK, works on sane cases. Now check whether non-existent headers 4788- # can be detected and how. 4789- cat >conftest.$ac_ext <<_ACEOF 4790-/* confdefs.h. */ 4791-_ACEOF 4792-cat confdefs.h >>conftest.$ac_ext 4793-cat >>conftest.$ac_ext <<_ACEOF 4794-/* end confdefs.h. */ 4795-#include <ac_nonexistent.h> 4796-_ACEOF 4797-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 4798- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 4799- ac_status=$? 4800- grep -v '^ *+' conftest.er1 >conftest.err 4801- rm -f conftest.er1 4802- cat conftest.err >&5 4803- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4804- (exit $ac_status); } >/dev/null; then 4805- if test -s conftest.err; then 4806- ac_cpp_err=$ac_c_preproc_warn_flag 4807- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 4808- else 4809- ac_cpp_err= 4810- fi 4811-else 4812- ac_cpp_err=yes 4813-fi 4814-if test -z "$ac_cpp_err"; then 4815- # Broken: success on invalid input. 4816-continue 4817-else 4818- echo "$as_me: failed program was:" >&5 4819-sed 's/^/| /' conftest.$ac_ext >&5 4820- 4821- # Passes both tests. 4822-ac_preproc_ok=: 4823-break 4824+rm -f conftest* 4825+ ac_cv_prog_CPP="$CPP" 4826 fi 4827-rm -f conftest.err conftest.$ac_ext 4828- 4829-done 4830-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4831-rm -f conftest.err conftest.$ac_ext 4832-if $ac_preproc_ok; then 4833- : 4834+ CPP="$ac_cv_prog_CPP" 4835 else 4836- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check 4837-See \`config.log' for more details." >&5 4838-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check 4839-See \`config.log' for more details." >&2;} 4840- { (exit 1); exit 1; }; } 4841+ ac_cv_prog_CPP="$CPP" 4842 fi 4843- 4844-ac_ext=c 4845-ac_cpp='$CPP $CPPFLAGS' 4846-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 4847-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 4848-ac_compiler_gnu=$ac_cv_c_compiler_gnu 4849- 4850+echo "$ac_t""$CPP" 1>&6 4851 4852 4853 ICC="no" 4854- echo "$as_me:$LINENO: checking for icc" >&5 4855-echo $ECHO_N "checking for icc... $ECHO_C" >&6 4856- cat >conftest.$ac_ext <<_ACEOF 4857-/* confdefs.h. */ 4858-_ACEOF 4859-cat confdefs.h >>conftest.$ac_ext 4860-cat >>conftest.$ac_ext <<_ACEOF 4861-/* end confdefs.h. */ 4862+ echo $ac_n "checking for icc""... $ac_c" 1>&6 4863+echo "configure:2561: checking for icc" >&5 4864+ cat > conftest.$ac_ext <<EOF 4865+#line 2563 "configure" 4866+#include "confdefs.h" 4867 __INTEL_COMPILER 4868-_ACEOF 4869+EOF 4870 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 4871- $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then 4872+ egrep "^__INTEL_COMPILER" >/dev/null 2>&1; then 4873+ rm -rf conftest* 4874 ICC="no" 4875- echo "$as_me:$LINENO: result: no" >&5 4876-echo "${ECHO_T}no" >&6 4877+ echo "$ac_t""no" 1>&6 4878 else 4879+ rm -rf conftest* 4880 ICC="yes" 4881 GCC="no" 4882- echo "$as_me:$LINENO: result: yes" >&5 4883-echo "${ECHO_T}yes" >&6 4884- 4885+ echo "$ac_t""yes" 1>&6 4886+ 4887 fi 4888 rm -f conftest* 4889 4890 4891 4892 SUNCC="no" 4893- echo "$as_me:$LINENO: checking for suncc" >&5 4894-echo $ECHO_N "checking for suncc... $ECHO_C" >&6 4895- cat >conftest.$ac_ext <<_ACEOF 4896-/* confdefs.h. */ 4897-_ACEOF 4898-cat confdefs.h >>conftest.$ac_ext 4899-cat >>conftest.$ac_ext <<_ACEOF 4900-/* end confdefs.h. */ 4901+ echo $ac_n "checking for suncc""... $ac_c" 1>&6 4902+echo "configure:2585: checking for suncc" >&5 4903+ cat > conftest.$ac_ext <<EOF 4904+#line 2587 "configure" 4905+#include "confdefs.h" 4906 __SUNPRO_C 4907-_ACEOF 4908+EOF 4909 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 4910- $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then 4911+ egrep "^__SUNPRO_C" >/dev/null 2>&1; then 4912+ rm -rf conftest* 4913 SUNCC="no" 4914- echo "$as_me:$LINENO: result: no" >&5 4915-echo "${ECHO_T}no" >&6 4916+ echo "$ac_t""no" 1>&6 4917 else 4918+ rm -rf conftest* 4919 SUNCC="yes" 4920 GCC="no" 4921 test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload" 4922 GCC="" 4923- echo "$as_me:$LINENO: result: yes" >&5 4924-echo "${ECHO_T}yes" >&6 4925- 4926+ echo "$ac_t""yes" 1>&6 4927+ 4928 fi 4929 rm -f conftest* 4930 4931 4932 if test "x$CC" != xcc; then 4933- echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 4934-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6 4935+ echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 4936+echo "configure:2610: checking whether $CC and cc understand -c and -o together" >&5 4937 else 4938- echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 4939-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6 4940+ echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 4941+echo "configure:2613: checking whether cc understands -c and -o together" >&5 4942 fi 4943-set dummy $CC; ac_cc=`echo $2 | 4944- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 4945-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then 4946- echo $ECHO_N "(cached) $ECHO_C" >&6 4947-else 4948- cat >conftest.$ac_ext <<_ACEOF 4949-/* confdefs.h. */ 4950-_ACEOF 4951-cat confdefs.h >>conftest.$ac_ext 4952-cat >>conftest.$ac_ext <<_ACEOF 4953-/* end confdefs.h. */ 4954- 4955-int 4956-main () 4957-{ 4958- 4959- ; 4960- return 0; 4961-} 4962-_ACEOF 4963+set dummy $CC; ac_cc="`echo $2 | 4964+ sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" 4965+if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then 4966+ echo $ac_n "(cached) $ac_c" 1>&6 4967+else 4968+ echo 'foo(){}' > conftest.c 4969 # Make sure it works both with $CC and with simple cc. 4970 # We do the test twice because some compilers refuse to overwrite an 4971 # existing .o file with -o, though they will create one. 4972-ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5' 4973-if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4974- (eval $ac_try) 2>&5 4975- ac_status=$? 4976- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4977- (exit $ac_status); } && 4978- test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4979- (eval $ac_try) 2>&5 4980- ac_status=$? 4981- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4982- (exit $ac_status); }; 4983+ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' 4984+if { (eval echo configure:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && 4985+ test -f conftest.o && { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; 4986 then 4987 eval ac_cv_prog_cc_${ac_cc}_c_o=yes 4988 if test "x$CC" != xcc; then 4989 # Test first that cc exists at all. 4990- if { ac_try='cc -c conftest.$ac_ext >&5' 4991- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4992- (eval $ac_try) 2>&5 4993- ac_status=$? 4994- echo "$as_me:$LINENO: \$? = $ac_status" >&5 4995- (exit $ac_status); }; }; then 4996- ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5' 4997- if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4998- (eval $ac_try) 2>&5 4999- ac_status=$? 5000- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5001- (exit $ac_status); } && 5002- test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5003- (eval $ac_try) 2>&5 5004- ac_status=$? 5005- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5006- (exit $ac_status); }; 5007+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then 5008+ ac_try='cc -c conftest.c -o conftest.o 1>&5' 5009+ if { (eval echo configure:2633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && 5010+ test -f conftest.o && { (eval echo configure:2634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; 5011 then 5012- # cc works too. 5013- : 5014+ # cc works too. 5015+ : 5016 else 5017- # cc exists but doesn't like -o. 5018- eval ac_cv_prog_cc_${ac_cc}_c_o=no 5019+ # cc exists but doesn't like -o. 5020+ eval ac_cv_prog_cc_${ac_cc}_c_o=no 5021 fi 5022 fi 5023 fi 5024@@ -3276,313 +2647,160 @@ 5025 5026 fi 5027 if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then 5028- echo "$as_me:$LINENO: result: yes" >&5 5029-echo "${ECHO_T}yes" >&6 5030+ echo "$ac_t""yes" 1>&6 5031 else 5032- echo "$as_me:$LINENO: result: no" >&5 5033-echo "${ECHO_T}no" >&6 5034- 5035-cat >>confdefs.h <<\_ACEOF 5036+ echo "$ac_t""no" 1>&6 5037+ cat >> confdefs.h <<\EOF 5038 #define NO_MINUS_C_MINUS_O 1 5039-_ACEOF 5040+EOF 5041 5042 fi 5043 5044-ac_ext=c 5045-ac_cpp='$CPP $CPPFLAGS' 5046-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 5047-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 5048-ac_compiler_gnu=$ac_cv_c_compiler_gnu 5049-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 5050-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 5051+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 5052+echo "configure:2661: checking how to run the C preprocessor" >&5 5053 # On Suns, sometimes $CPP names a directory. 5054 if test -n "$CPP" && test -d "$CPP"; then 5055 CPP= 5056 fi 5057 if test -z "$CPP"; then 5058- if test "${ac_cv_prog_CPP+set}" = set; then 5059- echo $ECHO_N "(cached) $ECHO_C" >&6 5060+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then 5061+ echo $ac_n "(cached) $ac_c" 1>&6 5062 else 5063- # Double quotes because CPP needs to be expanded 5064- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" 5065- do 5066- ac_preproc_ok=false 5067-for ac_c_preproc_warn_flag in '' yes 5068-do 5069- # Use a header file that comes with gcc, so configuring glibc 5070- # with a fresh cross-compiler works. 5071- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 5072- # <limits.h> exists even on freestanding compilers. 5073+ # This must be in double quotes, not single quotes, because CPP may get 5074+ # substituted into the Makefile and "${CC-cc}" will confuse make. 5075+ CPP="${CC-cc} -E" 5076 # On the NeXT, cc -E runs the code through the compiler's parser, 5077- # not just through cpp. "Syntax error" is here to catch this case. 5078- cat >conftest.$ac_ext <<_ACEOF 5079-/* confdefs.h. */ 5080-_ACEOF 5081-cat confdefs.h >>conftest.$ac_ext 5082-cat >>conftest.$ac_ext <<_ACEOF 5083-/* end confdefs.h. */ 5084-#ifdef __STDC__ 5085-# include <limits.h> 5086-#else 5087-# include <assert.h> 5088-#endif 5089- Syntax error 5090-_ACEOF 5091-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 5092- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5093- ac_status=$? 5094- grep -v '^ *+' conftest.er1 >conftest.err 5095- rm -f conftest.er1 5096- cat conftest.err >&5 5097- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5098- (exit $ac_status); } >/dev/null; then 5099- if test -s conftest.err; then 5100- ac_cpp_err=$ac_c_preproc_warn_flag 5101- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 5102- else 5103- ac_cpp_err= 5104- fi 5105-else 5106- ac_cpp_err=yes 5107-fi 5108-if test -z "$ac_cpp_err"; then 5109+ # not just through cpp. 5110+ cat > conftest.$ac_ext <<EOF 5111+#line 2676 "configure" 5112+#include "confdefs.h" 5113+#include <assert.h> 5114+Syntax Error 5115+EOF 5116+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 5117+{ (eval echo configure:2682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 5118+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 5119+if test -z "$ac_err"; then 5120 : 5121 else 5122- echo "$as_me: failed program was:" >&5 5123-sed 's/^/| /' conftest.$ac_ext >&5 5124- 5125- # Broken: fails on valid input. 5126-continue 5127-fi 5128-rm -f conftest.err conftest.$ac_ext 5129- 5130- # OK, works on sane cases. Now check whether non-existent headers 5131- # can be detected and how. 5132- cat >conftest.$ac_ext <<_ACEOF 5133-/* confdefs.h. */ 5134-_ACEOF 5135-cat confdefs.h >>conftest.$ac_ext 5136-cat >>conftest.$ac_ext <<_ACEOF 5137-/* end confdefs.h. */ 5138-#include <ac_nonexistent.h> 5139-_ACEOF 5140-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 5141- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5142- ac_status=$? 5143- grep -v '^ *+' conftest.er1 >conftest.err 5144- rm -f conftest.er1 5145- cat conftest.err >&5 5146- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5147- (exit $ac_status); } >/dev/null; then 5148- if test -s conftest.err; then 5149- ac_cpp_err=$ac_c_preproc_warn_flag 5150- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 5151- else 5152- ac_cpp_err= 5153- fi 5154-else 5155- ac_cpp_err=yes 5156-fi 5157-if test -z "$ac_cpp_err"; then 5158- # Broken: success on invalid input. 5159-continue 5160+ echo "$ac_err" >&5 5161+ echo "configure: failed program was:" >&5 5162+ cat conftest.$ac_ext >&5 5163+ rm -rf conftest* 5164+ CPP="${CC-cc} -E -traditional-cpp" 5165+ cat > conftest.$ac_ext <<EOF 5166+#line 2693 "configure" 5167+#include "confdefs.h" 5168+#include <assert.h> 5169+Syntax Error 5170+EOF 5171+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 5172+{ (eval echo configure:2699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 5173+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 5174+if test -z "$ac_err"; then 5175+ : 5176 else 5177- echo "$as_me: failed program was:" >&5 5178-sed 's/^/| /' conftest.$ac_ext >&5 5179- 5180- # Passes both tests. 5181-ac_preproc_ok=: 5182-break 5183-fi 5184-rm -f conftest.err conftest.$ac_ext 5185- 5186-done 5187-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5188-rm -f conftest.err conftest.$ac_ext 5189-if $ac_preproc_ok; then 5190- break 5191-fi 5192- 5193- done 5194- ac_cv_prog_CPP=$CPP 5195- 5196-fi 5197- CPP=$ac_cv_prog_CPP 5198+ echo "$ac_err" >&5 5199+ echo "configure: failed program was:" >&5 5200+ cat conftest.$ac_ext >&5 5201+ rm -rf conftest* 5202+ CPP="${CC-cc} -nologo -E" 5203+ cat > conftest.$ac_ext <<EOF 5204+#line 2710 "configure" 5205+#include "confdefs.h" 5206+#include <assert.h> 5207+Syntax Error 5208+EOF 5209+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 5210+{ (eval echo configure:2716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 5211+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 5212+if test -z "$ac_err"; then 5213+ : 5214 else 5215- ac_cv_prog_CPP=$CPP 5216+ echo "$ac_err" >&5 5217+ echo "configure: failed program was:" >&5 5218+ cat conftest.$ac_ext >&5 5219+ rm -rf conftest* 5220+ CPP=/lib/cpp 5221 fi 5222-echo "$as_me:$LINENO: result: $CPP" >&5 5223-echo "${ECHO_T}$CPP" >&6 5224-ac_preproc_ok=false 5225-for ac_c_preproc_warn_flag in '' yes 5226-do 5227- # Use a header file that comes with gcc, so configuring glibc 5228- # with a fresh cross-compiler works. 5229- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 5230- # <limits.h> exists even on freestanding compilers. 5231- # On the NeXT, cc -E runs the code through the compiler's parser, 5232- # not just through cpp. "Syntax error" is here to catch this case. 5233- cat >conftest.$ac_ext <<_ACEOF 5234-/* confdefs.h. */ 5235-_ACEOF 5236-cat confdefs.h >>conftest.$ac_ext 5237-cat >>conftest.$ac_ext <<_ACEOF 5238-/* end confdefs.h. */ 5239-#ifdef __STDC__ 5240-# include <limits.h> 5241-#else 5242-# include <assert.h> 5243-#endif 5244- Syntax error 5245-_ACEOF 5246-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 5247- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5248- ac_status=$? 5249- grep -v '^ *+' conftest.er1 >conftest.err 5250- rm -f conftest.er1 5251- cat conftest.err >&5 5252- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5253- (exit $ac_status); } >/dev/null; then 5254- if test -s conftest.err; then 5255- ac_cpp_err=$ac_c_preproc_warn_flag 5256- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 5257- else 5258- ac_cpp_err= 5259- fi 5260-else 5261- ac_cpp_err=yes 5262+rm -f conftest* 5263 fi 5264-if test -z "$ac_cpp_err"; then 5265- : 5266-else 5267- echo "$as_me: failed program was:" >&5 5268-sed 's/^/| /' conftest.$ac_ext >&5 5269- 5270- # Broken: fails on valid input. 5271-continue 5272+rm -f conftest* 5273 fi 5274-rm -f conftest.err conftest.$ac_ext 5275- 5276- # OK, works on sane cases. Now check whether non-existent headers 5277- # can be detected and how. 5278- cat >conftest.$ac_ext <<_ACEOF 5279-/* confdefs.h. */ 5280-_ACEOF 5281-cat confdefs.h >>conftest.$ac_ext 5282-cat >>conftest.$ac_ext <<_ACEOF 5283-/* end confdefs.h. */ 5284-#include <ac_nonexistent.h> 5285-_ACEOF 5286-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 5287- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 5288- ac_status=$? 5289- grep -v '^ *+' conftest.er1 >conftest.err 5290- rm -f conftest.er1 5291- cat conftest.err >&5 5292- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5293- (exit $ac_status); } >/dev/null; then 5294- if test -s conftest.err; then 5295- ac_cpp_err=$ac_c_preproc_warn_flag 5296- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 5297- else 5298- ac_cpp_err= 5299- fi 5300-else 5301- ac_cpp_err=yes 5302-fi 5303-if test -z "$ac_cpp_err"; then 5304- # Broken: success on invalid input. 5305-continue 5306-else 5307- echo "$as_me: failed program was:" >&5 5308-sed 's/^/| /' conftest.$ac_ext >&5 5309- 5310- # Passes both tests. 5311-ac_preproc_ok=: 5312-break 5313+rm -f conftest* 5314+ ac_cv_prog_CPP="$CPP" 5315 fi 5316-rm -f conftest.err conftest.$ac_ext 5317- 5318-done 5319-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5320-rm -f conftest.err conftest.$ac_ext 5321-if $ac_preproc_ok; then 5322- : 5323+ CPP="$ac_cv_prog_CPP" 5324 else 5325- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check 5326-See \`config.log' for more details." >&5 5327-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check 5328-See \`config.log' for more details." >&2;} 5329- { (exit 1); exit 1; }; } 5330+ ac_cv_prog_CPP="$CPP" 5331 fi 5332+echo "$ac_t""$CPP" 1>&6 5333 5334-ac_ext=c 5335-ac_cpp='$CPP $CPPFLAGS' 5336-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 5337-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 5338-ac_compiler_gnu=$ac_cv_c_compiler_gnu 5339- 5340- 5341-echo "$as_me:$LINENO: checking for AIX" >&5 5342-echo $ECHO_N "checking for AIX... $ECHO_C" >&6 5343-cat >conftest.$ac_ext <<_ACEOF 5344-/* confdefs.h. */ 5345-_ACEOF 5346-cat confdefs.h >>conftest.$ac_ext 5347-cat >>conftest.$ac_ext <<_ACEOF 5348-/* end confdefs.h. */ 5349+echo $ac_n "checking for AIX""... $ac_c" 1>&6 5350+echo "configure:2741: checking for AIX" >&5 5351+cat > conftest.$ac_ext <<EOF 5352+#line 2743 "configure" 5353+#include "confdefs.h" 5354 #ifdef _AIX 5355 yes 5356 #endif 5357 5358-_ACEOF 5359+EOF 5360 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 5361- $EGREP "yes" >/dev/null 2>&1; then 5362- echo "$as_me:$LINENO: result: yes" >&5 5363-echo "${ECHO_T}yes" >&6 5364-cat >>confdefs.h <<\_ACEOF 5365+ egrep "yes" >/dev/null 2>&1; then 5366+ rm -rf conftest* 5367+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF 5368 #define _ALL_SOURCE 1 5369-_ACEOF 5370+EOF 5371 5372 else 5373- echo "$as_me:$LINENO: result: no" >&5 5374-echo "${ECHO_T}no" >&6 5375+ rm -rf conftest* 5376+ echo "$ac_t""no" 1>&6 5377 fi 5378 rm -f conftest* 5379 5380 5381-echo "$as_me:$LINENO: checking whether ln -s works" >&5 5382-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 5383-LN_S=$as_ln_s 5384-if test "$LN_S" = "ln -s"; then 5385- echo "$as_me:$LINENO: result: yes" >&5 5386-echo "${ECHO_T}yes" >&6 5387+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 5388+echo "configure:2765: checking whether ln -s works" >&5 5389+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then 5390+ echo $ac_n "(cached) $ac_c" 1>&6 5391+else 5392+ rm -f conftestdata 5393+if ln -s X conftestdata 2>/dev/null 5394+then 5395+ rm -f conftestdata 5396+ ac_cv_prog_LN_S="ln -s" 5397+else 5398+ ac_cv_prog_LN_S=ln 5399+fi 5400+fi 5401+LN_S="$ac_cv_prog_LN_S" 5402+if test "$ac_cv_prog_LN_S" = "ln -s"; then 5403+ echo "$ac_t""yes" 1>&6 5404 else 5405- echo "$as_me:$LINENO: result: no, using $LN_S" >&5 5406-echo "${ECHO_T}no, using $LN_S" >&6 5407+ echo "$ac_t""no" 1>&6 5408 fi 5409 5410 5411 5412 php_with_libdir=lib 5413 5414-echo "$as_me:$LINENO: checking for system library directory" >&5 5415-echo $ECHO_N "checking for system library directory... $ECHO_C" >&6 5416- 5417+echo $ac_n "checking for system library directory""... $ac_c" 1>&6 5418+echo "configure:2790: checking for system library directory" >&5 5419 # Check whether --with-libdir or --without-libdir was given. 5420 if test "${with_libdir+set}" = set; then 5421 withval="$with_libdir" 5422 PHP_LIBDIR=$withval 5423 else 5424- 5425+ 5426 PHP_LIBDIR=lib 5427+ 5428 5429+fi 5430 5431-fi; 5432 5433 ext_output=$PHP_LIBDIR 5434-echo "$as_me:$LINENO: result: $ext_output" >&5 5435-echo "${ECHO_T}$ext_output" >&6 5436+echo "$ac_t""$ext_output" 1>&6 5437 5438 5439 5440@@ -3590,148 +2808,90 @@ 5441 5442 php_enable_rpath=yes 5443 5444-echo "$as_me:$LINENO: checking whether to enable runpaths" >&5 5445-echo $ECHO_N "checking whether to enable runpaths... $ECHO_C" >&6 5446+echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 5447+echo "configure:2813: checking whether to enable runpaths" >&5 5448 # Check whether --enable-rpath or --disable-rpath was given. 5449 if test "${enable_rpath+set}" = set; then 5450 enableval="$enable_rpath" 5451 PHP_RPATH=$enableval 5452 else 5453- 5454+ 5455 PHP_RPATH=yes 5456+ 5457 5458+fi 5459 5460-fi; 5461 5462 ext_output=$PHP_RPATH 5463-echo "$as_me:$LINENO: result: $ext_output" >&5 5464-echo "${ECHO_T}$ext_output" >&6 5465+echo "$ac_t""$ext_output" 1>&6 5466 5467 5468 5469 5470 5471-echo "$as_me:$LINENO: checking if compiler supports -R" >&5 5472-echo $ECHO_N "checking if compiler supports -R... $ECHO_C" >&6 5473-if test "${php_cv_cc_dashr+set}" = set; then 5474- echo $ECHO_N "(cached) $ECHO_C" >&6 5475+echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 5476+echo "configure:2834: checking if compiler supports -R" >&5 5477+if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then 5478+ echo $ac_n "(cached) $ac_c" 1>&6 5479 else 5480- 5481+ 5482 SAVE_LIBS=$LIBS 5483 LIBS="-R /usr/$PHP_LIBDIR $LIBS" 5484- cat >conftest.$ac_ext <<_ACEOF 5485-/* confdefs.h. */ 5486-_ACEOF 5487-cat confdefs.h >>conftest.$ac_ext 5488-cat >>conftest.$ac_ext <<_ACEOF 5489-/* end confdefs.h. */ 5490+ cat > conftest.$ac_ext <<EOF 5491+#line 2842 "configure" 5492+#include "confdefs.h" 5493 5494-int 5495-main () 5496-{ 5497+int main() { 5498 5499- ; 5500- return 0; 5501-} 5502-_ACEOF 5503-rm -f conftest.$ac_objext conftest$ac_exeext 5504-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5505- (eval $ac_link) 2>conftest.er1 5506- ac_status=$? 5507- grep -v '^ *+' conftest.er1 >conftest.err 5508- rm -f conftest.er1 5509- cat conftest.err >&5 5510- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5511- (exit $ac_status); } && 5512- { ac_try='test -z "$ac_c_werror_flag" 5513- || test ! -s conftest.err' 5514- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5515- (eval $ac_try) 2>&5 5516- ac_status=$? 5517- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5518- (exit $ac_status); }; } && 5519- { ac_try='test -s conftest$ac_exeext' 5520- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5521- (eval $ac_try) 2>&5 5522- ac_status=$? 5523- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5524- (exit $ac_status); }; }; then 5525+; return 0; } 5526+EOF 5527+if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 5528+ rm -rf conftest* 5529 php_cv_cc_dashr=yes 5530 else 5531- echo "$as_me: failed program was:" >&5 5532-sed 's/^/| /' conftest.$ac_ext >&5 5533- 5534-php_cv_cc_dashr=no 5535+ echo "configure: failed program was:" >&5 5536+ cat conftest.$ac_ext >&5 5537+ rm -rf conftest* 5538+ php_cv_cc_dashr=no 5539 fi 5540-rm -f conftest.err conftest.$ac_objext \ 5541- conftest$ac_exeext conftest.$ac_ext 5542+rm -f conftest* 5543 LIBS=$SAVE_LIBS 5544 fi 5545 5546-echo "$as_me:$LINENO: result: $php_cv_cc_dashr" >&5 5547-echo "${ECHO_T}$php_cv_cc_dashr" >&6 5548+echo "$ac_t""$php_cv_cc_dashr" 1>&6 5549 if test $php_cv_cc_dashr = "yes"; then 5550 ld_runpath_switch=-R 5551 else 5552- echo "$as_me:$LINENO: checking if compiler supports -Wl,-rpath," >&5 5553-echo $ECHO_N "checking if compiler supports -Wl,-rpath,... $ECHO_C" >&6 5554- if test "${php_cv_cc_rpath+set}" = set; then 5555- echo $ECHO_N "(cached) $ECHO_C" >&6 5556+ echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6 5557+echo "configure:2867: checking if compiler supports -Wl,-rpath," >&5 5558+ if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then 5559+ echo $ac_n "(cached) $ac_c" 1>&6 5560 else 5561- 5562+ 5563 SAVE_LIBS=$LIBS 5564 LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" 5565- cat >conftest.$ac_ext <<_ACEOF 5566-/* confdefs.h. */ 5567-_ACEOF 5568-cat confdefs.h >>conftest.$ac_ext 5569-cat >>conftest.$ac_ext <<_ACEOF 5570-/* end confdefs.h. */ 5571+ cat > conftest.$ac_ext <<EOF 5572+#line 2875 "configure" 5573+#include "confdefs.h" 5574 5575-int 5576-main () 5577-{ 5578+int main() { 5579 5580- ; 5581- return 0; 5582-} 5583-_ACEOF 5584-rm -f conftest.$ac_objext conftest$ac_exeext 5585-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 5586- (eval $ac_link) 2>conftest.er1 5587- ac_status=$? 5588- grep -v '^ *+' conftest.er1 >conftest.err 5589- rm -f conftest.er1 5590- cat conftest.err >&5 5591- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5592- (exit $ac_status); } && 5593- { ac_try='test -z "$ac_c_werror_flag" 5594- || test ! -s conftest.err' 5595- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5596- (eval $ac_try) 2>&5 5597- ac_status=$? 5598- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5599- (exit $ac_status); }; } && 5600- { ac_try='test -s conftest$ac_exeext' 5601- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5602- (eval $ac_try) 2>&5 5603- ac_status=$? 5604- echo "$as_me:$LINENO: \$? = $ac_status" >&5 5605- (exit $ac_status); }; }; then 5606+; return 0; } 5607+EOF 5608+if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 5609+ rm -rf conftest* 5610 php_cv_cc_rpath=yes 5611 else 5612- echo "$as_me: failed program was:" >&5 5613-sed 's/^/| /' conftest.$ac_ext >&5 5614- 5615-php_cv_cc_rpath=no 5616+ echo "configure: failed program was:" >&5 5617+ cat conftest.$ac_ext >&5 5618+ rm -rf conftest* 5619+ php_cv_cc_rpath=no 5620 fi 5621-rm -f conftest.err conftest.$ac_objext \ 5622- conftest$ac_exeext conftest.$ac_ext 5623+rm -f conftest* 5624 LIBS=$SAVE_LIBS 5625 fi 5626 5627- echo "$as_me:$LINENO: result: $php_cv_cc_rpath" >&5 5628-echo "${ECHO_T}$php_cv_cc_rpath" >&6 5629+ echo "$ac_t""$php_cv_cc_rpath" 1>&6 5630 if test $php_cv_cc_rpath = "yes"; then 5631 ld_runpath_switch=-Wl,-rpath, 5632 else 5633@@ -3746,120 +2906,100 @@ 5634 5635 for ac_prog in gawk nawk awk mawk 5636 do 5637- # Extract the first word of "$ac_prog", so it can be a program name with args. 5638+# Extract the first word of "$ac_prog", so it can be a program name with args. 5639 set dummy $ac_prog; ac_word=$2 5640-echo "$as_me:$LINENO: checking for $ac_word" >&5 5641-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 5642-if test "${ac_cv_prog_AWK+set}" = set; then 5643- echo $ECHO_N "(cached) $ECHO_C" >&6 5644+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 5645+echo "configure:2913: checking for $ac_word" >&5 5646+if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then 5647+ echo $ac_n "(cached) $ac_c" 1>&6 5648 else 5649 if test -n "$AWK"; then 5650 ac_cv_prog_AWK="$AWK" # Let the user override the test. 5651 else 5652-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 5653-as_dummy="/usr/xpg4/bin/:$PATH" 5654-for as_dir in $as_dummy 5655-do 5656- IFS=$as_save_IFS 5657- test -z "$as_dir" && as_dir=. 5658- for ac_exec_ext in '' $ac_executable_extensions; do 5659- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 5660- ac_cv_prog_AWK="$ac_prog" 5661- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 5662- break 2 5663- fi 5664-done 5665-done 5666- 5667+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 5668+ ac_dummy="/usr/xpg4/bin/:$PATH" 5669+ for ac_dir in $ac_dummy; do 5670+ test -z "$ac_dir" && ac_dir=. 5671+ if test -f $ac_dir/$ac_word; then 5672+ ac_cv_prog_AWK="$ac_prog" 5673+ break 5674+ fi 5675+ done 5676+ IFS="$ac_save_ifs" 5677 fi 5678 fi 5679-AWK=$ac_cv_prog_AWK 5680+AWK="$ac_cv_prog_AWK" 5681 if test -n "$AWK"; then 5682- echo "$as_me:$LINENO: result: $AWK" >&5 5683-echo "${ECHO_T}$AWK" >&6 5684+ echo "$ac_t""$AWK" 1>&6 5685 else 5686- echo "$as_me:$LINENO: result: no" >&5 5687-echo "${ECHO_T}no" >&6 5688+ echo "$ac_t""no" 1>&6 5689 fi 5690 5691- test -n "$AWK" && break 5692+test -n "$AWK" && break 5693 done 5694 test -n "$AWK" || AWK="bork" 5695 5696 case "$AWK" in 5697 *mawk) 5698- { echo "$as_me:$LINENO: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5 5699-echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;} 5700+ echo "configure: warning: mawk is known to have problems on some systems. You should install GNU awk" 1>&2 5701 ;; 5702- *gawk) 5703+ *gawk) 5704 ;; 5705- bork) 5706- { { echo "$as_me:$LINENO: error: Could not find awk; Install GNU awk" >&5 5707-echo "$as_me: error: Could not find awk; Install GNU awk" >&2;} 5708- { (exit 1); exit 1; }; } 5709+ bork) 5710+ { echo "configure: error: Could not find awk; Install GNU awk" 1>&2; exit 1; } 5711 ;; 5712 *) 5713- echo "$as_me:$LINENO: checking if $AWK is broken" >&5 5714-echo $ECHO_N "checking if $AWK is broken... $ECHO_C" >&6 5715+ echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 5716+echo "configure:2954: checking if $AWK is broken" >&5 5717 if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then 5718- echo "$as_me:$LINENO: result: yes" >&5 5719-echo "${ECHO_T}yes" >&6 5720- { { echo "$as_me:$LINENO: error: You should install GNU awk" >&5 5721-echo "$as_me: error: You should install GNU awk" >&2;} 5722- { (exit 1); exit 1; }; } 5723+ echo "$ac_t""yes" 1>&6 5724+ { echo "configure: error: You should install GNU awk" 1>&2; exit 1; } 5725 else 5726- echo "$as_me:$LINENO: result: no" >&5 5727-echo "${ECHO_T}no" >&6 5728+ echo "$ac_t""no" 1>&6 5729 fi 5730 ;; 5731 esac 5732- 5733+ 5734 PHP_VAR_SUBST="$PHP_VAR_SUBST AWK" 5735 5736 5737 5738 for ac_prog in 'bison -y' byacc 5739 do 5740- # Extract the first word of "$ac_prog", so it can be a program name with args. 5741+# Extract the first word of "$ac_prog", so it can be a program name with args. 5742 set dummy $ac_prog; ac_word=$2 5743-echo "$as_me:$LINENO: checking for $ac_word" >&5 5744-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 5745-if test "${ac_cv_prog_YACC+set}" = set; then 5746- echo $ECHO_N "(cached) $ECHO_C" >&6 5747+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 5748+echo "configure:2973: checking for $ac_word" >&5 5749+if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then 5750+ echo $ac_n "(cached) $ac_c" 1>&6 5751 else 5752 if test -n "$YACC"; then 5753 ac_cv_prog_YACC="$YACC" # Let the user override the test. 5754 else 5755-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 5756-for as_dir in $PATH 5757-do 5758- IFS=$as_save_IFS 5759- test -z "$as_dir" && as_dir=. 5760- for ac_exec_ext in '' $ac_executable_extensions; do 5761- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 5762- ac_cv_prog_YACC="$ac_prog" 5763- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 5764- break 2 5765- fi 5766-done 5767-done 5768- 5769+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 5770+ ac_dummy="$PATH" 5771+ for ac_dir in $ac_dummy; do 5772+ test -z "$ac_dir" && ac_dir=. 5773+ if test -f $ac_dir/$ac_word; then 5774+ ac_cv_prog_YACC="$ac_prog" 5775+ break 5776+ fi 5777+ done 5778+ IFS="$ac_save_ifs" 5779 fi 5780 fi 5781-YACC=$ac_cv_prog_YACC 5782+YACC="$ac_cv_prog_YACC" 5783 if test -n "$YACC"; then 5784- echo "$as_me:$LINENO: result: $YACC" >&5 5785-echo "${ECHO_T}$YACC" >&6 5786+ echo "$ac_t""$YACC" 1>&6 5787 else 5788- echo "$as_me:$LINENO: result: no" >&5 5789-echo "${ECHO_T}no" >&6 5790+ echo "$ac_t""no" 1>&6 5791 fi 5792 5793- test -n "$YACC" && break 5794+test -n "$YACC" && break 5795 done 5796 test -n "$YACC" || YACC="yacc" 5797 5798- 5799+ 5800 # we only support certain bison versions 5801 bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" 5802 5803@@ -3868,12 +3008,12 @@ 5804 5805 bison_version=none 5806 if test "$YACC"; then 5807- echo "$as_me:$LINENO: checking for bison version" >&5 5808-echo $ECHO_N "checking for bison version... $ECHO_C" >&6 5809-if test "${php_cv_bison_version+set}" = set; then 5810- echo $ECHO_N "(cached) $ECHO_C" >&6 5811+ echo $ac_n "checking for bison version""... $ac_c" 1>&6 5812+echo "configure:3013: checking for bison version" >&5 5813+if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then 5814+ echo $ac_n "(cached) $ac_c" 1>&6 5815 else 5816- 5817+ 5818 bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z` 5819 php_cv_bison_version=invalid 5820 if test -n "$bison_version_vars"; then 5821@@ -3886,86 +3026,78 @@ 5822 fi 5823 done 5824 fi 5825- 5826+ 5827 fi 5828-echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5 5829-echo "${ECHO_T}$php_cv_bison_version" >&6 5830+ 5831+echo "$ac_t""$php_cv_bison_version" 1>&6 5832 fi 5833 case $php_cv_bison_version in 5834 ""|invalid) 5835 bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)." 5836- { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5 5837-echo "$as_me: WARNING: $bison_msg" >&2;} 5838+ echo "configure: warning: $bison_msg" 1>&2 5839 YACC="exit 0;" 5840 ;; 5841 esac 5842 5843- 5844+ 5845 PHP_VAR_SUBST="$PHP_VAR_SUBST YACC" 5846 5847 5848 5849 # Extract the first word of "re2c", so it can be a program name with args. 5850 set dummy re2c; ac_word=$2 5851-echo "$as_me:$LINENO: checking for $ac_word" >&5 5852-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 5853-if test "${ac_cv_prog_RE2C+set}" = set; then 5854- echo $ECHO_N "(cached) $ECHO_C" >&6 5855+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 5856+echo "configure:3051: checking for $ac_word" >&5 5857+if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then 5858+ echo $ac_n "(cached) $ac_c" 1>&6 5859 else 5860 if test -n "$RE2C"; then 5861 ac_cv_prog_RE2C="$RE2C" # Let the user override the test. 5862 else 5863-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 5864-for as_dir in $PATH 5865-do 5866- IFS=$as_save_IFS 5867- test -z "$as_dir" && as_dir=. 5868- for ac_exec_ext in '' $ac_executable_extensions; do 5869- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 5870- ac_cv_prog_RE2C="re2c" 5871- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 5872- break 2 5873- fi 5874-done 5875-done 5876- 5877+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 5878+ ac_dummy="$PATH" 5879+ for ac_dir in $ac_dummy; do 5880+ test -z "$ac_dir" && ac_dir=. 5881+ if test -f $ac_dir/$ac_word; then 5882+ ac_cv_prog_RE2C="re2c" 5883+ break 5884+ fi 5885+ done 5886+ IFS="$ac_save_ifs" 5887 fi 5888 fi 5889-RE2C=$ac_cv_prog_RE2C 5890+RE2C="$ac_cv_prog_RE2C" 5891 if test -n "$RE2C"; then 5892- echo "$as_me:$LINENO: result: $RE2C" >&5 5893-echo "${ECHO_T}$RE2C" >&6 5894+ echo "$ac_t""$RE2C" 1>&6 5895 else 5896- echo "$as_me:$LINENO: result: no" >&5 5897-echo "${ECHO_T}no" >&6 5898+ echo "$ac_t""no" 1>&6 5899 fi 5900 5901 if test -n "$RE2C"; then 5902- echo "$as_me:$LINENO: checking for re2c version" >&5 5903-echo $ECHO_N "checking for re2c version... $ECHO_C" >&6 5904-if test "${php_cv_re2c_version+set}" = set; then 5905- echo $ECHO_N "(cached) $ECHO_C" >&6 5906+ echo $ac_n "checking for re2c version""... $ac_c" 1>&6 5907+echo "configure:3079: checking for re2c version" >&5 5908+if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then 5909+ echo $ac_n "(cached) $ac_c" 1>&6 5910 else 5911- 5912+ 5913 re2c_vernum=`$RE2C --vernum 2>/dev/null` 5914 if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1304"; then 5915 php_cv_re2c_version=invalid 5916 else 5917 php_cv_re2c_version="`$RE2C --version | cut -d ' ' -f 2 2>/dev/null` (ok)" 5918- fi 5919- 5920+ fi 5921+ 5922 fi 5923-echo "$as_me:$LINENO: result: $php_cv_re2c_version" >&5 5924-echo "${ECHO_T}$php_cv_re2c_version" >&6 5925+ 5926+echo "$ac_t""$php_cv_re2c_version" 1>&6 5927 fi 5928 case $php_cv_re2c_version in 5929 ""|invalid) 5930- { echo "$as_me:$LINENO: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&5 5931-echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&2;} 5932+ echo "configure: warning: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." 1>&2 5933 RE2C="exit 0;" 5934 ;; 5935 esac 5936- 5937+ 5938 PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C" 5939 5940 5941@@ -3973,9 +3105,7 @@ 5942 case $php_cv_bison_version in 5943 ""|invalid) 5944 if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then 5945- { { echo "$as_me:$LINENO: error: bison is required to build PHP/Zend when building a GIT checkout!" >&5 5946-echo "$as_me: error: bison is required to build PHP/Zend when building a GIT checkout!" >&2;} 5947- { (exit 1); exit 1; }; } 5948+ { echo "configure: error: bison is required to build PHP/Zend when building a GIT checkout!" 1>&2; exit 1; } 5949 fi 5950 ;; 5951 esac 5952@@ -3983,22 +3113,22 @@ 5953 5954 php_enable_re2c_cgoto=no 5955 5956-echo "$as_me:$LINENO: checking whether to enable computed goto gcc extension with re2c" >&5 5957-echo $ECHO_N "checking whether to enable computed goto gcc extension with re2c... $ECHO_C" >&6 5958+echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6 5959+echo "configure:3118: checking whether to enable computed goto gcc extension with re2c" >&5 5960 # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given. 5961 if test "${enable_re2c_cgoto+set}" = set; then 5962 enableval="$enable_re2c_cgoto" 5963 PHP_RE2C_CGOTO=$enableval 5964 else 5965- 5966+ 5967 PHP_RE2C_CGOTO=no 5968+ 5969 5970+fi 5971 5972-fi; 5973 5974 ext_output=$PHP_RE2C_CGOTO 5975-echo "$as_me:$LINENO: result: $ext_output" >&5 5976-echo "${ECHO_T}$ext_output" >&6 5977+echo "$ac_t""$ext_output" 1>&6 5978 5979 5980 5981@@ -4006,18 +3136,13 @@ 5982 if test "$PHP_RE2C_CGOTO" = "no"; then 5983 RE2C_FLAGS="" 5984 else 5985- echo "$as_me:$LINENO: checking whether re2c -g works" >&5 5986-echo $ECHO_N "checking whether re2c -g works... $ECHO_C" >&6 5987- cat >conftest.$ac_ext <<_ACEOF 5988-/* confdefs.h. */ 5989-_ACEOF 5990-cat confdefs.h >>conftest.$ac_ext 5991-cat >>conftest.$ac_ext <<_ACEOF 5992-/* end confdefs.h. */ 5993+ echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6 5994+echo "configure:3141: checking whether re2c -g works" >&5 5995+ cat > conftest.$ac_ext <<EOF 5996+#line 3143 "configure" 5997+#include "confdefs.h" 5998 5999-int 6000-main () 6001-{ 6002+int main() { 6003 6004 int main(int argc, const char **argv) 6005 { 6006@@ -4029,49 +3154,25 @@ 6007 goto *adr[0]; 6008 return 0; 6009 } 6010- 6011- ; 6012- return 0; 6013-} 6014-_ACEOF 6015-rm -f conftest.$ac_objext 6016-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6017- (eval $ac_compile) 2>conftest.er1 6018- ac_status=$? 6019- grep -v '^ *+' conftest.er1 >conftest.err 6020- rm -f conftest.er1 6021- cat conftest.err >&5 6022- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6023- (exit $ac_status); } && 6024- { ac_try='test -z "$ac_c_werror_flag" 6025- || test ! -s conftest.err' 6026- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6027- (eval $ac_try) 2>&5 6028- ac_status=$? 6029- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6030- (exit $ac_status); }; } && 6031- { ac_try='test -s conftest.$ac_objext' 6032- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6033- (eval $ac_try) 2>&5 6034- ac_status=$? 6035- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6036- (exit $ac_status); }; }; then 6037- 6038+ 6039+; return 0; } 6040+EOF 6041+if { (eval echo configure:3161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 6042+ rm -rf conftest* 6043+ 6044 RE2C_FLAGS="" 6045- echo "$as_me:$LINENO: result: no" >&5 6046-echo "${ECHO_T}no" >&6 6047- 6048+ echo "$ac_t""no" 1>&6 6049+ 6050 else 6051- echo "$as_me: failed program was:" >&5 6052-sed 's/^/| /' conftest.$ac_ext >&5 6053- 6054- 6055+ echo "configure: failed program was:" >&5 6056+ cat conftest.$ac_ext >&5 6057+ rm -rf conftest* 6058+ 6059 RE2C_FLAGS="-g" 6060- echo "$as_me:$LINENO: result: yes" >&5 6061-echo "${ECHO_T}yes" >&6 6062- 6063+ echo "$ac_t""yes" 1>&6 6064+ 6065 fi 6066-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 6067+rm -f conftest* 6068 fi 6069 6070 PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS" 6071@@ -4119,14 +3220,14 @@ 6072 ;; 6073 *darwin*|*rhapsody*) 6074 if test -n "$GCC"; then 6075- 6076+ 6077 gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp 6078- echo "$as_me:$LINENO: checking whether $CC supports -no-cpp-precomp" >&5 6079-echo $ECHO_N "checking whether $CC supports -no-cpp-precomp... $ECHO_C" >&6 6080-if test "${ac_cv_gcc_arg_no_cpp_precomp+set}" = set; then 6081- echo $ECHO_N "(cached) $ECHO_C" >&6 6082+ echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6 6083+echo "configure:3227: checking whether $CC supports -no-cpp-precomp" >&5 6084+if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then 6085+ echo $ac_n "(cached) $ac_c" 1>&6 6086 else 6087- 6088+ 6089 echo 'void somefunc() { };' > conftest.c 6090 cmd='$CC -no-cpp-precomp -c conftest.c' 6091 if eval $cmd 2>&1 | $EGREP -e -no-cpp-precomp >/dev/null ; then 6092@@ -4136,15 +3237,15 @@ 6093 fi 6094 eval $gcc_arg_name=$ac_result 6095 rm -f conftest.* 6096- 6097+ 6098 fi 6099-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_no_cpp_precomp" >&5 6100-echo "${ECHO_T}$ac_cv_gcc_arg_no_cpp_precomp" >&6 6101+ 6102+echo "$ac_t""$ac_cv_gcc_arg_no_cpp_precomp" 1>&6 6103 if eval test "\$$gcc_arg_name" = "yes"; then 6104 gcc_no_cpp_precomp=yes 6105 else 6106 : 6107- 6108+ 6109 fi 6110 6111 if test "$gcc_no_cpp_precomp" = "yes"; then 6112@@ -4166,8 +3267,7 @@ 6113 fi 6114 ;; 6115 *netware*) 6116- 6117- OVERALL_TARGET=php 6118+ 6119 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6120 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6121 php_c_post= 6122@@ -4189,17 +3289,15 @@ 6123 shared_cxx_post= 6124 shared_lo=lo 6125 6126- php_build_target=program 6127- 6128- 6129- 6130+ 6131+ 6132 case /main in 6133 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 6134 /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 6135 *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 6136 esac 6137- 6138- 6139+ 6140+ 6141 6142 b_c_pre=$php_c_pre 6143 b_cxx_pre=$php_cxx_pre 6144@@ -4212,12 +3310,12 @@ 6145 6146 old_IFS=$IFS 6147 for ac_src in internal_functions.c; do 6148- 6149+ 6150 IFS=. 6151 set $ac_src 6152 ac_obj=$1 6153 IFS=$old_IFS 6154- 6155+ 6156 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 6157 6158 case $ac_src in 6159@@ -4234,15 +3332,15 @@ 6160 done 6161 6162 6163- 6164- 6165+ 6166+ 6167 case win32 in 6168 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 6169 /*) ac_srcdir=`echo "win32"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 6170 *) ac_srcdir="$abs_srcdir/win32/"; ac_bdir="win32/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 6171 esac 6172- 6173- 6174+ 6175+ 6176 6177 b_c_pre=$php_c_pre 6178 b_cxx_pre=$php_cxx_pre 6179@@ -4255,12 +3353,12 @@ 6180 6181 old_IFS=$IFS 6182 for ac_src in sendmail.c; do 6183- 6184+ 6185 IFS=. 6186 set $ac_src 6187 ac_obj=$1 6188 IFS=$old_IFS 6189- 6190+ 6191 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 6192 6193 case $ac_src in 6194@@ -4279,10 +3377,10 @@ 6195 6196 PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) 6197 EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext 6198- 6199+ 6200 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP5LIB_SHARED_LIBADD" 6201 6202- 6203+ 6204 install_modules="install-modules" 6205 6206 case $host_alias in 6207@@ -4305,7 +3403,7 @@ 6208 else 6209 PHP_MODULES="$PHP_MODULES \$(phplibdir)/php5lib.$suffix" 6210 fi 6211- 6212+ 6213 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS" 6214 6215 cat >>Makefile.objects<<EOF 6216@@ -4322,22 +3420,19 @@ 6217 6218 # Disable PIC mode by default where it is known to be safe to do so, 6219 # to avoid the performance hit from the lost register 6220-echo "$as_me:$LINENO: checking whether to force non-PIC code in shared modules" >&5 6221-echo $ECHO_N "checking whether to force non-PIC code in shared modules... $ECHO_C" >&6 6222+echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6 6223+echo "configure:3425: checking whether to force non-PIC code in shared modules" >&5 6224 case $host_alias in 6225 i?86-*-linux*|i?86-*-freebsd*) 6226 if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then 6227 with_pic=no 6228- echo "$as_me:$LINENO: result: yes" >&5 6229-echo "${ECHO_T}yes" >&6 6230+ echo "$ac_t""yes" 1>&6 6231 else 6232- echo "$as_me:$LINENO: result: no" >&5 6233-echo "${ECHO_T}no" >&6 6234+ echo "$ac_t""no" 1>&6 6235 fi 6236 ;; 6237 *) 6238- echo "$as_me:$LINENO: result: no" >&5 6239-echo "${ECHO_T}no" >&6 6240+ echo "$ac_t""no" 1>&6 6241 ;; 6242 esac 6243 6244@@ -4355,20 +3450,20 @@ 6245 6246 6247 6248-echo "$as_me:$LINENO: checking whether /dev/urandom exists" >&5 6249-echo $ECHO_N "checking whether /dev/urandom exists... $ECHO_C" >&6 6250-if test -r "/dev/urandom" && test -c "/dev/urandom"; then 6251- 6252-cat >>confdefs.h <<\_ACEOF 6253+echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 6254+echo "configure:3455: checking whether /dev/urandom exists" >&5 6255+if test -r "/dev/urandom" && test -c "/dev/urandom"; then 6256+ cat >> confdefs.h <<\EOF 6257 #define HAVE_DEV_URANDOM 1 6258-_ACEOF 6259+EOF 6260+ 6261+ echo "$ac_t""yes" 1>&6 6262+else 6263+ echo "$ac_t""no" 1>&6 6264+fi 6265+ 6266+ 6267 6268- echo "$as_me:$LINENO: result: yes" >&5 6269-echo "${ECHO_T}yes" >&6 6270-else 6271- echo "$as_me:$LINENO: result: no" >&5 6272-echo "${ECHO_T}no" >&6 6273-fi 6274 6275 6276 6277@@ -4388,6 +3483,10 @@ 6278 6279 6280 6281+cat >> confdefs.h <<\EOF 6282+#define SUHOSIN_PATCH 1 6283+EOF 6284+ 6285 6286 6287 6288@@ -4399,7 +3498,7 @@ 6289 else 6290 save_CFLAGS=$CFLAGS 6291 save_LIBS=$LIBS 6292- 6293+ 6294 if test -n "$ac_cv_pthreads_lib"; then 6295 LIBS="$LIBS -l$ac_cv_pthreads_lib" 6296 fi 6297@@ -4408,9 +3507,9 @@ 6298 CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" 6299 fi 6300 6301- 6302+ 6303 if test "$cross_compiling" = yes; then 6304- 6305+ 6306 pthreads_working=no 6307 case $host_alias in 6308 *netware*) 6309@@ -4419,12 +3518,9 @@ 6310 6311 6312 else 6313- cat >conftest.$ac_ext <<_ACEOF 6314-/* confdefs.h. */ 6315-_ACEOF 6316-cat confdefs.h >>conftest.$ac_ext 6317-cat >>conftest.$ac_ext <<_ACEOF 6318-/* end confdefs.h. */ 6319+ cat > conftest.$ac_ext <<EOF 6320+#line 3523 "configure" 6321+#include "confdefs.h" 6322 6323 #include <pthread.h> 6324 #include <stddef.h> 6325@@ -4439,51 +3535,41 @@ 6326 int data = 1; 6327 pthread_mutexattr_init(&mattr); 6328 return pthread_create(&thd, NULL, thread_routine, &data); 6329-} 6330-_ACEOF 6331-rm -f conftest$ac_exeext 6332-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6333- (eval $ac_link) 2>&5 6334- ac_status=$? 6335- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6336- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 6337- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6338- (eval $ac_try) 2>&5 6339- ac_status=$? 6340- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6341- (exit $ac_status); }; }; then 6342- 6343+} 6344+EOF 6345+if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 6346+then 6347+ 6348 pthreads_working=yes 6349- 6350+ 6351 else 6352- echo "$as_me: program exited with status $ac_status" >&5 6353-echo "$as_me: failed program was:" >&5 6354-sed 's/^/| /' conftest.$ac_ext >&5 6355- 6356-( exit $ac_status ) 6357- 6358+ echo "configure: failed program was:" >&5 6359+ cat conftest.$ac_ext >&5 6360+ rm -fr conftest* 6361+ 6362 pthreads_working=no 6363- 6364+ 6365 fi 6366-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 6367+rm -fr conftest* 6368 fi 6369+ 6370 LIBS=$save_LIBS 6371 CFLAGS=$save_CFLAGS 6372 6373- echo "$as_me:$LINENO: checking for pthreads_cflags" >&5 6374-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6 6375-if test "${ac_cv_pthreads_cflags+set}" = set; then 6376- echo $ECHO_N "(cached) $ECHO_C" >&6 6377+ echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 6378+echo "configure:3561: checking for pthreads_cflags" >&5 6379+if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then 6380+ echo $ac_n "(cached) $ac_c" 1>&6 6381 else 6382- 6383+ 6384 ac_cv_pthreads_cflags= 6385 if test "$pthreads_working" != "yes"; then 6386- for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 6387+ for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 6388 ac_save=$CFLAGS 6389 CFLAGS="$CFLAGS $flag" 6390- 6391+ 6392 if test "$cross_compiling" = yes; then 6393- 6394+ 6395 pthreads_working=no 6396 case $host_alias in 6397 *netware*) 6398@@ -4492,12 +3578,9 @@ 6399 6400 6401 else 6402- cat >conftest.$ac_ext <<_ACEOF 6403-/* confdefs.h. */ 6404-_ACEOF 6405-cat confdefs.h >>conftest.$ac_ext 6406-cat >>conftest.$ac_ext <<_ACEOF 6407-/* end confdefs.h. */ 6408+ cat > conftest.$ac_ext <<EOF 6409+#line 3583 "configure" 6410+#include "confdefs.h" 6411 6412 #include <pthread.h> 6413 #include <stddef.h> 6414@@ -4512,34 +3595,24 @@ 6415 int data = 1; 6416 pthread_mutexattr_init(&mattr); 6417 return pthread_create(&thd, NULL, thread_routine, &data); 6418-} 6419-_ACEOF 6420-rm -f conftest$ac_exeext 6421-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6422- (eval $ac_link) 2>&5 6423- ac_status=$? 6424- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6425- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 6426- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6427- (eval $ac_try) 2>&5 6428- ac_status=$? 6429- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6430- (exit $ac_status); }; }; then 6431- 6432+} 6433+EOF 6434+if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 6435+then 6436+ 6437 pthreads_working=yes 6438- 6439+ 6440 else 6441- echo "$as_me: program exited with status $ac_status" >&5 6442-echo "$as_me: failed program was:" >&5 6443-sed 's/^/| /' conftest.$ac_ext >&5 6444- 6445-( exit $ac_status ) 6446- 6447+ echo "configure: failed program was:" >&5 6448+ cat conftest.$ac_ext >&5 6449+ rm -fr conftest* 6450+ 6451 pthreads_working=no 6452- 6453+ 6454 fi 6455-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 6456+rm -fr conftest* 6457 fi 6458+ 6459 CFLAGS=$ac_save 6460 if test "$pthreads_working" = "yes"; then 6461 ac_cv_pthreads_cflags=$flag 6462@@ -4550,23 +3623,23 @@ 6463 fi 6464 6465 fi 6466-echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5 6467-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6 6468 6469-echo "$as_me:$LINENO: checking for pthreads_lib" >&5 6470-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6 6471-if test "${ac_cv_pthreads_lib+set}" = set; then 6472- echo $ECHO_N "(cached) $ECHO_C" >&6 6473-else 6474+echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 6475 6476+echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 6477+echo "configure:3631: checking for pthreads_lib" >&5 6478+if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then 6479+ echo $ac_n "(cached) $ac_c" 1>&6 6480+else 6481+ 6482 ac_cv_pthreads_lib= 6483 if test "$pthreads_working" != "yes"; then 6484 for lib in pthread pthreads c_r; do 6485 ac_save=$LIBS 6486 LIBS="$LIBS -l$lib" 6487- 6488+ 6489 if test "$cross_compiling" = yes; then 6490- 6491+ 6492 pthreads_working=no 6493 case $host_alias in 6494 *netware*) 6495@@ -4575,12 +3648,9 @@ 6496 6497 6498 else 6499- cat >conftest.$ac_ext <<_ACEOF 6500-/* confdefs.h. */ 6501-_ACEOF 6502-cat confdefs.h >>conftest.$ac_ext 6503-cat >>conftest.$ac_ext <<_ACEOF 6504-/* end confdefs.h. */ 6505+ cat > conftest.$ac_ext <<EOF 6506+#line 3653 "configure" 6507+#include "confdefs.h" 6508 6509 #include <pthread.h> 6510 #include <stddef.h> 6511@@ -4595,34 +3665,24 @@ 6512 int data = 1; 6513 pthread_mutexattr_init(&mattr); 6514 return pthread_create(&thd, NULL, thread_routine, &data); 6515-} 6516-_ACEOF 6517-rm -f conftest$ac_exeext 6518-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 6519- (eval $ac_link) 2>&5 6520- ac_status=$? 6521- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6522- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 6523- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6524- (eval $ac_try) 2>&5 6525- ac_status=$? 6526- echo "$as_me:$LINENO: \$? = $ac_status" >&5 6527- (exit $ac_status); }; }; then 6528- 6529+} 6530+EOF 6531+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 6532+then 6533+ 6534 pthreads_working=yes 6535- 6536+ 6537 else 6538- echo "$as_me: program exited with status $ac_status" >&5 6539-echo "$as_me: failed program was:" >&5 6540-sed 's/^/| /' conftest.$ac_ext >&5 6541- 6542-( exit $ac_status ) 6543- 6544+ echo "configure: failed program was:" >&5 6545+ cat conftest.$ac_ext >&5 6546+ rm -fr conftest* 6547+ 6548 pthreads_working=no 6549- 6550+ 6551 fi 6552-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 6553+rm -fr conftest* 6554 fi 6555+ 6556 LIBS=$ac_save 6557 if test "$pthreads_working" = "yes"; then 6558 ac_cv_pthreads_lib=$lib 6559@@ -4632,8 +3692,8 @@ 6560 fi 6561 6562 fi 6563-echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5 6564-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6 6565+ 6566+echo "$ac_t""$ac_cv_pthreads_lib" 1>&6 6567 6568 if test "$pthreads_working" = "yes"; then 6569 threads_result="POSIX-Threads found" 6570@@ -4645,21 +3705,22 @@ 6571 # Check whether --enable- or --disable- was given. 6572 if test "${enable_+set}" = set; then 6573 enableval="$enable_" 6574- 6575-fi; 6576- 6577+ : 6578+fi 6579 6580 6581 6582+ 6583+ 6584 PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_SUFFIX_NAME" 6585 6586+ 6587 6588- 6589- 6590- 6591+ 6592+ 6593 PHP_VAR_SUBST="$PHP_VAR_SUBST SHLIB_DL_SUFFIX_NAME" 6594 6595- 6596+ 6597 6598 SHLIB_SUFFIX_NAME=so 6599 SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME 6600@@ -4674,9 +3735,7 @@ 6601 ;; 6602 esac 6603 6604-PHP_SAPI=default 6605 6606- OVERALL_TARGET=php 6607 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6608 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6609 php_c_post= 6610@@ -4698,8 +3757,7 @@ 6611 shared_cxx_post= 6612 shared_lo=lo 6613 6614- php_build_target=program 6615- 6616+PHP_SAPI=none 6617 6618 6619 6620@@ -4708,10 +3766,8 @@ 6621 SAPI_LIBTOOL=libphp$PHP_MAJOR_VERSION.la 6622 6623 6624- echo "$as_me:$LINENO: result: " >&5 6625-echo "${ECHO_T}" >&6 6626- echo "$as_me:$LINENO: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5 6627-echo "${ECHO_T}${T_MD}Configuring SAPI modules${T_ME}" >&6 6628+ echo "$ac_t""" 1>&6 6629+ echo "$ac_t""${T_MD}Configuring SAPI modules${T_ME}" 1>&6 6630 6631 6632 6633@@ -4720,17 +3776,17 @@ 6634 php_with_aolserver=no 6635 6636 6637- 6638 # Check whether --with-aolserver or --without-aolserver was given. 6639 if test "${with_aolserver+set}" = set; then 6640 withval="$with_aolserver" 6641 PHP_AOLSERVER=$withval 6642 else 6643- 6644+ 6645 PHP_AOLSERVER=no 6646+ 6647 6648+fi 6649 6650-fi; 6651 6652 ext_output=$PHP_AOLSERVER 6653 6654@@ -4738,94 +3794,88 @@ 6655 6656 6657 6658-echo "$as_me:$LINENO: checking for AOLserver support" >&5 6659-echo $ECHO_N "checking for AOLserver support... $ECHO_C" >&6 6660+echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 6661+echo "configure:3799: checking for AOLserver support" >&5 6662 6663 if test "$PHP_AOLSERVER" != "no"; then 6664 if test -d "$PHP_AOLSERVER/include"; then 6665 PHP_AOLSERVER_SRC=$PHP_AOLSERVER 6666 fi 6667 if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then 6668- { { echo "$as_me:$LINENO: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&5 6669-echo "$as_me: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&2;} 6670- { (exit 1); exit 1; }; } 6671+ { echo "configure: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" 1>&2; exit 1; } 6672 fi 6673 if test ! -d $PHP_AOLSERVER/bin ; then 6674- { { echo "$as_me:$LINENO: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&5 6675-echo "$as_me: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&2;} 6676- { (exit 1); exit 1; }; } 6677+ { echo "configure: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" 1>&2; exit 1; } 6678 fi 6679- 6680+ 6681 enable_maintainer_zts=yes 6682 if test "$pthreads_working" != "yes"; then 6683- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 6684-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 6685- { (exit 1); exit 1; }; } 6686+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 6687 fi 6688 6689- 6690+ 6691 if test "$PHP_AOLSERVER_SRC/include" != "/usr/include"; then 6692- 6693+ 6694 if test -z "$PHP_AOLSERVER_SRC/include" || echo "$PHP_AOLSERVER_SRC/include" | grep '^/' >/dev/null ; then 6695 ai_p=$PHP_AOLSERVER_SRC/include 6696 else 6697- 6698+ 6699 ep_dir="`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`" 6700- 6701+ 6702 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 6703 ai_p="$ep_realdir/`basename \"$PHP_AOLSERVER_SRC/include\"`" 6704 fi 6705 6706- 6707- 6708+ 6709+ 6710 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 6711- 6712+ 6713 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 6714 if test -n "$unique" && test "`eval $cmd`" = "" ; then 6715 eval "INCLUDEPATH$unique=set" 6716- 6717+ 6718 if test ""; then 6719 INCLUDES="-I$ai_p $INCLUDES" 6720 else 6721 INCLUDES="$INCLUDES -I$ai_p" 6722 fi 6723- 6724+ 6725 fi 6726 6727 fi 6728 6729- 6730-cat >>confdefs.h <<\_ACEOF 6731+ cat >> confdefs.h <<\EOF 6732 #define HAVE_AOLSERVER 1 6733-_ACEOF 6734- 6735+EOF 6736 6737- if test "$PHP_SAPI" != "default"; then 6738-{ { echo "$as_me:$LINENO: error: 6739-+--------------------------------------------------------------------+ 6740-| *** ATTENTION *** | 6741-| | 6742-| You've configured multiple SAPIs to be build. You can build only | 6743-| one SAPI module and CLI binary at the same time. | 6744-+--------------------------------------------------------------------+ 6745-" >&5 6746-echo "$as_me: error: 6747+ 6748+ if test "shared" = "program"; then 6749+ PHP_BINARIES="$PHP_BINARIES aolserver" 6750+ elif test "$PHP_SAPI" != "none"; then 6751+ { echo "configure: error: 6752 +--------------------------------------------------------------------+ 6753 | *** ATTENTION *** | 6754 | | 6755 | You've configured multiple SAPIs to be build. You can build only | 6756-| one SAPI module and CLI binary at the same time. | 6757+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 6758 +--------------------------------------------------------------------+ 6759-" >&2;} 6760- { (exit 1); exit 1; }; } 6761- fi 6762+" 1>&2; exit 1; } 6763+ else 6764+ PHP_SAPI=aolserver 6765+ fi 6766+ 6767+ 6768+ 6769+ BUILD_DIR="$BUILD_DIR sapi/aolserver" 6770+ 6771 6772- PHP_SAPI=aolserver 6773 6774- case "shared" in 6775- static) 6776+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS aolserver" 6777 6778- OVERALL_TARGET=php 6779+ 6780+ case "shared" in 6781+ static) 6782+ 6783 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6784 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6785 php_c_post= 6786@@ -4847,14 +3897,11 @@ 6787 shared_cxx_post= 6788 shared_lo=lo 6789 6790- php_build_target=program 6791- 6792 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 6793- php_build_target=static 6794+ php_sapi_module=static 6795 ;; 6796- shared) 6797- 6798- OVERALL_TARGET=php 6799+ shared) 6800+ 6801 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6802 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6803 php_c_post= 6804@@ -4876,11 +3923,9 @@ 6805 shared_cxx_post= 6806 shared_lo=lo 6807 6808- php_build_target=program 6809- 6810 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 6811- php_build_target=shared 6812- 6813+ php_sapi_module=shared 6814+ 6815 php_c_pre=$shared_c_pre 6816 php_c_meta=$shared_c_meta 6817 php_c_post=$shared_c_post 6818@@ -4889,9 +3934,8 @@ 6819 php_cxx_post=$shared_cxx_post 6820 php_lo=$shared_lo 6821 ;; 6822- bundle) 6823- 6824- OVERALL_TARGET=php 6825+ bundle) 6826+ 6827 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6828 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6829 php_c_post= 6830@@ -4913,47 +3957,20 @@ 6831 shared_cxx_post= 6832 shared_lo=lo 6833 6834- php_build_target=program 6835- 6836 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 6837- php_build_target=static 6838-;; 6839- program) 6840- OVERALL_TARGET=php 6841- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6842- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 6843- php_c_post= 6844- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 6845- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 6846- php_cxx_post= 6847- php_lo=lo 6848- 6849- case $with_pic in 6850- yes) pic_setting='-prefer-pic';; 6851- no) pic_setting='-prefer-non-pic';; 6852- esac 6853- 6854- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 6855- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 6856- shared_c_post= 6857- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 6858- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 6859- shared_cxx_post= 6860- shared_lo=lo 6861- 6862- php_build_target=program 6863+ php_sapi_module=static 6864 ;; 6865- esac 6866- 6867- 6868- 6869+ esac 6870+ install_sapi="install-sapi" 6871+ 6872+ 6873 case sapi/aolserver in 6874 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 6875 /*) ac_srcdir=`echo "sapi/aolserver"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 6876 *) ac_srcdir="$abs_srcdir/sapi/aolserver/"; ac_bdir="sapi/aolserver/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 6877 esac 6878- 6879- 6880+ 6881+ 6882 6883 b_c_pre=$php_c_pre 6884 b_cxx_pre=$php_cxx_pre 6885@@ -4966,12 +3983,12 @@ 6886 6887 old_IFS=$IFS 6888 for ac_src in aolserver.c; do 6889- 6890+ 6891 IFS=. 6892 set $ac_src 6893 ac_obj=$1 6894 IFS=$old_IFS 6895- 6896+ 6897 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 6898 6899 case $ac_src in 6900@@ -4988,12 +4005,12 @@ 6901 done 6902 6903 6904+ 6905 6906 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/" 6907 fi 6908 6909-echo "$as_me:$LINENO: result: $PHP_AOLSERVER" >&5 6910-echo "${ECHO_T}$PHP_AOLSERVER" >&6 6911+echo "$ac_t""$PHP_AOLSERVER" 1>&6 6912 6913 6914 6915@@ -5002,17 +4019,17 @@ 6916 php_with_apxs=no 6917 6918 6919- 6920 # Check whether --with-apxs or --without-apxs was given. 6921 if test "${with_apxs+set}" = set; then 6922 withval="$with_apxs" 6923 PHP_APXS=$withval 6924 else 6925- 6926+ 6927 PHP_APXS=no 6928+ 6929 6930+fi 6931 6932-fi; 6933 6934 ext_output=$PHP_APXS 6935 6936@@ -5020,24 +4037,24 @@ 6937 6938 6939 6940-echo "$as_me:$LINENO: checking for Apache 1.x module support via DSO through APXS" >&5 6941-echo $ECHO_N "checking for Apache 1.x module support via DSO through APXS... $ECHO_C" >&6 6942+echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 6943+echo "configure:4042: checking for Apache 1.x module support via DSO through APXS" >&5 6944 6945 if test "$PHP_APXS" != "no"; then 6946 if test "$PHP_APXS" = "yes"; then 6947 APXS=apxs 6948 $APXS -q CFLAGS >/dev/null 2>&1 6949- if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 6950+ if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 6951 APXS=/usr/sbin/apxs 6952 fi 6953 else 6954- 6955+ 6956 if test -z "$PHP_APXS" || echo "$PHP_APXS" | grep '^/' >/dev/null ; then 6957 APXS=$PHP_APXS 6958 else 6959- 6960+ 6961 ep_dir="`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`" 6962- 6963+ 6964 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 6965 APXS="$ep_realdir/`basename \"$PHP_APXS\"`" 6966 fi 6967@@ -5046,27 +4063,17 @@ 6968 6969 $APXS -q CFLAGS >/dev/null 2>&1 6970 if test "$?" != "0"; then 6971- echo "$as_me:$LINENO: result: " >&5 6972-echo "${ECHO_T}" >&6 6973- echo "$as_me:$LINENO: result: " >&5 6974-echo "${ECHO_T}" >&6 6975- echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS. Possible reasons:" >&5 6976-echo "${ECHO_T}Sorry, I was not able to successfully run APXS. Possible reasons:" >&6 6977- echo "$as_me:$LINENO: result: " >&5 6978-echo "${ECHO_T}" >&6 6979- echo "$as_me:$LINENO: result: 1. Perl is not installed;" >&5 6980-echo "${ECHO_T}1. Perl is not installed;" >&6 6981- echo "$as_me:$LINENO: result: 2. Apache was not compiled with DSO support (--enable-module=so);" >&5 6982-echo "${ECHO_T}2. Apache was not compiled with DSO support (--enable-module=so);" >&6 6983- echo "$as_me:$LINENO: result: 3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&5 6984-echo "${ECHO_T}3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&6 6985- echo "$as_me:$LINENO: result: The output of $APXS follows" >&5 6986-echo "${ECHO_T}The output of $APXS follows" >&6 6987+ echo "$ac_t""" 1>&6 6988+ echo "$ac_t""" 1>&6 6989+ echo "$ac_t""Sorry, I was not able to successfully run APXS. Possible reasons:" 1>&6 6990+ echo "$ac_t""" 1>&6 6991+ echo "$ac_t""1. Perl is not installed;" 1>&6 6992+ echo "$ac_t""2. Apache was not compiled with DSO support (--enable-module=so);" 1>&6 6993+ echo "$ac_t""3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" 1>&6 6994+ echo "$ac_t""The output of $APXS follows" 1>&6 6995 $APXS -q CFLAGS 6996- { { echo "$as_me:$LINENO: error: Aborting" >&5 6997-echo "$as_me: error: Aborting" >&2;} 6998- { (exit 1); exit 1; }; } 6999- fi 7000+ { echo "configure: error: Aborting" 1>&2; exit 1; } 7001+ fi 7002 7003 APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" 7004 APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` 7005@@ -5075,7 +4082,7 @@ 7006 APACHE_INCLUDE=-I$APXS_INCLUDEDIR 7007 7008 # Test that we're trying to configure with apache 1.x 7009- 7010+ 7011 ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` 7012 ac_IFS=$IFS 7013 IFS="- /. 7014@@ -5086,9 +4093,7 @@ 7015 APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` 7016 7017 if test "$APACHE_VERSION" -ge 2000000; then 7018- { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" >&5 7019-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" >&2;} 7020- { (exit 1); exit 1; }; } 7021+ { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } 7022 fi 7023 7024 for flag in $APXS_CFLAGS; do 7025@@ -5106,7 +4111,7 @@ 7026 ;; 7027 *darwin*) 7028 MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" 7029- 7030+ 7031 PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" 7032 7033 SAPI_SHARED=libs/libphp5.so 7034@@ -5117,33 +4122,34 @@ 7035 ;; 7036 esac 7037 7038- 7039- if test "$PHP_SAPI" != "default"; then 7040-{ { echo "$as_me:$LINENO: error: 7041-+--------------------------------------------------------------------+ 7042-| *** ATTENTION *** | 7043-| | 7044-| You've configured multiple SAPIs to be build. You can build only | 7045-| one SAPI module and CLI binary at the same time. | 7046-+--------------------------------------------------------------------+ 7047-" >&5 7048-echo "$as_me: error: 7049+ 7050+ if test "$build_type" = "program"; then 7051+ PHP_BINARIES="$PHP_BINARIES apache" 7052+ elif test "$PHP_SAPI" != "none"; then 7053+ { echo "configure: error: 7054 +--------------------------------------------------------------------+ 7055 | *** ATTENTION *** | 7056 | | 7057 | You've configured multiple SAPIs to be build. You can build only | 7058-| one SAPI module and CLI binary at the same time. | 7059+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 7060 +--------------------------------------------------------------------+ 7061-" >&2;} 7062- { (exit 1); exit 1; }; } 7063- fi 7064+" 1>&2; exit 1; } 7065+ else 7066+ PHP_SAPI=apache 7067+ fi 7068 7069- PHP_SAPI=apache 7070+ 7071+ 7072+ BUILD_DIR="$BUILD_DIR sapi/apache" 7073+ 7074 7075- case "$build_type" in 7076- static) 7077 7078- OVERALL_TARGET=php 7079+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache" 7080+ 7081+ 7082+ case "$build_type" in 7083+ static) 7084+ 7085 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7086 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7087 php_c_post= 7088@@ -5165,14 +4171,11 @@ 7089 shared_cxx_post= 7090 shared_lo=lo 7091 7092- php_build_target=program 7093- 7094 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7095- php_build_target=static 7096+ php_sapi_module=static 7097 ;; 7098- shared) 7099- 7100- OVERALL_TARGET=php 7101+ shared) 7102+ 7103 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7104 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7105 php_c_post= 7106@@ -5194,11 +4197,9 @@ 7107 shared_cxx_post= 7108 shared_lo=lo 7109 7110- php_build_target=program 7111- 7112 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7113- php_build_target=shared 7114- 7115+ php_sapi_module=shared 7116+ 7117 php_c_pre=$shared_c_pre 7118 php_c_meta=$shared_c_meta 7119 php_c_post=$shared_c_post 7120@@ -5207,9 +4208,8 @@ 7121 php_cxx_post=$shared_cxx_post 7122 php_lo=$shared_lo 7123 ;; 7124- bundle) 7125- 7126- OVERALL_TARGET=php 7127+ bundle) 7128+ 7129 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7130 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7131 php_c_post= 7132@@ -5231,47 +4231,20 @@ 7133 shared_cxx_post= 7134 shared_lo=lo 7135 7136- php_build_target=program 7137- 7138 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 7139- php_build_target=static 7140-;; 7141- program) 7142- OVERALL_TARGET=php 7143- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7144- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7145- php_c_post= 7146- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7147- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 7148- php_cxx_post= 7149- php_lo=lo 7150- 7151- case $with_pic in 7152- yes) pic_setting='-prefer-pic';; 7153- no) pic_setting='-prefer-non-pic';; 7154- esac 7155- 7156- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7157- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 7158- shared_c_post= 7159- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7160- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 7161- shared_cxx_post= 7162- shared_lo=lo 7163- 7164- php_build_target=program 7165+ php_sapi_module=static 7166 ;; 7167- esac 7168- 7169- 7170- 7171+ esac 7172+ install_sapi="install-sapi" 7173+ 7174+ 7175 case sapi/apache in 7176 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 7177 /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 7178 *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 7179 esac 7180- 7181- 7182+ 7183+ 7184 7185 b_c_pre=$php_c_pre 7186 b_cxx_pre=$php_cxx_pre 7187@@ -5284,12 +4257,12 @@ 7188 7189 old_IFS=$IFS 7190 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 7191- 7192+ 7193 IFS=. 7194 set $ac_src 7195 ac_obj=$1 7196 IFS=$old_IFS 7197- 7198+ 7199 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 7200 7201 case $ac_src in 7202@@ -5306,6 +4279,7 @@ 7203 done 7204 7205 7206+ 7207 7208 7209 # Test whether apxs support -S option 7210@@ -5313,7 +4287,7 @@ 7211 7212 if test "$?" != "0"; then 7213 APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option 7214- else 7215+ else 7216 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 7217 if test -z `$APXS -q SYSCONFDIR`; then 7218 APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 7219@@ -5333,43 +4307,38 @@ 7220 PHP_APXS_BROKEN=yes 7221 fi 7222 STRONGHOLD= 7223- 7224-cat >>confdefs.h <<\_ACEOF 7225+ cat >> confdefs.h <<\EOF 7226 #define HAVE_AP_CONFIG_H 1 7227-_ACEOF 7228- 7229+EOF 7230 7231-cat >>confdefs.h <<\_ACEOF 7232+ cat >> confdefs.h <<\EOF 7233 #define HAVE_AP_COMPAT_H 1 7234-_ACEOF 7235- 7236+EOF 7237 7238-cat >>confdefs.h <<\_ACEOF 7239+ cat >> confdefs.h <<\EOF 7240 #define HAVE_APACHE 1 7241-_ACEOF 7242+EOF 7243 7244- echo "$as_me:$LINENO: result: yes" >&5 7245-echo "${ECHO_T}yes" >&6 7246+ echo "$ac_t""yes" 1>&6 7247 else 7248- echo "$as_me:$LINENO: result: no" >&5 7249-echo "${ECHO_T}no" >&6 7250+ echo "$ac_t""no" 1>&6 7251 fi 7252 7253 7254 php_with_apache=no 7255 7256 7257- 7258 # Check whether --with-apache or --without-apache was given. 7259 if test "${with_apache+set}" = set; then 7260 withval="$with_apache" 7261 PHP_APACHE=$withval 7262 else 7263- 7264+ 7265 PHP_APACHE=no 7266+ 7267 7268+fi 7269 7270-fi; 7271 7272 ext_output=$PHP_APACHE 7273 7274@@ -5377,11 +4346,11 @@ 7275 7276 7277 7278-echo "$as_me:$LINENO: checking for Apache 1.x module support" >&5 7279-echo $ECHO_N "checking for Apache 1.x module support... $ECHO_C" >&6 7280+echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 7281+echo "configure:4351: checking for Apache 1.x module support" >&5 7282 7283 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then 7284- 7285+ 7286 if test "$PHP_APACHE" = "yes"; then 7287 # Apache's default directory 7288 PHP_APACHE=/usr/local/apache 7289@@ -5389,54 +4358,54 @@ 7290 7291 APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module" 7292 7293- 7294-cat >>confdefs.h <<\_ACEOF 7295+ cat >> confdefs.h <<\EOF 7296 #define HAVE_APACHE 1 7297-_ACEOF 7298+EOF 7299 7300 APACHE_MODULE=yes 7301- 7302+ 7303 if test -z "$PHP_APACHE" || echo "$PHP_APACHE" | grep '^/' >/dev/null ; then 7304 PHP_APACHE=$PHP_APACHE 7305 else 7306- 7307+ 7308 ep_dir="`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`" 7309- 7310+ 7311 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 7312 PHP_APACHE="$ep_realdir/`basename \"$PHP_APACHE\"`" 7313 fi 7314 7315 # For Apache 1.2.x 7316- if test -f $PHP_APACHE/src/httpd.h; then 7317+ if test -f $PHP_APACHE/src/httpd.h; then 7318 APACHE_INCLUDE=-I$PHP_APACHE/src 7319 APACHE_TARGET=$PHP_APACHE/src 7320- 7321- if test "$PHP_SAPI" != "default"; then 7322-{ { echo "$as_me:$LINENO: error: 7323-+--------------------------------------------------------------------+ 7324-| *** ATTENTION *** | 7325-| | 7326-| You've configured multiple SAPIs to be build. You can build only | 7327-| one SAPI module and CLI binary at the same time. | 7328-+--------------------------------------------------------------------+ 7329-" >&5 7330-echo "$as_me: error: 7331+ 7332+ if test "static" = "program"; then 7333+ PHP_BINARIES="$PHP_BINARIES apache" 7334+ elif test "$PHP_SAPI" != "none"; then 7335+ { echo "configure: error: 7336 +--------------------------------------------------------------------+ 7337 | *** ATTENTION *** | 7338 | | 7339 | You've configured multiple SAPIs to be build. You can build only | 7340-| one SAPI module and CLI binary at the same time. | 7341+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 7342 +--------------------------------------------------------------------+ 7343-" >&2;} 7344- { (exit 1); exit 1; }; } 7345- fi 7346+" 1>&2; exit 1; } 7347+ else 7348+ PHP_SAPI=apache 7349+ fi 7350 7351- PHP_SAPI=apache 7352+ 7353+ 7354+ BUILD_DIR="$BUILD_DIR sapi/apache" 7355+ 7356 7357- case "static" in 7358- static) 7359 7360- OVERALL_TARGET=php 7361+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache" 7362+ 7363+ 7364+ case "static" in 7365+ static) 7366+ 7367 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7368 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7369 php_c_post= 7370@@ -5458,14 +4427,11 @@ 7371 shared_cxx_post= 7372 shared_lo=lo 7373 7374- php_build_target=program 7375- 7376 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7377- php_build_target=static 7378+ php_sapi_module=static 7379 ;; 7380- shared) 7381- 7382- OVERALL_TARGET=php 7383+ shared) 7384+ 7385 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7386 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7387 php_c_post= 7388@@ -5487,11 +4453,9 @@ 7389 shared_cxx_post= 7390 shared_lo=lo 7391 7392- php_build_target=program 7393- 7394 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7395- php_build_target=shared 7396- 7397+ php_sapi_module=shared 7398+ 7399 php_c_pre=$shared_c_pre 7400 php_c_meta=$shared_c_meta 7401 php_c_post=$shared_c_post 7402@@ -5500,9 +4464,8 @@ 7403 php_cxx_post=$shared_cxx_post 7404 php_lo=$shared_lo 7405 ;; 7406- bundle) 7407- 7408- OVERALL_TARGET=php 7409+ bundle) 7410+ 7411 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7412 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7413 php_c_post= 7414@@ -5524,47 +4487,20 @@ 7415 shared_cxx_post= 7416 shared_lo=lo 7417 7418- php_build_target=program 7419- 7420 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 7421- php_build_target=static 7422-;; 7423- program) 7424- OVERALL_TARGET=php 7425- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7426- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7427- php_c_post= 7428- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7429- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 7430- php_cxx_post= 7431- php_lo=lo 7432- 7433- case $with_pic in 7434- yes) pic_setting='-prefer-pic';; 7435- no) pic_setting='-prefer-non-pic';; 7436- esac 7437- 7438- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7439- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 7440- shared_c_post= 7441- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7442- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 7443- shared_cxx_post= 7444- shared_lo=lo 7445- 7446- php_build_target=program 7447+ php_sapi_module=static 7448 ;; 7449- esac 7450- 7451- 7452- 7453+ esac 7454+ install_sapi="install-sapi" 7455+ 7456+ 7457 case sapi/apache in 7458 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 7459 /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 7460 *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 7461 esac 7462- 7463- 7464+ 7465+ 7466 7467 b_c_pre=$php_c_pre 7468 b_cxx_pre=$php_cxx_pre 7469@@ -5577,12 +4513,12 @@ 7470 7471 old_IFS=$IFS 7472 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 7473- 7474+ 7475 IFS=. 7476 set $ac_src 7477 ac_obj=$1 7478 IFS=$old_IFS 7479- 7480+ 7481 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 7482 7483 case $ac_src in 7484@@ -5599,24 +4535,21 @@ 7485 done 7486 7487 7488+ 7489 7490 APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET" 7491 PHP_LIBS="-L. -lphp3" 7492- echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5 7493-echo "${ECHO_T}yes - Apache 1.2.x" >&6 7494+ echo "$ac_t""yes - Apache 1.2.x" 1>&6 7495 STRONGHOLD= 7496 if test -f $PHP_APACHE/src/ap_config.h; then 7497- 7498-cat >>confdefs.h <<\_ACEOF 7499+ cat >> confdefs.h <<\EOF 7500 #define HAVE_AP_CONFIG_H 1 7501-_ACEOF 7502+EOF 7503 7504 fi 7505 # For Apache 2.0.x 7506 elif test -f $PHP_APACHE/include/httpd.h && test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then 7507- { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5 7508-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;} 7509- { (exit 1); exit 1; }; } 7510+ { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; } 7511 # For Apache 1.3.x 7512 elif test -f $PHP_APACHE/src/main/httpd.h; then 7513 APACHE_HAS_REGEX=1 7514@@ -5625,33 +4558,34 @@ 7515 if test ! -d $APACHE_TARGET; then 7516 mkdir $APACHE_TARGET 7517 fi 7518- 7519- if test "$PHP_SAPI" != "default"; then 7520-{ { echo "$as_me:$LINENO: error: 7521-+--------------------------------------------------------------------+ 7522-| *** ATTENTION *** | 7523-| | 7524-| You've configured multiple SAPIs to be build. You can build only | 7525-| one SAPI module and CLI binary at the same time. | 7526-+--------------------------------------------------------------------+ 7527-" >&5 7528-echo "$as_me: error: 7529+ 7530+ if test "static" = "program"; then 7531+ PHP_BINARIES="$PHP_BINARIES apache" 7532+ elif test "$PHP_SAPI" != "none"; then 7533+ { echo "configure: error: 7534 +--------------------------------------------------------------------+ 7535 | *** ATTENTION *** | 7536 | | 7537 | You've configured multiple SAPIs to be build. You can build only | 7538-| one SAPI module and CLI binary at the same time. | 7539+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 7540 +--------------------------------------------------------------------+ 7541-" >&2;} 7542- { (exit 1); exit 1; }; } 7543- fi 7544+" 1>&2; exit 1; } 7545+ else 7546+ PHP_SAPI=apache 7547+ fi 7548+ 7549+ 7550+ 7551+ BUILD_DIR="$BUILD_DIR sapi/apache" 7552+ 7553 7554- PHP_SAPI=apache 7555 7556- case "static" in 7557- static) 7558+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache" 7559 7560- OVERALL_TARGET=php 7561+ 7562+ case "static" in 7563+ static) 7564+ 7565 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7566 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7567 php_c_post= 7568@@ -5673,14 +4607,11 @@ 7569 shared_cxx_post= 7570 shared_lo=lo 7571 7572- php_build_target=program 7573- 7574 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7575- php_build_target=static 7576+ php_sapi_module=static 7577 ;; 7578- shared) 7579- 7580- OVERALL_TARGET=php 7581+ shared) 7582+ 7583 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7584 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7585 php_c_post= 7586@@ -5702,11 +4633,9 @@ 7587 shared_cxx_post= 7588 shared_lo=lo 7589 7590- php_build_target=program 7591- 7592 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7593- php_build_target=shared 7594- 7595+ php_sapi_module=shared 7596+ 7597 php_c_pre=$shared_c_pre 7598 php_c_meta=$shared_c_meta 7599 php_c_post=$shared_c_post 7600@@ -5715,9 +4644,8 @@ 7601 php_cxx_post=$shared_cxx_post 7602 php_lo=$shared_lo 7603 ;; 7604- bundle) 7605- 7606- OVERALL_TARGET=php 7607+ bundle) 7608+ 7609 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7610 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7611 php_c_post= 7612@@ -5739,47 +4667,20 @@ 7613 shared_cxx_post= 7614 shared_lo=lo 7615 7616- php_build_target=program 7617- 7618 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 7619- php_build_target=static 7620-;; 7621- program) 7622- OVERALL_TARGET=php 7623- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7624- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7625- php_c_post= 7626- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7627- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 7628- php_cxx_post= 7629- php_lo=lo 7630- 7631- case $with_pic in 7632- yes) pic_setting='-prefer-pic';; 7633- no) pic_setting='-prefer-non-pic';; 7634- esac 7635- 7636- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7637- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 7638- shared_c_post= 7639- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7640- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 7641- shared_cxx_post= 7642- shared_lo=lo 7643- 7644- php_build_target=program 7645+ php_sapi_module=static 7646 ;; 7647- esac 7648- 7649- 7650- 7651+ esac 7652+ install_sapi="install-sapi" 7653+ 7654+ 7655 case sapi/apache in 7656 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 7657 /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 7658 *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 7659 esac 7660- 7661- 7662+ 7663+ 7664 7665 b_c_pre=$php_c_pre 7666 b_cxx_pre=$php_cxx_pre 7667@@ -5792,12 +4693,12 @@ 7668 7669 old_IFS=$IFS 7670 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 7671- 7672+ 7673 IFS=. 7674 set $ac_src 7675 ac_obj=$1 7676 IFS=$old_IFS 7677- 7678+ 7679 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 7680 7681 case $ac_src in 7682@@ -5814,35 +4715,30 @@ 7683 done 7684 7685 7686+ 7687 7688 APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" 7689 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 7690- echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5 7691-echo "${ECHO_T}yes - Apache 1.3.x" >&6 7692+ echo "$ac_t""yes - Apache 1.3.x" 1>&6 7693 STRONGHOLD= 7694 if test -f $PHP_APACHE/src/include/ap_config.h; then 7695- 7696-cat >>confdefs.h <<\_ACEOF 7697+ cat >> confdefs.h <<\EOF 7698 #define HAVE_AP_CONFIG_H 1 7699-_ACEOF 7700+EOF 7701 7702 fi 7703 if test -f $PHP_APACHE/src/include/ap_compat.h; then 7704- 7705-cat >>confdefs.h <<\_ACEOF 7706+ cat >> confdefs.h <<\EOF 7707 #define HAVE_AP_COMPAT_H 1 7708-_ACEOF 7709+EOF 7710 7711 if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then 7712- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 7713-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 7714- { (exit 1); exit 1; }; } 7715+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 7716 fi 7717 elif test -f $PHP_APACHE/src/include/compat.h; then 7718- 7719-cat >>confdefs.h <<\_ACEOF 7720+ cat >> confdefs.h <<\EOF 7721 #define HAVE_OLD_COMPAT_H 1 7722-_ACEOF 7723+EOF 7724 7725 fi 7726 # Also for Apache 1.3.x 7727@@ -5853,33 +4749,34 @@ 7728 if test ! -d $APACHE_TARGET; then 7729 mkdir $APACHE_TARGET 7730 fi 7731- 7732- if test "$PHP_SAPI" != "default"; then 7733-{ { echo "$as_me:$LINENO: error: 7734-+--------------------------------------------------------------------+ 7735-| *** ATTENTION *** | 7736-| | 7737-| You've configured multiple SAPIs to be build. You can build only | 7738-| one SAPI module and CLI binary at the same time. | 7739-+--------------------------------------------------------------------+ 7740-" >&5 7741-echo "$as_me: error: 7742+ 7743+ if test "static" = "program"; then 7744+ PHP_BINARIES="$PHP_BINARIES apache" 7745+ elif test "$PHP_SAPI" != "none"; then 7746+ { echo "configure: error: 7747 +--------------------------------------------------------------------+ 7748 | *** ATTENTION *** | 7749 | | 7750 | You've configured multiple SAPIs to be build. You can build only | 7751-| one SAPI module and CLI binary at the same time. | 7752+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 7753 +--------------------------------------------------------------------+ 7754-" >&2;} 7755- { (exit 1); exit 1; }; } 7756- fi 7757+" 1>&2; exit 1; } 7758+ else 7759+ PHP_SAPI=apache 7760+ fi 7761 7762- PHP_SAPI=apache 7763+ 7764+ 7765+ BUILD_DIR="$BUILD_DIR sapi/apache" 7766+ 7767 7768- case "static" in 7769- static) 7770 7771- OVERALL_TARGET=php 7772+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache" 7773+ 7774+ 7775+ case "static" in 7776+ static) 7777+ 7778 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7779 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7780 php_c_post= 7781@@ -5901,14 +4798,11 @@ 7782 shared_cxx_post= 7783 shared_lo=lo 7784 7785- php_build_target=program 7786- 7787 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7788- php_build_target=static 7789+ php_sapi_module=static 7790 ;; 7791- shared) 7792- 7793- OVERALL_TARGET=php 7794+ shared) 7795+ 7796 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7797 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7798 php_c_post= 7799@@ -5930,11 +4824,9 @@ 7800 shared_cxx_post= 7801 shared_lo=lo 7802 7803- php_build_target=program 7804- 7805 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 7806- php_build_target=shared 7807- 7808+ php_sapi_module=shared 7809+ 7810 php_c_pre=$shared_c_pre 7811 php_c_meta=$shared_c_meta 7812 php_c_post=$shared_c_post 7813@@ -5943,9 +4835,8 @@ 7814 php_cxx_post=$shared_cxx_post 7815 php_lo=$shared_lo 7816 ;; 7817- bundle) 7818- 7819- OVERALL_TARGET=php 7820+ bundle) 7821+ 7822 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7823 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7824 php_c_post= 7825@@ -5967,47 +4858,20 @@ 7826 shared_cxx_post= 7827 shared_lo=lo 7828 7829- php_build_target=program 7830- 7831 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 7832- php_build_target=static 7833-;; 7834- program) 7835- OVERALL_TARGET=php 7836- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7837- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7838- php_c_post= 7839- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7840- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 7841- php_cxx_post= 7842- php_lo=lo 7843- 7844- case $with_pic in 7845- yes) pic_setting='-prefer-pic';; 7846- no) pic_setting='-prefer-non-pic';; 7847- esac 7848- 7849- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7850- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 7851- shared_c_post= 7852- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 7853- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 7854- shared_cxx_post= 7855- shared_lo=lo 7856- 7857- php_build_target=program 7858+ php_sapi_module=static 7859 ;; 7860- esac 7861- 7862- 7863- 7864+ esac 7865+ install_sapi="install-sapi" 7866+ 7867+ 7868 case sapi/apache in 7869 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 7870 /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 7871 *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 7872 esac 7873- 7874- 7875+ 7876+ 7877 7878 b_c_pre=$php_c_pre 7879 b_cxx_pre=$php_cxx_pre 7880@@ -6020,12 +4884,12 @@ 7881 7882 old_IFS=$IFS 7883 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 7884- 7885+ 7886 IFS=. 7887 set $ac_src 7888 ac_obj=$1 7889 IFS=$old_IFS 7890- 7891+ 7892 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 7893 7894 case $ac_src in 7895@@ -6042,68 +4906,64 @@ 7896 done 7897 7898 7899+ 7900 7901 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 7902 APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" 7903- echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5 7904-echo "${ECHO_T}yes - Apache 1.3.x" >&6 7905+ echo "$ac_t""yes - Apache 1.3.x" 1>&6 7906 STRONGHOLD= 7907 if test -f $PHP_APACHE/src/include/ap_config.h; then 7908- 7909-cat >>confdefs.h <<\_ACEOF 7910+ cat >> confdefs.h <<\EOF 7911 #define HAVE_AP_CONFIG_H 1 7912-_ACEOF 7913+EOF 7914 7915 fi 7916 if test -f $PHP_APACHE/src/include/ap_compat.h; then 7917- 7918-cat >>confdefs.h <<\_ACEOF 7919+ cat >> confdefs.h <<\EOF 7920 #define HAVE_AP_COMPAT_H 1 7921-_ACEOF 7922+EOF 7923 7924 if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then 7925- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 7926-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 7927- { (exit 1); exit 1; }; } 7928+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 7929 fi 7930 elif test -f $PHP_APACHE/src/include/compat.h; then 7931- 7932-cat >>confdefs.h <<\_ACEOF 7933+ cat >> confdefs.h <<\EOF 7934 #define HAVE_OLD_COMPAT_H 1 7935-_ACEOF 7936+EOF 7937 7938 fi 7939 # For StrongHold 2.2 7940 elif test -f $PHP_APACHE/apache/httpd.h; then 7941 APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include" 7942 APACHE_TARGET=$PHP_APACHE/apache 7943- 7944- if test "$PHP_SAPI" != "default"; then 7945-{ { echo "$as_me:$LINENO: error: 7946-+--------------------------------------------------------------------+ 7947-| *** ATTENTION *** | 7948-| | 7949-| You've configured multiple SAPIs to be build. You can build only | 7950-| one SAPI module and CLI binary at the same time. | 7951-+--------------------------------------------------------------------+ 7952-" >&5 7953-echo "$as_me: error: 7954+ 7955+ if test "static" = "program"; then 7956+ PHP_BINARIES="$PHP_BINARIES apache" 7957+ elif test "$PHP_SAPI" != "none"; then 7958+ { echo "configure: error: 7959 +--------------------------------------------------------------------+ 7960 | *** ATTENTION *** | 7961 | | 7962 | You've configured multiple SAPIs to be build. You can build only | 7963-| one SAPI module and CLI binary at the same time. | 7964+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 7965 +--------------------------------------------------------------------+ 7966-" >&2;} 7967- { (exit 1); exit 1; }; } 7968- fi 7969+" 1>&2; exit 1; } 7970+ else 7971+ PHP_SAPI=apache 7972+ fi 7973+ 7974+ 7975+ 7976+ BUILD_DIR="$BUILD_DIR sapi/apache" 7977+ 7978 7979- PHP_SAPI=apache 7980 7981- case "static" in 7982- static) 7983+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache" 7984 7985- OVERALL_TARGET=php 7986+ 7987+ case "static" in 7988+ static) 7989+ 7990 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 7991 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 7992 php_c_post= 7993@@ -6125,14 +4985,11 @@ 7994 shared_cxx_post= 7995 shared_lo=lo 7996 7997- php_build_target=program 7998- 7999 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8000- php_build_target=static 8001+ php_sapi_module=static 8002 ;; 8003- shared) 8004- 8005- OVERALL_TARGET=php 8006+ shared) 8007+ 8008 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8009 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8010 php_c_post= 8011@@ -6154,11 +5011,9 @@ 8012 shared_cxx_post= 8013 shared_lo=lo 8014 8015- php_build_target=program 8016- 8017 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8018- php_build_target=shared 8019- 8020+ php_sapi_module=shared 8021+ 8022 php_c_pre=$shared_c_pre 8023 php_c_meta=$shared_c_meta 8024 php_c_post=$shared_c_post 8025@@ -6167,9 +5022,8 @@ 8026 php_cxx_post=$shared_cxx_post 8027 php_lo=$shared_lo 8028 ;; 8029- bundle) 8030- 8031- OVERALL_TARGET=php 8032+ bundle) 8033+ 8034 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8035 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8036 php_c_post= 8037@@ -6191,47 +5045,20 @@ 8038 shared_cxx_post= 8039 shared_lo=lo 8040 8041- php_build_target=program 8042- 8043 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 8044- php_build_target=static 8045-;; 8046- program) 8047- OVERALL_TARGET=php 8048- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8049- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8050- php_c_post= 8051- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8052- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 8053- php_cxx_post= 8054- php_lo=lo 8055- 8056- case $with_pic in 8057- yes) pic_setting='-prefer-pic';; 8058- no) pic_setting='-prefer-non-pic';; 8059- esac 8060- 8061- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8062- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 8063- shared_c_post= 8064- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8065- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 8066- shared_cxx_post= 8067- shared_lo=lo 8068- 8069- php_build_target=program 8070+ php_sapi_module=static 8071 ;; 8072- esac 8073- 8074- 8075- 8076+ esac 8077+ install_sapi="install-sapi" 8078+ 8079+ 8080 case sapi/apache in 8081 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 8082 /*) ac_srcdir=`echo "sapi/apache"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 8083 *) ac_srcdir="$abs_srcdir/sapi/apache/"; ac_bdir="sapi/apache/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 8084 esac 8085- 8086- 8087+ 8088+ 8089 8090 b_c_pre=$php_c_pre 8091 b_cxx_pre=$php_cxx_pre 8092@@ -6244,12 +5071,12 @@ 8093 8094 old_IFS=$IFS 8095 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 8096- 8097+ 8098 IFS=. 8099 set $ac_src 8100 ac_obj=$1 8101 IFS=$old_IFS 8102- 8103+ 8104 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 8105 8106 case $ac_src in 8107@@ -6266,96 +5093,86 @@ 8108 done 8109 8110 8111+ 8112 8113 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 8114 APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET" 8115 STRONGHOLD=-DSTRONGHOLD=1 8116- echo "$as_me:$LINENO: result: yes - StrongHold" >&5 8117-echo "${ECHO_T}yes - StrongHold" >&6 8118+ echo "$ac_t""yes - StrongHold" 1>&6 8119 if test -f $PHP_APACHE/apache/ap_config.h; then 8120- 8121-cat >>confdefs.h <<\_ACEOF 8122+ cat >> confdefs.h <<\EOF 8123 #define HAVE_AP_CONFIG_H 1 8124-_ACEOF 8125+EOF 8126 8127 fi 8128 if test -f $PHP_APACHE/src/ap_compat.h; then 8129- 8130-cat >>confdefs.h <<\_ACEOF 8131+ cat >> confdefs.h <<\EOF 8132 #define HAVE_AP_COMPAT_H 1 8133-_ACEOF 8134+EOF 8135 8136 if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then 8137- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 8138-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 8139- { (exit 1); exit 1; }; } 8140+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 8141 fi 8142 elif test -f $PHP_APACHE/src/compat.h; then 8143- 8144-cat >>confdefs.h <<\_ACEOF 8145+ cat >> confdefs.h <<\EOF 8146 #define HAVE_OLD_COMPAT_H 1 8147-_ACEOF 8148+EOF 8149 8150 fi 8151 else 8152- echo "$as_me:$LINENO: result: no" >&5 8153-echo "${ECHO_T}no" >&6 8154- { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&5 8155-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&2;} 8156- { (exit 1); exit 1; }; } 8157+ echo "$ac_t""no" 1>&6 8158+ { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" 1>&2; exit 1; } 8159 fi 8160 else 8161- echo "$as_me:$LINENO: result: no" >&5 8162-echo "${ECHO_T}no" >&6 8163+ echo "$ac_t""no" 1>&6 8164 fi 8165 8166 # compatibility 8167 if test -z "$enable_mod_charset" && test "$with_mod_charset"; then 8168 enable_mod_charset=$with_mod_charset 8169 fi 8170- 8171+ 8172 8173 php_enable_mod_charset=no 8174 8175-echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5 8176-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6 8177+echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 8178+echo "configure:5140: checking whether to enable Apache charset compatibility option" >&5 8179 # Check whether --enable-mod-charset or --disable-mod-charset was given. 8180 if test "${enable_mod_charset+set}" = set; then 8181 enableval="$enable_mod_charset" 8182 PHP_MOD_CHARSET=$enableval 8183 else 8184- 8185+ 8186 PHP_MOD_CHARSET=no 8187+ 8188 8189+fi 8190 8191-fi; 8192 8193 ext_output=$PHP_MOD_CHARSET 8194-echo "$as_me:$LINENO: result: $ext_output" >&5 8195-echo "${ECHO_T}$ext_output" >&6 8196+echo "$ac_t""$ext_output" 1>&6 8197 8198 8199 8200 8201 if test "$PHP_MOD_CHARSET" = "yes"; then 8202- 8203-cat >>confdefs.h <<\_ACEOF 8204+ cat >> confdefs.h <<\EOF 8205 #define USE_TRANSFER_TABLES 1 8206-_ACEOF 8207+EOF 8208 8209 fi 8210 8211 if test "$APACHE_MODULE" = "yes"; then 8212- 8213+ 8214 if test -n "$GCC"; then 8215- 8216+ 8217 gcc_arg_name=ac_cv_gcc_arg_rdynamic 8218- echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5 8219-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6 8220-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then 8221- echo $ECHO_N "(cached) $ECHO_C" >&6 8222+ echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 8223+echo "configure:5172: checking whether $CC supports -rdynamic" >&5 8224+if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then 8225+ echo $ac_n "(cached) $ac_c" 1>&6 8226 else 8227- 8228+ 8229 echo 'void somefunc() { };' > conftest.c 8230 cmd='$CC -rdynamic -c conftest.c' 8231 if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then 8232@@ -6365,15 +5182,15 @@ 8233 fi 8234 eval $gcc_arg_name=$ac_result 8235 rm -f conftest.* 8236- 8237+ 8238 fi 8239-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5 8240-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6 8241+ 8242+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 8243 if eval test "\$$gcc_arg_name" = "yes"; then 8244 gcc_rdynamic=yes 8245 else 8246 : 8247- 8248+ 8249 fi 8250 8251 if test "$gcc_rdynamic" = "yes"; then 8252@@ -6382,7 +5199,7 @@ 8253 fi 8254 8255 $php_shtool mkdir -p sapi/apache 8256- 8257+ 8258 PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache/libphp5.module" 8259 8260 fi 8261@@ -6392,99 +5209,71 @@ 8262 APXS_EXP=-bE:sapi/apache/mod_php5.exp 8263 fi 8264 8265- 8266-echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5 8267-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6 8268-if test "${ac_cv_php_fd_in_buff+set}" = set; then 8269- echo $ECHO_N "(cached) $ECHO_C" >&6 8270+ 8271+echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 8272+echo "configure:5215: checking for member fd in BUFF *" >&5 8273+if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then 8274+ echo $ac_n "(cached) $ac_c" 1>&6 8275 else 8276- 8277+ 8278 save=$CPPFLAGS 8279 if test -n "$APXS_INCLUDEDIR"; then 8280 CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR" 8281 else 8282 CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" 8283 fi 8284- cat >conftest.$ac_ext <<_ACEOF 8285-/* confdefs.h. */ 8286-_ACEOF 8287-cat confdefs.h >>conftest.$ac_ext 8288-cat >>conftest.$ac_ext <<_ACEOF 8289-/* end confdefs.h. */ 8290+ cat > conftest.$ac_ext <<EOF 8291+#line 5227 "configure" 8292+#include "confdefs.h" 8293 #include <httpd.h> 8294-int 8295-main () 8296-{ 8297+int main() { 8298 conn_rec *c; int fd = c->client->fd; 8299- ; 8300- return 0; 8301-} 8302-_ACEOF 8303-rm -f conftest.$ac_objext 8304-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 8305- (eval $ac_compile) 2>conftest.er1 8306- ac_status=$? 8307- grep -v '^ *+' conftest.er1 >conftest.err 8308- rm -f conftest.er1 8309- cat conftest.err >&5 8310- echo "$as_me:$LINENO: \$? = $ac_status" >&5 8311- (exit $ac_status); } && 8312- { ac_try='test -z "$ac_c_werror_flag" 8313- || test ! -s conftest.err' 8314- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8315- (eval $ac_try) 2>&5 8316- ac_status=$? 8317- echo "$as_me:$LINENO: \$? = $ac_status" >&5 8318- (exit $ac_status); }; } && 8319- { ac_try='test -s conftest.$ac_objext' 8320- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8321- (eval $ac_try) 2>&5 8322- ac_status=$? 8323- echo "$as_me:$LINENO: \$? = $ac_status" >&5 8324- (exit $ac_status); }; }; then 8325- 8326+; return 0; } 8327+EOF 8328+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 8329+ rm -rf conftest* 8330+ 8331 ac_cv_php_fd_in_buff=yes 8332 else 8333- echo "$as_me: failed program was:" >&5 8334-sed 's/^/| /' conftest.$ac_ext >&5 8335- 8336-ac_cv_php_fd_in_buff=no 8337+ echo "configure: failed program was:" >&5 8338+ cat conftest.$ac_ext >&5 8339+ rm -rf conftest* 8340+ ac_cv_php_fd_in_buff=no 8341 fi 8342-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 8343+rm -f conftest* 8344 CPPFLAGS=$save 8345 8346 fi 8347-echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5 8348-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6 8349-if test "$ac_cv_php_fd_in_buff" = "yes"; then 8350 8351-cat >>confdefs.h <<\_ACEOF 8352+echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6 8353+if test "$ac_cv_php_fd_in_buff" = "yes"; then 8354+ cat >> confdefs.h <<\EOF 8355 #define PHP_APACHE_HAVE_CLIENT_FD 1 8356-_ACEOF 8357+EOF 8358 8359 fi 8360 8361 INSTALL_IT=$APACHE_INSTALL 8362 8363- 8364+ 8365 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP" 8366 8367- 8368+ 8369 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE" 8370 8371- 8372+ 8373 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET" 8374 8375- 8376+ 8377 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" 8378 8379- 8380+ 8381 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS" 8382 8383- 8384+ 8385 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INSTALL" 8386 8387- 8388+ 8389 PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD" 8390 8391 fi 8392@@ -6495,17 +5284,17 @@ 8393 php_with_apxs2filter=no 8394 8395 8396- 8397 # Check whether --with-apxs2filter or --without-apxs2filter was given. 8398 if test "${with_apxs2filter+set}" = set; then 8399 withval="$with_apxs2filter" 8400 PHP_APXS2FILTER=$withval 8401 else 8402- 8403+ 8404 PHP_APXS2FILTER=no 8405+ 8406 8407+fi 8408 8409-fi; 8410 8411 ext_output=$PHP_APXS2FILTER 8412 8413@@ -6513,8 +5302,8 @@ 8414 8415 8416 8417-echo "$as_me:$LINENO: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 8418-echo $ECHO_N "checking for Apache 2.0 filter-module support via DSO through APXS... $ECHO_C" >&6 8419+echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 8420+echo "configure:5307: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 8421 8422 if test "$PHP_APXS2FILTER" != "no"; then 8423 if test "$PHP_APXS2FILTER" = "yes"; then 8424@@ -6524,13 +5313,13 @@ 8425 APXS=/usr/sbin/apxs 8426 fi 8427 else 8428- 8429+ 8430 if test -z "$PHP_APXS2FILTER" || echo "$PHP_APXS2FILTER" | grep '^/' >/dev/null ; then 8431 APXS=$PHP_APXS2FILTER 8432 else 8433- 8434+ 8435 ep_dir="`echo $PHP_APXS2FILTER|$SED 's%/*[^/][^/]*/*$%%'`" 8436- 8437+ 8438 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 8439 APXS="$ep_realdir/`basename \"$PHP_APXS2FILTER\"`" 8440 fi 8441@@ -6539,29 +5328,18 @@ 8442 8443 $APXS -q CFLAGS >/dev/null 2>&1 8444 if test "$?" != "0"; then 8445- echo "$as_me:$LINENO: result: " >&5 8446-echo "${ECHO_T}" >&6 8447- echo "$as_me:$LINENO: result: " >&5 8448-echo "${ECHO_T}" >&6 8449- echo "$as_me:$LINENO: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 8450-echo "${ECHO_T}Sorry, I cannot run apxs. Possible reasons follow:" >&6 8451- echo "$as_me:$LINENO: result: " >&5 8452-echo "${ECHO_T}" >&6 8453- echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5 8454-echo "${ECHO_T}1. Perl is not installed" >&6 8455- echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&5 8456-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&6 8457- echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 8458-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6 8459- echo "$as_me:$LINENO: result: " >&5 8460-echo "${ECHO_T}" >&6 8461- echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5 8462-echo "${ECHO_T}The output of $APXS follows:" >&6 8463+ echo "$ac_t""" 1>&6 8464+ echo "$ac_t""" 1>&6 8465+ echo "$ac_t""Sorry, I cannot run apxs. Possible reasons follow:" 1>&6 8466+ echo "$ac_t""" 1>&6 8467+ echo "$ac_t""1. Perl is not installed" 1>&6 8468+ echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" 1>&6 8469+ echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6 8470+ echo "$ac_t""" 1>&6 8471+ echo "$ac_t""The output of $APXS follows:" 1>&6 8472 $APXS -q CFLAGS 8473- { { echo "$as_me:$LINENO: error: Aborting" >&5 8474-echo "$as_me: error: Aborting" >&2;} 8475- { (exit 1); exit 1; }; } 8476- fi 8477+ { echo "configure: error: Aborting" 1>&2; exit 1; } 8478+ fi 8479 8480 APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` 8481 APXS_BINDIR=`$APXS -q BINDIR` 8482@@ -6588,7 +5366,7 @@ 8483 APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" 8484 8485 # Test that we're trying to configure with apache 2.x 8486- 8487+ 8488 ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` 8489 ac_IFS=$IFS 8490 IFS="- /. 8491@@ -6599,13 +5377,9 @@ 8492 APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` 8493 8494 if test "$APACHE_VERSION" -le 2000000; then 8495- { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" >&5 8496-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" >&2;} 8497- { (exit 1); exit 1; }; } 8498+ { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; } 8499 elif test "$APACHE_VERSION" -lt 2000040; then 8500- { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.40 is required" >&5 8501-echo "$as_me: error: Please note that Apache version >= 2.0.40 is required" >&2;} 8502- { (exit 1); exit 1; }; } 8503+ { echo "configure: error: Please note that Apache version >= 2.0.40 is required" 1>&2; exit 1; } 8504 fi 8505 8506 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 8507@@ -6625,33 +5399,34 @@ 8508 case $host_alias in 8509 *aix*) 8510 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" 8511- 8512- if test "$PHP_SAPI" != "default"; then 8513-{ { echo "$as_me:$LINENO: error: 8514-+--------------------------------------------------------------------+ 8515-| *** ATTENTION *** | 8516-| | 8517-| You've configured multiple SAPIs to be build. You can build only | 8518-| one SAPI module and CLI binary at the same time. | 8519-+--------------------------------------------------------------------+ 8520-" >&5 8521-echo "$as_me: error: 8522+ 8523+ if test "shared" = "program"; then 8524+ PHP_BINARIES="$PHP_BINARIES apache2filter" 8525+ elif test "$PHP_SAPI" != "none"; then 8526+ { echo "configure: error: 8527 +--------------------------------------------------------------------+ 8528 | *** ATTENTION *** | 8529 | | 8530 | You've configured multiple SAPIs to be build. You can build only | 8531-| one SAPI module and CLI binary at the same time. | 8532+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 8533 +--------------------------------------------------------------------+ 8534-" >&2;} 8535- { (exit 1); exit 1; }; } 8536- fi 8537+" 1>&2; exit 1; } 8538+ else 8539+ PHP_SAPI=apache2filter 8540+ fi 8541+ 8542+ 8543+ 8544+ BUILD_DIR="$BUILD_DIR sapi/apache2filter" 8545+ 8546 8547- PHP_SAPI=apache2filter 8548 8549- case "shared" in 8550- static) 8551+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter" 8552 8553- OVERALL_TARGET=php 8554+ 8555+ case "shared" in 8556+ static) 8557+ 8558 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8559 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8560 php_c_post= 8561@@ -6673,14 +5448,11 @@ 8562 shared_cxx_post= 8563 shared_lo=lo 8564 8565- php_build_target=program 8566- 8567 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8568- php_build_target=static 8569+ php_sapi_module=static 8570 ;; 8571- shared) 8572- 8573- OVERALL_TARGET=php 8574+ shared) 8575+ 8576 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8577 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8578 php_c_post= 8579@@ -6702,11 +5474,9 @@ 8580 shared_cxx_post= 8581 shared_lo=lo 8582 8583- php_build_target=program 8584- 8585 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8586- php_build_target=shared 8587- 8588+ php_sapi_module=shared 8589+ 8590 php_c_pre=$shared_c_pre 8591 php_c_meta=$shared_c_meta 8592 php_c_post=$shared_c_post 8593@@ -6715,9 +5485,8 @@ 8594 php_cxx_post=$shared_cxx_post 8595 php_lo=$shared_lo 8596 ;; 8597- bundle) 8598- 8599- OVERALL_TARGET=php 8600+ bundle) 8601+ 8602 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8603 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8604 php_c_post= 8605@@ -6739,47 +5508,20 @@ 8606 shared_cxx_post= 8607 shared_lo=lo 8608 8609- php_build_target=program 8610- 8611 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 8612- php_build_target=static 8613-;; 8614- program) 8615- OVERALL_TARGET=php 8616- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8617- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8618- php_c_post= 8619- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8620- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 8621- php_cxx_post= 8622- php_lo=lo 8623- 8624- case $with_pic in 8625- yes) pic_setting='-prefer-pic';; 8626- no) pic_setting='-prefer-non-pic';; 8627- esac 8628- 8629- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8630- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 8631- shared_c_post= 8632- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8633- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 8634- shared_cxx_post= 8635- shared_lo=lo 8636- 8637- php_build_target=program 8638+ php_sapi_module=static 8639 ;; 8640- esac 8641- 8642- 8643- 8644+ esac 8645+ install_sapi="install-sapi" 8646+ 8647+ 8648 case sapi/apache2filter in 8649 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 8650 /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 8651 *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 8652 esac 8653- 8654- 8655+ 8656+ 8657 8658 b_c_pre=$php_c_pre 8659 b_cxx_pre=$php_cxx_pre 8660@@ -6792,12 +5534,12 @@ 8661 8662 old_IFS=$IFS 8663 for ac_src in sapi_apache2.c apache_config.c php_functions.c; do 8664- 8665+ 8666 IFS=. 8667 set $ac_src 8668 ac_obj=$1 8669 IFS=$old_IFS 8670- 8671+ 8672 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 8673 8674 case $ac_src in 8675@@ -6814,8 +5556,9 @@ 8676 done 8677 8678 8679+ 8680 8681- INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 8682+ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 8683 ;; 8684 *darwin*) 8685 if test -x "$APR_CONFIG"; then 8686@@ -6825,36 +5568,37 @@ 8687 MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" 8688 fi 8689 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" 8690- 8691+ 8692 PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" 8693 8694- 8695- if test "$PHP_SAPI" != "default"; then 8696-{ { echo "$as_me:$LINENO: error: 8697-+--------------------------------------------------------------------+ 8698-| *** ATTENTION *** | 8699-| | 8700-| You've configured multiple SAPIs to be build. You can build only | 8701-| one SAPI module and CLI binary at the same time. | 8702-+--------------------------------------------------------------------+ 8703-" >&5 8704-echo "$as_me: error: 8705+ 8706+ if test "bundle" = "program"; then 8707+ PHP_BINARIES="$PHP_BINARIES apache2filter" 8708+ elif test "$PHP_SAPI" != "none"; then 8709+ { echo "configure: error: 8710 +--------------------------------------------------------------------+ 8711 | *** ATTENTION *** | 8712 | | 8713 | You've configured multiple SAPIs to be build. You can build only | 8714-| one SAPI module and CLI binary at the same time. | 8715+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 8716 +--------------------------------------------------------------------+ 8717-" >&2;} 8718- { (exit 1); exit 1; }; } 8719- fi 8720+" 1>&2; exit 1; } 8721+ else 8722+ PHP_SAPI=apache2filter 8723+ fi 8724 8725- PHP_SAPI=apache2filter 8726+ 8727+ 8728+ BUILD_DIR="$BUILD_DIR sapi/apache2filter" 8729+ 8730 8731- case "bundle" in 8732- static) 8733 8734- OVERALL_TARGET=php 8735+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter" 8736+ 8737+ 8738+ case "bundle" in 8739+ static) 8740+ 8741 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8742 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8743 php_c_post= 8744@@ -6876,14 +5620,11 @@ 8745 shared_cxx_post= 8746 shared_lo=lo 8747 8748- php_build_target=program 8749- 8750 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8751- php_build_target=static 8752+ php_sapi_module=static 8753 ;; 8754- shared) 8755- 8756- OVERALL_TARGET=php 8757+ shared) 8758+ 8759 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8760 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8761 php_c_post= 8762@@ -6905,11 +5646,9 @@ 8763 shared_cxx_post= 8764 shared_lo=lo 8765 8766- php_build_target=program 8767- 8768 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8769- php_build_target=shared 8770- 8771+ php_sapi_module=shared 8772+ 8773 php_c_pre=$shared_c_pre 8774 php_c_meta=$shared_c_meta 8775 php_c_post=$shared_c_post 8776@@ -6918,9 +5657,8 @@ 8777 php_cxx_post=$shared_cxx_post 8778 php_lo=$shared_lo 8779 ;; 8780- bundle) 8781- 8782- OVERALL_TARGET=php 8783+ bundle) 8784+ 8785 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8786 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8787 php_c_post= 8788@@ -6942,47 +5680,20 @@ 8789 shared_cxx_post= 8790 shared_lo=lo 8791 8792- php_build_target=program 8793- 8794 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 8795- php_build_target=static 8796-;; 8797- program) 8798- OVERALL_TARGET=php 8799- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8800- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8801- php_c_post= 8802- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8803- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 8804- php_cxx_post= 8805- php_lo=lo 8806- 8807- case $with_pic in 8808- yes) pic_setting='-prefer-pic';; 8809- no) pic_setting='-prefer-non-pic';; 8810- esac 8811- 8812- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8813- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 8814- shared_c_post= 8815- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8816- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 8817- shared_cxx_post= 8818- shared_lo=lo 8819- 8820- php_build_target=program 8821+ php_sapi_module=static 8822 ;; 8823- esac 8824- 8825- 8826- 8827+ esac 8828+ install_sapi="install-sapi" 8829+ 8830+ 8831 case sapi/apache2filter in 8832 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 8833 /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 8834 *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 8835 esac 8836- 8837- 8838+ 8839+ 8840 8841 b_c_pre=$php_c_pre 8842 b_cxx_pre=$php_cxx_pre 8843@@ -6995,12 +5706,12 @@ 8844 8845 old_IFS=$IFS 8846 for ac_src in sapi_apache2.c apache_config.c php_functions.c; do 8847- 8848+ 8849 IFS=. 8850 set $ac_src 8851 ac_obj=$1 8852 IFS=$old_IFS 8853- 8854+ 8855 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 8856 8857 case $ac_src in 8858@@ -7017,6 +5728,7 @@ 8859 done 8860 8861 8862+ 8863 8864 SAPI_SHARED=libs/libphp5.so 8865 INSTALL_IT="$INSTALL_IT $SAPI_SHARED" 8866@@ -7025,33 +5737,34 @@ 8867 if test -f _APP_; then `rm _APP_`; fi 8868 `ln -s $APXS_BINDIR/httpd _APP_` 8869 EXTRA_LIBS="$EXTRA_LIBS _APP_" 8870- 8871- if test "$PHP_SAPI" != "default"; then 8872-{ { echo "$as_me:$LINENO: error: 8873-+--------------------------------------------------------------------+ 8874-| *** ATTENTION *** | 8875-| | 8876-| You've configured multiple SAPIs to be build. You can build only | 8877-| one SAPI module and CLI binary at the same time. | 8878-+--------------------------------------------------------------------+ 8879-" >&5 8880-echo "$as_me: error: 8881+ 8882+ if test "shared" = "program"; then 8883+ PHP_BINARIES="$PHP_BINARIES apache2filter" 8884+ elif test "$PHP_SAPI" != "none"; then 8885+ { echo "configure: error: 8886 +--------------------------------------------------------------------+ 8887 | *** ATTENTION *** | 8888 | | 8889 | You've configured multiple SAPIs to be build. You can build only | 8890-| one SAPI module and CLI binary at the same time. | 8891+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 8892 +--------------------------------------------------------------------+ 8893-" >&2;} 8894- { (exit 1); exit 1; }; } 8895- fi 8896+" 1>&2; exit 1; } 8897+ else 8898+ PHP_SAPI=apache2filter 8899+ fi 8900+ 8901+ 8902+ 8903+ BUILD_DIR="$BUILD_DIR sapi/apache2filter" 8904+ 8905 8906- PHP_SAPI=apache2filter 8907 8908- case "shared" in 8909- static) 8910+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter" 8911 8912- OVERALL_TARGET=php 8913+ 8914+ case "shared" in 8915+ static) 8916+ 8917 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8918 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8919 php_c_post= 8920@@ -7073,14 +5786,11 @@ 8921 shared_cxx_post= 8922 shared_lo=lo 8923 8924- php_build_target=program 8925- 8926 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8927- php_build_target=static 8928+ php_sapi_module=static 8929 ;; 8930- shared) 8931- 8932- OVERALL_TARGET=php 8933+ shared) 8934+ 8935 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8936 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8937 php_c_post= 8938@@ -7102,11 +5812,9 @@ 8939 shared_cxx_post= 8940 shared_lo=lo 8941 8942- php_build_target=program 8943- 8944 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 8945- php_build_target=shared 8946- 8947+ php_sapi_module=shared 8948+ 8949 php_c_pre=$shared_c_pre 8950 php_c_meta=$shared_c_meta 8951 php_c_post=$shared_c_post 8952@@ -7115,9 +5823,8 @@ 8953 php_cxx_post=$shared_cxx_post 8954 php_lo=$shared_lo 8955 ;; 8956- bundle) 8957- 8958- OVERALL_TARGET=php 8959+ bundle) 8960+ 8961 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8962 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8963 php_c_post= 8964@@ -7139,47 +5846,20 @@ 8965 shared_cxx_post= 8966 shared_lo=lo 8967 8968- php_build_target=program 8969- 8970 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 8971- php_build_target=static 8972-;; 8973- program) 8974- OVERALL_TARGET=php 8975- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8976- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 8977- php_c_post= 8978- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8979- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 8980- php_cxx_post= 8981- php_lo=lo 8982- 8983- case $with_pic in 8984- yes) pic_setting='-prefer-pic';; 8985- no) pic_setting='-prefer-non-pic';; 8986- esac 8987- 8988- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 8989- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 8990- shared_c_post= 8991- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 8992- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 8993- shared_cxx_post= 8994- shared_lo=lo 8995- 8996- php_build_target=program 8997+ php_sapi_module=static 8998 ;; 8999- esac 9000- 9001- 9002- 9003+ esac 9004+ install_sapi="install-sapi" 9005+ 9006+ 9007 case sapi/apache2filter in 9008 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 9009 /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 9010 *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 9011 esac 9012- 9013- 9014+ 9015+ 9016 9017 b_c_pre=$php_c_pre 9018 b_cxx_pre=$php_cxx_pre 9019@@ -7192,12 +5872,12 @@ 9020 9021 old_IFS=$IFS 9022 for ac_src in sapi_apache2.c apache_config.c php_functions.c; do 9023- 9024+ 9025 IFS=. 9026 set $ac_src 9027 ac_obj=$1 9028 IFS=$old_IFS 9029- 9030+ 9031 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 9032 9033 case $ac_src in 9034@@ -7214,37 +5894,39 @@ 9035 done 9036 9037 9038+ 9039 9040 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 9041 ;; 9042 *) 9043- 9044- if test "$PHP_SAPI" != "default"; then 9045-{ { echo "$as_me:$LINENO: error: 9046-+--------------------------------------------------------------------+ 9047-| *** ATTENTION *** | 9048-| | 9049-| You've configured multiple SAPIs to be build. You can build only | 9050-| one SAPI module and CLI binary at the same time. | 9051-+--------------------------------------------------------------------+ 9052-" >&5 9053-echo "$as_me: error: 9054+ 9055+ if test "shared" = "program"; then 9056+ PHP_BINARIES="$PHP_BINARIES apache2filter" 9057+ elif test "$PHP_SAPI" != "none"; then 9058+ { echo "configure: error: 9059 +--------------------------------------------------------------------+ 9060 | *** ATTENTION *** | 9061 | | 9062 | You've configured multiple SAPIs to be build. You can build only | 9063-| one SAPI module and CLI binary at the same time. | 9064+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 9065 +--------------------------------------------------------------------+ 9066-" >&2;} 9067- { (exit 1); exit 1; }; } 9068- fi 9069+" 1>&2; exit 1; } 9070+ else 9071+ PHP_SAPI=apache2filter 9072+ fi 9073 9074- PHP_SAPI=apache2filter 9075+ 9076+ 9077+ BUILD_DIR="$BUILD_DIR sapi/apache2filter" 9078+ 9079 9080- case "shared" in 9081- static) 9082 9083- OVERALL_TARGET=php 9084+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2filter" 9085+ 9086+ 9087+ case "shared" in 9088+ static) 9089+ 9090 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9091 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9092 php_c_post= 9093@@ -7266,14 +5948,11 @@ 9094 shared_cxx_post= 9095 shared_lo=lo 9096 9097- php_build_target=program 9098- 9099 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9100- php_build_target=static 9101+ php_sapi_module=static 9102 ;; 9103- shared) 9104- 9105- OVERALL_TARGET=php 9106+ shared) 9107+ 9108 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9109 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9110 php_c_post= 9111@@ -7295,11 +5974,9 @@ 9112 shared_cxx_post= 9113 shared_lo=lo 9114 9115- php_build_target=program 9116- 9117 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9118- php_build_target=shared 9119- 9120+ php_sapi_module=shared 9121+ 9122 php_c_pre=$shared_c_pre 9123 php_c_meta=$shared_c_meta 9124 php_c_post=$shared_c_post 9125@@ -7308,9 +5985,8 @@ 9126 php_cxx_post=$shared_cxx_post 9127 php_lo=$shared_lo 9128 ;; 9129- bundle) 9130- 9131- OVERALL_TARGET=php 9132+ bundle) 9133+ 9134 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9135 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9136 php_c_post= 9137@@ -7332,47 +6008,20 @@ 9138 shared_cxx_post= 9139 shared_lo=lo 9140 9141- php_build_target=program 9142- 9143 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 9144- php_build_target=static 9145-;; 9146- program) 9147- OVERALL_TARGET=php 9148- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9149- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9150- php_c_post= 9151- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9152- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 9153- php_cxx_post= 9154- php_lo=lo 9155- 9156- case $with_pic in 9157- yes) pic_setting='-prefer-pic';; 9158- no) pic_setting='-prefer-non-pic';; 9159- esac 9160- 9161- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9162- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 9163- shared_c_post= 9164- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9165- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 9166- shared_cxx_post= 9167- shared_lo=lo 9168- 9169- php_build_target=program 9170+ php_sapi_module=static 9171 ;; 9172- esac 9173- 9174- 9175- 9176+ esac 9177+ install_sapi="install-sapi" 9178+ 9179+ 9180 case sapi/apache2filter in 9181 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 9182 /*) ac_srcdir=`echo "sapi/apache2filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 9183 *) ac_srcdir="$abs_srcdir/sapi/apache2filter/"; ac_bdir="sapi/apache2filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 9184 esac 9185- 9186- 9187+ 9188+ 9189 9190 b_c_pre=$php_c_pre 9191 b_cxx_pre=$php_cxx_pre 9192@@ -7385,12 +6034,12 @@ 9193 9194 old_IFS=$IFS 9195 for ac_src in sapi_apache2.c apache_config.c php_functions.c; do 9196- 9197+ 9198 IFS=. 9199 set $ac_src 9200 ac_obj=$1 9201 IFS=$old_IFS 9202- 9203+ 9204 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 9205 9206 case $ac_src in 9207@@ -7407,7 +6056,8 @@ 9208 done 9209 9210 9211- 9212+ 9213+ 9214 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 9215 ;; 9216 esac 9217@@ -7415,36 +6065,30 @@ 9218 if test "$APACHE_VERSION" -lt 2004001; then 9219 APXS_MPM=`$APXS -q MPM_NAME` 9220 if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then 9221- 9222+ 9223 enable_maintainer_zts=yes 9224 if test "$pthreads_working" != "yes"; then 9225- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 9226-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 9227- { (exit 1); exit 1; }; } 9228+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 9229 fi 9230 9231 fi 9232 else 9233 APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` 9234 if test -n "$APACHE_THREADED_MPM"; then 9235- 9236+ 9237 enable_maintainer_zts=yes 9238 if test "$pthreads_working" != "yes"; then 9239- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 9240-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 9241- { (exit 1); exit 1; }; } 9242+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 9243 fi 9244 9245 fi 9246 fi 9247- echo "$as_me:$LINENO: result: yes" >&5 9248-echo "${ECHO_T}yes" >&6 9249- 9250+ echo "$ac_t""yes" 1>&6 9251+ 9252 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" 9253 9254 else 9255- echo "$as_me:$LINENO: result: no" >&5 9256-echo "${ECHO_T}no" >&6 9257+ echo "$ac_t""no" 1>&6 9258 fi 9259 9260 9261@@ -7453,17 +6097,17 @@ 9262 php_with_apxs2=no 9263 9264 9265- 9266 # Check whether --with-apxs2 or --without-apxs2 was given. 9267 if test "${with_apxs2+set}" = set; then 9268 withval="$with_apxs2" 9269 PHP_APXS2=$withval 9270 else 9271- 9272+ 9273 PHP_APXS2=no 9274+ 9275 9276+fi 9277 9278-fi; 9279 9280 ext_output=$PHP_APXS2 9281 9282@@ -7471,8 +6115,8 @@ 9283 9284 9285 9286-echo "$as_me:$LINENO: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 9287-echo $ECHO_N "checking for Apache 2.0 handler-module support via DSO through APXS... $ECHO_C" >&6 9288+echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 9289+echo "configure:6120: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 9290 9291 if test "$PHP_APXS2" != "no"; then 9292 if test "$PHP_APXS2" = "yes"; then 9293@@ -7482,13 +6126,13 @@ 9294 APXS=/usr/sbin/apxs 9295 fi 9296 else 9297- 9298+ 9299 if test -z "$PHP_APXS2" || echo "$PHP_APXS2" | grep '^/' >/dev/null ; then 9300 APXS=$PHP_APXS2 9301 else 9302- 9303+ 9304 ep_dir="`echo $PHP_APXS2|$SED 's%/*[^/][^/]*/*$%%'`" 9305- 9306+ 9307 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 9308 APXS="$ep_realdir/`basename \"$PHP_APXS2\"`" 9309 fi 9310@@ -7497,29 +6141,18 @@ 9311 9312 $APXS -q CFLAGS >/dev/null 2>&1 9313 if test "$?" != "0"; then 9314- echo "$as_me:$LINENO: result: " >&5 9315-echo "${ECHO_T}" >&6 9316- echo "$as_me:$LINENO: result: " >&5 9317-echo "${ECHO_T}" >&6 9318- echo "$as_me:$LINENO: result: Sorry, I cannot run apxs. Possible reasons follow:" >&5 9319-echo "${ECHO_T}Sorry, I cannot run apxs. Possible reasons follow:" >&6 9320- echo "$as_me:$LINENO: result: " >&5 9321-echo "${ECHO_T}" >&6 9322- echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5 9323-echo "${ECHO_T}1. Perl is not installed" >&6 9324- echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5 9325-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6 9326- echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5 9327-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6 9328- echo "$as_me:$LINENO: result: " >&5 9329-echo "${ECHO_T}" >&6 9330- echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5 9331-echo "${ECHO_T}The output of $APXS follows:" >&6 9332+ echo "$ac_t""" 1>&6 9333+ echo "$ac_t""" 1>&6 9334+ echo "$ac_t""Sorry, I cannot run apxs. Possible reasons follow:" 1>&6 9335+ echo "$ac_t""" 1>&6 9336+ echo "$ac_t""1. Perl is not installed" 1>&6 9337+ echo "$ac_t""2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" 1>&6 9338+ echo "$ac_t""3. Apache was not built using --enable-so (the apxs usage page is displayed)" 1>&6 9339+ echo "$ac_t""" 1>&6 9340+ echo "$ac_t""The output of $APXS follows:" 1>&6 9341 $APXS -q CFLAGS 9342- { { echo "$as_me:$LINENO: error: Aborting" >&5 9343-echo "$as_me: error: Aborting" >&2;} 9344- { (exit 1); exit 1; }; } 9345- fi 9346+ { echo "configure: error: Aborting" 1>&2; exit 1; } 9347+ fi 9348 9349 APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` 9350 APXS_BINDIR=`$APXS -q BINDIR` 9351@@ -7546,7 +6179,7 @@ 9352 APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS" 9353 9354 # Test that we're trying to configure with apache 2.x 9355- 9356+ 9357 ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` 9358 ac_IFS=$IFS 9359 IFS="- /. 9360@@ -7557,13 +6190,9 @@ 9361 APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` 9362 9363 if test "$APACHE_VERSION" -le 2000000; then 9364- { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" >&5 9365-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" >&2;} 9366- { (exit 1); exit 1; }; } 9367+ { echo "configure: error: You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)" 1>&2; exit 1; } 9368 elif test "$APACHE_VERSION" -lt 2000044; then 9369- { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.44 is required" >&5 9370-echo "$as_me: error: Please note that Apache version >= 2.0.44 is required" >&2;} 9371- { (exit 1); exit 1; }; } 9372+ { echo "configure: error: Please note that Apache version >= 2.0.44 is required" 1>&2; exit 1; } 9373 fi 9374 9375 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 9376@@ -7583,33 +6212,34 @@ 9377 case $host_alias in 9378 *aix*) 9379 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" 9380- 9381- if test "$PHP_SAPI" != "default"; then 9382-{ { echo "$as_me:$LINENO: error: 9383-+--------------------------------------------------------------------+ 9384-| *** ATTENTION *** | 9385-| | 9386-| You've configured multiple SAPIs to be build. You can build only | 9387-| one SAPI module and CLI binary at the same time. | 9388-+--------------------------------------------------------------------+ 9389-" >&5 9390-echo "$as_me: error: 9391+ 9392+ if test "shared" = "program"; then 9393+ PHP_BINARIES="$PHP_BINARIES apache2handler" 9394+ elif test "$PHP_SAPI" != "none"; then 9395+ { echo "configure: error: 9396 +--------------------------------------------------------------------+ 9397 | *** ATTENTION *** | 9398 | | 9399 | You've configured multiple SAPIs to be build. You can build only | 9400-| one SAPI module and CLI binary at the same time. | 9401+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 9402 +--------------------------------------------------------------------+ 9403-" >&2;} 9404- { (exit 1); exit 1; }; } 9405- fi 9406+" 1>&2; exit 1; } 9407+ else 9408+ PHP_SAPI=apache2handler 9409+ fi 9410 9411- PHP_SAPI=apache2handler 9412+ 9413+ 9414+ BUILD_DIR="$BUILD_DIR sapi/apache2handler" 9415+ 9416 9417- case "shared" in 9418- static) 9419 9420- OVERALL_TARGET=php 9421+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler" 9422+ 9423+ 9424+ case "shared" in 9425+ static) 9426+ 9427 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9428 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9429 php_c_post= 9430@@ -7631,14 +6261,11 @@ 9431 shared_cxx_post= 9432 shared_lo=lo 9433 9434- php_build_target=program 9435- 9436 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9437- php_build_target=static 9438+ php_sapi_module=static 9439 ;; 9440- shared) 9441- 9442- OVERALL_TARGET=php 9443+ shared) 9444+ 9445 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9446 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9447 php_c_post= 9448@@ -7660,11 +6287,9 @@ 9449 shared_cxx_post= 9450 shared_lo=lo 9451 9452- php_build_target=program 9453- 9454 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9455- php_build_target=shared 9456- 9457+ php_sapi_module=shared 9458+ 9459 php_c_pre=$shared_c_pre 9460 php_c_meta=$shared_c_meta 9461 php_c_post=$shared_c_post 9462@@ -7673,9 +6298,8 @@ 9463 php_cxx_post=$shared_cxx_post 9464 php_lo=$shared_lo 9465 ;; 9466- bundle) 9467- 9468- OVERALL_TARGET=php 9469+ bundle) 9470+ 9471 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9472 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9473 php_c_post= 9474@@ -7697,47 +6321,20 @@ 9475 shared_cxx_post= 9476 shared_lo=lo 9477 9478- php_build_target=program 9479- 9480 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 9481- php_build_target=static 9482-;; 9483- program) 9484- OVERALL_TARGET=php 9485- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9486- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9487- php_c_post= 9488- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9489- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 9490- php_cxx_post= 9491- php_lo=lo 9492- 9493- case $with_pic in 9494- yes) pic_setting='-prefer-pic';; 9495- no) pic_setting='-prefer-non-pic';; 9496- esac 9497- 9498- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9499- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 9500- shared_c_post= 9501- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9502- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 9503- shared_cxx_post= 9504- shared_lo=lo 9505- 9506- php_build_target=program 9507+ php_sapi_module=static 9508 ;; 9509- esac 9510- 9511- 9512- 9513+ esac 9514+ install_sapi="install-sapi" 9515+ 9516+ 9517 case sapi/apache2handler in 9518 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 9519 /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 9520 *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 9521 esac 9522- 9523- 9524+ 9525+ 9526 9527 b_c_pre=$php_c_pre 9528 b_cxx_pre=$php_cxx_pre 9529@@ -7750,12 +6347,12 @@ 9530 9531 old_IFS=$IFS 9532 for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do 9533- 9534+ 9535 IFS=. 9536 set $ac_src 9537 ac_obj=$1 9538 IFS=$old_IFS 9539- 9540+ 9541 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 9542 9543 case $ac_src in 9544@@ -7772,8 +6369,9 @@ 9545 done 9546 9547 9548+ 9549 9550- INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 9551+ INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 9552 ;; 9553 *darwin*) 9554 if test -x "$APR_CONFIG"; then 9555@@ -7783,36 +6381,37 @@ 9556 MH_BUNDLE_FLAGS="`$APU_CONFIG --ldflags --link-ld --libs` $MH_BUNDLE_FLAGS" 9557 fi 9558 MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" 9559- 9560+ 9561 PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" 9562 9563- 9564- if test "$PHP_SAPI" != "default"; then 9565-{ { echo "$as_me:$LINENO: error: 9566+ 9567+ if test "bundle" = "program"; then 9568+ PHP_BINARIES="$PHP_BINARIES apache2handler" 9569+ elif test "$PHP_SAPI" != "none"; then 9570+ { echo "configure: error: 9571 +--------------------------------------------------------------------+ 9572 | *** ATTENTION *** | 9573 | | 9574 | You've configured multiple SAPIs to be build. You can build only | 9575-| one SAPI module and CLI binary at the same time. | 9576+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 9577 +--------------------------------------------------------------------+ 9578-" >&5 9579-echo "$as_me: error: 9580-+--------------------------------------------------------------------+ 9581-| *** ATTENTION *** | 9582-| | 9583-| You've configured multiple SAPIs to be build. You can build only | 9584-| one SAPI module and CLI binary at the same time. | 9585-+--------------------------------------------------------------------+ 9586-" >&2;} 9587- { (exit 1); exit 1; }; } 9588- fi 9589+" 1>&2; exit 1; } 9590+ else 9591+ PHP_SAPI=apache2handler 9592+ fi 9593+ 9594+ 9595+ 9596+ BUILD_DIR="$BUILD_DIR sapi/apache2handler" 9597+ 9598 9599- PHP_SAPI=apache2handler 9600 9601- case "bundle" in 9602- static) 9603+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler" 9604 9605- OVERALL_TARGET=php 9606+ 9607+ case "bundle" in 9608+ static) 9609+ 9610 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9611 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9612 php_c_post= 9613@@ -7834,14 +6433,11 @@ 9614 shared_cxx_post= 9615 shared_lo=lo 9616 9617- php_build_target=program 9618- 9619 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9620- php_build_target=static 9621+ php_sapi_module=static 9622 ;; 9623- shared) 9624- 9625- OVERALL_TARGET=php 9626+ shared) 9627+ 9628 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9629 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9630 php_c_post= 9631@@ -7863,11 +6459,9 @@ 9632 shared_cxx_post= 9633 shared_lo=lo 9634 9635- php_build_target=program 9636- 9637 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9638- php_build_target=shared 9639- 9640+ php_sapi_module=shared 9641+ 9642 php_c_pre=$shared_c_pre 9643 php_c_meta=$shared_c_meta 9644 php_c_post=$shared_c_post 9645@@ -7876,9 +6470,8 @@ 9646 php_cxx_post=$shared_cxx_post 9647 php_lo=$shared_lo 9648 ;; 9649- bundle) 9650- 9651- OVERALL_TARGET=php 9652+ bundle) 9653+ 9654 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9655 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9656 php_c_post= 9657@@ -7900,47 +6493,20 @@ 9658 shared_cxx_post= 9659 shared_lo=lo 9660 9661- php_build_target=program 9662- 9663 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 9664- php_build_target=static 9665-;; 9666- program) 9667- OVERALL_TARGET=php 9668- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9669- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9670- php_c_post= 9671- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9672- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 9673- php_cxx_post= 9674- php_lo=lo 9675- 9676- case $with_pic in 9677- yes) pic_setting='-prefer-pic';; 9678- no) pic_setting='-prefer-non-pic';; 9679- esac 9680- 9681- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9682- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 9683- shared_c_post= 9684- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9685- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 9686- shared_cxx_post= 9687- shared_lo=lo 9688- 9689- php_build_target=program 9690+ php_sapi_module=static 9691 ;; 9692- esac 9693- 9694- 9695- 9696+ esac 9697+ install_sapi="install-sapi" 9698+ 9699+ 9700 case sapi/apache2handler in 9701 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 9702 /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 9703 *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 9704 esac 9705- 9706- 9707+ 9708+ 9709 9710 b_c_pre=$php_c_pre 9711 b_cxx_pre=$php_cxx_pre 9712@@ -7953,12 +6519,12 @@ 9713 9714 old_IFS=$IFS 9715 for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do 9716- 9717+ 9718 IFS=. 9719 set $ac_src 9720 ac_obj=$1 9721 IFS=$old_IFS 9722- 9723+ 9724 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 9725 9726 case $ac_src in 9727@@ -7975,6 +6541,7 @@ 9728 done 9729 9730 9731+ 9732 9733 SAPI_SHARED=libs/libphp5.so 9734 INSTALL_IT="$INSTALL_IT $SAPI_SHARED" 9735@@ -7983,33 +6550,34 @@ 9736 if test -f _APP_; then `rm _APP_`; fi 9737 `ln -s $APXS_BINDIR/httpd _APP_` 9738 EXTRA_LIBS="$EXTRA_LIBS _APP_" 9739- 9740- if test "$PHP_SAPI" != "default"; then 9741-{ { echo "$as_me:$LINENO: error: 9742-+--------------------------------------------------------------------+ 9743-| *** ATTENTION *** | 9744-| | 9745-| You've configured multiple SAPIs to be build. You can build only | 9746-| one SAPI module and CLI binary at the same time. | 9747-+--------------------------------------------------------------------+ 9748-" >&5 9749-echo "$as_me: error: 9750+ 9751+ if test "shared" = "program"; then 9752+ PHP_BINARIES="$PHP_BINARIES apache2handler" 9753+ elif test "$PHP_SAPI" != "none"; then 9754+ { echo "configure: error: 9755 +--------------------------------------------------------------------+ 9756 | *** ATTENTION *** | 9757 | | 9758 | You've configured multiple SAPIs to be build. You can build only | 9759-| one SAPI module and CLI binary at the same time. | 9760+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 9761 +--------------------------------------------------------------------+ 9762-" >&2;} 9763- { (exit 1); exit 1; }; } 9764- fi 9765+" 1>&2; exit 1; } 9766+ else 9767+ PHP_SAPI=apache2handler 9768+ fi 9769 9770- PHP_SAPI=apache2handler 9771+ 9772+ 9773+ BUILD_DIR="$BUILD_DIR sapi/apache2handler" 9774+ 9775 9776- case "shared" in 9777- static) 9778 9779- OVERALL_TARGET=php 9780+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler" 9781+ 9782+ 9783+ case "shared" in 9784+ static) 9785+ 9786 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9787 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9788 php_c_post= 9789@@ -8031,14 +6599,11 @@ 9790 shared_cxx_post= 9791 shared_lo=lo 9792 9793- php_build_target=program 9794- 9795 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9796- php_build_target=static 9797+ php_sapi_module=static 9798 ;; 9799- shared) 9800- 9801- OVERALL_TARGET=php 9802+ shared) 9803+ 9804 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9805 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9806 php_c_post= 9807@@ -8060,11 +6625,9 @@ 9808 shared_cxx_post= 9809 shared_lo=lo 9810 9811- php_build_target=program 9812- 9813 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9814- php_build_target=shared 9815- 9816+ php_sapi_module=shared 9817+ 9818 php_c_pre=$shared_c_pre 9819 php_c_meta=$shared_c_meta 9820 php_c_post=$shared_c_post 9821@@ -8073,9 +6636,8 @@ 9822 php_cxx_post=$shared_cxx_post 9823 php_lo=$shared_lo 9824 ;; 9825- bundle) 9826- 9827- OVERALL_TARGET=php 9828+ bundle) 9829+ 9830 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9831 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9832 php_c_post= 9833@@ -8097,47 +6659,20 @@ 9834 shared_cxx_post= 9835 shared_lo=lo 9836 9837- php_build_target=program 9838- 9839 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 9840- php_build_target=static 9841-;; 9842- program) 9843- OVERALL_TARGET=php 9844- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9845- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9846- php_c_post= 9847- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9848- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 9849- php_cxx_post= 9850- php_lo=lo 9851- 9852- case $with_pic in 9853- yes) pic_setting='-prefer-pic';; 9854- no) pic_setting='-prefer-non-pic';; 9855- esac 9856- 9857- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9858- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 9859- shared_c_post= 9860- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 9861- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 9862- shared_cxx_post= 9863- shared_lo=lo 9864- 9865- php_build_target=program 9866+ php_sapi_module=static 9867 ;; 9868- esac 9869- 9870- 9871- 9872+ esac 9873+ install_sapi="install-sapi" 9874+ 9875+ 9876 case sapi/apache2handler in 9877 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 9878 /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 9879 *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 9880 esac 9881- 9882- 9883+ 9884+ 9885 9886 b_c_pre=$php_c_pre 9887 b_cxx_pre=$php_cxx_pre 9888@@ -8150,12 +6685,12 @@ 9889 9890 old_IFS=$IFS 9891 for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do 9892- 9893+ 9894 IFS=. 9895 set $ac_src 9896 ac_obj=$1 9897 IFS=$old_IFS 9898- 9899+ 9900 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 9901 9902 case $ac_src in 9903@@ -8172,37 +6707,39 @@ 9904 done 9905 9906 9907+ 9908 9909 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 9910 ;; 9911 *) 9912- 9913- if test "$PHP_SAPI" != "default"; then 9914-{ { echo "$as_me:$LINENO: error: 9915+ 9916+ if test "shared" = "program"; then 9917+ PHP_BINARIES="$PHP_BINARIES apache2handler" 9918+ elif test "$PHP_SAPI" != "none"; then 9919+ { echo "configure: error: 9920 +--------------------------------------------------------------------+ 9921 | *** ATTENTION *** | 9922 | | 9923 | You've configured multiple SAPIs to be build. You can build only | 9924-| one SAPI module and CLI binary at the same time. | 9925+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 9926 +--------------------------------------------------------------------+ 9927-" >&5 9928-echo "$as_me: error: 9929-+--------------------------------------------------------------------+ 9930-| *** ATTENTION *** | 9931-| | 9932-| You've configured multiple SAPIs to be build. You can build only | 9933-| one SAPI module and CLI binary at the same time. | 9934-+--------------------------------------------------------------------+ 9935-" >&2;} 9936- { (exit 1); exit 1; }; } 9937- fi 9938+" 1>&2; exit 1; } 9939+ else 9940+ PHP_SAPI=apache2handler 9941+ fi 9942+ 9943+ 9944+ 9945+ BUILD_DIR="$BUILD_DIR sapi/apache2handler" 9946+ 9947 9948- PHP_SAPI=apache2handler 9949 9950- case "shared" in 9951- static) 9952+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache2handler" 9953 9954- OVERALL_TARGET=php 9955+ 9956+ case "shared" in 9957+ static) 9958+ 9959 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9960 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9961 php_c_post= 9962@@ -8224,14 +6761,11 @@ 9963 shared_cxx_post= 9964 shared_lo=lo 9965 9966- php_build_target=program 9967- 9968 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9969- php_build_target=static 9970+ php_sapi_module=static 9971 ;; 9972- shared) 9973- 9974- OVERALL_TARGET=php 9975+ shared) 9976+ 9977 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 9978 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 9979 php_c_post= 9980@@ -8253,11 +6787,9 @@ 9981 shared_cxx_post= 9982 shared_lo=lo 9983 9984- php_build_target=program 9985- 9986 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 9987- php_build_target=shared 9988- 9989+ php_sapi_module=shared 9990+ 9991 php_c_pre=$shared_c_pre 9992 php_c_meta=$shared_c_meta 9993 php_c_post=$shared_c_post 9994@@ -8266,9 +6798,8 @@ 9995 php_cxx_post=$shared_cxx_post 9996 php_lo=$shared_lo 9997 ;; 9998- bundle) 9999- 10000- OVERALL_TARGET=php 10001+ bundle) 10002+ 10003 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10004 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10005 php_c_post= 10006@@ -8290,47 +6821,20 @@ 10007 shared_cxx_post= 10008 shared_lo=lo 10009 10010- php_build_target=program 10011- 10012 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 10013- php_build_target=static 10014-;; 10015- program) 10016- OVERALL_TARGET=php 10017- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10018- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10019- php_c_post= 10020- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10021- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 10022- php_cxx_post= 10023- php_lo=lo 10024- 10025- case $with_pic in 10026- yes) pic_setting='-prefer-pic';; 10027- no) pic_setting='-prefer-non-pic';; 10028- esac 10029- 10030- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10031- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 10032- shared_c_post= 10033- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10034- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 10035- shared_cxx_post= 10036- shared_lo=lo 10037- 10038- php_build_target=program 10039+ php_sapi_module=static 10040 ;; 10041- esac 10042- 10043- 10044- 10045+ esac 10046+ install_sapi="install-sapi" 10047+ 10048+ 10049 case sapi/apache2handler in 10050 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 10051 /*) ac_srcdir=`echo "sapi/apache2handler"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 10052 *) ac_srcdir="$abs_srcdir/sapi/apache2handler/"; ac_bdir="sapi/apache2handler/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 10053 esac 10054- 10055- 10056+ 10057+ 10058 10059 b_c_pre=$php_c_pre 10060 b_cxx_pre=$php_cxx_pre 10061@@ -8343,12 +6847,12 @@ 10062 10063 old_IFS=$IFS 10064 for ac_src in mod_php5.c sapi_apache2.c apache_config.c php_functions.c; do 10065- 10066+ 10067 IFS=. 10068 set $ac_src 10069 ac_obj=$1 10070 IFS=$old_IFS 10071- 10072+ 10073 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 10074 10075 case $ac_src in 10076@@ -8365,7 +6869,8 @@ 10077 done 10078 10079 10080- 10081+ 10082+ 10083 INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" 10084 ;; 10085 esac 10086@@ -8373,36 +6878,30 @@ 10087 if test "$APACHE_VERSION" -lt 2004001; then 10088 APXS_MPM=`$APXS -q MPM_NAME` 10089 if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then 10090- 10091+ 10092 enable_maintainer_zts=yes 10093 if test "$pthreads_working" != "yes"; then 10094- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 10095-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 10096- { (exit 1); exit 1; }; } 10097+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 10098 fi 10099 10100 fi 10101 else 10102 APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` 10103 if test -n "$APACHE_THREADED_MPM"; then 10104- 10105+ 10106 enable_maintainer_zts=yes 10107 if test "$pthreads_working" != "yes"; then 10108- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 10109-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 10110- { (exit 1); exit 1; }; } 10111+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 10112 fi 10113 10114 fi 10115 fi 10116- echo "$as_me:$LINENO: result: yes" >&5 10117-echo "${ECHO_T}yes" >&6 10118- 10119+ echo "$ac_t""yes" 1>&6 10120+ 10121 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" 10122 10123 else 10124- echo "$as_me:$LINENO: result: no" >&5 10125-echo "${ECHO_T}no" >&6 10126+ echo "$ac_t""no" 1>&6 10127 fi 10128 10129 10130@@ -8412,17 +6911,17 @@ 10131 php_with_apache_hooks=no 10132 10133 10134- 10135 # Check whether --with-apache-hooks or --without-apache-hooks was given. 10136 if test "${with_apache_hooks+set}" = set; then 10137 withval="$with_apache_hooks" 10138 PHP_APACHE_HOOKS=$withval 10139 else 10140- 10141+ 10142 PHP_APACHE_HOOKS=no 10143+ 10144 10145+fi 10146 10147-fi; 10148 10149 ext_output=$PHP_APACHE_HOOKS 10150 10151@@ -8430,24 +6929,24 @@ 10152 10153 10154 10155-echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 10156-echo $ECHO_N "checking for Apache 1.x (hooks) module support via DSO through APXS... $ECHO_C" >&6 10157+echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 10158+echo "configure:6934: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 10159 10160 if test "$PHP_APACHE_HOOKS" != "no"; then 10161 if test "$PHP_APACHE_HOOKS" = "yes"; then 10162 APXS=apxs 10163 $APXS -q CFLAGS >/dev/null 2>&1 10164- if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 10165+ if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x 10166 APXS=/usr/sbin/apxs 10167 fi 10168 else 10169- 10170+ 10171 if test -z "$PHP_APACHE_HOOKS" || echo "$PHP_APACHE_HOOKS" | grep '^/' >/dev/null ; then 10172 APXS=$PHP_APACHE_HOOKS 10173 else 10174- 10175+ 10176 ep_dir="`echo $PHP_APACHE_HOOKS|$SED 's%/*[^/][^/]*/*$%%'`" 10177- 10178+ 10179 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 10180 APXS="$ep_realdir/`basename \"$PHP_APACHE_HOOKS\"`" 10181 fi 10182@@ -8456,27 +6955,17 @@ 10183 10184 $APXS -q CFLAGS >/dev/null 2>&1 10185 if test "$?" != "0"; then 10186- echo "$as_me:$LINENO: result: " >&5 10187-echo "${ECHO_T}" >&6 10188- echo "$as_me:$LINENO: result: " >&5 10189-echo "${ECHO_T}" >&6 10190- echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS. Possible reasons:" >&5 10191-echo "${ECHO_T}Sorry, I was not able to successfully run APXS. Possible reasons:" >&6 10192- echo "$as_me:$LINENO: result: " >&5 10193-echo "${ECHO_T}" >&6 10194- echo "$as_me:$LINENO: result: 1. Perl is not installed;" >&5 10195-echo "${ECHO_T}1. Perl is not installed;" >&6 10196- echo "$as_me:$LINENO: result: 2. Apache was not compiled with DSO support (--enable-module=so);" >&5 10197-echo "${ECHO_T}2. Apache was not compiled with DSO support (--enable-module=so);" >&6 10198- echo "$as_me:$LINENO: result: 3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&5 10199-echo "${ECHO_T}3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" >&6 10200- echo "$as_me:$LINENO: result: The output of $APXS follows" >&5 10201-echo "${ECHO_T}The output of $APXS follows" >&6 10202+ echo "$ac_t""" 1>&6 10203+ echo "$ac_t""" 1>&6 10204+ echo "$ac_t""Sorry, I was not able to successfully run APXS. Possible reasons:" 1>&6 10205+ echo "$ac_t""" 1>&6 10206+ echo "$ac_t""1. Perl is not installed;" 1>&6 10207+ echo "$ac_t""2. Apache was not compiled with DSO support (--enable-module=so);" 1>&6 10208+ echo "$ac_t""3. 'apxs' is not in your path. Try to use --with-apxs=/path/to/apxs" 1>&6 10209+ echo "$ac_t""The output of $APXS follows" 1>&6 10210 $APXS -q CFLAGS 10211- { { echo "$as_me:$LINENO: error: Aborting" >&5 10212-echo "$as_me: error: Aborting" >&2;} 10213- { (exit 1); exit 1; }; } 10214- fi 10215+ { echo "configure: error: Aborting" 1>&2; exit 1; } 10216+ fi 10217 10218 APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" 10219 APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR` 10220@@ -8485,7 +6974,7 @@ 10221 APACHE_INCLUDE=-I$APXS_INCLUDEDIR 10222 10223 # Test that we're trying to configure with apache 1.x 10224- 10225+ 10226 ac_output=`$APXS_HTTPD -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` 10227 ac_IFS=$IFS 10228 IFS="- /. 10229@@ -8496,9 +6985,7 @@ 10230 APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6` 10231 10232 if test "$APACHE_VERSION" -ge 2000000; then 10233- { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" >&5 10234-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" >&2;} 10235- { (exit 1); exit 1; }; } 10236+ { echo "configure: error: You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2" 1>&2; exit 1; } 10237 fi 10238 10239 for flag in $APXS_CFLAGS; do 10240@@ -8516,7 +7003,7 @@ 10241 ;; 10242 *darwin*) 10243 MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD" 10244- 10245+ 10246 PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS" 10247 10248 SAPI_SHARED=libs/libphp5.so 10249@@ -8527,33 +7014,34 @@ 10250 ;; 10251 esac 10252 10253- 10254- if test "$PHP_SAPI" != "default"; then 10255-{ { echo "$as_me:$LINENO: error: 10256-+--------------------------------------------------------------------+ 10257-| *** ATTENTION *** | 10258-| | 10259-| You've configured multiple SAPIs to be build. You can build only | 10260-| one SAPI module and CLI binary at the same time. | 10261-+--------------------------------------------------------------------+ 10262-" >&5 10263-echo "$as_me: error: 10264+ 10265+ if test "$build_type" = "program"; then 10266+ PHP_BINARIES="$PHP_BINARIES apache_hooks" 10267+ elif test "$PHP_SAPI" != "none"; then 10268+ { echo "configure: error: 10269 +--------------------------------------------------------------------+ 10270 | *** ATTENTION *** | 10271 | | 10272 | You've configured multiple SAPIs to be build. You can build only | 10273-| one SAPI module and CLI binary at the same time. | 10274+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 10275 +--------------------------------------------------------------------+ 10276-" >&2;} 10277- { (exit 1); exit 1; }; } 10278- fi 10279+" 1>&2; exit 1; } 10280+ else 10281+ PHP_SAPI=apache_hooks 10282+ fi 10283 10284- PHP_SAPI=apache_hooks 10285+ 10286+ 10287+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks" 10288+ 10289 10290- case "$build_type" in 10291- static) 10292 10293- OVERALL_TARGET=php 10294+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks" 10295+ 10296+ 10297+ case "$build_type" in 10298+ static) 10299+ 10300 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10301 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10302 php_c_post= 10303@@ -8575,14 +7063,11 @@ 10304 shared_cxx_post= 10305 shared_lo=lo 10306 10307- php_build_target=program 10308- 10309 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10310- php_build_target=static 10311+ php_sapi_module=static 10312 ;; 10313- shared) 10314- 10315- OVERALL_TARGET=php 10316+ shared) 10317+ 10318 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10319 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10320 php_c_post= 10321@@ -8604,11 +7089,9 @@ 10322 shared_cxx_post= 10323 shared_lo=lo 10324 10325- php_build_target=program 10326- 10327 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10328- php_build_target=shared 10329- 10330+ php_sapi_module=shared 10331+ 10332 php_c_pre=$shared_c_pre 10333 php_c_meta=$shared_c_meta 10334 php_c_post=$shared_c_post 10335@@ -8617,9 +7100,8 @@ 10336 php_cxx_post=$shared_cxx_post 10337 php_lo=$shared_lo 10338 ;; 10339- bundle) 10340- 10341- OVERALL_TARGET=php 10342+ bundle) 10343+ 10344 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10345 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10346 php_c_post= 10347@@ -8641,47 +7123,20 @@ 10348 shared_cxx_post= 10349 shared_lo=lo 10350 10351- php_build_target=program 10352- 10353 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 10354- php_build_target=static 10355-;; 10356- program) 10357- OVERALL_TARGET=php 10358- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10359- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10360- php_c_post= 10361- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10362- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 10363- php_cxx_post= 10364- php_lo=lo 10365- 10366- case $with_pic in 10367- yes) pic_setting='-prefer-pic';; 10368- no) pic_setting='-prefer-non-pic';; 10369- esac 10370- 10371- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10372- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 10373- shared_c_post= 10374- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10375- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 10376- shared_cxx_post= 10377- shared_lo=lo 10378- 10379- php_build_target=program 10380+ php_sapi_module=static 10381 ;; 10382- esac 10383- 10384- 10385- 10386+ esac 10387+ install_sapi="install-sapi" 10388+ 10389+ 10390 case sapi/apache_hooks in 10391 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 10392 /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 10393 *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 10394 esac 10395- 10396- 10397+ 10398+ 10399 10400 b_c_pre=$php_c_pre 10401 b_cxx_pre=$php_cxx_pre 10402@@ -8694,12 +7149,12 @@ 10403 10404 old_IFS=$IFS 10405 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 10406- 10407+ 10408 IFS=. 10409 set $ac_src 10410 ac_obj=$1 10411 IFS=$old_IFS 10412- 10413+ 10414 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 10415 10416 case $ac_src in 10417@@ -8716,6 +7171,7 @@ 10418 done 10419 10420 10421+ 10422 10423 10424 # Test whether apxs support -S option 10425@@ -8723,7 +7179,7 @@ 10426 10427 if test "$?" != "0"; then 10428 APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option 10429- else 10430+ else 10431 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` 10432 if test -z `$APXS -q SYSCONFDIR`; then 10433 APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ 10434@@ -8743,43 +7199,38 @@ 10435 PHP_APXS_BROKEN=yes 10436 fi 10437 STRONGHOLD= 10438- 10439-cat >>confdefs.h <<\_ACEOF 10440+ cat >> confdefs.h <<\EOF 10441 #define HAVE_AP_CONFIG_H 1 10442-_ACEOF 10443- 10444+EOF 10445 10446-cat >>confdefs.h <<\_ACEOF 10447+ cat >> confdefs.h <<\EOF 10448 #define HAVE_AP_COMPAT_H 1 10449-_ACEOF 10450- 10451+EOF 10452 10453-cat >>confdefs.h <<\_ACEOF 10454+ cat >> confdefs.h <<\EOF 10455 #define HAVE_APACHE_HOOKS 1 10456-_ACEOF 10457+EOF 10458 10459- echo "$as_me:$LINENO: result: yes" >&5 10460-echo "${ECHO_T}yes" >&6 10461+ echo "$ac_t""yes" 1>&6 10462 else 10463- echo "$as_me:$LINENO: result: no" >&5 10464-echo "${ECHO_T}no" >&6 10465+ echo "$ac_t""no" 1>&6 10466 fi 10467 10468 10469 php_with_apache_hooks_static=no 10470 10471 10472- 10473 # Check whether --with-apache-hooks-static or --without-apache-hooks-static was given. 10474 if test "${with_apache_hooks_static+set}" = set; then 10475 withval="$with_apache_hooks_static" 10476 PHP_APACHE_HOOKS_STATIC=$withval 10477 else 10478- 10479+ 10480 PHP_APACHE_HOOKS_STATIC=no 10481+ 10482 10483+fi 10484 10485-fi; 10486 10487 ext_output=$PHP_APACHE_HOOKS_STATIC 10488 10489@@ -8787,8 +7238,8 @@ 10490 10491 10492 10493-echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support" >&5 10494-echo $ECHO_N "checking for Apache 1.x (hooks) module support... $ECHO_C" >&6 10495+echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 10496+echo "configure:7243: checking for Apache 1.x (hooks) module support" >&5 10497 10498 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then 10499 10500@@ -8799,54 +7250,54 @@ 10501 10502 APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module" 10503 10504- 10505-cat >>confdefs.h <<\_ACEOF 10506+ cat >> confdefs.h <<\EOF 10507 #define HAVE_APACHE 1 10508-_ACEOF 10509+EOF 10510 10511 APACHE_HOOKS_MODULE=yes 10512- 10513+ 10514 if test -z "$PHP_APACHE_HOOKS_STATIC" || echo "$PHP_APACHE_HOOKS_STATIC" | grep '^/' >/dev/null ; then 10515 PHP_APACHE_HOOKS_STATIC=$PHP_APACHE_HOOKS_STATIC 10516 else 10517- 10518+ 10519 ep_dir="`echo $PHP_APACHE_HOOKS_STATIC|$SED 's%/*[^/][^/]*/*$%%'`" 10520- 10521+ 10522 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 10523 PHP_APACHE_HOOKS_STATIC="$ep_realdir/`basename \"$PHP_APACHE_HOOKS_STATIC\"`" 10524 fi 10525 10526 # For Apache 1.2.x 10527- if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then 10528+ if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then 10529 APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src 10530 APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src 10531- 10532- if test "$PHP_SAPI" != "default"; then 10533-{ { echo "$as_me:$LINENO: error: 10534-+--------------------------------------------------------------------+ 10535-| *** ATTENTION *** | 10536-| | 10537-| You've configured multiple SAPIs to be build. You can build only | 10538-| one SAPI module and CLI binary at the same time. | 10539-+--------------------------------------------------------------------+ 10540-" >&5 10541-echo "$as_me: error: 10542+ 10543+ if test "static" = "program"; then 10544+ PHP_BINARIES="$PHP_BINARIES apache_hooks" 10545+ elif test "$PHP_SAPI" != "none"; then 10546+ { echo "configure: error: 10547 +--------------------------------------------------------------------+ 10548 | *** ATTENTION *** | 10549 | | 10550 | You've configured multiple SAPIs to be build. You can build only | 10551-| one SAPI module and CLI binary at the same time. | 10552+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 10553 +--------------------------------------------------------------------+ 10554-" >&2;} 10555- { (exit 1); exit 1; }; } 10556- fi 10557+" 1>&2; exit 1; } 10558+ else 10559+ PHP_SAPI=apache_hooks 10560+ fi 10561+ 10562+ 10563+ 10564+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks" 10565+ 10566 10567- PHP_SAPI=apache_hooks 10568 10569- case "static" in 10570- static) 10571+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks" 10572 10573- OVERALL_TARGET=php 10574+ 10575+ case "static" in 10576+ static) 10577+ 10578 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10579 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10580 php_c_post= 10581@@ -8868,14 +7319,11 @@ 10582 shared_cxx_post= 10583 shared_lo=lo 10584 10585- php_build_target=program 10586- 10587 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10588- php_build_target=static 10589+ php_sapi_module=static 10590 ;; 10591- shared) 10592- 10593- OVERALL_TARGET=php 10594+ shared) 10595+ 10596 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10597 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10598 php_c_post= 10599@@ -8897,11 +7345,9 @@ 10600 shared_cxx_post= 10601 shared_lo=lo 10602 10603- php_build_target=program 10604- 10605 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10606- php_build_target=shared 10607- 10608+ php_sapi_module=shared 10609+ 10610 php_c_pre=$shared_c_pre 10611 php_c_meta=$shared_c_meta 10612 php_c_post=$shared_c_post 10613@@ -8910,9 +7356,8 @@ 10614 php_cxx_post=$shared_cxx_post 10615 php_lo=$shared_lo 10616 ;; 10617- bundle) 10618- 10619- OVERALL_TARGET=php 10620+ bundle) 10621+ 10622 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10623 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10624 php_c_post= 10625@@ -8934,47 +7379,20 @@ 10626 shared_cxx_post= 10627 shared_lo=lo 10628 10629- php_build_target=program 10630- 10631 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 10632- php_build_target=static 10633-;; 10634- program) 10635- OVERALL_TARGET=php 10636- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10637- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10638- php_c_post= 10639- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10640- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 10641- php_cxx_post= 10642- php_lo=lo 10643- 10644- case $with_pic in 10645- yes) pic_setting='-prefer-pic';; 10646- no) pic_setting='-prefer-non-pic';; 10647- esac 10648- 10649- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10650- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 10651- shared_c_post= 10652- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10653- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 10654- shared_cxx_post= 10655- shared_lo=lo 10656- 10657- php_build_target=program 10658+ php_sapi_module=static 10659 ;; 10660- esac 10661- 10662- 10663- 10664+ esac 10665+ install_sapi="install-sapi" 10666+ 10667+ 10668 case sapi/apache_hooks in 10669 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 10670 /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 10671 *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 10672 esac 10673- 10674- 10675+ 10676+ 10677 10678 b_c_pre=$php_c_pre 10679 b_cxx_pre=$php_cxx_pre 10680@@ -8987,12 +7405,12 @@ 10681 10682 old_IFS=$IFS 10683 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 10684- 10685+ 10686 IFS=. 10687 set $ac_src 10688 ac_obj=$1 10689 IFS=$old_IFS 10690- 10691+ 10692 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 10693 10694 case $ac_src in 10695@@ -9009,24 +7427,21 @@ 10696 done 10697 10698 10699+ 10700 10701 APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" 10702 PHP_LIBS="-L. -lphp3" 10703- echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5 10704-echo "${ECHO_T}yes - Apache 1.2.x" >&6 10705+ echo "$ac_t""yes - Apache 1.2.x" 1>&6 10706 STRONGHOLD= 10707 if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_config.h; then 10708- 10709-cat >>confdefs.h <<\_ACEOF 10710+ cat >> confdefs.h <<\EOF 10711 #define HAVE_AP_CONFIG_H 1 10712-_ACEOF 10713+EOF 10714 10715 fi 10716 # For Apache 2.0.x 10717 elif test -f $PHP_APACHE_HOOKS_STATIC/include/httpd.h && test -f $PHP_APACHE_HOOKS_STATIC/srclib/apr/include/apr_general.h ; then 10718- { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5 10719-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;} 10720- { (exit 1); exit 1; }; } 10721+ { echo "configure: error: Use --with-apxs2 with Apache 2.x!" 1>&2; exit 1; } 10722 # For Apache 1.3.x 10723 elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then 10724 APACHE_HAS_REGEX=1 10725@@ -9035,33 +7450,34 @@ 10726 if test ! -d $APACHE_TARGET; then 10727 mkdir $APACHE_TARGET 10728 fi 10729- 10730- if test "$PHP_SAPI" != "default"; then 10731-{ { echo "$as_me:$LINENO: error: 10732-+--------------------------------------------------------------------+ 10733-| *** ATTENTION *** | 10734-| | 10735-| You've configured multiple SAPIs to be build. You can build only | 10736-| one SAPI module and CLI binary at the same time. | 10737-+--------------------------------------------------------------------+ 10738-" >&5 10739-echo "$as_me: error: 10740+ 10741+ if test "static" = "program"; then 10742+ PHP_BINARIES="$PHP_BINARIES apache_hooks" 10743+ elif test "$PHP_SAPI" != "none"; then 10744+ { echo "configure: error: 10745 +--------------------------------------------------------------------+ 10746 | *** ATTENTION *** | 10747 | | 10748 | You've configured multiple SAPIs to be build. You can build only | 10749-| one SAPI module and CLI binary at the same time. | 10750+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 10751 +--------------------------------------------------------------------+ 10752-" >&2;} 10753- { (exit 1); exit 1; }; } 10754- fi 10755+" 1>&2; exit 1; } 10756+ else 10757+ PHP_SAPI=apache_hooks 10758+ fi 10759 10760- PHP_SAPI=apache_hooks 10761+ 10762+ 10763+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks" 10764+ 10765 10766- case "static" in 10767- static) 10768 10769- OVERALL_TARGET=php 10770+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks" 10771+ 10772+ 10773+ case "static" in 10774+ static) 10775+ 10776 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10777 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10778 php_c_post= 10779@@ -9083,14 +7499,11 @@ 10780 shared_cxx_post= 10781 shared_lo=lo 10782 10783- php_build_target=program 10784- 10785 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10786- php_build_target=static 10787+ php_sapi_module=static 10788 ;; 10789- shared) 10790- 10791- OVERALL_TARGET=php 10792+ shared) 10793+ 10794 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10795 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10796 php_c_post= 10797@@ -9112,11 +7525,9 @@ 10798 shared_cxx_post= 10799 shared_lo=lo 10800 10801- php_build_target=program 10802- 10803 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10804- php_build_target=shared 10805- 10806+ php_sapi_module=shared 10807+ 10808 php_c_pre=$shared_c_pre 10809 php_c_meta=$shared_c_meta 10810 php_c_post=$shared_c_post 10811@@ -9125,9 +7536,8 @@ 10812 php_cxx_post=$shared_cxx_post 10813 php_lo=$shared_lo 10814 ;; 10815- bundle) 10816- 10817- OVERALL_TARGET=php 10818+ bundle) 10819+ 10820 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10821 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10822 php_c_post= 10823@@ -9149,47 +7559,20 @@ 10824 shared_cxx_post= 10825 shared_lo=lo 10826 10827- php_build_target=program 10828- 10829 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 10830- php_build_target=static 10831-;; 10832- program) 10833- OVERALL_TARGET=php 10834- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10835- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10836- php_c_post= 10837- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10838- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 10839- php_cxx_post= 10840- php_lo=lo 10841- 10842- case $with_pic in 10843- yes) pic_setting='-prefer-pic';; 10844- no) pic_setting='-prefer-non-pic';; 10845- esac 10846- 10847- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10848- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 10849- shared_c_post= 10850- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 10851- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 10852- shared_cxx_post= 10853- shared_lo=lo 10854- 10855- php_build_target=program 10856+ php_sapi_module=static 10857 ;; 10858- esac 10859- 10860- 10861- 10862+ esac 10863+ install_sapi="install-sapi" 10864+ 10865+ 10866 case sapi/apache_hooks in 10867 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 10868 /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 10869 *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 10870 esac 10871- 10872- 10873+ 10874+ 10875 10876 b_c_pre=$php_c_pre 10877 b_cxx_pre=$php_cxx_pre 10878@@ -9202,12 +7585,12 @@ 10879 10880 old_IFS=$IFS 10881 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 10882- 10883+ 10884 IFS=. 10885 set $ac_src 10886 ac_obj=$1 10887 IFS=$old_IFS 10888- 10889+ 10890 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 10891 10892 case $ac_src in 10893@@ -9224,35 +7607,30 @@ 10894 done 10895 10896 10897+ 10898 10899 APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" 10900 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 10901- echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5 10902-echo "${ECHO_T}yes - Apache 1.3.x" >&6 10903+ echo "$ac_t""yes - Apache 1.3.x" 1>&6 10904 STRONGHOLD= 10905 if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then 10906- 10907-cat >>confdefs.h <<\_ACEOF 10908+ cat >> confdefs.h <<\EOF 10909 #define HAVE_AP_CONFIG_H 1 10910-_ACEOF 10911+EOF 10912 10913 fi 10914 if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then 10915- 10916-cat >>confdefs.h <<\_ACEOF 10917+ cat >> confdefs.h <<\EOF 10918 #define HAVE_AP_COMPAT_H 1 10919-_ACEOF 10920+EOF 10921 10922 if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then 10923- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 10924-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 10925- { (exit 1); exit 1; }; } 10926+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 10927 fi 10928 elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then 10929- 10930-cat >>confdefs.h <<\_ACEOF 10931+ cat >> confdefs.h <<\EOF 10932 #define HAVE_OLD_COMPAT_H 1 10933-_ACEOF 10934+EOF 10935 10936 fi 10937 # Also for Apache 1.3.x 10938@@ -9263,33 +7641,34 @@ 10939 if test ! -d $APACHE_TARGET; then 10940 mkdir $APACHE_TARGET 10941 fi 10942- 10943- if test "$PHP_SAPI" != "default"; then 10944-{ { echo "$as_me:$LINENO: error: 10945+ 10946+ if test "static" = "program"; then 10947+ PHP_BINARIES="$PHP_BINARIES apache_hooks" 10948+ elif test "$PHP_SAPI" != "none"; then 10949+ { echo "configure: error: 10950 +--------------------------------------------------------------------+ 10951 | *** ATTENTION *** | 10952 | | 10953 | You've configured multiple SAPIs to be build. You can build only | 10954-| one SAPI module and CLI binary at the same time. | 10955+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 10956 +--------------------------------------------------------------------+ 10957-" >&5 10958-echo "$as_me: error: 10959-+--------------------------------------------------------------------+ 10960-| *** ATTENTION *** | 10961-| | 10962-| You've configured multiple SAPIs to be build. You can build only | 10963-| one SAPI module and CLI binary at the same time. | 10964-+--------------------------------------------------------------------+ 10965-" >&2;} 10966- { (exit 1); exit 1; }; } 10967- fi 10968+" 1>&2; exit 1; } 10969+ else 10970+ PHP_SAPI=apache_hooks 10971+ fi 10972+ 10973+ 10974+ 10975+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks" 10976+ 10977 10978- PHP_SAPI=apache_hooks 10979 10980- case "static" in 10981- static) 10982+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks" 10983 10984- OVERALL_TARGET=php 10985+ 10986+ case "static" in 10987+ static) 10988+ 10989 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 10990 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 10991 php_c_post= 10992@@ -9311,14 +7690,11 @@ 10993 shared_cxx_post= 10994 shared_lo=lo 10995 10996- php_build_target=program 10997- 10998 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 10999- php_build_target=static 11000+ php_sapi_module=static 11001 ;; 11002- shared) 11003- 11004- OVERALL_TARGET=php 11005+ shared) 11006+ 11007 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11008 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11009 php_c_post= 11010@@ -9340,11 +7716,9 @@ 11011 shared_cxx_post= 11012 shared_lo=lo 11013 11014- php_build_target=program 11015- 11016 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 11017- php_build_target=shared 11018- 11019+ php_sapi_module=shared 11020+ 11021 php_c_pre=$shared_c_pre 11022 php_c_meta=$shared_c_meta 11023 php_c_post=$shared_c_post 11024@@ -9353,9 +7727,8 @@ 11025 php_cxx_post=$shared_cxx_post 11026 php_lo=$shared_lo 11027 ;; 11028- bundle) 11029- 11030- OVERALL_TARGET=php 11031+ bundle) 11032+ 11033 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11034 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11035 php_c_post= 11036@@ -9377,47 +7750,20 @@ 11037 shared_cxx_post= 11038 shared_lo=lo 11039 11040- php_build_target=program 11041- 11042 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 11043- php_build_target=static 11044-;; 11045- program) 11046- OVERALL_TARGET=php 11047- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11048- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11049- php_c_post= 11050- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11051- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 11052- php_cxx_post= 11053- php_lo=lo 11054- 11055- case $with_pic in 11056- yes) pic_setting='-prefer-pic';; 11057- no) pic_setting='-prefer-non-pic';; 11058- esac 11059- 11060- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11061- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 11062- shared_c_post= 11063- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11064- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 11065- shared_cxx_post= 11066- shared_lo=lo 11067- 11068- php_build_target=program 11069+ php_sapi_module=static 11070 ;; 11071- esac 11072- 11073- 11074- 11075+ esac 11076+ install_sapi="install-sapi" 11077+ 11078+ 11079 case sapi/apache_hooks in 11080 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 11081 /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 11082 *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 11083 esac 11084- 11085- 11086+ 11087+ 11088 11089 b_c_pre=$php_c_pre 11090 b_cxx_pre=$php_cxx_pre 11091@@ -9430,12 +7776,12 @@ 11092 11093 old_IFS=$IFS 11094 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 11095- 11096+ 11097 IFS=. 11098 set $ac_src 11099 ac_obj=$1 11100 IFS=$old_IFS 11101- 11102+ 11103 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 11104 11105 case $ac_src in 11106@@ -9452,68 +7798,64 @@ 11107 done 11108 11109 11110+ 11111 11112 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 11113 APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir" 11114- echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5 11115-echo "${ECHO_T}yes - Apache 1.3.x" >&6 11116+ echo "$ac_t""yes - Apache 1.3.x" 1>&6 11117 STRONGHOLD= 11118 if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then 11119- 11120-cat >>confdefs.h <<\_ACEOF 11121+ cat >> confdefs.h <<\EOF 11122 #define HAVE_AP_CONFIG_H 1 11123-_ACEOF 11124+EOF 11125 11126 fi 11127 if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then 11128- 11129-cat >>confdefs.h <<\_ACEOF 11130+ cat >> confdefs.h <<\EOF 11131 #define HAVE_AP_COMPAT_H 1 11132-_ACEOF 11133+EOF 11134 11135 if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then 11136- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 11137-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 11138- { (exit 1); exit 1; }; } 11139+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 11140 fi 11141 elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then 11142- 11143-cat >>confdefs.h <<\_ACEOF 11144+ cat >> confdefs.h <<\EOF 11145 #define HAVE_OLD_COMPAT_H 1 11146-_ACEOF 11147+EOF 11148 11149 fi 11150 # For StrongHold 2.2 11151 elif test -f $PHP_APACHE_HOOKS_STATIC/apache/httpd.h; then 11152 APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include" 11153 APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache 11154- 11155- if test "$PHP_SAPI" != "default"; then 11156-{ { echo "$as_me:$LINENO: error: 11157-+--------------------------------------------------------------------+ 11158-| *** ATTENTION *** | 11159-| | 11160-| You've configured multiple SAPIs to be build. You can build only | 11161-| one SAPI module and CLI binary at the same time. | 11162-+--------------------------------------------------------------------+ 11163-" >&5 11164-echo "$as_me: error: 11165+ 11166+ if test "static" = "program"; then 11167+ PHP_BINARIES="$PHP_BINARIES apache_hooks" 11168+ elif test "$PHP_SAPI" != "none"; then 11169+ { echo "configure: error: 11170 +--------------------------------------------------------------------+ 11171 | *** ATTENTION *** | 11172 | | 11173 | You've configured multiple SAPIs to be build. You can build only | 11174-| one SAPI module and CLI binary at the same time. | 11175+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 11176 +--------------------------------------------------------------------+ 11177-" >&2;} 11178- { (exit 1); exit 1; }; } 11179- fi 11180+" 1>&2; exit 1; } 11181+ else 11182+ PHP_SAPI=apache_hooks 11183+ fi 11184 11185- PHP_SAPI=apache_hooks 11186+ 11187+ 11188+ BUILD_DIR="$BUILD_DIR sapi/apache_hooks" 11189+ 11190 11191- case "static" in 11192- static) 11193 11194- OVERALL_TARGET=php 11195+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS apache_hooks" 11196+ 11197+ 11198+ case "static" in 11199+ static) 11200+ 11201 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11202 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11203 php_c_post= 11204@@ -9535,14 +7877,11 @@ 11205 shared_cxx_post= 11206 shared_lo=lo 11207 11208- php_build_target=program 11209- 11210 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 11211- php_build_target=static 11212+ php_sapi_module=static 11213 ;; 11214- shared) 11215- 11216- OVERALL_TARGET=php 11217+ shared) 11218+ 11219 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11220 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11221 php_c_post= 11222@@ -9564,11 +7903,9 @@ 11223 shared_cxx_post= 11224 shared_lo=lo 11225 11226- php_build_target=program 11227- 11228 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 11229- php_build_target=shared 11230- 11231+ php_sapi_module=shared 11232+ 11233 php_c_pre=$shared_c_pre 11234 php_c_meta=$shared_c_meta 11235 php_c_post=$shared_c_post 11236@@ -9577,9 +7914,8 @@ 11237 php_cxx_post=$shared_cxx_post 11238 php_lo=$shared_lo 11239 ;; 11240- bundle) 11241- 11242- OVERALL_TARGET=php 11243+ bundle) 11244+ 11245 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11246 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11247 php_c_post= 11248@@ -9601,47 +7937,20 @@ 11249 shared_cxx_post= 11250 shared_lo=lo 11251 11252- php_build_target=program 11253- 11254 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 11255- php_build_target=static 11256-;; 11257- program) 11258- OVERALL_TARGET=php 11259- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11260- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11261- php_c_post= 11262- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11263- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 11264- php_cxx_post= 11265- php_lo=lo 11266- 11267- case $with_pic in 11268- yes) pic_setting='-prefer-pic';; 11269- no) pic_setting='-prefer-non-pic';; 11270- esac 11271- 11272- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11273- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 11274- shared_c_post= 11275- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11276- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 11277- shared_cxx_post= 11278- shared_lo=lo 11279- 11280- php_build_target=program 11281+ php_sapi_module=static 11282 ;; 11283- esac 11284- 11285- 11286- 11287+ esac 11288+ install_sapi="install-sapi" 11289+ 11290+ 11291 case sapi/apache_hooks in 11292 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 11293 /*) ac_srcdir=`echo "sapi/apache_hooks"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 11294 *) ac_srcdir="$abs_srcdir/sapi/apache_hooks/"; ac_bdir="sapi/apache_hooks/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 11295 esac 11296- 11297- 11298+ 11299+ 11300 11301 b_c_pre=$php_c_pre 11302 b_cxx_pre=$php_cxx_pre 11303@@ -9654,12 +7963,12 @@ 11304 11305 old_IFS=$IFS 11306 for ac_src in sapi_apache.c mod_php5.c php_apache.c; do 11307- 11308+ 11309 IFS=. 11310 set $ac_src 11311 ac_obj=$1 11312 IFS=$old_IFS 11313- 11314+ 11315 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 11316 11317 case $ac_src in 11318@@ -9676,47 +7985,38 @@ 11319 done 11320 11321 11322+ 11323 11324 PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5" 11325 APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET" 11326 STRONGHOLD=-DSTRONGHOLD=1 11327- echo "$as_me:$LINENO: result: yes - StrongHold" >&5 11328-echo "${ECHO_T}yes - StrongHold" >&6 11329+ echo "$ac_t""yes - StrongHold" 1>&6 11330 if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then 11331- 11332-cat >>confdefs.h <<\_ACEOF 11333+ cat >> confdefs.h <<\EOF 11334 #define HAVE_AP_CONFIG_H 1 11335-_ACEOF 11336+EOF 11337 11338 fi 11339 if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_compat.h; then 11340- 11341-cat >>confdefs.h <<\_ACEOF 11342+ cat >> confdefs.h <<\EOF 11343 #define HAVE_AP_COMPAT_H 1 11344-_ACEOF 11345+EOF 11346 11347 if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then 11348- { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5 11349-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;} 11350- { (exit 1); exit 1; }; } 11351+ { echo "configure: error: Please run Apache\'s configure or src/Configure program once and try again" 1>&2; exit 1; } 11352 fi 11353 elif test -f $PHP_APACHE_HOOKS_STATIC/src/compat.h; then 11354- 11355-cat >>confdefs.h <<\_ACEOF 11356+ cat >> confdefs.h <<\EOF 11357 #define HAVE_OLD_COMPAT_H 1 11358-_ACEOF 11359+EOF 11360 11361 fi 11362 else 11363- echo "$as_me:$LINENO: result: no" >&5 11364-echo "${ECHO_T}no" >&6 11365- { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&5 11366-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&2;} 11367- { (exit 1); exit 1; }; } 11368+ echo "$ac_t""no" 1>&6 11369+ { echo "configure: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" 1>&2; exit 1; } 11370 fi 11371 else 11372- echo "$as_me:$LINENO: result: no" >&5 11373-echo "${ECHO_T}no" >&6 11374+ echo "$ac_t""no" 1>&6 11375 fi 11376 11377 # compatibility 11378@@ -9727,45 +8027,44 @@ 11379 11380 php_enable_mod_charset=no 11381 11382-echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5 11383-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6 11384+echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 11385+echo "configure:8032: checking whether to enable Apache charset compatibility option" >&5 11386 # Check whether --enable-mod-charset or --disable-mod-charset was given. 11387 if test "${enable_mod_charset+set}" = set; then 11388 enableval="$enable_mod_charset" 11389 PHP_MOD_CHARSET=$enableval 11390 else 11391- 11392+ 11393 PHP_MOD_CHARSET=no 11394+ 11395 11396+fi 11397 11398-fi; 11399 11400 ext_output=$PHP_MOD_CHARSET 11401-echo "$as_me:$LINENO: result: $ext_output" >&5 11402-echo "${ECHO_T}$ext_output" >&6 11403+echo "$ac_t""$ext_output" 1>&6 11404 11405 11406 11407 11408 if test "$PHP_MOD_CHARSET" = "yes"; then 11409- 11410-cat >>confdefs.h <<\_ACEOF 11411+ cat >> confdefs.h <<\EOF 11412 #define USE_TRANSFER_TABLES 1 11413-_ACEOF 11414+EOF 11415 11416 fi 11417 11418 if test "$APACHE_HOOKS_MODULE" = "yes"; then 11419- 11420+ 11421 if test -n "$GCC"; then 11422- 11423+ 11424 gcc_arg_name=ac_cv_gcc_arg_rdynamic 11425- echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5 11426-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6 11427-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then 11428- echo $ECHO_N "(cached) $ECHO_C" >&6 11429+ echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 11430+echo "configure:8064: checking whether $CC supports -rdynamic" >&5 11431+if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then 11432+ echo $ac_n "(cached) $ac_c" 1>&6 11433 else 11434- 11435+ 11436 echo 'void somefunc() { };' > conftest.c 11437 cmd='$CC -rdynamic -c conftest.c' 11438 if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then 11439@@ -9775,15 +8074,15 @@ 11440 fi 11441 eval $gcc_arg_name=$ac_result 11442 rm -f conftest.* 11443- 11444+ 11445 fi 11446-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5 11447-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6 11448+ 11449+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 11450 if eval test "\$$gcc_arg_name" = "yes"; then 11451 gcc_rdynamic=yes 11452 else 11453 : 11454- 11455+ 11456 fi 11457 11458 if test "$gcc_rdynamic" = "yes"; then 11459@@ -9792,7 +8091,7 @@ 11460 fi 11461 11462 $php_shtool mkdir -p sapi/apache_hooks 11463- 11464+ 11465 PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/apache_hooks/libphp5.module" 11466 11467 fi 11468@@ -9802,99 +8101,71 @@ 11469 APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp 11470 fi 11471 11472- 11473-echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5 11474-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6 11475-if test "${ac_cv_php_fd_in_buff+set}" = set; then 11476- echo $ECHO_N "(cached) $ECHO_C" >&6 11477+ 11478+echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 11479+echo "configure:8107: checking for member fd in BUFF *" >&5 11480+if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then 11481+ echo $ac_n "(cached) $ac_c" 1>&6 11482 else 11483- 11484+ 11485 save=$CPPFLAGS 11486 if test -n "$APXS_INCLUDEDIR"; then 11487 CPPFLAGS="$CPPFLAGS -I$APXS_INCLUDEDIR" 11488 else 11489 CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" 11490 fi 11491- cat >conftest.$ac_ext <<_ACEOF 11492-/* confdefs.h. */ 11493-_ACEOF 11494-cat confdefs.h >>conftest.$ac_ext 11495-cat >>conftest.$ac_ext <<_ACEOF 11496-/* end confdefs.h. */ 11497+ cat > conftest.$ac_ext <<EOF 11498+#line 8119 "configure" 11499+#include "confdefs.h" 11500 #include <httpd.h> 11501-int 11502-main () 11503-{ 11504+int main() { 11505 conn_rec *c; int fd = c->client->fd; 11506- ; 11507- return 0; 11508-} 11509-_ACEOF 11510-rm -f conftest.$ac_objext 11511-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 11512- (eval $ac_compile) 2>conftest.er1 11513- ac_status=$? 11514- grep -v '^ *+' conftest.er1 >conftest.err 11515- rm -f conftest.er1 11516- cat conftest.err >&5 11517- echo "$as_me:$LINENO: \$? = $ac_status" >&5 11518- (exit $ac_status); } && 11519- { ac_try='test -z "$ac_c_werror_flag" 11520- || test ! -s conftest.err' 11521- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11522- (eval $ac_try) 2>&5 11523- ac_status=$? 11524- echo "$as_me:$LINENO: \$? = $ac_status" >&5 11525- (exit $ac_status); }; } && 11526- { ac_try='test -s conftest.$ac_objext' 11527- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 11528- (eval $ac_try) 2>&5 11529- ac_status=$? 11530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 11531- (exit $ac_status); }; }; then 11532- 11533+; return 0; } 11534+EOF 11535+if { (eval echo configure:8126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 11536+ rm -rf conftest* 11537+ 11538 ac_cv_php_fd_in_buff=yes 11539 else 11540- echo "$as_me: failed program was:" >&5 11541-sed 's/^/| /' conftest.$ac_ext >&5 11542- 11543-ac_cv_php_fd_in_buff=no 11544+ echo "configure: failed program was:" >&5 11545+ cat conftest.$ac_ext >&5 11546+ rm -rf conftest* 11547+ ac_cv_php_fd_in_buff=no 11548 fi 11549-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 11550+rm -f conftest* 11551 CPPFLAGS=$save 11552 11553 fi 11554-echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5 11555-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6 11556-if test "$ac_cv_php_fd_in_buff" = "yes"; then 11557 11558-cat >>confdefs.h <<\_ACEOF 11559+echo "$ac_t""$ac_cv_php_fd_in_buff" 1>&6 11560+if test "$ac_cv_php_fd_in_buff" = "yes"; then 11561+ cat >> confdefs.h <<\EOF 11562 #define PHP_APACHE_HAVE_CLIENT_FD 1 11563-_ACEOF 11564+EOF 11565 11566 fi 11567 11568 INSTALL_IT=$APACHE_HOOKS_INSTALL 11569 11570- 11571+ 11572 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_EXP" 11573 11574- 11575+ 11576 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_INCLUDE" 11577 11578- 11579+ 11580 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_TARGET" 11581 11582- 11583+ 11584 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" 11585 11586- 11587+ 11588 PHP_VAR_SUBST="$PHP_VAR_SUBST APXS_LDFLAGS" 11589 11590- 11591+ 11592 PHP_VAR_SUBST="$PHP_VAR_SUBST APACHE_HOOKS_INSTALL" 11593 11594- 11595+ 11596 PHP_VAR_SUBST="$PHP_VAR_SUBST STRONGHOLD" 11597 11598 fi 11599@@ -9906,17 +8177,17 @@ 11600 php_with_caudium=no 11601 11602 11603- 11604 # Check whether --with-caudium or --without-caudium was given. 11605 if test "${with_caudium+set}" = set; then 11606 withval="$with_caudium" 11607 PHP_CAUDIUM=$withval 11608 else 11609- 11610+ 11611 PHP_CAUDIUM=no 11612+ 11613 11614+fi 11615 11616-fi; 11617 11618 ext_output=$PHP_CAUDIUM 11619 11620@@ -9924,8 +8195,8 @@ 11621 11622 11623 11624-echo "$as_me:$LINENO: checking for Caudium support" >&5 11625-echo $ECHO_N "checking for Caudium support... $ECHO_C" >&6 11626+echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 11627+echo "configure:8200: checking for Caudium support" >&5 11628 11629 if test "$PHP_CAUDIUM" != "no"; then 11630 if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi 11631@@ -9941,20 +8212,15 @@ 11632 elif test -f $PHP_CAUDIUM/bin/pike; then 11633 PIKE=$PHP_CAUDIUM/bin/pike 11634 else 11635- { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&5 11636-echo "$as_me: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&2;} 11637- { (exit 1); exit 1; }; } 11638+ { echo "configure: error: Could not find a pike in $PHP_CAUDIUM/bin/" 1>&2; exit 1; } 11639 fi 11640 if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then 11641 PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` 11642 PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' ` 11643 if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then 11644- { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5 11645-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;} 11646- { (exit 1); exit 1; }; } 11647+ { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; } 11648 fi 11649- echo "$as_me:$LINENO: result: yes" >&5 11650-echo "${ECHO_T}yes" >&6 11651+ echo "$ac_t""yes" 1>&6 11652 PIKE=`echo $PIKE | pike -e 'int tries=100; 11653 string orig,pike=Stdio.File("stdin")->read()-"\n"; 11654 orig=pike; 11655@@ -9963,33 +8229,33 @@ 11656 while(!catch(pike=readlink(pike)) && tries--) 11657 ; 11658 write(combine_path(dirname(orig), pike)); '` 11659- 11660+ 11661 if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then 11662- 11663+ 11664 if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then 11665 ai_p=$PIKE_INCLUDE_DIR 11666 else 11667- 11668+ 11669 ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 11670- 11671+ 11672 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 11673 ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`" 11674 fi 11675 11676- 11677- 11678+ 11679+ 11680 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 11681- 11682+ 11683 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 11684 if test -n "$unique" && test "`eval $cmd`" = "" ; then 11685 eval "INCLUDEPATH$unique=set" 11686- 11687+ 11688 if test ""; then 11689 INCLUDES="-I$ai_p $INCLUDES" 11690 else 11691 INCLUDES="$INCLUDES -I$ai_p" 11692 fi 11693- 11694+ 11695 fi 11696 11697 fi 11698@@ -9999,8 +8265,8 @@ 11699 else 11700 PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` 11701 fi 11702- echo "$as_me:$LINENO: checking for C includes in $PIKE_C_INCLUDE" >&5 11703-echo $ECHO_N "checking for C includes in $PIKE_C_INCLUDE... $ECHO_C" >&6 11704+ echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6 11705+echo "configure:8270: checking for C includes in $PIKE_C_INCLUDE" >&5 11706 if test -f $PIKE_C_INCLUDE/version.h; then 11707 PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` 11708 ###### VERSION MATCH CHECK ####### 11709@@ -10023,86 +8289,81 @@ 11710 fi 11711 11712 if test "$PIKE_TEST_VER" = "${PIKE_CMAJOR_VERSION}.${PIKE_CMINOR_VERSION}.${PIKE_CBUILD_VERSION}"; then 11713- 11714+ 11715 if test "$PIKE_C_INCLUDE" != "/usr/include"; then 11716- 11717+ 11718 if test -z "$PIKE_C_INCLUDE" || echo "$PIKE_C_INCLUDE" | grep '^/' >/dev/null ; then 11719 ai_p=$PIKE_C_INCLUDE 11720 else 11721- 11722+ 11723 ep_dir="`echo $PIKE_C_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 11724- 11725+ 11726 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 11727 ai_p="$ep_realdir/`basename \"$PIKE_C_INCLUDE\"`" 11728 fi 11729 11730- 11731- 11732+ 11733+ 11734 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 11735- 11736+ 11737 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 11738 if test -n "$unique" && test "`eval $cmd`" = "" ; then 11739 eval "INCLUDEPATH$unique=set" 11740- 11741+ 11742 if test ""; then 11743 INCLUDES="-I$ai_p $INCLUDES" 11744 else 11745 INCLUDES="$INCLUDES -I$ai_p" 11746 fi 11747- 11748+ 11749 fi 11750 11751 fi 11752 11753 PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE" 11754- echo "$as_me:$LINENO: result: found" >&5 11755-echo "${ECHO_T}found" >&6 11756+ echo "$ac_t""found" 1>&6 11757 else 11758- echo "$as_me:$LINENO: result: version mismatch" >&5 11759-echo "${ECHO_T}version mismatch" >&6 11760+ echo "$ac_t""version mismatch" 1>&6 11761 fi 11762 else 11763- echo "$as_me:$LINENO: result: not found" >&5 11764-echo "${ECHO_T}not found" >&6 11765+ echo "$ac_t""not found" 1>&6 11766 fi 11767 else 11768- { { echo "$as_me:$LINENO: error: Caudium PHP5 requires Pike 7.0 or newer" >&5 11769-echo "$as_me: error: Caudium PHP5 requires Pike 7.0 or newer" >&2;} 11770- { (exit 1); exit 1; }; } 11771+ { echo "configure: error: Caudium PHP5 requires Pike 7.0 or newer" 1>&2; exit 1; } 11772 fi 11773- PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` 11774- 11775-cat >>confdefs.h <<\_ACEOF 11776+ PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` 11777+ cat >> confdefs.h <<\EOF 11778 #define HAVE_CAUDIUM 1 11779-_ACEOF 11780- 11781+EOF 11782 11783- if test "$PHP_SAPI" != "default"; then 11784-{ { echo "$as_me:$LINENO: error: 11785-+--------------------------------------------------------------------+ 11786-| *** ATTENTION *** | 11787-| | 11788-| You've configured multiple SAPIs to be build. You can build only | 11789-| one SAPI module and CLI binary at the same time. | 11790-+--------------------------------------------------------------------+ 11791-" >&5 11792-echo "$as_me: error: 11793+ 11794+ if test "shared" = "program"; then 11795+ PHP_BINARIES="$PHP_BINARIES caudium" 11796+ elif test "$PHP_SAPI" != "none"; then 11797+ { echo "configure: error: 11798 +--------------------------------------------------------------------+ 11799 | *** ATTENTION *** | 11800 | | 11801 | You've configured multiple SAPIs to be build. You can build only | 11802-| one SAPI module and CLI binary at the same time. | 11803+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 11804 +--------------------------------------------------------------------+ 11805-" >&2;} 11806- { (exit 1); exit 1; }; } 11807- fi 11808+" 1>&2; exit 1; } 11809+ else 11810+ PHP_SAPI=caudium 11811+ fi 11812 11813- PHP_SAPI=caudium 11814+ 11815+ 11816+ BUILD_DIR="$BUILD_DIR sapi/caudium" 11817+ 11818 11819- case "shared" in 11820- static) 11821 11822- OVERALL_TARGET=php 11823+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS caudium" 11824+ 11825+ 11826+ case "shared" in 11827+ static) 11828+ 11829 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11830 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11831 php_c_post= 11832@@ -10124,14 +8385,11 @@ 11833 shared_cxx_post= 11834 shared_lo=lo 11835 11836- php_build_target=program 11837- 11838 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 11839- php_build_target=static 11840+ php_sapi_module=static 11841 ;; 11842- shared) 11843- 11844- OVERALL_TARGET=php 11845+ shared) 11846+ 11847 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11848 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11849 php_c_post= 11850@@ -10153,11 +8411,9 @@ 11851 shared_cxx_post= 11852 shared_lo=lo 11853 11854- php_build_target=program 11855- 11856 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 11857- php_build_target=shared 11858- 11859+ php_sapi_module=shared 11860+ 11861 php_c_pre=$shared_c_pre 11862 php_c_meta=$shared_c_meta 11863 php_c_post=$shared_c_post 11864@@ -10166,9 +8422,8 @@ 11865 php_cxx_post=$shared_cxx_post 11866 php_lo=$shared_lo 11867 ;; 11868- bundle) 11869- 11870- OVERALL_TARGET=php 11871+ bundle) 11872+ 11873 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11874 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11875 php_c_post= 11876@@ -10190,47 +8445,20 @@ 11877 shared_cxx_post= 11878 shared_lo=lo 11879 11880- php_build_target=program 11881- 11882 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 11883- php_build_target=static 11884-;; 11885- program) 11886- OVERALL_TARGET=php 11887- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11888- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 11889- php_c_post= 11890- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11891- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 11892- php_cxx_post= 11893- php_lo=lo 11894- 11895- case $with_pic in 11896- yes) pic_setting='-prefer-pic';; 11897- no) pic_setting='-prefer-non-pic';; 11898- esac 11899- 11900- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 11901- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 11902- shared_c_post= 11903- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 11904- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 11905- shared_cxx_post= 11906- shared_lo=lo 11907- 11908- php_build_target=program 11909+ php_sapi_module=static 11910 ;; 11911- esac 11912- 11913- 11914- 11915+ esac 11916+ install_sapi="install-sapi" 11917+ 11918+ 11919 case sapi/caudium in 11920 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 11921 /*) ac_srcdir=`echo "sapi/caudium"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 11922 *) ac_srcdir="$abs_srcdir/sapi/caudium/"; ac_bdir="sapi/caudium/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 11923 esac 11924- 11925- 11926+ 11927+ 11928 11929 b_c_pre=$php_c_pre 11930 b_cxx_pre=$php_cxx_pre 11931@@ -10243,12 +8471,12 @@ 11932 11933 old_IFS=$IFS 11934 for ac_src in caudium.c; do 11935- 11936+ 11937 IFS=. 11938 set $ac_src 11939 ac_obj=$1 11940 IFS=$old_IFS 11941- 11942+ 11943 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 11944 11945 case $ac_src in 11946@@ -10265,22 +8493,20 @@ 11947 done 11948 11949 11950+ 11951 11952 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so" 11953 RESULT=" *** Pike binary used: $PIKE 11954 *** Pike include dir(s) used: $PIKE_INCLUDE_DIR 11955 *** Pike version: $PIKE_VERSION" 11956- 11957+ 11958 enable_maintainer_zts=yes 11959 if test "$pthreads_working" != "yes"; then 11960- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 11961-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 11962- { (exit 1); exit 1; }; } 11963+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 11964 fi 11965 11966 fi 11967-echo "$as_me:$LINENO: result: $RESULT" >&5 11968-echo "${ECHO_T}$RESULT" >&6 11969+echo "$ac_t""$RESULT" 1>&6 11970 11971 11972 11973@@ -10293,11 +8519,12 @@ 11974 enableval="$enable_cli" 11975 PHP_CLI=$enableval 11976 else 11977- 11978+ 11979 PHP_CLI=yes 11980+ 11981 11982+fi 11983 11984-fi; 11985 11986 ext_output=$PHP_CLI 11987 11988@@ -10305,123 +8532,44 @@ 11989 11990 11991 11992-echo "$as_me:$LINENO: checking for CLI build" >&5 11993-echo $ECHO_N "checking for CLI build... $ECHO_C" >&6 11994+echo $ac_n "checking for CLI build""... $ac_c" 1>&6 11995+echo "configure:8537: checking for CLI build" >&5 11996 if test "$PHP_CLI" != "no"; then 11997- 11998+ 11999 src=$abs_srcdir/sapi/cli/Makefile.frag 12000- ac_srcdir=$abs_srcdir/sapi/cli 12001- ac_builddir=sapi/cli 12002+ ac_srcdir=$ext_srcdir 12003+ ac_builddir=$ext_builddir 12004 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 12005 12006- SAPI_CLI_PATH=sapi/cli/php 12007- 12008- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH" 12009- 12010- 12011- case $host_alias in 12012- *aix*) 12013- if test "$php_build_target" = "shared"; then 12014- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12015- else 12016- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12017- fi 12018- ;; 12019- *darwin*) 12020- BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12021- ;; 12022- *netware*) 12023- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" 12024- ;; 12025- *) 12026- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12027- ;; 12028- esac 12029- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" 12030- 12031- 12032- PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI" 12033- 12034- 12035- PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_CLI" 12036- 12037- 12038- PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1" 12039- 12040-fi 12041-echo "$as_me:$LINENO: result: $PHP_CLI" >&5 12042-echo "${ECHO_T}$PHP_CLI" >&6 12043- 12044- 12045- 12046-php_with_continuity=no 12047- 12048-echo "$as_me:$LINENO: checking for Continuity support" >&5 12049-echo $ECHO_N "checking for Continuity support... $ECHO_C" >&6 12050- 12051-# Check whether --with-continuity or --without-continuity was given. 12052-if test "${with_continuity+set}" = set; then 12053- withval="$with_continuity" 12054- PHP_CONTINUITY=$withval 12055-else 12056- 12057- PHP_CONTINUITY=no 12058- 12059- 12060-fi; 12061- 12062-ext_output=$PHP_CONTINUITY 12063-echo "$as_me:$LINENO: result: $ext_output" >&5 12064-echo "${ECHO_T}$ext_output" >&6 12065- 12066- 12067- 12068- 12069-if test "$PHP_CONTINUITY" != "no"; then 12070- if test ! -d $PHP_CONTINUITY; then 12071- { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&5 12072-echo "$as_me: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&2;} 12073- { (exit 1); exit 1; }; } 12074- fi 12075- echo "$as_me:$LINENO: checking for Continuity include files" >&5 12076-echo $ECHO_N "checking for Continuity include files... $ECHO_C" >&6 12077- if test -d $PHP_CONTINUITY/include ; then 12078- CAPI_INCLUDE=$PHP_CONTINUITY/include 12079- echo "$as_me:$LINENO: result: Continuity Binary Distribution" >&5 12080-echo "${ECHO_T}Continuity Binary Distribution" >&6 12081- else 12082- { { echo "$as_me:$LINENO: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&5 12083-echo "$as_me: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&2;} 12084- { (exit 1); exit 1; }; } 12085- fi 12086 12087+ SAPI_CLI_PATH=sapi/cli/php 12088 12089- if test "$PHP_SAPI" != "default"; then 12090-{ { echo "$as_me:$LINENO: error: 12091-+--------------------------------------------------------------------+ 12092-| *** ATTENTION *** | 12093-| | 12094-| You've configured multiple SAPIs to be build. You can build only | 12095-| one SAPI module and CLI binary at the same time. | 12096-+--------------------------------------------------------------------+ 12097-" >&5 12098-echo "$as_me: error: 12099+ 12100+ if test "program" = "program"; then 12101+ PHP_BINARIES="$PHP_BINARIES cli" 12102+ elif test "$PHP_SAPI" != "none"; then 12103+ { echo "configure: error: 12104 +--------------------------------------------------------------------+ 12105 | *** ATTENTION *** | 12106 | | 12107 | You've configured multiple SAPIs to be build. You can build only | 12108-| one SAPI module and CLI binary at the same time. | 12109+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 12110 +--------------------------------------------------------------------+ 12111-" >&2;} 12112- { (exit 1); exit 1; }; } 12113- fi 12114+" 1>&2; exit 1; } 12115+ else 12116+ PHP_SAPI=cli 12117+ fi 12118+ 12119+ 12120+ 12121+ BUILD_DIR="$BUILD_DIR sapi/cli" 12122+ 12123 12124- PHP_SAPI=continuity 12125 12126- case "shared" in 12127- static) 12128+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cli" 12129 12130- OVERALL_TARGET=php 12131+ 12132+ 12133 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12134 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12135 php_c_post= 12136@@ -10443,14 +8591,157 @@ 12137 shared_cxx_post= 12138 shared_lo=lo 12139 12140- php_build_target=program 12141+ install_binaries="install-binaries" 12142+ install_binary_targets="$install_binary_targets install-cli" 12143+ 12144+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS" 12145 12146- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 12147- php_build_target=static 12148-;; 12149- shared) 12150+ 12151+ case sapi/cli in 12152+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 12153+ /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 12154+ *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 12155+ esac 12156+ 12157+ 12158+ 12159+ b_c_pre=$php_c_pre 12160+ b_cxx_pre=$php_cxx_pre 12161+ b_c_meta=$php_c_meta 12162+ b_cxx_meta=$php_cxx_meta 12163+ b_c_post=$php_c_post 12164+ b_cxx_post=$php_cxx_post 12165+ b_lo=$php_lo 12166+ 12167+ 12168+ old_IFS=$IFS 12169+ for ac_src in php_cli.c php_cli_readline.c; do 12170+ 12171+ IFS=. 12172+ set $ac_src 12173+ ac_obj=$1 12174+ IFS=$old_IFS 12175+ 12176+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 12177+ 12178+ case $ac_src in 12179+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 12180+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 12181+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 12182+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; 12183+ esac 12184+ 12185+ cat >>Makefile.objects<<EOF 12186+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src 12187+ $ac_comp 12188+EOF 12189+ done 12190+ 12191+ 12192+ 12193+ 12194+ case $host_alias in 12195+ *aix*) 12196+ if test "$php_sapi_module" = "shared"; then 12197+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12198+ else 12199+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12200+ fi 12201+ ;; 12202+ *darwin*) 12203+ BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12204+ ;; 12205+ *netware*) 12206+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" 12207+ ;; 12208+ *) 12209+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 12210+ ;; 12211+ esac 12212+ 12213+ PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)" 12214+ 12215+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE" 12216+ 12217+ 12218+ 12219+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CLI_PATH" 12220+ 12221+ 12222+ PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CLI" 12223+ 12224+ 12225+ 12226+ PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cli/php.1" 12227+ 12228+fi 12229+echo "$ac_t""$PHP_CLI" 1>&6 12230 12231- OVERALL_TARGET=php 12232+ 12233+ 12234+php_with_continuity=no 12235+ 12236+echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 12237+echo "configure:8686: checking for Continuity support" >&5 12238+# Check whether --with-continuity or --without-continuity was given. 12239+if test "${with_continuity+set}" = set; then 12240+ withval="$with_continuity" 12241+ PHP_CONTINUITY=$withval 12242+else 12243+ 12244+ PHP_CONTINUITY=no 12245+ 12246+ 12247+fi 12248+ 12249+ 12250+ext_output=$PHP_CONTINUITY 12251+echo "$ac_t""$ext_output" 1>&6 12252+ 12253+ 12254+ 12255+ 12256+if test "$PHP_CONTINUITY" != "no"; then 12257+ if test ! -d $PHP_CONTINUITY; then 12258+ { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; } 12259+ fi 12260+ echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6 12261+echo "configure:8710: checking for Continuity include files" >&5 12262+ if test -d $PHP_CONTINUITY/include ; then 12263+ CAPI_INCLUDE=$PHP_CONTINUITY/include 12264+ echo "$ac_t""Continuity Binary Distribution" 1>&6 12265+ else 12266+ { echo "configure: error: Cannot find your CAPI include files in either DIR/src or DIR/include" 1>&2; exit 1; } 12267+ fi 12268+ 12269+ 12270+ if test "shared" = "program"; then 12271+ PHP_BINARIES="$PHP_BINARIES continuity" 12272+ elif test "$PHP_SAPI" != "none"; then 12273+ { echo "configure: error: 12274++--------------------------------------------------------------------+ 12275+| *** ATTENTION *** | 12276+| | 12277+| You've configured multiple SAPIs to be build. You can build only | 12278+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 12279++--------------------------------------------------------------------+ 12280+" 1>&2; exit 1; } 12281+ else 12282+ PHP_SAPI=continuity 12283+ fi 12284+ 12285+ 12286+ 12287+ BUILD_DIR="$BUILD_DIR sapi/continuity" 12288+ 12289+ 12290+ 12291+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS continuity" 12292+ 12293+ 12294+ case "shared" in 12295+ static) 12296+ 12297 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12298 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12299 php_c_post= 12300@@ -10472,22 +8763,11 @@ 12301 shared_cxx_post= 12302 shared_lo=lo 12303 12304- php_build_target=program 12305- 12306 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 12307- php_build_target=shared 12308- 12309- php_c_pre=$shared_c_pre 12310- php_c_meta=$shared_c_meta 12311- php_c_post=$shared_c_post 12312- php_cxx_pre=$shared_cxx_pre 12313- php_cxx_meta=$shared_cxx_meta 12314- php_cxx_post=$shared_cxx_post 12315- php_lo=$shared_lo 12316+ php_sapi_module=static 12317 ;; 12318- bundle) 12319- 12320- OVERALL_TARGET=php 12321+ shared) 12322+ 12323 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12324 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12325 php_c_post= 12326@@ -10509,13 +8789,19 @@ 12327 shared_cxx_post= 12328 shared_lo=lo 12329 12330- php_build_target=program 12331- 12332- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 12333- php_build_target=static 12334+ OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 12335+ php_sapi_module=shared 12336+ 12337+ php_c_pre=$shared_c_pre 12338+ php_c_meta=$shared_c_meta 12339+ php_c_post=$shared_c_post 12340+ php_cxx_pre=$shared_cxx_pre 12341+ php_cxx_meta=$shared_cxx_meta 12342+ php_cxx_post=$shared_cxx_post 12343+ php_lo=$shared_lo 12344 ;; 12345- program) 12346- OVERALL_TARGET=php 12347+ bundle) 12348+ 12349 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12350 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12351 php_c_post= 12352@@ -10537,19 +8823,20 @@ 12353 shared_cxx_post= 12354 shared_lo=lo 12355 12356- php_build_target=program 12357+ OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 12358+ php_sapi_module=static 12359 ;; 12360- esac 12361- 12362- 12363- 12364+ esac 12365+ install_sapi="install-sapi" 12366+ 12367+ 12368 case sapi/continuity in 12369 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 12370 /*) ac_srcdir=`echo "sapi/continuity"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 12371 *) ac_srcdir="$abs_srcdir/sapi/continuity/"; ac_bdir="sapi/continuity/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 12372 esac 12373- 12374- 12375+ 12376+ 12377 12378 b_c_pre=$php_c_pre 12379 b_cxx_pre=$php_cxx_pre 12380@@ -10562,12 +8849,12 @@ 12381 12382 old_IFS=$IFS 12383 for ac_src in capi.c; do 12384- 12385+ 12386 IFS=. 12387 set $ac_src 12388 ac_obj=$1 12389 IFS=$old_IFS 12390- 12391+ 12392 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 12393 12394 case $ac_src in 12395@@ -10584,50 +8871,48 @@ 12396 done 12397 12398 12399+ 12400 12401- 12402+ 12403 if test "$CAPI_INCLUDE" != "/usr/include"; then 12404- 12405+ 12406 if test -z "$CAPI_INCLUDE" || echo "$CAPI_INCLUDE" | grep '^/' >/dev/null ; then 12407 ai_p=$CAPI_INCLUDE 12408 else 12409- 12410+ 12411 ep_dir="`echo $CAPI_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 12412- 12413+ 12414 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 12415 ai_p="$ep_realdir/`basename \"$CAPI_INCLUDE\"`" 12416 fi 12417 12418- 12419- 12420+ 12421+ 12422 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 12423- 12424+ 12425 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 12426 if test -n "$unique" && test "`eval $cmd`" = "" ; then 12427 eval "INCLUDEPATH$unique=set" 12428- 12429+ 12430 if test ""; then 12431 INCLUDES="-I$ai_p $INCLUDES" 12432 else 12433 INCLUDES="$INCLUDES -I$ai_p" 12434 fi 12435- 12436+ 12437 fi 12438 12439 fi 12440 12441- 12442+ 12443 enable_maintainer_zts=yes 12444 if test "$pthreads_working" != "yes"; then 12445- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 12446-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 12447- { (exit 1); exit 1; }; } 12448+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 12449 fi 12450 12451- 12452-cat >>confdefs.h <<\_ACEOF 12453+ cat >> confdefs.h <<\EOF 12454 #define HAVE_CONTINUITY 1 12455-_ACEOF 12456+EOF 12457 12458 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CONTINUITY/lib/" 12459 fi 12460@@ -10643,11 +8928,12 @@ 12461 enableval="$enable_embed" 12462 PHP_EMBED=$enableval 12463 else 12464- 12465+ 12466 PHP_EMBED=no 12467+ 12468 12469+fi 12470 12471-fi; 12472 12473 ext_output=$PHP_EMBED 12474 12475@@ -10655,8 +8941,8 @@ 12476 12477 12478 12479-echo "$as_me:$LINENO: checking for embedded SAPI library support" >&5 12480-echo $ECHO_N "checking for embedded SAPI library support... $ECHO_C" >&6 12481+echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 12482+echo "configure:8946: checking for embedded SAPI library support" >&5 12483 12484 if test "$PHP_EMBED" != "no"; then 12485 case "$PHP_EMBED" in 12486@@ -10673,33 +8959,34 @@ 12487 ;; 12488 esac 12489 if test "$PHP_EMBED_TYPE" != "no"; then 12490- 12491- if test "$PHP_SAPI" != "default"; then 12492-{ { echo "$as_me:$LINENO: error: 12493-+--------------------------------------------------------------------+ 12494-| *** ATTENTION *** | 12495-| | 12496-| You've configured multiple SAPIs to be build. You can build only | 12497-| one SAPI module and CLI binary at the same time. | 12498-+--------------------------------------------------------------------+ 12499-" >&5 12500-echo "$as_me: error: 12501+ 12502+ if test "$PHP_EMBED_TYPE" = "program"; then 12503+ PHP_BINARIES="$PHP_BINARIES embed" 12504+ elif test "$PHP_SAPI" != "none"; then 12505+ { echo "configure: error: 12506 +--------------------------------------------------------------------+ 12507 | *** ATTENTION *** | 12508 | | 12509 | You've configured multiple SAPIs to be build. You can build only | 12510-| one SAPI module and CLI binary at the same time. | 12511+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 12512 +--------------------------------------------------------------------+ 12513-" >&2;} 12514- { (exit 1); exit 1; }; } 12515- fi 12516+" 1>&2; exit 1; } 12517+ else 12518+ PHP_SAPI=embed 12519+ fi 12520 12521- PHP_SAPI=embed 12522+ 12523+ 12524+ BUILD_DIR="$BUILD_DIR sapi/embed" 12525+ 12526 12527- case "$PHP_EMBED_TYPE" in 12528- static) 12529 12530- OVERALL_TARGET=php 12531+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS embed" 12532+ 12533+ 12534+ case "$PHP_EMBED_TYPE" in 12535+ static) 12536+ 12537 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12538 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12539 php_c_post= 12540@@ -10721,14 +9008,11 @@ 12541 shared_cxx_post= 12542 shared_lo=lo 12543 12544- php_build_target=program 12545- 12546 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 12547- php_build_target=static 12548+ php_sapi_module=static 12549 ;; 12550- shared) 12551- 12552- OVERALL_TARGET=php 12553+ shared) 12554+ 12555 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12556 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12557 php_c_post= 12558@@ -10750,11 +9034,9 @@ 12559 shared_cxx_post= 12560 shared_lo=lo 12561 12562- php_build_target=program 12563- 12564 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 12565- php_build_target=shared 12566- 12567+ php_sapi_module=shared 12568+ 12569 php_c_pre=$shared_c_pre 12570 php_c_meta=$shared_c_meta 12571 php_c_post=$shared_c_post 12572@@ -10763,9 +9045,8 @@ 12573 php_cxx_post=$shared_cxx_post 12574 php_lo=$shared_lo 12575 ;; 12576- bundle) 12577- 12578- OVERALL_TARGET=php 12579+ bundle) 12580+ 12581 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12582 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12583 php_c_post= 12584@@ -10787,47 +9068,20 @@ 12585 shared_cxx_post= 12586 shared_lo=lo 12587 12588- php_build_target=program 12589- 12590 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 12591- php_build_target=static 12592-;; 12593- program) 12594- OVERALL_TARGET=php 12595- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12596- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 12597- php_c_post= 12598- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 12599- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 12600- php_cxx_post= 12601- php_lo=lo 12602- 12603- case $with_pic in 12604- yes) pic_setting='-prefer-pic';; 12605- no) pic_setting='-prefer-non-pic';; 12606- esac 12607- 12608- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 12609- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 12610- shared_c_post= 12611- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 12612- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 12613- shared_cxx_post= 12614- shared_lo=lo 12615- 12616- php_build_target=program 12617+ php_sapi_module=static 12618 ;; 12619- esac 12620- 12621- 12622- 12623+ esac 12624+ install_sapi="install-sapi" 12625+ 12626+ 12627 case sapi/embed in 12628 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 12629 /*) ac_srcdir=`echo "sapi/embed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 12630 *) ac_srcdir="$abs_srcdir/sapi/embed/"; ac_bdir="sapi/embed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 12631 esac 12632- 12633- 12634+ 12635+ 12636 12637 b_c_pre=$php_c_pre 12638 b_cxx_pre=$php_cxx_pre 12639@@ -10840,12 +9094,12 @@ 12640 12641 old_IFS=$IFS 12642 for ac_src in php_embed.c; do 12643- 12644+ 12645 IFS=. 12646 set $ac_src 12647 ac_obj=$1 12648 IFS=$old_IFS 12649- 12650+ 12651 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 12652 12653 case $ac_src in 12654@@ -10862,31 +9116,30 @@ 12655 done 12656 12657 12658+ 12659 12660- 12661- 12662+ 12663+ 12664 for header_file in sapi/embed/php_embed.h; do 12665- 12666- 12667+ 12668+ 12669 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 12670- 12671+ 12672 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 12673 if test -n "$unique" && test "`eval $cmd`" = "" ; then 12674 eval "INSTALLHEADERS$unique=set" 12675- 12676+ 12677 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 12678- 12679+ 12680 fi 12681 12682- done 12683- 12684+ done 12685+ 12686 12687 fi 12688- echo "$as_me:$LINENO: result: $PHP_EMBED_TYPE" >&5 12689-echo "${ECHO_T}$PHP_EMBED_TYPE" >&6 12690+ echo "$ac_t""$PHP_EMBED_TYPE" 1>&6 12691 else 12692- echo "$as_me:$LINENO: result: no" >&5 12693-echo "${ECHO_T}no" >&6 12694+ echo "$ac_t""no" 1>&6 12695 fi 12696 12697 12698@@ -10900,11 +9153,12 @@ 12699 enableval="$enable_fpm" 12700 PHP_FPM=$enableval 12701 else 12702- 12703+ 12704 PHP_FPM=no 12705+ 12706 12707+fi 12708 12709-fi; 12710 12711 ext_output=$PHP_FPM 12712 12713@@ -10941,1429 +9195,467 @@ 12714 12715 12716 12717-echo "$as_me:$LINENO: checking for FPM build" >&5 12718-echo $ECHO_N "checking for FPM build... $ECHO_C" >&6 12719+echo $ac_n "checking for FPM build""... $ac_c" 1>&6 12720+echo "configure:9200: checking for FPM build" >&5 12721 if test "$PHP_FPM" != "no"; then 12722- echo "$as_me:$LINENO: result: $PHP_FPM" >&5 12723-echo "${ECHO_T}$PHP_FPM" >&6 12724- 12725- echo "$as_me:$LINENO: checking for ANSI C header files" >&5 12726-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 12727-if test "${ac_cv_header_stdc+set}" = set; then 12728- echo $ECHO_N "(cached) $ECHO_C" >&6 12729-else 12730- cat >conftest.$ac_ext <<_ACEOF 12731-/* confdefs.h. */ 12732-_ACEOF 12733-cat confdefs.h >>conftest.$ac_ext 12734-cat >>conftest.$ac_ext <<_ACEOF 12735-/* end confdefs.h. */ 12736-#include <stdlib.h> 12737-#include <stdarg.h> 12738-#include <string.h> 12739-#include <float.h> 12740- 12741-int 12742-main () 12743-{ 12744- 12745- ; 12746- return 0; 12747-} 12748-_ACEOF 12749-rm -f conftest.$ac_objext 12750-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 12751- (eval $ac_compile) 2>conftest.er1 12752- ac_status=$? 12753- grep -v '^ *+' conftest.er1 >conftest.err 12754- rm -f conftest.er1 12755- cat conftest.err >&5 12756- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12757- (exit $ac_status); } && 12758- { ac_try='test -z "$ac_c_werror_flag" 12759- || test ! -s conftest.err' 12760- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12761- (eval $ac_try) 2>&5 12762- ac_status=$? 12763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12764- (exit $ac_status); }; } && 12765- { ac_try='test -s conftest.$ac_objext' 12766- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12767- (eval $ac_try) 2>&5 12768- ac_status=$? 12769- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12770- (exit $ac_status); }; }; then 12771- ac_cv_header_stdc=yes 12772-else 12773- echo "$as_me: failed program was:" >&5 12774-sed 's/^/| /' conftest.$ac_ext >&5 12775- 12776-ac_cv_header_stdc=no 12777-fi 12778-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 12779- 12780-if test $ac_cv_header_stdc = yes; then 12781- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 12782- cat >conftest.$ac_ext <<_ACEOF 12783-/* confdefs.h. */ 12784-_ACEOF 12785-cat confdefs.h >>conftest.$ac_ext 12786-cat >>conftest.$ac_ext <<_ACEOF 12787-/* end confdefs.h. */ 12788-#include <string.h> 12789- 12790-_ACEOF 12791-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 12792- $EGREP "memchr" >/dev/null 2>&1; then 12793- : 12794-else 12795- ac_cv_header_stdc=no 12796-fi 12797-rm -f conftest* 12798- 12799-fi 12800- 12801-if test $ac_cv_header_stdc = yes; then 12802- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 12803- cat >conftest.$ac_ext <<_ACEOF 12804-/* confdefs.h. */ 12805-_ACEOF 12806-cat confdefs.h >>conftest.$ac_ext 12807-cat >>conftest.$ac_ext <<_ACEOF 12808-/* end confdefs.h. */ 12809-#include <stdlib.h> 12810- 12811-_ACEOF 12812-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 12813- $EGREP "free" >/dev/null 2>&1; then 12814- : 12815-else 12816- ac_cv_header_stdc=no 12817-fi 12818-rm -f conftest* 12819- 12820-fi 12821- 12822-if test $ac_cv_header_stdc = yes; then 12823- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 12824- if test "$cross_compiling" = yes; then 12825- : 12826-else 12827- cat >conftest.$ac_ext <<_ACEOF 12828-/* confdefs.h. */ 12829-_ACEOF 12830-cat confdefs.h >>conftest.$ac_ext 12831-cat >>conftest.$ac_ext <<_ACEOF 12832-/* end confdefs.h. */ 12833-#include <ctype.h> 12834-#if ((' ' & 0x0FF) == 0x020) 12835-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 12836-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 12837-#else 12838-# define ISLOWER(c) \ 12839- (('a' <= (c) && (c) <= 'i') \ 12840- || ('j' <= (c) && (c) <= 'r') \ 12841- || ('s' <= (c) && (c) <= 'z')) 12842-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 12843-#endif 12844- 12845-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 12846-int 12847-main () 12848-{ 12849- int i; 12850- for (i = 0; i < 256; i++) 12851- if (XOR (islower (i), ISLOWER (i)) 12852- || toupper (i) != TOUPPER (i)) 12853- exit(2); 12854- exit (0); 12855-} 12856-_ACEOF 12857-rm -f conftest$ac_exeext 12858-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 12859- (eval $ac_link) 2>&5 12860- ac_status=$? 12861- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12862- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 12863- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12864- (eval $ac_try) 2>&5 12865- ac_status=$? 12866- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12867- (exit $ac_status); }; }; then 12868- : 12869-else 12870- echo "$as_me: program exited with status $ac_status" >&5 12871-echo "$as_me: failed program was:" >&5 12872-sed 's/^/| /' conftest.$ac_ext >&5 12873- 12874-( exit $ac_status ) 12875-ac_cv_header_stdc=no 12876-fi 12877-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 12878-fi 12879-fi 12880-fi 12881-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 12882-echo "${ECHO_T}$ac_cv_header_stdc" >&6 12883-if test $ac_cv_header_stdc = yes; then 12884- 12885-cat >>confdefs.h <<\_ACEOF 12886-#define STDC_HEADERS 1 12887-_ACEOF 12888- 12889-fi 12890- 12891-# On IRIX 5.3, sys/types and inttypes.h are conflicting. 12892- 12893- 12894- 12895- 12896- 12897- 12898- 12899- 12900- 12901-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 12902- inttypes.h stdint.h unistd.h 12903-do 12904-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 12905-echo "$as_me:$LINENO: checking for $ac_header" >&5 12906-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 12907-if eval "test \"\${$as_ac_Header+set}\" = set"; then 12908- echo $ECHO_N "(cached) $ECHO_C" >&6 12909-else 12910- cat >conftest.$ac_ext <<_ACEOF 12911-/* confdefs.h. */ 12912-_ACEOF 12913-cat confdefs.h >>conftest.$ac_ext 12914-cat >>conftest.$ac_ext <<_ACEOF 12915-/* end confdefs.h. */ 12916-$ac_includes_default 12917- 12918-#include <$ac_header> 12919-_ACEOF 12920-rm -f conftest.$ac_objext 12921-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 12922- (eval $ac_compile) 2>conftest.er1 12923- ac_status=$? 12924- grep -v '^ *+' conftest.er1 >conftest.err 12925- rm -f conftest.er1 12926- cat conftest.err >&5 12927- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12928- (exit $ac_status); } && 12929- { ac_try='test -z "$ac_c_werror_flag" 12930- || test ! -s conftest.err' 12931- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12932- (eval $ac_try) 2>&5 12933- ac_status=$? 12934- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12935- (exit $ac_status); }; } && 12936- { ac_try='test -s conftest.$ac_objext' 12937- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 12938- (eval $ac_try) 2>&5 12939- ac_status=$? 12940- echo "$as_me:$LINENO: \$? = $ac_status" >&5 12941- (exit $ac_status); }; }; then 12942- eval "$as_ac_Header=yes" 12943-else 12944- echo "$as_me: failed program was:" >&5 12945-sed 's/^/| /' conftest.$ac_ext >&5 12946- 12947-eval "$as_ac_Header=no" 12948-fi 12949-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 12950-fi 12951-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 12952-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 12953-if test `eval echo '${'$as_ac_Header'}'` = yes; then 12954- cat >>confdefs.h <<_ACEOF 12955-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 12956-_ACEOF 12957- 12958-fi 12959- 12960-done 12961- 12962+ echo "$ac_t""$PHP_FPM" 1>&6 12963 12964- 12965- 12966- 12967- 12968-for ac_func in setenv clearenv setproctitle 12969+ 12970+ for ac_func in setenv clearenv setproctitle 12971 do 12972-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 12973-echo "$as_me:$LINENO: checking for $ac_func" >&5 12974-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 12975-if eval "test \"\${$as_ac_var+set}\" = set"; then 12976- echo $ECHO_N "(cached) $ECHO_C" >&6 12977-else 12978- cat >conftest.$ac_ext <<_ACEOF 12979-/* confdefs.h. */ 12980-_ACEOF 12981-cat confdefs.h >>conftest.$ac_ext 12982-cat >>conftest.$ac_ext <<_ACEOF 12983-/* end confdefs.h. */ 12984-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 12985- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 12986-#define $ac_func innocuous_$ac_func 12987- 12988+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 12989+echo "configure:9208: checking for $ac_func" >&5 12990+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 12991+ echo $ac_n "(cached) $ac_c" 1>&6 12992+else 12993+ cat > conftest.$ac_ext <<EOF 12994+#line 9213 "configure" 12995+#include "confdefs.h" 12996 /* System header to define __stub macros and hopefully few prototypes, 12997- which can conflict with char $ac_func (); below. 12998- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 12999- <limits.h> exists even on freestanding compilers. */ 13000- 13001-#ifdef __STDC__ 13002-# include <limits.h> 13003-#else 13004-# include <assert.h> 13005-#endif 13006- 13007-#undef $ac_func 13008- 13009+ which can conflict with char $ac_func(); below. */ 13010+#include <assert.h> 13011 /* Override any gcc2 internal prototype to avoid an error. */ 13012-#ifdef __cplusplus 13013-extern "C" 13014-{ 13015-#endif 13016 /* We use char because int might match the return type of a gcc2 13017- builtin and then its argument prototype would still apply. */ 13018-char $ac_func (); 13019+ builtin and then its argument prototype would still apply. */ 13020+char $ac_func(); 13021+ 13022+int main() { 13023+ 13024 /* The GNU C library defines this for functions which it implements 13025 to always fail with ENOSYS. Some functions are actually named 13026 something starting with __ and the normal name is an alias. */ 13027 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 13028 choke me 13029 #else 13030-char (*f) () = $ac_func; 13031-#endif 13032-#ifdef __cplusplus 13033-} 13034+$ac_func(); 13035 #endif 13036 13037-int 13038-main () 13039-{ 13040-return f != $ac_func; 13041- ; 13042- return 0; 13043-} 13044-_ACEOF 13045-rm -f conftest.$ac_objext conftest$ac_exeext 13046-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 13047- (eval $ac_link) 2>conftest.er1 13048- ac_status=$? 13049- grep -v '^ *+' conftest.er1 >conftest.err 13050- rm -f conftest.er1 13051- cat conftest.err >&5 13052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13053- (exit $ac_status); } && 13054- { ac_try='test -z "$ac_c_werror_flag" 13055- || test ! -s conftest.err' 13056- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13057- (eval $ac_try) 2>&5 13058- ac_status=$? 13059- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13060- (exit $ac_status); }; } && 13061- { ac_try='test -s conftest$ac_exeext' 13062- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13063- (eval $ac_try) 2>&5 13064- ac_status=$? 13065- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13066- (exit $ac_status); }; }; then 13067- eval "$as_ac_var=yes" 13068-else 13069- echo "$as_me: failed program was:" >&5 13070-sed 's/^/| /' conftest.$ac_ext >&5 13071- 13072-eval "$as_ac_var=no" 13073-fi 13074-rm -f conftest.err conftest.$ac_objext \ 13075- conftest$ac_exeext conftest.$ac_ext 13076-fi 13077-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 13078-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 13079-if test `eval echo '${'$as_ac_var'}'` = yes; then 13080- cat >>confdefs.h <<_ACEOF 13081-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 13082-_ACEOF 13083+; return 0; } 13084+EOF 13085+if { (eval echo configure:9236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 13086+ rm -rf conftest* 13087+ eval "ac_cv_func_$ac_func=yes" 13088+else 13089+ echo "configure: failed program was:" >&5 13090+ cat conftest.$ac_ext >&5 13091+ rm -rf conftest* 13092+ eval "ac_cv_func_$ac_func=no" 13093+fi 13094+rm -f conftest* 13095+fi 13096 13097+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 13098+ echo "$ac_t""yes" 1>&6 13099+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 13100+ cat >> confdefs.h <<EOF 13101+#define $ac_tr_func 1 13102+EOF 13103+ 13104+else 13105+ echo "$ac_t""no" 1>&6 13106 fi 13107 done 13108 13109 13110- echo "$as_me:$LINENO: checking for library containing socket" >&5 13111-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6 13112-if test "${ac_cv_search_socket+set}" = set; then 13113- echo $ECHO_N "(cached) $ECHO_C" >&6 13114-else 13115- ac_func_search_save_LIBS=$LIBS 13116-ac_cv_search_socket=no 13117-cat >conftest.$ac_ext <<_ACEOF 13118-/* confdefs.h. */ 13119-_ACEOF 13120-cat confdefs.h >>conftest.$ac_ext 13121-cat >>conftest.$ac_ext <<_ACEOF 13122-/* end confdefs.h. */ 13123- 13124+ 13125+echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 13126+echo "configure:9263: checking for library containing socket" >&5 13127+if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then 13128+ echo $ac_n "(cached) $ac_c" 1>&6 13129+else 13130+ ac_func_search_save_LIBS="$LIBS" 13131+ac_cv_search_socket="no" 13132+cat > conftest.$ac_ext <<EOF 13133+#line 9270 "configure" 13134+#include "confdefs.h" 13135 /* Override any gcc2 internal prototype to avoid an error. */ 13136-#ifdef __cplusplus 13137-extern "C" 13138-#endif 13139 /* We use char because int might match the return type of a gcc2 13140- builtin and then its argument prototype would still apply. */ 13141-char socket (); 13142-int 13143-main () 13144-{ 13145-socket (); 13146- ; 13147- return 0; 13148-} 13149-_ACEOF 13150-rm -f conftest.$ac_objext conftest$ac_exeext 13151-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 13152- (eval $ac_link) 2>conftest.er1 13153- ac_status=$? 13154- grep -v '^ *+' conftest.er1 >conftest.err 13155- rm -f conftest.er1 13156- cat conftest.err >&5 13157- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13158- (exit $ac_status); } && 13159- { ac_try='test -z "$ac_c_werror_flag" 13160- || test ! -s conftest.err' 13161- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13162- (eval $ac_try) 2>&5 13163- ac_status=$? 13164- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13165- (exit $ac_status); }; } && 13166- { ac_try='test -s conftest$ac_exeext' 13167- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13168- (eval $ac_try) 2>&5 13169- ac_status=$? 13170- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13171- (exit $ac_status); }; }; then 13172+ builtin and then its argument prototype would still apply. */ 13173+char socket(); 13174+ 13175+int main() { 13176+socket() 13177+; return 0; } 13178+EOF 13179+if { (eval echo configure:9281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 13180+ rm -rf conftest* 13181 ac_cv_search_socket="none required" 13182 else 13183- echo "$as_me: failed program was:" >&5 13184-sed 's/^/| /' conftest.$ac_ext >&5 13185- 13186+ echo "configure: failed program was:" >&5 13187+ cat conftest.$ac_ext >&5 13188 fi 13189-rm -f conftest.err conftest.$ac_objext \ 13190- conftest$ac_exeext conftest.$ac_ext 13191-if test "$ac_cv_search_socket" = no; then 13192- for ac_lib in socket; do 13193- LIBS="-l$ac_lib $ac_func_search_save_LIBS" 13194- cat >conftest.$ac_ext <<_ACEOF 13195-/* confdefs.h. */ 13196-_ACEOF 13197-cat confdefs.h >>conftest.$ac_ext 13198-cat >>conftest.$ac_ext <<_ACEOF 13199-/* end confdefs.h. */ 13200- 13201+rm -f conftest* 13202+test "$ac_cv_search_socket" = "no" && for i in socket; do 13203+LIBS="-l$i $ac_func_search_save_LIBS" 13204+cat > conftest.$ac_ext <<EOF 13205+#line 9292 "configure" 13206+#include "confdefs.h" 13207 /* Override any gcc2 internal prototype to avoid an error. */ 13208-#ifdef __cplusplus 13209-extern "C" 13210-#endif 13211 /* We use char because int might match the return type of a gcc2 13212- builtin and then its argument prototype would still apply. */ 13213-char socket (); 13214-int 13215-main () 13216-{ 13217-socket (); 13218- ; 13219- return 0; 13220-} 13221-_ACEOF 13222-rm -f conftest.$ac_objext conftest$ac_exeext 13223-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 13224- (eval $ac_link) 2>conftest.er1 13225- ac_status=$? 13226- grep -v '^ *+' conftest.er1 >conftest.err 13227- rm -f conftest.er1 13228- cat conftest.err >&5 13229- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13230- (exit $ac_status); } && 13231- { ac_try='test -z "$ac_c_werror_flag" 13232- || test ! -s conftest.err' 13233- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13234- (eval $ac_try) 2>&5 13235- ac_status=$? 13236- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13237- (exit $ac_status); }; } && 13238- { ac_try='test -s conftest$ac_exeext' 13239- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13240- (eval $ac_try) 2>&5 13241- ac_status=$? 13242- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13243- (exit $ac_status); }; }; then 13244- ac_cv_search_socket="-l$ac_lib" 13245+ builtin and then its argument prototype would still apply. */ 13246+char socket(); 13247+ 13248+int main() { 13249+socket() 13250+; return 0; } 13251+EOF 13252+if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 13253+ rm -rf conftest* 13254+ ac_cv_search_socket="-l$i" 13255 break 13256 else 13257- echo "$as_me: failed program was:" >&5 13258-sed 's/^/| /' conftest.$ac_ext >&5 13259- 13260-fi 13261-rm -f conftest.err conftest.$ac_objext \ 13262- conftest$ac_exeext conftest.$ac_ext 13263- done 13264-fi 13265-LIBS=$ac_func_search_save_LIBS 13266+ echo "configure: failed program was:" >&5 13267+ cat conftest.$ac_ext >&5 13268 fi 13269-echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 13270-echo "${ECHO_T}$ac_cv_search_socket" >&6 13271-if test "$ac_cv_search_socket" != no; then 13272- test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS" 13273- 13274+rm -f conftest* 13275+done 13276+LIBS="$ac_func_search_save_LIBS" 13277 fi 13278 13279- echo "$as_me:$LINENO: checking for library containing inet_addr" >&5 13280-echo $ECHO_N "checking for library containing inet_addr... $ECHO_C" >&6 13281-if test "${ac_cv_search_inet_addr+set}" = set; then 13282- echo $ECHO_N "(cached) $ECHO_C" >&6 13283-else 13284- ac_func_search_save_LIBS=$LIBS 13285-ac_cv_search_inet_addr=no 13286-cat >conftest.$ac_ext <<_ACEOF 13287-/* confdefs.h. */ 13288-_ACEOF 13289-cat confdefs.h >>conftest.$ac_ext 13290-cat >>conftest.$ac_ext <<_ACEOF 13291-/* end confdefs.h. */ 13292- 13293+echo "$ac_t""$ac_cv_search_socket" 1>&6 13294+if test "$ac_cv_search_socket" != "no"; then 13295+ test "$ac_cv_search_socket" = "none required" || LIBS="$ac_cv_search_socket $LIBS" 13296+ 13297+else : 13298+ 13299+fi 13300+ 13301+echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 13302+echo "configure:9325: checking for library containing inet_addr" >&5 13303+if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then 13304+ echo $ac_n "(cached) $ac_c" 1>&6 13305+else 13306+ ac_func_search_save_LIBS="$LIBS" 13307+ac_cv_search_inet_addr="no" 13308+cat > conftest.$ac_ext <<EOF 13309+#line 9332 "configure" 13310+#include "confdefs.h" 13311 /* Override any gcc2 internal prototype to avoid an error. */ 13312-#ifdef __cplusplus 13313-extern "C" 13314-#endif 13315 /* We use char because int might match the return type of a gcc2 13316- builtin and then its argument prototype would still apply. */ 13317-char inet_addr (); 13318-int 13319-main () 13320-{ 13321-inet_addr (); 13322- ; 13323- return 0; 13324-} 13325-_ACEOF 13326-rm -f conftest.$ac_objext conftest$ac_exeext 13327-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 13328- (eval $ac_link) 2>conftest.er1 13329- ac_status=$? 13330- grep -v '^ *+' conftest.er1 >conftest.err 13331- rm -f conftest.er1 13332- cat conftest.err >&5 13333- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13334- (exit $ac_status); } && 13335- { ac_try='test -z "$ac_c_werror_flag" 13336- || test ! -s conftest.err' 13337- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13338- (eval $ac_try) 2>&5 13339- ac_status=$? 13340- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13341- (exit $ac_status); }; } && 13342- { ac_try='test -s conftest$ac_exeext' 13343- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13344- (eval $ac_try) 2>&5 13345- ac_status=$? 13346- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13347- (exit $ac_status); }; }; then 13348+ builtin and then its argument prototype would still apply. */ 13349+char inet_addr(); 13350+ 13351+int main() { 13352+inet_addr() 13353+; return 0; } 13354+EOF 13355+if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 13356+ rm -rf conftest* 13357 ac_cv_search_inet_addr="none required" 13358 else 13359- echo "$as_me: failed program was:" >&5 13360-sed 's/^/| /' conftest.$ac_ext >&5 13361- 13362+ echo "configure: failed program was:" >&5 13363+ cat conftest.$ac_ext >&5 13364 fi 13365-rm -f conftest.err conftest.$ac_objext \ 13366- conftest$ac_exeext conftest.$ac_ext 13367-if test "$ac_cv_search_inet_addr" = no; then 13368- for ac_lib in nsl; do 13369- LIBS="-l$ac_lib $ac_func_search_save_LIBS" 13370- cat >conftest.$ac_ext <<_ACEOF 13371-/* confdefs.h. */ 13372-_ACEOF 13373-cat confdefs.h >>conftest.$ac_ext 13374-cat >>conftest.$ac_ext <<_ACEOF 13375-/* end confdefs.h. */ 13376- 13377+rm -f conftest* 13378+test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do 13379+LIBS="-l$i $ac_func_search_save_LIBS" 13380+cat > conftest.$ac_ext <<EOF 13381+#line 9354 "configure" 13382+#include "confdefs.h" 13383 /* Override any gcc2 internal prototype to avoid an error. */ 13384-#ifdef __cplusplus 13385-extern "C" 13386-#endif 13387 /* We use char because int might match the return type of a gcc2 13388- builtin and then its argument prototype would still apply. */ 13389-char inet_addr (); 13390-int 13391-main () 13392-{ 13393-inet_addr (); 13394- ; 13395- return 0; 13396-} 13397-_ACEOF 13398-rm -f conftest.$ac_objext conftest$ac_exeext 13399-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 13400- (eval $ac_link) 2>conftest.er1 13401- ac_status=$? 13402- grep -v '^ *+' conftest.er1 >conftest.err 13403- rm -f conftest.er1 13404- cat conftest.err >&5 13405- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13406- (exit $ac_status); } && 13407- { ac_try='test -z "$ac_c_werror_flag" 13408- || test ! -s conftest.err' 13409- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13410- (eval $ac_try) 2>&5 13411- ac_status=$? 13412- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13413- (exit $ac_status); }; } && 13414- { ac_try='test -s conftest$ac_exeext' 13415- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13416- (eval $ac_try) 2>&5 13417- ac_status=$? 13418- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13419- (exit $ac_status); }; }; then 13420- ac_cv_search_inet_addr="-l$ac_lib" 13421+ builtin and then its argument prototype would still apply. */ 13422+char inet_addr(); 13423+ 13424+int main() { 13425+inet_addr() 13426+; return 0; } 13427+EOF 13428+if { (eval echo configure:9365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 13429+ rm -rf conftest* 13430+ ac_cv_search_inet_addr="-l$i" 13431 break 13432 else 13433- echo "$as_me: failed program was:" >&5 13434-sed 's/^/| /' conftest.$ac_ext >&5 13435- 13436-fi 13437-rm -f conftest.err conftest.$ac_objext \ 13438- conftest$ac_exeext conftest.$ac_ext 13439- done 13440+ echo "configure: failed program was:" >&5 13441+ cat conftest.$ac_ext >&5 13442 fi 13443-LIBS=$ac_func_search_save_LIBS 13444+rm -f conftest* 13445+done 13446+LIBS="$ac_func_search_save_LIBS" 13447 fi 13448-echo "$as_me:$LINENO: result: $ac_cv_search_inet_addr" >&5 13449-echo "${ECHO_T}$ac_cv_search_inet_addr" >&6 13450-if test "$ac_cv_search_inet_addr" != no; then 13451- test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS" 13452 13453+echo "$ac_t""$ac_cv_search_inet_addr" 1>&6 13454+if test "$ac_cv_search_inet_addr" != "no"; then 13455+ test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS" 13456+ 13457+else : 13458+ 13459 fi 13460 13461- 13462- 13463- 13464- 13465- 13466- 13467- 13468-for ac_header in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h 13469+ for ac_hdr in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h 13470 do 13471-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 13472-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13473- echo "$as_me:$LINENO: checking for $ac_header" >&5 13474-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13475-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13476- echo $ECHO_N "(cached) $ECHO_C" >&6 13477-fi 13478-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13479-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13480-else 13481- # Is the header compilable? 13482-echo "$as_me:$LINENO: checking $ac_header usability" >&5 13483-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 13484-cat >conftest.$ac_ext <<_ACEOF 13485-/* confdefs.h. */ 13486-_ACEOF 13487-cat confdefs.h >>conftest.$ac_ext 13488-cat >>conftest.$ac_ext <<_ACEOF 13489-/* end confdefs.h. */ 13490-$ac_includes_default 13491-#include <$ac_header> 13492-_ACEOF 13493-rm -f conftest.$ac_objext 13494-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 13495- (eval $ac_compile) 2>conftest.er1 13496- ac_status=$? 13497- grep -v '^ *+' conftest.er1 >conftest.err 13498- rm -f conftest.er1 13499- cat conftest.err >&5 13500- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13501- (exit $ac_status); } && 13502- { ac_try='test -z "$ac_c_werror_flag" 13503- || test ! -s conftest.err' 13504- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13505- (eval $ac_try) 2>&5 13506- ac_status=$? 13507- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13508- (exit $ac_status); }; } && 13509- { ac_try='test -s conftest.$ac_objext' 13510- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13511- (eval $ac_try) 2>&5 13512- ac_status=$? 13513- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13514- (exit $ac_status); }; }; then 13515- ac_header_compiler=yes 13516-else 13517- echo "$as_me: failed program was:" >&5 13518-sed 's/^/| /' conftest.$ac_ext >&5 13519- 13520-ac_header_compiler=no 13521-fi 13522-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 13523-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 13524-echo "${ECHO_T}$ac_header_compiler" >&6 13525- 13526-# Is the header present? 13527-echo "$as_me:$LINENO: checking $ac_header presence" >&5 13528-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 13529-cat >conftest.$ac_ext <<_ACEOF 13530-/* confdefs.h. */ 13531-_ACEOF 13532-cat confdefs.h >>conftest.$ac_ext 13533-cat >>conftest.$ac_ext <<_ACEOF 13534-/* end confdefs.h. */ 13535-#include <$ac_header> 13536-_ACEOF 13537-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 13538- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 13539- ac_status=$? 13540- grep -v '^ *+' conftest.er1 >conftest.err 13541- rm -f conftest.er1 13542- cat conftest.err >&5 13543- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13544- (exit $ac_status); } >/dev/null; then 13545- if test -s conftest.err; then 13546- ac_cpp_err=$ac_c_preproc_warn_flag 13547- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 13548- else 13549- ac_cpp_err= 13550- fi 13551-else 13552- ac_cpp_err=yes 13553-fi 13554-if test -z "$ac_cpp_err"; then 13555- ac_header_preproc=yes 13556-else 13557- echo "$as_me: failed program was:" >&5 13558-sed 's/^/| /' conftest.$ac_ext >&5 13559- 13560- ac_header_preproc=no 13561-fi 13562-rm -f conftest.err conftest.$ac_ext 13563-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 13564-echo "${ECHO_T}$ac_header_preproc" >&6 13565- 13566-# So? What about this header? 13567-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 13568- yes:no: ) 13569- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 13570-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 13571- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 13572-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 13573- ac_header_preproc=yes 13574- ;; 13575- no:yes:* ) 13576- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 13577-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 13578- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 13579-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 13580- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 13581-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 13582- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 13583-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 13584- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 13585-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 13586- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 13587-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 13588- ( 13589- cat <<\_ASBOX 13590-## ------------------------------------------ ## 13591-## Report this to the AC_PACKAGE_NAME lists. ## 13592-## ------------------------------------------ ## 13593-_ASBOX 13594- ) | 13595- sed "s/^/$as_me: WARNING: /" >&2 13596- ;; 13597-esac 13598-echo "$as_me:$LINENO: checking for $ac_header" >&5 13599-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13600-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13601- echo $ECHO_N "(cached) $ECHO_C" >&6 13602+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 13603+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 13604+echo "configure:9390: checking for $ac_hdr" >&5 13605+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 13606+ echo $ac_n "(cached) $ac_c" 1>&6 13607 else 13608- eval "$as_ac_Header=\$ac_header_preproc" 13609+ cat > conftest.$ac_ext <<EOF 13610+#line 9395 "configure" 13611+#include "confdefs.h" 13612+#include <$ac_hdr> 13613+EOF 13614+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 13615+{ (eval echo configure:9400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 13616+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 13617+if test -z "$ac_err"; then 13618+ rm -rf conftest* 13619+ eval "ac_cv_header_$ac_safe=yes" 13620+else 13621+ echo "$ac_err" >&5 13622+ echo "configure: failed program was:" >&5 13623+ cat conftest.$ac_ext >&5 13624+ rm -rf conftest* 13625+ eval "ac_cv_header_$ac_safe=no" 13626 fi 13627-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13628-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13629- 13630+rm -f conftest* 13631 fi 13632-if test `eval echo '${'$as_ac_Header'}'` = yes; then 13633- cat >>confdefs.h <<_ACEOF 13634-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 13635-_ACEOF 13636- 13637+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 13638+ echo "$ac_t""yes" 1>&6 13639+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 13640+ cat >> confdefs.h <<EOF 13641+#define $ac_tr_hdr 1 13642+EOF 13643+ 13644+else 13645+ echo "$ac_t""no" 1>&6 13646 fi 13647- 13648 done 13649 13650- 13651- 13652- 13653-for ac_header in sys/select.h sys/socket.h sys/time.h 13654+ for ac_hdr in sys/select.h sys/socket.h sys/time.h 13655 do 13656-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 13657-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13658- echo "$as_me:$LINENO: checking for $ac_header" >&5 13659-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13660-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13661- echo $ECHO_N "(cached) $ECHO_C" >&6 13662-fi 13663-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13664-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13665-else 13666- # Is the header compilable? 13667-echo "$as_me:$LINENO: checking $ac_header usability" >&5 13668-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 13669-cat >conftest.$ac_ext <<_ACEOF 13670-/* confdefs.h. */ 13671-_ACEOF 13672-cat confdefs.h >>conftest.$ac_ext 13673-cat >>conftest.$ac_ext <<_ACEOF 13674-/* end confdefs.h. */ 13675-$ac_includes_default 13676-#include <$ac_header> 13677-_ACEOF 13678-rm -f conftest.$ac_objext 13679-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 13680- (eval $ac_compile) 2>conftest.er1 13681- ac_status=$? 13682- grep -v '^ *+' conftest.er1 >conftest.err 13683- rm -f conftest.er1 13684- cat conftest.err >&5 13685- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13686- (exit $ac_status); } && 13687- { ac_try='test -z "$ac_c_werror_flag" 13688- || test ! -s conftest.err' 13689- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13690- (eval $ac_try) 2>&5 13691- ac_status=$? 13692- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13693- (exit $ac_status); }; } && 13694- { ac_try='test -s conftest.$ac_objext' 13695- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13696- (eval $ac_try) 2>&5 13697- ac_status=$? 13698- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13699- (exit $ac_status); }; }; then 13700- ac_header_compiler=yes 13701-else 13702- echo "$as_me: failed program was:" >&5 13703-sed 's/^/| /' conftest.$ac_ext >&5 13704- 13705-ac_header_compiler=no 13706-fi 13707-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 13708-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 13709-echo "${ECHO_T}$ac_header_compiler" >&6 13710- 13711-# Is the header present? 13712-echo "$as_me:$LINENO: checking $ac_header presence" >&5 13713-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 13714-cat >conftest.$ac_ext <<_ACEOF 13715-/* confdefs.h. */ 13716-_ACEOF 13717-cat confdefs.h >>conftest.$ac_ext 13718-cat >>conftest.$ac_ext <<_ACEOF 13719-/* end confdefs.h. */ 13720-#include <$ac_header> 13721-_ACEOF 13722-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 13723- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 13724- ac_status=$? 13725- grep -v '^ *+' conftest.er1 >conftest.err 13726- rm -f conftest.er1 13727- cat conftest.err >&5 13728- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13729- (exit $ac_status); } >/dev/null; then 13730- if test -s conftest.err; then 13731- ac_cpp_err=$ac_c_preproc_warn_flag 13732- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 13733- else 13734- ac_cpp_err= 13735- fi 13736-else 13737- ac_cpp_err=yes 13738-fi 13739-if test -z "$ac_cpp_err"; then 13740- ac_header_preproc=yes 13741-else 13742- echo "$as_me: failed program was:" >&5 13743-sed 's/^/| /' conftest.$ac_ext >&5 13744- 13745- ac_header_preproc=no 13746-fi 13747-rm -f conftest.err conftest.$ac_ext 13748-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 13749-echo "${ECHO_T}$ac_header_preproc" >&6 13750- 13751-# So? What about this header? 13752-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 13753- yes:no: ) 13754- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 13755-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 13756- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 13757-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 13758- ac_header_preproc=yes 13759- ;; 13760- no:yes:* ) 13761- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 13762-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 13763- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 13764-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 13765- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 13766-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 13767- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 13768-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 13769- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 13770-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 13771- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 13772-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 13773- ( 13774- cat <<\_ASBOX 13775-## ------------------------------------------ ## 13776-## Report this to the AC_PACKAGE_NAME lists. ## 13777-## ------------------------------------------ ## 13778-_ASBOX 13779- ) | 13780- sed "s/^/$as_me: WARNING: /" >&2 13781- ;; 13782-esac 13783-echo "$as_me:$LINENO: checking for $ac_header" >&5 13784-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13785-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13786- echo $ECHO_N "(cached) $ECHO_C" >&6 13787+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 13788+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 13789+echo "configure:9430: checking for $ac_hdr" >&5 13790+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 13791+ echo $ac_n "(cached) $ac_c" 1>&6 13792+else 13793+ cat > conftest.$ac_ext <<EOF 13794+#line 9435 "configure" 13795+#include "confdefs.h" 13796+#include <$ac_hdr> 13797+EOF 13798+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 13799+{ (eval echo configure:9440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 13800+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 13801+if test -z "$ac_err"; then 13802+ rm -rf conftest* 13803+ eval "ac_cv_header_$ac_safe=yes" 13804 else 13805- eval "$as_ac_Header=\$ac_header_preproc" 13806+ echo "$ac_err" >&5 13807+ echo "configure: failed program was:" >&5 13808+ cat conftest.$ac_ext >&5 13809+ rm -rf conftest* 13810+ eval "ac_cv_header_$ac_safe=no" 13811 fi 13812-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13813-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13814- 13815+rm -f conftest* 13816 fi 13817-if test `eval echo '${'$as_ac_Header'}'` = yes; then 13818- cat >>confdefs.h <<_ACEOF 13819-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 13820-_ACEOF 13821- 13822+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 13823+ echo "$ac_t""yes" 1>&6 13824+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 13825+ cat >> confdefs.h <<EOF 13826+#define $ac_tr_hdr 1 13827+EOF 13828+ 13829+else 13830+ echo "$ac_t""no" 1>&6 13831 fi 13832- 13833 done 13834 13835- 13836- 13837-for ac_header in arpa/inet.h netinet/in.h 13838+ for ac_hdr in arpa/inet.h netinet/in.h 13839 do 13840-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 13841-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13842- echo "$as_me:$LINENO: checking for $ac_header" >&5 13843-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13844-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13845- echo $ECHO_N "(cached) $ECHO_C" >&6 13846-fi 13847-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13848-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13849-else 13850- # Is the header compilable? 13851-echo "$as_me:$LINENO: checking $ac_header usability" >&5 13852-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 13853-cat >conftest.$ac_ext <<_ACEOF 13854-/* confdefs.h. */ 13855-_ACEOF 13856-cat confdefs.h >>conftest.$ac_ext 13857-cat >>conftest.$ac_ext <<_ACEOF 13858-/* end confdefs.h. */ 13859-$ac_includes_default 13860-#include <$ac_header> 13861-_ACEOF 13862-rm -f conftest.$ac_objext 13863-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 13864- (eval $ac_compile) 2>conftest.er1 13865- ac_status=$? 13866- grep -v '^ *+' conftest.er1 >conftest.err 13867- rm -f conftest.er1 13868- cat conftest.err >&5 13869- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13870- (exit $ac_status); } && 13871- { ac_try='test -z "$ac_c_werror_flag" 13872- || test ! -s conftest.err' 13873- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13874- (eval $ac_try) 2>&5 13875- ac_status=$? 13876- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13877- (exit $ac_status); }; } && 13878- { ac_try='test -s conftest.$ac_objext' 13879- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 13880- (eval $ac_try) 2>&5 13881- ac_status=$? 13882- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13883- (exit $ac_status); }; }; then 13884- ac_header_compiler=yes 13885-else 13886- echo "$as_me: failed program was:" >&5 13887-sed 's/^/| /' conftest.$ac_ext >&5 13888- 13889-ac_header_compiler=no 13890-fi 13891-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 13892-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 13893-echo "${ECHO_T}$ac_header_compiler" >&6 13894- 13895-# Is the header present? 13896-echo "$as_me:$LINENO: checking $ac_header presence" >&5 13897-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 13898-cat >conftest.$ac_ext <<_ACEOF 13899-/* confdefs.h. */ 13900-_ACEOF 13901-cat confdefs.h >>conftest.$ac_ext 13902-cat >>conftest.$ac_ext <<_ACEOF 13903-/* end confdefs.h. */ 13904-#include <$ac_header> 13905-_ACEOF 13906-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 13907- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 13908- ac_status=$? 13909- grep -v '^ *+' conftest.er1 >conftest.err 13910- rm -f conftest.er1 13911- cat conftest.err >&5 13912- echo "$as_me:$LINENO: \$? = $ac_status" >&5 13913- (exit $ac_status); } >/dev/null; then 13914- if test -s conftest.err; then 13915- ac_cpp_err=$ac_c_preproc_warn_flag 13916- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 13917- else 13918- ac_cpp_err= 13919- fi 13920-else 13921- ac_cpp_err=yes 13922-fi 13923-if test -z "$ac_cpp_err"; then 13924- ac_header_preproc=yes 13925-else 13926- echo "$as_me: failed program was:" >&5 13927-sed 's/^/| /' conftest.$ac_ext >&5 13928- 13929- ac_header_preproc=no 13930-fi 13931-rm -f conftest.err conftest.$ac_ext 13932-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 13933-echo "${ECHO_T}$ac_header_preproc" >&6 13934- 13935-# So? What about this header? 13936-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 13937- yes:no: ) 13938- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 13939-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 13940- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 13941-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 13942- ac_header_preproc=yes 13943- ;; 13944- no:yes:* ) 13945- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 13946-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 13947- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 13948-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 13949- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 13950-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 13951- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 13952-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 13953- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 13954-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 13955- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 13956-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 13957- ( 13958- cat <<\_ASBOX 13959-## ------------------------------------------ ## 13960-## Report this to the AC_PACKAGE_NAME lists. ## 13961-## ------------------------------------------ ## 13962-_ASBOX 13963- ) | 13964- sed "s/^/$as_me: WARNING: /" >&2 13965- ;; 13966-esac 13967-echo "$as_me:$LINENO: checking for $ac_header" >&5 13968-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 13969-if eval "test \"\${$as_ac_Header+set}\" = set"; then 13970- echo $ECHO_N "(cached) $ECHO_C" >&6 13971+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 13972+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 13973+echo "configure:9470: checking for $ac_hdr" >&5 13974+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 13975+ echo $ac_n "(cached) $ac_c" 1>&6 13976+else 13977+ cat > conftest.$ac_ext <<EOF 13978+#line 9475 "configure" 13979+#include "confdefs.h" 13980+#include <$ac_hdr> 13981+EOF 13982+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 13983+{ (eval echo configure:9480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 13984+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 13985+if test -z "$ac_err"; then 13986+ rm -rf conftest* 13987+ eval "ac_cv_header_$ac_safe=yes" 13988 else 13989- eval "$as_ac_Header=\$ac_header_preproc" 13990+ echo "$ac_err" >&5 13991+ echo "configure: failed program was:" >&5 13992+ cat conftest.$ac_ext >&5 13993+ rm -rf conftest* 13994+ eval "ac_cv_header_$ac_safe=no" 13995 fi 13996-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 13997-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 13998- 13999+rm -f conftest* 14000 fi 14001-if test `eval echo '${'$as_ac_Header'}'` = yes; then 14002- cat >>confdefs.h <<_ACEOF 14003-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 14004-_ACEOF 14005- 14006+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 14007+ echo "$ac_t""yes" 1>&6 14008+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 14009+ cat >> confdefs.h <<EOF 14010+#define $ac_tr_hdr 1 14011+EOF 14012+ 14013+else 14014+ echo "$ac_t""no" 1>&6 14015 fi 14016- 14017 done 14018 14019- 14020-for ac_header in sysexits.h 14021+ for ac_hdr in sysexits.h 14022 do 14023-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 14024-if eval "test \"\${$as_ac_Header+set}\" = set"; then 14025- echo "$as_me:$LINENO: checking for $ac_header" >&5 14026-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 14027-if eval "test \"\${$as_ac_Header+set}\" = set"; then 14028- echo $ECHO_N "(cached) $ECHO_C" >&6 14029-fi 14030-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 14031-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 14032-else 14033- # Is the header compilable? 14034-echo "$as_me:$LINENO: checking $ac_header usability" >&5 14035-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 14036-cat >conftest.$ac_ext <<_ACEOF 14037-/* confdefs.h. */ 14038-_ACEOF 14039-cat confdefs.h >>conftest.$ac_ext 14040-cat >>conftest.$ac_ext <<_ACEOF 14041-/* end confdefs.h. */ 14042-$ac_includes_default 14043-#include <$ac_header> 14044-_ACEOF 14045-rm -f conftest.$ac_objext 14046-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 14047- (eval $ac_compile) 2>conftest.er1 14048- ac_status=$? 14049- grep -v '^ *+' conftest.er1 >conftest.err 14050- rm -f conftest.er1 14051- cat conftest.err >&5 14052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14053- (exit $ac_status); } && 14054- { ac_try='test -z "$ac_c_werror_flag" 14055- || test ! -s conftest.err' 14056- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14057- (eval $ac_try) 2>&5 14058- ac_status=$? 14059- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14060- (exit $ac_status); }; } && 14061- { ac_try='test -s conftest.$ac_objext' 14062- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14063- (eval $ac_try) 2>&5 14064- ac_status=$? 14065- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14066- (exit $ac_status); }; }; then 14067- ac_header_compiler=yes 14068-else 14069- echo "$as_me: failed program was:" >&5 14070-sed 's/^/| /' conftest.$ac_ext >&5 14071- 14072-ac_header_compiler=no 14073-fi 14074-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 14075-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 14076-echo "${ECHO_T}$ac_header_compiler" >&6 14077- 14078-# Is the header present? 14079-echo "$as_me:$LINENO: checking $ac_header presence" >&5 14080-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 14081-cat >conftest.$ac_ext <<_ACEOF 14082-/* confdefs.h. */ 14083-_ACEOF 14084-cat confdefs.h >>conftest.$ac_ext 14085-cat >>conftest.$ac_ext <<_ACEOF 14086-/* end confdefs.h. */ 14087-#include <$ac_header> 14088-_ACEOF 14089-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 14090- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 14091- ac_status=$? 14092- grep -v '^ *+' conftest.er1 >conftest.err 14093- rm -f conftest.er1 14094- cat conftest.err >&5 14095- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14096- (exit $ac_status); } >/dev/null; then 14097- if test -s conftest.err; then 14098- ac_cpp_err=$ac_c_preproc_warn_flag 14099- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 14100- else 14101- ac_cpp_err= 14102- fi 14103-else 14104- ac_cpp_err=yes 14105-fi 14106-if test -z "$ac_cpp_err"; then 14107- ac_header_preproc=yes 14108-else 14109- echo "$as_me: failed program was:" >&5 14110-sed 's/^/| /' conftest.$ac_ext >&5 14111- 14112- ac_header_preproc=no 14113-fi 14114-rm -f conftest.err conftest.$ac_ext 14115-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 14116-echo "${ECHO_T}$ac_header_preproc" >&6 14117- 14118-# So? What about this header? 14119-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 14120- yes:no: ) 14121- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 14122-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 14123- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 14124-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 14125- ac_header_preproc=yes 14126- ;; 14127- no:yes:* ) 14128- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 14129-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 14130- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 14131-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 14132- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 14133-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 14134- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 14135-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 14136- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 14137-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 14138- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 14139-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 14140- ( 14141- cat <<\_ASBOX 14142-## ------------------------------------------ ## 14143-## Report this to the AC_PACKAGE_NAME lists. ## 14144-## ------------------------------------------ ## 14145-_ASBOX 14146- ) | 14147- sed "s/^/$as_me: WARNING: /" >&2 14148- ;; 14149-esac 14150-echo "$as_me:$LINENO: checking for $ac_header" >&5 14151-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 14152-if eval "test \"\${$as_ac_Header+set}\" = set"; then 14153- echo $ECHO_N "(cached) $ECHO_C" >&6 14154+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 14155+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 14156+echo "configure:9510: checking for $ac_hdr" >&5 14157+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 14158+ echo $ac_n "(cached) $ac_c" 1>&6 14159+else 14160+ cat > conftest.$ac_ext <<EOF 14161+#line 9515 "configure" 14162+#include "confdefs.h" 14163+#include <$ac_hdr> 14164+EOF 14165+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 14166+{ (eval echo configure:9520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 14167+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 14168+if test -z "$ac_err"; then 14169+ rm -rf conftest* 14170+ eval "ac_cv_header_$ac_safe=yes" 14171 else 14172- eval "$as_ac_Header=\$ac_header_preproc" 14173+ echo "$ac_err" >&5 14174+ echo "configure: failed program was:" >&5 14175+ cat conftest.$ac_ext >&5 14176+ rm -rf conftest* 14177+ eval "ac_cv_header_$ac_safe=no" 14178 fi 14179-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 14180-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 14181- 14182+rm -f conftest* 14183 fi 14184-if test `eval echo '${'$as_ac_Header'}'` = yes; then 14185- cat >>confdefs.h <<_ACEOF 14186-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 14187-_ACEOF 14188- 14189+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 14190+ echo "$ac_t""yes" 1>&6 14191+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 14192+ cat >> confdefs.h <<EOF 14193+#define $ac_tr_hdr 1 14194+EOF 14195+ 14196+else 14197+ echo "$ac_t""no" 1>&6 14198 fi 14199- 14200 done 14201 14202 14203+ 14204+ echo $ac_n "checking for prctl""... $ac_c" 1>&6 14205+echo "configure:9549: checking for prctl" >&5 14206 14207- echo "$as_me:$LINENO: checking for prctl" >&5 14208-echo $ECHO_N "checking for prctl... $ECHO_C" >&6 14209- 14210- cat >conftest.$ac_ext <<_ACEOF 14211-/* confdefs.h. */ 14212-_ACEOF 14213-cat confdefs.h >>conftest.$ac_ext 14214-cat >>conftest.$ac_ext <<_ACEOF 14215-/* end confdefs.h. */ 14216- #include <sys/prctl.h> 14217-int 14218-main () 14219-{ 14220+ cat > conftest.$ac_ext <<EOF 14221+#line 9552 "configure" 14222+#include "confdefs.h" 14223+ #include <sys/prctl.h> 14224+int main() { 14225 prctl(0, 0, 0, 0, 0); 14226- ; 14227- return 0; 14228-} 14229-_ACEOF 14230-rm -f conftest.$ac_objext 14231-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 14232- (eval $ac_compile) 2>conftest.er1 14233- ac_status=$? 14234- grep -v '^ *+' conftest.er1 >conftest.err 14235- rm -f conftest.er1 14236- cat conftest.err >&5 14237- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14238- (exit $ac_status); } && 14239- { ac_try='test -z "$ac_c_werror_flag" 14240- || test ! -s conftest.err' 14241- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14242- (eval $ac_try) 2>&5 14243- ac_status=$? 14244- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14245- (exit $ac_status); }; } && 14246- { ac_try='test -s conftest.$ac_objext' 14247- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14248- (eval $ac_try) 2>&5 14249- ac_status=$? 14250- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14251- (exit $ac_status); }; }; then 14252- 14253- 14254-cat >>confdefs.h <<\_ACEOF 14255+; return 0; } 14256+EOF 14257+if { (eval echo configure:9559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 14258+ rm -rf conftest* 14259+ 14260+ cat >> confdefs.h <<\EOF 14261 #define HAVE_PRCTL 1 14262-_ACEOF 14263- 14264- echo "$as_me:$LINENO: result: yes" >&5 14265-echo "${ECHO_T}yes" >&6 14266+EOF 14267 14268+ echo "$ac_t""yes" 1>&6 14269+ 14270 else 14271- echo "$as_me: failed program was:" >&5 14272-sed 's/^/| /' conftest.$ac_ext >&5 14273- 14274- 14275- echo "$as_me:$LINENO: result: no" >&5 14276-echo "${ECHO_T}no" >&6 14277- 14278+ echo "configure: failed program was:" >&5 14279+ cat conftest.$ac_ext >&5 14280+ rm -rf conftest* 14281+ 14282+ echo "$ac_t""no" 1>&6 14283+ 14284 fi 14285-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 14286- 14287+rm -f conftest* 14288 14289+ 14290 have_clock_gettime=no 14291 14292- echo "$as_me:$LINENO: checking for clock_gettime" >&5 14293-echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 14294+ echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 14295+echo "configure:9582: checking for clock_gettime" >&5 14296 14297- cat >conftest.$ac_ext <<_ACEOF 14298-/* confdefs.h. */ 14299-_ACEOF 14300-cat confdefs.h >>conftest.$ac_ext 14301-cat >>conftest.$ac_ext <<_ACEOF 14302-/* end confdefs.h. */ 14303- #include <time.h> 14304-int 14305-main () 14306-{ 14307+ cat > conftest.$ac_ext <<EOF 14308+#line 9585 "configure" 14309+#include "confdefs.h" 14310+ #include <time.h> 14311+int main() { 14312 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); 14313- ; 14314- return 0; 14315-} 14316-_ACEOF 14317-rm -f conftest.$ac_objext conftest$ac_exeext 14318-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14319- (eval $ac_link) 2>conftest.er1 14320- ac_status=$? 14321- grep -v '^ *+' conftest.er1 >conftest.err 14322- rm -f conftest.er1 14323- cat conftest.err >&5 14324- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14325- (exit $ac_status); } && 14326- { ac_try='test -z "$ac_c_werror_flag" 14327- || test ! -s conftest.err' 14328- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14329- (eval $ac_try) 2>&5 14330- ac_status=$? 14331- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14332- (exit $ac_status); }; } && 14333- { ac_try='test -s conftest$ac_exeext' 14334- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14335- (eval $ac_try) 2>&5 14336- ac_status=$? 14337- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14338- (exit $ac_status); }; }; then 14339- 14340+; return 0; } 14341+EOF 14342+if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 14343+ rm -rf conftest* 14344+ 14345 have_clock_gettime=yes 14346- echo "$as_me:$LINENO: result: yes" >&5 14347-echo "${ECHO_T}yes" >&6 14348- 14349+ echo "$ac_t""yes" 1>&6 14350+ 14351 else 14352- echo "$as_me: failed program was:" >&5 14353-sed 's/^/| /' conftest.$ac_ext >&5 14354- 14355- 14356- echo "$as_me:$LINENO: result: no" >&5 14357-echo "${ECHO_T}no" >&6 14358- 14359+ echo "configure: failed program was:" >&5 14360+ cat conftest.$ac_ext >&5 14361+ rm -rf conftest* 14362+ 14363+ echo "$ac_t""no" 1>&6 14364+ 14365 fi 14366-rm -f conftest.err conftest.$ac_objext \ 14367- conftest$ac_exeext conftest.$ac_ext 14368+rm -f conftest* 14369 14370 if test "$have_clock_gettime" = "no"; then 14371- echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 14372-echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 14373+ echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 14374+echo "configure:9610: checking for clock_gettime in -lrt" >&5 14375 14376 SAVED_LIBS="$LIBS" 14377 LIBS="$LIBS -lrt" 14378 14379- cat >conftest.$ac_ext <<_ACEOF 14380-/* confdefs.h. */ 14381-_ACEOF 14382-cat confdefs.h >>conftest.$ac_ext 14383-cat >>conftest.$ac_ext <<_ACEOF 14384-/* end confdefs.h. */ 14385- #include <time.h> 14386-int 14387-main () 14388-{ 14389+ cat > conftest.$ac_ext <<EOF 14390+#line 9616 "configure" 14391+#include "confdefs.h" 14392+ #include <time.h> 14393+int main() { 14394 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); 14395- ; 14396- return 0; 14397-} 14398-_ACEOF 14399-rm -f conftest.$ac_objext conftest$ac_exeext 14400-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14401- (eval $ac_link) 2>conftest.er1 14402- ac_status=$? 14403- grep -v '^ *+' conftest.er1 >conftest.err 14404- rm -f conftest.er1 14405- cat conftest.err >&5 14406- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14407- (exit $ac_status); } && 14408- { ac_try='test -z "$ac_c_werror_flag" 14409- || test ! -s conftest.err' 14410- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14411- (eval $ac_try) 2>&5 14412- ac_status=$? 14413- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14414- (exit $ac_status); }; } && 14415- { ac_try='test -s conftest$ac_exeext' 14416- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14417- (eval $ac_try) 2>&5 14418- ac_status=$? 14419- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14420- (exit $ac_status); }; }; then 14421- 14422+; return 0; } 14423+EOF 14424+if { (eval echo configure:9623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 14425+ rm -rf conftest* 14426+ 14427 have_clock_gettime=yes 14428- echo "$as_me:$LINENO: result: yes" >&5 14429-echo "${ECHO_T}yes" >&6 14430- 14431+ echo "$ac_t""yes" 1>&6 14432+ 14433 else 14434- echo "$as_me: failed program was:" >&5 14435-sed 's/^/| /' conftest.$ac_ext >&5 14436- 14437- 14438+ echo "configure: failed program was:" >&5 14439+ cat conftest.$ac_ext >&5 14440+ rm -rf conftest* 14441+ 14442 LIBS="$SAVED_LIBS" 14443- echo "$as_me:$LINENO: result: no" >&5 14444-echo "${ECHO_T}no" >&6 14445- 14446+ echo "$ac_t""no" 1>&6 14447+ 14448 fi 14449-rm -f conftest.err conftest.$ac_objext \ 14450- conftest$ac_exeext conftest.$ac_ext 14451+rm -f conftest* 14452 fi 14453 14454 if test "$have_clock_gettime" = "yes"; then 14455- 14456-cat >>confdefs.h <<\_ACEOF 14457+ cat >> confdefs.h <<\EOF 14458 #define HAVE_CLOCK_GETTIME 1 14459-_ACEOF 14460+EOF 14461 14462 fi 14463 14464 have_clock_get_time=no 14465 14466 if test "$have_clock_gettime" = "no"; then 14467- echo "$as_me:$LINENO: checking for clock_get_time" >&5 14468-echo $ECHO_N "checking for clock_get_time... $ECHO_C" >&6 14469+ echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6 14470+echo "configure:9652: checking for clock_get_time" >&5 14471 14472 if test "$cross_compiling" = yes; then 14473- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 14474-See \`config.log' for more details." >&5 14475-echo "$as_me: error: cannot run test program while cross compiling 14476-See \`config.log' for more details." >&2;} 14477- { (exit 1); exit 1; }; } 14478-else 14479- cat >conftest.$ac_ext <<_ACEOF 14480-/* confdefs.h. */ 14481-_ACEOF 14482-cat confdefs.h >>conftest.$ac_ext 14483-cat >>conftest.$ac_ext <<_ACEOF 14484-/* end confdefs.h. */ 14485+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } 14486+else 14487+ cat > conftest.$ac_ext <<EOF 14488+#line 9658 "configure" 14489+#include "confdefs.h" 14490 #include <mach/mach.h> 14491 #include <mach/clock.h> 14492 #include <mach/mach_error.h> 14493@@ -12384,126 +9676,77 @@ 14494 14495 return 0; 14496 } 14497- 14498-_ACEOF 14499-rm -f conftest$ac_exeext 14500-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14501- (eval $ac_link) 2>&5 14502- ac_status=$? 14503- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14504- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 14505- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14506- (eval $ac_try) 2>&5 14507- ac_status=$? 14508- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14509- (exit $ac_status); }; }; then 14510- 14511+ 14512+EOF 14513+if { (eval echo configure:9682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 14514+then 14515+ 14516 have_clock_get_time=yes 14517- echo "$as_me:$LINENO: result: yes" >&5 14518-echo "${ECHO_T}yes" >&6 14519- 14520+ echo "$ac_t""yes" 1>&6 14521+ 14522 else 14523- echo "$as_me: program exited with status $ac_status" >&5 14524-echo "$as_me: failed program was:" >&5 14525-sed 's/^/| /' conftest.$ac_ext >&5 14526- 14527-( exit $ac_status ) 14528- 14529- echo "$as_me:$LINENO: result: no" >&5 14530-echo "${ECHO_T}no" >&6 14531- 14532+ echo "configure: failed program was:" >&5 14533+ cat conftest.$ac_ext >&5 14534+ rm -fr conftest* 14535+ 14536+ echo "$ac_t""no" 1>&6 14537+ 14538 fi 14539-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 14540+rm -fr conftest* 14541 fi 14542+ 14543 fi 14544 14545 if test "$have_clock_get_time" = "yes"; then 14546- 14547-cat >>confdefs.h <<\_ACEOF 14548+ cat >> confdefs.h <<\EOF 14549 #define HAVE_CLOCK_GET_TIME 1 14550-_ACEOF 14551+EOF 14552 14553 fi 14554 14555- 14556+ 14557 have_ptrace=no 14558 have_broken_ptrace=no 14559 14560- echo "$as_me:$LINENO: checking for ptrace" >&5 14561-echo $ECHO_N "checking for ptrace... $ECHO_C" >&6 14562+ echo $ac_n "checking for ptrace""... $ac_c" 1>&6 14563+echo "configure:9713: checking for ptrace" >&5 14564 14565- cat >conftest.$ac_ext <<_ACEOF 14566-/* confdefs.h. */ 14567-_ACEOF 14568-cat confdefs.h >>conftest.$ac_ext 14569-cat >>conftest.$ac_ext <<_ACEOF 14570-/* end confdefs.h. */ 14571+ cat > conftest.$ac_ext <<EOF 14572+#line 9716 "configure" 14573+#include "confdefs.h" 14574 14575 #include <sys/types.h> 14576- #include <sys/ptrace.h> 14577-int 14578-main () 14579-{ 14580+ #include <sys/ptrace.h> 14581+int main() { 14582 ptrace(0, 0, (void *) 0, 0); 14583- ; 14584- return 0; 14585-} 14586-_ACEOF 14587-rm -f conftest.$ac_objext 14588-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 14589- (eval $ac_compile) 2>conftest.er1 14590- ac_status=$? 14591- grep -v '^ *+' conftest.er1 >conftest.err 14592- rm -f conftest.er1 14593- cat conftest.err >&5 14594- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14595- (exit $ac_status); } && 14596- { ac_try='test -z "$ac_c_werror_flag" 14597- || test ! -s conftest.err' 14598- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14599- (eval $ac_try) 2>&5 14600- ac_status=$? 14601- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14602- (exit $ac_status); }; } && 14603- { ac_try='test -s conftest.$ac_objext' 14604- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14605- (eval $ac_try) 2>&5 14606- ac_status=$? 14607- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14608- (exit $ac_status); }; }; then 14609- 14610+; return 0; } 14611+EOF 14612+if { (eval echo configure:9725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 14613+ rm -rf conftest* 14614+ 14615 have_ptrace=yes 14616- echo "$as_me:$LINENO: result: yes" >&5 14617-echo "${ECHO_T}yes" >&6 14618- 14619+ echo "$ac_t""yes" 1>&6 14620+ 14621 else 14622- echo "$as_me: failed program was:" >&5 14623-sed 's/^/| /' conftest.$ac_ext >&5 14624- 14625- 14626- echo "$as_me:$LINENO: result: no" >&5 14627-echo "${ECHO_T}no" >&6 14628- 14629+ echo "configure: failed program was:" >&5 14630+ cat conftest.$ac_ext >&5 14631+ rm -rf conftest* 14632+ 14633+ echo "$ac_t""no" 1>&6 14634+ 14635 fi 14636-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 14637+rm -f conftest* 14638 14639 if test "$have_ptrace" = "yes"; then 14640- echo "$as_me:$LINENO: checking whether ptrace works" >&5 14641-echo $ECHO_N "checking whether ptrace works... $ECHO_C" >&6 14642+ echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6 14643+echo "configure:9743: checking whether ptrace works" >&5 14644 14645 if test "$cross_compiling" = yes; then 14646- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 14647-See \`config.log' for more details." >&5 14648-echo "$as_me: error: cannot run test program while cross compiling 14649-See \`config.log' for more details." >&2;} 14650- { (exit 1); exit 1; }; } 14651-else 14652- cat >conftest.$ac_ext <<_ACEOF 14653-/* confdefs.h. */ 14654-_ACEOF 14655-cat confdefs.h >>conftest.$ac_ext 14656-cat >>conftest.$ac_ext <<_ACEOF 14657-/* end confdefs.h. */ 14658+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } 14659+else 14660+ cat > conftest.$ac_ext <<EOF 14661+#line 9749 "configure" 14662+#include "confdefs.h" 14663 14664 #include <unistd.h> 14665 #include <signal.h> 14666@@ -12571,117 +9814,74 @@ 14667 return 0; 14668 } 14669 } 14670- 14671-_ACEOF 14672-rm -f conftest$ac_exeext 14673-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14674- (eval $ac_link) 2>&5 14675- ac_status=$? 14676- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14677- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 14678- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14679- (eval $ac_try) 2>&5 14680- ac_status=$? 14681- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14682- (exit $ac_status); }; }; then 14683- 14684- echo "$as_me:$LINENO: result: yes" >&5 14685-echo "${ECHO_T}yes" >&6 14686- 14687-else 14688- echo "$as_me: program exited with status $ac_status" >&5 14689-echo "$as_me: failed program was:" >&5 14690-sed 's/^/| /' conftest.$ac_ext >&5 14691- 14692-( exit $ac_status ) 14693- 14694+ 14695+EOF 14696+if { (eval echo configure:9820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 14697+then 14698+ 14699+ echo "$ac_t""yes" 1>&6 14700+ 14701+else 14702+ echo "configure: failed program was:" >&5 14703+ cat conftest.$ac_ext >&5 14704+ rm -fr conftest* 14705+ 14706 have_ptrace=no 14707 have_broken_ptrace=yes 14708- echo "$as_me:$LINENO: result: no" >&5 14709-echo "${ECHO_T}no" >&6 14710- 14711+ echo "$ac_t""no" 1>&6 14712+ 14713 fi 14714-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 14715+rm -fr conftest* 14716 fi 14717+ 14718 fi 14719 14720 if test "$have_ptrace" = "yes"; then 14721- 14722-cat >>confdefs.h <<\_ACEOF 14723+ cat >> confdefs.h <<\EOF 14724 #define HAVE_PTRACE 1 14725-_ACEOF 14726+EOF 14727 14728 fi 14729 14730 have_mach_vm_read=no 14731 14732 if test "$have_broken_ptrace" = "yes"; then 14733- echo "$as_me:$LINENO: checking for mach_vm_read" >&5 14734-echo $ECHO_N "checking for mach_vm_read... $ECHO_C" >&6 14735+ echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6 14736+echo "configure:9851: checking for mach_vm_read" >&5 14737 14738- cat >conftest.$ac_ext <<_ACEOF 14739-/* confdefs.h. */ 14740-_ACEOF 14741-cat confdefs.h >>conftest.$ac_ext 14742-cat >>conftest.$ac_ext <<_ACEOF 14743-/* end confdefs.h. */ 14744+ cat > conftest.$ac_ext <<EOF 14745+#line 9854 "configure" 14746+#include "confdefs.h" 14747 #include <mach/mach.h> 14748 #include <mach/mach_vm.h> 14749- 14750-int 14751-main () 14752-{ 14753+ 14754+int main() { 14755 14756 mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0); 14757- 14758- ; 14759- return 0; 14760-} 14761-_ACEOF 14762-rm -f conftest.$ac_objext 14763-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 14764- (eval $ac_compile) 2>conftest.er1 14765- ac_status=$? 14766- grep -v '^ *+' conftest.er1 >conftest.err 14767- rm -f conftest.er1 14768- cat conftest.err >&5 14769- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14770- (exit $ac_status); } && 14771- { ac_try='test -z "$ac_c_werror_flag" 14772- || test ! -s conftest.err' 14773- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14774- (eval $ac_try) 2>&5 14775- ac_status=$? 14776- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14777- (exit $ac_status); }; } && 14778- { ac_try='test -s conftest.$ac_objext' 14779- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14780- (eval $ac_try) 2>&5 14781- ac_status=$? 14782- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14783- (exit $ac_status); }; }; then 14784- 14785+ 14786+; return 0; } 14787+EOF 14788+if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 14789+ rm -rf conftest* 14790+ 14791 have_mach_vm_read=yes 14792- echo "$as_me:$LINENO: result: yes" >&5 14793-echo "${ECHO_T}yes" >&6 14794- 14795+ echo "$ac_t""yes" 1>&6 14796+ 14797 else 14798- echo "$as_me: failed program was:" >&5 14799-sed 's/^/| /' conftest.$ac_ext >&5 14800- 14801- 14802- echo "$as_me:$LINENO: result: no" >&5 14803-echo "${ECHO_T}no" >&6 14804- 14805+ echo "configure: failed program was:" >&5 14806+ cat conftest.$ac_ext >&5 14807+ rm -rf conftest* 14808+ 14809+ echo "$ac_t""no" 1>&6 14810+ 14811 fi 14812-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 14813+rm -f conftest* 14814 fi 14815 14816 if test "$have_mach_vm_read" = "yes"; then 14817- 14818-cat >>confdefs.h <<\_ACEOF 14819+ cat >> confdefs.h <<\EOF 14820 #define HAVE_MACH_VM_READ 1 14821-_ACEOF 14822+EOF 14823 14824 fi 14825 14826@@ -12696,22 +9896,15 @@ 14827 fi 14828 14829 if test -n "$proc_mem_file" ; then 14830- echo "$as_me:$LINENO: checking for proc mem file" >&5 14831-echo $ECHO_N "checking for proc mem file... $ECHO_C" >&6 14832- 14833+ echo $ac_n "checking for proc mem file""... $ac_c" 1>&6 14834+echo "configure:9901: checking for proc mem file" >&5 14835+ 14836 if test "$cross_compiling" = yes; then 14837- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 14838-See \`config.log' for more details." >&5 14839-echo "$as_me: error: cannot run test program while cross compiling 14840-See \`config.log' for more details." >&2;} 14841- { (exit 1); exit 1; }; } 14842-else 14843- cat >conftest.$ac_ext <<_ACEOF 14844-/* confdefs.h. */ 14845-_ACEOF 14846-cat confdefs.h >>conftest.$ac_ext 14847-cat >>conftest.$ac_ext <<_ACEOF 14848-/* end confdefs.h. */ 14849+ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } 14850+else 14851+ cat > conftest.$ac_ext <<EOF 14852+#line 9907 "configure" 14853+#include "confdefs.h" 14854 14855 #define _GNU_SOURCE 14856 #define _FILE_OFFSET_BITS 64 14857@@ -12738,471 +9931,271 @@ 14858 close(fd); 14859 return v1 != v2; 14860 } 14861- 14862-_ACEOF 14863-rm -f conftest$ac_exeext 14864-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14865- (eval $ac_link) 2>&5 14866- ac_status=$? 14867- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14868- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 14869- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14870- (eval $ac_try) 2>&5 14871- ac_status=$? 14872- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14873- (exit $ac_status); }; }; then 14874- 14875- echo "$as_me:$LINENO: result: $proc_mem_file" >&5 14876-echo "${ECHO_T}$proc_mem_file" >&6 14877- 14878-else 14879- echo "$as_me: program exited with status $ac_status" >&5 14880-echo "$as_me: failed program was:" >&5 14881-sed 's/^/| /' conftest.$ac_ext >&5 14882- 14883-( exit $ac_status ) 14884- 14885+ 14886+EOF 14887+if { (eval echo configure:9937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 14888+then 14889+ 14890+ echo "$ac_t""$proc_mem_file" 1>&6 14891+ 14892+else 14893+ echo "configure: failed program was:" >&5 14894+ cat conftest.$ac_ext >&5 14895+ rm -fr conftest* 14896+ 14897 proc_mem_file="" 14898- echo "$as_me:$LINENO: result: no" >&5 14899-echo "${ECHO_T}no" >&6 14900- 14901+ echo "$ac_t""no" 1>&6 14902+ 14903 fi 14904-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 14905+rm -fr conftest* 14906 fi 14907- fi 14908 14909+ fi 14910+ 14911 if test -n "$proc_mem_file"; then 14912- 14913-cat >>confdefs.h <<_ACEOF 14914+ cat >> confdefs.h <<EOF 14915 #define PROC_MEM_FILE "$proc_mem_file" 14916-_ACEOF 14917+EOF 14918 14919 fi 14920- 14921+ 14922 fpm_trace_type="" 14923 14924 if test "$have_ptrace" = "yes"; then 14925 fpm_trace_type=ptrace 14926- 14927+ 14928 elif test -n "$proc_mem_file"; then 14929 fpm_trace_type=pread 14930- 14931+ 14932 elif test "$have_mach_vm_read" = "yes" ; then 14933 fpm_trace_type=mach 14934- 14935+ 14936 else 14937- { echo "$as_me:$LINENO: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5 14938-echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;} 14939+ echo "configure: warning: FPM Trace - ptrace, pread, or mach: could not be found" 1>&2 14940 fi 14941+ 14942 14943+ 14944+ echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6 14945+echo "configure:9981: checking if gcc supports __sync_bool_compare_and_swap" >&5 14946+ cat > conftest.$ac_ext <<EOF 14947+#line 9983 "configure" 14948+#include "confdefs.h" 14949 14950- 14951- echo "$as_me:$LINENO: checking if gcc supports __sync_bool_compare_and_swap" >&5 14952-echo $ECHO_N "checking if gcc supports __sync_bool_compare_and_swap... $ECHO_C" >&6 14953- cat >conftest.$ac_ext <<_ACEOF 14954-/* confdefs.h. */ 14955-_ACEOF 14956-cat confdefs.h >>conftest.$ac_ext 14957-cat >>conftest.$ac_ext <<_ACEOF 14958-/* end confdefs.h. */ 14959- 14960-int 14961-main () 14962-{ 14963+int main() { 14964 14965 int variable = 1; 14966 return (__sync_bool_compare_and_swap(&variable, 1, 2) 14967 && __sync_add_and_fetch(&variable, 1)) ? 1 : 0; 14968- 14969- ; 14970- return 0; 14971-} 14972-_ACEOF 14973-rm -f conftest.$ac_objext conftest$ac_exeext 14974-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 14975- (eval $ac_link) 2>conftest.er1 14976- ac_status=$? 14977- grep -v '^ *+' conftest.er1 >conftest.err 14978- rm -f conftest.er1 14979- cat conftest.err >&5 14980- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14981- (exit $ac_status); } && 14982- { ac_try='test -z "$ac_c_werror_flag" 14983- || test ! -s conftest.err' 14984- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14985- (eval $ac_try) 2>&5 14986- ac_status=$? 14987- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14988- (exit $ac_status); }; } && 14989- { ac_try='test -s conftest$ac_exeext' 14990- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 14991- (eval $ac_try) 2>&5 14992- ac_status=$? 14993- echo "$as_me:$LINENO: \$? = $ac_status" >&5 14994- (exit $ac_status); }; }; then 14995- 14996- echo "$as_me:$LINENO: result: yes" >&5 14997-echo "${ECHO_T}yes" >&6 14998- 14999-cat >>confdefs.h <<\_ACEOF 15000+ 15001+; return 0; } 15002+EOF 15003+if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 15004+ rm -rf conftest* 15005+ 15006+ echo "$ac_t""yes" 1>&6 15007+ cat >> confdefs.h <<\EOF 15008 #define HAVE_BUILTIN_ATOMIC 1 15009-_ACEOF 15010- 15011+EOF 15012 15013+ 15014 else 15015- echo "$as_me: failed program was:" >&5 15016-sed 's/^/| /' conftest.$ac_ext >&5 15017- 15018- 15019- echo "$as_me:$LINENO: result: no" >&5 15020-echo "${ECHO_T}no" >&6 15021- 15022+ echo "configure: failed program was:" >&5 15023+ cat conftest.$ac_ext >&5 15024+ rm -rf conftest* 15025+ 15026+ echo "$ac_t""no" 1>&6 15027+ 15028 fi 15029-rm -f conftest.err conftest.$ac_objext \ 15030- conftest$ac_exeext conftest.$ac_ext 15031- 15032+rm -f conftest* 15033 15034+ 15035 have_lq=no 15036 15037- echo "$as_me:$LINENO: checking for TCP_INFO" >&5 15038-echo $ECHO_N "checking for TCP_INFO... $ECHO_C" >&6 15039+ echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6 15040+echo "configure:10017: checking for TCP_INFO" >&5 15041 15042- cat >conftest.$ac_ext <<_ACEOF 15043-/* confdefs.h. */ 15044-_ACEOF 15045-cat confdefs.h >>conftest.$ac_ext 15046-cat >>conftest.$ac_ext <<_ACEOF 15047-/* end confdefs.h. */ 15048- #include <netinet/tcp.h> 15049-int 15050-main () 15051-{ 15052+ cat > conftest.$ac_ext <<EOF 15053+#line 10020 "configure" 15054+#include "confdefs.h" 15055+ #include <netinet/tcp.h> 15056+int main() { 15057 struct tcp_info ti; int x = TCP_INFO; 15058- ; 15059- return 0; 15060-} 15061-_ACEOF 15062-rm -f conftest.$ac_objext 15063-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15064- (eval $ac_compile) 2>conftest.er1 15065- ac_status=$? 15066- grep -v '^ *+' conftest.er1 >conftest.err 15067- rm -f conftest.er1 15068- cat conftest.err >&5 15069- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15070- (exit $ac_status); } && 15071- { ac_try='test -z "$ac_c_werror_flag" 15072- || test ! -s conftest.err' 15073- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15074- (eval $ac_try) 2>&5 15075- ac_status=$? 15076- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15077- (exit $ac_status); }; } && 15078- { ac_try='test -s conftest.$ac_objext' 15079- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15080- (eval $ac_try) 2>&5 15081- ac_status=$? 15082- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15083- (exit $ac_status); }; }; then 15084- 15085+; return 0; } 15086+EOF 15087+if { (eval echo configure:10027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15088+ rm -rf conftest* 15089+ 15090 have_lq=tcp_info 15091- echo "$as_me:$LINENO: result: yes" >&5 15092-echo "${ECHO_T}yes" >&6 15093- 15094+ echo "$ac_t""yes" 1>&6 15095+ 15096 else 15097- echo "$as_me: failed program was:" >&5 15098-sed 's/^/| /' conftest.$ac_ext >&5 15099- 15100- 15101- echo "$as_me:$LINENO: result: no" >&5 15102-echo "${ECHO_T}no" >&6 15103- 15104+ echo "configure: failed program was:" >&5 15105+ cat conftest.$ac_ext >&5 15106+ rm -rf conftest* 15107+ 15108+ echo "$ac_t""no" 1>&6 15109+ 15110 fi 15111-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15112+rm -f conftest* 15113 15114 if test "$have_lq" = "tcp_info"; then 15115- 15116-cat >>confdefs.h <<\_ACEOF 15117+ cat >> confdefs.h <<\EOF 15118 #define HAVE_LQ_TCP_INFO 1 15119-_ACEOF 15120+EOF 15121 15122 fi 15123 15124 if test "$have_lq" = "no" ; then 15125- echo "$as_me:$LINENO: checking for SO_LISTENQLEN" >&5 15126-echo $ECHO_N "checking for SO_LISTENQLEN... $ECHO_C" >&6 15127+ echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6 15128+echo "configure:10052: checking for SO_LISTENQLEN" >&5 15129 15130- cat >conftest.$ac_ext <<_ACEOF 15131-/* confdefs.h. */ 15132-_ACEOF 15133-cat confdefs.h >>conftest.$ac_ext 15134-cat >>conftest.$ac_ext <<_ACEOF 15135-/* end confdefs.h. */ 15136- #include <sys/socket.h> 15137-int 15138-main () 15139-{ 15140+ cat > conftest.$ac_ext <<EOF 15141+#line 10055 "configure" 15142+#include "confdefs.h" 15143+ #include <sys/socket.h> 15144+int main() { 15145 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN; 15146- ; 15147- return 0; 15148-} 15149-_ACEOF 15150-rm -f conftest.$ac_objext 15151-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15152- (eval $ac_compile) 2>conftest.er1 15153- ac_status=$? 15154- grep -v '^ *+' conftest.er1 >conftest.err 15155- rm -f conftest.er1 15156- cat conftest.err >&5 15157- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15158- (exit $ac_status); } && 15159- { ac_try='test -z "$ac_c_werror_flag" 15160- || test ! -s conftest.err' 15161- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15162- (eval $ac_try) 2>&5 15163- ac_status=$? 15164- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15165- (exit $ac_status); }; } && 15166- { ac_try='test -s conftest.$ac_objext' 15167- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15168- (eval $ac_try) 2>&5 15169- ac_status=$? 15170- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15171- (exit $ac_status); }; }; then 15172- 15173+; return 0; } 15174+EOF 15175+if { (eval echo configure:10062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15176+ rm -rf conftest* 15177+ 15178 have_lq=so_listenq 15179- echo "$as_me:$LINENO: result: yes" >&5 15180-echo "${ECHO_T}yes" >&6 15181- 15182+ echo "$ac_t""yes" 1>&6 15183+ 15184 else 15185- echo "$as_me: failed program was:" >&5 15186-sed 's/^/| /' conftest.$ac_ext >&5 15187- 15188- 15189- echo "$as_me:$LINENO: result: no" >&5 15190-echo "${ECHO_T}no" >&6 15191- 15192+ echo "configure: failed program was:" >&5 15193+ cat conftest.$ac_ext >&5 15194+ rm -rf conftest* 15195+ 15196+ echo "$ac_t""no" 1>&6 15197+ 15198 fi 15199-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15200+rm -f conftest* 15201 15202 if test "$have_lq" = "tcp_info"; then 15203- 15204-cat >>confdefs.h <<\_ACEOF 15205+ cat >> confdefs.h <<\EOF 15206 #define HAVE_LQ_SO_LISTENQ 1 15207-_ACEOF 15208+EOF 15209 15210 fi 15211 fi 15212 15213+ 15214+ echo $ac_n "checking for sysconf""... $ac_c" 1>&6 15215+echo "configure:10088: checking for sysconf" >&5 15216 15217- echo "$as_me:$LINENO: checking for sysconf" >&5 15218-echo $ECHO_N "checking for sysconf... $ECHO_C" >&6 15219- 15220- cat >conftest.$ac_ext <<_ACEOF 15221-/* confdefs.h. */ 15222-_ACEOF 15223-cat confdefs.h >>conftest.$ac_ext 15224-cat >>conftest.$ac_ext <<_ACEOF 15225-/* end confdefs.h. */ 15226- #include <unistd.h> 15227-int 15228-main () 15229-{ 15230+ cat > conftest.$ac_ext <<EOF 15231+#line 10091 "configure" 15232+#include "confdefs.h" 15233+ #include <unistd.h> 15234+int main() { 15235 sysconf(_SC_CLK_TCK); 15236- ; 15237- return 0; 15238-} 15239-_ACEOF 15240-rm -f conftest.$ac_objext 15241-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15242- (eval $ac_compile) 2>conftest.er1 15243- ac_status=$? 15244- grep -v '^ *+' conftest.er1 >conftest.err 15245- rm -f conftest.er1 15246- cat conftest.err >&5 15247- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15248- (exit $ac_status); } && 15249- { ac_try='test -z "$ac_c_werror_flag" 15250- || test ! -s conftest.err' 15251- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15252- (eval $ac_try) 2>&5 15253- ac_status=$? 15254- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15255- (exit $ac_status); }; } && 15256- { ac_try='test -s conftest.$ac_objext' 15257- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15258- (eval $ac_try) 2>&5 15259- ac_status=$? 15260- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15261- (exit $ac_status); }; }; then 15262- 15263- 15264-cat >>confdefs.h <<\_ACEOF 15265+; return 0; } 15266+EOF 15267+if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15268+ rm -rf conftest* 15269+ 15270+ cat >> confdefs.h <<\EOF 15271 #define HAVE_SYSCONF 1 15272-_ACEOF 15273- 15274- echo "$as_me:$LINENO: result: yes" >&5 15275-echo "${ECHO_T}yes" >&6 15276+EOF 15277 15278+ echo "$ac_t""yes" 1>&6 15279+ 15280 else 15281- echo "$as_me: failed program was:" >&5 15282-sed 's/^/| /' conftest.$ac_ext >&5 15283- 15284- 15285- echo "$as_me:$LINENO: result: no" >&5 15286-echo "${ECHO_T}no" >&6 15287- 15288+ echo "configure: failed program was:" >&5 15289+ cat conftest.$ac_ext >&5 15290+ rm -rf conftest* 15291+ 15292+ echo "$ac_t""no" 1>&6 15293+ 15294 fi 15295-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15296- 15297+rm -f conftest* 15298 15299- echo "$as_me:$LINENO: checking for times" >&5 15300-echo $ECHO_N "checking for times... $ECHO_C" >&6 15301+ 15302+ echo $ac_n "checking for times""... $ac_c" 1>&6 15303+echo "configure:10119: checking for times" >&5 15304 15305- cat >conftest.$ac_ext <<_ACEOF 15306-/* confdefs.h. */ 15307-_ACEOF 15308-cat confdefs.h >>conftest.$ac_ext 15309-cat >>conftest.$ac_ext <<_ACEOF 15310-/* end confdefs.h. */ 15311- #include <sys/times.h> 15312-int 15313-main () 15314-{ 15315+ cat > conftest.$ac_ext <<EOF 15316+#line 10122 "configure" 15317+#include "confdefs.h" 15318+ #include <sys/times.h> 15319+int main() { 15320 struct tms t; times(&t); 15321- ; 15322- return 0; 15323-} 15324-_ACEOF 15325-rm -f conftest.$ac_objext 15326-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15327- (eval $ac_compile) 2>conftest.er1 15328- ac_status=$? 15329- grep -v '^ *+' conftest.er1 >conftest.err 15330- rm -f conftest.er1 15331- cat conftest.err >&5 15332- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15333- (exit $ac_status); } && 15334- { ac_try='test -z "$ac_c_werror_flag" 15335- || test ! -s conftest.err' 15336- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15337- (eval $ac_try) 2>&5 15338- ac_status=$? 15339- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15340- (exit $ac_status); }; } && 15341- { ac_try='test -s conftest.$ac_objext' 15342- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15343- (eval $ac_try) 2>&5 15344- ac_status=$? 15345- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15346- (exit $ac_status); }; }; then 15347- 15348- 15349-cat >>confdefs.h <<\_ACEOF 15350+; return 0; } 15351+EOF 15352+if { (eval echo configure:10129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15353+ rm -rf conftest* 15354+ 15355+ cat >> confdefs.h <<\EOF 15356 #define HAVE_TIMES 1 15357-_ACEOF 15358- 15359- echo "$as_me:$LINENO: result: yes" >&5 15360-echo "${ECHO_T}yes" >&6 15361+EOF 15362 15363+ echo "$ac_t""yes" 1>&6 15364+ 15365 else 15366- echo "$as_me: failed program was:" >&5 15367-sed 's/^/| /' conftest.$ac_ext >&5 15368- 15369- 15370- echo "$as_me:$LINENO: result: no" >&5 15371-echo "${ECHO_T}no" >&6 15372- 15373+ echo "configure: failed program was:" >&5 15374+ cat conftest.$ac_ext >&5 15375+ rm -rf conftest* 15376+ 15377+ echo "$ac_t""no" 1>&6 15378+ 15379 fi 15380-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15381- 15382- 15383- echo "$as_me:$LINENO: checking for kqueue" >&5 15384-echo $ECHO_N "checking for kqueue... $ECHO_C" >&6 15385+rm -f conftest* 15386 15387- cat >conftest.$ac_ext <<_ACEOF 15388-/* confdefs.h. */ 15389-_ACEOF 15390-cat confdefs.h >>conftest.$ac_ext 15391-cat >>conftest.$ac_ext <<_ACEOF 15392-/* end confdefs.h. */ 15393+ 15394+ echo $ac_n "checking for kqueue""... $ac_c" 1>&6 15395+echo "configure:10150: checking for kqueue" >&5 15396 15397+ cat > conftest.$ac_ext <<EOF 15398+#line 10153 "configure" 15399+#include "confdefs.h" 15400+ 15401 #include <sys/types.h> 15402 #include <sys/event.h> 15403 #include <sys/time.h> 15404- 15405-int 15406-main () 15407-{ 15408+ 15409+int main() { 15410 15411 int kfd; 15412 struct kevent k; 15413 kfd = kqueue(); 15414 /* 0 -> STDIN_FILENO */ 15415 EV_SET(&k, 0, EVFILT_READ , EV_ADD | EV_CLEAR, 0, 0, NULL); 15416- 15417- ; 15418- return 0; 15419-} 15420-_ACEOF 15421-rm -f conftest.$ac_objext 15422-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15423- (eval $ac_compile) 2>conftest.er1 15424- ac_status=$? 15425- grep -v '^ *+' conftest.er1 >conftest.err 15426- rm -f conftest.er1 15427- cat conftest.err >&5 15428- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15429- (exit $ac_status); } && 15430- { ac_try='test -z "$ac_c_werror_flag" 15431- || test ! -s conftest.err' 15432- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15433- (eval $ac_try) 2>&5 15434- ac_status=$? 15435- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15436- (exit $ac_status); }; } && 15437- { ac_try='test -s conftest.$ac_objext' 15438- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15439- (eval $ac_try) 2>&5 15440- ac_status=$? 15441- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15442- (exit $ac_status); }; }; then 15443- 15444- 15445-cat >>confdefs.h <<\_ACEOF 15446+ 15447+; return 0; } 15448+EOF 15449+if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15450+ rm -rf conftest* 15451+ 15452+ cat >> confdefs.h <<\EOF 15453 #define HAVE_KQUEUE 1 15454-_ACEOF 15455- 15456- echo "$as_me:$LINENO: result: yes" >&5 15457-echo "${ECHO_T}yes" >&6 15458+EOF 15459 15460+ echo "$ac_t""yes" 1>&6 15461+ 15462 else 15463- echo "$as_me: failed program was:" >&5 15464-sed 's/^/| /' conftest.$ac_ext >&5 15465- 15466- 15467- echo "$as_me:$LINENO: result: no" >&5 15468-echo "${ECHO_T}no" >&6 15469- 15470+ echo "configure: failed program was:" >&5 15471+ cat conftest.$ac_ext >&5 15472+ rm -rf conftest* 15473+ 15474+ echo "$ac_t""no" 1>&6 15475+ 15476 fi 15477-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15478- 15479- 15480- echo "$as_me:$LINENO: checking for port framework" >&5 15481-echo $ECHO_N "checking for port framework... $ECHO_C" >&6 15482+rm -f conftest* 15483 15484- cat >conftest.$ac_ext <<_ACEOF 15485-/* confdefs.h. */ 15486-_ACEOF 15487-cat confdefs.h >>conftest.$ac_ext 15488-cat >>conftest.$ac_ext <<_ACEOF 15489-/* end confdefs.h. */ 15490+ 15491+ echo $ac_n "checking for port framework""... $ac_c" 1>&6 15492+echo "configure:10191: checking for port framework" >&5 15493 15494+ cat > conftest.$ac_ext <<EOF 15495+#line 10194 "configure" 15496+#include "confdefs.h" 15497+ 15498 #include <port.h> 15499- 15500-int 15501-main () 15502-{ 15503+ 15504+int main() { 15505 15506 int port; 15507 15508@@ -13210,70 +10203,40 @@ 15509 if (port < 0) { 15510 return 1; 15511 } 15512- 15513- ; 15514- return 0; 15515-} 15516-_ACEOF 15517-rm -f conftest.$ac_objext 15518-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15519- (eval $ac_compile) 2>conftest.er1 15520- ac_status=$? 15521- grep -v '^ *+' conftest.er1 >conftest.err 15522- rm -f conftest.er1 15523- cat conftest.err >&5 15524- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15525- (exit $ac_status); } && 15526- { ac_try='test -z "$ac_c_werror_flag" 15527- || test ! -s conftest.err' 15528- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15529- (eval $ac_try) 2>&5 15530- ac_status=$? 15531- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15532- (exit $ac_status); }; } && 15533- { ac_try='test -s conftest.$ac_objext' 15534- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15535- (eval $ac_try) 2>&5 15536- ac_status=$? 15537- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15538- (exit $ac_status); }; }; then 15539- 15540- 15541-cat >>confdefs.h <<\_ACEOF 15542+ 15543+; return 0; } 15544+EOF 15545+if { (eval echo configure:10210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15546+ rm -rf conftest* 15547+ 15548+ cat >> confdefs.h <<\EOF 15549 #define HAVE_PORT 1 15550-_ACEOF 15551- 15552- echo "$as_me:$LINENO: result: yes" >&5 15553-echo "${ECHO_T}yes" >&6 15554+EOF 15555 15556+ echo "$ac_t""yes" 1>&6 15557+ 15558 else 15559- echo "$as_me: failed program was:" >&5 15560-sed 's/^/| /' conftest.$ac_ext >&5 15561- 15562- 15563- echo "$as_me:$LINENO: result: no" >&5 15564-echo "${ECHO_T}no" >&6 15565- 15566+ echo "configure: failed program was:" >&5 15567+ cat conftest.$ac_ext >&5 15568+ rm -rf conftest* 15569+ 15570+ echo "$ac_t""no" 1>&6 15571+ 15572 fi 15573-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15574- 15575- 15576- echo "$as_me:$LINENO: checking for /dev/poll" >&5 15577-echo $ECHO_N "checking for /dev/poll... $ECHO_C" >&6 15578+rm -f conftest* 15579 15580- cat >conftest.$ac_ext <<_ACEOF 15581-/* confdefs.h. */ 15582-_ACEOF 15583-cat confdefs.h >>conftest.$ac_ext 15584-cat >>conftest.$ac_ext <<_ACEOF 15585-/* end confdefs.h. */ 15586+ 15587+ echo $ac_n "checking for /dev/poll""... $ac_c" 1>&6 15588+echo "configure:10231: checking for /dev/poll" >&5 15589 15590+ cat > conftest.$ac_ext <<EOF 15591+#line 10234 "configure" 15592+#include "confdefs.h" 15593+ 15594 #include <stdio.h> 15595 #include <sys/devpoll.h> 15596- 15597-int 15598-main () 15599-{ 15600+ 15601+int main() { 15602 15603 int n, dp; 15604 struct dvpoll dvp; 15605@@ -13282,69 +10245,39 @@ 15606 dvp.dp_nfds = 0; 15607 dvp.dp_timeout = 0; 15608 n = ioctl(dp, DP_POLL, &dvp) 15609- 15610- ; 15611- return 0; 15612-} 15613-_ACEOF 15614-rm -f conftest.$ac_objext 15615-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15616- (eval $ac_compile) 2>conftest.er1 15617- ac_status=$? 15618- grep -v '^ *+' conftest.er1 >conftest.err 15619- rm -f conftest.er1 15620- cat conftest.err >&5 15621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15622- (exit $ac_status); } && 15623- { ac_try='test -z "$ac_c_werror_flag" 15624- || test ! -s conftest.err' 15625- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15626- (eval $ac_try) 2>&5 15627- ac_status=$? 15628- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15629- (exit $ac_status); }; } && 15630- { ac_try='test -s conftest.$ac_objext' 15631- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15632- (eval $ac_try) 2>&5 15633- ac_status=$? 15634- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15635- (exit $ac_status); }; }; then 15636- 15637- 15638-cat >>confdefs.h <<\_ACEOF 15639+ 15640+; return 0; } 15641+EOF 15642+if { (eval echo configure:10252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15643+ rm -rf conftest* 15644+ 15645+ cat >> confdefs.h <<\EOF 15646 #define HAVE_DEVPOLL 1 15647-_ACEOF 15648- 15649- echo "$as_me:$LINENO: result: yes" >&5 15650-echo "${ECHO_T}yes" >&6 15651+EOF 15652 15653+ echo "$ac_t""yes" 1>&6 15654+ 15655 else 15656- echo "$as_me: failed program was:" >&5 15657-sed 's/^/| /' conftest.$ac_ext >&5 15658- 15659- 15660- echo "$as_me:$LINENO: result: no" >&5 15661-echo "${ECHO_T}no" >&6 15662- 15663+ echo "configure: failed program was:" >&5 15664+ cat conftest.$ac_ext >&5 15665+ rm -rf conftest* 15666+ 15667+ echo "$ac_t""no" 1>&6 15668+ 15669 fi 15670-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15671- 15672- 15673- echo "$as_me:$LINENO: checking for epoll" >&5 15674-echo $ECHO_N "checking for epoll... $ECHO_C" >&6 15675+rm -f conftest* 15676 15677- cat >conftest.$ac_ext <<_ACEOF 15678-/* confdefs.h. */ 15679-_ACEOF 15680-cat confdefs.h >>conftest.$ac_ext 15681-cat >>conftest.$ac_ext <<_ACEOF 15682-/* end confdefs.h. */ 15683+ 15684+ echo $ac_n "checking for epoll""... $ac_c" 1>&6 15685+echo "configure:10273: checking for epoll" >&5 15686 15687+ cat > conftest.$ac_ext <<EOF 15688+#line 10276 "configure" 15689+#include "confdefs.h" 15690+ 15691 #include <sys/epoll.h> 15692- 15693-int 15694-main () 15695-{ 15696+ 15697+int main() { 15698 15699 int epollfd; 15700 struct epoll_event e; 15701@@ -13365,69 +10298,39 @@ 15702 if (epoll_wait(epollfd, &e, 1, 1) < 0) { 15703 return 1; 15704 } 15705- 15706- ; 15707- return 0; 15708-} 15709-_ACEOF 15710-rm -f conftest.$ac_objext 15711-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15712- (eval $ac_compile) 2>conftest.er1 15713- ac_status=$? 15714- grep -v '^ *+' conftest.er1 >conftest.err 15715- rm -f conftest.er1 15716- cat conftest.err >&5 15717- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15718- (exit $ac_status); } && 15719- { ac_try='test -z "$ac_c_werror_flag" 15720- || test ! -s conftest.err' 15721- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15722- (eval $ac_try) 2>&5 15723- ac_status=$? 15724- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15725- (exit $ac_status); }; } && 15726- { ac_try='test -s conftest.$ac_objext' 15727- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15728- (eval $ac_try) 2>&5 15729- ac_status=$? 15730- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15731- (exit $ac_status); }; }; then 15732- 15733- 15734-cat >>confdefs.h <<\_ACEOF 15735+ 15736+; return 0; } 15737+EOF 15738+if { (eval echo configure:10305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15739+ rm -rf conftest* 15740+ 15741+ cat >> confdefs.h <<\EOF 15742 #define HAVE_EPOLL 1 15743-_ACEOF 15744- 15745- echo "$as_me:$LINENO: result: yes" >&5 15746-echo "${ECHO_T}yes" >&6 15747+EOF 15748 15749+ echo "$ac_t""yes" 1>&6 15750+ 15751 else 15752- echo "$as_me: failed program was:" >&5 15753-sed 's/^/| /' conftest.$ac_ext >&5 15754- 15755- 15756- echo "$as_me:$LINENO: result: no" >&5 15757-echo "${ECHO_T}no" >&6 15758- 15759+ echo "configure: failed program was:" >&5 15760+ cat conftest.$ac_ext >&5 15761+ rm -rf conftest* 15762+ 15763+ echo "$ac_t""no" 1>&6 15764+ 15765 fi 15766-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15767- 15768- 15769- echo "$as_me:$LINENO: checking for poll" >&5 15770-echo $ECHO_N "checking for poll... $ECHO_C" >&6 15771+rm -f conftest* 15772 15773- cat >conftest.$ac_ext <<_ACEOF 15774-/* confdefs.h. */ 15775-_ACEOF 15776-cat confdefs.h >>conftest.$ac_ext 15777-cat >>conftest.$ac_ext <<_ACEOF 15778-/* end confdefs.h. */ 15779+ 15780+ echo $ac_n "checking for poll""... $ac_c" 1>&6 15781+echo "configure:10326: checking for poll" >&5 15782 15783+ cat > conftest.$ac_ext <<EOF 15784+#line 10329 "configure" 15785+#include "confdefs.h" 15786+ 15787 #include <poll.h> 15788- 15789-int 15790-main () 15791-{ 15792+ 15793+int main() { 15794 15795 struct pollfd fds[2]; 15796 15797@@ -13438,64 +10341,36 @@ 15798 fds[1].events = POLLIN; 15799 15800 poll(fds, 2, 1); 15801- 15802- ; 15803- return 0; 15804-} 15805-_ACEOF 15806-rm -f conftest.$ac_objext 15807-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15808- (eval $ac_compile) 2>conftest.er1 15809- ac_status=$? 15810- grep -v '^ *+' conftest.er1 >conftest.err 15811- rm -f conftest.er1 15812- cat conftest.err >&5 15813- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15814- (exit $ac_status); } && 15815- { ac_try='test -z "$ac_c_werror_flag" 15816- || test ! -s conftest.err' 15817- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15818- (eval $ac_try) 2>&5 15819- ac_status=$? 15820- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15821- (exit $ac_status); }; } && 15822- { ac_try='test -s conftest.$ac_objext' 15823- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15824- (eval $ac_try) 2>&5 15825- ac_status=$? 15826- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15827- (exit $ac_status); }; }; then 15828- 15829- 15830-cat >>confdefs.h <<\_ACEOF 15831+ 15832+; return 0; } 15833+EOF 15834+if { (eval echo configure:10348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15835+ rm -rf conftest* 15836+ 15837+ cat >> confdefs.h <<\EOF 15838 #define HAVE_POLL 1 15839-_ACEOF 15840- 15841- echo "$as_me:$LINENO: result: yes" >&5 15842-echo "${ECHO_T}yes" >&6 15843+EOF 15844 15845+ echo "$ac_t""yes" 1>&6 15846+ 15847 else 15848- echo "$as_me: failed program was:" >&5 15849-sed 's/^/| /' conftest.$ac_ext >&5 15850- 15851- 15852- echo "$as_me:$LINENO: result: no" >&5 15853-echo "${ECHO_T}no" >&6 15854- 15855+ echo "configure: failed program was:" >&5 15856+ cat conftest.$ac_ext >&5 15857+ rm -rf conftest* 15858+ 15859+ echo "$ac_t""no" 1>&6 15860+ 15861 fi 15862-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15863- 15864- 15865- echo "$as_me:$LINENO: checking for select" >&5 15866-echo $ECHO_N "checking for select... $ECHO_C" >&6 15867+rm -f conftest* 15868 15869- cat >conftest.$ac_ext <<_ACEOF 15870-/* confdefs.h. */ 15871-_ACEOF 15872-cat confdefs.h >>conftest.$ac_ext 15873-cat >>conftest.$ac_ext <<_ACEOF 15874-/* end confdefs.h. */ 15875+ 15876+ echo $ac_n "checking for select""... $ac_c" 1>&6 15877+echo "configure:10369: checking for select" >&5 15878 15879+ cat > conftest.$ac_ext <<EOF 15880+#line 10372 "configure" 15881+#include "confdefs.h" 15882+ 15883 /* According to POSIX.1-2001 */ 15884 #include <sys/select.h> 15885 15886@@ -13503,10 +10378,8 @@ 15887 #include <sys/time.h> 15888 #include <sys/types.h> 15889 #include <unistd.h> 15890- 15891-int 15892-main () 15893-{ 15894+ 15895+int main() { 15896 15897 fd_set fds; 15898 struct timeval t; 15899@@ -13516,69 +10389,44 @@ 15900 /* 0 -> STDIN_FILENO */ 15901 FD_SET(0, &fds); 15902 select(FD_SETSIZE, &fds, NULL, NULL, &t); 15903- 15904- ; 15905- return 0; 15906-} 15907-_ACEOF 15908-rm -f conftest.$ac_objext 15909-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 15910- (eval $ac_compile) 2>conftest.er1 15911- ac_status=$? 15912- grep -v '^ *+' conftest.er1 >conftest.err 15913- rm -f conftest.er1 15914- cat conftest.err >&5 15915- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15916- (exit $ac_status); } && 15917- { ac_try='test -z "$ac_c_werror_flag" 15918- || test ! -s conftest.err' 15919- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15920- (eval $ac_try) 2>&5 15921- ac_status=$? 15922- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15923- (exit $ac_status); }; } && 15924- { ac_try='test -s conftest.$ac_objext' 15925- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 15926- (eval $ac_try) 2>&5 15927- ac_status=$? 15928- echo "$as_me:$LINENO: \$? = $ac_status" >&5 15929- (exit $ac_status); }; }; then 15930- 15931- 15932-cat >>confdefs.h <<\_ACEOF 15933+ 15934+; return 0; } 15935+EOF 15936+if { (eval echo configure:10396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 15937+ rm -rf conftest* 15938+ 15939+ cat >> confdefs.h <<\EOF 15940 #define HAVE_SELECT 1 15941-_ACEOF 15942- 15943- echo "$as_me:$LINENO: result: yes" >&5 15944-echo "${ECHO_T}yes" >&6 15945+EOF 15946 15947+ echo "$ac_t""yes" 1>&6 15948+ 15949 else 15950- echo "$as_me: failed program was:" >&5 15951-sed 's/^/| /' conftest.$ac_ext >&5 15952- 15953- 15954- echo "$as_me:$LINENO: result: no" >&5 15955-echo "${ECHO_T}no" >&6 15956- 15957+ echo "configure: failed program was:" >&5 15958+ cat conftest.$ac_ext >&5 15959+ rm -rf conftest* 15960+ 15961+ echo "$ac_t""no" 1>&6 15962+ 15963 fi 15964-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 15965- 15966+rm -f conftest* 15967 15968 15969+ 15970 php_with_fpm_user=nobody 15971 15972 15973- 15974 # Check whether --with-fpm-user or --without-fpm-user was given. 15975 if test "${with_fpm_user+set}" = set; then 15976 withval="$with_fpm_user" 15977 PHP_FPM_USER=$withval 15978 else 15979- 15980+ 15981 PHP_FPM_USER=nobody 15982+ 15983 15984+fi 15985 15986-fi; 15987 15988 ext_output=$PHP_FPM_USER 15989 15990@@ -13586,21 +10434,21 @@ 15991 15992 15993 15994- 15995+ 15996 php_with_fpm_group=nobody 15997 15998 15999- 16000 # Check whether --with-fpm-group or --without-fpm-group was given. 16001 if test "${with_fpm_group+set}" = set; then 16002 withval="$with_fpm_group" 16003 PHP_FPM_GROUP=$withval 16004 else 16005- 16006+ 16007 PHP_FPM_GROUP=nobody 16008+ 16009 16010+fi 16011 16012-fi; 16013 16014 ext_output=$PHP_FPM_GROUP 16015 16016@@ -13620,73 +10468,77 @@ 16017 php_fpm_group="$PHP_FPM_GROUP" 16018 fi 16019 16020- 16021- 16022+ 16023+ 16024 PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_user" 16025 16026+ 16027 16028- 16029- 16030- 16031+ 16032+ 16033 PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_group" 16034 16035- 16036+ 16037 16038 php_fpm_sysconfdir=`eval echo $sysconfdir` 16039- 16040- 16041+ 16042+ 16043 PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_sysconfdir" 16044 16045- 16046+ 16047 16048 php_fpm_localstatedir=`eval echo $localstatedir` 16049- 16050- 16051+ 16052+ 16053 PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_localstatedir" 16054 16055- 16056+ 16057 16058 php_fpm_prefix=`eval echo $prefix` 16059- 16060- 16061+ 16062+ 16063 PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_prefix" 16064 16065+ 16066 16067 16068- 16069- 16070-cat >>confdefs.h <<_ACEOF 16071+ cat >> confdefs.h <<EOF 16072 #define PHP_FPM_USER "$php_fpm_user" 16073-_ACEOF 16074- 16075+EOF 16076 16077-cat >>confdefs.h <<_ACEOF 16078+ cat >> confdefs.h <<EOF 16079 #define PHP_FPM_GROUP "$php_fpm_group" 16080-_ACEOF 16081+EOF 16082 16083 16084+ 16085+ 16086+ BUILD_DIR="$BUILD_DIR sapi/fpm/fpm" 16087+ 16088+ 16089+ 16090+ 16091+ BUILD_DIR="$BUILD_DIR sapi/fpm/fpm/events" 16092+ 16093 16094+ 16095 PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html" 16096 16097- 16098+ 16099 src=$abs_srcdir/sapi/fpm/Makefile.frag 16100- ac_srcdir=$abs_srcdir/sapi/fpm 16101- ac_builddir=sapi/fpm 16102+ ac_srcdir=$ext_srcdir 16103+ ac_builddir=$ext_builddir 16104 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 16105 16106 16107 SAPI_FPM_PATH=sapi/fpm/php-fpm 16108- 16109- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH" 16110- 16111- 16112+ 16113 if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then 16114 PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" 16115 fi 16116- 16117+ 16118 PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" 16119- 16120- INSTALL_IT=":" 16121+ 16122 PHP_FPM_FILES="fpm/fastcgi.c \ 16123 fpm/fpm.c \ 16124 fpm/fpm_children.c \ 16125@@ -13718,127 +10570,32 @@ 16126 fpm/events/port.c \ 16127 " 16128 16129- 16130- if test "$PHP_SAPI" != "default"; then 16131-{ { echo "$as_me:$LINENO: error: 16132-+--------------------------------------------------------------------+ 16133-| *** ATTENTION *** | 16134-| | 16135-| You've configured multiple SAPIs to be build. You can build only | 16136-| one SAPI module and CLI binary at the same time. | 16137-+--------------------------------------------------------------------+ 16138-" >&5 16139-echo "$as_me: error: 16140+ 16141+ if test "program" = "program"; then 16142+ PHP_BINARIES="$PHP_BINARIES fpm" 16143+ elif test "$PHP_SAPI" != "none"; then 16144+ { echo "configure: error: 16145 +--------------------------------------------------------------------+ 16146 | *** ATTENTION *** | 16147 | | 16148 | You've configured multiple SAPIs to be build. You can build only | 16149-| one SAPI module and CLI binary at the same time. | 16150+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 16151 +--------------------------------------------------------------------+ 16152-" >&2;} 16153- { (exit 1); exit 1; }; } 16154- fi 16155- 16156- PHP_SAPI=fpm 16157- 16158- case "program" in 16159- static) 16160- 16161- OVERALL_TARGET=php 16162- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16163- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16164- php_c_post= 16165- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16166- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16167- php_cxx_post= 16168- php_lo=lo 16169- 16170- case $with_pic in 16171- yes) pic_setting='-prefer-pic';; 16172- no) pic_setting='-prefer-non-pic';; 16173- esac 16174- 16175- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16176- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16177- shared_c_post= 16178- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16179- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16180- shared_cxx_post= 16181- shared_lo=lo 16182- 16183- php_build_target=program 16184- 16185- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16186- php_build_target=static 16187-;; 16188- shared) 16189- 16190- OVERALL_TARGET=php 16191- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16192- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16193- php_c_post= 16194- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16195- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16196- php_cxx_post= 16197- php_lo=lo 16198- 16199- case $with_pic in 16200- yes) pic_setting='-prefer-pic';; 16201- no) pic_setting='-prefer-non-pic';; 16202- esac 16203- 16204- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16205- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16206- shared_c_post= 16207- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16208- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16209- shared_cxx_post= 16210- shared_lo=lo 16211- 16212- php_build_target=program 16213- 16214- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16215- php_build_target=shared 16216- 16217- php_c_pre=$shared_c_pre 16218- php_c_meta=$shared_c_meta 16219- php_c_post=$shared_c_post 16220- php_cxx_pre=$shared_cxx_pre 16221- php_cxx_meta=$shared_cxx_meta 16222- php_cxx_post=$shared_cxx_post 16223- php_lo=$shared_lo 16224-;; 16225- bundle) 16226- 16227- OVERALL_TARGET=php 16228- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16229- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16230- php_c_post= 16231- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16232- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16233- php_cxx_post= 16234- php_lo=lo 16235+" 1>&2; exit 1; } 16236+ else 16237+ PHP_SAPI=fpm 16238+ fi 16239 16240- case $with_pic in 16241- yes) pic_setting='-prefer-pic';; 16242- no) pic_setting='-prefer-non-pic';; 16243- esac 16244+ 16245+ 16246+ BUILD_DIR="$BUILD_DIR sapi/fpm" 16247+ 16248 16249- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16250- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16251- shared_c_post= 16252- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16253- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16254- shared_cxx_post= 16255- shared_lo=lo 16256 16257- php_build_target=program 16258+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS fpm" 16259 16260- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 16261- php_build_target=static 16262-;; 16263- program) 16264- OVERALL_TARGET='$(SAPI_FPM_PATH)' 16265+ 16266+ 16267 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16268 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16269 php_c_post= 16270@@ -13860,19 +10617,19 @@ 16271 shared_cxx_post= 16272 shared_lo=lo 16273 16274- php_build_target=program 16275-;; 16276- esac 16277- 16278- 16279+ install_binaries="install-binaries" 16280+ install_binary_targets="$install_binary_targets install-fpm" 16281+ 16282+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_FPM_OBJS" 16283 16284+ 16285 case sapi/fpm in 16286 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 16287 /*) ac_srcdir=`echo "sapi/fpm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 16288 *) ac_srcdir="$abs_srcdir/sapi/fpm/"; ac_bdir="sapi/fpm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 16289 esac 16290- 16291- 16292+ 16293+ 16294 16295 b_c_pre=$php_c_pre 16296 b_cxx_pre=$php_cxx_pre 16297@@ -13885,13 +10642,13 @@ 16298 16299 old_IFS=$IFS 16300 for ac_src in $PHP_FPM_FILES $PHP_FPM_TRACE_FILES; do 16301- 16302+ 16303 IFS=. 16304 set $ac_src 16305 ac_obj=$1 16306 IFS=$old_IFS 16307- 16308- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 16309+ 16310+ PHP_FPM_OBJS="$PHP_FPM_OBJS $ac_bdir$ac_obj.lo" 16311 16312 case $ac_src in 16313 *.c) ac_comp="$b_c_pre $PHP_FPM_CFLAGS $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 16314@@ -13906,50 +10663,52 @@ 16315 EOF 16316 done 16317 16318- 16319+ 16320 16321 16322 case $host_alias in 16323 *aix*) 16324- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16325+ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16326 ;; 16327 *darwin*) 16328- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16329+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16330 ;; 16331 *) 16332- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16333+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 16334 ;; 16335 esac 16336 16337+ 16338+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_FPM_PATH" 16339 16340+ 16341 PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_FPM" 16342 16343+ 16344 else 16345- echo "$as_me:$LINENO: result: no" >&5 16346-echo "${ECHO_T}no" >&6 16347+ echo "$ac_t""no" 1>&6 16348 fi 16349 16350 16351 16352 php_with_isapi=no 16353 16354-echo "$as_me:$LINENO: checking for Zeus ISAPI support" >&5 16355-echo $ECHO_N "checking for Zeus ISAPI support... $ECHO_C" >&6 16356- 16357+echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 16358+echo "configure:10698: checking for Zeus ISAPI support" >&5 16359 # Check whether --with-isapi or --without-isapi was given. 16360 if test "${with_isapi+set}" = set; then 16361 withval="$with_isapi" 16362 PHP_ISAPI=$withval 16363 else 16364- 16365+ 16366 PHP_ISAPI=no 16367+ 16368 16369+fi 16370 16371-fi; 16372 16373 ext_output=$PHP_ISAPI 16374-echo "$as_me:$LINENO: result: $ext_output" >&5 16375-echo "${ECHO_T}$ext_output" >&6 16376+echo "$ac_t""$ext_output" 1>&6 16377 16378 16379 16380@@ -13960,80 +10719,76 @@ 16381 else 16382 ZEUSPATH=$PHP_ISAPI 16383 fi 16384- test -f "$ZEUSPATH/web/include/httpext.h" || { { echo "$as_me:$LINENO: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&5 16385-echo "$as_me: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&2;} 16386- { (exit 1); exit 1; }; } 16387- 16388+ test -f "$ZEUSPATH/web/include/httpext.h" || { echo "configure: error: Unable to find httpext.h in $ZEUSPATH/web/include" 1>&2; exit 1; } 16389+ 16390 enable_maintainer_zts=yes 16391 if test "$pthreads_working" != "yes"; then 16392- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 16393-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 16394- { (exit 1); exit 1; }; } 16395+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 16396 fi 16397 16398- 16399-cat >>confdefs.h <<\_ACEOF 16400+ cat >> confdefs.h <<\EOF 16401 #define WITH_ZEUS 1 16402-_ACEOF 16403- 16404+EOF 16405 16406+ 16407 if test "$ZEUSPATH/web/include" != "/usr/include"; then 16408- 16409+ 16410 if test -z "$ZEUSPATH/web/include" || echo "$ZEUSPATH/web/include" | grep '^/' >/dev/null ; then 16411 ai_p=$ZEUSPATH/web/include 16412 else 16413- 16414+ 16415 ep_dir="`echo $ZEUSPATH/web/include|$SED 's%/*[^/][^/]*/*$%%'`" 16416- 16417+ 16418 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 16419 ai_p="$ep_realdir/`basename \"$ZEUSPATH/web/include\"`" 16420 fi 16421 16422- 16423- 16424+ 16425+ 16426 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 16427- 16428+ 16429 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 16430 if test -n "$unique" && test "`eval $cmd`" = "" ; then 16431 eval "INCLUDEPATH$unique=set" 16432- 16433+ 16434 if test ""; then 16435 INCLUDES="-I$ai_p $INCLUDES" 16436 else 16437 INCLUDES="$INCLUDES -I$ai_p" 16438 fi 16439- 16440+ 16441 fi 16442 16443 fi 16444 16445- 16446- if test "$PHP_SAPI" != "default"; then 16447-{ { echo "$as_me:$LINENO: error: 16448-+--------------------------------------------------------------------+ 16449-| *** ATTENTION *** | 16450-| | 16451-| You've configured multiple SAPIs to be build. You can build only | 16452-| one SAPI module and CLI binary at the same time. | 16453-+--------------------------------------------------------------------+ 16454-" >&5 16455-echo "$as_me: error: 16456+ 16457+ if test "shared" = "program"; then 16458+ PHP_BINARIES="$PHP_BINARIES isapi" 16459+ elif test "$PHP_SAPI" != "none"; then 16460+ { echo "configure: error: 16461 +--------------------------------------------------------------------+ 16462 | *** ATTENTION *** | 16463 | | 16464 | You've configured multiple SAPIs to be build. You can build only | 16465-| one SAPI module and CLI binary at the same time. | 16466+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 16467 +--------------------------------------------------------------------+ 16468-" >&2;} 16469- { (exit 1); exit 1; }; } 16470- fi 16471+" 1>&2; exit 1; } 16472+ else 16473+ PHP_SAPI=isapi 16474+ fi 16475 16476- PHP_SAPI=isapi 16477+ 16478+ 16479+ BUILD_DIR="$BUILD_DIR sapi/isapi" 16480+ 16481 16482- case "shared" in 16483- static) 16484 16485- OVERALL_TARGET=php 16486+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS isapi" 16487+ 16488+ 16489+ case "shared" in 16490+ static) 16491+ 16492 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16493 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16494 php_c_post= 16495@@ -14055,14 +10810,11 @@ 16496 shared_cxx_post= 16497 shared_lo=lo 16498 16499- php_build_target=program 16500- 16501 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16502- php_build_target=static 16503+ php_sapi_module=static 16504 ;; 16505- shared) 16506- 16507- OVERALL_TARGET=php 16508+ shared) 16509+ 16510 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16511 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16512 php_c_post= 16513@@ -14084,11 +10836,9 @@ 16514 shared_cxx_post= 16515 shared_lo=lo 16516 16517- php_build_target=program 16518- 16519 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16520- php_build_target=shared 16521- 16522+ php_sapi_module=shared 16523+ 16524 php_c_pre=$shared_c_pre 16525 php_c_meta=$shared_c_meta 16526 php_c_post=$shared_c_post 16527@@ -14097,9 +10847,8 @@ 16528 php_cxx_post=$shared_cxx_post 16529 php_lo=$shared_lo 16530 ;; 16531- bundle) 16532- 16533- OVERALL_TARGET=php 16534+ bundle) 16535+ 16536 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16537 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16538 php_c_post= 16539@@ -14121,47 +10870,20 @@ 16540 shared_cxx_post= 16541 shared_lo=lo 16542 16543- php_build_target=program 16544- 16545 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 16546- php_build_target=static 16547-;; 16548- program) 16549- OVERALL_TARGET=php 16550- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16551- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16552- php_c_post= 16553- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16554- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16555- php_cxx_post= 16556- php_lo=lo 16557- 16558- case $with_pic in 16559- yes) pic_setting='-prefer-pic';; 16560- no) pic_setting='-prefer-non-pic';; 16561- esac 16562- 16563- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16564- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16565- shared_c_post= 16566- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16567- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16568- shared_cxx_post= 16569- shared_lo=lo 16570- 16571- php_build_target=program 16572+ php_sapi_module=static 16573 ;; 16574- esac 16575- 16576- 16577- 16578+ esac 16579+ install_sapi="install-sapi" 16580+ 16581+ 16582 case sapi/isapi in 16583 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 16584 /*) ac_srcdir=`echo "sapi/isapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 16585 *) ac_srcdir="$abs_srcdir/sapi/isapi/"; ac_bdir="sapi/isapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 16586 esac 16587- 16588- 16589+ 16590+ 16591 16592 b_c_pre=$php_c_pre 16593 b_cxx_pre=$php_cxx_pre 16594@@ -14174,12 +10896,12 @@ 16595 16596 old_IFS=$IFS 16597 for ac_src in php5isapi.c; do 16598- 16599+ 16600 IFS=. 16601 set $ac_src 16602 ac_obj=$1 16603 IFS=$old_IFS 16604- 16605+ 16606 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 16607 16608 case $ac_src in 16609@@ -14196,30 +10918,31 @@ 16610 done 16611 16612 16613+ 16614 16615 INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/" 16616 fi 16617 16618 16619 16620-echo "$as_me:$LINENO: checking for LiteSpeed support" >&5 16621-echo $ECHO_N "checking for LiteSpeed support... $ECHO_C" >&6 16622+echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6 16623+echo "configure:10930: checking for LiteSpeed support" >&5 16624 16625 16626 php_with_litespeed=no 16627 16628 16629- 16630 # Check whether --with-litespeed or --without-litespeed was given. 16631 if test "${with_litespeed+set}" = set; then 16632 withval="$with_litespeed" 16633 PHP_LITESPEED=$withval 16634 else 16635- 16636+ 16637 PHP_LITESPEED=no 16638 test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL 16639 16640-fi; 16641+fi 16642+ 16643 16644 16645 ext_output="yes, shared" 16646@@ -14249,137 +10972,39 @@ 16647 16648 16649 if test "$PHP_LITESPEED" != "no"; then 16650- 16651+ 16652 src=$abs_srcdir/sapi/litespeed/Makefile.frag 16653 ac_srcdir=$abs_srcdir/sapi/litespeed 16654 ac_builddir=sapi/litespeed 16655 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 16656 16657 SAPI_LITESPEED_PATH=sapi/litespeed/php 16658- 16659- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH" 16660- 16661- 16662- if test "$PHP_SAPI" != "default"; then 16663-{ { echo "$as_me:$LINENO: error: 16664-+--------------------------------------------------------------------+ 16665-| *** ATTENTION *** | 16666-| | 16667-| You've configured multiple SAPIs to be build. You can build only | 16668-| one SAPI module and CLI binary at the same time. | 16669-+--------------------------------------------------------------------+ 16670-" >&5 16671-echo "$as_me: error: 16672+ 16673+ if test "program" = "program"; then 16674+ PHP_BINARIES="$PHP_BINARIES litespeed" 16675+ elif test "$PHP_SAPI" != "none"; then 16676+ { echo "configure: error: 16677 +--------------------------------------------------------------------+ 16678 | *** ATTENTION *** | 16679 | | 16680 | You've configured multiple SAPIs to be build. You can build only | 16681-| one SAPI module and CLI binary at the same time. | 16682+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 16683 +--------------------------------------------------------------------+ 16684-" >&2;} 16685- { (exit 1); exit 1; }; } 16686- fi 16687- 16688- PHP_SAPI=litespeed 16689- 16690- case "program" in 16691- static) 16692- 16693- OVERALL_TARGET=php 16694- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16695- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16696- php_c_post= 16697- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16698- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16699- php_cxx_post= 16700- php_lo=lo 16701- 16702- case $with_pic in 16703- yes) pic_setting='-prefer-pic';; 16704- no) pic_setting='-prefer-non-pic';; 16705- esac 16706- 16707- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16708- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16709- shared_c_post= 16710- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16711- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16712- shared_cxx_post= 16713- shared_lo=lo 16714- 16715- php_build_target=program 16716- 16717- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16718- php_build_target=static 16719-;; 16720- shared) 16721- 16722- OVERALL_TARGET=php 16723- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16724- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16725- php_c_post= 16726- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16727- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16728- php_cxx_post= 16729- php_lo=lo 16730- 16731- case $with_pic in 16732- yes) pic_setting='-prefer-pic';; 16733- no) pic_setting='-prefer-non-pic';; 16734- esac 16735- 16736- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16737- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16738- shared_c_post= 16739- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16740- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16741- shared_cxx_post= 16742- shared_lo=lo 16743- 16744- php_build_target=program 16745- 16746- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 16747- php_build_target=shared 16748- 16749- php_c_pre=$shared_c_pre 16750- php_c_meta=$shared_c_meta 16751- php_c_post=$shared_c_post 16752- php_cxx_pre=$shared_cxx_pre 16753- php_cxx_meta=$shared_cxx_meta 16754- php_cxx_post=$shared_cxx_post 16755- php_lo=$shared_lo 16756-;; 16757- bundle) 16758- 16759- OVERALL_TARGET=php 16760- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16761- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16762- php_c_post= 16763- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16764- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16765- php_cxx_post= 16766- php_lo=lo 16767+" 1>&2; exit 1; } 16768+ else 16769+ PHP_SAPI=litespeed 16770+ fi 16771 16772- case $with_pic in 16773- yes) pic_setting='-prefer-pic';; 16774- no) pic_setting='-prefer-non-pic';; 16775- esac 16776+ 16777+ 16778+ BUILD_DIR="$BUILD_DIR sapi/litespeed" 16779+ 16780 16781- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16782- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16783- shared_c_post= 16784- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16785- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16786- shared_cxx_post= 16787- shared_lo=lo 16788 16789- php_build_target=program 16790+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS litespeed" 16791 16792- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 16793- php_build_target=static 16794-;; 16795- program) 16796- OVERALL_TARGET='$(SAPI_LITESPEED_PATH)' 16797+ 16798+ 16799 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16800 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16801 php_c_post= 16802@@ -14401,19 +11026,19 @@ 16803 shared_cxx_post= 16804 shared_lo=lo 16805 16806- php_build_target=program 16807-;; 16808- esac 16809- 16810- 16811+ install_binaries="install-binaries" 16812+ install_binary_targets="$install_binary_targets install-litespeed" 16813+ 16814+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LITESPEED_OBJS" 16815 16816+ 16817 case sapi/litespeed in 16818 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 16819 /*) ac_srcdir=`echo "sapi/litespeed"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 16820 *) ac_srcdir="$abs_srcdir/sapi/litespeed/"; ac_bdir="sapi/litespeed/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 16821 esac 16822- 16823- 16824+ 16825+ 16826 16827 b_c_pre=$php_c_pre 16828 b_cxx_pre=$php_cxx_pre 16829@@ -14426,13 +11051,13 @@ 16830 16831 old_IFS=$IFS 16832 for ac_src in lsapi_main.c lsapilib.c; do 16833- 16834+ 16835 IFS=. 16836 set $ac_src 16837 ac_obj=$1 16838 IFS=$old_IFS 16839- 16840- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 16841+ 16842+ PHP_LITESPEED_OBJS="$PHP_LITESPEED_OBJS $ac_bdir$ac_obj.lo" 16843 16844 case $ac_src in 16845 *.c) ac_comp="$b_c_pre "" $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 16846@@ -14447,51 +11072,52 @@ 16847 EOF 16848 done 16849 16850- 16851- 16852+ 16853+ 16854 INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp" 16855 case $host_alias in 16856 *darwin*) 16857- BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16858+ BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16859 ;; 16860 *cygwin*) 16861 SAPI_LITESPEED_PATH=sapi/litespeed/php.exe 16862- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16863+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16864 ;; 16865 *) 16866- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16867+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 16868 ;; 16869 esac 16870 16871+ 16872+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_LITESPEED_PATH" 16873 16874+ 16875 PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_LITESPEED" 16876 16877 fi 16878 16879-echo "$as_me:$LINENO: result: $PHP_LITESPEED" >&5 16880-echo "${ECHO_T}$PHP_LITESPEED" >&6 16881+echo "$ac_t""$PHP_LITESPEED" 1>&6 16882 16883 16884 16885 php_with_milter=no 16886 16887-echo "$as_me:$LINENO: checking for Milter support" >&5 16888-echo $ECHO_N "checking for Milter support... $ECHO_C" >&6 16889- 16890+echo $ac_n "checking for Milter support""... $ac_c" 1>&6 16891+echo "configure:11107: checking for Milter support" >&5 16892 # Check whether --with-milter or --without-milter was given. 16893 if test "${with_milter+set}" = set; then 16894 withval="$with_milter" 16895 PHP_MILTER=$withval 16896 else 16897- 16898+ 16899 PHP_MILTER=no 16900+ 16901 16902+fi 16903 16904-fi; 16905 16906 ext_output=$PHP_MILTER 16907-echo "$as_me:$LINENO: result: $ext_output" >&5 16908-echo "${ECHO_T}$ext_output" >&6 16909+echo "$ac_t""$ext_output" 1>&6 16910 16911 16912 16913@@ -14504,151 +11130,52 @@ 16914 if test -f /usr/lib/libmilter/libmilter.a ; then 16915 MILTERPATH=/usr/lib/libmilter 16916 else 16917- { { echo "$as_me:$LINENO: error: Unable to find libmilter.a" >&5 16918-echo "$as_me: error: Unable to find libmilter.a" >&2;} 16919- { (exit 1); exit 1; }; } 16920+ { echo "configure: error: Unable to find libmilter.a" 1>&2; exit 1; } 16921 fi 16922 fi 16923 else 16924 MILTERPATH=$PHP_MILTER 16925 fi 16926- 16927+ 16928 SAPI_MILTER_PATH=sapi/milter/php-milter 16929- 16930+ 16931 enable_maintainer_zts=yes 16932 if test "$pthreads_working" != "yes"; then 16933- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 16934-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 16935- { (exit 1); exit 1; }; } 16936+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 16937 fi 16938 16939- 16940+ 16941 src=$abs_srcdir/sapi/milter/Makefile.frag 16942 ac_srcdir=$ext_srcdir 16943 ac_builddir=$ext_builddir 16944 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 16945 16946- 16947- if test "$PHP_SAPI" != "default"; then 16948-{ { echo "$as_me:$LINENO: error: 16949-+--------------------------------------------------------------------+ 16950-| *** ATTENTION *** | 16951-| | 16952-| You've configured multiple SAPIs to be build. You can build only | 16953-| one SAPI module and CLI binary at the same time. | 16954-+--------------------------------------------------------------------+ 16955-" >&5 16956-echo "$as_me: error: 16957+ 16958+ if test "program" = "program"; then 16959+ PHP_BINARIES="$PHP_BINARIES milter" 16960+ elif test "$PHP_SAPI" != "none"; then 16961+ { echo "configure: error: 16962 +--------------------------------------------------------------------+ 16963 | *** ATTENTION *** | 16964 | | 16965 | You've configured multiple SAPIs to be build. You can build only | 16966-| one SAPI module and CLI binary at the same time. | 16967+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 16968 +--------------------------------------------------------------------+ 16969-" >&2;} 16970- { (exit 1); exit 1; }; } 16971- fi 16972- 16973- PHP_SAPI=milter 16974- 16975- case "program" in 16976- static) 16977- 16978- OVERALL_TARGET=php 16979- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16980- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 16981- php_c_post= 16982- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16983- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 16984- php_cxx_post= 16985- php_lo=lo 16986- 16987- case $with_pic in 16988- yes) pic_setting='-prefer-pic';; 16989- no) pic_setting='-prefer-non-pic';; 16990- esac 16991- 16992- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 16993- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 16994- shared_c_post= 16995- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 16996- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 16997- shared_cxx_post= 16998- shared_lo=lo 16999- 17000- php_build_target=program 17001- 17002- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 17003- php_build_target=static 17004-;; 17005- shared) 17006- 17007- OVERALL_TARGET=php 17008- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17009- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17010- php_c_post= 17011- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17012- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 17013- php_cxx_post= 17014- php_lo=lo 17015- 17016- case $with_pic in 17017- yes) pic_setting='-prefer-pic';; 17018- no) pic_setting='-prefer-non-pic';; 17019- esac 17020- 17021- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17022- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 17023- shared_c_post= 17024- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17025- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 17026- shared_cxx_post= 17027- shared_lo=lo 17028- 17029- php_build_target=program 17030- 17031- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 17032- php_build_target=shared 17033- 17034- php_c_pre=$shared_c_pre 17035- php_c_meta=$shared_c_meta 17036- php_c_post=$shared_c_post 17037- php_cxx_pre=$shared_cxx_pre 17038- php_cxx_meta=$shared_cxx_meta 17039- php_cxx_post=$shared_cxx_post 17040- php_lo=$shared_lo 17041-;; 17042- bundle) 17043- 17044- OVERALL_TARGET=php 17045- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17046- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17047- php_c_post= 17048- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17049- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 17050- php_cxx_post= 17051- php_lo=lo 17052+" 1>&2; exit 1; } 17053+ else 17054+ PHP_SAPI=milter 17055+ fi 17056 17057- case $with_pic in 17058- yes) pic_setting='-prefer-pic';; 17059- no) pic_setting='-prefer-non-pic';; 17060- esac 17061+ 17062+ 17063+ BUILD_DIR="$BUILD_DIR sapi/milter" 17064+ 17065 17066- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17067- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 17068- shared_c_post= 17069- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17070- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 17071- shared_cxx_post= 17072- shared_lo=lo 17073 17074- php_build_target=program 17075+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS milter" 17076 17077- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 17078- php_build_target=static 17079-;; 17080- program) 17081- OVERALL_TARGET='$(SAPI_MILTER_PATH)' 17082+ 17083+ 17084 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17085 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17086 php_c_post= 17087@@ -14670,19 +11197,19 @@ 17088 shared_cxx_post= 17089 shared_lo=lo 17090 17091- php_build_target=program 17092-;; 17093- esac 17094- 17095- 17096+ install_binaries="install-binaries" 17097+ install_binary_targets="$install_binary_targets install-milter" 17098+ 17099+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MILTER_OBJS" 17100 17101+ 17102 case sapi/milter in 17103 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 17104 /*) ac_srcdir=`echo "sapi/milter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 17105 *) ac_srcdir="$abs_srcdir/sapi/milter/"; ac_bdir="sapi/milter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 17106 esac 17107- 17108- 17109+ 17110+ 17111 17112 b_c_pre=$php_c_pre 17113 b_cxx_pre=$php_cxx_pre 17114@@ -14695,13 +11222,13 @@ 17115 17116 old_IFS=$IFS 17117 for ac_src in php_milter.c getopt.c; do 17118- 17119+ 17120 IFS=. 17121 set $ac_src 17122 ac_obj=$1 17123 IFS=$old_IFS 17124- 17125- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 17126+ 17127+ PHP_MILTER_OBJS="$PHP_MILTER_OBJS $ac_bdir$ac_obj.lo" 17128 17129 case $ac_src in 17130 *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 17131@@ -14716,63 +11243,62 @@ 17132 EOF 17133 done 17134 17135- 17136- 17137- 17138+ 17139+ 17140+ 17141 17142 if test -n "$MILTERPATH"; then 17143- 17144+ 17145 if test "$MILTERPATH" != "/usr/$PHP_LIBDIR" && test "$MILTERPATH" != "/usr/lib"; then 17146- 17147+ 17148 if test -z "$MILTERPATH" || echo "$MILTERPATH" | grep '^/' >/dev/null ; then 17149 ai_p=$MILTERPATH 17150 else 17151- 17152+ 17153 ep_dir="`echo $MILTERPATH|$SED 's%/*[^/][^/]*/*$%%'`" 17154- 17155+ 17156 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 17157 ai_p="$ep_realdir/`basename \"$MILTERPATH\"`" 17158 fi 17159 17160- 17161- 17162- 17163- 17164+ 17165+ 17166+ 17167+ 17168 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 17169- 17170+ 17171 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 17172 if test -n "$unique" && test "`eval $cmd`" = "" ; then 17173 eval "LIBPATH$unique=set" 17174- 17175+ 17176 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 17177 LDFLAGS="$LDFLAGS -L$ai_p" 17178 PHP_RPATHS="$PHP_RPATHS $ai_p" 17179- 17180+ 17181 fi 17182 17183 17184- 17185+ 17186 fi 17187 17188 fi 17189- 17190- 17191+ 17192+ 17193 case milter in 17194 c|c_r|pthread*) ;; 17195- *) 17196- LIBS="-lmilter $LIBS" 17197+ *) 17198+ LIBS="-lmilter $LIBS" 17199 ;; 17200 esac 17201 17202 17203 17204 17205- BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" 17206- INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter" 17207- 17208+ BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" 17209+ 17210 PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_MILTER_PATH" 17211 17212- 17213+ 17214 PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_MILTER" 17215 17216 fi 17217@@ -14781,385 +11307,158 @@ 17218 17219 php_with_nsapi=no 17220 17221-echo "$as_me:$LINENO: checking for NSAPI support" >&5 17222-echo $ECHO_N "checking for NSAPI support... $ECHO_C" >&6 17223- 17224+echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 17225+echo "configure:11312: checking for NSAPI support" >&5 17226 # Check whether --with-nsapi or --without-nsapi was given. 17227 if test "${with_nsapi+set}" = set; then 17228 withval="$with_nsapi" 17229 PHP_NSAPI=$withval 17230 else 17231- 17232+ 17233 PHP_NSAPI=no 17234+ 17235 17236+fi 17237 17238-fi; 17239 17240 ext_output=$PHP_NSAPI 17241-echo "$as_me:$LINENO: result: $ext_output" >&5 17242-echo "${ECHO_T}$ext_output" >&6 17243+echo "$ac_t""$ext_output" 1>&6 17244 17245 17246 17247 17248 if test "$PHP_NSAPI" != "no"; then 17249 if test ! -d $PHP_NSAPI/bin ; then 17250- { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&5 17251-echo "$as_me: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&2;} 17252- { (exit 1); exit 1; }; } 17253+ { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; } 17254 fi 17255- echo "$as_me:$LINENO: checking for NSAPI include files" >&5 17256-echo $ECHO_N "checking for NSAPI include files... $ECHO_C" >&6 17257+ echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 17258+echo "configure:11336: checking for NSAPI include files" >&5 17259 if test -d $PHP_NSAPI/include ; then 17260 NSAPI_INC_DIR="$PHP_NSAPI/include" 17261- echo "$as_me:$LINENO: result: Netscape 3.x / Sun 7.x style" >&5 17262-echo "${ECHO_T}Netscape 3.x / Sun 7.x style" >&6 17263- 17264-for ac_header in $NSAPI_INC_DIR/nsapi.h 17265+ echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6 17266+ for ac_hdr in $NSAPI_INC_DIR/nsapi.h 17267 do 17268-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 17269-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17270- echo "$as_me:$LINENO: checking for $ac_header" >&5 17271-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 17272-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17273- echo $ECHO_N "(cached) $ECHO_C" >&6 17274-fi 17275-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 17276-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 17277-else 17278- # Is the header compilable? 17279-echo "$as_me:$LINENO: checking $ac_header usability" >&5 17280-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 17281-cat >conftest.$ac_ext <<_ACEOF 17282-/* confdefs.h. */ 17283-_ACEOF 17284-cat confdefs.h >>conftest.$ac_ext 17285-cat >>conftest.$ac_ext <<_ACEOF 17286-/* end confdefs.h. */ 17287-$ac_includes_default 17288-#include <$ac_header> 17289-_ACEOF 17290-rm -f conftest.$ac_objext 17291-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 17292- (eval $ac_compile) 2>conftest.er1 17293- ac_status=$? 17294- grep -v '^ *+' conftest.er1 >conftest.err 17295- rm -f conftest.er1 17296- cat conftest.err >&5 17297- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17298- (exit $ac_status); } && 17299- { ac_try='test -z "$ac_c_werror_flag" 17300- || test ! -s conftest.err' 17301- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17302- (eval $ac_try) 2>&5 17303- ac_status=$? 17304- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17305- (exit $ac_status); }; } && 17306- { ac_try='test -s conftest.$ac_objext' 17307- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17308- (eval $ac_try) 2>&5 17309- ac_status=$? 17310- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17311- (exit $ac_status); }; }; then 17312- ac_header_compiler=yes 17313-else 17314- echo "$as_me: failed program was:" >&5 17315-sed 's/^/| /' conftest.$ac_ext >&5 17316- 17317-ac_header_compiler=no 17318-fi 17319-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 17320-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 17321-echo "${ECHO_T}$ac_header_compiler" >&6 17322- 17323-# Is the header present? 17324-echo "$as_me:$LINENO: checking $ac_header presence" >&5 17325-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 17326-cat >conftest.$ac_ext <<_ACEOF 17327-/* confdefs.h. */ 17328-_ACEOF 17329-cat confdefs.h >>conftest.$ac_ext 17330-cat >>conftest.$ac_ext <<_ACEOF 17331-/* end confdefs.h. */ 17332-#include <$ac_header> 17333-_ACEOF 17334-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 17335- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 17336- ac_status=$? 17337- grep -v '^ *+' conftest.er1 >conftest.err 17338- rm -f conftest.er1 17339- cat conftest.err >&5 17340- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17341- (exit $ac_status); } >/dev/null; then 17342- if test -s conftest.err; then 17343- ac_cpp_err=$ac_c_preproc_warn_flag 17344- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 17345- else 17346- ac_cpp_err= 17347- fi 17348-else 17349- ac_cpp_err=yes 17350-fi 17351-if test -z "$ac_cpp_err"; then 17352- ac_header_preproc=yes 17353-else 17354- echo "$as_me: failed program was:" >&5 17355-sed 's/^/| /' conftest.$ac_ext >&5 17356- 17357- ac_header_preproc=no 17358-fi 17359-rm -f conftest.err conftest.$ac_ext 17360-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 17361-echo "${ECHO_T}$ac_header_preproc" >&6 17362- 17363-# So? What about this header? 17364-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 17365- yes:no: ) 17366- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 17367-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 17368- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 17369-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 17370- ac_header_preproc=yes 17371- ;; 17372- no:yes:* ) 17373- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 17374-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 17375- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 17376-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 17377- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 17378-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 17379- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 17380-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 17381- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 17382-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 17383- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 17384-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 17385- ( 17386- cat <<\_ASBOX 17387-## ------------------------------------------ ## 17388-## Report this to the AC_PACKAGE_NAME lists. ## 17389-## ------------------------------------------ ## 17390-_ASBOX 17391- ) | 17392- sed "s/^/$as_me: WARNING: /" >&2 17393- ;; 17394-esac 17395-echo "$as_me:$LINENO: checking for $ac_header" >&5 17396-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 17397-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17398- echo $ECHO_N "(cached) $ECHO_C" >&6 17399+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 17400+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 17401+echo "configure:11344: checking for $ac_hdr" >&5 17402+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 17403+ echo $ac_n "(cached) $ac_c" 1>&6 17404+else 17405+ cat > conftest.$ac_ext <<EOF 17406+#line 11349 "configure" 17407+#include "confdefs.h" 17408+#include <$ac_hdr> 17409+EOF 17410+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 17411+{ (eval echo configure:11354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 17412+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 17413+if test -z "$ac_err"; then 17414+ rm -rf conftest* 17415+ eval "ac_cv_header_$ac_safe=yes" 17416 else 17417- eval "$as_ac_Header=\$ac_header_preproc" 17418+ echo "$ac_err" >&5 17419+ echo "configure: failed program was:" >&5 17420+ cat conftest.$ac_ext >&5 17421+ rm -rf conftest* 17422+ eval "ac_cv_header_$ac_safe=no" 17423 fi 17424-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 17425-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 17426- 17427+rm -f conftest* 17428 fi 17429-if test `eval echo '${'$as_ac_Header'}'` = yes; then 17430- cat >>confdefs.h <<_ACEOF 17431-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 17432-_ACEOF 17433- 17434+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 17435+ echo "$ac_t""yes" 1>&6 17436+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 17437+ cat >> confdefs.h <<EOF 17438+#define $ac_tr_hdr 1 17439+EOF 17440+ 17441+else 17442+ echo "$ac_t""no" 1>&6 17443 fi 17444- 17445 done 17446 17447 NSAPI_INCLUDE="-I$NSAPI_INC_DIR" 17448 fi 17449 if test -d $PHP_NSAPI/plugins/include ; then 17450 NSAPI_INC_DIR="$PHP_NSAPI/plugins/include" 17451- echo "$as_me:$LINENO: result: iPlanet 4.x / Sun 6.x style" >&5 17452-echo "${ECHO_T}iPlanet 4.x / Sun 6.x style" >&6 17453- 17454-for ac_header in $NSAPI_INC_DIR/nsapi.h 17455+ echo "$ac_t""iPlanet 4.x / Sun 6.x style" 1>&6 17456+ for ac_hdr in $NSAPI_INC_DIR/nsapi.h 17457 do 17458-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 17459-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17460- echo "$as_me:$LINENO: checking for $ac_header" >&5 17461-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 17462-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17463- echo $ECHO_N "(cached) $ECHO_C" >&6 17464-fi 17465-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 17466-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 17467-else 17468- # Is the header compilable? 17469-echo "$as_me:$LINENO: checking $ac_header usability" >&5 17470-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 17471-cat >conftest.$ac_ext <<_ACEOF 17472-/* confdefs.h. */ 17473-_ACEOF 17474-cat confdefs.h >>conftest.$ac_ext 17475-cat >>conftest.$ac_ext <<_ACEOF 17476-/* end confdefs.h. */ 17477-$ac_includes_default 17478-#include <$ac_header> 17479-_ACEOF 17480-rm -f conftest.$ac_objext 17481-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 17482- (eval $ac_compile) 2>conftest.er1 17483- ac_status=$? 17484- grep -v '^ *+' conftest.er1 >conftest.err 17485- rm -f conftest.er1 17486- cat conftest.err >&5 17487- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17488- (exit $ac_status); } && 17489- { ac_try='test -z "$ac_c_werror_flag" 17490- || test ! -s conftest.err' 17491- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17492- (eval $ac_try) 2>&5 17493- ac_status=$? 17494- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17495- (exit $ac_status); }; } && 17496- { ac_try='test -s conftest.$ac_objext' 17497- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 17498- (eval $ac_try) 2>&5 17499- ac_status=$? 17500- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17501- (exit $ac_status); }; }; then 17502- ac_header_compiler=yes 17503-else 17504- echo "$as_me: failed program was:" >&5 17505-sed 's/^/| /' conftest.$ac_ext >&5 17506- 17507-ac_header_compiler=no 17508-fi 17509-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 17510-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 17511-echo "${ECHO_T}$ac_header_compiler" >&6 17512- 17513-# Is the header present? 17514-echo "$as_me:$LINENO: checking $ac_header presence" >&5 17515-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 17516-cat >conftest.$ac_ext <<_ACEOF 17517-/* confdefs.h. */ 17518-_ACEOF 17519-cat confdefs.h >>conftest.$ac_ext 17520-cat >>conftest.$ac_ext <<_ACEOF 17521-/* end confdefs.h. */ 17522-#include <$ac_header> 17523-_ACEOF 17524-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 17525- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 17526- ac_status=$? 17527- grep -v '^ *+' conftest.er1 >conftest.err 17528- rm -f conftest.er1 17529- cat conftest.err >&5 17530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 17531- (exit $ac_status); } >/dev/null; then 17532- if test -s conftest.err; then 17533- ac_cpp_err=$ac_c_preproc_warn_flag 17534- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 17535- else 17536- ac_cpp_err= 17537- fi 17538-else 17539- ac_cpp_err=yes 17540-fi 17541-if test -z "$ac_cpp_err"; then 17542- ac_header_preproc=yes 17543-else 17544- echo "$as_me: failed program was:" >&5 17545-sed 's/^/| /' conftest.$ac_ext >&5 17546- 17547- ac_header_preproc=no 17548-fi 17549-rm -f conftest.err conftest.$ac_ext 17550-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 17551-echo "${ECHO_T}$ac_header_preproc" >&6 17552- 17553-# So? What about this header? 17554-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 17555- yes:no: ) 17556- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 17557-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 17558- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 17559-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 17560- ac_header_preproc=yes 17561- ;; 17562- no:yes:* ) 17563- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 17564-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 17565- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 17566-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 17567- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 17568-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 17569- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 17570-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 17571- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 17572-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 17573- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 17574-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 17575- ( 17576- cat <<\_ASBOX 17577-## ------------------------------------------ ## 17578-## Report this to the AC_PACKAGE_NAME lists. ## 17579-## ------------------------------------------ ## 17580-_ASBOX 17581- ) | 17582- sed "s/^/$as_me: WARNING: /" >&2 17583- ;; 17584-esac 17585-echo "$as_me:$LINENO: checking for $ac_header" >&5 17586-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 17587-if eval "test \"\${$as_ac_Header+set}\" = set"; then 17588- echo $ECHO_N "(cached) $ECHO_C" >&6 17589+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 17590+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 17591+echo "configure:11389: checking for $ac_hdr" >&5 17592+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 17593+ echo $ac_n "(cached) $ac_c" 1>&6 17594+else 17595+ cat > conftest.$ac_ext <<EOF 17596+#line 11394 "configure" 17597+#include "confdefs.h" 17598+#include <$ac_hdr> 17599+EOF 17600+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 17601+{ (eval echo configure:11399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 17602+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 17603+if test -z "$ac_err"; then 17604+ rm -rf conftest* 17605+ eval "ac_cv_header_$ac_safe=yes" 17606 else 17607- eval "$as_ac_Header=\$ac_header_preproc" 17608+ echo "$ac_err" >&5 17609+ echo "configure: failed program was:" >&5 17610+ cat conftest.$ac_ext >&5 17611+ rm -rf conftest* 17612+ eval "ac_cv_header_$ac_safe=no" 17613 fi 17614-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 17615-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 17616- 17617+rm -f conftest* 17618 fi 17619-if test `eval echo '${'$as_ac_Header'}'` = yes; then 17620- cat >>confdefs.h <<_ACEOF 17621-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 17622-_ACEOF 17623- 17624+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 17625+ echo "$ac_t""yes" 1>&6 17626+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 17627+ cat >> confdefs.h <<EOF 17628+#define $ac_tr_hdr 1 17629+EOF 17630+ 17631+else 17632+ echo "$ac_t""no" 1>&6 17633 fi 17634- 17635 done 17636 17637 NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR" 17638 fi 17639 if test -z "$NSAPI_INCLUDE"; then 17640- { { echo "$as_me:$LINENO: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&5 17641-echo "$as_me: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&2;} 17642- { (exit 1); exit 1; }; } 17643+ { echo "configure: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" 1>&2; exit 1; } 17644 fi 17645 17646- 17647+ 17648 for ac_i in $NSAPI_INCLUDE; do 17649 case $ac_i in 17650 -I*) 17651 ac_ii=`echo $ac_i|cut -c 3-` 17652- 17653+ 17654 if test "$ac_ii" != "/usr/include"; then 17655- 17656+ 17657 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 17658 ai_p=$ac_ii 17659 else 17660- 17661+ 17662 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 17663- 17664+ 17665 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 17666 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 17667 fi 17668 17669- 17670- 17671+ 17672+ 17673 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 17674- 17675+ 17676 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 17677 if test -n "$unique" && test "`eval $cmd`" = "" ; then 17678 eval "INCLUDEPATH$unique=set" 17679- 17680+ 17681 if test ""; then 17682 INCLUDES="-I$ai_p $INCLUDES" 17683 else 17684 INCLUDES="$INCLUDES -I$ai_p" 17685 fi 17686- 17687+ 17688 fi 17689 17690 fi 17691@@ -15168,46 +11467,44 @@ 17692 esac 17693 done 17694 17695- 17696+ 17697 enable_maintainer_zts=yes 17698 if test "$pthreads_working" != "yes"; then 17699- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 17700-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 17701- { (exit 1); exit 1; }; } 17702+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 17703 fi 17704 17705- 17706-cat >>confdefs.h <<\_ACEOF 17707+ cat >> confdefs.h <<\EOF 17708 #define HAVE_NSAPI 1 17709-_ACEOF 17710- 17711+EOF 17712 17713- if test "$PHP_SAPI" != "default"; then 17714-{ { echo "$as_me:$LINENO: error: 17715+ 17716+ if test "shared" = "program"; then 17717+ PHP_BINARIES="$PHP_BINARIES nsapi" 17718+ elif test "$PHP_SAPI" != "none"; then 17719+ { echo "configure: error: 17720 +--------------------------------------------------------------------+ 17721 | *** ATTENTION *** | 17722 | | 17723 | You've configured multiple SAPIs to be build. You can build only | 17724-| one SAPI module and CLI binary at the same time. | 17725+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 17726 +--------------------------------------------------------------------+ 17727-" >&5 17728-echo "$as_me: error: 17729-+--------------------------------------------------------------------+ 17730-| *** ATTENTION *** | 17731-| | 17732-| You've configured multiple SAPIs to be build. You can build only | 17733-| one SAPI module and CLI binary at the same time. | 17734-+--------------------------------------------------------------------+ 17735-" >&2;} 17736- { (exit 1); exit 1; }; } 17737- fi 17738+" 1>&2; exit 1; } 17739+ else 17740+ PHP_SAPI=nsapi 17741+ fi 17742+ 17743+ 17744+ 17745+ BUILD_DIR="$BUILD_DIR sapi/nsapi" 17746+ 17747 17748- PHP_SAPI=nsapi 17749 17750- case "shared" in 17751- static) 17752+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS nsapi" 17753 17754- OVERALL_TARGET=php 17755+ 17756+ case "shared" in 17757+ static) 17758+ 17759 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17760 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17761 php_c_post= 17762@@ -15229,14 +11526,11 @@ 17763 shared_cxx_post= 17764 shared_lo=lo 17765 17766- php_build_target=program 17767- 17768 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 17769- php_build_target=static 17770+ php_sapi_module=static 17771 ;; 17772- shared) 17773- 17774- OVERALL_TARGET=php 17775+ shared) 17776+ 17777 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17778 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17779 php_c_post= 17780@@ -15258,11 +11552,9 @@ 17781 shared_cxx_post= 17782 shared_lo=lo 17783 17784- php_build_target=program 17785- 17786 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 17787- php_build_target=shared 17788- 17789+ php_sapi_module=shared 17790+ 17791 php_c_pre=$shared_c_pre 17792 php_c_meta=$shared_c_meta 17793 php_c_post=$shared_c_post 17794@@ -15271,9 +11563,8 @@ 17795 php_cxx_post=$shared_cxx_post 17796 php_lo=$shared_lo 17797 ;; 17798- bundle) 17799- 17800- OVERALL_TARGET=php 17801+ bundle) 17802+ 17803 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17804 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17805 php_c_post= 17806@@ -15295,47 +11586,20 @@ 17807 shared_cxx_post= 17808 shared_lo=lo 17809 17810- php_build_target=program 17811- 17812 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 17813- php_build_target=static 17814-;; 17815- program) 17816- OVERALL_TARGET=php 17817- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17818- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 17819- php_c_post= 17820- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17821- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 17822- php_cxx_post= 17823- php_lo=lo 17824- 17825- case $with_pic in 17826- yes) pic_setting='-prefer-pic';; 17827- no) pic_setting='-prefer-non-pic';; 17828- esac 17829- 17830- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 17831- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 17832- shared_c_post= 17833- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 17834- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 17835- shared_cxx_post= 17836- shared_lo=lo 17837- 17838- php_build_target=program 17839+ php_sapi_module=static 17840 ;; 17841- esac 17842- 17843- 17844- 17845+ esac 17846+ install_sapi="install-sapi" 17847+ 17848+ 17849 case sapi/nsapi in 17850 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 17851 /*) ac_srcdir=`echo "sapi/nsapi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 17852 *) ac_srcdir="$abs_srcdir/sapi/nsapi/"; ac_bdir="sapi/nsapi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 17853 esac 17854- 17855- 17856+ 17857+ 17858 17859 b_c_pre=$php_c_pre 17860 b_cxx_pre=$php_cxx_pre 17861@@ -15348,12 +11612,12 @@ 17862 17863 old_IFS=$IFS 17864 for ac_src in nsapi.c; do 17865- 17866+ 17867 IFS=. 17868 set $ac_src 17869 ac_obj=$1 17870 IFS=$old_IFS 17871- 17872+ 17873 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 17874 17875 case $ac_src in 17876@@ -15370,6 +11634,7 @@ 17877 done 17878 17879 17880+ 17881 17882 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/" 17883 fi 17884@@ -15380,104 +11645,99 @@ 17885 17886 php_with_phttpd=no 17887 17888-echo "$as_me:$LINENO: checking for PHTTPD support" >&5 17889-echo $ECHO_N "checking for PHTTPD support... $ECHO_C" >&6 17890- 17891+echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 17892+echo "configure:11650: checking for PHTTPD support" >&5 17893 # Check whether --with-phttpd or --without-phttpd was given. 17894 if test "${with_phttpd+set}" = set; then 17895 withval="$with_phttpd" 17896 PHP_PHTTPD=$withval 17897 else 17898- 17899+ 17900 PHP_PHTTPD=no 17901+ 17902 17903+fi 17904 17905-fi; 17906 17907 ext_output=$PHP_PHTTPD 17908-echo "$as_me:$LINENO: result: $ext_output" >&5 17909-echo "${ECHO_T}$ext_output" >&6 17910+echo "$ac_t""$ext_output" 1>&6 17911 17912 17913 17914 17915 if test "$PHP_PHTTPD" != "no"; then 17916 if test ! -d $PHP_PHTTPD ; then 17917- { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5 17918-echo "$as_me: error: You did not specify a directory" >&2;} 17919- { (exit 1); exit 1; }; } 17920+ { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } 17921 fi 17922- 17923+ 17924 enable_maintainer_zts=yes 17925 if test "$pthreads_working" != "yes"; then 17926- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 17927-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 17928- { (exit 1); exit 1; }; } 17929+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 17930 fi 17931 17932- 17933+ 17934 if test "$PHP_PHTTPD/include" != "/usr/include"; then 17935- 17936+ 17937 if test -z "$PHP_PHTTPD/include" || echo "$PHP_PHTTPD/include" | grep '^/' >/dev/null ; then 17938 ai_p=$PHP_PHTTPD/include 17939 else 17940- 17941+ 17942 ep_dir="`echo $PHP_PHTTPD/include|$SED 's%/*[^/][^/]*/*$%%'`" 17943- 17944+ 17945 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 17946 ai_p="$ep_realdir/`basename \"$PHP_PHTTPD/include\"`" 17947 fi 17948 17949- 17950- 17951+ 17952+ 17953 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 17954- 17955+ 17956 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 17957 if test -n "$unique" && test "`eval $cmd`" = "" ; then 17958 eval "INCLUDEPATH$unique=set" 17959- 17960+ 17961 if test ""; then 17962 INCLUDES="-I$ai_p $INCLUDES" 17963 else 17964 INCLUDES="$INCLUDES -I$ai_p" 17965 fi 17966- 17967+ 17968 fi 17969 17970 fi 17971 17972- 17973-cat >>confdefs.h <<\_ACEOF 17974+ cat >> confdefs.h <<\EOF 17975 #define HAVE_PHTTPD 1 17976-_ACEOF 17977- 17978+EOF 17979 17980- if test "$PHP_SAPI" != "default"; then 17981-{ { echo "$as_me:$LINENO: error: 17982-+--------------------------------------------------------------------+ 17983-| *** ATTENTION *** | 17984-| | 17985-| You've configured multiple SAPIs to be build. You can build only | 17986-| one SAPI module and CLI binary at the same time. | 17987-+--------------------------------------------------------------------+ 17988-" >&5 17989-echo "$as_me: error: 17990+ 17991+ if test "shared" = "program"; then 17992+ PHP_BINARIES="$PHP_BINARIES phttpd" 17993+ elif test "$PHP_SAPI" != "none"; then 17994+ { echo "configure: error: 17995 +--------------------------------------------------------------------+ 17996 | *** ATTENTION *** | 17997 | | 17998 | You've configured multiple SAPIs to be build. You can build only | 17999-| one SAPI module and CLI binary at the same time. | 18000+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 18001 +--------------------------------------------------------------------+ 18002-" >&2;} 18003- { (exit 1); exit 1; }; } 18004- fi 18005+" 1>&2; exit 1; } 18006+ else 18007+ PHP_SAPI=phttpd 18008+ fi 18009 18010- PHP_SAPI=phttpd 18011+ 18012+ 18013+ BUILD_DIR="$BUILD_DIR sapi/phttpd" 18014+ 18015 18016- case "shared" in 18017- static) 18018 18019- OVERALL_TARGET=php 18020+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS phttpd" 18021+ 18022+ 18023+ case "shared" in 18024+ static) 18025+ 18026 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18027 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18028 php_c_post= 18029@@ -15499,14 +11759,11 @@ 18030 shared_cxx_post= 18031 shared_lo=lo 18032 18033- php_build_target=program 18034- 18035 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18036- php_build_target=static 18037+ php_sapi_module=static 18038 ;; 18039- shared) 18040- 18041- OVERALL_TARGET=php 18042+ shared) 18043+ 18044 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18045 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18046 php_c_post= 18047@@ -15528,11 +11785,9 @@ 18048 shared_cxx_post= 18049 shared_lo=lo 18050 18051- php_build_target=program 18052- 18053 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18054- php_build_target=shared 18055- 18056+ php_sapi_module=shared 18057+ 18058 php_c_pre=$shared_c_pre 18059 php_c_meta=$shared_c_meta 18060 php_c_post=$shared_c_post 18061@@ -15541,9 +11796,8 @@ 18062 php_cxx_post=$shared_cxx_post 18063 php_lo=$shared_lo 18064 ;; 18065- bundle) 18066- 18067- OVERALL_TARGET=php 18068+ bundle) 18069+ 18070 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18071 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18072 php_c_post= 18073@@ -15565,47 +11819,20 @@ 18074 shared_cxx_post= 18075 shared_lo=lo 18076 18077- php_build_target=program 18078- 18079 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 18080- php_build_target=static 18081-;; 18082- program) 18083- OVERALL_TARGET=php 18084- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18085- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18086- php_c_post= 18087- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18088- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 18089- php_cxx_post= 18090- php_lo=lo 18091- 18092- case $with_pic in 18093- yes) pic_setting='-prefer-pic';; 18094- no) pic_setting='-prefer-non-pic';; 18095- esac 18096- 18097- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18098- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 18099- shared_c_post= 18100- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18101- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 18102- shared_cxx_post= 18103- shared_lo=lo 18104- 18105- php_build_target=program 18106+ php_sapi_module=static 18107 ;; 18108- esac 18109- 18110- 18111- 18112+ esac 18113+ install_sapi="install-sapi" 18114+ 18115+ 18116 case sapi/phttpd in 18117 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 18118 /*) ac_srcdir=`echo "sapi/phttpd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 18119 *) ac_srcdir="$abs_srcdir/sapi/phttpd/"; ac_bdir="sapi/phttpd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 18120 esac 18121- 18122- 18123+ 18124+ 18125 18126 b_c_pre=$php_c_pre 18127 b_cxx_pre=$php_cxx_pre 18128@@ -15618,12 +11845,12 @@ 18129 18130 old_IFS=$IFS 18131 for ac_src in phttpd.c; do 18132- 18133+ 18134 IFS=. 18135 set $ac_src 18136 ac_obj=$1 18137 IFS=$old_IFS 18138- 18139+ 18140 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 18141 18142 case $ac_src in 18143@@ -15640,6 +11867,7 @@ 18144 done 18145 18146 18147+ 18148 18149 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/" 18150 fi 18151@@ -15649,23 +11877,22 @@ 18152 18153 php_with_pi3web=no 18154 18155-echo "$as_me:$LINENO: checking for Pi3Web support" >&5 18156-echo $ECHO_N "checking for Pi3Web support... $ECHO_C" >&6 18157- 18158+echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 18159+echo "configure:11882: checking for Pi3Web support" >&5 18160 # Check whether --with-pi3web or --without-pi3web was given. 18161 if test "${with_pi3web+set}" = set; then 18162 withval="$with_pi3web" 18163 PHP_PI3WEB=$withval 18164 else 18165- 18166+ 18167 PHP_PI3WEB=no 18168+ 18169 18170+fi 18171 18172-fi; 18173 18174 ext_output=$PHP_PI3WEB 18175-echo "$as_me:$LINENO: result: $ext_output" >&5 18176-echo "${ECHO_T}$ext_output" >&6 18177+echo "$ac_t""$ext_output" 1>&6 18178 18179 18180 18181@@ -15676,173 +11903,169 @@ 18182 else 18183 PI3PATH=$PHP_PI3WEB 18184 fi 18185- test -f "$PI3PATH/PiAPI/PiAPI.h" || { { echo "$as_me:$LINENO: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&5 18186-echo "$as_me: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&2;} 18187- { (exit 1); exit 1; }; } 18188- 18189+ test -f "$PI3PATH/PiAPI/PiAPI.h" || { echo "configure: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" 1>&2; exit 1; } 18190+ 18191 enable_maintainer_zts=yes 18192 if test "$pthreads_working" != "yes"; then 18193- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 18194-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 18195- { (exit 1); exit 1; }; } 18196+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 18197 fi 18198 18199- 18200-cat >>confdefs.h <<\_ACEOF 18201+ cat >> confdefs.h <<\EOF 18202 #define WITH_PI3WEB 1 18203-_ACEOF 18204- 18205+EOF 18206 18207+ 18208 if test "$PI3PATH/PiAPI" != "/usr/include"; then 18209- 18210+ 18211 if test -z "$PI3PATH/PiAPI" || echo "$PI3PATH/PiAPI" | grep '^/' >/dev/null ; then 18212 ai_p=$PI3PATH/PiAPI 18213 else 18214- 18215+ 18216 ep_dir="`echo $PI3PATH/PiAPI|$SED 's%/*[^/][^/]*/*$%%'`" 18217- 18218+ 18219 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18220 ai_p="$ep_realdir/`basename \"$PI3PATH/PiAPI\"`" 18221 fi 18222 18223- 18224- 18225+ 18226+ 18227 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 18228- 18229+ 18230 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 18231 if test -n "$unique" && test "`eval $cmd`" = "" ; then 18232 eval "INCLUDEPATH$unique=set" 18233- 18234+ 18235 if test ""; then 18236 INCLUDES="-I$ai_p $INCLUDES" 18237 else 18238 INCLUDES="$INCLUDES -I$ai_p" 18239 fi 18240- 18241+ 18242 fi 18243 18244 fi 18245 18246- 18247+ 18248 if test "$PI3PATH/Pi2API" != "/usr/include"; then 18249- 18250+ 18251 if test -z "$PI3PATH/Pi2API" || echo "$PI3PATH/Pi2API" | grep '^/' >/dev/null ; then 18252 ai_p=$PI3PATH/Pi2API 18253 else 18254- 18255+ 18256 ep_dir="`echo $PI3PATH/Pi2API|$SED 's%/*[^/][^/]*/*$%%'`" 18257- 18258+ 18259 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18260 ai_p="$ep_realdir/`basename \"$PI3PATH/Pi2API\"`" 18261 fi 18262 18263- 18264- 18265+ 18266+ 18267 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 18268- 18269+ 18270 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 18271 if test -n "$unique" && test "`eval $cmd`" = "" ; then 18272 eval "INCLUDEPATH$unique=set" 18273- 18274+ 18275 if test ""; then 18276 INCLUDES="-I$ai_p $INCLUDES" 18277 else 18278 INCLUDES="$INCLUDES -I$ai_p" 18279 fi 18280- 18281+ 18282 fi 18283 18284 fi 18285 18286- 18287+ 18288 if test "$PI3PATH/Pi3API" != "/usr/include"; then 18289- 18290+ 18291 if test -z "$PI3PATH/Pi3API" || echo "$PI3PATH/Pi3API" | grep '^/' >/dev/null ; then 18292 ai_p=$PI3PATH/Pi3API 18293 else 18294- 18295+ 18296 ep_dir="`echo $PI3PATH/Pi3API|$SED 's%/*[^/][^/]*/*$%%'`" 18297- 18298+ 18299 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18300 ai_p="$ep_realdir/`basename \"$PI3PATH/Pi3API\"`" 18301 fi 18302 18303- 18304- 18305+ 18306+ 18307 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 18308- 18309+ 18310 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 18311 if test -n "$unique" && test "`eval $cmd`" = "" ; then 18312 eval "INCLUDEPATH$unique=set" 18313- 18314+ 18315 if test ""; then 18316 INCLUDES="-I$ai_p $INCLUDES" 18317 else 18318 INCLUDES="$INCLUDES -I$ai_p" 18319 fi 18320- 18321+ 18322 fi 18323 18324 fi 18325 18326- 18327+ 18328 if test "$PI3PATH/PHP5" != "/usr/include"; then 18329- 18330+ 18331 if test -z "$PI3PATH/PHP5" || echo "$PI3PATH/PHP5" | grep '^/' >/dev/null ; then 18332 ai_p=$PI3PATH/PHP5 18333 else 18334- 18335+ 18336 ep_dir="`echo $PI3PATH/PHP5|$SED 's%/*[^/][^/]*/*$%%'`" 18337- 18338+ 18339 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18340 ai_p="$ep_realdir/`basename \"$PI3PATH/PHP5\"`" 18341 fi 18342 18343- 18344- 18345+ 18346+ 18347 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 18348- 18349+ 18350 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 18351 if test -n "$unique" && test "`eval $cmd`" = "" ; then 18352 eval "INCLUDEPATH$unique=set" 18353- 18354+ 18355 if test ""; then 18356 INCLUDES="-I$ai_p $INCLUDES" 18357 else 18358 INCLUDES="$INCLUDES -I$ai_p" 18359 fi 18360- 18361+ 18362 fi 18363 18364 fi 18365 18366- 18367- if test "$PHP_SAPI" != "default"; then 18368-{ { echo "$as_me:$LINENO: error: 18369-+--------------------------------------------------------------------+ 18370-| *** ATTENTION *** | 18371-| | 18372-| You've configured multiple SAPIs to be build. You can build only | 18373-| one SAPI module and CLI binary at the same time. | 18374-+--------------------------------------------------------------------+ 18375-" >&5 18376-echo "$as_me: error: 18377+ 18378+ if test "shared" = "program"; then 18379+ PHP_BINARIES="$PHP_BINARIES pi3web" 18380+ elif test "$PHP_SAPI" != "none"; then 18381+ { echo "configure: error: 18382 +--------------------------------------------------------------------+ 18383 | *** ATTENTION *** | 18384 | | 18385 | You've configured multiple SAPIs to be build. You can build only | 18386-| one SAPI module and CLI binary at the same time. | 18387+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 18388 +--------------------------------------------------------------------+ 18389-" >&2;} 18390- { (exit 1); exit 1; }; } 18391- fi 18392+" 1>&2; exit 1; } 18393+ else 18394+ PHP_SAPI=pi3web 18395+ fi 18396 18397- PHP_SAPI=pi3web 18398+ 18399+ 18400+ BUILD_DIR="$BUILD_DIR sapi/pi3web" 18401+ 18402 18403- case "shared" in 18404- static) 18405 18406- OVERALL_TARGET=php 18407+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS pi3web" 18408+ 18409+ 18410+ case "shared" in 18411+ static) 18412+ 18413 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18414 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18415 php_c_post= 18416@@ -15864,14 +12087,11 @@ 18417 shared_cxx_post= 18418 shared_lo=lo 18419 18420- php_build_target=program 18421- 18422 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18423- php_build_target=static 18424+ php_sapi_module=static 18425 ;; 18426- shared) 18427- 18428- OVERALL_TARGET=php 18429+ shared) 18430+ 18431 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18432 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18433 php_c_post= 18434@@ -15893,11 +12113,9 @@ 18435 shared_cxx_post= 18436 shared_lo=lo 18437 18438- php_build_target=program 18439- 18440 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18441- php_build_target=shared 18442- 18443+ php_sapi_module=shared 18444+ 18445 php_c_pre=$shared_c_pre 18446 php_c_meta=$shared_c_meta 18447 php_c_post=$shared_c_post 18448@@ -15906,9 +12124,8 @@ 18449 php_cxx_post=$shared_cxx_post 18450 php_lo=$shared_lo 18451 ;; 18452- bundle) 18453- 18454- OVERALL_TARGET=php 18455+ bundle) 18456+ 18457 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18458 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18459 php_c_post= 18460@@ -15930,47 +12147,20 @@ 18461 shared_cxx_post= 18462 shared_lo=lo 18463 18464- php_build_target=program 18465- 18466 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 18467- php_build_target=static 18468+ php_sapi_module=static 18469 ;; 18470- program) 18471- OVERALL_TARGET=php 18472- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18473- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18474- php_c_post= 18475- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18476- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 18477- php_cxx_post= 18478- php_lo=lo 18479- 18480- case $with_pic in 18481- yes) pic_setting='-prefer-pic';; 18482- no) pic_setting='-prefer-non-pic';; 18483- esac 18484- 18485- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18486- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 18487- shared_c_post= 18488- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18489- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 18490- shared_cxx_post= 18491- shared_lo=lo 18492- 18493- php_build_target=program 18494-;; 18495- esac 18496- 18497- 18498- 18499+ esac 18500+ install_sapi="install-sapi" 18501+ 18502+ 18503 case sapi/pi3web in 18504 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 18505 /*) ac_srcdir=`echo "sapi/pi3web"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 18506 *) ac_srcdir="$abs_srcdir/sapi/pi3web/"; ac_bdir="sapi/pi3web/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 18507 esac 18508- 18509- 18510+ 18511+ 18512 18513 b_c_pre=$php_c_pre 18514 b_cxx_pre=$php_cxx_pre 18515@@ -15983,12 +12173,12 @@ 18516 18517 old_IFS=$IFS 18518 for ac_src in pi3web_sapi.c; do 18519- 18520+ 18521 IFS=. 18522 set $ac_src 18523 ac_obj=$1 18524 IFS=$old_IFS 18525- 18526+ 18527 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 18528 18529 case $ac_src in 18530@@ -16005,6 +12195,7 @@ 18531 done 18532 18533 18534+ 18535 18536 INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/" 18537 fi 18538@@ -16015,17 +12206,17 @@ 18539 php_with_roxen=no 18540 18541 18542- 18543 # Check whether --with-roxen or --without-roxen was given. 18544 if test "${with_roxen+set}" = set; then 18545 withval="$with_roxen" 18546 PHP_ROXEN=$withval 18547 else 18548- 18549+ 18550 PHP_ROXEN=no 18551+ 18552 18553+fi 18554 18555-fi; 18556 18557 ext_output=$PHP_ROXEN 18558 18559@@ -16036,122 +12227,114 @@ 18560 18561 php_enable_roxen_zts=no 18562 18563-echo "$as_me:$LINENO: checking whether Roxen module is build using ZTS" >&5 18564-echo $ECHO_N "checking whether Roxen module is build using ZTS... $ECHO_C" >&6 18565+echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6 18566+echo "configure:12232: checking whether Roxen module is build using ZTS" >&5 18567 # Check whether --enable-roxen-zts or --disable-roxen-zts was given. 18568 if test "${enable_roxen_zts+set}" = set; then 18569 enableval="$enable_roxen_zts" 18570 PHP_ROXEN_ZTS=$enableval 18571 else 18572- 18573+ 18574 PHP_ROXEN_ZTS=no 18575+ 18576 18577+fi 18578 18579-fi; 18580 18581 ext_output=$PHP_ROXEN_ZTS 18582-echo "$as_me:$LINENO: result: $ext_output" >&5 18583-echo "${ECHO_T}$ext_output" >&6 18584+echo "$ac_t""$ext_output" 1>&6 18585 18586 18587 18588 18589 RESULT= 18590-echo "$as_me:$LINENO: checking for Roxen/Pike support" >&5 18591-echo $ECHO_N "checking for Roxen/Pike support... $ECHO_C" >&6 18592+echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 18593+echo "configure:12253: checking for Roxen/Pike support" >&5 18594 if test "$PHP_ROXEN" != "no"; then 18595 if test ! -d $PHP_ROXEN ; then 18596- { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5 18597-echo "$as_me: error: You did not specify a directory" >&2;} 18598- { (exit 1); exit 1; }; } 18599+ { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } 18600 fi 18601 if test -f $PHP_ROXEN/bin/roxen; then 18602 PIKE=$PHP_ROXEN/bin/roxen 18603 elif test -f $PHP_ROXEN/bin/pike; then 18604 PIKE=$PHP_ROXEN/bin/pike 18605 else 18606- { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_ROXEN/bin/" >&5 18607-echo "$as_me: error: Could not find a pike in $PHP_ROXEN/bin/" >&2;} 18608- { (exit 1); exit 1; }; } 18609+ { echo "configure: error: Could not find a pike in $PHP_ROXEN/bin/" 1>&2; exit 1; } 18610 fi 18611 18612 if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then 18613 PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'` 18614 PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'` 18615 if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then 18616- { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5 18617-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;} 18618- { (exit 1); exit 1; }; } 18619+ { echo "configure: error: Failed to figure out Pike module and include directories" 1>&2; exit 1; } 18620 fi 18621 else 18622- { { echo "$as_me:$LINENO: error: Roxen/PHP requires Pike 0.7.79 or newer" >&5 18623-echo "$as_me: error: Roxen/PHP requires Pike 0.7.79 or newer" >&2;} 18624- { (exit 1); exit 1; }; } 18625+ { echo "configure: error: Roxen/PHP requires Pike 0.7.79 or newer" 1>&2; exit 1; } 18626 fi 18627- 18628- 18629+ 18630+ 18631 if test "$PIKE_INCLUDE_DIR" != "/usr/include"; then 18632- 18633+ 18634 if test -z "$PIKE_INCLUDE_DIR" || echo "$PIKE_INCLUDE_DIR" | grep '^/' >/dev/null ; then 18635 ai_p=$PIKE_INCLUDE_DIR 18636 else 18637- 18638+ 18639 ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 18640- 18641+ 18642 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18643 ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`" 18644 fi 18645 18646- 18647- 18648+ 18649+ 18650 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 18651- 18652+ 18653 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 18654 if test -n "$unique" && test "`eval $cmd`" = "" ; then 18655 eval "INCLUDEPATH$unique=set" 18656- 18657+ 18658 if test ""; then 18659 INCLUDES="-I$ai_p $INCLUDES" 18660 else 18661 INCLUDES="$INCLUDES -I$ai_p" 18662 fi 18663- 18664+ 18665 fi 18666 18667 fi 18668 18669- 18670-cat >>confdefs.h <<\_ACEOF 18671+ cat >> confdefs.h <<\EOF 18672 #define HAVE_ROXEN 1 18673-_ACEOF 18674- 18675+EOF 18676 18677- if test "$PHP_SAPI" != "default"; then 18678-{ { echo "$as_me:$LINENO: error: 18679-+--------------------------------------------------------------------+ 18680-| *** ATTENTION *** | 18681-| | 18682-| You've configured multiple SAPIs to be build. You can build only | 18683-| one SAPI module and CLI binary at the same time. | 18684-+--------------------------------------------------------------------+ 18685-" >&5 18686-echo "$as_me: error: 18687+ 18688+ if test "shared" = "program"; then 18689+ PHP_BINARIES="$PHP_BINARIES roxen" 18690+ elif test "$PHP_SAPI" != "none"; then 18691+ { echo "configure: error: 18692 +--------------------------------------------------------------------+ 18693 | *** ATTENTION *** | 18694 | | 18695 | You've configured multiple SAPIs to be build. You can build only | 18696-| one SAPI module and CLI binary at the same time. | 18697+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 18698 +--------------------------------------------------------------------+ 18699-" >&2;} 18700- { (exit 1); exit 1; }; } 18701- fi 18702+" 1>&2; exit 1; } 18703+ else 18704+ PHP_SAPI=roxen 18705+ fi 18706 18707- PHP_SAPI=roxen 18708+ 18709+ 18710+ BUILD_DIR="$BUILD_DIR sapi/roxen" 18711+ 18712 18713- case "shared" in 18714- static) 18715 18716- OVERALL_TARGET=php 18717+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS roxen" 18718+ 18719+ 18720+ case "shared" in 18721+ static) 18722+ 18723 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18724 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18725 php_c_post= 18726@@ -16173,14 +12356,11 @@ 18727 shared_cxx_post= 18728 shared_lo=lo 18729 18730- php_build_target=program 18731- 18732 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18733- php_build_target=static 18734+ php_sapi_module=static 18735 ;; 18736- shared) 18737- 18738- OVERALL_TARGET=php 18739+ shared) 18740+ 18741 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18742 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18743 php_c_post= 18744@@ -16202,11 +12382,9 @@ 18745 shared_cxx_post= 18746 shared_lo=lo 18747 18748- php_build_target=program 18749- 18750 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 18751- php_build_target=shared 18752- 18753+ php_sapi_module=shared 18754+ 18755 php_c_pre=$shared_c_pre 18756 php_c_meta=$shared_c_meta 18757 php_c_post=$shared_c_post 18758@@ -16215,9 +12393,8 @@ 18759 php_cxx_post=$shared_cxx_post 18760 php_lo=$shared_lo 18761 ;; 18762- bundle) 18763- 18764- OVERALL_TARGET=php 18765+ bundle) 18766+ 18767 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18768 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18769 php_c_post= 18770@@ -16239,47 +12416,20 @@ 18771 shared_cxx_post= 18772 shared_lo=lo 18773 18774- php_build_target=program 18775- 18776 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 18777- php_build_target=static 18778-;; 18779- program) 18780- OVERALL_TARGET=php 18781- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18782- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 18783- php_c_post= 18784- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18785- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 18786- php_cxx_post= 18787- php_lo=lo 18788- 18789- case $with_pic in 18790- yes) pic_setting='-prefer-pic';; 18791- no) pic_setting='-prefer-non-pic';; 18792- esac 18793- 18794- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 18795- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 18796- shared_c_post= 18797- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 18798- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 18799- shared_cxx_post= 18800- shared_lo=lo 18801- 18802- php_build_target=program 18803+ php_sapi_module=static 18804 ;; 18805- esac 18806- 18807- 18808- 18809+ esac 18810+ install_sapi="install-sapi" 18811+ 18812+ 18813 case sapi/roxen in 18814 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 18815 /*) ac_srcdir=`echo "sapi/roxen"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 18816 *) ac_srcdir="$abs_srcdir/sapi/roxen/"; ac_bdir="sapi/roxen/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 18817 esac 18818- 18819- 18820+ 18821+ 18822 18823 b_c_pre=$php_c_pre 18824 b_cxx_pre=$php_cxx_pre 18825@@ -16292,12 +12442,12 @@ 18826 18827 old_IFS=$IFS 18828 for ac_src in roxen.c; do 18829- 18830+ 18831 IFS=. 18832 set $ac_src 18833 ac_obj=$1 18834 IFS=$old_IFS 18835- 18836+ 18837 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 18838 18839 case $ac_src in 18840@@ -16314,6 +12464,7 @@ 18841 done 18842 18843 18844+ 18845 18846 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so" 18847 RESULT="yes 18848@@ -16323,23 +12474,19 @@ 18849 PIKE_INCLUDE_DIR=" -I$PIKE_INCLUDE_DIR " 18850 18851 if test "$PHP_ROXEN_ZTS" != "no"; then 18852- 18853+ 18854 enable_maintainer_zts=yes 18855 if test "$pthreads_working" != "yes"; then 18856- { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5 18857-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;} 18858- { (exit 1); exit 1; }; } 18859+ { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } 18860 fi 18861 18862- 18863-cat >>confdefs.h <<\_ACEOF 18864+ cat >> confdefs.h <<\EOF 18865 #define ROXEN_USE_ZTS 1 18866-_ACEOF 18867+EOF 18868 18869 fi 18870 fi 18871-echo "$as_me:$LINENO: result: $RESULT" >&5 18872-echo "${ECHO_T}$RESULT" >&6 18873+echo "$ac_t""$RESULT" 1>&6 18874 18875 18876 18877@@ -16347,17 +12494,17 @@ 18878 php_with_thttpd=no 18879 18880 18881- 18882 # Check whether --with-thttpd or --without-thttpd was given. 18883 if test "${with_thttpd+set}" = set; then 18884 withval="$with_thttpd" 18885 PHP_THTTPD=$withval 18886 else 18887- 18888+ 18889 PHP_THTTPD=no 18890+ 18891 18892+fi 18893 18894-fi; 18895 18896 ext_output=$PHP_THTTPD 18897 18898@@ -16365,27 +12512,26 @@ 18899 18900 18901 18902-echo "$as_me:$LINENO: checking for thttpd" >&5 18903-echo $ECHO_N "checking for thttpd... $ECHO_C" >&6 18904+echo $ac_n "checking for thttpd""... $ac_c" 1>&6 18905+echo "configure:12517: checking for thttpd" >&5 18906 18907 if test "$PHP_THTTPD" != "no"; then 18908 if test ! -d $PHP_THTTPD; then 18909- echo "$as_me:$LINENO: result: thttpd directory does not exist ($PHP_THTTPD)" >&5 18910-echo "${ECHO_T}thttpd directory does not exist ($PHP_THTTPD)" >&6 18911+ echo "$ac_t""thttpd directory does not exist ($PHP_THTTPD)" 1>&6 18912 fi 18913 18914- 18915+ 18916 if test -z "$PHP_THTTPD" || echo "$PHP_THTTPD" | grep '^/' >/dev/null ; then 18917 THTTPD=$PHP_THTTPD 18918 else 18919- 18920+ 18921 ep_dir="`echo $PHP_THTTPD|$SED 's%/*[^/][^/]*/*$%%'`" 18922- 18923+ 18924 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 18925 THTTPD="$ep_realdir/`basename \"$PHP_THTTPD\"`" 18926 fi 18927 18928- 18929+ 18930 if grep thttpd.2.21b $PHP_THTTPD/version.h >/dev/null; then 18931 patch="test -f $THTTPD/php_patched || \ 18932 (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)" 18933@@ -16393,20 +12539,18 @@ 18934 elif grep Premium $PHP_THTTPD/version.h >/dev/null; then 18935 patch= 18936 else 18937- { { echo "$as_me:$LINENO: error: This version only supports thttpd-2.21b and Premium thttpd" >&5 18938-echo "$as_me: error: This version only supports thttpd-2.21b and Premium thttpd" >&2;} 18939- { (exit 1); exit 1; }; } 18940+ { echo "configure: error: This version only supports thttpd-2.21b and Premium thttpd" 1>&2; exit 1; } 18941 fi 18942- 18943+ 18944 if test -n "$GCC"; then 18945- 18946+ 18947 gcc_arg_name=ac_cv_gcc_arg_rdynamic 18948- echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5 18949-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6 18950-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then 18951- echo $ECHO_N "(cached) $ECHO_C" >&6 18952+ echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 18953+echo "configure:12550: checking whether $CC supports -rdynamic" >&5 18954+if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then 18955+ echo $ac_n "(cached) $ac_c" 1>&6 18956 else 18957- 18958+ 18959 echo 'void somefunc() { };' > conftest.c 18960 cmd='$CC -rdynamic -c conftest.c' 18961 if eval $cmd 2>&1 | $EGREP -e -rdynamic >/dev/null ; then 18962@@ -16416,15 +12560,15 @@ 18963 fi 18964 eval $gcc_arg_name=$ac_result 18965 rm -f conftest.* 18966- 18967+ 18968 fi 18969-echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5 18970-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6 18971+ 18972+echo "$ac_t""$ac_cv_gcc_arg_rdynamic" 1>&6 18973 if eval test "\$$gcc_arg_name" = "yes"; then 18974 gcc_rdynamic=yes 18975 else 18976 : 18977- 18978+ 18979 fi 18980 18981 if test "$gcc_rdynamic" = "yes"; then 18982@@ -16441,64 +12585,65 @@ 18983 \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\ 18984 $patch" 18985 PHP_THTTPD="yes, using $THTTPD" 18986- 18987+ 18988 if test "$THTTPD" != "/usr/include"; then 18989- 18990+ 18991 if test -z "$THTTPD" || echo "$THTTPD" | grep '^/' >/dev/null ; then 18992 ai_p=$THTTPD 18993 else 18994- 18995+ 18996 ep_dir="`echo $THTTPD|$SED 's%/*[^/][^/]*/*$%%'`" 18997- 18998+ 18999 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 19000 ai_p="$ep_realdir/`basename \"$THTTPD\"`" 19001 fi 19002 19003- 19004- 19005+ 19006+ 19007 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 19008- 19009+ 19010 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 19011 if test -n "$unique" && test "`eval $cmd`" = "" ; then 19012 eval "INCLUDEPATH$unique=set" 19013- 19014+ 19015 if test ""; then 19016 INCLUDES="-I$ai_p $INCLUDES" 19017 else 19018 INCLUDES="$INCLUDES -I$ai_p" 19019 fi 19020- 19021+ 19022 fi 19023 19024 fi 19025 19026- 19027- if test "$PHP_SAPI" != "default"; then 19028-{ { echo "$as_me:$LINENO: error: 19029-+--------------------------------------------------------------------+ 19030-| *** ATTENTION *** | 19031-| | 19032-| You've configured multiple SAPIs to be build. You can build only | 19033-| one SAPI module and CLI binary at the same time. | 19034-+--------------------------------------------------------------------+ 19035-" >&5 19036-echo "$as_me: error: 19037+ 19038+ if test "static" = "program"; then 19039+ PHP_BINARIES="$PHP_BINARIES thttpd" 19040+ elif test "$PHP_SAPI" != "none"; then 19041+ { echo "configure: error: 19042 +--------------------------------------------------------------------+ 19043 | *** ATTENTION *** | 19044 | | 19045 | You've configured multiple SAPIs to be build. You can build only | 19046-| one SAPI module and CLI binary at the same time. | 19047+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 19048 +--------------------------------------------------------------------+ 19049-" >&2;} 19050- { (exit 1); exit 1; }; } 19051- fi 19052+" 1>&2; exit 1; } 19053+ else 19054+ PHP_SAPI=thttpd 19055+ fi 19056+ 19057+ 19058+ 19059+ BUILD_DIR="$BUILD_DIR sapi/thttpd" 19060+ 19061 19062- PHP_SAPI=thttpd 19063 19064- case "static" in 19065- static) 19066+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS thttpd" 19067 19068- OVERALL_TARGET=php 19069+ 19070+ case "static" in 19071+ static) 19072+ 19073 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19074 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19075 php_c_post= 19076@@ -16520,14 +12665,11 @@ 19077 shared_cxx_post= 19078 shared_lo=lo 19079 19080- php_build_target=program 19081- 19082 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19083- php_build_target=static 19084+ php_sapi_module=static 19085 ;; 19086- shared) 19087- 19088- OVERALL_TARGET=php 19089+ shared) 19090+ 19091 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19092 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19093 php_c_post= 19094@@ -16549,11 +12691,9 @@ 19095 shared_cxx_post= 19096 shared_lo=lo 19097 19098- php_build_target=program 19099- 19100 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19101- php_build_target=shared 19102- 19103+ php_sapi_module=shared 19104+ 19105 php_c_pre=$shared_c_pre 19106 php_c_meta=$shared_c_meta 19107 php_c_post=$shared_c_post 19108@@ -16562,9 +12702,8 @@ 19109 php_cxx_post=$shared_cxx_post 19110 php_lo=$shared_lo 19111 ;; 19112- bundle) 19113- 19114- OVERALL_TARGET=php 19115+ bundle) 19116+ 19117 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19118 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19119 php_c_post= 19120@@ -16586,60 +12725,33 @@ 19121 shared_cxx_post= 19122 shared_lo=lo 19123 19124- php_build_target=program 19125- 19126 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 19127- php_build_target=static 19128-;; 19129- program) 19130- OVERALL_TARGET=php 19131- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19132- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19133- php_c_post= 19134- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19135- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 19136- php_cxx_post= 19137- php_lo=lo 19138- 19139- case $with_pic in 19140- yes) pic_setting='-prefer-pic';; 19141- no) pic_setting='-prefer-non-pic';; 19142- esac 19143- 19144- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19145- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 19146- shared_c_post= 19147- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19148- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 19149- shared_cxx_post= 19150- shared_lo=lo 19151- 19152- php_build_target=program 19153+ php_sapi_module=static 19154 ;; 19155- esac 19156- 19157- 19158+ esac 19159+ install_sapi="install-sapi" 19160+ 19161+ 19162 19163 fi 19164-echo "$as_me:$LINENO: result: $PHP_THTTPD" >&5 19165-echo "${ECHO_T}$PHP_THTTPD" >&6 19166+echo "$ac_t""$PHP_THTTPD" 1>&6 19167 19168 19169 19170 php_with_tux=no 19171 19172 19173- 19174 # Check whether --with-tux or --without-tux was given. 19175 if test "${with_tux+set}" = set; then 19176 withval="$with_tux" 19177 PHP_TUX=$withval 19178 else 19179- 19180+ 19181 PHP_TUX=no 19182+ 19183 19184+fi 19185 19186-fi; 19187 19188 ext_output=$PHP_TUX 19189 19190@@ -16647,191 +12759,79 @@ 19191 19192 19193 19194-echo "$as_me:$LINENO: checking for TUX" >&5 19195-echo $ECHO_N "checking for TUX... $ECHO_C" >&6 19196+echo $ac_n "checking for TUX""... $ac_c" 1>&6 19197+echo "configure:12764: checking for TUX" >&5 19198 if test "$PHP_TUX" != "no"; then 19199 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" 19200- 19201-for ac_header in tuxmodule.h 19202+ for ac_hdr in tuxmodule.h 19203 do 19204-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 19205-if eval "test \"\${$as_ac_Header+set}\" = set"; then 19206- echo "$as_me:$LINENO: checking for $ac_header" >&5 19207-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 19208-if eval "test \"\${$as_ac_Header+set}\" = set"; then 19209- echo $ECHO_N "(cached) $ECHO_C" >&6 19210-fi 19211-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 19212-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 19213-else 19214- # Is the header compilable? 19215-echo "$as_me:$LINENO: checking $ac_header usability" >&5 19216-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 19217-cat >conftest.$ac_ext <<_ACEOF 19218-/* confdefs.h. */ 19219-_ACEOF 19220-cat confdefs.h >>conftest.$ac_ext 19221-cat >>conftest.$ac_ext <<_ACEOF 19222-/* end confdefs.h. */ 19223-$ac_includes_default 19224-#include <$ac_header> 19225-_ACEOF 19226-rm -f conftest.$ac_objext 19227-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 19228- (eval $ac_compile) 2>conftest.er1 19229- ac_status=$? 19230- grep -v '^ *+' conftest.er1 >conftest.err 19231- rm -f conftest.er1 19232- cat conftest.err >&5 19233- echo "$as_me:$LINENO: \$? = $ac_status" >&5 19234- (exit $ac_status); } && 19235- { ac_try='test -z "$ac_c_werror_flag" 19236- || test ! -s conftest.err' 19237- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19238- (eval $ac_try) 2>&5 19239- ac_status=$? 19240- echo "$as_me:$LINENO: \$? = $ac_status" >&5 19241- (exit $ac_status); }; } && 19242- { ac_try='test -s conftest.$ac_objext' 19243- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 19244- (eval $ac_try) 2>&5 19245- ac_status=$? 19246- echo "$as_me:$LINENO: \$? = $ac_status" >&5 19247- (exit $ac_status); }; }; then 19248- ac_header_compiler=yes 19249-else 19250- echo "$as_me: failed program was:" >&5 19251-sed 's/^/| /' conftest.$ac_ext >&5 19252- 19253-ac_header_compiler=no 19254-fi 19255-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 19256-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 19257-echo "${ECHO_T}$ac_header_compiler" >&6 19258- 19259-# Is the header present? 19260-echo "$as_me:$LINENO: checking $ac_header presence" >&5 19261-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 19262-cat >conftest.$ac_ext <<_ACEOF 19263-/* confdefs.h. */ 19264-_ACEOF 19265-cat confdefs.h >>conftest.$ac_ext 19266-cat >>conftest.$ac_ext <<_ACEOF 19267-/* end confdefs.h. */ 19268-#include <$ac_header> 19269-_ACEOF 19270-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 19271- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 19272- ac_status=$? 19273- grep -v '^ *+' conftest.er1 >conftest.err 19274- rm -f conftest.er1 19275- cat conftest.err >&5 19276- echo "$as_me:$LINENO: \$? = $ac_status" >&5 19277- (exit $ac_status); } >/dev/null; then 19278- if test -s conftest.err; then 19279- ac_cpp_err=$ac_c_preproc_warn_flag 19280- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 19281- else 19282- ac_cpp_err= 19283- fi 19284-else 19285- ac_cpp_err=yes 19286-fi 19287-if test -z "$ac_cpp_err"; then 19288- ac_header_preproc=yes 19289-else 19290- echo "$as_me: failed program was:" >&5 19291-sed 's/^/| /' conftest.$ac_ext >&5 19292- 19293- ac_header_preproc=no 19294-fi 19295-rm -f conftest.err conftest.$ac_ext 19296-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 19297-echo "${ECHO_T}$ac_header_preproc" >&6 19298- 19299-# So? What about this header? 19300-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 19301- yes:no: ) 19302- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 19303-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 19304- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 19305-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 19306- ac_header_preproc=yes 19307- ;; 19308- no:yes:* ) 19309- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 19310-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 19311- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 19312-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 19313- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 19314-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 19315- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 19316-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 19317- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 19318-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 19319- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 19320-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 19321- ( 19322- cat <<\_ASBOX 19323-## ------------------------------------------ ## 19324-## Report this to the AC_PACKAGE_NAME lists. ## 19325-## ------------------------------------------ ## 19326-_ASBOX 19327- ) | 19328- sed "s/^/$as_me: WARNING: /" >&2 19329- ;; 19330-esac 19331-echo "$as_me:$LINENO: checking for $ac_header" >&5 19332-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 19333-if eval "test \"\${$as_ac_Header+set}\" = set"; then 19334- echo $ECHO_N "(cached) $ECHO_C" >&6 19335+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 19336+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 19337+echo "configure:12771: checking for $ac_hdr" >&5 19338+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 19339+ echo $ac_n "(cached) $ac_c" 1>&6 19340+else 19341+ cat > conftest.$ac_ext <<EOF 19342+#line 12776 "configure" 19343+#include "confdefs.h" 19344+#include <$ac_hdr> 19345+EOF 19346+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 19347+{ (eval echo configure:12781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 19348+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 19349+if test -z "$ac_err"; then 19350+ rm -rf conftest* 19351+ eval "ac_cv_header_$ac_safe=yes" 19352 else 19353- eval "$as_ac_Header=\$ac_header_preproc" 19354+ echo "$ac_err" >&5 19355+ echo "configure: failed program was:" >&5 19356+ cat conftest.$ac_ext >&5 19357+ rm -rf conftest* 19358+ eval "ac_cv_header_$ac_safe=no" 19359 fi 19360-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 19361-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 19362- 19363+rm -f conftest* 19364 fi 19365-if test `eval echo '${'$as_ac_Header'}'` = yes; then 19366- cat >>confdefs.h <<_ACEOF 19367-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 19368-_ACEOF 19369+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 19370+ echo "$ac_t""yes" 1>&6 19371+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 19372+ cat >> confdefs.h <<EOF 19373+#define $ac_tr_hdr 1 19374+EOF 19375 : 19376 else 19377- { { echo "$as_me:$LINENO: error: Cannot find tuxmodule.h" >&5 19378-echo "$as_me: error: Cannot find tuxmodule.h" >&2;} 19379- { (exit 1); exit 1; }; } 19380+ echo "$ac_t""no" 1>&6 19381+{ echo "configure: error: Cannot find tuxmodule.h" 1>&2; exit 1; } 19382 fi 19383- 19384 done 19385 19386- 19387- if test "$PHP_SAPI" != "default"; then 19388-{ { echo "$as_me:$LINENO: error: 19389-+--------------------------------------------------------------------+ 19390-| *** ATTENTION *** | 19391-| | 19392-| You've configured multiple SAPIs to be build. You can build only | 19393-| one SAPI module and CLI binary at the same time. | 19394-+--------------------------------------------------------------------+ 19395-" >&5 19396-echo "$as_me: error: 19397+ 19398+ if test "shared" = "program"; then 19399+ PHP_BINARIES="$PHP_BINARIES tux" 19400+ elif test "$PHP_SAPI" != "none"; then 19401+ { echo "configure: error: 19402 +--------------------------------------------------------------------+ 19403 | *** ATTENTION *** | 19404 | | 19405 | You've configured multiple SAPIs to be build. You can build only | 19406-| one SAPI module and CLI binary at the same time. | 19407+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 19408 +--------------------------------------------------------------------+ 19409-" >&2;} 19410- { (exit 1); exit 1; }; } 19411- fi 19412+" 1>&2; exit 1; } 19413+ else 19414+ PHP_SAPI=tux 19415+ fi 19416 19417- PHP_SAPI=tux 19418+ 19419+ 19420+ BUILD_DIR="$BUILD_DIR sapi/tux" 19421+ 19422 19423- case "shared" in 19424- static) 19425 19426- OVERALL_TARGET=php 19427+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS tux" 19428+ 19429+ 19430+ case "shared" in 19431+ static) 19432+ 19433 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19434 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19435 php_c_post= 19436@@ -16853,14 +12853,11 @@ 19437 shared_cxx_post= 19438 shared_lo=lo 19439 19440- php_build_target=program 19441- 19442 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19443- php_build_target=static 19444+ php_sapi_module=static 19445 ;; 19446- shared) 19447- 19448- OVERALL_TARGET=php 19449+ shared) 19450+ 19451 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19452 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19453 php_c_post= 19454@@ -16882,11 +12879,9 @@ 19455 shared_cxx_post= 19456 shared_lo=lo 19457 19458- php_build_target=program 19459- 19460 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19461- php_build_target=shared 19462- 19463+ php_sapi_module=shared 19464+ 19465 php_c_pre=$shared_c_pre 19466 php_c_meta=$shared_c_meta 19467 php_c_post=$shared_c_post 19468@@ -16895,9 +12890,8 @@ 19469 php_cxx_post=$shared_cxx_post 19470 php_lo=$shared_lo 19471 ;; 19472- bundle) 19473- 19474- OVERALL_TARGET=php 19475+ bundle) 19476+ 19477 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19478 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19479 php_c_post= 19480@@ -16919,47 +12913,20 @@ 19481 shared_cxx_post= 19482 shared_lo=lo 19483 19484- php_build_target=program 19485- 19486 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 19487- php_build_target=static 19488-;; 19489- program) 19490- OVERALL_TARGET=php 19491- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19492- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19493- php_c_post= 19494- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19495- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 19496- php_cxx_post= 19497- php_lo=lo 19498- 19499- case $with_pic in 19500- yes) pic_setting='-prefer-pic';; 19501- no) pic_setting='-prefer-non-pic';; 19502- esac 19503- 19504- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19505- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 19506- shared_c_post= 19507- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19508- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 19509- shared_cxx_post= 19510- shared_lo=lo 19511- 19512- php_build_target=program 19513+ php_sapi_module=static 19514 ;; 19515- esac 19516- 19517- 19518- 19519+ esac 19520+ install_sapi="install-sapi" 19521+ 19522+ 19523 case sapi/tux in 19524 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 19525 /*) ac_srcdir=`echo "sapi/tux"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 19526 *) ac_srcdir="$abs_srcdir/sapi/tux/"; ac_bdir="sapi/tux/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 19527 esac 19528- 19529- 19530+ 19531+ 19532 19533 b_c_pre=$php_c_pre 19534 b_cxx_pre=$php_cxx_pre 19535@@ -16972,12 +12939,12 @@ 19536 19537 old_IFS=$IFS 19538 for ac_src in php_tux.c; do 19539- 19540+ 19541 IFS=. 19542 set $ac_src 19543 ac_obj=$1 19544 IFS=$old_IFS 19545- 19546+ 19547 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 19548 19549 case $ac_src in 19550@@ -16994,12 +12961,11 @@ 19551 done 19552 19553 19554+ 19555 19556- echo "$as_me:$LINENO: result: $PHP_TUX" >&5 19557-echo "${ECHO_T}$PHP_TUX" >&6 19558+ echo "$ac_t""$PHP_TUX" 1>&6 19559 else 19560- echo "$as_me:$LINENO: result: no" >&5 19561-echo "${ECHO_T}no" >&6 19562+ echo "$ac_t""no" 1>&6 19563 fi 19564 19565 19566@@ -17007,17 +12973,17 @@ 19567 php_with_webjames=no 19568 19569 19570- 19571 # Check whether --with-webjames or --without-webjames was given. 19572 if test "${with_webjames+set}" = set; then 19573 withval="$with_webjames" 19574 PHP_WEBJAMES=$withval 19575 else 19576- 19577+ 19578 PHP_WEBJAMES=no 19579+ 19580 19581+fi 19582 19583-fi; 19584 19585 ext_output=$PHP_WEBJAMES 19586 19587@@ -17025,17 +12991,17 @@ 19588 19589 19590 19591-echo "$as_me:$LINENO: checking for webjames" >&5 19592-echo $ECHO_N "checking for webjames... $ECHO_C" >&6 19593+echo $ac_n "checking for webjames""... $ac_c" 1>&6 19594+echo "configure:12996: checking for webjames" >&5 19595 19596 if test "$PHP_WEBJAMES" != "no"; then 19597- 19598+ 19599 if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then 19600 PHP_WEBJAMES=$PHP_WEBJAMES 19601 else 19602- 19603+ 19604 ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`" 19605- 19606+ 19607 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 19608 PHP_WEBJAMES="$ep_realdir/`basename \"$PHP_WEBJAMES\"`" 19609 fi 19610@@ -17044,64 +13010,65 @@ 19611 echo 'PHP_LIBS = -l$abs_srcdir/$SAPI_STATIC \$(PHP_LIBS) \$(EXTRA_LIBS)' > $PHP_WEBJAMES/build/php; \ 19612 echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $PHP_WEBJAMES/build/php; \ 19613 echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $PHP_WEBJAMES/build/php;" 19614- 19615+ 19616 if test "$PHP_WEBJAMES" != "/usr/include"; then 19617- 19618+ 19619 if test -z "$PHP_WEBJAMES" || echo "$PHP_WEBJAMES" | grep '^/' >/dev/null ; then 19620 ai_p=$PHP_WEBJAMES 19621 else 19622- 19623+ 19624 ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`" 19625- 19626+ 19627 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 19628 ai_p="$ep_realdir/`basename \"$PHP_WEBJAMES\"`" 19629 fi 19630 19631- 19632- 19633+ 19634+ 19635 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 19636- 19637+ 19638 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 19639 if test -n "$unique" && test "`eval $cmd`" = "" ; then 19640 eval "INCLUDEPATH$unique=set" 19641- 19642+ 19643 if test ""; then 19644 INCLUDES="-I$ai_p $INCLUDES" 19645 else 19646 INCLUDES="$INCLUDES -I$ai_p" 19647 fi 19648- 19649+ 19650 fi 19651 19652 fi 19653 19654- 19655- if test "$PHP_SAPI" != "default"; then 19656-{ { echo "$as_me:$LINENO: error: 19657+ 19658+ if test "static" = "program"; then 19659+ PHP_BINARIES="$PHP_BINARIES webjames" 19660+ elif test "$PHP_SAPI" != "none"; then 19661+ { echo "configure: error: 19662 +--------------------------------------------------------------------+ 19663 | *** ATTENTION *** | 19664 | | 19665 | You've configured multiple SAPIs to be build. You can build only | 19666-| one SAPI module and CLI binary at the same time. | 19667+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 19668 +--------------------------------------------------------------------+ 19669-" >&5 19670-echo "$as_me: error: 19671-+--------------------------------------------------------------------+ 19672-| *** ATTENTION *** | 19673-| | 19674-| You've configured multiple SAPIs to be build. You can build only | 19675-| one SAPI module and CLI binary at the same time. | 19676-+--------------------------------------------------------------------+ 19677-" >&2;} 19678- { (exit 1); exit 1; }; } 19679- fi 19680+" 1>&2; exit 1; } 19681+ else 19682+ PHP_SAPI=webjames 19683+ fi 19684+ 19685+ 19686+ 19687+ BUILD_DIR="$BUILD_DIR sapi/webjames" 19688+ 19689 19690- PHP_SAPI=webjames 19691 19692- case "static" in 19693- static) 19694+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS webjames" 19695 19696- OVERALL_TARGET=php 19697+ 19698+ case "static" in 19699+ static) 19700+ 19701 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19702 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19703 php_c_post= 19704@@ -17123,14 +13090,11 @@ 19705 shared_cxx_post= 19706 shared_lo=lo 19707 19708- php_build_target=program 19709- 19710 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19711- php_build_target=static 19712+ php_sapi_module=static 19713 ;; 19714- shared) 19715- 19716- OVERALL_TARGET=php 19717+ shared) 19718+ 19719 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19720 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19721 php_c_post= 19722@@ -17152,11 +13116,9 @@ 19723 shared_cxx_post= 19724 shared_lo=lo 19725 19726- php_build_target=program 19727- 19728 OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 19729- php_build_target=shared 19730- 19731+ php_sapi_module=shared 19732+ 19733 php_c_pre=$shared_c_pre 19734 php_c_meta=$shared_c_meta 19735 php_c_post=$shared_c_post 19736@@ -17165,9 +13127,8 @@ 19737 php_cxx_post=$shared_cxx_post 19738 php_lo=$shared_lo 19739 ;; 19740- bundle) 19741- 19742- OVERALL_TARGET=php 19743+ bundle) 19744+ 19745 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19746 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19747 php_c_post= 19748@@ -17189,47 +13150,20 @@ 19749 shared_cxx_post= 19750 shared_lo=lo 19751 19752- php_build_target=program 19753- 19754 OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 19755- php_build_target=static 19756-;; 19757- program) 19758- OVERALL_TARGET=php 19759- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19760- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 19761- php_c_post= 19762- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19763- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 19764- php_cxx_post= 19765- php_lo=lo 19766- 19767- case $with_pic in 19768- yes) pic_setting='-prefer-pic';; 19769- no) pic_setting='-prefer-non-pic';; 19770- esac 19771- 19772- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 19773- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 19774- shared_c_post= 19775- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 19776- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 19777- shared_cxx_post= 19778- shared_lo=lo 19779- 19780- php_build_target=program 19781+ php_sapi_module=static 19782 ;; 19783- esac 19784- 19785- 19786- 19787+ esac 19788+ install_sapi="install-sapi" 19789+ 19790+ 19791 case sapi/webjames in 19792 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 19793 /*) ac_srcdir=`echo "sapi/webjames"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 19794 *) ac_srcdir="$abs_srcdir/sapi/webjames/"; ac_bdir="sapi/webjames/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 19795 esac 19796- 19797- 19798+ 19799+ 19800 19801 b_c_pre=$php_c_pre 19802 b_cxx_pre=$php_cxx_pre 19803@@ -17242,12 +13176,12 @@ 19804 19805 old_IFS=$IFS 19806 for ac_src in webjames.c; do 19807- 19808+ 19809 IFS=. 19810 set $ac_src 19811 ac_obj=$1 19812 IFS=$old_IFS 19813- 19814+ 19815 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 19816 19817 case $ac_src in 19818@@ -17264,12 +13198,11 @@ 19819 done 19820 19821 19822+ 19823 19824- echo "$as_me:$LINENO: result: yes, using $PHP_WEBJAMES" >&5 19825-echo "${ECHO_T}yes, using $PHP_WEBJAMES" >&6 19826+ echo "$ac_t""yes, using $PHP_WEBJAMES" 1>&6 19827 else 19828- echo "$as_me:$LINENO: result: no" >&5 19829-echo "${ECHO_T}no" >&6 19830+ echo "$ac_t""no" 1>&6 19831 fi 19832 19833 19834@@ -17282,11 +13215,12 @@ 19835 enableval="$enable_cgi" 19836 PHP_CGI=$enableval 19837 else 19838- 19839+ 19840 PHP_CGI=yes 19841+ 19842 19843+fi 19844 19845-fi; 19846 19847 ext_output=$PHP_CGI 19848 19849@@ -17294,86 +13228,70 @@ 19850 19851 19852 19853-if test "$PHP_SAPI" = "default"; then 19854- echo "$as_me:$LINENO: checking whether to build CGI binary" >&5 19855-echo $ECHO_N "checking whether to build CGI binary... $ECHO_C" >&6 19856- if test "$PHP_CGI" != "no"; then 19857- echo "$as_me:$LINENO: result: yes" >&5 19858-echo "${ECHO_T}yes" >&6 19859- 19860- echo "$as_me:$LINENO: checking for socklen_t in sys/socket.h" >&5 19861-echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6 19862- cat >conftest.$ac_ext <<_ACEOF 19863-/* confdefs.h. */ 19864-_ACEOF 19865-cat confdefs.h >>conftest.$ac_ext 19866-cat >>conftest.$ac_ext <<_ACEOF 19867-/* end confdefs.h. */ 19868+echo $ac_n "checking for CGI build""... $ac_c" 1>&6 19869+echo "configure:13233: checking for CGI build" >&5 19870+if test "$PHP_CGI" != "no"; then 19871+ echo "$ac_t""yes" 1>&6 19872+ echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 19873+echo "configure:13237: checking for socklen_t in sys/socket.h" >&5 19874+ cat > conftest.$ac_ext <<EOF 19875+#line 13239 "configure" 19876+#include "confdefs.h" 19877 #include <sys/socket.h> 19878- 19879-_ACEOF 19880+EOF 19881 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 19882- $EGREP "socklen_t" >/dev/null 2>&1; then 19883- echo "$as_me:$LINENO: result: yes" >&5 19884-echo "${ECHO_T}yes" >&6 19885- 19886-cat >>confdefs.h <<\_ACEOF 19887+ egrep "socklen_t" >/dev/null 2>&1; then 19888+ rm -rf conftest* 19889+ echo "$ac_t""yes" 1>&6 19890+ cat >> confdefs.h <<\EOF 19891 #define HAVE_SOCKLEN_T 1 19892-_ACEOF 19893+EOF 19894 19895 else 19896- echo "$as_me:$LINENO: result: no" >&5 19897-echo "${ECHO_T}no" >&6 19898+ rm -rf conftest* 19899+ echo "$ac_t""no" 1>&6 19900 fi 19901 rm -f conftest* 19902 19903 19904- echo "$as_me:$LINENO: checking for sun_len in sys/un.h" >&5 19905-echo $ECHO_N "checking for sun_len in sys/un.h... $ECHO_C" >&6 19906- cat >conftest.$ac_ext <<_ACEOF 19907-/* confdefs.h. */ 19908-_ACEOF 19909-cat confdefs.h >>conftest.$ac_ext 19910-cat >>conftest.$ac_ext <<_ACEOF 19911-/* end confdefs.h. */ 19912+ echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6 19913+echo "configure:13259: checking for sun_len in sys/un.h" >&5 19914+ cat > conftest.$ac_ext <<EOF 19915+#line 13261 "configure" 19916+#include "confdefs.h" 19917 #include <sys/un.h> 19918- 19919-_ACEOF 19920+EOF 19921 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 19922- $EGREP "sun_len" >/dev/null 2>&1; then 19923- echo "$as_me:$LINENO: result: yes" >&5 19924-echo "${ECHO_T}yes" >&6 19925- 19926-cat >>confdefs.h <<\_ACEOF 19927+ egrep "sun_len" >/dev/null 2>&1; then 19928+ rm -rf conftest* 19929+ echo "$ac_t""yes" 1>&6 19930+ cat >> confdefs.h <<\EOF 19931 #define HAVE_SOCKADDR_UN_SUN_LEN 1 19932-_ACEOF 19933+EOF 19934 19935 else 19936- echo "$as_me:$LINENO: result: no" >&5 19937-echo "${ECHO_T}no" >&6 19938+ rm -rf conftest* 19939+ echo "$ac_t""no" 1>&6 19940 fi 19941 rm -f conftest* 19942 19943 19944- echo "$as_me:$LINENO: checking whether cross-process locking is required by accept()" >&5 19945-echo $ECHO_N "checking whether cross-process locking is required by accept()... $ECHO_C" >&6 19946+ echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6 19947+echo "configure:13281: checking whether cross-process locking is required by accept()" >&5 19948 case "`uname -sr`" in 19949- IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) 19950- echo "$as_me:$LINENO: result: yes" >&5 19951-echo "${ECHO_T}yes" >&6 19952- 19953-cat >>confdefs.h <<\_ACEOF 19954+ IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) 19955+ echo "$ac_t""yes" 1>&6 19956+ cat >> confdefs.h <<\EOF 19957 #define USE_LOCKING 1 19958-_ACEOF 19959+EOF 19960 19961 ;; 19962 *) 19963- echo "$as_me:$LINENO: result: no" >&5 19964-echo "${ECHO_T}no" >&6 19965+ echo "$ac_t""no" 1>&6 19966 ;; 19967 esac 19968 19969- 19970+ 19971 src=$abs_srcdir/sapi/cgi/Makefile.frag 19972 ac_srcdir=$ext_srcdir 19973 ac_builddir=$ext_builddir 19974@@ -17389,131 +13307,32 @@ 19975 ;; 19976 esac 19977 19978- PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" 19979- 19980- 19981- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" 19982- 19983- if test "$PHP_SAPI" != "default"; then 19984-{ { echo "$as_me:$LINENO: error: 19985-+--------------------------------------------------------------------+ 19986-| *** ATTENTION *** | 19987-| | 19988-| You've configured multiple SAPIs to be build. You can build only | 19989-| one SAPI module and CLI binary at the same time. | 19990-+--------------------------------------------------------------------+ 19991-" >&5 19992-echo "$as_me: error: 19993+ 19994+ if test "program" = "program"; then 19995+ PHP_BINARIES="$PHP_BINARIES cgi" 19996+ elif test "$PHP_SAPI" != "none"; then 19997+ { echo "configure: error: 19998 +--------------------------------------------------------------------+ 19999 | *** ATTENTION *** | 20000 | | 20001 | You've configured multiple SAPIs to be build. You can build only | 20002-| one SAPI module and CLI binary at the same time. | 20003+| one SAPI module plus CGI, CLI and FPM binaries at the same time. | 20004 +--------------------------------------------------------------------+ 20005-" >&2;} 20006- { (exit 1); exit 1; }; } 20007- fi 20008- 20009- PHP_SAPI=cgi 20010- 20011- case "program" in 20012- static) 20013- 20014- OVERALL_TARGET=php 20015- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20016- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 20017- php_c_post= 20018- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20019- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 20020- php_cxx_post= 20021- php_lo=lo 20022- 20023- case $with_pic in 20024- yes) pic_setting='-prefer-pic';; 20025- no) pic_setting='-prefer-non-pic';; 20026- esac 20027- 20028- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20029- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 20030- shared_c_post= 20031- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20032- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 20033- shared_cxx_post= 20034- shared_lo=lo 20035- 20036- php_build_target=program 20037- 20038- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 20039- php_build_target=static 20040-;; 20041- shared) 20042- 20043- OVERALL_TARGET=php 20044- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20045- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 20046- php_c_post= 20047- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20048- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 20049- php_cxx_post= 20050- php_lo=lo 20051- 20052- case $with_pic in 20053- yes) pic_setting='-prefer-pic';; 20054- no) pic_setting='-prefer-non-pic';; 20055- esac 20056- 20057- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20058- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 20059- shared_c_post= 20060- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20061- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 20062- shared_cxx_post= 20063- shared_lo=lo 20064- 20065- php_build_target=program 20066- 20067- OVERALL_TARGET=libphp$PHP_MAJOR_VERSION.la 20068- php_build_target=shared 20069- 20070- php_c_pre=$shared_c_pre 20071- php_c_meta=$shared_c_meta 20072- php_c_post=$shared_c_post 20073- php_cxx_pre=$shared_cxx_pre 20074- php_cxx_meta=$shared_cxx_meta 20075- php_cxx_post=$shared_cxx_post 20076- php_lo=$shared_lo 20077-;; 20078- bundle) 20079- 20080- OVERALL_TARGET=php 20081- php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20082- php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 20083- php_c_post= 20084- php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20085- php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' 20086- php_cxx_post= 20087- php_lo=lo 20088+" 1>&2; exit 1; } 20089+ else 20090+ PHP_SAPI=cgi 20091+ fi 20092 20093- case $with_pic in 20094- yes) pic_setting='-prefer-pic';; 20095- no) pic_setting='-prefer-non-pic';; 20096- esac 20097+ 20098+ 20099+ BUILD_DIR="$BUILD_DIR sapi/cgi" 20100+ 20101 20102- shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20103- shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting 20104- shared_c_post= 20105- shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' 20106- shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) '$pic_setting 20107- shared_cxx_post= 20108- shared_lo=lo 20109 20110- php_build_target=program 20111+ PHP_INSTALLED_SAPIS="$PHP_INSTALLED_SAPIS cgi" 20112 20113- OVERALL_TARGET=libs/libphp$PHP_MAJOR_VERSION.bundle 20114- php_build_target=static 20115-;; 20116- program) 20117- OVERALL_TARGET='$(SAPI_CGI_PATH)' 20118+ 20119+ 20120 php_c_pre='$(LIBTOOL) --mode=compile $(CC)' 20121 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' 20122 php_c_post= 20123@@ -17535,19 +13354,19 @@ 20124 shared_cxx_post= 20125 shared_lo=lo 20126 20127- php_build_target=program 20128-;; 20129- esac 20130- 20131- 20132+ install_binaries="install-binaries" 20133+ install_binary_targets="$install_binary_targets install-cgi" 20134+ 20135+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CGI_OBJS" 20136 20137+ 20138 case sapi/cgi in 20139 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 20140 /*) ac_srcdir=`echo "sapi/cgi"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 20141 *) ac_srcdir="$abs_srcdir/sapi/cgi/"; ac_bdir="sapi/cgi/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 20142 esac 20143- 20144- 20145+ 20146+ 20147 20148 b_c_pre=$php_c_pre 20149 b_cxx_pre=$php_cxx_pre 20150@@ -17560,13 +13379,13 @@ 20151 20152 old_IFS=$IFS 20153 for ac_src in cgi_main.c fastcgi.c; do 20154- 20155+ 20156 IFS=. 20157 set $ac_src 20158 ac_obj=$1 20159 IFS=$old_IFS 20160- 20161- PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 20162+ 20163+ PHP_CGI_OBJS="$PHP_CGI_OBJS $ac_bdir$ac_obj.lo" 20164 20165 case $ac_src in 20166 *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 20167@@ -17581,46 +13400,55 @@ 20168 EOF 20169 done 20170 20171- 20172+ 20173 20174 20175 case $host_alias in 20176 *aix*) 20177- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20178+ if test "$php_sapi_module" = "shared"; then 20179+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20180+ else 20181+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20182+ fi 20183 ;; 20184 *darwin*) 20185- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20186+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20187 ;; 20188 *) 20189- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20190+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 20191 ;; 20192 esac 20193 20194+ 20195+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" 20196 20197+ 20198 PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CGI" 20199 20200- 20201- elif test "$PHP_CLI" != "no"; then 20202- echo "$as_me:$LINENO: result: no" >&5 20203-echo "${ECHO_T}no" >&6 20204- OVERALL_TARGET= 20205- PHP_SAPI=cli 20206- else 20207- { { echo "$as_me:$LINENO: error: No SAPIs selected." >&5 20208-echo "$as_me: error: No SAPIs selected." >&2;} 20209- { (exit 1); exit 1; }; } 20210- fi 20211+else 20212+ echo "$ac_t""yes" 1>&6 20213 fi 20214 20215 20216 20217-echo "$as_me:$LINENO: checking for chosen SAPI module" >&5 20218-echo $ECHO_N "checking for chosen SAPI module... $ECHO_C" >&6 20219-echo "$as_me:$LINENO: result: $PHP_SAPI" >&5 20220-echo "${ECHO_T}$PHP_SAPI" >&6 20221+echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 20222+echo "configure:13436: checking for chosen SAPI module" >&5 20223+echo "$ac_t""$PHP_SAPI" 1>&6 20224 20225-if test "$enable_maintainer_zts" = "yes"; then 20226+echo $ac_n "checking for executable SAPI binaries""... $ac_c" 1>&6 20227+echo "configure:13440: checking for executable SAPI binaries" >&5 20228+if test "$PHP_BINARIES"; then 20229+ echo "$ac_t""$PHP_BINARIES" 1>&6 20230+else 20231+ echo "$ac_t""none" 1>&6 20232+fi 20233 20234+if test -z "$PHP_INSTALLED_SAPIS"; then 20235+ { echo "configure: error: Nothing to build." 1>&2; exit 1; } 20236+fi 20237+ 20238+if test "$enable_maintainer_zts" = "yes"; then 20239+ 20240 if test -n "$ac_cv_pthreads_lib"; then 20241 LIBS="$LIBS -l$ac_cv_pthreads_lib" 20242 fi 20243@@ -17629,14 +13457,12 @@ 20244 CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" 20245 fi 20246 20247- 20248+ 20249 if test -z "$host_alias" && test -n "$host"; then 20250 host_alias=$host 20251 fi 20252 if test -z "$host_alias"; then 20253- { { echo "$as_me:$LINENO: error: host_alias is not set. Make sure to run config.guess" >&5 20254-echo "$as_me: error: host_alias is not set. Make sure to run config.guess" >&2;} 20255- { (exit 1); exit 1; }; } 20256+ { echo "configure: error: host_alias is not set. Make sure to run config.guess" 1>&2; exit 1; } 20257 fi 20258 case $host_alias in 20259 *solaris*) 20260@@ -17662,137 +13488,117 @@ 20261 fi 20262 20263 20264- echo "$as_me:$LINENO: result: " >&5 20265-echo "${ECHO_T}" >&6 20266- echo "$as_me:$LINENO: result: ${T_MD}Running system checks${T_ME}" >&5 20267-echo "${ECHO_T}${T_MD}Running system checks${T_ME}" >&6 20268+ 20269+ 20270+ 20271+ 20272+ echo "$ac_t""" 1>&6 20273+ echo "$ac_t""${T_MD}Running system checks${T_ME}" 1>&6 20274 20275 20276 20277 PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib 20278 # Extract the first word of "sendmail", so it can be a program name with args. 20279 set dummy sendmail; ac_word=$2 20280-echo "$as_me:$LINENO: checking for $ac_word" >&5 20281-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 20282-if test "${ac_cv_path_PROG_SENDMAIL+set}" = set; then 20283- echo $ECHO_N "(cached) $ECHO_C" >&6 20284+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 20285+echo "configure:13505: checking for $ac_word" >&5 20286+if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then 20287+ echo $ac_n "(cached) $ac_c" 1>&6 20288 else 20289- case $PROG_SENDMAIL in 20290- [\\/]* | ?:[\\/]*) 20291+ case "$PROG_SENDMAIL" in 20292+ /*) 20293 ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path. 20294 ;; 20295+ ?:/*) 20296+ ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a dos path. 20297+ ;; 20298 *) 20299- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 20300-as_dummy="$PATH:$PHP_ALT_PATH" 20301-for as_dir in $as_dummy 20302-do 20303- IFS=$as_save_IFS 20304- test -z "$as_dir" && as_dir=. 20305- for ac_exec_ext in '' $ac_executable_extensions; do 20306- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 20307- ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext" 20308- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 20309- break 2 20310- fi 20311-done 20312-done 20313- 20314+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 20315+ ac_dummy="$PATH:$PHP_ALT_PATH" 20316+ for ac_dir in $ac_dummy; do 20317+ test -z "$ac_dir" && ac_dir=. 20318+ if test -f $ac_dir/$ac_word; then 20319+ ac_cv_path_PROG_SENDMAIL="$ac_dir/$ac_word" 20320+ break 20321+ fi 20322+ done 20323+ IFS="$ac_save_ifs" 20324 ;; 20325 esac 20326 fi 20327-PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL 20328- 20329+PROG_SENDMAIL="$ac_cv_path_PROG_SENDMAIL" 20330 if test -n "$PROG_SENDMAIL"; then 20331- echo "$as_me:$LINENO: result: $PROG_SENDMAIL" >&5 20332-echo "${ECHO_T}$PROG_SENDMAIL" >&6 20333+ echo "$ac_t""$PROG_SENDMAIL" 1>&6 20334 else 20335- echo "$as_me:$LINENO: result: no" >&5 20336-echo "${ECHO_T}no" >&6 20337+ echo "$ac_t""no" 1>&6 20338 fi 20339 20340- 20341+ 20342 PHP_VAR_SUBST="$PHP_VAR_SUBST PROG_SENDMAIL" 20343 20344 20345 20346 20347- echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5 20348-echo $ECHO_N "checking whether system uses EBCDIC... $ECHO_C" >&6 20349-if test "${ac_cv_ebcdic+set}" = set; then 20350- echo $ECHO_N "(cached) $ECHO_C" >&6 20351+ echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 20352+echo "configure:13544: checking whether system uses EBCDIC" >&5 20353+if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then 20354+ echo $ac_n "(cached) $ac_c" 1>&6 20355 else 20356- 20357+ 20358 if test "$cross_compiling" = yes; then 20359- 20360+ 20361 ac_cv_ebcdic=no 20362 20363 else 20364- cat >conftest.$ac_ext <<_ACEOF 20365-/* confdefs.h. */ 20366-_ACEOF 20367-cat confdefs.h >>conftest.$ac_ext 20368-cat >>conftest.$ac_ext <<_ACEOF 20369-/* end confdefs.h. */ 20370- 20371-int main(void) { 20372- return (unsigned char)'A' != (unsigned char)0xC1; 20373-} 20374+ cat > conftest.$ac_ext <<EOF 20375+#line 13555 "configure" 20376+#include "confdefs.h" 20377 20378-_ACEOF 20379-rm -f conftest$ac_exeext 20380-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20381- (eval $ac_link) 2>&5 20382- ac_status=$? 20383- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20384- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 20385- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20386- (eval $ac_try) 2>&5 20387- ac_status=$? 20388- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20389- (exit $ac_status); }; }; then 20390+int main(void) { 20391+ return (unsigned char)'A' != (unsigned char)0xC1; 20392+} 20393 20394+EOF 20395+if { (eval echo configure:13563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 20396+then 20397+ 20398 ac_cv_ebcdic=yes 20399 20400 else 20401- echo "$as_me: program exited with status $ac_status" >&5 20402-echo "$as_me: failed program was:" >&5 20403-sed 's/^/| /' conftest.$ac_ext >&5 20404- 20405-( exit $ac_status ) 20406- 20407+ echo "configure: failed program was:" >&5 20408+ cat conftest.$ac_ext >&5 20409+ rm -fr conftest* 20410+ 20411 ac_cv_ebcdic=no 20412 20413 fi 20414-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 20415+rm -fr conftest* 20416 fi 20417+ 20418 fi 20419-echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5 20420-echo "${ECHO_T}$ac_cv_ebcdic" >&6 20421- if test "$ac_cv_ebcdic" = "yes"; then 20422 20423-cat >>confdefs.h <<\_ACEOF 20424+echo "$ac_t""$ac_cv_ebcdic" 1>&6 20425+ if test "$ac_cv_ebcdic" = "yes"; then 20426+ cat >> confdefs.h <<\EOF 20427 #define CHARSET_EBCDIC 1 20428-_ACEOF 20429+EOF 20430 20431 fi 20432 20433 20434-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 20435-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 20436-if test "${ac_cv_c_bigendian_php+set}" = set; then 20437- echo $ECHO_N "(cached) $ECHO_C" >&6 20438+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 20439+echo "configure:13591: checking whether byte ordering is bigendian" >&5 20440+if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then 20441+ echo $ac_n "(cached) $ac_c" 1>&6 20442 else 20443- 20444+ 20445 ac_cv_c_bigendian_php=unknown 20446 if test "$cross_compiling" = yes; then 20447 ac_cv_c_bigendian_php=unknown 20448 else 20449- cat >conftest.$ac_ext <<_ACEOF 20450-/* confdefs.h. */ 20451-_ACEOF 20452-cat confdefs.h >>conftest.$ac_ext 20453-cat >>conftest.$ac_ext <<_ACEOF 20454-/* end confdefs.h. */ 20455+ cat > conftest.$ac_ext <<EOF 20456+#line 13601 "configure" 20457+#include "confdefs.h" 20458 20459 int main(void) 20460 { 20461@@ -17805,61 +13611,47 @@ 20462 return(1); 20463 } 20464 } 20465- 20466-_ACEOF 20467-rm -f conftest$ac_exeext 20468-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20469- (eval $ac_link) 2>&5 20470- ac_status=$? 20471- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20472- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 20473- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20474- (eval $ac_try) 2>&5 20475- ac_status=$? 20476- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20477- (exit $ac_status); }; }; then 20478+ 20479+EOF 20480+if { (eval echo configure:13617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 20481+then 20482 ac_cv_c_bigendian_php=yes 20483 else 20484- echo "$as_me: program exited with status $ac_status" >&5 20485-echo "$as_me: failed program was:" >&5 20486-sed 's/^/| /' conftest.$ac_ext >&5 20487- 20488-( exit $ac_status ) 20489-ac_cv_c_bigendian_php=no 20490+ echo "configure: failed program was:" >&5 20491+ cat conftest.$ac_ext >&5 20492+ rm -fr conftest* 20493+ ac_cv_c_bigendian_php=no 20494 fi 20495-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 20496+rm -fr conftest* 20497 fi 20498 20499+ 20500 fi 20501-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5 20502-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6 20503- if test $ac_cv_c_bigendian_php = yes; then 20504 20505-cat >>confdefs.h <<\_ACEOF 20506-#define WORDS_BIGENDIAN 20507-_ACEOF 20508+echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6 20509+ if test $ac_cv_c_bigendian_php = yes; then 20510+ cat >> confdefs.h <<\EOF 20511+#define WORDS_BIGENDIAN 20512+EOF 20513 20514 fi 20515 20516 20517 20518- echo "$as_me:$LINENO: checking whether writing to stdout works" >&5 20519-echo $ECHO_N "checking whether writing to stdout works... $ECHO_C" >&6 20520-if test "${ac_cv_write_stdout+set}" = set; then 20521- echo $ECHO_N "(cached) $ECHO_C" >&6 20522+ echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 20523+echo "configure:13643: checking whether writing to stdout works" >&5 20524+if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then 20525+ echo $ac_n "(cached) $ac_c" 1>&6 20526 else 20527- 20528+ 20529 if test "$cross_compiling" = yes; then 20530- 20531+ 20532 ac_cv_write_stdout=no 20533- 20534+ 20535 else 20536- cat >conftest.$ac_ext <<_ACEOF 20537-/* confdefs.h. */ 20538-_ACEOF 20539-cat confdefs.h >>conftest.$ac_ext 20540-cat >>conftest.$ac_ext <<_ACEOF 20541-/* end confdefs.h. */ 20542+ cat > conftest.$ac_ext <<EOF 20543+#line 13654 "configure" 20544+#include "confdefs.h" 20545 20546 #ifdef HAVE_UNISTD_H 20547 #include <unistd.h> 20548@@ -17874,43 +13666,32 @@ 20549 n = write(1, TEXT, sizeof(TEXT)-1); 20550 return (!(n == sizeof(TEXT)-1)); 20551 } 20552- 20553-_ACEOF 20554-rm -f conftest$ac_exeext 20555-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20556- (eval $ac_link) 2>&5 20557- ac_status=$? 20558- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20559- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 20560- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20561- (eval $ac_try) 2>&5 20562- ac_status=$? 20563- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20564- (exit $ac_status); }; }; then 20565- 20566+ 20567+EOF 20568+if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 20569+then 20570+ 20571 ac_cv_write_stdout=yes 20572- 20573+ 20574 else 20575- echo "$as_me: program exited with status $ac_status" >&5 20576-echo "$as_me: failed program was:" >&5 20577-sed 's/^/| /' conftest.$ac_ext >&5 20578- 20579-( exit $ac_status ) 20580- 20581+ echo "configure: failed program was:" >&5 20582+ cat conftest.$ac_ext >&5 20583+ rm -fr conftest* 20584+ 20585 ac_cv_write_stdout=no 20586- 20587+ 20588 fi 20589-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 20590+rm -fr conftest* 20591 fi 20592 20593+ 20594 fi 20595-echo "$as_me:$LINENO: result: $ac_cv_write_stdout" >&5 20596-echo "${ECHO_T}$ac_cv_write_stdout" >&6 20597- if test "$ac_cv_write_stdout" = "yes"; then 20598 20599-cat >>confdefs.h <<\_ACEOF 20600+echo "$ac_t""$ac_cv_write_stdout" 1>&6 20601+ if test "$ac_cv_write_stdout" = "yes"; then 20602+ cat >> confdefs.h <<\EOF 20603 #define PHP_WRITE_STDOUT 1 20604-_ACEOF 20605+EOF 20606 20607 fi 20608 20609@@ -17919,37 +13700,37 @@ 20610 CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" 20611 LDFLAGS="$LDFLAGS -L/usr/pkg/lib" 20612 fi 20613-test -d /usr/ucblib && 20614+test -d /usr/ucblib && 20615 if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then 20616- 20617+ 20618 if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then 20619 ai_p=/usr/ucblib 20620 else 20621- 20622+ 20623 ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`" 20624- 20625+ 20626 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 20627 ai_p="$ep_realdir/`basename \"/usr/ucblib\"`" 20628 fi 20629 20630- 20631- 20632- 20633- 20634+ 20635+ 20636+ 20637+ 20638 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 20639- 20640+ 20641 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 20642 if test -n "$unique" && test "`eval $cmd`" = "" ; then 20643 eval "LIBPATH$unique=set" 20644- 20645+ 20646 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 20647 LDFLAGS="$LDFLAGS -L$ai_p" 20648 PHP_RPATHS="$PHP_RPATHS $ai_p" 20649- 20650+ 20651 fi 20652 20653 20654- 20655+ 20656 fi 20657 20658 20659@@ -17960,353 +13741,200 @@ 20660 unset ac_cv_func_socket 20661 unset ac_cv_func___socket 20662 unset found 20663- 20664- echo "$as_me:$LINENO: checking for socket" >&5 20665-echo $ECHO_N "checking for socket... $ECHO_C" >&6 20666-if test "${ac_cv_func_socket+set}" = set; then 20667- echo $ECHO_N "(cached) $ECHO_C" >&6 20668-else 20669- cat >conftest.$ac_ext <<_ACEOF 20670-/* confdefs.h. */ 20671-_ACEOF 20672-cat confdefs.h >>conftest.$ac_ext 20673-cat >>conftest.$ac_ext <<_ACEOF 20674-/* end confdefs.h. */ 20675-/* Define socket to an innocuous variant, in case <limits.h> declares socket. 20676- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 20677-#define socket innocuous_socket 20678- 20679-/* System header to define __stub macros and hopefully few prototypes, 20680- which can conflict with char socket (); below. 20681- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 20682- <limits.h> exists even on freestanding compilers. */ 20683- 20684-#ifdef __STDC__ 20685-# include <limits.h> 20686-#else 20687-# include <assert.h> 20688-#endif 20689- 20690-#undef socket 20691- 20692+ 20693+ echo $ac_n "checking for socket""... $ac_c" 1>&6 20694+echo "configure:13747: checking for socket" >&5 20695+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then 20696+ echo $ac_n "(cached) $ac_c" 1>&6 20697+else 20698+ cat > conftest.$ac_ext <<EOF 20699+#line 13752 "configure" 20700+#include "confdefs.h" 20701+/* System header to define __stub macros and hopefully few prototypes, 20702+ which can conflict with char socket(); below. */ 20703+#include <assert.h> 20704 /* Override any gcc2 internal prototype to avoid an error. */ 20705-#ifdef __cplusplus 20706-extern "C" 20707-{ 20708-#endif 20709 /* We use char because int might match the return type of a gcc2 20710- builtin and then its argument prototype would still apply. */ 20711-char socket (); 20712+ builtin and then its argument prototype would still apply. */ 20713+char socket(); 20714+ 20715+int main() { 20716+ 20717 /* The GNU C library defines this for functions which it implements 20718 to always fail with ENOSYS. Some functions are actually named 20719 something starting with __ and the normal name is an alias. */ 20720 #if defined (__stub_socket) || defined (__stub___socket) 20721 choke me 20722 #else 20723-char (*f) () = socket; 20724-#endif 20725-#ifdef __cplusplus 20726-} 20727+socket(); 20728 #endif 20729 20730-int 20731-main () 20732-{ 20733-return f != socket; 20734- ; 20735- return 0; 20736-} 20737-_ACEOF 20738-rm -f conftest.$ac_objext conftest$ac_exeext 20739-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20740- (eval $ac_link) 2>conftest.er1 20741- ac_status=$? 20742- grep -v '^ *+' conftest.er1 >conftest.err 20743- rm -f conftest.er1 20744- cat conftest.err >&5 20745- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20746- (exit $ac_status); } && 20747- { ac_try='test -z "$ac_c_werror_flag" 20748- || test ! -s conftest.err' 20749- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20750- (eval $ac_try) 2>&5 20751- ac_status=$? 20752- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20753- (exit $ac_status); }; } && 20754- { ac_try='test -s conftest$ac_exeext' 20755- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20756- (eval $ac_try) 2>&5 20757- ac_status=$? 20758- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20759- (exit $ac_status); }; }; then 20760- ac_cv_func_socket=yes 20761-else 20762- echo "$as_me: failed program was:" >&5 20763-sed 's/^/| /' conftest.$ac_ext >&5 20764- 20765-ac_cv_func_socket=no 20766-fi 20767-rm -f conftest.err conftest.$ac_objext \ 20768- conftest$ac_exeext conftest.$ac_ext 20769-fi 20770-echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 20771-echo "${ECHO_T}$ac_cv_func_socket" >&6 20772-if test $ac_cv_func_socket = yes; then 20773- found=yes 20774+; return 0; } 20775+EOF 20776+if { (eval echo configure:13775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 20777+ rm -rf conftest* 20778+ eval "ac_cv_func_socket=yes" 20779 else 20780- echo "$as_me:$LINENO: checking for __socket" >&5 20781-echo $ECHO_N "checking for __socket... $ECHO_C" >&6 20782-if test "${ac_cv_func___socket+set}" = set; then 20783- echo $ECHO_N "(cached) $ECHO_C" >&6 20784-else 20785- cat >conftest.$ac_ext <<_ACEOF 20786-/* confdefs.h. */ 20787-_ACEOF 20788-cat confdefs.h >>conftest.$ac_ext 20789-cat >>conftest.$ac_ext <<_ACEOF 20790-/* end confdefs.h. */ 20791-/* Define __socket to an innocuous variant, in case <limits.h> declares __socket. 20792- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 20793-#define __socket innocuous___socket 20794+ echo "configure: failed program was:" >&5 20795+ cat conftest.$ac_ext >&5 20796+ rm -rf conftest* 20797+ eval "ac_cv_func_socket=no" 20798+fi 20799+rm -f conftest* 20800+fi 20801 20802+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then 20803+ echo "$ac_t""yes" 1>&6 20804+ found=yes 20805+else 20806+ echo "$ac_t""no" 1>&6 20807+ echo $ac_n "checking for __socket""... $ac_c" 1>&6 20808+echo "configure:13793: checking for __socket" >&5 20809+if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then 20810+ echo $ac_n "(cached) $ac_c" 1>&6 20811+else 20812+ cat > conftest.$ac_ext <<EOF 20813+#line 13798 "configure" 20814+#include "confdefs.h" 20815 /* System header to define __stub macros and hopefully few prototypes, 20816- which can conflict with char __socket (); below. 20817- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 20818- <limits.h> exists even on freestanding compilers. */ 20819- 20820-#ifdef __STDC__ 20821-# include <limits.h> 20822-#else 20823-# include <assert.h> 20824-#endif 20825- 20826-#undef __socket 20827- 20828+ which can conflict with char __socket(); below. */ 20829+#include <assert.h> 20830 /* Override any gcc2 internal prototype to avoid an error. */ 20831-#ifdef __cplusplus 20832-extern "C" 20833-{ 20834-#endif 20835 /* We use char because int might match the return type of a gcc2 20836- builtin and then its argument prototype would still apply. */ 20837-char __socket (); 20838+ builtin and then its argument prototype would still apply. */ 20839+char __socket(); 20840+ 20841+int main() { 20842+ 20843 /* The GNU C library defines this for functions which it implements 20844 to always fail with ENOSYS. Some functions are actually named 20845 something starting with __ and the normal name is an alias. */ 20846 #if defined (__stub___socket) || defined (__stub_____socket) 20847 choke me 20848 #else 20849-char (*f) () = __socket; 20850-#endif 20851-#ifdef __cplusplus 20852-} 20853+__socket(); 20854 #endif 20855 20856-int 20857-main () 20858-{ 20859-return f != __socket; 20860- ; 20861- return 0; 20862-} 20863-_ACEOF 20864-rm -f conftest.$ac_objext conftest$ac_exeext 20865-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20866- (eval $ac_link) 2>conftest.er1 20867- ac_status=$? 20868- grep -v '^ *+' conftest.er1 >conftest.err 20869- rm -f conftest.er1 20870- cat conftest.err >&5 20871- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20872- (exit $ac_status); } && 20873- { ac_try='test -z "$ac_c_werror_flag" 20874- || test ! -s conftest.err' 20875- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20876- (eval $ac_try) 2>&5 20877- ac_status=$? 20878- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20879- (exit $ac_status); }; } && 20880- { ac_try='test -s conftest$ac_exeext' 20881- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20882- (eval $ac_try) 2>&5 20883- ac_status=$? 20884- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20885- (exit $ac_status); }; }; then 20886- ac_cv_func___socket=yes 20887-else 20888- echo "$as_me: failed program was:" >&5 20889-sed 's/^/| /' conftest.$ac_ext >&5 20890- 20891-ac_cv_func___socket=no 20892-fi 20893-rm -f conftest.err conftest.$ac_objext \ 20894- conftest$ac_exeext conftest.$ac_ext 20895-fi 20896-echo "$as_me:$LINENO: result: $ac_cv_func___socket" >&5 20897-echo "${ECHO_T}$ac_cv_func___socket" >&6 20898-if test $ac_cv_func___socket = yes; then 20899- found=yes 20900+; return 0; } 20901+EOF 20902+if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 20903+ rm -rf conftest* 20904+ eval "ac_cv_func___socket=yes" 20905 else 20906- found=no 20907+ echo "configure: failed program was:" >&5 20908+ cat conftest.$ac_ext >&5 20909+ rm -rf conftest* 20910+ eval "ac_cv_func___socket=no" 20911+fi 20912+rm -f conftest* 20913 fi 20914 20915+if eval "test \"`echo '$ac_cv_func_'__socket`\" = yes"; then 20916+ echo "$ac_t""yes" 1>&6 20917+ found=yes 20918+else 20919+ echo "$ac_t""no" 1>&6 20920+found=no 20921+fi 20922+ 20923 fi 20924 20925 20926 case $found in 20927- yes) 20928- 20929-cat >>confdefs.h <<\_ACEOF 20930+ yes) 20931+ cat >> confdefs.h <<\EOF 20932 #define HAVE_SOCKET 1 20933-_ACEOF 20934+EOF 20935 20936 ac_cv_func_socket=yes 20937 ;; 20938- 20939- *) 20940- 20941+ 20942+ *) 20943+ 20944 unset ac_cv_lib_socket_socket 20945 unset ac_cv_lib_socket___socket 20946 unset found 20947- echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 20948-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 20949-if test "${ac_cv_lib_socket_socket+set}" = set; then 20950- echo $ECHO_N "(cached) $ECHO_C" >&6 20951+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 20952+echo "configure:13859: checking for socket in -lsocket" >&5 20953+ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` 20954+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 20955+ echo $ac_n "(cached) $ac_c" 1>&6 20956 else 20957- ac_check_lib_save_LIBS=$LIBS 20958+ ac_save_LIBS="$LIBS" 20959 LIBS="-lsocket $LIBS" 20960-cat >conftest.$ac_ext <<_ACEOF 20961-/* confdefs.h. */ 20962-_ACEOF 20963-cat confdefs.h >>conftest.$ac_ext 20964-cat >>conftest.$ac_ext <<_ACEOF 20965-/* end confdefs.h. */ 20966- 20967+cat > conftest.$ac_ext <<EOF 20968+#line 13867 "configure" 20969+#include "confdefs.h" 20970 /* Override any gcc2 internal prototype to avoid an error. */ 20971-#ifdef __cplusplus 20972-extern "C" 20973-#endif 20974 /* We use char because int might match the return type of a gcc2 20975- builtin and then its argument prototype would still apply. */ 20976-char socket (); 20977-int 20978-main () 20979-{ 20980-socket (); 20981- ; 20982- return 0; 20983-} 20984-_ACEOF 20985-rm -f conftest.$ac_objext conftest$ac_exeext 20986-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 20987- (eval $ac_link) 2>conftest.er1 20988- ac_status=$? 20989- grep -v '^ *+' conftest.er1 >conftest.err 20990- rm -f conftest.er1 20991- cat conftest.err >&5 20992- echo "$as_me:$LINENO: \$? = $ac_status" >&5 20993- (exit $ac_status); } && 20994- { ac_try='test -z "$ac_c_werror_flag" 20995- || test ! -s conftest.err' 20996- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 20997- (eval $ac_try) 2>&5 20998- ac_status=$? 20999- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21000- (exit $ac_status); }; } && 21001- { ac_try='test -s conftest$ac_exeext' 21002- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21003- (eval $ac_try) 2>&5 21004- ac_status=$? 21005- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21006- (exit $ac_status); }; }; then 21007- ac_cv_lib_socket_socket=yes 21008-else 21009- echo "$as_me: failed program was:" >&5 21010-sed 's/^/| /' conftest.$ac_ext >&5 21011- 21012-ac_cv_lib_socket_socket=no 21013-fi 21014-rm -f conftest.err conftest.$ac_objext \ 21015- conftest$ac_exeext conftest.$ac_ext 21016-LIBS=$ac_check_lib_save_LIBS 21017-fi 21018-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 21019-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 21020-if test $ac_cv_lib_socket_socket = yes; then 21021+ builtin and then its argument prototype would still apply. */ 21022+char socket(); 21023+ 21024+int main() { 21025+socket() 21026+; return 0; } 21027+EOF 21028+if { (eval echo configure:13878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21029+ rm -rf conftest* 21030+ eval "ac_cv_lib_$ac_lib_var=yes" 21031+else 21032+ echo "configure: failed program was:" >&5 21033+ cat conftest.$ac_ext >&5 21034+ rm -rf conftest* 21035+ eval "ac_cv_lib_$ac_lib_var=no" 21036+fi 21037+rm -f conftest* 21038+LIBS="$ac_save_LIBS" 21039+ 21040+fi 21041+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 21042+ echo "$ac_t""yes" 1>&6 21043 found=yes 21044 else 21045+ echo "$ac_t""no" 1>&6 21046 21047- echo "$as_me:$LINENO: checking for __socket in -lsocket" >&5 21048-echo $ECHO_N "checking for __socket in -lsocket... $ECHO_C" >&6 21049-if test "${ac_cv_lib_socket___socket+set}" = set; then 21050- echo $ECHO_N "(cached) $ECHO_C" >&6 21051+ echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 21052+echo "configure:13898: checking for __socket in -lsocket" >&5 21053+ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'` 21054+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 21055+ echo $ac_n "(cached) $ac_c" 1>&6 21056 else 21057- ac_check_lib_save_LIBS=$LIBS 21058+ ac_save_LIBS="$LIBS" 21059 LIBS="-lsocket $LIBS" 21060-cat >conftest.$ac_ext <<_ACEOF 21061-/* confdefs.h. */ 21062-_ACEOF 21063-cat confdefs.h >>conftest.$ac_ext 21064-cat >>conftest.$ac_ext <<_ACEOF 21065-/* end confdefs.h. */ 21066- 21067+cat > conftest.$ac_ext <<EOF 21068+#line 13906 "configure" 21069+#include "confdefs.h" 21070 /* Override any gcc2 internal prototype to avoid an error. */ 21071-#ifdef __cplusplus 21072-extern "C" 21073-#endif 21074 /* We use char because int might match the return type of a gcc2 21075- builtin and then its argument prototype would still apply. */ 21076-char __socket (); 21077-int 21078-main () 21079-{ 21080-__socket (); 21081- ; 21082- return 0; 21083-} 21084-_ACEOF 21085-rm -f conftest.$ac_objext conftest$ac_exeext 21086-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21087- (eval $ac_link) 2>conftest.er1 21088- ac_status=$? 21089- grep -v '^ *+' conftest.er1 >conftest.err 21090- rm -f conftest.er1 21091- cat conftest.err >&5 21092- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21093- (exit $ac_status); } && 21094- { ac_try='test -z "$ac_c_werror_flag" 21095- || test ! -s conftest.err' 21096- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21097- (eval $ac_try) 2>&5 21098- ac_status=$? 21099- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21100- (exit $ac_status); }; } && 21101- { ac_try='test -s conftest$ac_exeext' 21102- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21103- (eval $ac_try) 2>&5 21104- ac_status=$? 21105- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21106- (exit $ac_status); }; }; then 21107- ac_cv_lib_socket___socket=yes 21108-else 21109- echo "$as_me: failed program was:" >&5 21110-sed 's/^/| /' conftest.$ac_ext >&5 21111- 21112-ac_cv_lib_socket___socket=no 21113-fi 21114-rm -f conftest.err conftest.$ac_objext \ 21115- conftest$ac_exeext conftest.$ac_ext 21116-LIBS=$ac_check_lib_save_LIBS 21117-fi 21118-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socket" >&5 21119-echo "${ECHO_T}$ac_cv_lib_socket___socket" >&6 21120-if test $ac_cv_lib_socket___socket = yes; then 21121- found=yes 21122+ builtin and then its argument prototype would still apply. */ 21123+char __socket(); 21124+ 21125+int main() { 21126+__socket() 21127+; return 0; } 21128+EOF 21129+if { (eval echo configure:13917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21130+ rm -rf conftest* 21131+ eval "ac_cv_lib_$ac_lib_var=yes" 21132 else 21133- found=no 21134+ echo "configure: failed program was:" >&5 21135+ cat conftest.$ac_ext >&5 21136+ rm -rf conftest* 21137+ eval "ac_cv_lib_$ac_lib_var=no" 21138 fi 21139+rm -f conftest* 21140+LIBS="$ac_save_LIBS" 21141 21142+fi 21143+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 21144+ echo "$ac_t""yes" 1>&6 21145+ found=yes 21146+else 21147+ echo "$ac_t""no" 1>&6 21148+found=no 21149+fi 21150 21151+ 21152 fi 21153 21154 21155@@ -18316,422 +13944,254 @@ 21156 if test "$cross_compiling" = yes; then 21157 found=no 21158 else 21159- cat >conftest.$ac_ext <<_ACEOF 21160-/* confdefs.h. */ 21161-_ACEOF 21162-cat confdefs.h >>conftest.$ac_ext 21163-cat >>conftest.$ac_ext <<_ACEOF 21164-/* end confdefs.h. */ 21165+ cat > conftest.$ac_ext <<EOF 21166+#line 13949 "configure" 21167+#include "confdefs.h" 21168 main() { return (0); } 21169-_ACEOF 21170-rm -f conftest$ac_exeext 21171-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21172- (eval $ac_link) 2>&5 21173- ac_status=$? 21174- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21175- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 21176- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21177- (eval $ac_try) 2>&5 21178- ac_status=$? 21179- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21180- (exit $ac_status); }; }; then 21181+EOF 21182+if { (eval echo configure:13953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 21183+then 21184 found=yes 21185 else 21186- echo "$as_me: program exited with status $ac_status" >&5 21187-echo "$as_me: failed program was:" >&5 21188-sed 's/^/| /' conftest.$ac_ext >&5 21189- 21190-( exit $ac_status ) 21191-found=no 21192+ echo "configure: failed program was:" >&5 21193+ cat conftest.$ac_ext >&5 21194+ rm -fr conftest* 21195+ found=no 21196 fi 21197-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 21198+rm -fr conftest* 21199 fi 21200+ 21201 LIBS=$ac_libs 21202 fi 21203 21204 if test "$found" = "yes"; then 21205- 21206- 21207+ 21208+ 21209 case socket in 21210 c|c_r|pthread*) ;; 21211- *) 21212- LIBS="-lsocket $LIBS" 21213+ *) 21214+ LIBS="-lsocket $LIBS" 21215 ;; 21216 esac 21217 21218 21219- 21220-cat >>confdefs.h <<\_ACEOF 21221+ cat >> confdefs.h <<\EOF 21222 #define HAVE_SOCKET 1 21223-_ACEOF 21224- 21225+EOF 21226 21227-cat >>confdefs.h <<\_ACEOF 21228+ cat >> confdefs.h <<\EOF 21229 #define HAVE_LIBSOCKET 1 21230-_ACEOF 21231+EOF 21232 21233 ac_cv_func_socket=yes 21234 else 21235- 21236+ 21237 : 21238 21239 fi 21240- 21241+ 21242 ;; 21243- 21244+ 21245 esac 21246 21247 21248 unset ac_cv_func_socketpair 21249 unset ac_cv_func___socketpair 21250 unset found 21251- 21252- echo "$as_me:$LINENO: checking for socketpair" >&5 21253-echo $ECHO_N "checking for socketpair... $ECHO_C" >&6 21254-if test "${ac_cv_func_socketpair+set}" = set; then 21255- echo $ECHO_N "(cached) $ECHO_C" >&6 21256-else 21257- cat >conftest.$ac_ext <<_ACEOF 21258-/* confdefs.h. */ 21259-_ACEOF 21260-cat confdefs.h >>conftest.$ac_ext 21261-cat >>conftest.$ac_ext <<_ACEOF 21262-/* end confdefs.h. */ 21263-/* Define socketpair to an innocuous variant, in case <limits.h> declares socketpair. 21264- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 21265-#define socketpair innocuous_socketpair 21266- 21267+ 21268+ echo $ac_n "checking for socketpair""... $ac_c" 1>&6 21269+echo "configure:14004: checking for socketpair" >&5 21270+if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then 21271+ echo $ac_n "(cached) $ac_c" 1>&6 21272+else 21273+ cat > conftest.$ac_ext <<EOF 21274+#line 14009 "configure" 21275+#include "confdefs.h" 21276 /* System header to define __stub macros and hopefully few prototypes, 21277- which can conflict with char socketpair (); below. 21278- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 21279- <limits.h> exists even on freestanding compilers. */ 21280- 21281-#ifdef __STDC__ 21282-# include <limits.h> 21283-#else 21284-# include <assert.h> 21285-#endif 21286- 21287-#undef socketpair 21288- 21289+ which can conflict with char socketpair(); below. */ 21290+#include <assert.h> 21291 /* Override any gcc2 internal prototype to avoid an error. */ 21292-#ifdef __cplusplus 21293-extern "C" 21294-{ 21295-#endif 21296 /* We use char because int might match the return type of a gcc2 21297- builtin and then its argument prototype would still apply. */ 21298-char socketpair (); 21299+ builtin and then its argument prototype would still apply. */ 21300+char socketpair(); 21301+ 21302+int main() { 21303+ 21304 /* The GNU C library defines this for functions which it implements 21305 to always fail with ENOSYS. Some functions are actually named 21306 something starting with __ and the normal name is an alias. */ 21307 #if defined (__stub_socketpair) || defined (__stub___socketpair) 21308 choke me 21309 #else 21310-char (*f) () = socketpair; 21311-#endif 21312-#ifdef __cplusplus 21313-} 21314+socketpair(); 21315 #endif 21316 21317-int 21318-main () 21319-{ 21320-return f != socketpair; 21321- ; 21322- return 0; 21323-} 21324-_ACEOF 21325-rm -f conftest.$ac_objext conftest$ac_exeext 21326-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21327- (eval $ac_link) 2>conftest.er1 21328- ac_status=$? 21329- grep -v '^ *+' conftest.er1 >conftest.err 21330- rm -f conftest.er1 21331- cat conftest.err >&5 21332- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21333- (exit $ac_status); } && 21334- { ac_try='test -z "$ac_c_werror_flag" 21335- || test ! -s conftest.err' 21336- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21337- (eval $ac_try) 2>&5 21338- ac_status=$? 21339- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21340- (exit $ac_status); }; } && 21341- { ac_try='test -s conftest$ac_exeext' 21342- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21343- (eval $ac_try) 2>&5 21344- ac_status=$? 21345- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21346- (exit $ac_status); }; }; then 21347- ac_cv_func_socketpair=yes 21348-else 21349- echo "$as_me: failed program was:" >&5 21350-sed 's/^/| /' conftest.$ac_ext >&5 21351- 21352-ac_cv_func_socketpair=no 21353-fi 21354-rm -f conftest.err conftest.$ac_objext \ 21355- conftest$ac_exeext conftest.$ac_ext 21356-fi 21357-echo "$as_me:$LINENO: result: $ac_cv_func_socketpair" >&5 21358-echo "${ECHO_T}$ac_cv_func_socketpair" >&6 21359-if test $ac_cv_func_socketpair = yes; then 21360- found=yes 21361+; return 0; } 21362+EOF 21363+if { (eval echo configure:14032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21364+ rm -rf conftest* 21365+ eval "ac_cv_func_socketpair=yes" 21366 else 21367- echo "$as_me:$LINENO: checking for __socketpair" >&5 21368-echo $ECHO_N "checking for __socketpair... $ECHO_C" >&6 21369-if test "${ac_cv_func___socketpair+set}" = set; then 21370- echo $ECHO_N "(cached) $ECHO_C" >&6 21371-else 21372- cat >conftest.$ac_ext <<_ACEOF 21373-/* confdefs.h. */ 21374-_ACEOF 21375-cat confdefs.h >>conftest.$ac_ext 21376-cat >>conftest.$ac_ext <<_ACEOF 21377-/* end confdefs.h. */ 21378-/* Define __socketpair to an innocuous variant, in case <limits.h> declares __socketpair. 21379- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 21380-#define __socketpair innocuous___socketpair 21381+ echo "configure: failed program was:" >&5 21382+ cat conftest.$ac_ext >&5 21383+ rm -rf conftest* 21384+ eval "ac_cv_func_socketpair=no" 21385+fi 21386+rm -f conftest* 21387+fi 21388 21389+if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then 21390+ echo "$ac_t""yes" 1>&6 21391+ found=yes 21392+else 21393+ echo "$ac_t""no" 1>&6 21394+ echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 21395+echo "configure:14050: checking for __socketpair" >&5 21396+if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then 21397+ echo $ac_n "(cached) $ac_c" 1>&6 21398+else 21399+ cat > conftest.$ac_ext <<EOF 21400+#line 14055 "configure" 21401+#include "confdefs.h" 21402 /* System header to define __stub macros and hopefully few prototypes, 21403- which can conflict with char __socketpair (); below. 21404- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 21405- <limits.h> exists even on freestanding compilers. */ 21406- 21407-#ifdef __STDC__ 21408-# include <limits.h> 21409-#else 21410-# include <assert.h> 21411-#endif 21412- 21413-#undef __socketpair 21414- 21415+ which can conflict with char __socketpair(); below. */ 21416+#include <assert.h> 21417 /* Override any gcc2 internal prototype to avoid an error. */ 21418-#ifdef __cplusplus 21419-extern "C" 21420-{ 21421-#endif 21422 /* We use char because int might match the return type of a gcc2 21423- builtin and then its argument prototype would still apply. */ 21424-char __socketpair (); 21425+ builtin and then its argument prototype would still apply. */ 21426+char __socketpair(); 21427+ 21428+int main() { 21429+ 21430 /* The GNU C library defines this for functions which it implements 21431 to always fail with ENOSYS. Some functions are actually named 21432 something starting with __ and the normal name is an alias. */ 21433 #if defined (__stub___socketpair) || defined (__stub_____socketpair) 21434 choke me 21435 #else 21436-char (*f) () = __socketpair; 21437-#endif 21438-#ifdef __cplusplus 21439-} 21440+__socketpair(); 21441 #endif 21442 21443-int 21444-main () 21445-{ 21446-return f != __socketpair; 21447- ; 21448- return 0; 21449-} 21450-_ACEOF 21451-rm -f conftest.$ac_objext conftest$ac_exeext 21452-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21453- (eval $ac_link) 2>conftest.er1 21454- ac_status=$? 21455- grep -v '^ *+' conftest.er1 >conftest.err 21456- rm -f conftest.er1 21457- cat conftest.err >&5 21458- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21459- (exit $ac_status); } && 21460- { ac_try='test -z "$ac_c_werror_flag" 21461- || test ! -s conftest.err' 21462- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21463- (eval $ac_try) 2>&5 21464- ac_status=$? 21465- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21466- (exit $ac_status); }; } && 21467- { ac_try='test -s conftest$ac_exeext' 21468- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21469- (eval $ac_try) 2>&5 21470- ac_status=$? 21471- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21472- (exit $ac_status); }; }; then 21473- ac_cv_func___socketpair=yes 21474-else 21475- echo "$as_me: failed program was:" >&5 21476-sed 's/^/| /' conftest.$ac_ext >&5 21477- 21478-ac_cv_func___socketpair=no 21479-fi 21480-rm -f conftest.err conftest.$ac_objext \ 21481- conftest$ac_exeext conftest.$ac_ext 21482-fi 21483-echo "$as_me:$LINENO: result: $ac_cv_func___socketpair" >&5 21484-echo "${ECHO_T}$ac_cv_func___socketpair" >&6 21485-if test $ac_cv_func___socketpair = yes; then 21486- found=yes 21487+; return 0; } 21488+EOF 21489+if { (eval echo configure:14078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21490+ rm -rf conftest* 21491+ eval "ac_cv_func___socketpair=yes" 21492 else 21493- found=no 21494+ echo "configure: failed program was:" >&5 21495+ cat conftest.$ac_ext >&5 21496+ rm -rf conftest* 21497+ eval "ac_cv_func___socketpair=no" 21498+fi 21499+rm -f conftest* 21500 fi 21501 21502+if eval "test \"`echo '$ac_cv_func_'__socketpair`\" = yes"; then 21503+ echo "$ac_t""yes" 1>&6 21504+ found=yes 21505+else 21506+ echo "$ac_t""no" 1>&6 21507+found=no 21508+fi 21509+ 21510 fi 21511 21512 21513 case $found in 21514- yes) 21515- 21516-cat >>confdefs.h <<\_ACEOF 21517+ yes) 21518+ cat >> confdefs.h <<\EOF 21519 #define HAVE_SOCKETPAIR 1 21520-_ACEOF 21521+EOF 21522 21523 ac_cv_func_socketpair=yes 21524 ;; 21525- 21526- *) 21527- 21528+ 21529+ *) 21530+ 21531 unset ac_cv_lib_socket_socketpair 21532 unset ac_cv_lib_socket___socketpair 21533 unset found 21534- echo "$as_me:$LINENO: checking for socketpair in -lsocket" >&5 21535-echo $ECHO_N "checking for socketpair in -lsocket... $ECHO_C" >&6 21536-if test "${ac_cv_lib_socket_socketpair+set}" = set; then 21537- echo $ECHO_N "(cached) $ECHO_C" >&6 21538+ echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 21539+echo "configure:14116: checking for socketpair in -lsocket" >&5 21540+ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'` 21541+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 21542+ echo $ac_n "(cached) $ac_c" 1>&6 21543 else 21544- ac_check_lib_save_LIBS=$LIBS 21545+ ac_save_LIBS="$LIBS" 21546 LIBS="-lsocket $LIBS" 21547-cat >conftest.$ac_ext <<_ACEOF 21548-/* confdefs.h. */ 21549-_ACEOF 21550-cat confdefs.h >>conftest.$ac_ext 21551-cat >>conftest.$ac_ext <<_ACEOF 21552-/* end confdefs.h. */ 21553- 21554+cat > conftest.$ac_ext <<EOF 21555+#line 14124 "configure" 21556+#include "confdefs.h" 21557 /* Override any gcc2 internal prototype to avoid an error. */ 21558-#ifdef __cplusplus 21559-extern "C" 21560-#endif 21561 /* We use char because int might match the return type of a gcc2 21562- builtin and then its argument prototype would still apply. */ 21563-char socketpair (); 21564-int 21565-main () 21566-{ 21567-socketpair (); 21568- ; 21569- return 0; 21570-} 21571-_ACEOF 21572-rm -f conftest.$ac_objext conftest$ac_exeext 21573-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21574- (eval $ac_link) 2>conftest.er1 21575- ac_status=$? 21576- grep -v '^ *+' conftest.er1 >conftest.err 21577- rm -f conftest.er1 21578- cat conftest.err >&5 21579- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21580- (exit $ac_status); } && 21581- { ac_try='test -z "$ac_c_werror_flag" 21582- || test ! -s conftest.err' 21583- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21584- (eval $ac_try) 2>&5 21585- ac_status=$? 21586- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21587- (exit $ac_status); }; } && 21588- { ac_try='test -s conftest$ac_exeext' 21589- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21590- (eval $ac_try) 2>&5 21591- ac_status=$? 21592- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21593- (exit $ac_status); }; }; then 21594- ac_cv_lib_socket_socketpair=yes 21595-else 21596- echo "$as_me: failed program was:" >&5 21597-sed 's/^/| /' conftest.$ac_ext >&5 21598- 21599-ac_cv_lib_socket_socketpair=no 21600-fi 21601-rm -f conftest.err conftest.$ac_objext \ 21602- conftest$ac_exeext conftest.$ac_ext 21603-LIBS=$ac_check_lib_save_LIBS 21604-fi 21605-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socketpair" >&5 21606-echo "${ECHO_T}$ac_cv_lib_socket_socketpair" >&6 21607-if test $ac_cv_lib_socket_socketpair = yes; then 21608+ builtin and then its argument prototype would still apply. */ 21609+char socketpair(); 21610+ 21611+int main() { 21612+socketpair() 21613+; return 0; } 21614+EOF 21615+if { (eval echo configure:14135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21616+ rm -rf conftest* 21617+ eval "ac_cv_lib_$ac_lib_var=yes" 21618+else 21619+ echo "configure: failed program was:" >&5 21620+ cat conftest.$ac_ext >&5 21621+ rm -rf conftest* 21622+ eval "ac_cv_lib_$ac_lib_var=no" 21623+fi 21624+rm -f conftest* 21625+LIBS="$ac_save_LIBS" 21626+ 21627+fi 21628+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 21629+ echo "$ac_t""yes" 1>&6 21630 found=yes 21631 else 21632+ echo "$ac_t""no" 1>&6 21633 21634- echo "$as_me:$LINENO: checking for __socketpair in -lsocket" >&5 21635-echo $ECHO_N "checking for __socketpair in -lsocket... $ECHO_C" >&6 21636-if test "${ac_cv_lib_socket___socketpair+set}" = set; then 21637- echo $ECHO_N "(cached) $ECHO_C" >&6 21638+ echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 21639+echo "configure:14155: checking for __socketpair in -lsocket" >&5 21640+ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'` 21641+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 21642+ echo $ac_n "(cached) $ac_c" 1>&6 21643 else 21644- ac_check_lib_save_LIBS=$LIBS 21645+ ac_save_LIBS="$LIBS" 21646 LIBS="-lsocket $LIBS" 21647-cat >conftest.$ac_ext <<_ACEOF 21648-/* confdefs.h. */ 21649-_ACEOF 21650-cat confdefs.h >>conftest.$ac_ext 21651-cat >>conftest.$ac_ext <<_ACEOF 21652-/* end confdefs.h. */ 21653- 21654+cat > conftest.$ac_ext <<EOF 21655+#line 14163 "configure" 21656+#include "confdefs.h" 21657 /* Override any gcc2 internal prototype to avoid an error. */ 21658-#ifdef __cplusplus 21659-extern "C" 21660-#endif 21661 /* We use char because int might match the return type of a gcc2 21662- builtin and then its argument prototype would still apply. */ 21663-char __socketpair (); 21664-int 21665-main () 21666-{ 21667-__socketpair (); 21668- ; 21669- return 0; 21670-} 21671-_ACEOF 21672-rm -f conftest.$ac_objext conftest$ac_exeext 21673-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21674- (eval $ac_link) 2>conftest.er1 21675- ac_status=$? 21676- grep -v '^ *+' conftest.er1 >conftest.err 21677- rm -f conftest.er1 21678- cat conftest.err >&5 21679- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21680- (exit $ac_status); } && 21681- { ac_try='test -z "$ac_c_werror_flag" 21682- || test ! -s conftest.err' 21683- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21684- (eval $ac_try) 2>&5 21685- ac_status=$? 21686- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21687- (exit $ac_status); }; } && 21688- { ac_try='test -s conftest$ac_exeext' 21689- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21690- (eval $ac_try) 2>&5 21691- ac_status=$? 21692- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21693- (exit $ac_status); }; }; then 21694- ac_cv_lib_socket___socketpair=yes 21695-else 21696- echo "$as_me: failed program was:" >&5 21697-sed 's/^/| /' conftest.$ac_ext >&5 21698- 21699-ac_cv_lib_socket___socketpair=no 21700-fi 21701-rm -f conftest.err conftest.$ac_objext \ 21702- conftest$ac_exeext conftest.$ac_ext 21703-LIBS=$ac_check_lib_save_LIBS 21704-fi 21705-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socketpair" >&5 21706-echo "${ECHO_T}$ac_cv_lib_socket___socketpair" >&6 21707-if test $ac_cv_lib_socket___socketpair = yes; then 21708- found=yes 21709+ builtin and then its argument prototype would still apply. */ 21710+char __socketpair(); 21711+ 21712+int main() { 21713+__socketpair() 21714+; return 0; } 21715+EOF 21716+if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21717+ rm -rf conftest* 21718+ eval "ac_cv_lib_$ac_lib_var=yes" 21719 else 21720- found=no 21721+ echo "configure: failed program was:" >&5 21722+ cat conftest.$ac_ext >&5 21723+ rm -rf conftest* 21724+ eval "ac_cv_lib_$ac_lib_var=no" 21725 fi 21726+rm -f conftest* 21727+LIBS="$ac_save_LIBS" 21728 21729+fi 21730+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 21731+ echo "$ac_t""yes" 1>&6 21732+ found=yes 21733+else 21734+ echo "$ac_t""no" 1>&6 21735+found=no 21736+fi 21737 21738+ 21739 fi 21740 21741 21742@@ -18741,422 +14201,254 @@ 21743 if test "$cross_compiling" = yes; then 21744 found=no 21745 else 21746- cat >conftest.$ac_ext <<_ACEOF 21747-/* confdefs.h. */ 21748-_ACEOF 21749-cat confdefs.h >>conftest.$ac_ext 21750-cat >>conftest.$ac_ext <<_ACEOF 21751-/* end confdefs.h. */ 21752+ cat > conftest.$ac_ext <<EOF 21753+#line 14206 "configure" 21754+#include "confdefs.h" 21755 main() { return (0); } 21756-_ACEOF 21757-rm -f conftest$ac_exeext 21758-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21759- (eval $ac_link) 2>&5 21760- ac_status=$? 21761- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21762- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 21763- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21764- (eval $ac_try) 2>&5 21765- ac_status=$? 21766- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21767- (exit $ac_status); }; }; then 21768+EOF 21769+if { (eval echo configure:14210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 21770+then 21771 found=yes 21772 else 21773- echo "$as_me: program exited with status $ac_status" >&5 21774-echo "$as_me: failed program was:" >&5 21775-sed 's/^/| /' conftest.$ac_ext >&5 21776- 21777-( exit $ac_status ) 21778-found=no 21779+ echo "configure: failed program was:" >&5 21780+ cat conftest.$ac_ext >&5 21781+ rm -fr conftest* 21782+ found=no 21783 fi 21784-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 21785+rm -fr conftest* 21786 fi 21787+ 21788 LIBS=$ac_libs 21789 fi 21790 21791 if test "$found" = "yes"; then 21792- 21793- 21794+ 21795+ 21796 case socket in 21797 c|c_r|pthread*) ;; 21798- *) 21799- LIBS="-lsocket $LIBS" 21800+ *) 21801+ LIBS="-lsocket $LIBS" 21802 ;; 21803 esac 21804 21805 21806- 21807-cat >>confdefs.h <<\_ACEOF 21808+ cat >> confdefs.h <<\EOF 21809 #define HAVE_SOCKETPAIR 1 21810-_ACEOF 21811- 21812+EOF 21813 21814-cat >>confdefs.h <<\_ACEOF 21815+ cat >> confdefs.h <<\EOF 21816 #define HAVE_LIBSOCKET 1 21817-_ACEOF 21818+EOF 21819 21820 ac_cv_func_socketpair=yes 21821 else 21822- 21823+ 21824 : 21825 21826 fi 21827- 21828+ 21829 ;; 21830- 21831+ 21832 esac 21833 21834 21835 unset ac_cv_func_htonl 21836 unset ac_cv_func___htonl 21837 unset found 21838- 21839- echo "$as_me:$LINENO: checking for htonl" >&5 21840-echo $ECHO_N "checking for htonl... $ECHO_C" >&6 21841-if test "${ac_cv_func_htonl+set}" = set; then 21842- echo $ECHO_N "(cached) $ECHO_C" >&6 21843-else 21844- cat >conftest.$ac_ext <<_ACEOF 21845-/* confdefs.h. */ 21846-_ACEOF 21847-cat confdefs.h >>conftest.$ac_ext 21848-cat >>conftest.$ac_ext <<_ACEOF 21849-/* end confdefs.h. */ 21850-/* Define htonl to an innocuous variant, in case <limits.h> declares htonl. 21851- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 21852-#define htonl innocuous_htonl 21853- 21854+ 21855+ echo $ac_n "checking for htonl""... $ac_c" 1>&6 21856+echo "configure:14261: checking for htonl" >&5 21857+if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then 21858+ echo $ac_n "(cached) $ac_c" 1>&6 21859+else 21860+ cat > conftest.$ac_ext <<EOF 21861+#line 14266 "configure" 21862+#include "confdefs.h" 21863 /* System header to define __stub macros and hopefully few prototypes, 21864- which can conflict with char htonl (); below. 21865- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 21866- <limits.h> exists even on freestanding compilers. */ 21867- 21868-#ifdef __STDC__ 21869-# include <limits.h> 21870-#else 21871-# include <assert.h> 21872-#endif 21873- 21874-#undef htonl 21875- 21876+ which can conflict with char htonl(); below. */ 21877+#include <assert.h> 21878 /* Override any gcc2 internal prototype to avoid an error. */ 21879-#ifdef __cplusplus 21880-extern "C" 21881-{ 21882-#endif 21883 /* We use char because int might match the return type of a gcc2 21884- builtin and then its argument prototype would still apply. */ 21885-char htonl (); 21886+ builtin and then its argument prototype would still apply. */ 21887+char htonl(); 21888+ 21889+int main() { 21890+ 21891 /* The GNU C library defines this for functions which it implements 21892 to always fail with ENOSYS. Some functions are actually named 21893 something starting with __ and the normal name is an alias. */ 21894 #if defined (__stub_htonl) || defined (__stub___htonl) 21895 choke me 21896 #else 21897-char (*f) () = htonl; 21898-#endif 21899-#ifdef __cplusplus 21900-} 21901+htonl(); 21902 #endif 21903 21904-int 21905-main () 21906-{ 21907-return f != htonl; 21908- ; 21909- return 0; 21910-} 21911-_ACEOF 21912-rm -f conftest.$ac_objext conftest$ac_exeext 21913-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 21914- (eval $ac_link) 2>conftest.er1 21915- ac_status=$? 21916- grep -v '^ *+' conftest.er1 >conftest.err 21917- rm -f conftest.er1 21918- cat conftest.err >&5 21919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21920- (exit $ac_status); } && 21921- { ac_try='test -z "$ac_c_werror_flag" 21922- || test ! -s conftest.err' 21923- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21924- (eval $ac_try) 2>&5 21925- ac_status=$? 21926- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21927- (exit $ac_status); }; } && 21928- { ac_try='test -s conftest$ac_exeext' 21929- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 21930- (eval $ac_try) 2>&5 21931- ac_status=$? 21932- echo "$as_me:$LINENO: \$? = $ac_status" >&5 21933- (exit $ac_status); }; }; then 21934- ac_cv_func_htonl=yes 21935-else 21936- echo "$as_me: failed program was:" >&5 21937-sed 's/^/| /' conftest.$ac_ext >&5 21938- 21939-ac_cv_func_htonl=no 21940-fi 21941-rm -f conftest.err conftest.$ac_objext \ 21942- conftest$ac_exeext conftest.$ac_ext 21943-fi 21944-echo "$as_me:$LINENO: result: $ac_cv_func_htonl" >&5 21945-echo "${ECHO_T}$ac_cv_func_htonl" >&6 21946-if test $ac_cv_func_htonl = yes; then 21947- found=yes 21948+; return 0; } 21949+EOF 21950+if { (eval echo configure:14289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 21951+ rm -rf conftest* 21952+ eval "ac_cv_func_htonl=yes" 21953 else 21954- echo "$as_me:$LINENO: checking for __htonl" >&5 21955-echo $ECHO_N "checking for __htonl... $ECHO_C" >&6 21956-if test "${ac_cv_func___htonl+set}" = set; then 21957- echo $ECHO_N "(cached) $ECHO_C" >&6 21958-else 21959- cat >conftest.$ac_ext <<_ACEOF 21960-/* confdefs.h. */ 21961-_ACEOF 21962-cat confdefs.h >>conftest.$ac_ext 21963-cat >>conftest.$ac_ext <<_ACEOF 21964-/* end confdefs.h. */ 21965-/* Define __htonl to an innocuous variant, in case <limits.h> declares __htonl. 21966- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 21967-#define __htonl innocuous___htonl 21968+ echo "configure: failed program was:" >&5 21969+ cat conftest.$ac_ext >&5 21970+ rm -rf conftest* 21971+ eval "ac_cv_func_htonl=no" 21972+fi 21973+rm -f conftest* 21974+fi 21975 21976+if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then 21977+ echo "$ac_t""yes" 1>&6 21978+ found=yes 21979+else 21980+ echo "$ac_t""no" 1>&6 21981+ echo $ac_n "checking for __htonl""... $ac_c" 1>&6 21982+echo "configure:14307: checking for __htonl" >&5 21983+if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then 21984+ echo $ac_n "(cached) $ac_c" 1>&6 21985+else 21986+ cat > conftest.$ac_ext <<EOF 21987+#line 14312 "configure" 21988+#include "confdefs.h" 21989 /* System header to define __stub macros and hopefully few prototypes, 21990- which can conflict with char __htonl (); below. 21991- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 21992- <limits.h> exists even on freestanding compilers. */ 21993- 21994-#ifdef __STDC__ 21995-# include <limits.h> 21996-#else 21997-# include <assert.h> 21998-#endif 21999- 22000-#undef __htonl 22001- 22002+ which can conflict with char __htonl(); below. */ 22003+#include <assert.h> 22004 /* Override any gcc2 internal prototype to avoid an error. */ 22005-#ifdef __cplusplus 22006-extern "C" 22007-{ 22008-#endif 22009 /* We use char because int might match the return type of a gcc2 22010- builtin and then its argument prototype would still apply. */ 22011-char __htonl (); 22012+ builtin and then its argument prototype would still apply. */ 22013+char __htonl(); 22014+ 22015+int main() { 22016+ 22017 /* The GNU C library defines this for functions which it implements 22018 to always fail with ENOSYS. Some functions are actually named 22019 something starting with __ and the normal name is an alias. */ 22020 #if defined (__stub___htonl) || defined (__stub_____htonl) 22021 choke me 22022 #else 22023-char (*f) () = __htonl; 22024-#endif 22025-#ifdef __cplusplus 22026-} 22027+__htonl(); 22028 #endif 22029 22030-int 22031-main () 22032-{ 22033-return f != __htonl; 22034- ; 22035- return 0; 22036-} 22037-_ACEOF 22038-rm -f conftest.$ac_objext conftest$ac_exeext 22039-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22040- (eval $ac_link) 2>conftest.er1 22041- ac_status=$? 22042- grep -v '^ *+' conftest.er1 >conftest.err 22043- rm -f conftest.er1 22044- cat conftest.err >&5 22045- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22046- (exit $ac_status); } && 22047- { ac_try='test -z "$ac_c_werror_flag" 22048- || test ! -s conftest.err' 22049- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22050- (eval $ac_try) 2>&5 22051- ac_status=$? 22052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22053- (exit $ac_status); }; } && 22054- { ac_try='test -s conftest$ac_exeext' 22055- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22056- (eval $ac_try) 2>&5 22057- ac_status=$? 22058- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22059- (exit $ac_status); }; }; then 22060- ac_cv_func___htonl=yes 22061-else 22062- echo "$as_me: failed program was:" >&5 22063-sed 's/^/| /' conftest.$ac_ext >&5 22064- 22065-ac_cv_func___htonl=no 22066-fi 22067-rm -f conftest.err conftest.$ac_objext \ 22068- conftest$ac_exeext conftest.$ac_ext 22069-fi 22070-echo "$as_me:$LINENO: result: $ac_cv_func___htonl" >&5 22071-echo "${ECHO_T}$ac_cv_func___htonl" >&6 22072-if test $ac_cv_func___htonl = yes; then 22073- found=yes 22074+; return 0; } 22075+EOF 22076+if { (eval echo configure:14335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22077+ rm -rf conftest* 22078+ eval "ac_cv_func___htonl=yes" 22079 else 22080- found=no 22081+ echo "configure: failed program was:" >&5 22082+ cat conftest.$ac_ext >&5 22083+ rm -rf conftest* 22084+ eval "ac_cv_func___htonl=no" 22085+fi 22086+rm -f conftest* 22087 fi 22088 22089+if eval "test \"`echo '$ac_cv_func_'__htonl`\" = yes"; then 22090+ echo "$ac_t""yes" 1>&6 22091+ found=yes 22092+else 22093+ echo "$ac_t""no" 1>&6 22094+found=no 22095+fi 22096+ 22097 fi 22098 22099 22100 case $found in 22101- yes) 22102- 22103-cat >>confdefs.h <<\_ACEOF 22104+ yes) 22105+ cat >> confdefs.h <<\EOF 22106 #define HAVE_HTONL 1 22107-_ACEOF 22108+EOF 22109 22110 ac_cv_func_htonl=yes 22111 ;; 22112- 22113- *) 22114- 22115+ 22116+ *) 22117+ 22118 unset ac_cv_lib_socket_htonl 22119 unset ac_cv_lib_socket___htonl 22120 unset found 22121- echo "$as_me:$LINENO: checking for htonl in -lsocket" >&5 22122-echo $ECHO_N "checking for htonl in -lsocket... $ECHO_C" >&6 22123-if test "${ac_cv_lib_socket_htonl+set}" = set; then 22124- echo $ECHO_N "(cached) $ECHO_C" >&6 22125+ echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 22126+echo "configure:14373: checking for htonl in -lsocket" >&5 22127+ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'` 22128+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 22129+ echo $ac_n "(cached) $ac_c" 1>&6 22130 else 22131- ac_check_lib_save_LIBS=$LIBS 22132+ ac_save_LIBS="$LIBS" 22133 LIBS="-lsocket $LIBS" 22134-cat >conftest.$ac_ext <<_ACEOF 22135-/* confdefs.h. */ 22136-_ACEOF 22137-cat confdefs.h >>conftest.$ac_ext 22138-cat >>conftest.$ac_ext <<_ACEOF 22139-/* end confdefs.h. */ 22140- 22141+cat > conftest.$ac_ext <<EOF 22142+#line 14381 "configure" 22143+#include "confdefs.h" 22144 /* Override any gcc2 internal prototype to avoid an error. */ 22145-#ifdef __cplusplus 22146-extern "C" 22147-#endif 22148 /* We use char because int might match the return type of a gcc2 22149- builtin and then its argument prototype would still apply. */ 22150-char htonl (); 22151-int 22152-main () 22153-{ 22154-htonl (); 22155- ; 22156- return 0; 22157-} 22158-_ACEOF 22159-rm -f conftest.$ac_objext conftest$ac_exeext 22160-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22161- (eval $ac_link) 2>conftest.er1 22162- ac_status=$? 22163- grep -v '^ *+' conftest.er1 >conftest.err 22164- rm -f conftest.er1 22165- cat conftest.err >&5 22166- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22167- (exit $ac_status); } && 22168- { ac_try='test -z "$ac_c_werror_flag" 22169- || test ! -s conftest.err' 22170- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22171- (eval $ac_try) 2>&5 22172- ac_status=$? 22173- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22174- (exit $ac_status); }; } && 22175- { ac_try='test -s conftest$ac_exeext' 22176- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22177- (eval $ac_try) 2>&5 22178- ac_status=$? 22179- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22180- (exit $ac_status); }; }; then 22181- ac_cv_lib_socket_htonl=yes 22182-else 22183- echo "$as_me: failed program was:" >&5 22184-sed 's/^/| /' conftest.$ac_ext >&5 22185- 22186-ac_cv_lib_socket_htonl=no 22187-fi 22188-rm -f conftest.err conftest.$ac_objext \ 22189- conftest$ac_exeext conftest.$ac_ext 22190-LIBS=$ac_check_lib_save_LIBS 22191-fi 22192-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_htonl" >&5 22193-echo "${ECHO_T}$ac_cv_lib_socket_htonl" >&6 22194-if test $ac_cv_lib_socket_htonl = yes; then 22195+ builtin and then its argument prototype would still apply. */ 22196+char htonl(); 22197+ 22198+int main() { 22199+htonl() 22200+; return 0; } 22201+EOF 22202+if { (eval echo configure:14392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22203+ rm -rf conftest* 22204+ eval "ac_cv_lib_$ac_lib_var=yes" 22205+else 22206+ echo "configure: failed program was:" >&5 22207+ cat conftest.$ac_ext >&5 22208+ rm -rf conftest* 22209+ eval "ac_cv_lib_$ac_lib_var=no" 22210+fi 22211+rm -f conftest* 22212+LIBS="$ac_save_LIBS" 22213+ 22214+fi 22215+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 22216+ echo "$ac_t""yes" 1>&6 22217 found=yes 22218 else 22219+ echo "$ac_t""no" 1>&6 22220 22221- echo "$as_me:$LINENO: checking for __htonl in -lsocket" >&5 22222-echo $ECHO_N "checking for __htonl in -lsocket... $ECHO_C" >&6 22223-if test "${ac_cv_lib_socket___htonl+set}" = set; then 22224- echo $ECHO_N "(cached) $ECHO_C" >&6 22225+ echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 22226+echo "configure:14412: checking for __htonl in -lsocket" >&5 22227+ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'` 22228+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 22229+ echo $ac_n "(cached) $ac_c" 1>&6 22230 else 22231- ac_check_lib_save_LIBS=$LIBS 22232+ ac_save_LIBS="$LIBS" 22233 LIBS="-lsocket $LIBS" 22234-cat >conftest.$ac_ext <<_ACEOF 22235-/* confdefs.h. */ 22236-_ACEOF 22237-cat confdefs.h >>conftest.$ac_ext 22238-cat >>conftest.$ac_ext <<_ACEOF 22239-/* end confdefs.h. */ 22240- 22241+cat > conftest.$ac_ext <<EOF 22242+#line 14420 "configure" 22243+#include "confdefs.h" 22244 /* Override any gcc2 internal prototype to avoid an error. */ 22245-#ifdef __cplusplus 22246-extern "C" 22247-#endif 22248 /* We use char because int might match the return type of a gcc2 22249- builtin and then its argument prototype would still apply. */ 22250-char __htonl (); 22251-int 22252-main () 22253-{ 22254-__htonl (); 22255- ; 22256- return 0; 22257-} 22258-_ACEOF 22259-rm -f conftest.$ac_objext conftest$ac_exeext 22260-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22261- (eval $ac_link) 2>conftest.er1 22262- ac_status=$? 22263- grep -v '^ *+' conftest.er1 >conftest.err 22264- rm -f conftest.er1 22265- cat conftest.err >&5 22266- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22267- (exit $ac_status); } && 22268- { ac_try='test -z "$ac_c_werror_flag" 22269- || test ! -s conftest.err' 22270- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22271- (eval $ac_try) 2>&5 22272- ac_status=$? 22273- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22274- (exit $ac_status); }; } && 22275- { ac_try='test -s conftest$ac_exeext' 22276- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22277- (eval $ac_try) 2>&5 22278- ac_status=$? 22279- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22280- (exit $ac_status); }; }; then 22281- ac_cv_lib_socket___htonl=yes 22282-else 22283- echo "$as_me: failed program was:" >&5 22284-sed 's/^/| /' conftest.$ac_ext >&5 22285- 22286-ac_cv_lib_socket___htonl=no 22287-fi 22288-rm -f conftest.err conftest.$ac_objext \ 22289- conftest$ac_exeext conftest.$ac_ext 22290-LIBS=$ac_check_lib_save_LIBS 22291-fi 22292-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___htonl" >&5 22293-echo "${ECHO_T}$ac_cv_lib_socket___htonl" >&6 22294-if test $ac_cv_lib_socket___htonl = yes; then 22295- found=yes 22296+ builtin and then its argument prototype would still apply. */ 22297+char __htonl(); 22298+ 22299+int main() { 22300+__htonl() 22301+; return 0; } 22302+EOF 22303+if { (eval echo configure:14431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22304+ rm -rf conftest* 22305+ eval "ac_cv_lib_$ac_lib_var=yes" 22306 else 22307- found=no 22308+ echo "configure: failed program was:" >&5 22309+ cat conftest.$ac_ext >&5 22310+ rm -rf conftest* 22311+ eval "ac_cv_lib_$ac_lib_var=no" 22312 fi 22313+rm -f conftest* 22314+LIBS="$ac_save_LIBS" 22315 22316+fi 22317+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 22318+ echo "$ac_t""yes" 1>&6 22319+ found=yes 22320+else 22321+ echo "$ac_t""no" 1>&6 22322+found=no 22323+fi 22324 22325+ 22326 fi 22327 22328 22329@@ -19166,425 +14458,254 @@ 22330 if test "$cross_compiling" = yes; then 22331 found=no 22332 else 22333- cat >conftest.$ac_ext <<_ACEOF 22334-/* confdefs.h. */ 22335-_ACEOF 22336-cat confdefs.h >>conftest.$ac_ext 22337-cat >>conftest.$ac_ext <<_ACEOF 22338-/* end confdefs.h. */ 22339+ cat > conftest.$ac_ext <<EOF 22340+#line 14463 "configure" 22341+#include "confdefs.h" 22342 main() { return (0); } 22343-_ACEOF 22344-rm -f conftest$ac_exeext 22345-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22346- (eval $ac_link) 2>&5 22347- ac_status=$? 22348- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22349- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 22350- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22351- (eval $ac_try) 2>&5 22352- ac_status=$? 22353- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22354- (exit $ac_status); }; }; then 22355+EOF 22356+if { (eval echo configure:14467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 22357+then 22358 found=yes 22359 else 22360- echo "$as_me: program exited with status $ac_status" >&5 22361-echo "$as_me: failed program was:" >&5 22362-sed 's/^/| /' conftest.$ac_ext >&5 22363- 22364-( exit $ac_status ) 22365-found=no 22366+ echo "configure: failed program was:" >&5 22367+ cat conftest.$ac_ext >&5 22368+ rm -fr conftest* 22369+ found=no 22370 fi 22371-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 22372+rm -fr conftest* 22373 fi 22374+ 22375 LIBS=$ac_libs 22376 fi 22377 22378 if test "$found" = "yes"; then 22379- 22380- 22381+ 22382+ 22383 case socket in 22384 c|c_r|pthread*) ;; 22385- *) 22386- LIBS="-lsocket $LIBS" 22387+ *) 22388+ LIBS="-lsocket $LIBS" 22389 ;; 22390 esac 22391 22392 22393- 22394-cat >>confdefs.h <<\_ACEOF 22395+ cat >> confdefs.h <<\EOF 22396 #define HAVE_HTONL 1 22397-_ACEOF 22398- 22399+EOF 22400 22401-cat >>confdefs.h <<\_ACEOF 22402+ cat >> confdefs.h <<\EOF 22403 #define HAVE_LIBSOCKET 1 22404-_ACEOF 22405+EOF 22406 22407 ac_cv_func_htonl=yes 22408 else 22409- 22410+ 22411 : 22412 22413 fi 22414- 22415+ 22416 ;; 22417- 22418+ 22419 esac 22420 22421 22422 unset ac_cv_func_gethostname 22423 unset ac_cv_func___gethostname 22424 unset found 22425- 22426- echo "$as_me:$LINENO: checking for gethostname" >&5 22427-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6 22428-if test "${ac_cv_func_gethostname+set}" = set; then 22429- echo $ECHO_N "(cached) $ECHO_C" >&6 22430-else 22431- cat >conftest.$ac_ext <<_ACEOF 22432-/* confdefs.h. */ 22433-_ACEOF 22434-cat confdefs.h >>conftest.$ac_ext 22435-cat >>conftest.$ac_ext <<_ACEOF 22436-/* end confdefs.h. */ 22437-/* Define gethostname to an innocuous variant, in case <limits.h> declares gethostname. 22438- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 22439-#define gethostname innocuous_gethostname 22440- 22441+ 22442+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 22443+echo "configure:14518: checking for gethostname" >&5 22444+if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then 22445+ echo $ac_n "(cached) $ac_c" 1>&6 22446+else 22447+ cat > conftest.$ac_ext <<EOF 22448+#line 14523 "configure" 22449+#include "confdefs.h" 22450 /* System header to define __stub macros and hopefully few prototypes, 22451- which can conflict with char gethostname (); below. 22452- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 22453- <limits.h> exists even on freestanding compilers. */ 22454- 22455-#ifdef __STDC__ 22456-# include <limits.h> 22457-#else 22458-# include <assert.h> 22459-#endif 22460- 22461-#undef gethostname 22462- 22463+ which can conflict with char gethostname(); below. */ 22464+#include <assert.h> 22465 /* Override any gcc2 internal prototype to avoid an error. */ 22466-#ifdef __cplusplus 22467-extern "C" 22468-{ 22469-#endif 22470 /* We use char because int might match the return type of a gcc2 22471- builtin and then its argument prototype would still apply. */ 22472-char gethostname (); 22473+ builtin and then its argument prototype would still apply. */ 22474+char gethostname(); 22475+ 22476+int main() { 22477+ 22478 /* The GNU C library defines this for functions which it implements 22479 to always fail with ENOSYS. Some functions are actually named 22480 something starting with __ and the normal name is an alias. */ 22481 #if defined (__stub_gethostname) || defined (__stub___gethostname) 22482 choke me 22483 #else 22484-char (*f) () = gethostname; 22485-#endif 22486-#ifdef __cplusplus 22487-} 22488+gethostname(); 22489 #endif 22490 22491-int 22492-main () 22493-{ 22494-return f != gethostname; 22495- ; 22496- return 0; 22497-} 22498-_ACEOF 22499-rm -f conftest.$ac_objext conftest$ac_exeext 22500-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22501- (eval $ac_link) 2>conftest.er1 22502- ac_status=$? 22503- grep -v '^ *+' conftest.er1 >conftest.err 22504- rm -f conftest.er1 22505- cat conftest.err >&5 22506- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22507- (exit $ac_status); } && 22508- { ac_try='test -z "$ac_c_werror_flag" 22509- || test ! -s conftest.err' 22510- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22511- (eval $ac_try) 2>&5 22512- ac_status=$? 22513- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22514- (exit $ac_status); }; } && 22515- { ac_try='test -s conftest$ac_exeext' 22516- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22517- (eval $ac_try) 2>&5 22518- ac_status=$? 22519- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22520- (exit $ac_status); }; }; then 22521- ac_cv_func_gethostname=yes 22522-else 22523- echo "$as_me: failed program was:" >&5 22524-sed 's/^/| /' conftest.$ac_ext >&5 22525- 22526-ac_cv_func_gethostname=no 22527-fi 22528-rm -f conftest.err conftest.$ac_objext \ 22529- conftest$ac_exeext conftest.$ac_ext 22530-fi 22531-echo "$as_me:$LINENO: result: $ac_cv_func_gethostname" >&5 22532-echo "${ECHO_T}$ac_cv_func_gethostname" >&6 22533-if test $ac_cv_func_gethostname = yes; then 22534- found=yes 22535+; return 0; } 22536+EOF 22537+if { (eval echo configure:14546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22538+ rm -rf conftest* 22539+ eval "ac_cv_func_gethostname=yes" 22540 else 22541- echo "$as_me:$LINENO: checking for __gethostname" >&5 22542-echo $ECHO_N "checking for __gethostname... $ECHO_C" >&6 22543-if test "${ac_cv_func___gethostname+set}" = set; then 22544- echo $ECHO_N "(cached) $ECHO_C" >&6 22545-else 22546- cat >conftest.$ac_ext <<_ACEOF 22547-/* confdefs.h. */ 22548-_ACEOF 22549-cat confdefs.h >>conftest.$ac_ext 22550-cat >>conftest.$ac_ext <<_ACEOF 22551-/* end confdefs.h. */ 22552-/* Define __gethostname to an innocuous variant, in case <limits.h> declares __gethostname. 22553- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 22554-#define __gethostname innocuous___gethostname 22555+ echo "configure: failed program was:" >&5 22556+ cat conftest.$ac_ext >&5 22557+ rm -rf conftest* 22558+ eval "ac_cv_func_gethostname=no" 22559+fi 22560+rm -f conftest* 22561+fi 22562 22563+if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then 22564+ echo "$ac_t""yes" 1>&6 22565+ found=yes 22566+else 22567+ echo "$ac_t""no" 1>&6 22568+ echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 22569+echo "configure:14564: checking for __gethostname" >&5 22570+if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then 22571+ echo $ac_n "(cached) $ac_c" 1>&6 22572+else 22573+ cat > conftest.$ac_ext <<EOF 22574+#line 14569 "configure" 22575+#include "confdefs.h" 22576 /* System header to define __stub macros and hopefully few prototypes, 22577- which can conflict with char __gethostname (); below. 22578- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 22579- <limits.h> exists even on freestanding compilers. */ 22580- 22581-#ifdef __STDC__ 22582-# include <limits.h> 22583-#else 22584-# include <assert.h> 22585-#endif 22586- 22587-#undef __gethostname 22588- 22589+ which can conflict with char __gethostname(); below. */ 22590+#include <assert.h> 22591 /* Override any gcc2 internal prototype to avoid an error. */ 22592-#ifdef __cplusplus 22593-extern "C" 22594-{ 22595-#endif 22596 /* We use char because int might match the return type of a gcc2 22597- builtin and then its argument prototype would still apply. */ 22598-char __gethostname (); 22599+ builtin and then its argument prototype would still apply. */ 22600+char __gethostname(); 22601+ 22602+int main() { 22603+ 22604 /* The GNU C library defines this for functions which it implements 22605 to always fail with ENOSYS. Some functions are actually named 22606 something starting with __ and the normal name is an alias. */ 22607 #if defined (__stub___gethostname) || defined (__stub_____gethostname) 22608 choke me 22609 #else 22610-char (*f) () = __gethostname; 22611-#endif 22612-#ifdef __cplusplus 22613-} 22614+__gethostname(); 22615 #endif 22616 22617-int 22618-main () 22619-{ 22620-return f != __gethostname; 22621- ; 22622- return 0; 22623-} 22624-_ACEOF 22625-rm -f conftest.$ac_objext conftest$ac_exeext 22626-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22627- (eval $ac_link) 2>conftest.er1 22628- ac_status=$? 22629- grep -v '^ *+' conftest.er1 >conftest.err 22630- rm -f conftest.er1 22631- cat conftest.err >&5 22632- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22633- (exit $ac_status); } && 22634- { ac_try='test -z "$ac_c_werror_flag" 22635- || test ! -s conftest.err' 22636- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22637- (eval $ac_try) 2>&5 22638- ac_status=$? 22639- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22640- (exit $ac_status); }; } && 22641- { ac_try='test -s conftest$ac_exeext' 22642- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22643- (eval $ac_try) 2>&5 22644- ac_status=$? 22645- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22646- (exit $ac_status); }; }; then 22647- ac_cv_func___gethostname=yes 22648-else 22649- echo "$as_me: failed program was:" >&5 22650-sed 's/^/| /' conftest.$ac_ext >&5 22651- 22652-ac_cv_func___gethostname=no 22653-fi 22654-rm -f conftest.err conftest.$ac_objext \ 22655- conftest$ac_exeext conftest.$ac_ext 22656-fi 22657-echo "$as_me:$LINENO: result: $ac_cv_func___gethostname" >&5 22658-echo "${ECHO_T}$ac_cv_func___gethostname" >&6 22659-if test $ac_cv_func___gethostname = yes; then 22660- found=yes 22661+; return 0; } 22662+EOF 22663+if { (eval echo configure:14592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22664+ rm -rf conftest* 22665+ eval "ac_cv_func___gethostname=yes" 22666 else 22667- found=no 22668+ echo "configure: failed program was:" >&5 22669+ cat conftest.$ac_ext >&5 22670+ rm -rf conftest* 22671+ eval "ac_cv_func___gethostname=no" 22672+fi 22673+rm -f conftest* 22674 fi 22675 22676+if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then 22677+ echo "$ac_t""yes" 1>&6 22678+ found=yes 22679+else 22680+ echo "$ac_t""no" 1>&6 22681+found=no 22682+fi 22683+ 22684 fi 22685 22686-cat >> confdefs.h <<\EOF 22687-#define SUHOSIN_PATCH 1 22688-EOF 22689 22690 case $found in 22691- yes) 22692- 22693-cat >>confdefs.h <<\_ACEOF 22694+ yes) 22695+ cat >> confdefs.h <<\EOF 22696 #define HAVE_GETHOSTNAME 1 22697-_ACEOF 22698+EOF 22699 22700 ac_cv_func_gethostname=yes 22701 ;; 22702- 22703- *) 22704- 22705+ 22706+ *) 22707+ 22708 unset ac_cv_lib_nsl_gethostname 22709 unset ac_cv_lib_nsl___gethostname 22710 unset found 22711- echo "$as_me:$LINENO: checking for gethostname in -lnsl" >&5 22712-echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 22713-if test "${ac_cv_lib_nsl_gethostname+set}" = set; then 22714- echo $ECHO_N "(cached) $ECHO_C" >&6 22715+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 22716+echo "configure:14630: checking for gethostname in -lnsl" >&5 22717+ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` 22718+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 22719+ echo $ac_n "(cached) $ac_c" 1>&6 22720 else 22721- ac_check_lib_save_LIBS=$LIBS 22722+ ac_save_LIBS="$LIBS" 22723 LIBS="-lnsl $LIBS" 22724-cat >conftest.$ac_ext <<_ACEOF 22725-/* confdefs.h. */ 22726-_ACEOF 22727-cat confdefs.h >>conftest.$ac_ext 22728-cat >>conftest.$ac_ext <<_ACEOF 22729-/* end confdefs.h. */ 22730- 22731+cat > conftest.$ac_ext <<EOF 22732+#line 14638 "configure" 22733+#include "confdefs.h" 22734 /* Override any gcc2 internal prototype to avoid an error. */ 22735-#ifdef __cplusplus 22736-extern "C" 22737-#endif 22738 /* We use char because int might match the return type of a gcc2 22739- builtin and then its argument prototype would still apply. */ 22740-char gethostname (); 22741-int 22742-main () 22743-{ 22744-gethostname (); 22745- ; 22746- return 0; 22747-} 22748-_ACEOF 22749-rm -f conftest.$ac_objext conftest$ac_exeext 22750-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22751- (eval $ac_link) 2>conftest.er1 22752- ac_status=$? 22753- grep -v '^ *+' conftest.er1 >conftest.err 22754- rm -f conftest.er1 22755- cat conftest.err >&5 22756- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22757- (exit $ac_status); } && 22758- { ac_try='test -z "$ac_c_werror_flag" 22759- || test ! -s conftest.err' 22760- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22761- (eval $ac_try) 2>&5 22762- ac_status=$? 22763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22764- (exit $ac_status); }; } && 22765- { ac_try='test -s conftest$ac_exeext' 22766- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22767- (eval $ac_try) 2>&5 22768- ac_status=$? 22769- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22770- (exit $ac_status); }; }; then 22771- ac_cv_lib_nsl_gethostname=yes 22772-else 22773- echo "$as_me: failed program was:" >&5 22774-sed 's/^/| /' conftest.$ac_ext >&5 22775- 22776-ac_cv_lib_nsl_gethostname=no 22777-fi 22778-rm -f conftest.err conftest.$ac_objext \ 22779- conftest$ac_exeext conftest.$ac_ext 22780-LIBS=$ac_check_lib_save_LIBS 22781-fi 22782-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostname" >&5 22783-echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 22784-if test $ac_cv_lib_nsl_gethostname = yes; then 22785+ builtin and then its argument prototype would still apply. */ 22786+char gethostname(); 22787+ 22788+int main() { 22789+gethostname() 22790+; return 0; } 22791+EOF 22792+if { (eval echo configure:14649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22793+ rm -rf conftest* 22794+ eval "ac_cv_lib_$ac_lib_var=yes" 22795+else 22796+ echo "configure: failed program was:" >&5 22797+ cat conftest.$ac_ext >&5 22798+ rm -rf conftest* 22799+ eval "ac_cv_lib_$ac_lib_var=no" 22800+fi 22801+rm -f conftest* 22802+LIBS="$ac_save_LIBS" 22803+ 22804+fi 22805+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 22806+ echo "$ac_t""yes" 1>&6 22807 found=yes 22808 else 22809+ echo "$ac_t""no" 1>&6 22810 22811- echo "$as_me:$LINENO: checking for __gethostname in -lnsl" >&5 22812-echo $ECHO_N "checking for __gethostname in -lnsl... $ECHO_C" >&6 22813-if test "${ac_cv_lib_nsl___gethostname+set}" = set; then 22814- echo $ECHO_N "(cached) $ECHO_C" >&6 22815+ echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 22816+echo "configure:14669: checking for __gethostname in -lnsl" >&5 22817+ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` 22818+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 22819+ echo $ac_n "(cached) $ac_c" 1>&6 22820 else 22821- ac_check_lib_save_LIBS=$LIBS 22822+ ac_save_LIBS="$LIBS" 22823 LIBS="-lnsl $LIBS" 22824-cat >conftest.$ac_ext <<_ACEOF 22825-/* confdefs.h. */ 22826-_ACEOF 22827-cat confdefs.h >>conftest.$ac_ext 22828-cat >>conftest.$ac_ext <<_ACEOF 22829-/* end confdefs.h. */ 22830- 22831+cat > conftest.$ac_ext <<EOF 22832+#line 14677 "configure" 22833+#include "confdefs.h" 22834 /* Override any gcc2 internal prototype to avoid an error. */ 22835-#ifdef __cplusplus 22836-extern "C" 22837-#endif 22838 /* We use char because int might match the return type of a gcc2 22839- builtin and then its argument prototype would still apply. */ 22840-char __gethostname (); 22841-int 22842-main () 22843-{ 22844-__gethostname (); 22845- ; 22846- return 0; 22847-} 22848-_ACEOF 22849-rm -f conftest.$ac_objext conftest$ac_exeext 22850-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22851- (eval $ac_link) 2>conftest.er1 22852- ac_status=$? 22853- grep -v '^ *+' conftest.er1 >conftest.err 22854- rm -f conftest.er1 22855- cat conftest.err >&5 22856- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22857- (exit $ac_status); } && 22858- { ac_try='test -z "$ac_c_werror_flag" 22859- || test ! -s conftest.err' 22860- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22861- (eval $ac_try) 2>&5 22862- ac_status=$? 22863- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22864- (exit $ac_status); }; } && 22865- { ac_try='test -s conftest$ac_exeext' 22866- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22867- (eval $ac_try) 2>&5 22868- ac_status=$? 22869- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22870- (exit $ac_status); }; }; then 22871- ac_cv_lib_nsl___gethostname=yes 22872-else 22873- echo "$as_me: failed program was:" >&5 22874-sed 's/^/| /' conftest.$ac_ext >&5 22875- 22876-ac_cv_lib_nsl___gethostname=no 22877-fi 22878-rm -f conftest.err conftest.$ac_objext \ 22879- conftest$ac_exeext conftest.$ac_ext 22880-LIBS=$ac_check_lib_save_LIBS 22881-fi 22882-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostname" >&5 22883-echo "${ECHO_T}$ac_cv_lib_nsl___gethostname" >&6 22884-if test $ac_cv_lib_nsl___gethostname = yes; then 22885- found=yes 22886+ builtin and then its argument prototype would still apply. */ 22887+char __gethostname(); 22888+ 22889+int main() { 22890+__gethostname() 22891+; return 0; } 22892+EOF 22893+if { (eval echo configure:14688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 22894+ rm -rf conftest* 22895+ eval "ac_cv_lib_$ac_lib_var=yes" 22896 else 22897- found=no 22898+ echo "configure: failed program was:" >&5 22899+ cat conftest.$ac_ext >&5 22900+ rm -rf conftest* 22901+ eval "ac_cv_lib_$ac_lib_var=no" 22902 fi 22903+rm -f conftest* 22904+LIBS="$ac_save_LIBS" 22905 22906+fi 22907+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 22908+ echo "$ac_t""yes" 1>&6 22909+ found=yes 22910+else 22911+ echo "$ac_t""no" 1>&6 22912+found=no 22913+fi 22914 22915+ 22916 fi 22917 22918 22919@@ -19594,422 +14715,254 @@ 22920 if test "$cross_compiling" = yes; then 22921 found=no 22922 else 22923- cat >conftest.$ac_ext <<_ACEOF 22924-/* confdefs.h. */ 22925-_ACEOF 22926-cat confdefs.h >>conftest.$ac_ext 22927-cat >>conftest.$ac_ext <<_ACEOF 22928-/* end confdefs.h. */ 22929+ cat > conftest.$ac_ext <<EOF 22930+#line 14720 "configure" 22931+#include "confdefs.h" 22932 main() { return (0); } 22933-_ACEOF 22934-rm -f conftest$ac_exeext 22935-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 22936- (eval $ac_link) 2>&5 22937- ac_status=$? 22938- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22939- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 22940- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 22941- (eval $ac_try) 2>&5 22942- ac_status=$? 22943- echo "$as_me:$LINENO: \$? = $ac_status" >&5 22944- (exit $ac_status); }; }; then 22945+EOF 22946+if { (eval echo configure:14724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 22947+then 22948 found=yes 22949 else 22950- echo "$as_me: program exited with status $ac_status" >&5 22951-echo "$as_me: failed program was:" >&5 22952-sed 's/^/| /' conftest.$ac_ext >&5 22953- 22954-( exit $ac_status ) 22955-found=no 22956+ echo "configure: failed program was:" >&5 22957+ cat conftest.$ac_ext >&5 22958+ rm -fr conftest* 22959+ found=no 22960 fi 22961-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 22962+rm -fr conftest* 22963 fi 22964+ 22965 LIBS=$ac_libs 22966 fi 22967 22968 if test "$found" = "yes"; then 22969- 22970- 22971+ 22972+ 22973 case nsl in 22974 c|c_r|pthread*) ;; 22975- *) 22976- LIBS="-lnsl $LIBS" 22977+ *) 22978+ LIBS="-lnsl $LIBS" 22979 ;; 22980 esac 22981 22982 22983- 22984-cat >>confdefs.h <<\_ACEOF 22985+ cat >> confdefs.h <<\EOF 22986 #define HAVE_GETHOSTNAME 1 22987-_ACEOF 22988- 22989+EOF 22990 22991-cat >>confdefs.h <<\_ACEOF 22992+ cat >> confdefs.h <<\EOF 22993 #define HAVE_LIBNSL 1 22994-_ACEOF 22995+EOF 22996 22997 ac_cv_func_gethostname=yes 22998 else 22999- 23000+ 23001 : 23002 23003 fi 23004- 23005+ 23006 ;; 23007- 23008+ 23009 esac 23010 23011 23012 unset ac_cv_func_gethostbyaddr 23013 unset ac_cv_func___gethostbyaddr 23014 unset found 23015- 23016- echo "$as_me:$LINENO: checking for gethostbyaddr" >&5 23017-echo $ECHO_N "checking for gethostbyaddr... $ECHO_C" >&6 23018-if test "${ac_cv_func_gethostbyaddr+set}" = set; then 23019- echo $ECHO_N "(cached) $ECHO_C" >&6 23020-else 23021- cat >conftest.$ac_ext <<_ACEOF 23022-/* confdefs.h. */ 23023-_ACEOF 23024-cat confdefs.h >>conftest.$ac_ext 23025-cat >>conftest.$ac_ext <<_ACEOF 23026-/* end confdefs.h. */ 23027-/* Define gethostbyaddr to an innocuous variant, in case <limits.h> declares gethostbyaddr. 23028- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 23029-#define gethostbyaddr innocuous_gethostbyaddr 23030- 23031+ 23032+ echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 23033+echo "configure:14775: checking for gethostbyaddr" >&5 23034+if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then 23035+ echo $ac_n "(cached) $ac_c" 1>&6 23036+else 23037+ cat > conftest.$ac_ext <<EOF 23038+#line 14780 "configure" 23039+#include "confdefs.h" 23040 /* System header to define __stub macros and hopefully few prototypes, 23041- which can conflict with char gethostbyaddr (); below. 23042- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 23043- <limits.h> exists even on freestanding compilers. */ 23044- 23045-#ifdef __STDC__ 23046-# include <limits.h> 23047-#else 23048-# include <assert.h> 23049-#endif 23050- 23051-#undef gethostbyaddr 23052- 23053+ which can conflict with char gethostbyaddr(); below. */ 23054+#include <assert.h> 23055 /* Override any gcc2 internal prototype to avoid an error. */ 23056-#ifdef __cplusplus 23057-extern "C" 23058-{ 23059-#endif 23060 /* We use char because int might match the return type of a gcc2 23061- builtin and then its argument prototype would still apply. */ 23062-char gethostbyaddr (); 23063+ builtin and then its argument prototype would still apply. */ 23064+char gethostbyaddr(); 23065+ 23066+int main() { 23067+ 23068 /* The GNU C library defines this for functions which it implements 23069 to always fail with ENOSYS. Some functions are actually named 23070 something starting with __ and the normal name is an alias. */ 23071 #if defined (__stub_gethostbyaddr) || defined (__stub___gethostbyaddr) 23072 choke me 23073 #else 23074-char (*f) () = gethostbyaddr; 23075-#endif 23076-#ifdef __cplusplus 23077-} 23078+gethostbyaddr(); 23079 #endif 23080 23081-int 23082-main () 23083-{ 23084-return f != gethostbyaddr; 23085- ; 23086- return 0; 23087-} 23088-_ACEOF 23089-rm -f conftest.$ac_objext conftest$ac_exeext 23090-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23091- (eval $ac_link) 2>conftest.er1 23092- ac_status=$? 23093- grep -v '^ *+' conftest.er1 >conftest.err 23094- rm -f conftest.er1 23095- cat conftest.err >&5 23096- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23097- (exit $ac_status); } && 23098- { ac_try='test -z "$ac_c_werror_flag" 23099- || test ! -s conftest.err' 23100- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23101- (eval $ac_try) 2>&5 23102- ac_status=$? 23103- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23104- (exit $ac_status); }; } && 23105- { ac_try='test -s conftest$ac_exeext' 23106- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23107- (eval $ac_try) 2>&5 23108- ac_status=$? 23109- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23110- (exit $ac_status); }; }; then 23111- ac_cv_func_gethostbyaddr=yes 23112-else 23113- echo "$as_me: failed program was:" >&5 23114-sed 's/^/| /' conftest.$ac_ext >&5 23115- 23116-ac_cv_func_gethostbyaddr=no 23117-fi 23118-rm -f conftest.err conftest.$ac_objext \ 23119- conftest$ac_exeext conftest.$ac_ext 23120-fi 23121-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyaddr" >&5 23122-echo "${ECHO_T}$ac_cv_func_gethostbyaddr" >&6 23123-if test $ac_cv_func_gethostbyaddr = yes; then 23124- found=yes 23125+; return 0; } 23126+EOF 23127+if { (eval echo configure:14803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23128+ rm -rf conftest* 23129+ eval "ac_cv_func_gethostbyaddr=yes" 23130 else 23131- echo "$as_me:$LINENO: checking for __gethostbyaddr" >&5 23132-echo $ECHO_N "checking for __gethostbyaddr... $ECHO_C" >&6 23133-if test "${ac_cv_func___gethostbyaddr+set}" = set; then 23134- echo $ECHO_N "(cached) $ECHO_C" >&6 23135-else 23136- cat >conftest.$ac_ext <<_ACEOF 23137-/* confdefs.h. */ 23138-_ACEOF 23139-cat confdefs.h >>conftest.$ac_ext 23140-cat >>conftest.$ac_ext <<_ACEOF 23141-/* end confdefs.h. */ 23142-/* Define __gethostbyaddr to an innocuous variant, in case <limits.h> declares __gethostbyaddr. 23143- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 23144-#define __gethostbyaddr innocuous___gethostbyaddr 23145+ echo "configure: failed program was:" >&5 23146+ cat conftest.$ac_ext >&5 23147+ rm -rf conftest* 23148+ eval "ac_cv_func_gethostbyaddr=no" 23149+fi 23150+rm -f conftest* 23151+fi 23152 23153+if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then 23154+ echo "$ac_t""yes" 1>&6 23155+ found=yes 23156+else 23157+ echo "$ac_t""no" 1>&6 23158+ echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 23159+echo "configure:14821: checking for __gethostbyaddr" >&5 23160+if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then 23161+ echo $ac_n "(cached) $ac_c" 1>&6 23162+else 23163+ cat > conftest.$ac_ext <<EOF 23164+#line 14826 "configure" 23165+#include "confdefs.h" 23166 /* System header to define __stub macros and hopefully few prototypes, 23167- which can conflict with char __gethostbyaddr (); below. 23168- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 23169- <limits.h> exists even on freestanding compilers. */ 23170- 23171-#ifdef __STDC__ 23172-# include <limits.h> 23173-#else 23174-# include <assert.h> 23175-#endif 23176- 23177-#undef __gethostbyaddr 23178- 23179+ which can conflict with char __gethostbyaddr(); below. */ 23180+#include <assert.h> 23181 /* Override any gcc2 internal prototype to avoid an error. */ 23182-#ifdef __cplusplus 23183-extern "C" 23184-{ 23185-#endif 23186 /* We use char because int might match the return type of a gcc2 23187- builtin and then its argument prototype would still apply. */ 23188-char __gethostbyaddr (); 23189+ builtin and then its argument prototype would still apply. */ 23190+char __gethostbyaddr(); 23191+ 23192+int main() { 23193+ 23194 /* The GNU C library defines this for functions which it implements 23195 to always fail with ENOSYS. Some functions are actually named 23196 something starting with __ and the normal name is an alias. */ 23197 #if defined (__stub___gethostbyaddr) || defined (__stub_____gethostbyaddr) 23198 choke me 23199 #else 23200-char (*f) () = __gethostbyaddr; 23201-#endif 23202-#ifdef __cplusplus 23203-} 23204+__gethostbyaddr(); 23205 #endif 23206 23207-int 23208-main () 23209-{ 23210-return f != __gethostbyaddr; 23211- ; 23212- return 0; 23213-} 23214-_ACEOF 23215-rm -f conftest.$ac_objext conftest$ac_exeext 23216-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23217- (eval $ac_link) 2>conftest.er1 23218- ac_status=$? 23219- grep -v '^ *+' conftest.er1 >conftest.err 23220- rm -f conftest.er1 23221- cat conftest.err >&5 23222- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23223- (exit $ac_status); } && 23224- { ac_try='test -z "$ac_c_werror_flag" 23225- || test ! -s conftest.err' 23226- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23227- (eval $ac_try) 2>&5 23228- ac_status=$? 23229- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23230- (exit $ac_status); }; } && 23231- { ac_try='test -s conftest$ac_exeext' 23232- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23233- (eval $ac_try) 2>&5 23234- ac_status=$? 23235- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23236- (exit $ac_status); }; }; then 23237- ac_cv_func___gethostbyaddr=yes 23238-else 23239- echo "$as_me: failed program was:" >&5 23240-sed 's/^/| /' conftest.$ac_ext >&5 23241- 23242-ac_cv_func___gethostbyaddr=no 23243-fi 23244-rm -f conftest.err conftest.$ac_objext \ 23245- conftest$ac_exeext conftest.$ac_ext 23246-fi 23247-echo "$as_me:$LINENO: result: $ac_cv_func___gethostbyaddr" >&5 23248-echo "${ECHO_T}$ac_cv_func___gethostbyaddr" >&6 23249-if test $ac_cv_func___gethostbyaddr = yes; then 23250- found=yes 23251+; return 0; } 23252+EOF 23253+if { (eval echo configure:14849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23254+ rm -rf conftest* 23255+ eval "ac_cv_func___gethostbyaddr=yes" 23256 else 23257- found=no 23258+ echo "configure: failed program was:" >&5 23259+ cat conftest.$ac_ext >&5 23260+ rm -rf conftest* 23261+ eval "ac_cv_func___gethostbyaddr=no" 23262+fi 23263+rm -f conftest* 23264 fi 23265 23266+if eval "test \"`echo '$ac_cv_func_'__gethostbyaddr`\" = yes"; then 23267+ echo "$ac_t""yes" 1>&6 23268+ found=yes 23269+else 23270+ echo "$ac_t""no" 1>&6 23271+found=no 23272+fi 23273+ 23274 fi 23275 23276 23277 case $found in 23278- yes) 23279- 23280-cat >>confdefs.h <<\_ACEOF 23281+ yes) 23282+ cat >> confdefs.h <<\EOF 23283 #define HAVE_GETHOSTBYADDR 1 23284-_ACEOF 23285+EOF 23286 23287 ac_cv_func_gethostbyaddr=yes 23288 ;; 23289- 23290- *) 23291- 23292+ 23293+ *) 23294+ 23295 unset ac_cv_lib_nsl_gethostbyaddr 23296 unset ac_cv_lib_nsl___gethostbyaddr 23297 unset found 23298- echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5 23299-echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6 23300-if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then 23301- echo $ECHO_N "(cached) $ECHO_C" >&6 23302+ echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 23303+echo "configure:14887: checking for gethostbyaddr in -lnsl" >&5 23304+ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` 23305+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 23306+ echo $ac_n "(cached) $ac_c" 1>&6 23307 else 23308- ac_check_lib_save_LIBS=$LIBS 23309+ ac_save_LIBS="$LIBS" 23310 LIBS="-lnsl $LIBS" 23311-cat >conftest.$ac_ext <<_ACEOF 23312-/* confdefs.h. */ 23313-_ACEOF 23314-cat confdefs.h >>conftest.$ac_ext 23315-cat >>conftest.$ac_ext <<_ACEOF 23316-/* end confdefs.h. */ 23317- 23318+cat > conftest.$ac_ext <<EOF 23319+#line 14895 "configure" 23320+#include "confdefs.h" 23321 /* Override any gcc2 internal prototype to avoid an error. */ 23322-#ifdef __cplusplus 23323-extern "C" 23324-#endif 23325 /* We use char because int might match the return type of a gcc2 23326- builtin and then its argument prototype would still apply. */ 23327-char gethostbyaddr (); 23328-int 23329-main () 23330-{ 23331-gethostbyaddr (); 23332- ; 23333- return 0; 23334-} 23335-_ACEOF 23336-rm -f conftest.$ac_objext conftest$ac_exeext 23337-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23338- (eval $ac_link) 2>conftest.er1 23339- ac_status=$? 23340- grep -v '^ *+' conftest.er1 >conftest.err 23341- rm -f conftest.er1 23342- cat conftest.err >&5 23343- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23344- (exit $ac_status); } && 23345- { ac_try='test -z "$ac_c_werror_flag" 23346- || test ! -s conftest.err' 23347- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23348- (eval $ac_try) 2>&5 23349- ac_status=$? 23350- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23351- (exit $ac_status); }; } && 23352- { ac_try='test -s conftest$ac_exeext' 23353- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23354- (eval $ac_try) 2>&5 23355- ac_status=$? 23356- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23357- (exit $ac_status); }; }; then 23358- ac_cv_lib_nsl_gethostbyaddr=yes 23359-else 23360- echo "$as_me: failed program was:" >&5 23361-sed 's/^/| /' conftest.$ac_ext >&5 23362- 23363-ac_cv_lib_nsl_gethostbyaddr=no 23364-fi 23365-rm -f conftest.err conftest.$ac_objext \ 23366- conftest$ac_exeext conftest.$ac_ext 23367-LIBS=$ac_check_lib_save_LIBS 23368-fi 23369-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5 23370-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6 23371-if test $ac_cv_lib_nsl_gethostbyaddr = yes; then 23372+ builtin and then its argument prototype would still apply. */ 23373+char gethostbyaddr(); 23374+ 23375+int main() { 23376+gethostbyaddr() 23377+; return 0; } 23378+EOF 23379+if { (eval echo configure:14906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23380+ rm -rf conftest* 23381+ eval "ac_cv_lib_$ac_lib_var=yes" 23382+else 23383+ echo "configure: failed program was:" >&5 23384+ cat conftest.$ac_ext >&5 23385+ rm -rf conftest* 23386+ eval "ac_cv_lib_$ac_lib_var=no" 23387+fi 23388+rm -f conftest* 23389+LIBS="$ac_save_LIBS" 23390+ 23391+fi 23392+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 23393+ echo "$ac_t""yes" 1>&6 23394 found=yes 23395 else 23396+ echo "$ac_t""no" 1>&6 23397 23398- echo "$as_me:$LINENO: checking for __gethostbyaddr in -lnsl" >&5 23399-echo $ECHO_N "checking for __gethostbyaddr in -lnsl... $ECHO_C" >&6 23400-if test "${ac_cv_lib_nsl___gethostbyaddr+set}" = set; then 23401- echo $ECHO_N "(cached) $ECHO_C" >&6 23402+ echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 23403+echo "configure:14926: checking for __gethostbyaddr in -lnsl" >&5 23404+ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'` 23405+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 23406+ echo $ac_n "(cached) $ac_c" 1>&6 23407 else 23408- ac_check_lib_save_LIBS=$LIBS 23409+ ac_save_LIBS="$LIBS" 23410 LIBS="-lnsl $LIBS" 23411-cat >conftest.$ac_ext <<_ACEOF 23412-/* confdefs.h. */ 23413-_ACEOF 23414-cat confdefs.h >>conftest.$ac_ext 23415-cat >>conftest.$ac_ext <<_ACEOF 23416-/* end confdefs.h. */ 23417- 23418+cat > conftest.$ac_ext <<EOF 23419+#line 14934 "configure" 23420+#include "confdefs.h" 23421 /* Override any gcc2 internal prototype to avoid an error. */ 23422-#ifdef __cplusplus 23423-extern "C" 23424-#endif 23425 /* We use char because int might match the return type of a gcc2 23426- builtin and then its argument prototype would still apply. */ 23427-char __gethostbyaddr (); 23428-int 23429-main () 23430-{ 23431-__gethostbyaddr (); 23432- ; 23433- return 0; 23434-} 23435-_ACEOF 23436-rm -f conftest.$ac_objext conftest$ac_exeext 23437-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23438- (eval $ac_link) 2>conftest.er1 23439- ac_status=$? 23440- grep -v '^ *+' conftest.er1 >conftest.err 23441- rm -f conftest.er1 23442- cat conftest.err >&5 23443- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23444- (exit $ac_status); } && 23445- { ac_try='test -z "$ac_c_werror_flag" 23446- || test ! -s conftest.err' 23447- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23448- (eval $ac_try) 2>&5 23449- ac_status=$? 23450- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23451- (exit $ac_status); }; } && 23452- { ac_try='test -s conftest$ac_exeext' 23453- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23454- (eval $ac_try) 2>&5 23455- ac_status=$? 23456- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23457- (exit $ac_status); }; }; then 23458- ac_cv_lib_nsl___gethostbyaddr=yes 23459-else 23460- echo "$as_me: failed program was:" >&5 23461-sed 's/^/| /' conftest.$ac_ext >&5 23462- 23463-ac_cv_lib_nsl___gethostbyaddr=no 23464-fi 23465-rm -f conftest.err conftest.$ac_objext \ 23466- conftest$ac_exeext conftest.$ac_ext 23467-LIBS=$ac_check_lib_save_LIBS 23468-fi 23469-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostbyaddr" >&5 23470-echo "${ECHO_T}$ac_cv_lib_nsl___gethostbyaddr" >&6 23471-if test $ac_cv_lib_nsl___gethostbyaddr = yes; then 23472- found=yes 23473+ builtin and then its argument prototype would still apply. */ 23474+char __gethostbyaddr(); 23475+ 23476+int main() { 23477+__gethostbyaddr() 23478+; return 0; } 23479+EOF 23480+if { (eval echo configure:14945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23481+ rm -rf conftest* 23482+ eval "ac_cv_lib_$ac_lib_var=yes" 23483 else 23484- found=no 23485+ echo "configure: failed program was:" >&5 23486+ cat conftest.$ac_ext >&5 23487+ rm -rf conftest* 23488+ eval "ac_cv_lib_$ac_lib_var=no" 23489 fi 23490+rm -f conftest* 23491+LIBS="$ac_save_LIBS" 23492 23493+fi 23494+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 23495+ echo "$ac_t""yes" 1>&6 23496+ found=yes 23497+else 23498+ echo "$ac_t""no" 1>&6 23499+found=no 23500+fi 23501 23502+ 23503 fi 23504 23505 23506@@ -20019,422 +14972,254 @@ 23507 if test "$cross_compiling" = yes; then 23508 found=no 23509 else 23510- cat >conftest.$ac_ext <<_ACEOF 23511-/* confdefs.h. */ 23512-_ACEOF 23513-cat confdefs.h >>conftest.$ac_ext 23514-cat >>conftest.$ac_ext <<_ACEOF 23515-/* end confdefs.h. */ 23516+ cat > conftest.$ac_ext <<EOF 23517+#line 14977 "configure" 23518+#include "confdefs.h" 23519 main() { return (0); } 23520-_ACEOF 23521-rm -f conftest$ac_exeext 23522-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23523- (eval $ac_link) 2>&5 23524- ac_status=$? 23525- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23526- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 23527- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23528- (eval $ac_try) 2>&5 23529- ac_status=$? 23530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23531- (exit $ac_status); }; }; then 23532+EOF 23533+if { (eval echo configure:14981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 23534+then 23535 found=yes 23536 else 23537- echo "$as_me: program exited with status $ac_status" >&5 23538-echo "$as_me: failed program was:" >&5 23539-sed 's/^/| /' conftest.$ac_ext >&5 23540- 23541-( exit $ac_status ) 23542-found=no 23543+ echo "configure: failed program was:" >&5 23544+ cat conftest.$ac_ext >&5 23545+ rm -fr conftest* 23546+ found=no 23547 fi 23548-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 23549+rm -fr conftest* 23550 fi 23551+ 23552 LIBS=$ac_libs 23553 fi 23554 23555 if test "$found" = "yes"; then 23556- 23557- 23558+ 23559+ 23560 case nsl in 23561 c|c_r|pthread*) ;; 23562- *) 23563- LIBS="-lnsl $LIBS" 23564+ *) 23565+ LIBS="-lnsl $LIBS" 23566 ;; 23567 esac 23568 23569 23570- 23571-cat >>confdefs.h <<\_ACEOF 23572+ cat >> confdefs.h <<\EOF 23573 #define HAVE_GETHOSTBYADDR 1 23574-_ACEOF 23575- 23576+EOF 23577 23578-cat >>confdefs.h <<\_ACEOF 23579+ cat >> confdefs.h <<\EOF 23580 #define HAVE_LIBNSL 1 23581-_ACEOF 23582+EOF 23583 23584 ac_cv_func_gethostbyaddr=yes 23585 else 23586- 23587+ 23588 : 23589 23590 fi 23591- 23592+ 23593 ;; 23594- 23595+ 23596 esac 23597 23598 23599 unset ac_cv_func_yp_get_default_domain 23600 unset ac_cv_func___yp_get_default_domain 23601 unset found 23602- 23603- echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5 23604-echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6 23605-if test "${ac_cv_func_yp_get_default_domain+set}" = set; then 23606- echo $ECHO_N "(cached) $ECHO_C" >&6 23607-else 23608- cat >conftest.$ac_ext <<_ACEOF 23609-/* confdefs.h. */ 23610-_ACEOF 23611-cat confdefs.h >>conftest.$ac_ext 23612-cat >>conftest.$ac_ext <<_ACEOF 23613-/* end confdefs.h. */ 23614-/* Define yp_get_default_domain to an innocuous variant, in case <limits.h> declares yp_get_default_domain. 23615- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 23616-#define yp_get_default_domain innocuous_yp_get_default_domain 23617- 23618+ 23619+ echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 23620+echo "configure:15032: checking for yp_get_default_domain" >&5 23621+if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then 23622+ echo $ac_n "(cached) $ac_c" 1>&6 23623+else 23624+ cat > conftest.$ac_ext <<EOF 23625+#line 15037 "configure" 23626+#include "confdefs.h" 23627 /* System header to define __stub macros and hopefully few prototypes, 23628- which can conflict with char yp_get_default_domain (); below. 23629- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 23630- <limits.h> exists even on freestanding compilers. */ 23631- 23632-#ifdef __STDC__ 23633-# include <limits.h> 23634-#else 23635-# include <assert.h> 23636-#endif 23637- 23638-#undef yp_get_default_domain 23639- 23640+ which can conflict with char yp_get_default_domain(); below. */ 23641+#include <assert.h> 23642 /* Override any gcc2 internal prototype to avoid an error. */ 23643-#ifdef __cplusplus 23644-extern "C" 23645-{ 23646-#endif 23647 /* We use char because int might match the return type of a gcc2 23648- builtin and then its argument prototype would still apply. */ 23649-char yp_get_default_domain (); 23650+ builtin and then its argument prototype would still apply. */ 23651+char yp_get_default_domain(); 23652+ 23653+int main() { 23654+ 23655 /* The GNU C library defines this for functions which it implements 23656 to always fail with ENOSYS. Some functions are actually named 23657 something starting with __ and the normal name is an alias. */ 23658 #if defined (__stub_yp_get_default_domain) || defined (__stub___yp_get_default_domain) 23659 choke me 23660 #else 23661-char (*f) () = yp_get_default_domain; 23662-#endif 23663-#ifdef __cplusplus 23664-} 23665+yp_get_default_domain(); 23666 #endif 23667 23668-int 23669-main () 23670-{ 23671-return f != yp_get_default_domain; 23672- ; 23673- return 0; 23674-} 23675-_ACEOF 23676-rm -f conftest.$ac_objext conftest$ac_exeext 23677-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23678- (eval $ac_link) 2>conftest.er1 23679- ac_status=$? 23680- grep -v '^ *+' conftest.er1 >conftest.err 23681- rm -f conftest.er1 23682- cat conftest.err >&5 23683- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23684- (exit $ac_status); } && 23685- { ac_try='test -z "$ac_c_werror_flag" 23686- || test ! -s conftest.err' 23687- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23688- (eval $ac_try) 2>&5 23689- ac_status=$? 23690- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23691- (exit $ac_status); }; } && 23692- { ac_try='test -s conftest$ac_exeext' 23693- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23694- (eval $ac_try) 2>&5 23695- ac_status=$? 23696- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23697- (exit $ac_status); }; }; then 23698- ac_cv_func_yp_get_default_domain=yes 23699-else 23700- echo "$as_me: failed program was:" >&5 23701-sed 's/^/| /' conftest.$ac_ext >&5 23702- 23703-ac_cv_func_yp_get_default_domain=no 23704-fi 23705-rm -f conftest.err conftest.$ac_objext \ 23706- conftest$ac_exeext conftest.$ac_ext 23707-fi 23708-echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5 23709-echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6 23710-if test $ac_cv_func_yp_get_default_domain = yes; then 23711- found=yes 23712+; return 0; } 23713+EOF 23714+if { (eval echo configure:15060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23715+ rm -rf conftest* 23716+ eval "ac_cv_func_yp_get_default_domain=yes" 23717 else 23718- echo "$as_me:$LINENO: checking for __yp_get_default_domain" >&5 23719-echo $ECHO_N "checking for __yp_get_default_domain... $ECHO_C" >&6 23720-if test "${ac_cv_func___yp_get_default_domain+set}" = set; then 23721- echo $ECHO_N "(cached) $ECHO_C" >&6 23722-else 23723- cat >conftest.$ac_ext <<_ACEOF 23724-/* confdefs.h. */ 23725-_ACEOF 23726-cat confdefs.h >>conftest.$ac_ext 23727-cat >>conftest.$ac_ext <<_ACEOF 23728-/* end confdefs.h. */ 23729-/* Define __yp_get_default_domain to an innocuous variant, in case <limits.h> declares __yp_get_default_domain. 23730- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 23731-#define __yp_get_default_domain innocuous___yp_get_default_domain 23732+ echo "configure: failed program was:" >&5 23733+ cat conftest.$ac_ext >&5 23734+ rm -rf conftest* 23735+ eval "ac_cv_func_yp_get_default_domain=no" 23736+fi 23737+rm -f conftest* 23738+fi 23739 23740+if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then 23741+ echo "$ac_t""yes" 1>&6 23742+ found=yes 23743+else 23744+ echo "$ac_t""no" 1>&6 23745+ echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 23746+echo "configure:15078: checking for __yp_get_default_domain" >&5 23747+if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then 23748+ echo $ac_n "(cached) $ac_c" 1>&6 23749+else 23750+ cat > conftest.$ac_ext <<EOF 23751+#line 15083 "configure" 23752+#include "confdefs.h" 23753 /* System header to define __stub macros and hopefully few prototypes, 23754- which can conflict with char __yp_get_default_domain (); below. 23755- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 23756- <limits.h> exists even on freestanding compilers. */ 23757- 23758-#ifdef __STDC__ 23759-# include <limits.h> 23760-#else 23761-# include <assert.h> 23762-#endif 23763- 23764-#undef __yp_get_default_domain 23765- 23766+ which can conflict with char __yp_get_default_domain(); below. */ 23767+#include <assert.h> 23768 /* Override any gcc2 internal prototype to avoid an error. */ 23769-#ifdef __cplusplus 23770-extern "C" 23771-{ 23772-#endif 23773 /* We use char because int might match the return type of a gcc2 23774- builtin and then its argument prototype would still apply. */ 23775-char __yp_get_default_domain (); 23776+ builtin and then its argument prototype would still apply. */ 23777+char __yp_get_default_domain(); 23778+ 23779+int main() { 23780+ 23781 /* The GNU C library defines this for functions which it implements 23782 to always fail with ENOSYS. Some functions are actually named 23783 something starting with __ and the normal name is an alias. */ 23784 #if defined (__stub___yp_get_default_domain) || defined (__stub_____yp_get_default_domain) 23785 choke me 23786 #else 23787-char (*f) () = __yp_get_default_domain; 23788-#endif 23789-#ifdef __cplusplus 23790-} 23791+__yp_get_default_domain(); 23792 #endif 23793 23794-int 23795-main () 23796-{ 23797-return f != __yp_get_default_domain; 23798- ; 23799- return 0; 23800-} 23801-_ACEOF 23802-rm -f conftest.$ac_objext conftest$ac_exeext 23803-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23804- (eval $ac_link) 2>conftest.er1 23805- ac_status=$? 23806- grep -v '^ *+' conftest.er1 >conftest.err 23807- rm -f conftest.er1 23808- cat conftest.err >&5 23809- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23810- (exit $ac_status); } && 23811- { ac_try='test -z "$ac_c_werror_flag" 23812- || test ! -s conftest.err' 23813- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23814- (eval $ac_try) 2>&5 23815- ac_status=$? 23816- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23817- (exit $ac_status); }; } && 23818- { ac_try='test -s conftest$ac_exeext' 23819- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23820- (eval $ac_try) 2>&5 23821- ac_status=$? 23822- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23823- (exit $ac_status); }; }; then 23824- ac_cv_func___yp_get_default_domain=yes 23825-else 23826- echo "$as_me: failed program was:" >&5 23827-sed 's/^/| /' conftest.$ac_ext >&5 23828- 23829-ac_cv_func___yp_get_default_domain=no 23830-fi 23831-rm -f conftest.err conftest.$ac_objext \ 23832- conftest$ac_exeext conftest.$ac_ext 23833-fi 23834-echo "$as_me:$LINENO: result: $ac_cv_func___yp_get_default_domain" >&5 23835-echo "${ECHO_T}$ac_cv_func___yp_get_default_domain" >&6 23836-if test $ac_cv_func___yp_get_default_domain = yes; then 23837- found=yes 23838+; return 0; } 23839+EOF 23840+if { (eval echo configure:15106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23841+ rm -rf conftest* 23842+ eval "ac_cv_func___yp_get_default_domain=yes" 23843 else 23844- found=no 23845+ echo "configure: failed program was:" >&5 23846+ cat conftest.$ac_ext >&5 23847+ rm -rf conftest* 23848+ eval "ac_cv_func___yp_get_default_domain=no" 23849+fi 23850+rm -f conftest* 23851 fi 23852 23853+if eval "test \"`echo '$ac_cv_func_'__yp_get_default_domain`\" = yes"; then 23854+ echo "$ac_t""yes" 1>&6 23855+ found=yes 23856+else 23857+ echo "$ac_t""no" 1>&6 23858+found=no 23859+fi 23860+ 23861 fi 23862 23863 23864 case $found in 23865- yes) 23866- 23867-cat >>confdefs.h <<\_ACEOF 23868+ yes) 23869+ cat >> confdefs.h <<\EOF 23870 #define HAVE_YP_GET_DEFAULT_DOMAIN 1 23871-_ACEOF 23872+EOF 23873 23874 ac_cv_func_yp_get_default_domain=yes 23875 ;; 23876- 23877- *) 23878- 23879+ 23880+ *) 23881+ 23882 unset ac_cv_lib_nsl_yp_get_default_domain 23883 unset ac_cv_lib_nsl___yp_get_default_domain 23884 unset found 23885- echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 23886-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6 23887-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then 23888- echo $ECHO_N "(cached) $ECHO_C" >&6 23889+ echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 23890+echo "configure:15144: checking for yp_get_default_domain in -lnsl" >&5 23891+ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` 23892+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 23893+ echo $ac_n "(cached) $ac_c" 1>&6 23894 else 23895- ac_check_lib_save_LIBS=$LIBS 23896+ ac_save_LIBS="$LIBS" 23897 LIBS="-lnsl $LIBS" 23898-cat >conftest.$ac_ext <<_ACEOF 23899-/* confdefs.h. */ 23900-_ACEOF 23901-cat confdefs.h >>conftest.$ac_ext 23902-cat >>conftest.$ac_ext <<_ACEOF 23903-/* end confdefs.h. */ 23904- 23905+cat > conftest.$ac_ext <<EOF 23906+#line 15152 "configure" 23907+#include "confdefs.h" 23908 /* Override any gcc2 internal prototype to avoid an error. */ 23909-#ifdef __cplusplus 23910-extern "C" 23911-#endif 23912 /* We use char because int might match the return type of a gcc2 23913- builtin and then its argument prototype would still apply. */ 23914-char yp_get_default_domain (); 23915-int 23916-main () 23917-{ 23918-yp_get_default_domain (); 23919- ; 23920- return 0; 23921-} 23922-_ACEOF 23923-rm -f conftest.$ac_objext conftest$ac_exeext 23924-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 23925- (eval $ac_link) 2>conftest.er1 23926- ac_status=$? 23927- grep -v '^ *+' conftest.er1 >conftest.err 23928- rm -f conftest.er1 23929- cat conftest.err >&5 23930- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23931- (exit $ac_status); } && 23932- { ac_try='test -z "$ac_c_werror_flag" 23933- || test ! -s conftest.err' 23934- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23935- (eval $ac_try) 2>&5 23936- ac_status=$? 23937- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23938- (exit $ac_status); }; } && 23939- { ac_try='test -s conftest$ac_exeext' 23940- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 23941- (eval $ac_try) 2>&5 23942- ac_status=$? 23943- echo "$as_me:$LINENO: \$? = $ac_status" >&5 23944- (exit $ac_status); }; }; then 23945- ac_cv_lib_nsl_yp_get_default_domain=yes 23946-else 23947- echo "$as_me: failed program was:" >&5 23948-sed 's/^/| /' conftest.$ac_ext >&5 23949- 23950-ac_cv_lib_nsl_yp_get_default_domain=no 23951-fi 23952-rm -f conftest.err conftest.$ac_objext \ 23953- conftest$ac_exeext conftest.$ac_ext 23954-LIBS=$ac_check_lib_save_LIBS 23955-fi 23956-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5 23957-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6 23958-if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then 23959+ builtin and then its argument prototype would still apply. */ 23960+char yp_get_default_domain(); 23961+ 23962+int main() { 23963+yp_get_default_domain() 23964+; return 0; } 23965+EOF 23966+if { (eval echo configure:15163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 23967+ rm -rf conftest* 23968+ eval "ac_cv_lib_$ac_lib_var=yes" 23969+else 23970+ echo "configure: failed program was:" >&5 23971+ cat conftest.$ac_ext >&5 23972+ rm -rf conftest* 23973+ eval "ac_cv_lib_$ac_lib_var=no" 23974+fi 23975+rm -f conftest* 23976+LIBS="$ac_save_LIBS" 23977+ 23978+fi 23979+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 23980+ echo "$ac_t""yes" 1>&6 23981 found=yes 23982 else 23983+ echo "$ac_t""no" 1>&6 23984 23985- echo "$as_me:$LINENO: checking for __yp_get_default_domain in -lnsl" >&5 23986-echo $ECHO_N "checking for __yp_get_default_domain in -lnsl... $ECHO_C" >&6 23987-if test "${ac_cv_lib_nsl___yp_get_default_domain+set}" = set; then 23988- echo $ECHO_N "(cached) $ECHO_C" >&6 23989+ echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6 23990+echo "configure:15183: checking for __yp_get_default_domain in -lnsl" >&5 23991+ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'` 23992+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 23993+ echo $ac_n "(cached) $ac_c" 1>&6 23994 else 23995- ac_check_lib_save_LIBS=$LIBS 23996+ ac_save_LIBS="$LIBS" 23997 LIBS="-lnsl $LIBS" 23998-cat >conftest.$ac_ext <<_ACEOF 23999-/* confdefs.h. */ 24000-_ACEOF 24001-cat confdefs.h >>conftest.$ac_ext 24002-cat >>conftest.$ac_ext <<_ACEOF 24003-/* end confdefs.h. */ 24004- 24005+cat > conftest.$ac_ext <<EOF 24006+#line 15191 "configure" 24007+#include "confdefs.h" 24008 /* Override any gcc2 internal prototype to avoid an error. */ 24009-#ifdef __cplusplus 24010-extern "C" 24011-#endif 24012 /* We use char because int might match the return type of a gcc2 24013- builtin and then its argument prototype would still apply. */ 24014-char __yp_get_default_domain (); 24015-int 24016-main () 24017-{ 24018-__yp_get_default_domain (); 24019- ; 24020- return 0; 24021-} 24022-_ACEOF 24023-rm -f conftest.$ac_objext conftest$ac_exeext 24024-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24025- (eval $ac_link) 2>conftest.er1 24026- ac_status=$? 24027- grep -v '^ *+' conftest.er1 >conftest.err 24028- rm -f conftest.er1 24029- cat conftest.err >&5 24030- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24031- (exit $ac_status); } && 24032- { ac_try='test -z "$ac_c_werror_flag" 24033- || test ! -s conftest.err' 24034- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24035- (eval $ac_try) 2>&5 24036- ac_status=$? 24037- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24038- (exit $ac_status); }; } && 24039- { ac_try='test -s conftest$ac_exeext' 24040- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24041- (eval $ac_try) 2>&5 24042- ac_status=$? 24043- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24044- (exit $ac_status); }; }; then 24045- ac_cv_lib_nsl___yp_get_default_domain=yes 24046-else 24047- echo "$as_me: failed program was:" >&5 24048-sed 's/^/| /' conftest.$ac_ext >&5 24049- 24050-ac_cv_lib_nsl___yp_get_default_domain=no 24051-fi 24052-rm -f conftest.err conftest.$ac_objext \ 24053- conftest$ac_exeext conftest.$ac_ext 24054-LIBS=$ac_check_lib_save_LIBS 24055-fi 24056-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___yp_get_default_domain" >&5 24057-echo "${ECHO_T}$ac_cv_lib_nsl___yp_get_default_domain" >&6 24058-if test $ac_cv_lib_nsl___yp_get_default_domain = yes; then 24059- found=yes 24060+ builtin and then its argument prototype would still apply. */ 24061+char __yp_get_default_domain(); 24062+ 24063+int main() { 24064+__yp_get_default_domain() 24065+; return 0; } 24066+EOF 24067+if { (eval echo configure:15202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24068+ rm -rf conftest* 24069+ eval "ac_cv_lib_$ac_lib_var=yes" 24070 else 24071- found=no 24072+ echo "configure: failed program was:" >&5 24073+ cat conftest.$ac_ext >&5 24074+ rm -rf conftest* 24075+ eval "ac_cv_lib_$ac_lib_var=no" 24076 fi 24077+rm -f conftest* 24078+LIBS="$ac_save_LIBS" 24079 24080+fi 24081+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 24082+ echo "$ac_t""yes" 1>&6 24083+ found=yes 24084+else 24085+ echo "$ac_t""no" 1>&6 24086+found=no 24087+fi 24088 24089+ 24090 fi 24091 24092 24093@@ -20444,69 +15229,54 @@ 24094 if test "$cross_compiling" = yes; then 24095 found=no 24096 else 24097- cat >conftest.$ac_ext <<_ACEOF 24098-/* confdefs.h. */ 24099-_ACEOF 24100-cat confdefs.h >>conftest.$ac_ext 24101-cat >>conftest.$ac_ext <<_ACEOF 24102-/* end confdefs.h. */ 24103+ cat > conftest.$ac_ext <<EOF 24104+#line 15234 "configure" 24105+#include "confdefs.h" 24106 main() { return (0); } 24107-_ACEOF 24108-rm -f conftest$ac_exeext 24109-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24110- (eval $ac_link) 2>&5 24111- ac_status=$? 24112- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24113- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 24114- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24115- (eval $ac_try) 2>&5 24116- ac_status=$? 24117- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24118- (exit $ac_status); }; }; then 24119+EOF 24120+if { (eval echo configure:15238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 24121+then 24122 found=yes 24123 else 24124- echo "$as_me: program exited with status $ac_status" >&5 24125-echo "$as_me: failed program was:" >&5 24126-sed 's/^/| /' conftest.$ac_ext >&5 24127- 24128-( exit $ac_status ) 24129-found=no 24130+ echo "configure: failed program was:" >&5 24131+ cat conftest.$ac_ext >&5 24132+ rm -fr conftest* 24133+ found=no 24134 fi 24135-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 24136+rm -fr conftest* 24137 fi 24138+ 24139 LIBS=$ac_libs 24140 fi 24141 24142 if test "$found" = "yes"; then 24143- 24144- 24145+ 24146+ 24147 case nsl in 24148 c|c_r|pthread*) ;; 24149- *) 24150- LIBS="-lnsl $LIBS" 24151+ *) 24152+ LIBS="-lnsl $LIBS" 24153 ;; 24154 esac 24155 24156 24157- 24158-cat >>confdefs.h <<\_ACEOF 24159+ cat >> confdefs.h <<\EOF 24160 #define HAVE_YP_GET_DEFAULT_DOMAIN 1 24161-_ACEOF 24162- 24163+EOF 24164 24165-cat >>confdefs.h <<\_ACEOF 24166+ cat >> confdefs.h <<\EOF 24167 #define HAVE_LIBNSL 1 24168-_ACEOF 24169+EOF 24170 24171 ac_cv_func_yp_get_default_domain=yes 24172 else 24173- 24174+ 24175 : 24176 24177 fi 24178- 24179+ 24180 ;; 24181- 24182+ 24183 esac 24184 24185 24186@@ -20514,353 +15284,200 @@ 24187 unset ac_cv_func_dlopen 24188 unset ac_cv_func___dlopen 24189 unset found 24190- 24191- echo "$as_me:$LINENO: checking for dlopen" >&5 24192-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 24193-if test "${ac_cv_func_dlopen+set}" = set; then 24194- echo $ECHO_N "(cached) $ECHO_C" >&6 24195-else 24196- cat >conftest.$ac_ext <<_ACEOF 24197-/* confdefs.h. */ 24198-_ACEOF 24199-cat confdefs.h >>conftest.$ac_ext 24200-cat >>conftest.$ac_ext <<_ACEOF 24201-/* end confdefs.h. */ 24202-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. 24203- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 24204-#define dlopen innocuous_dlopen 24205- 24206+ 24207+ echo $ac_n "checking for dlopen""... $ac_c" 1>&6 24208+echo "configure:15290: checking for dlopen" >&5 24209+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then 24210+ echo $ac_n "(cached) $ac_c" 1>&6 24211+else 24212+ cat > conftest.$ac_ext <<EOF 24213+#line 15295 "configure" 24214+#include "confdefs.h" 24215 /* System header to define __stub macros and hopefully few prototypes, 24216- which can conflict with char dlopen (); below. 24217- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 24218- <limits.h> exists even on freestanding compilers. */ 24219- 24220-#ifdef __STDC__ 24221-# include <limits.h> 24222-#else 24223-# include <assert.h> 24224-#endif 24225- 24226-#undef dlopen 24227- 24228+ which can conflict with char dlopen(); below. */ 24229+#include <assert.h> 24230 /* Override any gcc2 internal prototype to avoid an error. */ 24231-#ifdef __cplusplus 24232-extern "C" 24233-{ 24234-#endif 24235 /* We use char because int might match the return type of a gcc2 24236- builtin and then its argument prototype would still apply. */ 24237-char dlopen (); 24238+ builtin and then its argument prototype would still apply. */ 24239+char dlopen(); 24240+ 24241+int main() { 24242+ 24243 /* The GNU C library defines this for functions which it implements 24244 to always fail with ENOSYS. Some functions are actually named 24245 something starting with __ and the normal name is an alias. */ 24246 #if defined (__stub_dlopen) || defined (__stub___dlopen) 24247 choke me 24248 #else 24249-char (*f) () = dlopen; 24250-#endif 24251-#ifdef __cplusplus 24252-} 24253+dlopen(); 24254 #endif 24255 24256-int 24257-main () 24258-{ 24259-return f != dlopen; 24260- ; 24261- return 0; 24262-} 24263-_ACEOF 24264-rm -f conftest.$ac_objext conftest$ac_exeext 24265-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24266- (eval $ac_link) 2>conftest.er1 24267- ac_status=$? 24268- grep -v '^ *+' conftest.er1 >conftest.err 24269- rm -f conftest.er1 24270- cat conftest.err >&5 24271- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24272- (exit $ac_status); } && 24273- { ac_try='test -z "$ac_c_werror_flag" 24274- || test ! -s conftest.err' 24275- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24276- (eval $ac_try) 2>&5 24277- ac_status=$? 24278- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24279- (exit $ac_status); }; } && 24280- { ac_try='test -s conftest$ac_exeext' 24281- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24282- (eval $ac_try) 2>&5 24283- ac_status=$? 24284- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24285- (exit $ac_status); }; }; then 24286- ac_cv_func_dlopen=yes 24287-else 24288- echo "$as_me: failed program was:" >&5 24289-sed 's/^/| /' conftest.$ac_ext >&5 24290- 24291-ac_cv_func_dlopen=no 24292-fi 24293-rm -f conftest.err conftest.$ac_objext \ 24294- conftest$ac_exeext conftest.$ac_ext 24295-fi 24296-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 24297-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 24298-if test $ac_cv_func_dlopen = yes; then 24299- found=yes 24300+; return 0; } 24301+EOF 24302+if { (eval echo configure:15318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24303+ rm -rf conftest* 24304+ eval "ac_cv_func_dlopen=yes" 24305 else 24306- echo "$as_me:$LINENO: checking for __dlopen" >&5 24307-echo $ECHO_N "checking for __dlopen... $ECHO_C" >&6 24308-if test "${ac_cv_func___dlopen+set}" = set; then 24309- echo $ECHO_N "(cached) $ECHO_C" >&6 24310-else 24311- cat >conftest.$ac_ext <<_ACEOF 24312-/* confdefs.h. */ 24313-_ACEOF 24314-cat confdefs.h >>conftest.$ac_ext 24315-cat >>conftest.$ac_ext <<_ACEOF 24316-/* end confdefs.h. */ 24317-/* Define __dlopen to an innocuous variant, in case <limits.h> declares __dlopen. 24318- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 24319-#define __dlopen innocuous___dlopen 24320+ echo "configure: failed program was:" >&5 24321+ cat conftest.$ac_ext >&5 24322+ rm -rf conftest* 24323+ eval "ac_cv_func_dlopen=no" 24324+fi 24325+rm -f conftest* 24326+fi 24327 24328+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then 24329+ echo "$ac_t""yes" 1>&6 24330+ found=yes 24331+else 24332+ echo "$ac_t""no" 1>&6 24333+ echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 24334+echo "configure:15336: checking for __dlopen" >&5 24335+if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then 24336+ echo $ac_n "(cached) $ac_c" 1>&6 24337+else 24338+ cat > conftest.$ac_ext <<EOF 24339+#line 15341 "configure" 24340+#include "confdefs.h" 24341 /* System header to define __stub macros and hopefully few prototypes, 24342- which can conflict with char __dlopen (); below. 24343- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 24344- <limits.h> exists even on freestanding compilers. */ 24345- 24346-#ifdef __STDC__ 24347-# include <limits.h> 24348-#else 24349-# include <assert.h> 24350-#endif 24351- 24352-#undef __dlopen 24353- 24354+ which can conflict with char __dlopen(); below. */ 24355+#include <assert.h> 24356 /* Override any gcc2 internal prototype to avoid an error. */ 24357-#ifdef __cplusplus 24358-extern "C" 24359-{ 24360-#endif 24361 /* We use char because int might match the return type of a gcc2 24362- builtin and then its argument prototype would still apply. */ 24363-char __dlopen (); 24364+ builtin and then its argument prototype would still apply. */ 24365+char __dlopen(); 24366+ 24367+int main() { 24368+ 24369 /* The GNU C library defines this for functions which it implements 24370 to always fail with ENOSYS. Some functions are actually named 24371 something starting with __ and the normal name is an alias. */ 24372 #if defined (__stub___dlopen) || defined (__stub_____dlopen) 24373 choke me 24374 #else 24375-char (*f) () = __dlopen; 24376-#endif 24377-#ifdef __cplusplus 24378-} 24379+__dlopen(); 24380 #endif 24381 24382-int 24383-main () 24384-{ 24385-return f != __dlopen; 24386- ; 24387- return 0; 24388-} 24389-_ACEOF 24390-rm -f conftest.$ac_objext conftest$ac_exeext 24391-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24392- (eval $ac_link) 2>conftest.er1 24393- ac_status=$? 24394- grep -v '^ *+' conftest.er1 >conftest.err 24395- rm -f conftest.er1 24396- cat conftest.err >&5 24397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24398- (exit $ac_status); } && 24399- { ac_try='test -z "$ac_c_werror_flag" 24400- || test ! -s conftest.err' 24401- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24402- (eval $ac_try) 2>&5 24403- ac_status=$? 24404- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24405- (exit $ac_status); }; } && 24406- { ac_try='test -s conftest$ac_exeext' 24407- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24408- (eval $ac_try) 2>&5 24409- ac_status=$? 24410- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24411- (exit $ac_status); }; }; then 24412- ac_cv_func___dlopen=yes 24413-else 24414- echo "$as_me: failed program was:" >&5 24415-sed 's/^/| /' conftest.$ac_ext >&5 24416- 24417-ac_cv_func___dlopen=no 24418-fi 24419-rm -f conftest.err conftest.$ac_objext \ 24420- conftest$ac_exeext conftest.$ac_ext 24421-fi 24422-echo "$as_me:$LINENO: result: $ac_cv_func___dlopen" >&5 24423-echo "${ECHO_T}$ac_cv_func___dlopen" >&6 24424-if test $ac_cv_func___dlopen = yes; then 24425- found=yes 24426+; return 0; } 24427+EOF 24428+if { (eval echo configure:15364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24429+ rm -rf conftest* 24430+ eval "ac_cv_func___dlopen=yes" 24431 else 24432- found=no 24433+ echo "configure: failed program was:" >&5 24434+ cat conftest.$ac_ext >&5 24435+ rm -rf conftest* 24436+ eval "ac_cv_func___dlopen=no" 24437+fi 24438+rm -f conftest* 24439 fi 24440 24441+if eval "test \"`echo '$ac_cv_func_'__dlopen`\" = yes"; then 24442+ echo "$ac_t""yes" 1>&6 24443+ found=yes 24444+else 24445+ echo "$ac_t""no" 1>&6 24446+found=no 24447+fi 24448+ 24449 fi 24450 24451 24452 case $found in 24453- yes) 24454- 24455-cat >>confdefs.h <<\_ACEOF 24456+ yes) 24457+ cat >> confdefs.h <<\EOF 24458 #define HAVE_DLOPEN 1 24459-_ACEOF 24460+EOF 24461 24462 ac_cv_func_dlopen=yes 24463 ;; 24464- 24465- *) 24466- 24467+ 24468+ *) 24469+ 24470 unset ac_cv_lib_dl_dlopen 24471 unset ac_cv_lib_dl___dlopen 24472 unset found 24473- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 24474-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 24475-if test "${ac_cv_lib_dl_dlopen+set}" = set; then 24476- echo $ECHO_N "(cached) $ECHO_C" >&6 24477+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 24478+echo "configure:15402: checking for dlopen in -ldl" >&5 24479+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` 24480+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 24481+ echo $ac_n "(cached) $ac_c" 1>&6 24482 else 24483- ac_check_lib_save_LIBS=$LIBS 24484+ ac_save_LIBS="$LIBS" 24485 LIBS="-ldl $LIBS" 24486-cat >conftest.$ac_ext <<_ACEOF 24487-/* confdefs.h. */ 24488-_ACEOF 24489-cat confdefs.h >>conftest.$ac_ext 24490-cat >>conftest.$ac_ext <<_ACEOF 24491-/* end confdefs.h. */ 24492- 24493+cat > conftest.$ac_ext <<EOF 24494+#line 15410 "configure" 24495+#include "confdefs.h" 24496 /* Override any gcc2 internal prototype to avoid an error. */ 24497-#ifdef __cplusplus 24498-extern "C" 24499-#endif 24500 /* We use char because int might match the return type of a gcc2 24501- builtin and then its argument prototype would still apply. */ 24502-char dlopen (); 24503-int 24504-main () 24505-{ 24506-dlopen (); 24507- ; 24508- return 0; 24509-} 24510-_ACEOF 24511-rm -f conftest.$ac_objext conftest$ac_exeext 24512-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24513- (eval $ac_link) 2>conftest.er1 24514- ac_status=$? 24515- grep -v '^ *+' conftest.er1 >conftest.err 24516- rm -f conftest.er1 24517- cat conftest.err >&5 24518- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24519- (exit $ac_status); } && 24520- { ac_try='test -z "$ac_c_werror_flag" 24521- || test ! -s conftest.err' 24522- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24523- (eval $ac_try) 2>&5 24524- ac_status=$? 24525- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24526- (exit $ac_status); }; } && 24527- { ac_try='test -s conftest$ac_exeext' 24528- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24529- (eval $ac_try) 2>&5 24530- ac_status=$? 24531- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24532- (exit $ac_status); }; }; then 24533- ac_cv_lib_dl_dlopen=yes 24534-else 24535- echo "$as_me: failed program was:" >&5 24536-sed 's/^/| /' conftest.$ac_ext >&5 24537- 24538-ac_cv_lib_dl_dlopen=no 24539-fi 24540-rm -f conftest.err conftest.$ac_objext \ 24541- conftest$ac_exeext conftest.$ac_ext 24542-LIBS=$ac_check_lib_save_LIBS 24543-fi 24544-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 24545-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 24546-if test $ac_cv_lib_dl_dlopen = yes; then 24547+ builtin and then its argument prototype would still apply. */ 24548+char dlopen(); 24549+ 24550+int main() { 24551+dlopen() 24552+; return 0; } 24553+EOF 24554+if { (eval echo configure:15421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24555+ rm -rf conftest* 24556+ eval "ac_cv_lib_$ac_lib_var=yes" 24557+else 24558+ echo "configure: failed program was:" >&5 24559+ cat conftest.$ac_ext >&5 24560+ rm -rf conftest* 24561+ eval "ac_cv_lib_$ac_lib_var=no" 24562+fi 24563+rm -f conftest* 24564+LIBS="$ac_save_LIBS" 24565+ 24566+fi 24567+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 24568+ echo "$ac_t""yes" 1>&6 24569 found=yes 24570 else 24571+ echo "$ac_t""no" 1>&6 24572 24573- echo "$as_me:$LINENO: checking for __dlopen in -ldl" >&5 24574-echo $ECHO_N "checking for __dlopen in -ldl... $ECHO_C" >&6 24575-if test "${ac_cv_lib_dl___dlopen+set}" = set; then 24576- echo $ECHO_N "(cached) $ECHO_C" >&6 24577+ echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 24578+echo "configure:15441: checking for __dlopen in -ldl" >&5 24579+ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'` 24580+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 24581+ echo $ac_n "(cached) $ac_c" 1>&6 24582 else 24583- ac_check_lib_save_LIBS=$LIBS 24584+ ac_save_LIBS="$LIBS" 24585 LIBS="-ldl $LIBS" 24586-cat >conftest.$ac_ext <<_ACEOF 24587-/* confdefs.h. */ 24588-_ACEOF 24589-cat confdefs.h >>conftest.$ac_ext 24590-cat >>conftest.$ac_ext <<_ACEOF 24591-/* end confdefs.h. */ 24592- 24593+cat > conftest.$ac_ext <<EOF 24594+#line 15449 "configure" 24595+#include "confdefs.h" 24596 /* Override any gcc2 internal prototype to avoid an error. */ 24597-#ifdef __cplusplus 24598-extern "C" 24599-#endif 24600 /* We use char because int might match the return type of a gcc2 24601- builtin and then its argument prototype would still apply. */ 24602-char __dlopen (); 24603-int 24604-main () 24605-{ 24606-__dlopen (); 24607- ; 24608- return 0; 24609-} 24610-_ACEOF 24611-rm -f conftest.$ac_objext conftest$ac_exeext 24612-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24613- (eval $ac_link) 2>conftest.er1 24614- ac_status=$? 24615- grep -v '^ *+' conftest.er1 >conftest.err 24616- rm -f conftest.er1 24617- cat conftest.err >&5 24618- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24619- (exit $ac_status); } && 24620- { ac_try='test -z "$ac_c_werror_flag" 24621- || test ! -s conftest.err' 24622- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24623- (eval $ac_try) 2>&5 24624- ac_status=$? 24625- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24626- (exit $ac_status); }; } && 24627- { ac_try='test -s conftest$ac_exeext' 24628- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24629- (eval $ac_try) 2>&5 24630- ac_status=$? 24631- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24632- (exit $ac_status); }; }; then 24633- ac_cv_lib_dl___dlopen=yes 24634-else 24635- echo "$as_me: failed program was:" >&5 24636-sed 's/^/| /' conftest.$ac_ext >&5 24637- 24638-ac_cv_lib_dl___dlopen=no 24639-fi 24640-rm -f conftest.err conftest.$ac_objext \ 24641- conftest$ac_exeext conftest.$ac_ext 24642-LIBS=$ac_check_lib_save_LIBS 24643-fi 24644-echo "$as_me:$LINENO: result: $ac_cv_lib_dl___dlopen" >&5 24645-echo "${ECHO_T}$ac_cv_lib_dl___dlopen" >&6 24646-if test $ac_cv_lib_dl___dlopen = yes; then 24647- found=yes 24648+ builtin and then its argument prototype would still apply. */ 24649+char __dlopen(); 24650+ 24651+int main() { 24652+__dlopen() 24653+; return 0; } 24654+EOF 24655+if { (eval echo configure:15460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24656+ rm -rf conftest* 24657+ eval "ac_cv_lib_$ac_lib_var=yes" 24658 else 24659- found=no 24660+ echo "configure: failed program was:" >&5 24661+ cat conftest.$ac_ext >&5 24662+ rm -rf conftest* 24663+ eval "ac_cv_lib_$ac_lib_var=no" 24664 fi 24665+rm -f conftest* 24666+LIBS="$ac_save_LIBS" 24667 24668+fi 24669+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 24670+ echo "$ac_t""yes" 1>&6 24671+ found=yes 24672+else 24673+ echo "$ac_t""no" 1>&6 24674+found=no 24675+fi 24676 24677+ 24678 fi 24679 24680 24681@@ -20870,150 +15487,107 @@ 24682 if test "$cross_compiling" = yes; then 24683 found=no 24684 else 24685- cat >conftest.$ac_ext <<_ACEOF 24686-/* confdefs.h. */ 24687-_ACEOF 24688-cat confdefs.h >>conftest.$ac_ext 24689-cat >>conftest.$ac_ext <<_ACEOF 24690-/* end confdefs.h. */ 24691+ cat > conftest.$ac_ext <<EOF 24692+#line 15492 "configure" 24693+#include "confdefs.h" 24694 main() { return (0); } 24695-_ACEOF 24696-rm -f conftest$ac_exeext 24697-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24698- (eval $ac_link) 2>&5 24699- ac_status=$? 24700- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24701- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 24702- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24703- (eval $ac_try) 2>&5 24704- ac_status=$? 24705- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24706- (exit $ac_status); }; }; then 24707+EOF 24708+if { (eval echo configure:15496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 24709+then 24710 found=yes 24711 else 24712- echo "$as_me: program exited with status $ac_status" >&5 24713-echo "$as_me: failed program was:" >&5 24714-sed 's/^/| /' conftest.$ac_ext >&5 24715- 24716-( exit $ac_status ) 24717-found=no 24718+ echo "configure: failed program was:" >&5 24719+ cat conftest.$ac_ext >&5 24720+ rm -fr conftest* 24721+ found=no 24722 fi 24723-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 24724+rm -fr conftest* 24725 fi 24726+ 24727 LIBS=$ac_libs 24728 fi 24729 24730 if test "$found" = "yes"; then 24731- 24732- 24733+ 24734+ 24735 case dl in 24736 c|c_r|pthread*) ;; 24737- *) 24738- LIBS="-ldl $LIBS" 24739+ *) 24740+ LIBS="-ldl $LIBS" 24741 ;; 24742 esac 24743 24744 24745- 24746-cat >>confdefs.h <<\_ACEOF 24747+ cat >> confdefs.h <<\EOF 24748 #define HAVE_DLOPEN 1 24749-_ACEOF 24750- 24751+EOF 24752 24753-cat >>confdefs.h <<\_ACEOF 24754+ cat >> confdefs.h <<\EOF 24755 #define HAVE_LIBDL 1 24756-_ACEOF 24757+EOF 24758 24759 ac_cv_func_dlopen=yes 24760 else 24761- 24762+ 24763 : 24764 24765 fi 24766- 24767+ 24768 ;; 24769- 24770+ 24771 esac 24772 24773 if test "$ac_cv_func_dlopen" = "yes"; then 24774- 24775-cat >>confdefs.h <<\_ACEOF 24776+ cat >> confdefs.h <<\EOF 24777 #define HAVE_LIBDL 1 24778-_ACEOF 24779+EOF 24780 24781 fi 24782- 24783-echo "$as_me:$LINENO: checking for sin in -lm" >&5 24784-echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6 24785-if test "${ac_cv_lib_m_sin+set}" = set; then 24786- echo $ECHO_N "(cached) $ECHO_C" >&6 24787+echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 24788+echo "configure:15548: checking for sin in -lm" >&5 24789+ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` 24790+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 24791+ echo $ac_n "(cached) $ac_c" 1>&6 24792 else 24793- ac_check_lib_save_LIBS=$LIBS 24794+ ac_save_LIBS="$LIBS" 24795 LIBS="-lm $LIBS" 24796-cat >conftest.$ac_ext <<_ACEOF 24797-/* confdefs.h. */ 24798-_ACEOF 24799-cat confdefs.h >>conftest.$ac_ext 24800-cat >>conftest.$ac_ext <<_ACEOF 24801-/* end confdefs.h. */ 24802- 24803+cat > conftest.$ac_ext <<EOF 24804+#line 15556 "configure" 24805+#include "confdefs.h" 24806 /* Override any gcc2 internal prototype to avoid an error. */ 24807-#ifdef __cplusplus 24808-extern "C" 24809-#endif 24810 /* We use char because int might match the return type of a gcc2 24811- builtin and then its argument prototype would still apply. */ 24812-char sin (); 24813-int 24814-main () 24815-{ 24816-sin (); 24817- ; 24818- return 0; 24819-} 24820-_ACEOF 24821-rm -f conftest.$ac_objext conftest$ac_exeext 24822-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24823- (eval $ac_link) 2>conftest.er1 24824- ac_status=$? 24825- grep -v '^ *+' conftest.er1 >conftest.err 24826- rm -f conftest.er1 24827- cat conftest.err >&5 24828- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24829- (exit $ac_status); } && 24830- { ac_try='test -z "$ac_c_werror_flag" 24831- || test ! -s conftest.err' 24832- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24833- (eval $ac_try) 2>&5 24834- ac_status=$? 24835- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24836- (exit $ac_status); }; } && 24837- { ac_try='test -s conftest$ac_exeext' 24838- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24839- (eval $ac_try) 2>&5 24840- ac_status=$? 24841- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24842- (exit $ac_status); }; }; then 24843- ac_cv_lib_m_sin=yes 24844-else 24845- echo "$as_me: failed program was:" >&5 24846-sed 's/^/| /' conftest.$ac_ext >&5 24847- 24848-ac_cv_lib_m_sin=no 24849-fi 24850-rm -f conftest.err conftest.$ac_objext \ 24851- conftest$ac_exeext conftest.$ac_ext 24852-LIBS=$ac_check_lib_save_LIBS 24853-fi 24854-echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5 24855-echo "${ECHO_T}$ac_cv_lib_m_sin" >&6 24856-if test $ac_cv_lib_m_sin = yes; then 24857- cat >>confdefs.h <<_ACEOF 24858-#define HAVE_LIBM 1 24859-_ACEOF 24860+ builtin and then its argument prototype would still apply. */ 24861+char sin(); 24862+ 24863+int main() { 24864+sin() 24865+; return 0; } 24866+EOF 24867+if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 24868+ rm -rf conftest* 24869+ eval "ac_cv_lib_$ac_lib_var=yes" 24870+else 24871+ echo "configure: failed program was:" >&5 24872+ cat conftest.$ac_ext >&5 24873+ rm -rf conftest* 24874+ eval "ac_cv_lib_$ac_lib_var=no" 24875+fi 24876+rm -f conftest* 24877+LIBS="$ac_save_LIBS" 24878+ 24879+fi 24880+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 24881+ echo "$ac_t""yes" 1>&6 24882+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ 24883+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` 24884+ cat >> confdefs.h <<EOF 24885+#define $ac_tr_lib 1 24886+EOF 24887 24888 LIBS="-lm $LIBS" 24889 24890+else 24891+ echo "$ac_t""no" 1>&6 24892 fi 24893 24894 24895@@ -21021,353 +15595,200 @@ 24896 unset ac_cv_func_inet_aton 24897 unset ac_cv_func___inet_aton 24898 unset found 24899- 24900- echo "$as_me:$LINENO: checking for inet_aton" >&5 24901-echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6 24902-if test "${ac_cv_func_inet_aton+set}" = set; then 24903- echo $ECHO_N "(cached) $ECHO_C" >&6 24904-else 24905- cat >conftest.$ac_ext <<_ACEOF 24906-/* confdefs.h. */ 24907-_ACEOF 24908-cat confdefs.h >>conftest.$ac_ext 24909-cat >>conftest.$ac_ext <<_ACEOF 24910-/* end confdefs.h. */ 24911-/* Define inet_aton to an innocuous variant, in case <limits.h> declares inet_aton. 24912- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 24913-#define inet_aton innocuous_inet_aton 24914- 24915+ 24916+ echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 24917+echo "configure:15601: checking for inet_aton" >&5 24918+if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then 24919+ echo $ac_n "(cached) $ac_c" 1>&6 24920+else 24921+ cat > conftest.$ac_ext <<EOF 24922+#line 15606 "configure" 24923+#include "confdefs.h" 24924 /* System header to define __stub macros and hopefully few prototypes, 24925- which can conflict with char inet_aton (); below. 24926- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 24927- <limits.h> exists even on freestanding compilers. */ 24928- 24929-#ifdef __STDC__ 24930-# include <limits.h> 24931-#else 24932-# include <assert.h> 24933-#endif 24934- 24935-#undef inet_aton 24936- 24937+ which can conflict with char inet_aton(); below. */ 24938+#include <assert.h> 24939 /* Override any gcc2 internal prototype to avoid an error. */ 24940-#ifdef __cplusplus 24941-extern "C" 24942-{ 24943-#endif 24944 /* We use char because int might match the return type of a gcc2 24945- builtin and then its argument prototype would still apply. */ 24946-char inet_aton (); 24947+ builtin and then its argument prototype would still apply. */ 24948+char inet_aton(); 24949+ 24950+int main() { 24951+ 24952 /* The GNU C library defines this for functions which it implements 24953 to always fail with ENOSYS. Some functions are actually named 24954 something starting with __ and the normal name is an alias. */ 24955 #if defined (__stub_inet_aton) || defined (__stub___inet_aton) 24956 choke me 24957 #else 24958-char (*f) () = inet_aton; 24959-#endif 24960-#ifdef __cplusplus 24961-} 24962+inet_aton(); 24963 #endif 24964 24965-int 24966-main () 24967-{ 24968-return f != inet_aton; 24969- ; 24970- return 0; 24971-} 24972-_ACEOF 24973-rm -f conftest.$ac_objext conftest$ac_exeext 24974-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 24975- (eval $ac_link) 2>conftest.er1 24976- ac_status=$? 24977- grep -v '^ *+' conftest.er1 >conftest.err 24978- rm -f conftest.er1 24979- cat conftest.err >&5 24980- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24981- (exit $ac_status); } && 24982- { ac_try='test -z "$ac_c_werror_flag" 24983- || test ! -s conftest.err' 24984- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24985- (eval $ac_try) 2>&5 24986- ac_status=$? 24987- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24988- (exit $ac_status); }; } && 24989- { ac_try='test -s conftest$ac_exeext' 24990- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 24991- (eval $ac_try) 2>&5 24992- ac_status=$? 24993- echo "$as_me:$LINENO: \$? = $ac_status" >&5 24994- (exit $ac_status); }; }; then 24995- ac_cv_func_inet_aton=yes 24996-else 24997- echo "$as_me: failed program was:" >&5 24998-sed 's/^/| /' conftest.$ac_ext >&5 24999- 25000-ac_cv_func_inet_aton=no 25001-fi 25002-rm -f conftest.err conftest.$ac_objext \ 25003- conftest$ac_exeext conftest.$ac_ext 25004-fi 25005-echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5 25006-echo "${ECHO_T}$ac_cv_func_inet_aton" >&6 25007-if test $ac_cv_func_inet_aton = yes; then 25008- found=yes 25009+; return 0; } 25010+EOF 25011+if { (eval echo configure:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25012+ rm -rf conftest* 25013+ eval "ac_cv_func_inet_aton=yes" 25014 else 25015- echo "$as_me:$LINENO: checking for __inet_aton" >&5 25016-echo $ECHO_N "checking for __inet_aton... $ECHO_C" >&6 25017-if test "${ac_cv_func___inet_aton+set}" = set; then 25018- echo $ECHO_N "(cached) $ECHO_C" >&6 25019-else 25020- cat >conftest.$ac_ext <<_ACEOF 25021-/* confdefs.h. */ 25022-_ACEOF 25023-cat confdefs.h >>conftest.$ac_ext 25024-cat >>conftest.$ac_ext <<_ACEOF 25025-/* end confdefs.h. */ 25026-/* Define __inet_aton to an innocuous variant, in case <limits.h> declares __inet_aton. 25027- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 25028-#define __inet_aton innocuous___inet_aton 25029- 25030-/* System header to define __stub macros and hopefully few prototypes, 25031- which can conflict with char __inet_aton (); below. 25032- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 25033- <limits.h> exists even on freestanding compilers. */ 25034- 25035-#ifdef __STDC__ 25036-# include <limits.h> 25037-#else 25038-# include <assert.h> 25039-#endif 25040- 25041-#undef __inet_aton 25042+ echo "configure: failed program was:" >&5 25043+ cat conftest.$ac_ext >&5 25044+ rm -rf conftest* 25045+ eval "ac_cv_func_inet_aton=no" 25046+fi 25047+rm -f conftest* 25048+fi 25049 25050+if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then 25051+ echo "$ac_t""yes" 1>&6 25052+ found=yes 25053+else 25054+ echo "$ac_t""no" 1>&6 25055+ echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 25056+echo "configure:15647: checking for __inet_aton" >&5 25057+if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then 25058+ echo $ac_n "(cached) $ac_c" 1>&6 25059+else 25060+ cat > conftest.$ac_ext <<EOF 25061+#line 15652 "configure" 25062+#include "confdefs.h" 25063+/* System header to define __stub macros and hopefully few prototypes, 25064+ which can conflict with char __inet_aton(); below. */ 25065+#include <assert.h> 25066 /* Override any gcc2 internal prototype to avoid an error. */ 25067-#ifdef __cplusplus 25068-extern "C" 25069-{ 25070-#endif 25071 /* We use char because int might match the return type of a gcc2 25072- builtin and then its argument prototype would still apply. */ 25073-char __inet_aton (); 25074+ builtin and then its argument prototype would still apply. */ 25075+char __inet_aton(); 25076+ 25077+int main() { 25078+ 25079 /* The GNU C library defines this for functions which it implements 25080 to always fail with ENOSYS. Some functions are actually named 25081 something starting with __ and the normal name is an alias. */ 25082 #if defined (__stub___inet_aton) || defined (__stub_____inet_aton) 25083 choke me 25084 #else 25085-char (*f) () = __inet_aton; 25086-#endif 25087-#ifdef __cplusplus 25088-} 25089+__inet_aton(); 25090 #endif 25091 25092-int 25093-main () 25094-{ 25095-return f != __inet_aton; 25096- ; 25097- return 0; 25098-} 25099-_ACEOF 25100-rm -f conftest.$ac_objext conftest$ac_exeext 25101-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25102- (eval $ac_link) 2>conftest.er1 25103- ac_status=$? 25104- grep -v '^ *+' conftest.er1 >conftest.err 25105- rm -f conftest.er1 25106- cat conftest.err >&5 25107- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25108- (exit $ac_status); } && 25109- { ac_try='test -z "$ac_c_werror_flag" 25110- || test ! -s conftest.err' 25111- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25112- (eval $ac_try) 2>&5 25113- ac_status=$? 25114- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25115- (exit $ac_status); }; } && 25116- { ac_try='test -s conftest$ac_exeext' 25117- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25118- (eval $ac_try) 2>&5 25119- ac_status=$? 25120- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25121- (exit $ac_status); }; }; then 25122- ac_cv_func___inet_aton=yes 25123-else 25124- echo "$as_me: failed program was:" >&5 25125-sed 's/^/| /' conftest.$ac_ext >&5 25126- 25127-ac_cv_func___inet_aton=no 25128-fi 25129-rm -f conftest.err conftest.$ac_objext \ 25130- conftest$ac_exeext conftest.$ac_ext 25131-fi 25132-echo "$as_me:$LINENO: result: $ac_cv_func___inet_aton" >&5 25133-echo "${ECHO_T}$ac_cv_func___inet_aton" >&6 25134-if test $ac_cv_func___inet_aton = yes; then 25135- found=yes 25136+; return 0; } 25137+EOF 25138+if { (eval echo configure:15675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25139+ rm -rf conftest* 25140+ eval "ac_cv_func___inet_aton=yes" 25141 else 25142- found=no 25143+ echo "configure: failed program was:" >&5 25144+ cat conftest.$ac_ext >&5 25145+ rm -rf conftest* 25146+ eval "ac_cv_func___inet_aton=no" 25147+fi 25148+rm -f conftest* 25149 fi 25150 25151+if eval "test \"`echo '$ac_cv_func_'__inet_aton`\" = yes"; then 25152+ echo "$ac_t""yes" 1>&6 25153+ found=yes 25154+else 25155+ echo "$ac_t""no" 1>&6 25156+found=no 25157+fi 25158+ 25159 fi 25160 25161 25162 case $found in 25163- yes) 25164- 25165-cat >>confdefs.h <<\_ACEOF 25166+ yes) 25167+ cat >> confdefs.h <<\EOF 25168 #define HAVE_INET_ATON 1 25169-_ACEOF 25170+EOF 25171 25172 ac_cv_func_inet_aton=yes 25173 ;; 25174- 25175- *) 25176- 25177+ 25178+ *) 25179+ 25180 unset ac_cv_lib_resolv_inet_aton 25181 unset ac_cv_lib_resolv___inet_aton 25182 unset found 25183- echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 25184-echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6 25185-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then 25186- echo $ECHO_N "(cached) $ECHO_C" >&6 25187+ echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 25188+echo "configure:15713: checking for inet_aton in -lresolv" >&5 25189+ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` 25190+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 25191+ echo $ac_n "(cached) $ac_c" 1>&6 25192 else 25193- ac_check_lib_save_LIBS=$LIBS 25194+ ac_save_LIBS="$LIBS" 25195 LIBS="-lresolv $LIBS" 25196-cat >conftest.$ac_ext <<_ACEOF 25197-/* confdefs.h. */ 25198-_ACEOF 25199-cat confdefs.h >>conftest.$ac_ext 25200-cat >>conftest.$ac_ext <<_ACEOF 25201-/* end confdefs.h. */ 25202- 25203+cat > conftest.$ac_ext <<EOF 25204+#line 15721 "configure" 25205+#include "confdefs.h" 25206 /* Override any gcc2 internal prototype to avoid an error. */ 25207-#ifdef __cplusplus 25208-extern "C" 25209-#endif 25210 /* We use char because int might match the return type of a gcc2 25211- builtin and then its argument prototype would still apply. */ 25212-char inet_aton (); 25213-int 25214-main () 25215-{ 25216-inet_aton (); 25217- ; 25218- return 0; 25219-} 25220-_ACEOF 25221-rm -f conftest.$ac_objext conftest$ac_exeext 25222-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25223- (eval $ac_link) 2>conftest.er1 25224- ac_status=$? 25225- grep -v '^ *+' conftest.er1 >conftest.err 25226- rm -f conftest.er1 25227- cat conftest.err >&5 25228- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25229- (exit $ac_status); } && 25230- { ac_try='test -z "$ac_c_werror_flag" 25231- || test ! -s conftest.err' 25232- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25233- (eval $ac_try) 2>&5 25234- ac_status=$? 25235- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25236- (exit $ac_status); }; } && 25237- { ac_try='test -s conftest$ac_exeext' 25238- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25239- (eval $ac_try) 2>&5 25240- ac_status=$? 25241- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25242- (exit $ac_status); }; }; then 25243- ac_cv_lib_resolv_inet_aton=yes 25244-else 25245- echo "$as_me: failed program was:" >&5 25246-sed 's/^/| /' conftest.$ac_ext >&5 25247- 25248-ac_cv_lib_resolv_inet_aton=no 25249-fi 25250-rm -f conftest.err conftest.$ac_objext \ 25251- conftest$ac_exeext conftest.$ac_ext 25252-LIBS=$ac_check_lib_save_LIBS 25253-fi 25254-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5 25255-echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6 25256-if test $ac_cv_lib_resolv_inet_aton = yes; then 25257+ builtin and then its argument prototype would still apply. */ 25258+char inet_aton(); 25259+ 25260+int main() { 25261+inet_aton() 25262+; return 0; } 25263+EOF 25264+if { (eval echo configure:15732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25265+ rm -rf conftest* 25266+ eval "ac_cv_lib_$ac_lib_var=yes" 25267+else 25268+ echo "configure: failed program was:" >&5 25269+ cat conftest.$ac_ext >&5 25270+ rm -rf conftest* 25271+ eval "ac_cv_lib_$ac_lib_var=no" 25272+fi 25273+rm -f conftest* 25274+LIBS="$ac_save_LIBS" 25275+ 25276+fi 25277+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 25278+ echo "$ac_t""yes" 1>&6 25279 found=yes 25280 else 25281+ echo "$ac_t""no" 1>&6 25282 25283- echo "$as_me:$LINENO: checking for __inet_aton in -lresolv" >&5 25284-echo $ECHO_N "checking for __inet_aton in -lresolv... $ECHO_C" >&6 25285-if test "${ac_cv_lib_resolv___inet_aton+set}" = set; then 25286- echo $ECHO_N "(cached) $ECHO_C" >&6 25287+ echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 25288+echo "configure:15752: checking for __inet_aton in -lresolv" >&5 25289+ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'` 25290+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 25291+ echo $ac_n "(cached) $ac_c" 1>&6 25292 else 25293- ac_check_lib_save_LIBS=$LIBS 25294+ ac_save_LIBS="$LIBS" 25295 LIBS="-lresolv $LIBS" 25296-cat >conftest.$ac_ext <<_ACEOF 25297-/* confdefs.h. */ 25298-_ACEOF 25299-cat confdefs.h >>conftest.$ac_ext 25300-cat >>conftest.$ac_ext <<_ACEOF 25301-/* end confdefs.h. */ 25302- 25303+cat > conftest.$ac_ext <<EOF 25304+#line 15760 "configure" 25305+#include "confdefs.h" 25306 /* Override any gcc2 internal prototype to avoid an error. */ 25307-#ifdef __cplusplus 25308-extern "C" 25309-#endif 25310 /* We use char because int might match the return type of a gcc2 25311- builtin and then its argument prototype would still apply. */ 25312-char __inet_aton (); 25313-int 25314-main () 25315-{ 25316-__inet_aton (); 25317- ; 25318- return 0; 25319-} 25320-_ACEOF 25321-rm -f conftest.$ac_objext conftest$ac_exeext 25322-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25323- (eval $ac_link) 2>conftest.er1 25324- ac_status=$? 25325- grep -v '^ *+' conftest.er1 >conftest.err 25326- rm -f conftest.er1 25327- cat conftest.err >&5 25328- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25329- (exit $ac_status); } && 25330- { ac_try='test -z "$ac_c_werror_flag" 25331- || test ! -s conftest.err' 25332- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25333- (eval $ac_try) 2>&5 25334- ac_status=$? 25335- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25336- (exit $ac_status); }; } && 25337- { ac_try='test -s conftest$ac_exeext' 25338- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25339- (eval $ac_try) 2>&5 25340- ac_status=$? 25341- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25342- (exit $ac_status); }; }; then 25343- ac_cv_lib_resolv___inet_aton=yes 25344-else 25345- echo "$as_me: failed program was:" >&5 25346-sed 's/^/| /' conftest.$ac_ext >&5 25347- 25348-ac_cv_lib_resolv___inet_aton=no 25349-fi 25350-rm -f conftest.err conftest.$ac_objext \ 25351- conftest$ac_exeext conftest.$ac_ext 25352-LIBS=$ac_check_lib_save_LIBS 25353-fi 25354-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___inet_aton" >&5 25355-echo "${ECHO_T}$ac_cv_lib_resolv___inet_aton" >&6 25356-if test $ac_cv_lib_resolv___inet_aton = yes; then 25357- found=yes 25358+ builtin and then its argument prototype would still apply. */ 25359+char __inet_aton(); 25360+ 25361+int main() { 25362+__inet_aton() 25363+; return 0; } 25364+EOF 25365+if { (eval echo configure:15771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25366+ rm -rf conftest* 25367+ eval "ac_cv_lib_$ac_lib_var=yes" 25368 else 25369- found=no 25370+ echo "configure: failed program was:" >&5 25371+ cat conftest.$ac_ext >&5 25372+ rm -rf conftest* 25373+ eval "ac_cv_lib_$ac_lib_var=no" 25374 fi 25375+rm -f conftest* 25376+LIBS="$ac_save_LIBS" 25377 25378+fi 25379+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 25380+ echo "$ac_t""yes" 1>&6 25381+ found=yes 25382+else 25383+ echo "$ac_t""no" 1>&6 25384+found=no 25385+fi 25386 25387+ 25388 fi 25389 25390 25391@@ -21377,206 +15798,133 @@ 25392 if test "$cross_compiling" = yes; then 25393 found=no 25394 else 25395- cat >conftest.$ac_ext <<_ACEOF 25396-/* confdefs.h. */ 25397-_ACEOF 25398-cat confdefs.h >>conftest.$ac_ext 25399-cat >>conftest.$ac_ext <<_ACEOF 25400-/* end confdefs.h. */ 25401+ cat > conftest.$ac_ext <<EOF 25402+#line 15803 "configure" 25403+#include "confdefs.h" 25404 main() { return (0); } 25405-_ACEOF 25406-rm -f conftest$ac_exeext 25407-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25408- (eval $ac_link) 2>&5 25409- ac_status=$? 25410- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25411- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 25412- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25413- (eval $ac_try) 2>&5 25414- ac_status=$? 25415- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25416- (exit $ac_status); }; }; then 25417+EOF 25418+if { (eval echo configure:15807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 25419+then 25420 found=yes 25421 else 25422- echo "$as_me: program exited with status $ac_status" >&5 25423-echo "$as_me: failed program was:" >&5 25424-sed 's/^/| /' conftest.$ac_ext >&5 25425- 25426-( exit $ac_status ) 25427-found=no 25428+ echo "configure: failed program was:" >&5 25429+ cat conftest.$ac_ext >&5 25430+ rm -fr conftest* 25431+ found=no 25432 fi 25433-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 25434+rm -fr conftest* 25435 fi 25436+ 25437 LIBS=$ac_libs 25438 fi 25439 25440 if test "$found" = "yes"; then 25441- 25442- 25443+ 25444+ 25445 case resolv in 25446 c|c_r|pthread*) ;; 25447- *) 25448- LIBS="-lresolv $LIBS" 25449+ *) 25450+ LIBS="-lresolv $LIBS" 25451 ;; 25452 esac 25453 25454 25455- 25456-cat >>confdefs.h <<\_ACEOF 25457+ cat >> confdefs.h <<\EOF 25458 #define HAVE_INET_ATON 1 25459-_ACEOF 25460- 25461+EOF 25462 25463-cat >>confdefs.h <<\_ACEOF 25464+ cat >> confdefs.h <<\EOF 25465 #define HAVE_LIBRESOLV 1 25466-_ACEOF 25467+EOF 25468 25469 ac_cv_func_inet_aton=yes 25470 else 25471- 25472- 25473+ 25474+ 25475 unset ac_cv_lib_bind_inet_aton 25476 unset ac_cv_lib_bind___inet_aton 25477 unset found 25478- echo "$as_me:$LINENO: checking for inet_aton in -lbind" >&5 25479-echo $ECHO_N "checking for inet_aton in -lbind... $ECHO_C" >&6 25480-if test "${ac_cv_lib_bind_inet_aton+set}" = set; then 25481- echo $ECHO_N "(cached) $ECHO_C" >&6 25482+ echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 25483+echo "configure:15849: checking for inet_aton in -lbind" >&5 25484+ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` 25485+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 25486+ echo $ac_n "(cached) $ac_c" 1>&6 25487 else 25488- ac_check_lib_save_LIBS=$LIBS 25489+ ac_save_LIBS="$LIBS" 25490 LIBS="-lbind $LIBS" 25491-cat >conftest.$ac_ext <<_ACEOF 25492-/* confdefs.h. */ 25493-_ACEOF 25494-cat confdefs.h >>conftest.$ac_ext 25495-cat >>conftest.$ac_ext <<_ACEOF 25496-/* end confdefs.h. */ 25497- 25498+cat > conftest.$ac_ext <<EOF 25499+#line 15857 "configure" 25500+#include "confdefs.h" 25501 /* Override any gcc2 internal prototype to avoid an error. */ 25502-#ifdef __cplusplus 25503-extern "C" 25504-#endif 25505 /* We use char because int might match the return type of a gcc2 25506- builtin and then its argument prototype would still apply. */ 25507-char inet_aton (); 25508-int 25509-main () 25510-{ 25511-inet_aton (); 25512- ; 25513- return 0; 25514-} 25515-_ACEOF 25516-rm -f conftest.$ac_objext conftest$ac_exeext 25517-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25518- (eval $ac_link) 2>conftest.er1 25519- ac_status=$? 25520- grep -v '^ *+' conftest.er1 >conftest.err 25521- rm -f conftest.er1 25522- cat conftest.err >&5 25523- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25524- (exit $ac_status); } && 25525- { ac_try='test -z "$ac_c_werror_flag" 25526- || test ! -s conftest.err' 25527- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25528- (eval $ac_try) 2>&5 25529- ac_status=$? 25530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25531- (exit $ac_status); }; } && 25532- { ac_try='test -s conftest$ac_exeext' 25533- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25534- (eval $ac_try) 2>&5 25535- ac_status=$? 25536- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25537- (exit $ac_status); }; }; then 25538- ac_cv_lib_bind_inet_aton=yes 25539-else 25540- echo "$as_me: failed program was:" >&5 25541-sed 's/^/| /' conftest.$ac_ext >&5 25542- 25543-ac_cv_lib_bind_inet_aton=no 25544-fi 25545-rm -f conftest.err conftest.$ac_objext \ 25546- conftest$ac_exeext conftest.$ac_ext 25547-LIBS=$ac_check_lib_save_LIBS 25548-fi 25549-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_aton" >&5 25550-echo "${ECHO_T}$ac_cv_lib_bind_inet_aton" >&6 25551-if test $ac_cv_lib_bind_inet_aton = yes; then 25552+ builtin and then its argument prototype would still apply. */ 25553+char inet_aton(); 25554+ 25555+int main() { 25556+inet_aton() 25557+; return 0; } 25558+EOF 25559+if { (eval echo configure:15868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25560+ rm -rf conftest* 25561+ eval "ac_cv_lib_$ac_lib_var=yes" 25562+else 25563+ echo "configure: failed program was:" >&5 25564+ cat conftest.$ac_ext >&5 25565+ rm -rf conftest* 25566+ eval "ac_cv_lib_$ac_lib_var=no" 25567+fi 25568+rm -f conftest* 25569+LIBS="$ac_save_LIBS" 25570+ 25571+fi 25572+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 25573+ echo "$ac_t""yes" 1>&6 25574 found=yes 25575 else 25576+ echo "$ac_t""no" 1>&6 25577 25578- echo "$as_me:$LINENO: checking for __inet_aton in -lbind" >&5 25579-echo $ECHO_N "checking for __inet_aton in -lbind... $ECHO_C" >&6 25580-if test "${ac_cv_lib_bind___inet_aton+set}" = set; then 25581- echo $ECHO_N "(cached) $ECHO_C" >&6 25582+ echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 25583+echo "configure:15888: checking for __inet_aton in -lbind" >&5 25584+ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` 25585+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 25586+ echo $ac_n "(cached) $ac_c" 1>&6 25587 else 25588- ac_check_lib_save_LIBS=$LIBS 25589+ ac_save_LIBS="$LIBS" 25590 LIBS="-lbind $LIBS" 25591-cat >conftest.$ac_ext <<_ACEOF 25592-/* confdefs.h. */ 25593-_ACEOF 25594-cat confdefs.h >>conftest.$ac_ext 25595-cat >>conftest.$ac_ext <<_ACEOF 25596-/* end confdefs.h. */ 25597- 25598+cat > conftest.$ac_ext <<EOF 25599+#line 15896 "configure" 25600+#include "confdefs.h" 25601 /* Override any gcc2 internal prototype to avoid an error. */ 25602-#ifdef __cplusplus 25603-extern "C" 25604-#endif 25605 /* We use char because int might match the return type of a gcc2 25606- builtin and then its argument prototype would still apply. */ 25607-char __inet_aton (); 25608-int 25609-main () 25610-{ 25611-__inet_aton (); 25612- ; 25613- return 0; 25614-} 25615-_ACEOF 25616-rm -f conftest.$ac_objext conftest$ac_exeext 25617-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25618- (eval $ac_link) 2>conftest.er1 25619- ac_status=$? 25620- grep -v '^ *+' conftest.er1 >conftest.err 25621- rm -f conftest.er1 25622- cat conftest.err >&5 25623- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25624- (exit $ac_status); } && 25625- { ac_try='test -z "$ac_c_werror_flag" 25626- || test ! -s conftest.err' 25627- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25628- (eval $ac_try) 2>&5 25629- ac_status=$? 25630- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25631- (exit $ac_status); }; } && 25632- { ac_try='test -s conftest$ac_exeext' 25633- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25634- (eval $ac_try) 2>&5 25635- ac_status=$? 25636- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25637- (exit $ac_status); }; }; then 25638- ac_cv_lib_bind___inet_aton=yes 25639-else 25640- echo "$as_me: failed program was:" >&5 25641-sed 's/^/| /' conftest.$ac_ext >&5 25642- 25643-ac_cv_lib_bind___inet_aton=no 25644-fi 25645-rm -f conftest.err conftest.$ac_objext \ 25646- conftest$ac_exeext conftest.$ac_ext 25647-LIBS=$ac_check_lib_save_LIBS 25648-fi 25649-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_aton" >&5 25650-echo "${ECHO_T}$ac_cv_lib_bind___inet_aton" >&6 25651-if test $ac_cv_lib_bind___inet_aton = yes; then 25652- found=yes 25653+ builtin and then its argument prototype would still apply. */ 25654+char __inet_aton(); 25655+ 25656+int main() { 25657+__inet_aton() 25658+; return 0; } 25659+EOF 25660+if { (eval echo configure:15907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 25661+ rm -rf conftest* 25662+ eval "ac_cv_lib_$ac_lib_var=yes" 25663 else 25664- found=no 25665+ echo "configure: failed program was:" >&5 25666+ cat conftest.$ac_ext >&5 25667+ rm -rf conftest* 25668+ eval "ac_cv_lib_$ac_lib_var=no" 25669 fi 25670+rm -f conftest* 25671+LIBS="$ac_save_LIBS" 25672 25673+fi 25674+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 25675+ echo "$ac_t""yes" 1>&6 25676+ found=yes 25677+else 25678+ echo "$ac_t""no" 1>&6 25679+found=no 25680+fi 25681 25682+ 25683 fi 25684 25685 25686@@ -21586,146 +15934,101 @@ 25687 if test "$cross_compiling" = yes; then 25688 found=no 25689 else 25690- cat >conftest.$ac_ext <<_ACEOF 25691-/* confdefs.h. */ 25692-_ACEOF 25693-cat confdefs.h >>conftest.$ac_ext 25694-cat >>conftest.$ac_ext <<_ACEOF 25695-/* end confdefs.h. */ 25696+ cat > conftest.$ac_ext <<EOF 25697+#line 15939 "configure" 25698+#include "confdefs.h" 25699 main() { return (0); } 25700-_ACEOF 25701-rm -f conftest$ac_exeext 25702-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25703- (eval $ac_link) 2>&5 25704- ac_status=$? 25705- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25706- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 25707- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25708- (eval $ac_try) 2>&5 25709- ac_status=$? 25710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25711- (exit $ac_status); }; }; then 25712+EOF 25713+if { (eval echo configure:15943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 25714+then 25715 found=yes 25716 else 25717- echo "$as_me: program exited with status $ac_status" >&5 25718-echo "$as_me: failed program was:" >&5 25719-sed 's/^/| /' conftest.$ac_ext >&5 25720- 25721-( exit $ac_status ) 25722-found=no 25723+ echo "configure: failed program was:" >&5 25724+ cat conftest.$ac_ext >&5 25725+ rm -fr conftest* 25726+ found=no 25727 fi 25728-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 25729+rm -fr conftest* 25730 fi 25731+ 25732 LIBS=$ac_libs 25733 fi 25734 25735 if test "$found" = "yes"; then 25736- 25737- 25738+ 25739+ 25740 case bind in 25741 c|c_r|pthread*) ;; 25742- *) 25743- LIBS="-lbind $LIBS" 25744+ *) 25745+ LIBS="-lbind $LIBS" 25746 ;; 25747 esac 25748 25749 25750- 25751-cat >>confdefs.h <<\_ACEOF 25752+ cat >> confdefs.h <<\EOF 25753 #define HAVE_INET_ATON 1 25754-_ACEOF 25755- 25756+EOF 25757 25758-cat >>confdefs.h <<\_ACEOF 25759+ cat >> confdefs.h <<\EOF 25760 #define HAVE_LIBBIND 1 25761-_ACEOF 25762+EOF 25763 25764 ac_cv_func_inet_aton=yes 25765 else 25766- 25767+ 25768 : 25769 25770 fi 25771- 25772+ 25773 25774 fi 25775- 25776+ 25777 ;; 25778- 25779+ 25780 esac 25781 25782 25783 25784-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 25785-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 25786-if test "${ac_cv_header_stdc+set}" = set; then 25787- echo $ECHO_N "(cached) $ECHO_C" >&6 25788-else 25789- cat >conftest.$ac_ext <<_ACEOF 25790-/* confdefs.h. */ 25791-_ACEOF 25792-cat confdefs.h >>conftest.$ac_ext 25793-cat >>conftest.$ac_ext <<_ACEOF 25794-/* end confdefs.h. */ 25795+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 25796+echo "configure:15994: checking for ANSI C header files" >&5 25797+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 25798+ echo $ac_n "(cached) $ac_c" 1>&6 25799+else 25800+ cat > conftest.$ac_ext <<EOF 25801+#line 15999 "configure" 25802+#include "confdefs.h" 25803 #include <stdlib.h> 25804 #include <stdarg.h> 25805 #include <string.h> 25806 #include <float.h> 25807- 25808-int 25809-main () 25810-{ 25811- 25812- ; 25813- return 0; 25814-} 25815-_ACEOF 25816-rm -f conftest.$ac_objext 25817-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 25818- (eval $ac_compile) 2>conftest.er1 25819- ac_status=$? 25820- grep -v '^ *+' conftest.er1 >conftest.err 25821- rm -f conftest.er1 25822- cat conftest.err >&5 25823- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25824- (exit $ac_status); } && 25825- { ac_try='test -z "$ac_c_werror_flag" 25826- || test ! -s conftest.err' 25827- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25828- (eval $ac_try) 2>&5 25829- ac_status=$? 25830- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25831- (exit $ac_status); }; } && 25832- { ac_try='test -s conftest.$ac_objext' 25833- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25834- (eval $ac_try) 2>&5 25835- ac_status=$? 25836- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25837- (exit $ac_status); }; }; then 25838+EOF 25839+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 25840+{ (eval echo configure:16007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 25841+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 25842+if test -z "$ac_err"; then 25843+ rm -rf conftest* 25844 ac_cv_header_stdc=yes 25845 else 25846- echo "$as_me: failed program was:" >&5 25847-sed 's/^/| /' conftest.$ac_ext >&5 25848- 25849-ac_cv_header_stdc=no 25850+ echo "$ac_err" >&5 25851+ echo "configure: failed program was:" >&5 25852+ cat conftest.$ac_ext >&5 25853+ rm -rf conftest* 25854+ ac_cv_header_stdc=no 25855 fi 25856-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 25857+rm -f conftest* 25858 25859 if test $ac_cv_header_stdc = yes; then 25860 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 25861- cat >conftest.$ac_ext <<_ACEOF 25862-/* confdefs.h. */ 25863-_ACEOF 25864-cat confdefs.h >>conftest.$ac_ext 25865-cat >>conftest.$ac_ext <<_ACEOF 25866-/* end confdefs.h. */ 25867+cat > conftest.$ac_ext <<EOF 25868+#line 16024 "configure" 25869+#include "confdefs.h" 25870 #include <string.h> 25871- 25872-_ACEOF 25873+EOF 25874 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 25875- $EGREP "memchr" >/dev/null 2>&1; then 25876+ egrep "memchr" >/dev/null 2>&1; then 25877 : 25878 else 25879+ rm -rf conftest* 25880 ac_cv_header_stdc=no 25881 fi 25882 rm -f conftest* 25883@@ -21734,19 +16037,16 @@ 25884 25885 if test $ac_cv_header_stdc = yes; then 25886 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 25887- cat >conftest.$ac_ext <<_ACEOF 25888-/* confdefs.h. */ 25889-_ACEOF 25890-cat confdefs.h >>conftest.$ac_ext 25891-cat >>conftest.$ac_ext <<_ACEOF 25892-/* end confdefs.h. */ 25893+cat > conftest.$ac_ext <<EOF 25894+#line 16042 "configure" 25895+#include "confdefs.h" 25896 #include <stdlib.h> 25897- 25898-_ACEOF 25899+EOF 25900 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 25901- $EGREP "free" >/dev/null 2>&1; then 25902+ egrep "free" >/dev/null 2>&1; then 25903 : 25904 else 25905+ rm -rf conftest* 25906 ac_cv_header_stdc=no 25907 fi 25908 rm -f conftest* 25909@@ -21755,459 +16055,171 @@ 25910 25911 if test $ac_cv_header_stdc = yes; then 25912 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 25913- if test "$cross_compiling" = yes; then 25914+if test "$cross_compiling" = yes; then 25915 : 25916 else 25917- cat >conftest.$ac_ext <<_ACEOF 25918-/* confdefs.h. */ 25919-_ACEOF 25920-cat confdefs.h >>conftest.$ac_ext 25921-cat >>conftest.$ac_ext <<_ACEOF 25922-/* end confdefs.h. */ 25923+ cat > conftest.$ac_ext <<EOF 25924+#line 16063 "configure" 25925+#include "confdefs.h" 25926 #include <ctype.h> 25927-#if ((' ' & 0x0FF) == 0x020) 25928-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 25929-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 25930-#else 25931-# define ISLOWER(c) \ 25932- (('a' <= (c) && (c) <= 'i') \ 25933- || ('j' <= (c) && (c) <= 'r') \ 25934- || ('s' <= (c) && (c) <= 'z')) 25935-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 25936-#endif 25937- 25938+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 25939+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 25940 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 25941-int 25942-main () 25943-{ 25944- int i; 25945- for (i = 0; i < 256; i++) 25946- if (XOR (islower (i), ISLOWER (i)) 25947- || toupper (i) != TOUPPER (i)) 25948- exit(2); 25949- exit (0); 25950-} 25951-_ACEOF 25952-rm -f conftest$ac_exeext 25953-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 25954- (eval $ac_link) 2>&5 25955- ac_status=$? 25956- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25957- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 25958- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 25959- (eval $ac_try) 2>&5 25960- ac_status=$? 25961- echo "$as_me:$LINENO: \$? = $ac_status" >&5 25962- (exit $ac_status); }; }; then 25963+int main () { int i; for (i = 0; i < 256; i++) 25964+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 25965+exit (0); } 25966+ 25967+EOF 25968+if { (eval echo configure:16074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 25969+then 25970 : 25971 else 25972- echo "$as_me: program exited with status $ac_status" >&5 25973-echo "$as_me: failed program was:" >&5 25974-sed 's/^/| /' conftest.$ac_ext >&5 25975- 25976-( exit $ac_status ) 25977-ac_cv_header_stdc=no 25978+ echo "configure: failed program was:" >&5 25979+ cat conftest.$ac_ext >&5 25980+ rm -fr conftest* 25981+ ac_cv_header_stdc=no 25982 fi 25983-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 25984+rm -fr conftest* 25985 fi 25986+ 25987 fi 25988 fi 25989-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 25990-echo "${ECHO_T}$ac_cv_header_stdc" >&6 25991-if test $ac_cv_header_stdc = yes; then 25992 25993-cat >>confdefs.h <<\_ACEOF 25994+echo "$ac_t""$ac_cv_header_stdc" 1>&6 25995+if test $ac_cv_header_stdc = yes; then 25996+ cat >> confdefs.h <<\EOF 25997 #define STDC_HEADERS 1 25998-_ACEOF 25999+EOF 26000 26001 fi 26002 26003- 26004- 26005- 26006- 26007- 26008 ac_header_dirent=no 26009-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do 26010- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` 26011-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 26012-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 26013-if eval "test \"\${$as_ac_Header+set}\" = set"; then 26014- echo $ECHO_N "(cached) $ECHO_C" >&6 26015-else 26016- cat >conftest.$ac_ext <<_ACEOF 26017-/* confdefs.h. */ 26018-_ACEOF 26019-cat confdefs.h >>conftest.$ac_ext 26020-cat >>conftest.$ac_ext <<_ACEOF 26021-/* end confdefs.h. */ 26022+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h 26023+do 26024+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 26025+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 26026+echo "configure:16102: checking for $ac_hdr that defines DIR" >&5 26027+if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then 26028+ echo $ac_n "(cached) $ac_c" 1>&6 26029+else 26030+ cat > conftest.$ac_ext <<EOF 26031+#line 16107 "configure" 26032+#include "confdefs.h" 26033 #include <sys/types.h> 26034 #include <$ac_hdr> 26035- 26036-int 26037-main () 26038-{ 26039-if ((DIR *) 0) 26040-return 0; 26041- ; 26042- return 0; 26043-} 26044-_ACEOF 26045-rm -f conftest.$ac_objext 26046-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 26047- (eval $ac_compile) 2>conftest.er1 26048- ac_status=$? 26049- grep -v '^ *+' conftest.er1 >conftest.err 26050- rm -f conftest.er1 26051- cat conftest.err >&5 26052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26053- (exit $ac_status); } && 26054- { ac_try='test -z "$ac_c_werror_flag" 26055- || test ! -s conftest.err' 26056- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26057- (eval $ac_try) 2>&5 26058- ac_status=$? 26059- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26060- (exit $ac_status); }; } && 26061- { ac_try='test -s conftest.$ac_objext' 26062- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26063- (eval $ac_try) 2>&5 26064- ac_status=$? 26065- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26066- (exit $ac_status); }; }; then 26067- eval "$as_ac_Header=yes" 26068-else 26069- echo "$as_me: failed program was:" >&5 26070-sed 's/^/| /' conftest.$ac_ext >&5 26071- 26072-eval "$as_ac_Header=no" 26073-fi 26074-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 26075-fi 26076-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 26077-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 26078-if test `eval echo '${'$as_ac_Header'}'` = yes; then 26079- cat >>confdefs.h <<_ACEOF 26080-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 26081-_ACEOF 26082- 26083-ac_header_dirent=$ac_hdr; break 26084+int main() { 26085+DIR *dirp = 0; 26086+; return 0; } 26087+EOF 26088+if { (eval echo configure:16115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 26089+ rm -rf conftest* 26090+ eval "ac_cv_header_dirent_$ac_safe=yes" 26091+else 26092+ echo "configure: failed program was:" >&5 26093+ cat conftest.$ac_ext >&5 26094+ rm -rf conftest* 26095+ eval "ac_cv_header_dirent_$ac_safe=no" 26096+fi 26097+rm -f conftest* 26098+fi 26099+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then 26100+ echo "$ac_t""yes" 1>&6 26101+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 26102+ cat >> confdefs.h <<EOF 26103+#define $ac_tr_hdr 1 26104+EOF 26105+ ac_header_dirent=$ac_hdr; break 26106+else 26107+ echo "$ac_t""no" 1>&6 26108 fi 26109- 26110 done 26111 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. 26112 if test $ac_header_dirent = dirent.h; then 26113- echo "$as_me:$LINENO: checking for library containing opendir" >&5 26114-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 26115-if test "${ac_cv_search_opendir+set}" = set; then 26116- echo $ECHO_N "(cached) $ECHO_C" >&6 26117-else 26118- ac_func_search_save_LIBS=$LIBS 26119-ac_cv_search_opendir=no 26120-cat >conftest.$ac_ext <<_ACEOF 26121-/* confdefs.h. */ 26122-_ACEOF 26123-cat confdefs.h >>conftest.$ac_ext 26124-cat >>conftest.$ac_ext <<_ACEOF 26125-/* end confdefs.h. */ 26126- 26127+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 26128+echo "configure:16140: checking for opendir in -ldir" >&5 26129+ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` 26130+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 26131+ echo $ac_n "(cached) $ac_c" 1>&6 26132+else 26133+ ac_save_LIBS="$LIBS" 26134+LIBS="-ldir $LIBS" 26135+cat > conftest.$ac_ext <<EOF 26136+#line 16148 "configure" 26137+#include "confdefs.h" 26138 /* Override any gcc2 internal prototype to avoid an error. */ 26139-#ifdef __cplusplus 26140-extern "C" 26141-#endif 26142 /* We use char because int might match the return type of a gcc2 26143- builtin and then its argument prototype would still apply. */ 26144-char opendir (); 26145-int 26146-main () 26147-{ 26148-opendir (); 26149- ; 26150- return 0; 26151-} 26152-_ACEOF 26153-rm -f conftest.$ac_objext conftest$ac_exeext 26154-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26155- (eval $ac_link) 2>conftest.er1 26156- ac_status=$? 26157- grep -v '^ *+' conftest.er1 >conftest.err 26158- rm -f conftest.er1 26159- cat conftest.err >&5 26160- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26161- (exit $ac_status); } && 26162- { ac_try='test -z "$ac_c_werror_flag" 26163- || test ! -s conftest.err' 26164- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26165- (eval $ac_try) 2>&5 26166- ac_status=$? 26167- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26168- (exit $ac_status); }; } && 26169- { ac_try='test -s conftest$ac_exeext' 26170- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26171- (eval $ac_try) 2>&5 26172- ac_status=$? 26173- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26174- (exit $ac_status); }; }; then 26175- ac_cv_search_opendir="none required" 26176-else 26177- echo "$as_me: failed program was:" >&5 26178-sed 's/^/| /' conftest.$ac_ext >&5 26179- 26180-fi 26181-rm -f conftest.err conftest.$ac_objext \ 26182- conftest$ac_exeext conftest.$ac_ext 26183-if test "$ac_cv_search_opendir" = no; then 26184- for ac_lib in dir; do 26185- LIBS="-l$ac_lib $ac_func_search_save_LIBS" 26186- cat >conftest.$ac_ext <<_ACEOF 26187-/* confdefs.h. */ 26188-_ACEOF 26189-cat confdefs.h >>conftest.$ac_ext 26190-cat >>conftest.$ac_ext <<_ACEOF 26191-/* end confdefs.h. */ 26192+ builtin and then its argument prototype would still apply. */ 26193+char opendir(); 26194 26195-/* Override any gcc2 internal prototype to avoid an error. */ 26196-#ifdef __cplusplus 26197-extern "C" 26198-#endif 26199-/* We use char because int might match the return type of a gcc2 26200- builtin and then its argument prototype would still apply. */ 26201-char opendir (); 26202-int 26203-main () 26204-{ 26205-opendir (); 26206- ; 26207- return 0; 26208-} 26209-_ACEOF 26210-rm -f conftest.$ac_objext conftest$ac_exeext 26211-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26212- (eval $ac_link) 2>conftest.er1 26213- ac_status=$? 26214- grep -v '^ *+' conftest.er1 >conftest.err 26215- rm -f conftest.er1 26216- cat conftest.err >&5 26217- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26218- (exit $ac_status); } && 26219- { ac_try='test -z "$ac_c_werror_flag" 26220- || test ! -s conftest.err' 26221- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26222- (eval $ac_try) 2>&5 26223- ac_status=$? 26224- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26225- (exit $ac_status); }; } && 26226- { ac_try='test -s conftest$ac_exeext' 26227- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26228- (eval $ac_try) 2>&5 26229- ac_status=$? 26230- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26231- (exit $ac_status); }; }; then 26232- ac_cv_search_opendir="-l$ac_lib" 26233-break 26234+int main() { 26235+opendir() 26236+; return 0; } 26237+EOF 26238+if { (eval echo configure:16159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 26239+ rm -rf conftest* 26240+ eval "ac_cv_lib_$ac_lib_var=yes" 26241 else 26242- echo "$as_me: failed program was:" >&5 26243-sed 's/^/| /' conftest.$ac_ext >&5 26244- 26245-fi 26246-rm -f conftest.err conftest.$ac_objext \ 26247- conftest$ac_exeext conftest.$ac_ext 26248- done 26249-fi 26250-LIBS=$ac_func_search_save_LIBS 26251+ echo "configure: failed program was:" >&5 26252+ cat conftest.$ac_ext >&5 26253+ rm -rf conftest* 26254+ eval "ac_cv_lib_$ac_lib_var=no" 26255 fi 26256-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 26257-echo "${ECHO_T}$ac_cv_search_opendir" >&6 26258-if test "$ac_cv_search_opendir" != no; then 26259- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" 26260+rm -f conftest* 26261+LIBS="$ac_save_LIBS" 26262 26263 fi 26264+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 26265+ echo "$ac_t""yes" 1>&6 26266+ LIBS="$LIBS -ldir" 26267+else 26268+ echo "$ac_t""no" 1>&6 26269+fi 26270 26271 else 26272- echo "$as_me:$LINENO: checking for library containing opendir" >&5 26273-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 26274-if test "${ac_cv_search_opendir+set}" = set; then 26275- echo $ECHO_N "(cached) $ECHO_C" >&6 26276+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 26277+echo "configure:16181: checking for opendir in -lx" >&5 26278+ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` 26279+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 26280+ echo $ac_n "(cached) $ac_c" 1>&6 26281 else 26282- ac_func_search_save_LIBS=$LIBS 26283-ac_cv_search_opendir=no 26284-cat >conftest.$ac_ext <<_ACEOF 26285-/* confdefs.h. */ 26286-_ACEOF 26287-cat confdefs.h >>conftest.$ac_ext 26288-cat >>conftest.$ac_ext <<_ACEOF 26289-/* end confdefs.h. */ 26290- 26291+ ac_save_LIBS="$LIBS" 26292+LIBS="-lx $LIBS" 26293+cat > conftest.$ac_ext <<EOF 26294+#line 16189 "configure" 26295+#include "confdefs.h" 26296 /* Override any gcc2 internal prototype to avoid an error. */ 26297-#ifdef __cplusplus 26298-extern "C" 26299-#endif 26300 /* We use char because int might match the return type of a gcc2 26301- builtin and then its argument prototype would still apply. */ 26302-char opendir (); 26303-int 26304-main () 26305-{ 26306-opendir (); 26307- ; 26308- return 0; 26309-} 26310-_ACEOF 26311-rm -f conftest.$ac_objext conftest$ac_exeext 26312-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26313- (eval $ac_link) 2>conftest.er1 26314- ac_status=$? 26315- grep -v '^ *+' conftest.er1 >conftest.err 26316- rm -f conftest.er1 26317- cat conftest.err >&5 26318- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26319- (exit $ac_status); } && 26320- { ac_try='test -z "$ac_c_werror_flag" 26321- || test ! -s conftest.err' 26322- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26323- (eval $ac_try) 2>&5 26324- ac_status=$? 26325- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26326- (exit $ac_status); }; } && 26327- { ac_try='test -s conftest$ac_exeext' 26328- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26329- (eval $ac_try) 2>&5 26330- ac_status=$? 26331- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26332- (exit $ac_status); }; }; then 26333- ac_cv_search_opendir="none required" 26334-else 26335- echo "$as_me: failed program was:" >&5 26336-sed 's/^/| /' conftest.$ac_ext >&5 26337- 26338-fi 26339-rm -f conftest.err conftest.$ac_objext \ 26340- conftest$ac_exeext conftest.$ac_ext 26341-if test "$ac_cv_search_opendir" = no; then 26342- for ac_lib in x; do 26343- LIBS="-l$ac_lib $ac_func_search_save_LIBS" 26344- cat >conftest.$ac_ext <<_ACEOF 26345-/* confdefs.h. */ 26346-_ACEOF 26347-cat confdefs.h >>conftest.$ac_ext 26348-cat >>conftest.$ac_ext <<_ACEOF 26349-/* end confdefs.h. */ 26350+ builtin and then its argument prototype would still apply. */ 26351+char opendir(); 26352 26353-/* Override any gcc2 internal prototype to avoid an error. */ 26354-#ifdef __cplusplus 26355-extern "C" 26356-#endif 26357-/* We use char because int might match the return type of a gcc2 26358- builtin and then its argument prototype would still apply. */ 26359-char opendir (); 26360-int 26361-main () 26362-{ 26363-opendir (); 26364- ; 26365- return 0; 26366-} 26367-_ACEOF 26368-rm -f conftest.$ac_objext conftest$ac_exeext 26369-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26370- (eval $ac_link) 2>conftest.er1 26371- ac_status=$? 26372- grep -v '^ *+' conftest.er1 >conftest.err 26373- rm -f conftest.er1 26374- cat conftest.err >&5 26375- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26376- (exit $ac_status); } && 26377- { ac_try='test -z "$ac_c_werror_flag" 26378- || test ! -s conftest.err' 26379- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26380- (eval $ac_try) 2>&5 26381- ac_status=$? 26382- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26383- (exit $ac_status); }; } && 26384- { ac_try='test -s conftest$ac_exeext' 26385- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26386- (eval $ac_try) 2>&5 26387- ac_status=$? 26388- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26389- (exit $ac_status); }; }; then 26390- ac_cv_search_opendir="-l$ac_lib" 26391-break 26392+int main() { 26393+opendir() 26394+; return 0; } 26395+EOF 26396+if { (eval echo configure:16200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 26397+ rm -rf conftest* 26398+ eval "ac_cv_lib_$ac_lib_var=yes" 26399 else 26400- echo "$as_me: failed program was:" >&5 26401-sed 's/^/| /' conftest.$ac_ext >&5 26402- 26403-fi 26404-rm -f conftest.err conftest.$ac_objext \ 26405- conftest$ac_exeext conftest.$ac_ext 26406- done 26407-fi 26408-LIBS=$ac_func_search_save_LIBS 26409+ echo "configure: failed program was:" >&5 26410+ cat conftest.$ac_ext >&5 26411+ rm -rf conftest* 26412+ eval "ac_cv_lib_$ac_lib_var=no" 26413 fi 26414-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 26415-echo "${ECHO_T}$ac_cv_search_opendir" >&6 26416-if test "$ac_cv_search_opendir" != no; then 26417- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" 26418+rm -f conftest* 26419+LIBS="$ac_save_LIBS" 26420 26421 fi 26422- 26423+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 26424+ echo "$ac_t""yes" 1>&6 26425+ LIBS="$LIBS -lx" 26426+else 26427+ echo "$ac_t""no" 1>&6 26428 fi 26429 26430+fi 26431 26432 26433- 26434- 26435- 26436- 26437- 26438- 26439- 26440- 26441- 26442- 26443- 26444- 26445- 26446- 26447- 26448- 26449- 26450- 26451- 26452- 26453- 26454- 26455- 26456- 26457- 26458- 26459- 26460- 26461- 26462- 26463- 26464- 26465- 26466- 26467- 26468- 26469- 26470- 26471- 26472- 26473- 26474- 26475- 26476- 26477- 26478- 26479- 26480- 26481- 26482- 26483- 26484- 26485- 26486-for ac_header in \ 26487+for ac_hdr in \ 26488 inttypes.h \ 26489 stdint.h \ 26490 dirent.h \ 26491@@ -22264,241 +16276,128 @@ 26492 assert.h 26493 26494 do 26495-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 26496-echo "$as_me:$LINENO: checking for $ac_header" >&5 26497-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 26498-if eval "test \"\${$as_ac_Header+set}\" = set"; then 26499- echo $ECHO_N "(cached) $ECHO_C" >&6 26500-else 26501- cat >conftest.$ac_ext <<_ACEOF 26502-/* confdefs.h. */ 26503-_ACEOF 26504-cat confdefs.h >>conftest.$ac_ext 26505-cat >>conftest.$ac_ext <<_ACEOF 26506-/* end confdefs.h. */ 26507- 26508-#ifdef HAVE_SYS_PARAM_H 26509-#include <sys/param.h> 26510-#endif 26511-#ifdef HAVE_SYS_TYPES_H 26512-#include <sys/types.h> 26513-#endif 26514-#ifdef HAVE_SYS_TIME_H 26515-#include <sys/time.h> 26516-#endif 26517-#ifdef HAVE_NETINET_IN_H 26518-#include <netinet/in.h> 26519-#endif 26520-#ifdef HAVE_ARPA_NAMESER_H 26521-#include <arpa/nameser.h> 26522-#endif 26523- 26524- 26525-#include <$ac_header> 26526-_ACEOF 26527-rm -f conftest.$ac_objext 26528-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 26529- (eval $ac_compile) 2>conftest.er1 26530- ac_status=$? 26531- grep -v '^ *+' conftest.er1 >conftest.err 26532- rm -f conftest.er1 26533- cat conftest.err >&5 26534- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26535- (exit $ac_status); } && 26536- { ac_try='test -z "$ac_c_werror_flag" 26537- || test ! -s conftest.err' 26538- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26539- (eval $ac_try) 2>&5 26540- ac_status=$? 26541- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26542- (exit $ac_status); }; } && 26543- { ac_try='test -s conftest.$ac_objext' 26544- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26545- (eval $ac_try) 2>&5 26546- ac_status=$? 26547- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26548- (exit $ac_status); }; }; then 26549- eval "$as_ac_Header=yes" 26550-else 26551- echo "$as_me: failed program was:" >&5 26552-sed 's/^/| /' conftest.$ac_ext >&5 26553- 26554-eval "$as_ac_Header=no" 26555-fi 26556-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 26557-fi 26558-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 26559-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 26560-if test `eval echo '${'$as_ac_Header'}'` = yes; then 26561- cat >>confdefs.h <<_ACEOF 26562-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 26563-_ACEOF 26564- 26565+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 26566+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 26567+echo "configure:16282: checking for $ac_hdr" >&5 26568+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 26569+ echo $ac_n "(cached) $ac_c" 1>&6 26570+else 26571+ cat > conftest.$ac_ext <<EOF 26572+#line 16287 "configure" 26573+#include "confdefs.h" 26574+#include <$ac_hdr> 26575+EOF 26576+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 26577+{ (eval echo configure:16292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 26578+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 26579+if test -z "$ac_err"; then 26580+ rm -rf conftest* 26581+ eval "ac_cv_header_$ac_safe=yes" 26582+else 26583+ echo "$ac_err" >&5 26584+ echo "configure: failed program was:" >&5 26585+ cat conftest.$ac_ext >&5 26586+ rm -rf conftest* 26587+ eval "ac_cv_header_$ac_safe=no" 26588+fi 26589+rm -f conftest* 26590+fi 26591+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 26592+ echo "$ac_t""yes" 1>&6 26593+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 26594+ cat >> confdefs.h <<EOF 26595+#define $ac_tr_hdr 1 26596+EOF 26597+ 26598+else 26599+ echo "$ac_t""no" 1>&6 26600 fi 26601- 26602 done 26603 26604 26605 26606- echo "$as_me:$LINENO: checking for fopencookie" >&5 26607-echo $ECHO_N "checking for fopencookie... $ECHO_C" >&6 26608-if test "${ac_cv_func_fopencookie+set}" = set; then 26609- echo $ECHO_N "(cached) $ECHO_C" >&6 26610-else 26611- cat >conftest.$ac_ext <<_ACEOF 26612-/* confdefs.h. */ 26613-_ACEOF 26614-cat confdefs.h >>conftest.$ac_ext 26615-cat >>conftest.$ac_ext <<_ACEOF 26616-/* end confdefs.h. */ 26617-/* Define fopencookie to an innocuous variant, in case <limits.h> declares fopencookie. 26618- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 26619-#define fopencookie innocuous_fopencookie 26620- 26621+ echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 26622+echo "configure:16321: checking for fopencookie" >&5 26623+if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then 26624+ echo $ac_n "(cached) $ac_c" 1>&6 26625+else 26626+ cat > conftest.$ac_ext <<EOF 26627+#line 16326 "configure" 26628+#include "confdefs.h" 26629 /* System header to define __stub macros and hopefully few prototypes, 26630- which can conflict with char fopencookie (); below. 26631- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 26632- <limits.h> exists even on freestanding compilers. */ 26633- 26634-#ifdef __STDC__ 26635-# include <limits.h> 26636-#else 26637-# include <assert.h> 26638-#endif 26639- 26640-#undef fopencookie 26641- 26642+ which can conflict with char fopencookie(); below. */ 26643+#include <assert.h> 26644 /* Override any gcc2 internal prototype to avoid an error. */ 26645-#ifdef __cplusplus 26646-extern "C" 26647-{ 26648-#endif 26649 /* We use char because int might match the return type of a gcc2 26650- builtin and then its argument prototype would still apply. */ 26651-char fopencookie (); 26652+ builtin and then its argument prototype would still apply. */ 26653+char fopencookie(); 26654+ 26655+int main() { 26656+ 26657 /* The GNU C library defines this for functions which it implements 26658 to always fail with ENOSYS. Some functions are actually named 26659 something starting with __ and the normal name is an alias. */ 26660 #if defined (__stub_fopencookie) || defined (__stub___fopencookie) 26661 choke me 26662 #else 26663-char (*f) () = fopencookie; 26664-#endif 26665-#ifdef __cplusplus 26666-} 26667+fopencookie(); 26668 #endif 26669 26670-int 26671-main () 26672-{ 26673-return f != fopencookie; 26674- ; 26675- return 0; 26676-} 26677-_ACEOF 26678-rm -f conftest.$ac_objext conftest$ac_exeext 26679-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26680- (eval $ac_link) 2>conftest.er1 26681- ac_status=$? 26682- grep -v '^ *+' conftest.er1 >conftest.err 26683- rm -f conftest.er1 26684- cat conftest.err >&5 26685- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26686- (exit $ac_status); } && 26687- { ac_try='test -z "$ac_c_werror_flag" 26688- || test ! -s conftest.err' 26689- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26690- (eval $ac_try) 2>&5 26691- ac_status=$? 26692- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26693- (exit $ac_status); }; } && 26694- { ac_try='test -s conftest$ac_exeext' 26695- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26696- (eval $ac_try) 2>&5 26697- ac_status=$? 26698- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26699- (exit $ac_status); }; }; then 26700- ac_cv_func_fopencookie=yes 26701-else 26702- echo "$as_me: failed program was:" >&5 26703-sed 's/^/| /' conftest.$ac_ext >&5 26704- 26705-ac_cv_func_fopencookie=no 26706-fi 26707-rm -f conftest.err conftest.$ac_objext \ 26708- conftest$ac_exeext conftest.$ac_ext 26709-fi 26710-echo "$as_me:$LINENO: result: $ac_cv_func_fopencookie" >&5 26711-echo "${ECHO_T}$ac_cv_func_fopencookie" >&6 26712-if test $ac_cv_func_fopencookie = yes; then 26713+; return 0; } 26714+EOF 26715+if { (eval echo configure:16349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 26716+ rm -rf conftest* 26717+ eval "ac_cv_func_fopencookie=yes" 26718+else 26719+ echo "configure: failed program was:" >&5 26720+ cat conftest.$ac_ext >&5 26721+ rm -rf conftest* 26722+ eval "ac_cv_func_fopencookie=no" 26723+fi 26724+rm -f conftest* 26725+fi 26726+ 26727+if eval "test \"`echo '$ac_cv_func_'fopencookie`\" = yes"; then 26728+ echo "$ac_t""yes" 1>&6 26729 have_glibc_fopencookie=yes 26730+else 26731+ echo "$ac_t""no" 1>&6 26732 fi 26733 26734 26735 if test "$have_glibc_fopencookie" = "yes"; then 26736-cat >conftest.$ac_ext <<_ACEOF 26737-/* confdefs.h. */ 26738-_ACEOF 26739-cat confdefs.h >>conftest.$ac_ext 26740-cat >>conftest.$ac_ext <<_ACEOF 26741-/* end confdefs.h. */ 26742+cat > conftest.$ac_ext <<EOF 26743+#line 16371 "configure" 26744+#include "confdefs.h" 26745 26746 #define _GNU_SOURCE 26747 #include <stdio.h> 26748 26749-int 26750-main () 26751-{ 26752+int main() { 26753 cookie_io_functions_t cookie; 26754- ; 26755- return 0; 26756-} 26757-_ACEOF 26758-rm -f conftest.$ac_objext 26759-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 26760- (eval $ac_compile) 2>conftest.er1 26761- ac_status=$? 26762- grep -v '^ *+' conftest.er1 >conftest.err 26763- rm -f conftest.er1 26764- cat conftest.err >&5 26765- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26766- (exit $ac_status); } && 26767- { ac_try='test -z "$ac_c_werror_flag" 26768- || test ! -s conftest.err' 26769- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26770- (eval $ac_try) 2>&5 26771- ac_status=$? 26772- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26773- (exit $ac_status); }; } && 26774- { ac_try='test -s conftest.$ac_objext' 26775- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26776- (eval $ac_try) 2>&5 26777- ac_status=$? 26778- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26779- (exit $ac_status); }; }; then 26780+; return 0; } 26781+EOF 26782+if { (eval echo configure:16381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 26783+ rm -rf conftest* 26784 have_cookie_io_functions_t=yes 26785 else 26786- echo "$as_me: failed program was:" >&5 26787-sed 's/^/| /' conftest.$ac_ext >&5 26788- 26789+ echo "configure: failed program was:" >&5 26790+ cat conftest.$ac_ext >&5 26791 fi 26792-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 26793+rm -f conftest* 26794 26795 if test "$have_cookie_io_functions_t" = "yes"; then 26796 cookie_io_functions_t=cookie_io_functions_t 26797 have_fopen_cookie=yes 26798 26799 if test "$cross_compiling" = yes; then 26800- 26801+ 26802 cookie_io_functions_use_off64_t=no 26803 26804 else 26805- cat >conftest.$ac_ext <<_ACEOF 26806-/* confdefs.h. */ 26807-_ACEOF 26808-cat confdefs.h >>conftest.$ac_ext 26809-cat >>conftest.$ac_ext <<_ACEOF 26810-/* end confdefs.h. */ 26811+ cat > conftest.$ac_ext <<EOF 26812+#line 16400 "configure" 26813+#include "confdefs.h" 26814 26815 #define _GNU_SOURCE 26816 #include <stdio.h> 26817@@ -22528,83 +16427,45 @@ 26818 } 26819 26820 26821-_ACEOF 26822-rm -f conftest$ac_exeext 26823-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 26824- (eval $ac_link) 2>&5 26825- ac_status=$? 26826- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26827- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 26828- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26829- (eval $ac_try) 2>&5 26830- ac_status=$? 26831- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26832- (exit $ac_status); }; }; then 26833- 26834+EOF 26835+if { (eval echo configure:16432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 26836+then 26837+ 26838 cookie_io_functions_use_off64_t=yes 26839 26840 else 26841- echo "$as_me: program exited with status $ac_status" >&5 26842-echo "$as_me: failed program was:" >&5 26843-sed 's/^/| /' conftest.$ac_ext >&5 26844- 26845-( exit $ac_status ) 26846- 26847+ echo "configure: failed program was:" >&5 26848+ cat conftest.$ac_ext >&5 26849+ rm -fr conftest* 26850+ 26851 cookie_io_functions_use_off64_t=no 26852 26853 fi 26854-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 26855+rm -fr conftest* 26856 fi 26857 26858+ 26859 else 26860 26861-cat >conftest.$ac_ext <<_ACEOF 26862-/* confdefs.h. */ 26863-_ACEOF 26864-cat confdefs.h >>conftest.$ac_ext 26865-cat >>conftest.$ac_ext <<_ACEOF 26866-/* end confdefs.h. */ 26867+cat > conftest.$ac_ext <<EOF 26868+#line 16452 "configure" 26869+#include "confdefs.h" 26870 26871 #define _GNU_SOURCE 26872 #include <stdio.h> 26873 26874-int 26875-main () 26876-{ 26877- _IO_cookie_io_functions_t cookie; 26878- ; 26879- return 0; 26880-} 26881-_ACEOF 26882-rm -f conftest.$ac_objext 26883-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 26884- (eval $ac_compile) 2>conftest.er1 26885- ac_status=$? 26886- grep -v '^ *+' conftest.er1 >conftest.err 26887- rm -f conftest.er1 26888- cat conftest.err >&5 26889- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26890- (exit $ac_status); } && 26891- { ac_try='test -z "$ac_c_werror_flag" 26892- || test ! -s conftest.err' 26893- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26894- (eval $ac_try) 2>&5 26895- ac_status=$? 26896- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26897- (exit $ac_status); }; } && 26898- { ac_try='test -s conftest.$ac_objext' 26899- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 26900- (eval $ac_try) 2>&5 26901- ac_status=$? 26902- echo "$as_me:$LINENO: \$? = $ac_status" >&5 26903- (exit $ac_status); }; }; then 26904+int main() { 26905+ _IO_cookie_io_functions_t cookie; 26906+; return 0; } 26907+EOF 26908+if { (eval echo configure:16462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 26909+ rm -rf conftest* 26910 have_IO_cookie_io_functions_t=yes 26911 else 26912- echo "$as_me: failed program was:" >&5 26913-sed 's/^/| /' conftest.$ac_ext >&5 26914- 26915+ echo "configure: failed program was:" >&5 26916+ cat conftest.$ac_ext >&5 26917 fi 26918-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 26919+rm -f conftest* 26920 if test "$have_cookie_io_functions_t" = "yes" ; then 26921 cookie_io_functions_t=_IO_cookie_io_functions_t 26922 have_fopen_cookie=yes 26923@@ -22612,111 +16473,75 @@ 26924 fi 26925 26926 if test "$have_fopen_cookie" = "yes" ; then 26927- 26928-cat >>confdefs.h <<\_ACEOF 26929+ cat >> confdefs.h <<\EOF 26930 #define HAVE_FOPENCOOKIE 1 26931-_ACEOF 26932- 26933+EOF 26934 26935-cat >>confdefs.h <<_ACEOF 26936+ cat >> confdefs.h <<EOF 26937 #define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t 26938-_ACEOF 26939+EOF 26940 26941 if test "$cookie_io_functions_use_off64_t" = "yes" ; then 26942- 26943-cat >>confdefs.h <<\_ACEOF 26944+ cat >> confdefs.h <<\EOF 26945 #define COOKIE_SEEKER_USES_OFF64_T 1 26946-_ACEOF 26947+EOF 26948 26949 fi 26950 fi 26951 fi 26952 26953 26954- echo "$as_me:$LINENO: checking for broken getcwd" >&5 26955-echo $ECHO_N "checking for broken getcwd... $ECHO_C" >&6 26956+ echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 26957+echo "configure:16496: checking for broken getcwd" >&5 26958 os=`uname -sr 2>/dev/null` 26959 case $os in 26960 SunOS*) 26961- 26962-cat >>confdefs.h <<\_ACEOF 26963+ cat >> confdefs.h <<\EOF 26964 #define HAVE_BROKEN_GETCWD 1 26965-_ACEOF 26966+EOF 26967 26968- echo "$as_me:$LINENO: result: yes" >&5 26969-echo "${ECHO_T}yes" >&6;; 26970+ echo "$ac_t""yes" 1>&6;; 26971 *) 26972- echo "$as_me:$LINENO: result: no" >&5 26973-echo "${ECHO_T}no" >&6;; 26974+ echo "$ac_t""no" 1>&6;; 26975 esac 26976 26977 26978- echo "$as_me:$LINENO: checking for broken libc stdio" >&5 26979-echo $ECHO_N "checking for broken libc stdio... $ECHO_C" >&6 26980- if test "${_cv_have_broken_glibc_fopen_append+set}" = set; then 26981- echo $ECHO_N "(cached) $ECHO_C" >&6 26982+ echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 26983+echo "configure:16511: checking for broken libc stdio" >&5 26984+ if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then 26985+ echo $ac_n "(cached) $ac_c" 1>&6 26986 else 26987- 26988+ 26989 if test "$cross_compiling" = yes; then 26990- cat >conftest.$ac_ext <<_ACEOF 26991-/* confdefs.h. */ 26992-_ACEOF 26993-cat confdefs.h >>conftest.$ac_ext 26994-cat >>conftest.$ac_ext <<_ACEOF 26995-/* end confdefs.h. */ 26996+ cat > conftest.$ac_ext <<EOF 26997+#line 16518 "configure" 26998+#include "confdefs.h" 26999 27000 #include <features.h> 27001 27002-int 27003-main () 27004-{ 27005+int main() { 27006 27007 #if !__GLIBC_PREREQ(2,2) 27008 choke me 27009 #endif 27010 27011- ; 27012- return 0; 27013-} 27014-_ACEOF 27015-rm -f conftest.$ac_objext 27016-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27017- (eval $ac_compile) 2>conftest.er1 27018- ac_status=$? 27019- grep -v '^ *+' conftest.er1 >conftest.err 27020- rm -f conftest.er1 27021- cat conftest.err >&5 27022- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27023- (exit $ac_status); } && 27024- { ac_try='test -z "$ac_c_werror_flag" 27025- || test ! -s conftest.err' 27026- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27027- (eval $ac_try) 2>&5 27028- ac_status=$? 27029- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27030- (exit $ac_status); }; } && 27031- { ac_try='test -s conftest.$ac_objext' 27032- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27033- (eval $ac_try) 2>&5 27034- ac_status=$? 27035- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27036- (exit $ac_status); }; }; then 27037+; return 0; } 27038+EOF 27039+if { (eval echo configure:16531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27040+ rm -rf conftest* 27041 _cv_have_broken_glibc_fopen_append=yes 27042 else 27043- echo "$as_me: failed program was:" >&5 27044-sed 's/^/| /' conftest.$ac_ext >&5 27045- 27046-_cv_have_broken_glibc_fopen_append=no 27047+ echo "configure: failed program was:" >&5 27048+ cat conftest.$ac_ext >&5 27049+ rm -rf conftest* 27050+ _cv_have_broken_glibc_fopen_append=no 27051 fi 27052-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27053+rm -f conftest* 27054 27055 else 27056- cat >conftest.$ac_ext <<_ACEOF 27057-/* confdefs.h. */ 27058-_ACEOF 27059-cat confdefs.h >>conftest.$ac_ext 27060-cat >>conftest.$ac_ext <<_ACEOF 27061-/* end confdefs.h. */ 27062+ cat > conftest.$ac_ext <<EOF 27063+#line 16544 "configure" 27064+#include "confdefs.h" 27065 27066 #include <stdio.h> 27067 int main(int argc, char *argv[]) 27068@@ -22724,7 +16549,7 @@ 27069 FILE *fp; 27070 long position; 27071 char *filename = "/tmp/phpglibccheck"; 27072- 27073+ 27074 fp = fopen(filename, "w"); 27075 if (fp == NULL) { 27076 perror("fopen"); 27077@@ -22742,2939 +16567,643 @@ 27078 return 0; 27079 } 27080 27081-_ACEOF 27082-rm -f conftest$ac_exeext 27083-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 27084- (eval $ac_link) 2>&5 27085- ac_status=$? 27086- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27087- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 27088- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27089- (eval $ac_try) 2>&5 27090- ac_status=$? 27091- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27092- (exit $ac_status); }; }; then 27093+EOF 27094+if { (eval echo configure:16572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 27095+then 27096 _cv_have_broken_glibc_fopen_append=no 27097 else 27098- echo "$as_me: program exited with status $ac_status" >&5 27099-echo "$as_me: failed program was:" >&5 27100-sed 's/^/| /' conftest.$ac_ext >&5 27101- 27102-( exit $ac_status ) 27103-_cv_have_broken_glibc_fopen_append=yes 27104+ echo "configure: failed program was:" >&5 27105+ cat conftest.$ac_ext >&5 27106+ rm -fr conftest* 27107+ _cv_have_broken_glibc_fopen_append=yes 27108 fi 27109-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 27110+rm -fr conftest* 27111 fi 27112+ 27113 fi 27114 27115 27116 if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then 27117- echo "$as_me:$LINENO: result: yes" >&5 27118-echo "${ECHO_T}yes" >&6 27119- 27120-cat >>confdefs.h <<\_ACEOF 27121+ echo "$ac_t""yes" 1>&6 27122+ cat >> confdefs.h <<\EOF 27123 #define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1 27124-_ACEOF 27125+EOF 27126 27127 else 27128- echo "$as_me:$LINENO: result: no" >&5 27129-echo "${ECHO_T}no" >&6 27130+ echo "$ac_t""no" 1>&6 27131 fi 27132 27133 27134 27135-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 27136-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 27137-if test "${ac_cv_struct_tm+set}" = set; then 27138- echo $ECHO_N "(cached) $ECHO_C" >&6 27139+echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 27140+echo "configure:16600: checking whether struct tm is in sys/time.h or time.h" >&5 27141+if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then 27142+ echo $ac_n "(cached) $ac_c" 1>&6 27143 else 27144- cat >conftest.$ac_ext <<_ACEOF 27145-/* confdefs.h. */ 27146-_ACEOF 27147-cat confdefs.h >>conftest.$ac_ext 27148-cat >>conftest.$ac_ext <<_ACEOF 27149-/* end confdefs.h. */ 27150+ cat > conftest.$ac_ext <<EOF 27151+#line 16605 "configure" 27152+#include "confdefs.h" 27153 #include <sys/types.h> 27154 #include <time.h> 27155- 27156-int 27157-main () 27158-{ 27159+int main() { 27160 struct tm *tp; tp->tm_sec; 27161- ; 27162- return 0; 27163-} 27164-_ACEOF 27165-rm -f conftest.$ac_objext 27166-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27167- (eval $ac_compile) 2>conftest.er1 27168- ac_status=$? 27169- grep -v '^ *+' conftest.er1 >conftest.err 27170- rm -f conftest.er1 27171- cat conftest.err >&5 27172- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27173- (exit $ac_status); } && 27174- { ac_try='test -z "$ac_c_werror_flag" 27175- || test ! -s conftest.err' 27176- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27177- (eval $ac_try) 2>&5 27178- ac_status=$? 27179- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27180- (exit $ac_status); }; } && 27181- { ac_try='test -s conftest.$ac_objext' 27182- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27183- (eval $ac_try) 2>&5 27184- ac_status=$? 27185- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27186- (exit $ac_status); }; }; then 27187+; return 0; } 27188+EOF 27189+if { (eval echo configure:16613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27190+ rm -rf conftest* 27191 ac_cv_struct_tm=time.h 27192 else 27193- echo "$as_me: failed program was:" >&5 27194-sed 's/^/| /' conftest.$ac_ext >&5 27195- 27196-ac_cv_struct_tm=sys/time.h 27197+ echo "configure: failed program was:" >&5 27198+ cat conftest.$ac_ext >&5 27199+ rm -rf conftest* 27200+ ac_cv_struct_tm=sys/time.h 27201 fi 27202-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27203+rm -f conftest* 27204 fi 27205-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 27206-echo "${ECHO_T}$ac_cv_struct_tm" >&6 27207-if test $ac_cv_struct_tm = sys/time.h; then 27208 27209-cat >>confdefs.h <<\_ACEOF 27210+echo "$ac_t""$ac_cv_struct_tm" 1>&6 27211+if test $ac_cv_struct_tm = sys/time.h; then 27212+ cat >> confdefs.h <<\EOF 27213 #define TM_IN_SYS_TIME 1 27214-_ACEOF 27215+EOF 27216 27217 fi 27218 27219-echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 27220-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6 27221-if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then 27222- echo $ECHO_N "(cached) $ECHO_C" >&6 27223+echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 27224+echo "configure:16634: checking for tm_zone in struct tm" >&5 27225+if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then 27226+ echo $ac_n "(cached) $ac_c" 1>&6 27227 else 27228- cat >conftest.$ac_ext <<_ACEOF 27229-/* confdefs.h. */ 27230-_ACEOF 27231-cat confdefs.h >>conftest.$ac_ext 27232-cat >>conftest.$ac_ext <<_ACEOF 27233-/* end confdefs.h. */ 27234-#include <sys/types.h> 27235-#include <$ac_cv_struct_tm> 27236- 27237- 27238-int 27239-main () 27240-{ 27241-static struct tm ac_aggr; 27242-if (ac_aggr.tm_zone) 27243-return 0; 27244- ; 27245- return 0; 27246-} 27247-_ACEOF 27248-rm -f conftest.$ac_objext 27249-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27250- (eval $ac_compile) 2>conftest.er1 27251- ac_status=$? 27252- grep -v '^ *+' conftest.er1 >conftest.err 27253- rm -f conftest.er1 27254- cat conftest.err >&5 27255- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27256- (exit $ac_status); } && 27257- { ac_try='test -z "$ac_c_werror_flag" 27258- || test ! -s conftest.err' 27259- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27260- (eval $ac_try) 2>&5 27261- ac_status=$? 27262- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27263- (exit $ac_status); }; } && 27264- { ac_try='test -s conftest.$ac_objext' 27265- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27266- (eval $ac_try) 2>&5 27267- ac_status=$? 27268- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27269- (exit $ac_status); }; }; then 27270- ac_cv_member_struct_tm_tm_zone=yes 27271-else 27272- echo "$as_me: failed program was:" >&5 27273-sed 's/^/| /' conftest.$ac_ext >&5 27274- 27275-cat >conftest.$ac_ext <<_ACEOF 27276-/* confdefs.h. */ 27277-_ACEOF 27278-cat confdefs.h >>conftest.$ac_ext 27279-cat >>conftest.$ac_ext <<_ACEOF 27280-/* end confdefs.h. */ 27281+ cat > conftest.$ac_ext <<EOF 27282+#line 16639 "configure" 27283+#include "confdefs.h" 27284 #include <sys/types.h> 27285 #include <$ac_cv_struct_tm> 27286- 27287- 27288-int 27289-main () 27290-{ 27291-static struct tm ac_aggr; 27292-if (sizeof ac_aggr.tm_zone) 27293-return 0; 27294- ; 27295- return 0; 27296-} 27297-_ACEOF 27298-rm -f conftest.$ac_objext 27299-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27300- (eval $ac_compile) 2>conftest.er1 27301- ac_status=$? 27302- grep -v '^ *+' conftest.er1 >conftest.err 27303- rm -f conftest.er1 27304- cat conftest.err >&5 27305- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27306- (exit $ac_status); } && 27307- { ac_try='test -z "$ac_c_werror_flag" 27308- || test ! -s conftest.err' 27309- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27310- (eval $ac_try) 2>&5 27311- ac_status=$? 27312- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27313- (exit $ac_status); }; } && 27314- { ac_try='test -s conftest.$ac_objext' 27315- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27316- (eval $ac_try) 2>&5 27317- ac_status=$? 27318- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27319- (exit $ac_status); }; }; then 27320- ac_cv_member_struct_tm_tm_zone=yes 27321-else 27322- echo "$as_me: failed program was:" >&5 27323-sed 's/^/| /' conftest.$ac_ext >&5 27324- 27325-ac_cv_member_struct_tm_tm_zone=no 27326-fi 27327-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27328-fi 27329-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27330-fi 27331-echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 27332-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6 27333-if test $ac_cv_member_struct_tm_tm_zone = yes; then 27334- 27335-cat >>confdefs.h <<_ACEOF 27336-#define HAVE_STRUCT_TM_TM_ZONE 1 27337-_ACEOF 27338- 27339- 27340+int main() { 27341+struct tm tm; tm.tm_zone; 27342+; return 0; } 27343+EOF 27344+if { (eval echo configure:16647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27345+ rm -rf conftest* 27346+ ac_cv_struct_tm_zone=yes 27347+else 27348+ echo "configure: failed program was:" >&5 27349+ cat conftest.$ac_ext >&5 27350+ rm -rf conftest* 27351+ ac_cv_struct_tm_zone=no 27352+fi 27353+rm -f conftest* 27354 fi 27355 27356-if test "$ac_cv_member_struct_tm_tm_zone" = yes; then 27357- 27358-cat >>confdefs.h <<\_ACEOF 27359+echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6 27360+if test "$ac_cv_struct_tm_zone" = yes; then 27361+ cat >> confdefs.h <<\EOF 27362 #define HAVE_TM_ZONE 1 27363-_ACEOF 27364+EOF 27365 27366 else 27367- echo "$as_me:$LINENO: checking for tzname" >&5 27368-echo $ECHO_N "checking for tzname... $ECHO_C" >&6 27369-if test "${ac_cv_var_tzname+set}" = set; then 27370- echo $ECHO_N "(cached) $ECHO_C" >&6 27371-else 27372- cat >conftest.$ac_ext <<_ACEOF 27373-/* confdefs.h. */ 27374-_ACEOF 27375-cat confdefs.h >>conftest.$ac_ext 27376-cat >>conftest.$ac_ext <<_ACEOF 27377-/* end confdefs.h. */ 27378+ echo $ac_n "checking for tzname""... $ac_c" 1>&6 27379+echo "configure:16667: checking for tzname" >&5 27380+if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then 27381+ echo $ac_n "(cached) $ac_c" 1>&6 27382+else 27383+ cat > conftest.$ac_ext <<EOF 27384+#line 16672 "configure" 27385+#include "confdefs.h" 27386 #include <time.h> 27387 #ifndef tzname /* For SGI. */ 27388 extern char *tzname[]; /* RS6000 and others reject char **tzname. */ 27389 #endif 27390- 27391-int 27392-main () 27393-{ 27394+int main() { 27395 atoi(*tzname); 27396- ; 27397- return 0; 27398-} 27399-_ACEOF 27400-rm -f conftest.$ac_objext conftest$ac_exeext 27401-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 27402- (eval $ac_link) 2>conftest.er1 27403- ac_status=$? 27404- grep -v '^ *+' conftest.er1 >conftest.err 27405- rm -f conftest.er1 27406- cat conftest.err >&5 27407- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27408- (exit $ac_status); } && 27409- { ac_try='test -z "$ac_c_werror_flag" 27410- || test ! -s conftest.err' 27411- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27412- (eval $ac_try) 2>&5 27413- ac_status=$? 27414- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27415- (exit $ac_status); }; } && 27416- { ac_try='test -s conftest$ac_exeext' 27417- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27418- (eval $ac_try) 2>&5 27419- ac_status=$? 27420- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27421- (exit $ac_status); }; }; then 27422+; return 0; } 27423+EOF 27424+if { (eval echo configure:16682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 27425+ rm -rf conftest* 27426 ac_cv_var_tzname=yes 27427 else 27428- echo "$as_me: failed program was:" >&5 27429-sed 's/^/| /' conftest.$ac_ext >&5 27430- 27431-ac_cv_var_tzname=no 27432+ echo "configure: failed program was:" >&5 27433+ cat conftest.$ac_ext >&5 27434+ rm -rf conftest* 27435+ ac_cv_var_tzname=no 27436 fi 27437-rm -f conftest.err conftest.$ac_objext \ 27438- conftest$ac_exeext conftest.$ac_ext 27439+rm -f conftest* 27440 fi 27441-echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 27442-echo "${ECHO_T}$ac_cv_var_tzname" >&6 27443- if test $ac_cv_var_tzname = yes; then 27444 27445-cat >>confdefs.h <<\_ACEOF 27446+echo "$ac_t""$ac_cv_var_tzname" 1>&6 27447+ if test $ac_cv_var_tzname = yes; then 27448+ cat >> confdefs.h <<\EOF 27449 #define HAVE_TZNAME 1 27450-_ACEOF 27451+EOF 27452 27453 fi 27454 fi 27455 27456 27457 27458- echo "$as_me:$LINENO: checking for missing declarations of reentrant functions" >&5 27459-echo $ECHO_N "checking for missing declarations of reentrant functions... $ECHO_C" >&6 27460- cat >conftest.$ac_ext <<_ACEOF 27461-/* confdefs.h. */ 27462-_ACEOF 27463-cat confdefs.h >>conftest.$ac_ext 27464-cat >>conftest.$ac_ext <<_ACEOF 27465-/* end confdefs.h. */ 27466+ echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 27467+echo "configure:16706: checking for missing declarations of reentrant functions" >&5 27468+ cat > conftest.$ac_ext <<EOF 27469+#line 16708 "configure" 27470+#include "confdefs.h" 27471 #include <time.h> 27472-int 27473-main () 27474-{ 27475+int main() { 27476 struct tm *(*func)() = localtime_r 27477- ; 27478- return 0; 27479-} 27480-_ACEOF 27481-rm -f conftest.$ac_objext 27482-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27483- (eval $ac_compile) 2>conftest.er1 27484- ac_status=$? 27485- grep -v '^ *+' conftest.er1 >conftest.err 27486- rm -f conftest.er1 27487- cat conftest.err >&5 27488- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27489- (exit $ac_status); } && 27490- { ac_try='test -z "$ac_c_werror_flag" 27491- || test ! -s conftest.err' 27492- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27493- (eval $ac_try) 2>&5 27494- ac_status=$? 27495- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27496- (exit $ac_status); }; } && 27497- { ac_try='test -s conftest.$ac_objext' 27498- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27499- (eval $ac_try) 2>&5 27500- ac_status=$? 27501- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27502- (exit $ac_status); }; }; then 27503- 27504+; return 0; } 27505+EOF 27506+if { (eval echo configure:16715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27507+ rm -rf conftest* 27508+ 27509 : 27510- 27511+ 27512 else 27513- echo "$as_me: failed program was:" >&5 27514-sed 's/^/| /' conftest.$ac_ext >&5 27515- 27516- 27517- 27518-cat >>confdefs.h <<\_ACEOF 27519+ echo "configure: failed program was:" >&5 27520+ cat conftest.$ac_ext >&5 27521+ rm -rf conftest* 27522+ 27523+ cat >> confdefs.h <<\EOF 27524 #define MISSING_LOCALTIME_R_DECL 1 27525-_ACEOF 27526- 27527+EOF 27528 27529+ 27530 fi 27531-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27532- cat >conftest.$ac_ext <<_ACEOF 27533-/* confdefs.h. */ 27534-_ACEOF 27535-cat confdefs.h >>conftest.$ac_ext 27536-cat >>conftest.$ac_ext <<_ACEOF 27537-/* end confdefs.h. */ 27538+rm -f conftest* 27539+ cat > conftest.$ac_ext <<EOF 27540+#line 16733 "configure" 27541+#include "confdefs.h" 27542 #include <time.h> 27543-int 27544-main () 27545-{ 27546+int main() { 27547 struct tm *(*func)() = gmtime_r 27548- ; 27549- return 0; 27550-} 27551-_ACEOF 27552-rm -f conftest.$ac_objext 27553-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27554- (eval $ac_compile) 2>conftest.er1 27555- ac_status=$? 27556- grep -v '^ *+' conftest.er1 >conftest.err 27557- rm -f conftest.er1 27558- cat conftest.err >&5 27559- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27560- (exit $ac_status); } && 27561- { ac_try='test -z "$ac_c_werror_flag" 27562- || test ! -s conftest.err' 27563- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27564- (eval $ac_try) 2>&5 27565- ac_status=$? 27566- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27567- (exit $ac_status); }; } && 27568- { ac_try='test -s conftest.$ac_objext' 27569- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27570- (eval $ac_try) 2>&5 27571- ac_status=$? 27572- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27573- (exit $ac_status); }; }; then 27574- 27575+; return 0; } 27576+EOF 27577+if { (eval echo configure:16740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27578+ rm -rf conftest* 27579+ 27580 : 27581- 27582+ 27583 else 27584- echo "$as_me: failed program was:" >&5 27585-sed 's/^/| /' conftest.$ac_ext >&5 27586- 27587- 27588- 27589-cat >>confdefs.h <<\_ACEOF 27590+ echo "configure: failed program was:" >&5 27591+ cat conftest.$ac_ext >&5 27592+ rm -rf conftest* 27593+ 27594+ cat >> confdefs.h <<\EOF 27595 #define MISSING_GMTIME_R_DECL 1 27596-_ACEOF 27597- 27598+EOF 27599 27600+ 27601 fi 27602-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27603- cat >conftest.$ac_ext <<_ACEOF 27604-/* confdefs.h. */ 27605-_ACEOF 27606-cat confdefs.h >>conftest.$ac_ext 27607-cat >>conftest.$ac_ext <<_ACEOF 27608-/* end confdefs.h. */ 27609+rm -f conftest* 27610+ cat > conftest.$ac_ext <<EOF 27611+#line 16758 "configure" 27612+#include "confdefs.h" 27613 #include <time.h> 27614-int 27615-main () 27616-{ 27617+int main() { 27618 char *(*func)() = asctime_r 27619- ; 27620- return 0; 27621-} 27622-_ACEOF 27623-rm -f conftest.$ac_objext 27624-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27625- (eval $ac_compile) 2>conftest.er1 27626- ac_status=$? 27627- grep -v '^ *+' conftest.er1 >conftest.err 27628- rm -f conftest.er1 27629- cat conftest.err >&5 27630- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27631- (exit $ac_status); } && 27632- { ac_try='test -z "$ac_c_werror_flag" 27633- || test ! -s conftest.err' 27634- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27635- (eval $ac_try) 2>&5 27636- ac_status=$? 27637- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27638- (exit $ac_status); }; } && 27639- { ac_try='test -s conftest.$ac_objext' 27640- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27641- (eval $ac_try) 2>&5 27642- ac_status=$? 27643- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27644- (exit $ac_status); }; }; then 27645- 27646+; return 0; } 27647+EOF 27648+if { (eval echo configure:16765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27649+ rm -rf conftest* 27650+ 27651 : 27652- 27653+ 27654 else 27655- echo "$as_me: failed program was:" >&5 27656-sed 's/^/| /' conftest.$ac_ext >&5 27657- 27658- 27659- 27660-cat >>confdefs.h <<\_ACEOF 27661+ echo "configure: failed program was:" >&5 27662+ cat conftest.$ac_ext >&5 27663+ rm -rf conftest* 27664+ 27665+ cat >> confdefs.h <<\EOF 27666 #define MISSING_ASCTIME_R_DECL 1 27667-_ACEOF 27668- 27669+EOF 27670 27671+ 27672 fi 27673-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27674- cat >conftest.$ac_ext <<_ACEOF 27675-/* confdefs.h. */ 27676-_ACEOF 27677-cat confdefs.h >>conftest.$ac_ext 27678-cat >>conftest.$ac_ext <<_ACEOF 27679-/* end confdefs.h. */ 27680+rm -f conftest* 27681+ cat > conftest.$ac_ext <<EOF 27682+#line 16783 "configure" 27683+#include "confdefs.h" 27684 #include <time.h> 27685-int 27686-main () 27687-{ 27688+int main() { 27689 char *(*func)() = ctime_r 27690- ; 27691- return 0; 27692-} 27693-_ACEOF 27694-rm -f conftest.$ac_objext 27695-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27696- (eval $ac_compile) 2>conftest.er1 27697- ac_status=$? 27698- grep -v '^ *+' conftest.er1 >conftest.err 27699- rm -f conftest.er1 27700- cat conftest.err >&5 27701- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27702- (exit $ac_status); } && 27703- { ac_try='test -z "$ac_c_werror_flag" 27704- || test ! -s conftest.err' 27705- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27706- (eval $ac_try) 2>&5 27707- ac_status=$? 27708- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27709- (exit $ac_status); }; } && 27710- { ac_try='test -s conftest.$ac_objext' 27711- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27712- (eval $ac_try) 2>&5 27713- ac_status=$? 27714- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27715- (exit $ac_status); }; }; then 27716- 27717+; return 0; } 27718+EOF 27719+if { (eval echo configure:16790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27720+ rm -rf conftest* 27721+ 27722 : 27723- 27724+ 27725 else 27726- echo "$as_me: failed program was:" >&5 27727-sed 's/^/| /' conftest.$ac_ext >&5 27728- 27729- 27730- 27731-cat >>confdefs.h <<\_ACEOF 27732+ echo "configure: failed program was:" >&5 27733+ cat conftest.$ac_ext >&5 27734+ rm -rf conftest* 27735+ 27736+ cat >> confdefs.h <<\EOF 27737 #define MISSING_CTIME_R_DECL 1 27738-_ACEOF 27739- 27740+EOF 27741 27742+ 27743 fi 27744-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27745- cat >conftest.$ac_ext <<_ACEOF 27746-/* confdefs.h. */ 27747-_ACEOF 27748-cat confdefs.h >>conftest.$ac_ext 27749-cat >>conftest.$ac_ext <<_ACEOF 27750-/* end confdefs.h. */ 27751+rm -f conftest* 27752+ cat > conftest.$ac_ext <<EOF 27753+#line 16808 "configure" 27754+#include "confdefs.h" 27755 #include <string.h> 27756-int 27757-main () 27758-{ 27759+int main() { 27760 char *(*func)() = strtok_r 27761- ; 27762- return 0; 27763-} 27764-_ACEOF 27765-rm -f conftest.$ac_objext 27766-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27767- (eval $ac_compile) 2>conftest.er1 27768- ac_status=$? 27769- grep -v '^ *+' conftest.er1 >conftest.err 27770- rm -f conftest.er1 27771- cat conftest.err >&5 27772- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27773- (exit $ac_status); } && 27774- { ac_try='test -z "$ac_c_werror_flag" 27775- || test ! -s conftest.err' 27776- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27777- (eval $ac_try) 2>&5 27778- ac_status=$? 27779- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27780- (exit $ac_status); }; } && 27781- { ac_try='test -s conftest.$ac_objext' 27782- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27783- (eval $ac_try) 2>&5 27784- ac_status=$? 27785- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27786- (exit $ac_status); }; }; then 27787- 27788+; return 0; } 27789+EOF 27790+if { (eval echo configure:16815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27791+ rm -rf conftest* 27792+ 27793 : 27794- 27795+ 27796 else 27797- echo "$as_me: failed program was:" >&5 27798-sed 's/^/| /' conftest.$ac_ext >&5 27799- 27800- 27801- 27802-cat >>confdefs.h <<\_ACEOF 27803+ echo "configure: failed program was:" >&5 27804+ cat conftest.$ac_ext >&5 27805+ rm -rf conftest* 27806+ 27807+ cat >> confdefs.h <<\EOF 27808 #define MISSING_STRTOK_R_DECL 1 27809-_ACEOF 27810- 27811+EOF 27812 27813+ 27814 fi 27815-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27816- echo "$as_me:$LINENO: result: done" >&5 27817-echo "${ECHO_T}done" >&6 27818+rm -f conftest* 27819+ echo "$ac_t""done" 1>&6 27820 27821 27822- echo "$as_me:$LINENO: checking for fclose declaration" >&5 27823-echo $ECHO_N "checking for fclose declaration... $ECHO_C" >&6 27824- cat >conftest.$ac_ext <<_ACEOF 27825-/* confdefs.h. */ 27826-_ACEOF 27827-cat confdefs.h >>conftest.$ac_ext 27828-cat >>conftest.$ac_ext <<_ACEOF 27829-/* end confdefs.h. */ 27830+ echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 27831+echo "configure:16836: checking for fclose declaration" >&5 27832+ cat > conftest.$ac_ext <<EOF 27833+#line 16838 "configure" 27834+#include "confdefs.h" 27835 #include <stdio.h> 27836-int 27837-main () 27838-{ 27839+int main() { 27840 int (*func)() = fclose 27841- ; 27842- return 0; 27843-} 27844-_ACEOF 27845-rm -f conftest.$ac_objext 27846-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27847- (eval $ac_compile) 2>conftest.er1 27848- ac_status=$? 27849- grep -v '^ *+' conftest.er1 >conftest.err 27850- rm -f conftest.er1 27851- cat conftest.err >&5 27852- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27853- (exit $ac_status); } && 27854- { ac_try='test -z "$ac_c_werror_flag" 27855- || test ! -s conftest.err' 27856- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27857- (eval $ac_try) 2>&5 27858- ac_status=$? 27859- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27860- (exit $ac_status); }; } && 27861- { ac_try='test -s conftest.$ac_objext' 27862- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27863- (eval $ac_try) 2>&5 27864- ac_status=$? 27865- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27866- (exit $ac_status); }; }; then 27867- 27868- 27869-cat >>confdefs.h <<\_ACEOF 27870+; return 0; } 27871+EOF 27872+if { (eval echo configure:16845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27873+ rm -rf conftest* 27874+ 27875+ cat >> confdefs.h <<\EOF 27876 #define MISSING_FCLOSE_DECL 0 27877-_ACEOF 27878- 27879- echo "$as_me:$LINENO: result: ok" >&5 27880-echo "${ECHO_T}ok" >&6 27881+EOF 27882 27883+ echo "$ac_t""ok" 1>&6 27884+ 27885 else 27886- echo "$as_me: failed program was:" >&5 27887-sed 's/^/| /' conftest.$ac_ext >&5 27888- 27889- 27890- 27891-cat >>confdefs.h <<\_ACEOF 27892+ echo "configure: failed program was:" >&5 27893+ cat conftest.$ac_ext >&5 27894+ rm -rf conftest* 27895+ 27896+ cat >> confdefs.h <<\EOF 27897 #define MISSING_FCLOSE_DECL 1 27898-_ACEOF 27899- 27900- echo "$as_me:$LINENO: result: missing" >&5 27901-echo "${ECHO_T}missing" >&6 27902+EOF 27903 27904+ echo "$ac_t""missing" 1>&6 27905+ 27906 fi 27907-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27908+rm -f conftest* 27909 27910 27911 27912-echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5 27913-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6 27914-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then 27915- echo $ECHO_N "(cached) $ECHO_C" >&6 27916+echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 27917+echo "configure:16871: checking for tm_gmtoff in struct tm" >&5 27918+if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then 27919+ echo $ac_n "(cached) $ac_c" 1>&6 27920 else 27921- cat >conftest.$ac_ext <<_ACEOF 27922-/* confdefs.h. */ 27923-_ACEOF 27924-cat confdefs.h >>conftest.$ac_ext 27925-cat >>conftest.$ac_ext <<_ACEOF 27926-/* end confdefs.h. */ 27927+ cat > conftest.$ac_ext <<EOF 27928+#line 16876 "configure" 27929+#include "confdefs.h" 27930 #include <sys/types.h> 27931 #include <$ac_cv_struct_tm> 27932-int 27933-main () 27934-{ 27935+int main() { 27936 struct tm tm; tm.tm_gmtoff; 27937- ; 27938- return 0; 27939-} 27940-_ACEOF 27941-rm -f conftest.$ac_objext 27942-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 27943- (eval $ac_compile) 2>conftest.er1 27944- ac_status=$? 27945- grep -v '^ *+' conftest.er1 >conftest.err 27946- rm -f conftest.er1 27947- cat conftest.err >&5 27948- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27949- (exit $ac_status); } && 27950- { ac_try='test -z "$ac_c_werror_flag" 27951- || test ! -s conftest.err' 27952- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27953- (eval $ac_try) 2>&5 27954- ac_status=$? 27955- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27956- (exit $ac_status); }; } && 27957- { ac_try='test -s conftest.$ac_objext' 27958- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 27959- (eval $ac_try) 2>&5 27960- ac_status=$? 27961- echo "$as_me:$LINENO: \$? = $ac_status" >&5 27962- (exit $ac_status); }; }; then 27963+; return 0; } 27964+EOF 27965+if { (eval echo configure:16884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 27966+ rm -rf conftest* 27967 ac_cv_struct_tm_gmtoff=yes 27968 else 27969- echo "$as_me: failed program was:" >&5 27970-sed 's/^/| /' conftest.$ac_ext >&5 27971- 27972-ac_cv_struct_tm_gmtoff=no 27973+ echo "configure: failed program was:" >&5 27974+ cat conftest.$ac_ext >&5 27975+ rm -rf conftest* 27976+ ac_cv_struct_tm_gmtoff=no 27977 fi 27978-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 27979+rm -f conftest* 27980 fi 27981-echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5 27982-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6 27983 27984-if test "$ac_cv_struct_tm_gmtoff" = yes; then 27985+echo "$ac_t""$ac_cv_struct_tm_gmtoff" 1>&6 27986 27987-cat >>confdefs.h <<\_ACEOF 27988+if test "$ac_cv_struct_tm_gmtoff" = yes; then 27989+ cat >> confdefs.h <<\EOF 27990 #define HAVE_TM_GMTOFF 1 27991-_ACEOF 27992+EOF 27993 27994 fi 27995 27996 27997-echo "$as_me:$LINENO: checking for struct flock" >&5 27998-echo $ECHO_N "checking for struct flock... $ECHO_C" >&6 27999-if test "${ac_cv_struct_flock+set}" = set; then 28000- echo $ECHO_N "(cached) $ECHO_C" >&6 28001+echo $ac_n "checking for struct flock""... $ac_c" 1>&6 28002+echo "configure:16907: checking for struct flock" >&5 28003+if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then 28004+ echo $ac_n "(cached) $ac_c" 1>&6 28005 else 28006- cat >conftest.$ac_ext <<_ACEOF 28007-/* confdefs.h. */ 28008-_ACEOF 28009-cat confdefs.h >>conftest.$ac_ext 28010-cat >>conftest.$ac_ext <<_ACEOF 28011-/* end confdefs.h. */ 28012+ cat > conftest.$ac_ext <<EOF 28013+#line 16912 "configure" 28014+#include "confdefs.h" 28015 28016 #include <unistd.h> 28017 #include <fcntl.h> 28018- 28019-int 28020-main () 28021-{ 28022+ 28023+int main() { 28024 struct flock x; 28025- ; 28026- return 0; 28027-} 28028-_ACEOF 28029-rm -f conftest.$ac_objext 28030-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28031- (eval $ac_compile) 2>conftest.er1 28032- ac_status=$? 28033- grep -v '^ *+' conftest.er1 >conftest.err 28034- rm -f conftest.er1 28035- cat conftest.err >&5 28036- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28037- (exit $ac_status); } && 28038- { ac_try='test -z "$ac_c_werror_flag" 28039- || test ! -s conftest.err' 28040- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28041- (eval $ac_try) 2>&5 28042- ac_status=$? 28043- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28044- (exit $ac_status); }; } && 28045- { ac_try='test -s conftest.$ac_objext' 28046- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28047- (eval $ac_try) 2>&5 28048- ac_status=$? 28049- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28050- (exit $ac_status); }; }; then 28051- 28052+; return 0; } 28053+EOF 28054+if { (eval echo configure:16922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 28055+ rm -rf conftest* 28056+ 28057 ac_cv_struct_flock=yes 28058- 28059+ 28060 else 28061- echo "$as_me: failed program was:" >&5 28062-sed 's/^/| /' conftest.$ac_ext >&5 28063- 28064- 28065+ echo "configure: failed program was:" >&5 28066+ cat conftest.$ac_ext >&5 28067+ rm -rf conftest* 28068+ 28069 ac_cv_struct_flock=no 28070- 28071+ 28072 fi 28073-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28074+rm -f conftest* 28075 28076 fi 28077-echo "$as_me:$LINENO: result: $ac_cv_struct_flock" >&5 28078-echo "${ECHO_T}$ac_cv_struct_flock" >&6 28079-if test "$ac_cv_struct_flock" = "yes" ; then 28080 28081-cat >>confdefs.h <<\_ACEOF 28082+echo "$ac_t""$ac_cv_struct_flock" 1>&6 28083+if test "$ac_cv_struct_flock" = "yes" ; then 28084+ cat >> confdefs.h <<\EOF 28085 #define HAVE_STRUCT_FLOCK 1 28086-_ACEOF 28087+EOF 28088 28089 fi 28090 28091 28092-echo "$as_me:$LINENO: checking for socklen_t" >&5 28093-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 28094-if test "${ac_cv_socklen_t+set}" = set; then 28095- echo $ECHO_N "(cached) $ECHO_C" >&6 28096+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 28097+echo "configure:16949: checking for socklen_t" >&5 28098+if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then 28099+ echo $ac_n "(cached) $ac_c" 1>&6 28100 else 28101- cat >conftest.$ac_ext <<_ACEOF 28102-/* confdefs.h. */ 28103-_ACEOF 28104-cat confdefs.h >>conftest.$ac_ext 28105-cat >>conftest.$ac_ext <<_ACEOF 28106-/* end confdefs.h. */ 28107+ cat > conftest.$ac_ext <<EOF 28108+#line 16954 "configure" 28109+#include "confdefs.h" 28110 28111 #include <sys/types.h> 28112 #include <sys/socket.h> 28113 28114-int 28115-main () 28116-{ 28117+int main() { 28118 28119 socklen_t x; 28120 28121- ; 28122- return 0; 28123-} 28124-_ACEOF 28125-rm -f conftest.$ac_objext 28126-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28127- (eval $ac_compile) 2>conftest.er1 28128- ac_status=$? 28129- grep -v '^ *+' conftest.er1 >conftest.err 28130- rm -f conftest.er1 28131- cat conftest.err >&5 28132- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28133- (exit $ac_status); } && 28134- { ac_try='test -z "$ac_c_werror_flag" 28135- || test ! -s conftest.err' 28136- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28137- (eval $ac_try) 2>&5 28138- ac_status=$? 28139- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28140- (exit $ac_status); }; } && 28141- { ac_try='test -s conftest.$ac_objext' 28142- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28143- (eval $ac_try) 2>&5 28144- ac_status=$? 28145- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28146- (exit $ac_status); }; }; then 28147- 28148+; return 0; } 28149+EOF 28150+if { (eval echo configure:16966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 28151+ rm -rf conftest* 28152+ 28153 ac_cv_socklen_t=yes 28154 28155 else 28156- echo "$as_me: failed program was:" >&5 28157-sed 's/^/| /' conftest.$ac_ext >&5 28158- 28159- 28160+ echo "configure: failed program was:" >&5 28161+ cat conftest.$ac_ext >&5 28162+ rm -rf conftest* 28163+ 28164 ac_cv_socklen_t=no 28165 28166 fi 28167-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28168+rm -f conftest* 28169 fi 28170-echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5 28171-echo "${ECHO_T}$ac_cv_socklen_t" >&6 28172-if test "$ac_cv_socklen_t" = "yes"; then 28173 28174-cat >>confdefs.h <<\_ACEOF 28175+echo "$ac_t""$ac_cv_socklen_t" 1>&6 28176+if test "$ac_cv_socklen_t" = "yes"; then 28177+ cat >> confdefs.h <<\EOF 28178 #define HAVE_SOCKLEN_T 1 28179-_ACEOF 28180+EOF 28181 28182 fi 28183 28184 28185-echo "$as_me:$LINENO: checking for size_t" >&5 28186-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 28187-if test "${ac_cv_type_size_t+set}" = set; then 28188- echo $ECHO_N "(cached) $ECHO_C" >&6 28189+echo $ac_n "checking size of size_t""... $ac_c" 1>&6 28190+echo "configure:16992: checking size of size_t" >&5 28191+if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then 28192+ echo $ac_n "(cached) $ac_c" 1>&6 28193 else 28194- cat >conftest.$ac_ext <<_ACEOF 28195-/* confdefs.h. */ 28196-_ACEOF 28197-cat confdefs.h >>conftest.$ac_ext 28198-cat >>conftest.$ac_ext <<_ACEOF 28199-/* end confdefs.h. */ 28200-$ac_includes_default 28201-int 28202-main () 28203-{ 28204-if ((size_t *) 0) 28205- return 0; 28206-if (sizeof (size_t)) 28207- return 0; 28208- ; 28209- return 0; 28210-} 28211-_ACEOF 28212-rm -f conftest.$ac_objext 28213-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28214- (eval $ac_compile) 2>conftest.er1 28215- ac_status=$? 28216- grep -v '^ *+' conftest.er1 >conftest.err 28217- rm -f conftest.er1 28218- cat conftest.err >&5 28219- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28220- (exit $ac_status); } && 28221- { ac_try='test -z "$ac_c_werror_flag" 28222- || test ! -s conftest.err' 28223- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28224- (eval $ac_try) 2>&5 28225- ac_status=$? 28226- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28227- (exit $ac_status); }; } && 28228- { ac_try='test -s conftest.$ac_objext' 28229- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28230- (eval $ac_try) 2>&5 28231- ac_status=$? 28232- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28233- (exit $ac_status); }; }; then 28234- ac_cv_type_size_t=yes 28235-else 28236- echo "$as_me: failed program was:" >&5 28237-sed 's/^/| /' conftest.$ac_ext >&5 28238- 28239-ac_cv_type_size_t=no 28240-fi 28241-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28242-fi 28243-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 28244-echo "${ECHO_T}$ac_cv_type_size_t" >&6 28245- 28246-echo "$as_me:$LINENO: checking size of size_t" >&5 28247-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 28248-if test "${ac_cv_sizeof_size_t+set}" = set; then 28249- echo $ECHO_N "(cached) $ECHO_C" >&6 28250-else 28251- if test "$ac_cv_type_size_t" = yes; then 28252- # The cast to unsigned long works around a bug in the HP C Compiler 28253- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 28254- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 28255- # This bug is HP SR number 8606223364. 28256 if test "$cross_compiling" = yes; then 28257- # Depending upon the size, compute the lo and hi bounds. 28258-cat >conftest.$ac_ext <<_ACEOF 28259-/* confdefs.h. */ 28260-_ACEOF 28261-cat confdefs.h >>conftest.$ac_ext 28262-cat >>conftest.$ac_ext <<_ACEOF 28263-/* end confdefs.h. */ 28264-$ac_includes_default 28265-int 28266-main () 28267-{ 28268-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; 28269-test_array [0] = 0 28270- 28271- ; 28272- return 0; 28273-} 28274-_ACEOF 28275-rm -f conftest.$ac_objext 28276-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28277- (eval $ac_compile) 2>conftest.er1 28278- ac_status=$? 28279- grep -v '^ *+' conftest.er1 >conftest.err 28280- rm -f conftest.er1 28281- cat conftest.err >&5 28282- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28283- (exit $ac_status); } && 28284- { ac_try='test -z "$ac_c_werror_flag" 28285- || test ! -s conftest.err' 28286- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28287- (eval $ac_try) 2>&5 28288- ac_status=$? 28289- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28290- (exit $ac_status); }; } && 28291- { ac_try='test -s conftest.$ac_objext' 28292- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28293- (eval $ac_try) 2>&5 28294- ac_status=$? 28295- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28296- (exit $ac_status); }; }; then 28297- ac_lo=0 ac_mid=0 28298- while :; do 28299- cat >conftest.$ac_ext <<_ACEOF 28300-/* confdefs.h. */ 28301-_ACEOF 28302-cat confdefs.h >>conftest.$ac_ext 28303-cat >>conftest.$ac_ext <<_ACEOF 28304-/* end confdefs.h. */ 28305-$ac_includes_default 28306-int 28307-main () 28308-{ 28309-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; 28310-test_array [0] = 0 28311- 28312- ; 28313- return 0; 28314-} 28315-_ACEOF 28316-rm -f conftest.$ac_objext 28317-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28318- (eval $ac_compile) 2>conftest.er1 28319- ac_status=$? 28320- grep -v '^ *+' conftest.er1 >conftest.err 28321- rm -f conftest.er1 28322- cat conftest.err >&5 28323- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28324- (exit $ac_status); } && 28325- { ac_try='test -z "$ac_c_werror_flag" 28326- || test ! -s conftest.err' 28327- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28328- (eval $ac_try) 2>&5 28329- ac_status=$? 28330- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28331- (exit $ac_status); }; } && 28332- { ac_try='test -s conftest.$ac_objext' 28333- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28334- (eval $ac_try) 2>&5 28335- ac_status=$? 28336- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28337- (exit $ac_status); }; }; then 28338- ac_hi=$ac_mid; break 28339-else 28340- echo "$as_me: failed program was:" >&5 28341-sed 's/^/| /' conftest.$ac_ext >&5 28342- 28343-ac_lo=`expr $ac_mid + 1` 28344- if test $ac_lo -le $ac_mid; then 28345- ac_lo= ac_hi= 28346- break 28347- fi 28348- ac_mid=`expr 2 '*' $ac_mid + 1` 28349-fi 28350-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28351- done 28352-else 28353- echo "$as_me: failed program was:" >&5 28354-sed 's/^/| /' conftest.$ac_ext >&5 28355- 28356-cat >conftest.$ac_ext <<_ACEOF 28357-/* confdefs.h. */ 28358-_ACEOF 28359-cat confdefs.h >>conftest.$ac_ext 28360-cat >>conftest.$ac_ext <<_ACEOF 28361-/* end confdefs.h. */ 28362-$ac_includes_default 28363-int 28364-main () 28365-{ 28366-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; 28367-test_array [0] = 0 28368- 28369- ; 28370- return 0; 28371-} 28372-_ACEOF 28373-rm -f conftest.$ac_objext 28374-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28375- (eval $ac_compile) 2>conftest.er1 28376- ac_status=$? 28377- grep -v '^ *+' conftest.er1 >conftest.err 28378- rm -f conftest.er1 28379- cat conftest.err >&5 28380- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28381- (exit $ac_status); } && 28382- { ac_try='test -z "$ac_c_werror_flag" 28383- || test ! -s conftest.err' 28384- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28385- (eval $ac_try) 2>&5 28386- ac_status=$? 28387- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28388- (exit $ac_status); }; } && 28389- { ac_try='test -s conftest.$ac_objext' 28390- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28391- (eval $ac_try) 2>&5 28392- ac_status=$? 28393- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28394- (exit $ac_status); }; }; then 28395- ac_hi=-1 ac_mid=-1 28396- while :; do 28397- cat >conftest.$ac_ext <<_ACEOF 28398-/* confdefs.h. */ 28399-_ACEOF 28400-cat confdefs.h >>conftest.$ac_ext 28401-cat >>conftest.$ac_ext <<_ACEOF 28402-/* end confdefs.h. */ 28403-$ac_includes_default 28404-int 28405-main () 28406-{ 28407-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; 28408-test_array [0] = 0 28409- 28410- ; 28411- return 0; 28412-} 28413-_ACEOF 28414-rm -f conftest.$ac_objext 28415-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28416- (eval $ac_compile) 2>conftest.er1 28417- ac_status=$? 28418- grep -v '^ *+' conftest.er1 >conftest.err 28419- rm -f conftest.er1 28420- cat conftest.err >&5 28421- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28422- (exit $ac_status); } && 28423- { ac_try='test -z "$ac_c_werror_flag" 28424- || test ! -s conftest.err' 28425- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28426- (eval $ac_try) 2>&5 28427- ac_status=$? 28428- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28429- (exit $ac_status); }; } && 28430- { ac_try='test -s conftest.$ac_objext' 28431- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28432- (eval $ac_try) 2>&5 28433- ac_status=$? 28434- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28435- (exit $ac_status); }; }; then 28436- ac_lo=$ac_mid; break 28437-else 28438- echo "$as_me: failed program was:" >&5 28439-sed 's/^/| /' conftest.$ac_ext >&5 28440- 28441-ac_hi=`expr '(' $ac_mid ')' - 1` 28442- if test $ac_mid -le $ac_hi; then 28443- ac_lo= ac_hi= 28444- break 28445- fi 28446- ac_mid=`expr 2 '*' $ac_mid` 28447-fi 28448-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28449- done 28450-else 28451- echo "$as_me: failed program was:" >&5 28452-sed 's/^/| /' conftest.$ac_ext >&5 28453- 28454-ac_lo= ac_hi= 28455-fi 28456-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28457-fi 28458-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28459-# Binary search between lo and hi bounds. 28460-while test "x$ac_lo" != "x$ac_hi"; do 28461- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 28462- cat >conftest.$ac_ext <<_ACEOF 28463-/* confdefs.h. */ 28464-_ACEOF 28465-cat confdefs.h >>conftest.$ac_ext 28466-cat >>conftest.$ac_ext <<_ACEOF 28467-/* end confdefs.h. */ 28468-$ac_includes_default 28469-int 28470-main () 28471-{ 28472-static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; 28473-test_array [0] = 0 28474- 28475- ; 28476- return 0; 28477-} 28478-_ACEOF 28479-rm -f conftest.$ac_objext 28480-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28481- (eval $ac_compile) 2>conftest.er1 28482- ac_status=$? 28483- grep -v '^ *+' conftest.er1 >conftest.err 28484- rm -f conftest.er1 28485- cat conftest.err >&5 28486- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28487- (exit $ac_status); } && 28488- { ac_try='test -z "$ac_c_werror_flag" 28489- || test ! -s conftest.err' 28490- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28491- (eval $ac_try) 2>&5 28492- ac_status=$? 28493- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28494- (exit $ac_status); }; } && 28495- { ac_try='test -s conftest.$ac_objext' 28496- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28497- (eval $ac_try) 2>&5 28498- ac_status=$? 28499- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28500- (exit $ac_status); }; }; then 28501- ac_hi=$ac_mid 28502+ ac_cv_sizeof_size_t=8 28503 else 28504- echo "$as_me: failed program was:" >&5 28505-sed 's/^/| /' conftest.$ac_ext >&5 28506- 28507-ac_lo=`expr '(' $ac_mid ')' + 1` 28508-fi 28509-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28510-done 28511-case $ac_lo in 28512-?*) ac_cv_sizeof_size_t=$ac_lo;; 28513-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 28514-See \`config.log' for more details." >&5 28515-echo "$as_me: error: cannot compute sizeof (size_t), 77 28516-See \`config.log' for more details." >&2;} 28517- { (exit 1); exit 1; }; } ;; 28518-esac 28519-else 28520- if test "$cross_compiling" = yes; then 28521- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 28522-See \`config.log' for more details." >&5 28523-echo "$as_me: error: cannot run test program while cross compiling 28524-See \`config.log' for more details." >&2;} 28525- { (exit 1); exit 1; }; } 28526-else 28527- cat >conftest.$ac_ext <<_ACEOF 28528-/* confdefs.h. */ 28529-_ACEOF 28530-cat confdefs.h >>conftest.$ac_ext 28531-cat >>conftest.$ac_ext <<_ACEOF 28532-/* end confdefs.h. */ 28533-$ac_includes_default 28534-long longval () { return (long) (sizeof (size_t)); } 28535-unsigned long ulongval () { return (long) (sizeof (size_t)); } 28536+ cat > conftest.$ac_ext <<EOF 28537+#line 17000 "configure" 28538+#include "confdefs.h" 28539 #include <stdio.h> 28540-#include <stdlib.h> 28541-int 28542-main () 28543+main() 28544 { 28545- 28546- FILE *f = fopen ("conftest.val", "w"); 28547- if (! f) 28548- exit (1); 28549- if (((long) (sizeof (size_t))) < 0) 28550- { 28551- long i = longval (); 28552- if (i != ((long) (sizeof (size_t)))) 28553- exit (1); 28554- fprintf (f, "%ld\n", i); 28555- } 28556- else 28557- { 28558- unsigned long i = ulongval (); 28559- if (i != ((long) (sizeof (size_t)))) 28560- exit (1); 28561- fprintf (f, "%lu\n", i); 28562- } 28563- exit (ferror (f) || fclose (f) != 0); 28564- 28565- ; 28566- return 0; 28567+ FILE *f=fopen("conftestval", "w"); 28568+ if (!f) exit(1); 28569+ fprintf(f, "%d\n", sizeof(size_t)); 28570+ exit(0); 28571 } 28572-_ACEOF 28573-rm -f conftest$ac_exeext 28574-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 28575- (eval $ac_link) 2>&5 28576- ac_status=$? 28577- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28578- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 28579- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28580- (eval $ac_try) 2>&5 28581- ac_status=$? 28582- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28583- (exit $ac_status); }; }; then 28584- ac_cv_sizeof_size_t=`cat conftest.val` 28585-else 28586- echo "$as_me: program exited with status $ac_status" >&5 28587-echo "$as_me: failed program was:" >&5 28588-sed 's/^/| /' conftest.$ac_ext >&5 28589- 28590-( exit $ac_status ) 28591-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 28592-See \`config.log' for more details." >&5 28593-echo "$as_me: error: cannot compute sizeof (size_t), 77 28594-See \`config.log' for more details." >&2;} 28595- { (exit 1); exit 1; }; } 28596-fi 28597-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 28598-fi 28599-fi 28600-rm -f conftest.val 28601+EOF 28602+if { (eval echo configure:17011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 28603+then 28604+ ac_cv_sizeof_size_t=`cat conftestval` 28605 else 28606+ echo "configure: failed program was:" >&5 28607+ cat conftest.$ac_ext >&5 28608+ rm -fr conftest* 28609 ac_cv_sizeof_size_t=0 28610 fi 28611+rm -fr conftest* 28612 fi 28613-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 28614-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 28615-cat >>confdefs.h <<_ACEOF 28616-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t 28617-_ACEOF 28618- 28619- 28620-echo "$as_me:$LINENO: checking for long long" >&5 28621-echo $ECHO_N "checking for long long... $ECHO_C" >&6 28622-if test "${ac_cv_type_long_long+set}" = set; then 28623- echo $ECHO_N "(cached) $ECHO_C" >&6 28624-else 28625- cat >conftest.$ac_ext <<_ACEOF 28626-/* confdefs.h. */ 28627-_ACEOF 28628-cat confdefs.h >>conftest.$ac_ext 28629-cat >>conftest.$ac_ext <<_ACEOF 28630-/* end confdefs.h. */ 28631-$ac_includes_default 28632-int 28633-main () 28634-{ 28635-if ((long long *) 0) 28636- return 0; 28637-if (sizeof (long long)) 28638- return 0; 28639- ; 28640- return 0; 28641-} 28642-_ACEOF 28643-rm -f conftest.$ac_objext 28644-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28645- (eval $ac_compile) 2>conftest.er1 28646- ac_status=$? 28647- grep -v '^ *+' conftest.er1 >conftest.err 28648- rm -f conftest.er1 28649- cat conftest.err >&5 28650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28651- (exit $ac_status); } && 28652- { ac_try='test -z "$ac_c_werror_flag" 28653- || test ! -s conftest.err' 28654- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28655- (eval $ac_try) 2>&5 28656- ac_status=$? 28657- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28658- (exit $ac_status); }; } && 28659- { ac_try='test -s conftest.$ac_objext' 28660- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28661- (eval $ac_try) 2>&5 28662- ac_status=$? 28663- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28664- (exit $ac_status); }; }; then 28665- ac_cv_type_long_long=yes 28666-else 28667- echo "$as_me: failed program was:" >&5 28668-sed 's/^/| /' conftest.$ac_ext >&5 28669- 28670-ac_cv_type_long_long=no 28671-fi 28672-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28673-fi 28674-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 28675-echo "${ECHO_T}$ac_cv_type_long_long" >&6 28676- 28677-echo "$as_me:$LINENO: checking size of long long" >&5 28678-echo $ECHO_N "checking size of long long... $ECHO_C" >&6 28679-if test "${ac_cv_sizeof_long_long+set}" = set; then 28680- echo $ECHO_N "(cached) $ECHO_C" >&6 28681-else 28682- if test "$ac_cv_type_long_long" = yes; then 28683- # The cast to unsigned long works around a bug in the HP C Compiler 28684- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 28685- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 28686- # This bug is HP SR number 8606223364. 28687- if test "$cross_compiling" = yes; then 28688- # Depending upon the size, compute the lo and hi bounds. 28689-cat >conftest.$ac_ext <<_ACEOF 28690-/* confdefs.h. */ 28691-_ACEOF 28692-cat confdefs.h >>conftest.$ac_ext 28693-cat >>conftest.$ac_ext <<_ACEOF 28694-/* end confdefs.h. */ 28695-$ac_includes_default 28696-int 28697-main () 28698-{ 28699-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; 28700-test_array [0] = 0 28701- 28702- ; 28703- return 0; 28704-} 28705-_ACEOF 28706-rm -f conftest.$ac_objext 28707-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28708- (eval $ac_compile) 2>conftest.er1 28709- ac_status=$? 28710- grep -v '^ *+' conftest.er1 >conftest.err 28711- rm -f conftest.er1 28712- cat conftest.err >&5 28713- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28714- (exit $ac_status); } && 28715- { ac_try='test -z "$ac_c_werror_flag" 28716- || test ! -s conftest.err' 28717- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28718- (eval $ac_try) 2>&5 28719- ac_status=$? 28720- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28721- (exit $ac_status); }; } && 28722- { ac_try='test -s conftest.$ac_objext' 28723- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28724- (eval $ac_try) 2>&5 28725- ac_status=$? 28726- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28727- (exit $ac_status); }; }; then 28728- ac_lo=0 ac_mid=0 28729- while :; do 28730- cat >conftest.$ac_ext <<_ACEOF 28731-/* confdefs.h. */ 28732-_ACEOF 28733-cat confdefs.h >>conftest.$ac_ext 28734-cat >>conftest.$ac_ext <<_ACEOF 28735-/* end confdefs.h. */ 28736-$ac_includes_default 28737-int 28738-main () 28739-{ 28740-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 28741-test_array [0] = 0 28742- 28743- ; 28744- return 0; 28745-} 28746-_ACEOF 28747-rm -f conftest.$ac_objext 28748-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28749- (eval $ac_compile) 2>conftest.er1 28750- ac_status=$? 28751- grep -v '^ *+' conftest.er1 >conftest.err 28752- rm -f conftest.er1 28753- cat conftest.err >&5 28754- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28755- (exit $ac_status); } && 28756- { ac_try='test -z "$ac_c_werror_flag" 28757- || test ! -s conftest.err' 28758- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28759- (eval $ac_try) 2>&5 28760- ac_status=$? 28761- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28762- (exit $ac_status); }; } && 28763- { ac_try='test -s conftest.$ac_objext' 28764- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28765- (eval $ac_try) 2>&5 28766- ac_status=$? 28767- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28768- (exit $ac_status); }; }; then 28769- ac_hi=$ac_mid; break 28770-else 28771- echo "$as_me: failed program was:" >&5 28772-sed 's/^/| /' conftest.$ac_ext >&5 28773- 28774-ac_lo=`expr $ac_mid + 1` 28775- if test $ac_lo -le $ac_mid; then 28776- ac_lo= ac_hi= 28777- break 28778- fi 28779- ac_mid=`expr 2 '*' $ac_mid + 1` 28780-fi 28781-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28782- done 28783-else 28784- echo "$as_me: failed program was:" >&5 28785-sed 's/^/| /' conftest.$ac_ext >&5 28786- 28787-cat >conftest.$ac_ext <<_ACEOF 28788-/* confdefs.h. */ 28789-_ACEOF 28790-cat confdefs.h >>conftest.$ac_ext 28791-cat >>conftest.$ac_ext <<_ACEOF 28792-/* end confdefs.h. */ 28793-$ac_includes_default 28794-int 28795-main () 28796-{ 28797-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; 28798-test_array [0] = 0 28799- 28800- ; 28801- return 0; 28802-} 28803-_ACEOF 28804-rm -f conftest.$ac_objext 28805-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28806- (eval $ac_compile) 2>conftest.er1 28807- ac_status=$? 28808- grep -v '^ *+' conftest.er1 >conftest.err 28809- rm -f conftest.er1 28810- cat conftest.err >&5 28811- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28812- (exit $ac_status); } && 28813- { ac_try='test -z "$ac_c_werror_flag" 28814- || test ! -s conftest.err' 28815- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28816- (eval $ac_try) 2>&5 28817- ac_status=$? 28818- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28819- (exit $ac_status); }; } && 28820- { ac_try='test -s conftest.$ac_objext' 28821- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28822- (eval $ac_try) 2>&5 28823- ac_status=$? 28824- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28825- (exit $ac_status); }; }; then 28826- ac_hi=-1 ac_mid=-1 28827- while :; do 28828- cat >conftest.$ac_ext <<_ACEOF 28829-/* confdefs.h. */ 28830-_ACEOF 28831-cat confdefs.h >>conftest.$ac_ext 28832-cat >>conftest.$ac_ext <<_ACEOF 28833-/* end confdefs.h. */ 28834-$ac_includes_default 28835-int 28836-main () 28837-{ 28838-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; 28839-test_array [0] = 0 28840- 28841- ; 28842- return 0; 28843-} 28844-_ACEOF 28845-rm -f conftest.$ac_objext 28846-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28847- (eval $ac_compile) 2>conftest.er1 28848- ac_status=$? 28849- grep -v '^ *+' conftest.er1 >conftest.err 28850- rm -f conftest.er1 28851- cat conftest.err >&5 28852- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28853- (exit $ac_status); } && 28854- { ac_try='test -z "$ac_c_werror_flag" 28855- || test ! -s conftest.err' 28856- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28857- (eval $ac_try) 2>&5 28858- ac_status=$? 28859- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28860- (exit $ac_status); }; } && 28861- { ac_try='test -s conftest.$ac_objext' 28862- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28863- (eval $ac_try) 2>&5 28864- ac_status=$? 28865- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28866- (exit $ac_status); }; }; then 28867- ac_lo=$ac_mid; break 28868-else 28869- echo "$as_me: failed program was:" >&5 28870-sed 's/^/| /' conftest.$ac_ext >&5 28871- 28872-ac_hi=`expr '(' $ac_mid ')' - 1` 28873- if test $ac_mid -le $ac_hi; then 28874- ac_lo= ac_hi= 28875- break 28876- fi 28877- ac_mid=`expr 2 '*' $ac_mid` 28878-fi 28879-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28880- done 28881-else 28882- echo "$as_me: failed program was:" >&5 28883-sed 's/^/| /' conftest.$ac_ext >&5 28884- 28885-ac_lo= ac_hi= 28886-fi 28887-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28888-fi 28889-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28890-# Binary search between lo and hi bounds. 28891-while test "x$ac_lo" != "x$ac_hi"; do 28892- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 28893- cat >conftest.$ac_ext <<_ACEOF 28894-/* confdefs.h. */ 28895-_ACEOF 28896-cat confdefs.h >>conftest.$ac_ext 28897-cat >>conftest.$ac_ext <<_ACEOF 28898-/* end confdefs.h. */ 28899-$ac_includes_default 28900-int 28901-main () 28902-{ 28903-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 28904-test_array [0] = 0 28905- 28906- ; 28907- return 0; 28908-} 28909-_ACEOF 28910-rm -f conftest.$ac_objext 28911-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 28912- (eval $ac_compile) 2>conftest.er1 28913- ac_status=$? 28914- grep -v '^ *+' conftest.er1 >conftest.err 28915- rm -f conftest.er1 28916- cat conftest.err >&5 28917- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28918- (exit $ac_status); } && 28919- { ac_try='test -z "$ac_c_werror_flag" 28920- || test ! -s conftest.err' 28921- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28922- (eval $ac_try) 2>&5 28923- ac_status=$? 28924- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28925- (exit $ac_status); }; } && 28926- { ac_try='test -s conftest.$ac_objext' 28927- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 28928- (eval $ac_try) 2>&5 28929- ac_status=$? 28930- echo "$as_me:$LINENO: \$? = $ac_status" >&5 28931- (exit $ac_status); }; }; then 28932- ac_hi=$ac_mid 28933-else 28934- echo "$as_me: failed program was:" >&5 28935-sed 's/^/| /' conftest.$ac_ext >&5 28936- 28937-ac_lo=`expr '(' $ac_mid ')' + 1` 28938-fi 28939-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 28940-done 28941-case $ac_lo in 28942-?*) ac_cv_sizeof_long_long=$ac_lo;; 28943-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 28944-See \`config.log' for more details." >&5 28945-echo "$as_me: error: cannot compute sizeof (long long), 77 28946-See \`config.log' for more details." >&2;} 28947- { (exit 1); exit 1; }; } ;; 28948-esac 28949-else 28950- if test "$cross_compiling" = yes; then 28951- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 28952-See \`config.log' for more details." >&5 28953-echo "$as_me: error: cannot run test program while cross compiling 28954-See \`config.log' for more details." >&2;} 28955- { (exit 1); exit 1; }; } 28956-else 28957- cat >conftest.$ac_ext <<_ACEOF 28958-/* confdefs.h. */ 28959-_ACEOF 28960-cat confdefs.h >>conftest.$ac_ext 28961-cat >>conftest.$ac_ext <<_ACEOF 28962-/* end confdefs.h. */ 28963-$ac_includes_default 28964-long longval () { return (long) (sizeof (long long)); } 28965-unsigned long ulongval () { return (long) (sizeof (long long)); } 28966-#include <stdio.h> 28967-#include <stdlib.h> 28968-int 28969-main () 28970-{ 28971- 28972- FILE *f = fopen ("conftest.val", "w"); 28973- if (! f) 28974- exit (1); 28975- if (((long) (sizeof (long long))) < 0) 28976- { 28977- long i = longval (); 28978- if (i != ((long) (sizeof (long long)))) 28979- exit (1); 28980- fprintf (f, "%ld\n", i); 28981- } 28982- else 28983- { 28984- unsigned long i = ulongval (); 28985- if (i != ((long) (sizeof (long long)))) 28986- exit (1); 28987- fprintf (f, "%lu\n", i); 28988- } 28989- exit (ferror (f) || fclose (f) != 0); 28990- 28991- ; 28992- return 0; 28993-} 28994-_ACEOF 28995-rm -f conftest$ac_exeext 28996-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 28997- (eval $ac_link) 2>&5 28998- ac_status=$? 28999- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29000- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 29001- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29002- (eval $ac_try) 2>&5 29003- ac_status=$? 29004- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29005- (exit $ac_status); }; }; then 29006- ac_cv_sizeof_long_long=`cat conftest.val` 29007-else 29008- echo "$as_me: program exited with status $ac_status" >&5 29009-echo "$as_me: failed program was:" >&5 29010-sed 's/^/| /' conftest.$ac_ext >&5 29011- 29012-( exit $ac_status ) 29013-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 29014-See \`config.log' for more details." >&5 29015-echo "$as_me: error: cannot compute sizeof (long long), 77 29016-See \`config.log' for more details." >&2;} 29017- { (exit 1); exit 1; }; } 29018-fi 29019-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 29020-fi 29021-fi 29022-rm -f conftest.val 29023-else 29024- ac_cv_sizeof_long_long=0 29025-fi 29026-fi 29027-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 29028-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 29029-cat >>confdefs.h <<_ACEOF 29030-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 29031-_ACEOF 29032 29033- 29034-echo "$as_me:$LINENO: checking for long long int" >&5 29035-echo $ECHO_N "checking for long long int... $ECHO_C" >&6 29036-if test "${ac_cv_type_long_long_int+set}" = set; then 29037- echo $ECHO_N "(cached) $ECHO_C" >&6 29038-else 29039- cat >conftest.$ac_ext <<_ACEOF 29040-/* confdefs.h. */ 29041-_ACEOF 29042-cat confdefs.h >>conftest.$ac_ext 29043-cat >>conftest.$ac_ext <<_ACEOF 29044-/* end confdefs.h. */ 29045-$ac_includes_default 29046-int 29047-main () 29048-{ 29049-if ((long long int *) 0) 29050- return 0; 29051-if (sizeof (long long int)) 29052- return 0; 29053- ; 29054- return 0; 29055-} 29056-_ACEOF 29057-rm -f conftest.$ac_objext 29058-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29059- (eval $ac_compile) 2>conftest.er1 29060- ac_status=$? 29061- grep -v '^ *+' conftest.er1 >conftest.err 29062- rm -f conftest.er1 29063- cat conftest.err >&5 29064- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29065- (exit $ac_status); } && 29066- { ac_try='test -z "$ac_c_werror_flag" 29067- || test ! -s conftest.err' 29068- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29069- (eval $ac_try) 2>&5 29070- ac_status=$? 29071- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29072- (exit $ac_status); }; } && 29073- { ac_try='test -s conftest.$ac_objext' 29074- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29075- (eval $ac_try) 2>&5 29076- ac_status=$? 29077- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29078- (exit $ac_status); }; }; then 29079- ac_cv_type_long_long_int=yes 29080-else 29081- echo "$as_me: failed program was:" >&5 29082-sed 's/^/| /' conftest.$ac_ext >&5 29083- 29084-ac_cv_type_long_long_int=no 29085-fi 29086-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29087-fi 29088-echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 29089-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 29090- 29091-echo "$as_me:$LINENO: checking size of long long int" >&5 29092-echo $ECHO_N "checking size of long long int... $ECHO_C" >&6 29093-if test "${ac_cv_sizeof_long_long_int+set}" = set; then 29094- echo $ECHO_N "(cached) $ECHO_C" >&6 29095-else 29096- if test "$ac_cv_type_long_long_int" = yes; then 29097- # The cast to unsigned long works around a bug in the HP C Compiler 29098- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 29099- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 29100- # This bug is HP SR number 8606223364. 29101- if test "$cross_compiling" = yes; then 29102- # Depending upon the size, compute the lo and hi bounds. 29103-cat >conftest.$ac_ext <<_ACEOF 29104-/* confdefs.h. */ 29105-_ACEOF 29106-cat confdefs.h >>conftest.$ac_ext 29107-cat >>conftest.$ac_ext <<_ACEOF 29108-/* end confdefs.h. */ 29109-$ac_includes_default 29110-int 29111-main () 29112-{ 29113-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)]; 29114-test_array [0] = 0 29115- 29116- ; 29117- return 0; 29118-} 29119-_ACEOF 29120-rm -f conftest.$ac_objext 29121-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29122- (eval $ac_compile) 2>conftest.er1 29123- ac_status=$? 29124- grep -v '^ *+' conftest.er1 >conftest.err 29125- rm -f conftest.er1 29126- cat conftest.err >&5 29127- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29128- (exit $ac_status); } && 29129- { ac_try='test -z "$ac_c_werror_flag" 29130- || test ! -s conftest.err' 29131- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29132- (eval $ac_try) 2>&5 29133- ac_status=$? 29134- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29135- (exit $ac_status); }; } && 29136- { ac_try='test -s conftest.$ac_objext' 29137- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29138- (eval $ac_try) 2>&5 29139- ac_status=$? 29140- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29141- (exit $ac_status); }; }; then 29142- ac_lo=0 ac_mid=0 29143- while :; do 29144- cat >conftest.$ac_ext <<_ACEOF 29145-/* confdefs.h. */ 29146-_ACEOF 29147-cat confdefs.h >>conftest.$ac_ext 29148-cat >>conftest.$ac_ext <<_ACEOF 29149-/* end confdefs.h. */ 29150-$ac_includes_default 29151-int 29152-main () 29153-{ 29154-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; 29155-test_array [0] = 0 29156- 29157- ; 29158- return 0; 29159-} 29160-_ACEOF 29161-rm -f conftest.$ac_objext 29162-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29163- (eval $ac_compile) 2>conftest.er1 29164- ac_status=$? 29165- grep -v '^ *+' conftest.er1 >conftest.err 29166- rm -f conftest.er1 29167- cat conftest.err >&5 29168- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29169- (exit $ac_status); } && 29170- { ac_try='test -z "$ac_c_werror_flag" 29171- || test ! -s conftest.err' 29172- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29173- (eval $ac_try) 2>&5 29174- ac_status=$? 29175- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29176- (exit $ac_status); }; } && 29177- { ac_try='test -s conftest.$ac_objext' 29178- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29179- (eval $ac_try) 2>&5 29180- ac_status=$? 29181- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29182- (exit $ac_status); }; }; then 29183- ac_hi=$ac_mid; break 29184-else 29185- echo "$as_me: failed program was:" >&5 29186-sed 's/^/| /' conftest.$ac_ext >&5 29187- 29188-ac_lo=`expr $ac_mid + 1` 29189- if test $ac_lo -le $ac_mid; then 29190- ac_lo= ac_hi= 29191- break 29192- fi 29193- ac_mid=`expr 2 '*' $ac_mid + 1` 29194-fi 29195-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29196- done 29197-else 29198- echo "$as_me: failed program was:" >&5 29199-sed 's/^/| /' conftest.$ac_ext >&5 29200- 29201-cat >conftest.$ac_ext <<_ACEOF 29202-/* confdefs.h. */ 29203-_ACEOF 29204-cat confdefs.h >>conftest.$ac_ext 29205-cat >>conftest.$ac_ext <<_ACEOF 29206-/* end confdefs.h. */ 29207-$ac_includes_default 29208-int 29209-main () 29210-{ 29211-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)]; 29212-test_array [0] = 0 29213- 29214- ; 29215- return 0; 29216-} 29217-_ACEOF 29218-rm -f conftest.$ac_objext 29219-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29220- (eval $ac_compile) 2>conftest.er1 29221- ac_status=$? 29222- grep -v '^ *+' conftest.er1 >conftest.err 29223- rm -f conftest.er1 29224- cat conftest.err >&5 29225- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29226- (exit $ac_status); } && 29227- { ac_try='test -z "$ac_c_werror_flag" 29228- || test ! -s conftest.err' 29229- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29230- (eval $ac_try) 2>&5 29231- ac_status=$? 29232- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29233- (exit $ac_status); }; } && 29234- { ac_try='test -s conftest.$ac_objext' 29235- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29236- (eval $ac_try) 2>&5 29237- ac_status=$? 29238- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29239- (exit $ac_status); }; }; then 29240- ac_hi=-1 ac_mid=-1 29241- while :; do 29242- cat >conftest.$ac_ext <<_ACEOF 29243-/* confdefs.h. */ 29244-_ACEOF 29245-cat confdefs.h >>conftest.$ac_ext 29246-cat >>conftest.$ac_ext <<_ACEOF 29247-/* end confdefs.h. */ 29248-$ac_includes_default 29249-int 29250-main () 29251-{ 29252-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)]; 29253-test_array [0] = 0 29254- 29255- ; 29256- return 0; 29257-} 29258-_ACEOF 29259-rm -f conftest.$ac_objext 29260-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29261- (eval $ac_compile) 2>conftest.er1 29262- ac_status=$? 29263- grep -v '^ *+' conftest.er1 >conftest.err 29264- rm -f conftest.er1 29265- cat conftest.err >&5 29266- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29267- (exit $ac_status); } && 29268- { ac_try='test -z "$ac_c_werror_flag" 29269- || test ! -s conftest.err' 29270- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29271- (eval $ac_try) 2>&5 29272- ac_status=$? 29273- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29274- (exit $ac_status); }; } && 29275- { ac_try='test -s conftest.$ac_objext' 29276- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29277- (eval $ac_try) 2>&5 29278- ac_status=$? 29279- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29280- (exit $ac_status); }; }; then 29281- ac_lo=$ac_mid; break 29282-else 29283- echo "$as_me: failed program was:" >&5 29284-sed 's/^/| /' conftest.$ac_ext >&5 29285- 29286-ac_hi=`expr '(' $ac_mid ')' - 1` 29287- if test $ac_mid -le $ac_hi; then 29288- ac_lo= ac_hi= 29289- break 29290- fi 29291- ac_mid=`expr 2 '*' $ac_mid` 29292-fi 29293-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29294- done 29295-else 29296- echo "$as_me: failed program was:" >&5 29297-sed 's/^/| /' conftest.$ac_ext >&5 29298- 29299-ac_lo= ac_hi= 29300-fi 29301-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29302-fi 29303-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29304-# Binary search between lo and hi bounds. 29305-while test "x$ac_lo" != "x$ac_hi"; do 29306- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 29307- cat >conftest.$ac_ext <<_ACEOF 29308-/* confdefs.h. */ 29309-_ACEOF 29310-cat confdefs.h >>conftest.$ac_ext 29311-cat >>conftest.$ac_ext <<_ACEOF 29312-/* end confdefs.h. */ 29313-$ac_includes_default 29314-int 29315-main () 29316-{ 29317-static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; 29318-test_array [0] = 0 29319- 29320- ; 29321- return 0; 29322-} 29323-_ACEOF 29324-rm -f conftest.$ac_objext 29325-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29326- (eval $ac_compile) 2>conftest.er1 29327- ac_status=$? 29328- grep -v '^ *+' conftest.er1 >conftest.err 29329- rm -f conftest.er1 29330- cat conftest.err >&5 29331- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29332- (exit $ac_status); } && 29333- { ac_try='test -z "$ac_c_werror_flag" 29334- || test ! -s conftest.err' 29335- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29336- (eval $ac_try) 2>&5 29337- ac_status=$? 29338- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29339- (exit $ac_status); }; } && 29340- { ac_try='test -s conftest.$ac_objext' 29341- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29342- (eval $ac_try) 2>&5 29343- ac_status=$? 29344- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29345- (exit $ac_status); }; }; then 29346- ac_hi=$ac_mid 29347-else 29348- echo "$as_me: failed program was:" >&5 29349-sed 's/^/| /' conftest.$ac_ext >&5 29350- 29351-ac_lo=`expr '(' $ac_mid ')' + 1` 29352 fi 29353-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29354-done 29355-case $ac_lo in 29356-?*) ac_cv_sizeof_long_long_int=$ac_lo;; 29357-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 29358-See \`config.log' for more details." >&5 29359-echo "$as_me: error: cannot compute sizeof (long long int), 77 29360-See \`config.log' for more details." >&2;} 29361- { (exit 1); exit 1; }; } ;; 29362-esac 29363-else 29364- if test "$cross_compiling" = yes; then 29365- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 29366-See \`config.log' for more details." >&5 29367-echo "$as_me: error: cannot run test program while cross compiling 29368-See \`config.log' for more details." >&2;} 29369- { (exit 1); exit 1; }; } 29370-else 29371- cat >conftest.$ac_ext <<_ACEOF 29372-/* confdefs.h. */ 29373-_ACEOF 29374-cat confdefs.h >>conftest.$ac_ext 29375-cat >>conftest.$ac_ext <<_ACEOF 29376-/* end confdefs.h. */ 29377-$ac_includes_default 29378-long longval () { return (long) (sizeof (long long int)); } 29379-unsigned long ulongval () { return (long) (sizeof (long long int)); } 29380-#include <stdio.h> 29381-#include <stdlib.h> 29382-int 29383-main () 29384-{ 29385- 29386- FILE *f = fopen ("conftest.val", "w"); 29387- if (! f) 29388- exit (1); 29389- if (((long) (sizeof (long long int))) < 0) 29390- { 29391- long i = longval (); 29392- if (i != ((long) (sizeof (long long int)))) 29393- exit (1); 29394- fprintf (f, "%ld\n", i); 29395- } 29396- else 29397- { 29398- unsigned long i = ulongval (); 29399- if (i != ((long) (sizeof (long long int)))) 29400- exit (1); 29401- fprintf (f, "%lu\n", i); 29402- } 29403- exit (ferror (f) || fclose (f) != 0); 29404- 29405- ; 29406- return 0; 29407-} 29408-_ACEOF 29409-rm -f conftest$ac_exeext 29410-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 29411- (eval $ac_link) 2>&5 29412- ac_status=$? 29413- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29414- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 29415- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29416- (eval $ac_try) 2>&5 29417- ac_status=$? 29418- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29419- (exit $ac_status); }; }; then 29420- ac_cv_sizeof_long_long_int=`cat conftest.val` 29421-else 29422- echo "$as_me: program exited with status $ac_status" >&5 29423-echo "$as_me: failed program was:" >&5 29424-sed 's/^/| /' conftest.$ac_ext >&5 29425- 29426-( exit $ac_status ) 29427-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77 29428-See \`config.log' for more details." >&5 29429-echo "$as_me: error: cannot compute sizeof (long long int), 77 29430-See \`config.log' for more details." >&2;} 29431- { (exit 1); exit 1; }; } 29432-fi 29433-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 29434-fi 29435-fi 29436-rm -f conftest.val 29437-else 29438- ac_cv_sizeof_long_long_int=0 29439-fi 29440-fi 29441-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5 29442-echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 29443-cat >>confdefs.h <<_ACEOF 29444-#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int 29445-_ACEOF 29446- 29447- 29448-echo "$as_me:$LINENO: checking for long" >&5 29449-echo $ECHO_N "checking for long... $ECHO_C" >&6 29450-if test "${ac_cv_type_long+set}" = set; then 29451- echo $ECHO_N "(cached) $ECHO_C" >&6 29452-else 29453- cat >conftest.$ac_ext <<_ACEOF 29454-/* confdefs.h. */ 29455-_ACEOF 29456-cat confdefs.h >>conftest.$ac_ext 29457-cat >>conftest.$ac_ext <<_ACEOF 29458-/* end confdefs.h. */ 29459-$ac_includes_default 29460-int 29461-main () 29462-{ 29463-if ((long *) 0) 29464- return 0; 29465-if (sizeof (long)) 29466- return 0; 29467- ; 29468- return 0; 29469-} 29470-_ACEOF 29471-rm -f conftest.$ac_objext 29472-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29473- (eval $ac_compile) 2>conftest.er1 29474- ac_status=$? 29475- grep -v '^ *+' conftest.er1 >conftest.err 29476- rm -f conftest.er1 29477- cat conftest.err >&5 29478- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29479- (exit $ac_status); } && 29480- { ac_try='test -z "$ac_c_werror_flag" 29481- || test ! -s conftest.err' 29482- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29483- (eval $ac_try) 2>&5 29484- ac_status=$? 29485- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29486- (exit $ac_status); }; } && 29487- { ac_try='test -s conftest.$ac_objext' 29488- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29489- (eval $ac_try) 2>&5 29490- ac_status=$? 29491- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29492- (exit $ac_status); }; }; then 29493- ac_cv_type_long=yes 29494-else 29495- echo "$as_me: failed program was:" >&5 29496-sed 's/^/| /' conftest.$ac_ext >&5 29497- 29498-ac_cv_type_long=no 29499-fi 29500-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29501-fi 29502-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 29503-echo "${ECHO_T}$ac_cv_type_long" >&6 29504- 29505-echo "$as_me:$LINENO: checking size of long" >&5 29506-echo $ECHO_N "checking size of long... $ECHO_C" >&6 29507-if test "${ac_cv_sizeof_long+set}" = set; then 29508- echo $ECHO_N "(cached) $ECHO_C" >&6 29509-else 29510- if test "$ac_cv_type_long" = yes; then 29511- # The cast to unsigned long works around a bug in the HP C Compiler 29512- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 29513- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 29514- # This bug is HP SR number 8606223364. 29515- if test "$cross_compiling" = yes; then 29516- # Depending upon the size, compute the lo and hi bounds. 29517-cat >conftest.$ac_ext <<_ACEOF 29518-/* confdefs.h. */ 29519-_ACEOF 29520-cat confdefs.h >>conftest.$ac_ext 29521-cat >>conftest.$ac_ext <<_ACEOF 29522-/* end confdefs.h. */ 29523-$ac_includes_default 29524-int 29525-main () 29526-{ 29527-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; 29528-test_array [0] = 0 29529- 29530- ; 29531- return 0; 29532-} 29533-_ACEOF 29534-rm -f conftest.$ac_objext 29535-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29536- (eval $ac_compile) 2>conftest.er1 29537- ac_status=$? 29538- grep -v '^ *+' conftest.er1 >conftest.err 29539- rm -f conftest.er1 29540- cat conftest.err >&5 29541- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29542- (exit $ac_status); } && 29543- { ac_try='test -z "$ac_c_werror_flag" 29544- || test ! -s conftest.err' 29545- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29546- (eval $ac_try) 2>&5 29547- ac_status=$? 29548- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29549- (exit $ac_status); }; } && 29550- { ac_try='test -s conftest.$ac_objext' 29551- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29552- (eval $ac_try) 2>&5 29553- ac_status=$? 29554- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29555- (exit $ac_status); }; }; then 29556- ac_lo=0 ac_mid=0 29557- while :; do 29558- cat >conftest.$ac_ext <<_ACEOF 29559-/* confdefs.h. */ 29560-_ACEOF 29561-cat confdefs.h >>conftest.$ac_ext 29562-cat >>conftest.$ac_ext <<_ACEOF 29563-/* end confdefs.h. */ 29564-$ac_includes_default 29565-int 29566-main () 29567-{ 29568-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 29569-test_array [0] = 0 29570- 29571- ; 29572- return 0; 29573-} 29574-_ACEOF 29575-rm -f conftest.$ac_objext 29576-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29577- (eval $ac_compile) 2>conftest.er1 29578- ac_status=$? 29579- grep -v '^ *+' conftest.er1 >conftest.err 29580- rm -f conftest.er1 29581- cat conftest.err >&5 29582- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29583- (exit $ac_status); } && 29584- { ac_try='test -z "$ac_c_werror_flag" 29585- || test ! -s conftest.err' 29586- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29587- (eval $ac_try) 2>&5 29588- ac_status=$? 29589- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29590- (exit $ac_status); }; } && 29591- { ac_try='test -s conftest.$ac_objext' 29592- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29593- (eval $ac_try) 2>&5 29594- ac_status=$? 29595- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29596- (exit $ac_status); }; }; then 29597- ac_hi=$ac_mid; break 29598-else 29599- echo "$as_me: failed program was:" >&5 29600-sed 's/^/| /' conftest.$ac_ext >&5 29601- 29602-ac_lo=`expr $ac_mid + 1` 29603- if test $ac_lo -le $ac_mid; then 29604- ac_lo= ac_hi= 29605- break 29606- fi 29607- ac_mid=`expr 2 '*' $ac_mid + 1` 29608-fi 29609-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29610- done 29611-else 29612- echo "$as_me: failed program was:" >&5 29613-sed 's/^/| /' conftest.$ac_ext >&5 29614- 29615-cat >conftest.$ac_ext <<_ACEOF 29616-/* confdefs.h. */ 29617-_ACEOF 29618-cat confdefs.h >>conftest.$ac_ext 29619-cat >>conftest.$ac_ext <<_ACEOF 29620-/* end confdefs.h. */ 29621-$ac_includes_default 29622-int 29623-main () 29624-{ 29625-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; 29626-test_array [0] = 0 29627- 29628- ; 29629- return 0; 29630-} 29631-_ACEOF 29632-rm -f conftest.$ac_objext 29633-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29634- (eval $ac_compile) 2>conftest.er1 29635- ac_status=$? 29636- grep -v '^ *+' conftest.er1 >conftest.err 29637- rm -f conftest.er1 29638- cat conftest.err >&5 29639- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29640- (exit $ac_status); } && 29641- { ac_try='test -z "$ac_c_werror_flag" 29642- || test ! -s conftest.err' 29643- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29644- (eval $ac_try) 2>&5 29645- ac_status=$? 29646- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29647- (exit $ac_status); }; } && 29648- { ac_try='test -s conftest.$ac_objext' 29649- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29650- (eval $ac_try) 2>&5 29651- ac_status=$? 29652- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29653- (exit $ac_status); }; }; then 29654- ac_hi=-1 ac_mid=-1 29655- while :; do 29656- cat >conftest.$ac_ext <<_ACEOF 29657-/* confdefs.h. */ 29658-_ACEOF 29659-cat confdefs.h >>conftest.$ac_ext 29660-cat >>conftest.$ac_ext <<_ACEOF 29661-/* end confdefs.h. */ 29662-$ac_includes_default 29663-int 29664-main () 29665-{ 29666-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; 29667-test_array [0] = 0 29668- 29669- ; 29670- return 0; 29671-} 29672-_ACEOF 29673-rm -f conftest.$ac_objext 29674-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29675- (eval $ac_compile) 2>conftest.er1 29676- ac_status=$? 29677- grep -v '^ *+' conftest.er1 >conftest.err 29678- rm -f conftest.er1 29679- cat conftest.err >&5 29680- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29681- (exit $ac_status); } && 29682- { ac_try='test -z "$ac_c_werror_flag" 29683- || test ! -s conftest.err' 29684- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29685- (eval $ac_try) 2>&5 29686- ac_status=$? 29687- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29688- (exit $ac_status); }; } && 29689- { ac_try='test -s conftest.$ac_objext' 29690- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29691- (eval $ac_try) 2>&5 29692- ac_status=$? 29693- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29694- (exit $ac_status); }; }; then 29695- ac_lo=$ac_mid; break 29696-else 29697- echo "$as_me: failed program was:" >&5 29698-sed 's/^/| /' conftest.$ac_ext >&5 29699- 29700-ac_hi=`expr '(' $ac_mid ')' - 1` 29701- if test $ac_mid -le $ac_hi; then 29702- ac_lo= ac_hi= 29703- break 29704- fi 29705- ac_mid=`expr 2 '*' $ac_mid` 29706-fi 29707-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29708- done 29709-else 29710- echo "$as_me: failed program was:" >&5 29711-sed 's/^/| /' conftest.$ac_ext >&5 29712- 29713-ac_lo= ac_hi= 29714-fi 29715-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29716-fi 29717-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29718-# Binary search between lo and hi bounds. 29719-while test "x$ac_lo" != "x$ac_hi"; do 29720- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 29721- cat >conftest.$ac_ext <<_ACEOF 29722-/* confdefs.h. */ 29723-_ACEOF 29724-cat confdefs.h >>conftest.$ac_ext 29725-cat >>conftest.$ac_ext <<_ACEOF 29726-/* end confdefs.h. */ 29727-$ac_includes_default 29728-int 29729-main () 29730-{ 29731-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 29732-test_array [0] = 0 29733+echo "$ac_t""$ac_cv_sizeof_size_t" 1>&6 29734+cat >> confdefs.h <<EOF 29735+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t 29736+EOF 29737 29738- ; 29739- return 0; 29740-} 29741-_ACEOF 29742-rm -f conftest.$ac_objext 29743-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29744- (eval $ac_compile) 2>conftest.er1 29745- ac_status=$? 29746- grep -v '^ *+' conftest.er1 >conftest.err 29747- rm -f conftest.er1 29748- cat conftest.err >&5 29749- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29750- (exit $ac_status); } && 29751- { ac_try='test -z "$ac_c_werror_flag" 29752- || test ! -s conftest.err' 29753- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29754- (eval $ac_try) 2>&5 29755- ac_status=$? 29756- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29757- (exit $ac_status); }; } && 29758- { ac_try='test -s conftest.$ac_objext' 29759- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29760- (eval $ac_try) 2>&5 29761- ac_status=$? 29762- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29763- (exit $ac_status); }; }; then 29764- ac_hi=$ac_mid 29765-else 29766- echo "$as_me: failed program was:" >&5 29767-sed 's/^/| /' conftest.$ac_ext >&5 29768 29769-ac_lo=`expr '(' $ac_mid ')' + 1` 29770-fi 29771-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29772-done 29773-case $ac_lo in 29774-?*) ac_cv_sizeof_long=$ac_lo;; 29775-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 29776-See \`config.log' for more details." >&5 29777-echo "$as_me: error: cannot compute sizeof (long), 77 29778-See \`config.log' for more details." >&2;} 29779- { (exit 1); exit 1; }; } ;; 29780-esac 29781+echo $ac_n "checking size of long long""... $ac_c" 1>&6 29782+echo "configure:17031: checking size of long long" >&5 29783+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then 29784+ echo $ac_n "(cached) $ac_c" 1>&6 29785 else 29786 if test "$cross_compiling" = yes; then 29787- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 29788-See \`config.log' for more details." >&5 29789-echo "$as_me: error: cannot run test program while cross compiling 29790-See \`config.log' for more details." >&2;} 29791- { (exit 1); exit 1; }; } 29792-else 29793- cat >conftest.$ac_ext <<_ACEOF 29794-/* confdefs.h. */ 29795-_ACEOF 29796-cat confdefs.h >>conftest.$ac_ext 29797-cat >>conftest.$ac_ext <<_ACEOF 29798-/* end confdefs.h. */ 29799-$ac_includes_default 29800-long longval () { return (long) (sizeof (long)); } 29801-unsigned long ulongval () { return (long) (sizeof (long)); } 29802+ ac_cv_sizeof_long_long=8 29803+else 29804+ cat > conftest.$ac_ext <<EOF 29805+#line 17039 "configure" 29806+#include "confdefs.h" 29807 #include <stdio.h> 29808-#include <stdlib.h> 29809-int 29810-main () 29811+main() 29812 { 29813- 29814- FILE *f = fopen ("conftest.val", "w"); 29815- if (! f) 29816- exit (1); 29817- if (((long) (sizeof (long))) < 0) 29818- { 29819- long i = longval (); 29820- if (i != ((long) (sizeof (long)))) 29821- exit (1); 29822- fprintf (f, "%ld\n", i); 29823- } 29824- else 29825- { 29826- unsigned long i = ulongval (); 29827- if (i != ((long) (sizeof (long)))) 29828- exit (1); 29829- fprintf (f, "%lu\n", i); 29830- } 29831- exit (ferror (f) || fclose (f) != 0); 29832- 29833- ; 29834- return 0; 29835+ FILE *f=fopen("conftestval", "w"); 29836+ if (!f) exit(1); 29837+ fprintf(f, "%d\n", sizeof(long long)); 29838+ exit(0); 29839 } 29840-_ACEOF 29841-rm -f conftest$ac_exeext 29842-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 29843- (eval $ac_link) 2>&5 29844- ac_status=$? 29845- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29846- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 29847- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29848- (eval $ac_try) 2>&5 29849- ac_status=$? 29850- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29851- (exit $ac_status); }; }; then 29852- ac_cv_sizeof_long=`cat conftest.val` 29853-else 29854- echo "$as_me: program exited with status $ac_status" >&5 29855-echo "$as_me: failed program was:" >&5 29856-sed 's/^/| /' conftest.$ac_ext >&5 29857- 29858-( exit $ac_status ) 29859-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 29860-See \`config.log' for more details." >&5 29861-echo "$as_me: error: cannot compute sizeof (long), 77 29862-See \`config.log' for more details." >&2;} 29863- { (exit 1); exit 1; }; } 29864-fi 29865-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 29866-fi 29867-fi 29868-rm -f conftest.val 29869+EOF 29870+if { (eval echo configure:17050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 29871+then 29872+ ac_cv_sizeof_long_long=`cat conftestval` 29873 else 29874- ac_cv_sizeof_long=0 29875+ echo "configure: failed program was:" >&5 29876+ cat conftest.$ac_ext >&5 29877+ rm -fr conftest* 29878+ ac_cv_sizeof_long_long=0 29879 fi 29880+rm -fr conftest* 29881 fi 29882-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 29883-echo "${ECHO_T}$ac_cv_sizeof_long" >&6 29884-cat >>confdefs.h <<_ACEOF 29885-#define SIZEOF_LONG $ac_cv_sizeof_long 29886-_ACEOF 29887 29888+fi 29889+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 29890+cat >> confdefs.h <<EOF 29891+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 29892+EOF 29893 29894-echo "$as_me:$LINENO: checking for int" >&5 29895-echo $ECHO_N "checking for int... $ECHO_C" >&6 29896-if test "${ac_cv_type_int+set}" = set; then 29897- echo $ECHO_N "(cached) $ECHO_C" >&6 29898-else 29899- cat >conftest.$ac_ext <<_ACEOF 29900-/* confdefs.h. */ 29901-_ACEOF 29902-cat confdefs.h >>conftest.$ac_ext 29903-cat >>conftest.$ac_ext <<_ACEOF 29904-/* end confdefs.h. */ 29905-$ac_includes_default 29906-int 29907-main () 29908-{ 29909-if ((int *) 0) 29910- return 0; 29911-if (sizeof (int)) 29912- return 0; 29913- ; 29914- return 0; 29915-} 29916-_ACEOF 29917-rm -f conftest.$ac_objext 29918-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29919- (eval $ac_compile) 2>conftest.er1 29920- ac_status=$? 29921- grep -v '^ *+' conftest.er1 >conftest.err 29922- rm -f conftest.er1 29923- cat conftest.err >&5 29924- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29925- (exit $ac_status); } && 29926- { ac_try='test -z "$ac_c_werror_flag" 29927- || test ! -s conftest.err' 29928- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29929- (eval $ac_try) 2>&5 29930- ac_status=$? 29931- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29932- (exit $ac_status); }; } && 29933- { ac_try='test -s conftest.$ac_objext' 29934- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 29935- (eval $ac_try) 2>&5 29936- ac_status=$? 29937- echo "$as_me:$LINENO: \$? = $ac_status" >&5 29938- (exit $ac_status); }; }; then 29939- ac_cv_type_int=yes 29940-else 29941- echo "$as_me: failed program was:" >&5 29942-sed 's/^/| /' conftest.$ac_ext >&5 29943- 29944-ac_cv_type_int=no 29945-fi 29946-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 29947-fi 29948-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 29949-echo "${ECHO_T}$ac_cv_type_int" >&6 29950- 29951-echo "$as_me:$LINENO: checking size of int" >&5 29952-echo $ECHO_N "checking size of int... $ECHO_C" >&6 29953-if test "${ac_cv_sizeof_int+set}" = set; then 29954- echo $ECHO_N "(cached) $ECHO_C" >&6 29955-else 29956- if test "$ac_cv_type_int" = yes; then 29957- # The cast to unsigned long works around a bug in the HP C Compiler 29958- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 29959- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 29960- # This bug is HP SR number 8606223364. 29961+ 29962+echo $ac_n "checking size of long long int""... $ac_c" 1>&6 29963+echo "configure:17070: checking size of long long int" >&5 29964+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then 29965+ echo $ac_n "(cached) $ac_c" 1>&6 29966+else 29967 if test "$cross_compiling" = yes; then 29968- # Depending upon the size, compute the lo and hi bounds. 29969-cat >conftest.$ac_ext <<_ACEOF 29970-/* confdefs.h. */ 29971-_ACEOF 29972-cat confdefs.h >>conftest.$ac_ext 29973-cat >>conftest.$ac_ext <<_ACEOF 29974-/* end confdefs.h. */ 29975-$ac_includes_default 29976-int 29977-main () 29978+ ac_cv_sizeof_long_long_int=8 29979+else 29980+ cat > conftest.$ac_ext <<EOF 29981+#line 17078 "configure" 29982+#include "confdefs.h" 29983+#include <stdio.h> 29984+main() 29985 { 29986-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; 29987-test_array [0] = 0 29988- 29989- ; 29990- return 0; 29991+ FILE *f=fopen("conftestval", "w"); 29992+ if (!f) exit(1); 29993+ fprintf(f, "%d\n", sizeof(long long int)); 29994+ exit(0); 29995 } 29996-_ACEOF 29997-rm -f conftest.$ac_objext 29998-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 29999- (eval $ac_compile) 2>conftest.er1 30000- ac_status=$? 30001- grep -v '^ *+' conftest.er1 >conftest.err 30002- rm -f conftest.er1 30003- cat conftest.err >&5 30004- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30005- (exit $ac_status); } && 30006- { ac_try='test -z "$ac_c_werror_flag" 30007- || test ! -s conftest.err' 30008- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30009- (eval $ac_try) 2>&5 30010- ac_status=$? 30011- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30012- (exit $ac_status); }; } && 30013- { ac_try='test -s conftest.$ac_objext' 30014- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30015- (eval $ac_try) 2>&5 30016- ac_status=$? 30017- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30018- (exit $ac_status); }; }; then 30019- ac_lo=0 ac_mid=0 30020- while :; do 30021- cat >conftest.$ac_ext <<_ACEOF 30022-/* confdefs.h. */ 30023-_ACEOF 30024-cat confdefs.h >>conftest.$ac_ext 30025-cat >>conftest.$ac_ext <<_ACEOF 30026-/* end confdefs.h. */ 30027-$ac_includes_default 30028-int 30029-main () 30030-{ 30031-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 30032-test_array [0] = 0 30033+EOF 30034+if { (eval echo configure:17089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30035+then 30036+ ac_cv_sizeof_long_long_int=`cat conftestval` 30037+else 30038+ echo "configure: failed program was:" >&5 30039+ cat conftest.$ac_ext >&5 30040+ rm -fr conftest* 30041+ ac_cv_sizeof_long_long_int=0 30042+fi 30043+rm -fr conftest* 30044+fi 30045 30046- ; 30047- return 0; 30048-} 30049-_ACEOF 30050-rm -f conftest.$ac_objext 30051-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30052- (eval $ac_compile) 2>conftest.er1 30053- ac_status=$? 30054- grep -v '^ *+' conftest.er1 >conftest.err 30055- rm -f conftest.er1 30056- cat conftest.err >&5 30057- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30058- (exit $ac_status); } && 30059- { ac_try='test -z "$ac_c_werror_flag" 30060- || test ! -s conftest.err' 30061- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30062- (eval $ac_try) 2>&5 30063- ac_status=$? 30064- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30065- (exit $ac_status); }; } && 30066- { ac_try='test -s conftest.$ac_objext' 30067- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30068- (eval $ac_try) 2>&5 30069- ac_status=$? 30070- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30071- (exit $ac_status); }; }; then 30072- ac_hi=$ac_mid; break 30073-else 30074- echo "$as_me: failed program was:" >&5 30075-sed 's/^/| /' conftest.$ac_ext >&5 30076- 30077-ac_lo=`expr $ac_mid + 1` 30078- if test $ac_lo -le $ac_mid; then 30079- ac_lo= ac_hi= 30080- break 30081- fi 30082- ac_mid=`expr 2 '*' $ac_mid + 1` 30083-fi 30084-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30085- done 30086-else 30087- echo "$as_me: failed program was:" >&5 30088-sed 's/^/| /' conftest.$ac_ext >&5 30089- 30090-cat >conftest.$ac_ext <<_ACEOF 30091-/* confdefs.h. */ 30092-_ACEOF 30093-cat confdefs.h >>conftest.$ac_ext 30094-cat >>conftest.$ac_ext <<_ACEOF 30095-/* end confdefs.h. */ 30096-$ac_includes_default 30097-int 30098-main () 30099-{ 30100-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; 30101-test_array [0] = 0 30102+fi 30103+echo "$ac_t""$ac_cv_sizeof_long_long_int" 1>&6 30104+cat >> confdefs.h <<EOF 30105+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int 30106+EOF 30107 30108- ; 30109- return 0; 30110-} 30111-_ACEOF 30112-rm -f conftest.$ac_objext 30113-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30114- (eval $ac_compile) 2>conftest.er1 30115- ac_status=$? 30116- grep -v '^ *+' conftest.er1 >conftest.err 30117- rm -f conftest.er1 30118- cat conftest.err >&5 30119- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30120- (exit $ac_status); } && 30121- { ac_try='test -z "$ac_c_werror_flag" 30122- || test ! -s conftest.err' 30123- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30124- (eval $ac_try) 2>&5 30125- ac_status=$? 30126- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30127- (exit $ac_status); }; } && 30128- { ac_try='test -s conftest.$ac_objext' 30129- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30130- (eval $ac_try) 2>&5 30131- ac_status=$? 30132- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30133- (exit $ac_status); }; }; then 30134- ac_hi=-1 ac_mid=-1 30135- while :; do 30136- cat >conftest.$ac_ext <<_ACEOF 30137-/* confdefs.h. */ 30138-_ACEOF 30139-cat confdefs.h >>conftest.$ac_ext 30140-cat >>conftest.$ac_ext <<_ACEOF 30141-/* end confdefs.h. */ 30142-$ac_includes_default 30143-int 30144-main () 30145-{ 30146-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; 30147-test_array [0] = 0 30148 30149- ; 30150- return 0; 30151-} 30152-_ACEOF 30153-rm -f conftest.$ac_objext 30154-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30155- (eval $ac_compile) 2>conftest.er1 30156- ac_status=$? 30157- grep -v '^ *+' conftest.er1 >conftest.err 30158- rm -f conftest.er1 30159- cat conftest.err >&5 30160- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30161- (exit $ac_status); } && 30162- { ac_try='test -z "$ac_c_werror_flag" 30163- || test ! -s conftest.err' 30164- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30165- (eval $ac_try) 2>&5 30166- ac_status=$? 30167- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30168- (exit $ac_status); }; } && 30169- { ac_try='test -s conftest.$ac_objext' 30170- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30171- (eval $ac_try) 2>&5 30172- ac_status=$? 30173- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30174- (exit $ac_status); }; }; then 30175- ac_lo=$ac_mid; break 30176-else 30177- echo "$as_me: failed program was:" >&5 30178-sed 's/^/| /' conftest.$ac_ext >&5 30179- 30180-ac_hi=`expr '(' $ac_mid ')' - 1` 30181- if test $ac_mid -le $ac_hi; then 30182- ac_lo= ac_hi= 30183- break 30184- fi 30185- ac_mid=`expr 2 '*' $ac_mid` 30186-fi 30187-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30188- done 30189-else 30190- echo "$as_me: failed program was:" >&5 30191-sed 's/^/| /' conftest.$ac_ext >&5 30192- 30193-ac_lo= ac_hi= 30194-fi 30195-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30196-fi 30197-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30198-# Binary search between lo and hi bounds. 30199-while test "x$ac_lo" != "x$ac_hi"; do 30200- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 30201- cat >conftest.$ac_ext <<_ACEOF 30202-/* confdefs.h. */ 30203-_ACEOF 30204-cat confdefs.h >>conftest.$ac_ext 30205-cat >>conftest.$ac_ext <<_ACEOF 30206-/* end confdefs.h. */ 30207-$ac_includes_default 30208-int 30209-main () 30210+echo $ac_n "checking size of long""... $ac_c" 1>&6 30211+echo "configure:17109: checking size of long" >&5 30212+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 30213+ echo $ac_n "(cached) $ac_c" 1>&6 30214+else 30215+ if test "$cross_compiling" = yes; then 30216+ ac_cv_sizeof_long=8 30217+else 30218+ cat > conftest.$ac_ext <<EOF 30219+#line 17117 "configure" 30220+#include "confdefs.h" 30221+#include <stdio.h> 30222+main() 30223 { 30224-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 30225-test_array [0] = 0 30226- 30227- ; 30228- return 0; 30229+ FILE *f=fopen("conftestval", "w"); 30230+ if (!f) exit(1); 30231+ fprintf(f, "%d\n", sizeof(long)); 30232+ exit(0); 30233 } 30234-_ACEOF 30235-rm -f conftest.$ac_objext 30236-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30237- (eval $ac_compile) 2>conftest.er1 30238- ac_status=$? 30239- grep -v '^ *+' conftest.er1 >conftest.err 30240- rm -f conftest.er1 30241- cat conftest.err >&5 30242- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30243- (exit $ac_status); } && 30244- { ac_try='test -z "$ac_c_werror_flag" 30245- || test ! -s conftest.err' 30246- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30247- (eval $ac_try) 2>&5 30248- ac_status=$? 30249- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30250- (exit $ac_status); }; } && 30251- { ac_try='test -s conftest.$ac_objext' 30252- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30253- (eval $ac_try) 2>&5 30254- ac_status=$? 30255- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30256- (exit $ac_status); }; }; then 30257- ac_hi=$ac_mid 30258+EOF 30259+if { (eval echo configure:17128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30260+then 30261+ ac_cv_sizeof_long=`cat conftestval` 30262 else 30263- echo "$as_me: failed program was:" >&5 30264-sed 's/^/| /' conftest.$ac_ext >&5 30265+ echo "configure: failed program was:" >&5 30266+ cat conftest.$ac_ext >&5 30267+ rm -fr conftest* 30268+ ac_cv_sizeof_long=0 30269+fi 30270+rm -fr conftest* 30271+fi 30272 30273-ac_lo=`expr '(' $ac_mid ')' + 1` 30274 fi 30275-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30276-done 30277-case $ac_lo in 30278-?*) ac_cv_sizeof_int=$ac_lo;; 30279-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 30280-See \`config.log' for more details." >&5 30281-echo "$as_me: error: cannot compute sizeof (int), 77 30282-See \`config.log' for more details." >&2;} 30283- { (exit 1); exit 1; }; } ;; 30284-esac 30285+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 30286+cat >> confdefs.h <<EOF 30287+#define SIZEOF_LONG $ac_cv_sizeof_long 30288+EOF 30289+ 30290+ 30291+echo $ac_n "checking size of int""... $ac_c" 1>&6 30292+echo "configure:17148: checking size of int" >&5 30293+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 30294+ echo $ac_n "(cached) $ac_c" 1>&6 30295 else 30296 if test "$cross_compiling" = yes; then 30297- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 30298-See \`config.log' for more details." >&5 30299-echo "$as_me: error: cannot run test program while cross compiling 30300-See \`config.log' for more details." >&2;} 30301- { (exit 1); exit 1; }; } 30302-else 30303- cat >conftest.$ac_ext <<_ACEOF 30304-/* confdefs.h. */ 30305-_ACEOF 30306-cat confdefs.h >>conftest.$ac_ext 30307-cat >>conftest.$ac_ext <<_ACEOF 30308-/* end confdefs.h. */ 30309-$ac_includes_default 30310-long longval () { return (long) (sizeof (int)); } 30311-unsigned long ulongval () { return (long) (sizeof (int)); } 30312+ ac_cv_sizeof_int=4 30313+else 30314+ cat > conftest.$ac_ext <<EOF 30315+#line 17156 "configure" 30316+#include "confdefs.h" 30317 #include <stdio.h> 30318-#include <stdlib.h> 30319-int 30320-main () 30321+main() 30322 { 30323- 30324- FILE *f = fopen ("conftest.val", "w"); 30325- if (! f) 30326- exit (1); 30327- if (((long) (sizeof (int))) < 0) 30328- { 30329- long i = longval (); 30330- if (i != ((long) (sizeof (int)))) 30331- exit (1); 30332- fprintf (f, "%ld\n", i); 30333- } 30334- else 30335- { 30336- unsigned long i = ulongval (); 30337- if (i != ((long) (sizeof (int)))) 30338- exit (1); 30339- fprintf (f, "%lu\n", i); 30340- } 30341- exit (ferror (f) || fclose (f) != 0); 30342- 30343- ; 30344- return 0; 30345+ FILE *f=fopen("conftestval", "w"); 30346+ if (!f) exit(1); 30347+ fprintf(f, "%d\n", sizeof(int)); 30348+ exit(0); 30349 } 30350-_ACEOF 30351-rm -f conftest$ac_exeext 30352-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 30353- (eval $ac_link) 2>&5 30354- ac_status=$? 30355- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30356- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 30357- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30358- (eval $ac_try) 2>&5 30359- ac_status=$? 30360- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30361- (exit $ac_status); }; }; then 30362- ac_cv_sizeof_int=`cat conftest.val` 30363-else 30364- echo "$as_me: program exited with status $ac_status" >&5 30365-echo "$as_me: failed program was:" >&5 30366-sed 's/^/| /' conftest.$ac_ext >&5 30367- 30368-( exit $ac_status ) 30369-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 30370-See \`config.log' for more details." >&5 30371-echo "$as_me: error: cannot compute sizeof (int), 77 30372-See \`config.log' for more details." >&2;} 30373- { (exit 1); exit 1; }; } 30374-fi 30375-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 30376-fi 30377-fi 30378-rm -f conftest.val 30379+EOF 30380+if { (eval echo configure:17167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30381+then 30382+ ac_cv_sizeof_int=`cat conftestval` 30383 else 30384+ echo "configure: failed program was:" >&5 30385+ cat conftest.$ac_ext >&5 30386+ rm -fr conftest* 30387 ac_cv_sizeof_int=0 30388 fi 30389+rm -fr conftest* 30390 fi 30391-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 30392-echo "${ECHO_T}$ac_cv_sizeof_int" >&6 30393-cat >>confdefs.h <<_ACEOF 30394-#define SIZEOF_INT $ac_cv_sizeof_int 30395-_ACEOF 30396 30397+fi 30398+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 30399+cat >> confdefs.h <<EOF 30400+#define SIZEOF_INT $ac_cv_sizeof_int 30401+EOF 30402 30403 30404 30405- echo "$as_me:$LINENO: checking size of intmax_t" >&5 30406-echo $ECHO_N "checking size of intmax_t... $ECHO_C" >&6 30407 30408+ echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 30409+echo "configure:17189: checking size of intmax_t" >&5 30410+ 30411 php_cache_value=php_cv_sizeof_intmax_t 30412- if test "${php_cv_sizeof_intmax_t+set}" = set; then 30413- echo $ECHO_N "(cached) $ECHO_C" >&6 30414+ if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then 30415+ echo $ac_n "(cached) $ac_c" 1>&6 30416 else 30417- 30418+ 30419 old_LIBS=$LIBS 30420 LIBS= 30421 old_LDFLAGS=$LDFLAGS 30422 LDFLAGS= 30423 if test "$cross_compiling" = yes; then 30424- 30425+ 30426 eval $php_cache_value=0 30427 30428 else 30429- cat >conftest.$ac_ext <<_ACEOF 30430-/* confdefs.h. */ 30431-_ACEOF 30432-cat confdefs.h >>conftest.$ac_ext 30433-cat >>conftest.$ac_ext <<_ACEOF 30434-/* end confdefs.h. */ 30435+ cat > conftest.$ac_ext <<EOF 30436+#line 17206 "configure" 30437+#include "confdefs.h" 30438 #include <stdio.h> 30439 #if STDC_HEADERS 30440 #include <stdlib.h> 30441@@ -25695,34 +17224,24 @@ 30442 fprintf(fp, "%d\n", sizeof(intmax_t)); 30443 return(0); 30444 } 30445- 30446-_ACEOF 30447-rm -f conftest$ac_exeext 30448-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 30449- (eval $ac_link) 2>&5 30450- ac_status=$? 30451- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30452- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 30453- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30454- (eval $ac_try) 2>&5 30455- ac_status=$? 30456- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30457- (exit $ac_status); }; }; then 30458- 30459+ 30460+EOF 30461+if { (eval echo configure:17230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30462+then 30463+ 30464 eval $php_cache_value=`cat conftestval` 30465- 30466+ 30467 else 30468- echo "$as_me: program exited with status $ac_status" >&5 30469-echo "$as_me: failed program was:" >&5 30470-sed 's/^/| /' conftest.$ac_ext >&5 30471- 30472-( exit $ac_status ) 30473- 30474+ echo "configure: failed program was:" >&5 30475+ cat conftest.$ac_ext >&5 30476+ rm -fr conftest* 30477+ 30478 eval $php_cache_value=0 30479- 30480+ 30481 fi 30482-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 30483+rm -fr conftest* 30484 fi 30485+ 30486 LDFLAGS=$old_LDFLAGS 30487 LIBS=$old_LIBS 30488 30489@@ -25730,47 +17249,41 @@ 30490 30491 if eval test "\$$php_cache_value" != "0"; then 30492 30493- 30494-cat >>confdefs.h <<_ACEOF 30495+ cat >> confdefs.h <<EOF 30496 #define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t 30497-_ACEOF 30498- 30499+EOF 30500 30501-cat >>confdefs.h <<_ACEOF 30502+ cat >> confdefs.h <<EOF 30503 #define HAVE_INTMAX_T 1 30504-_ACEOF 30505- 30506+EOF 30507 30508+ 30509 30510 fi 30511 30512- echo "$as_me:$LINENO: result: $php_cv_sizeof_intmax_t" >&5 30513-echo "${ECHO_T}$php_cv_sizeof_intmax_t" >&6 30514+ echo "$ac_t""$php_cv_sizeof_intmax_t" 1>&6 30515 30516 30517- echo "$as_me:$LINENO: checking size of ssize_t" >&5 30518-echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6 30519- 30520+ echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 30521+echo "configure:17269: checking size of ssize_t" >&5 30522+ 30523 php_cache_value=php_cv_sizeof_ssize_t 30524- if test "${php_cv_sizeof_ssize_t+set}" = set; then 30525- echo $ECHO_N "(cached) $ECHO_C" >&6 30526+ if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then 30527+ echo $ac_n "(cached) $ac_c" 1>&6 30528 else 30529- 30530+ 30531 old_LIBS=$LIBS 30532 LIBS= 30533 old_LDFLAGS=$LDFLAGS 30534 LDFLAGS= 30535 if test "$cross_compiling" = yes; then 30536- 30537+ 30538 eval $php_cache_value=8 30539 30540 else 30541- cat >conftest.$ac_ext <<_ACEOF 30542-/* confdefs.h. */ 30543-_ACEOF 30544-cat confdefs.h >>conftest.$ac_ext 30545-cat >>conftest.$ac_ext <<_ACEOF 30546-/* end confdefs.h. */ 30547+ cat > conftest.$ac_ext <<EOF 30548+#line 17286 "configure" 30549+#include "confdefs.h" 30550 #include <stdio.h> 30551 #if STDC_HEADERS 30552 #include <stdlib.h> 30553@@ -25791,34 +17304,24 @@ 30554 fprintf(fp, "%d\n", sizeof(ssize_t)); 30555 return(0); 30556 } 30557- 30558-_ACEOF 30559-rm -f conftest$ac_exeext 30560-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 30561- (eval $ac_link) 2>&5 30562- ac_status=$? 30563- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30564- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 30565- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30566- (eval $ac_try) 2>&5 30567- ac_status=$? 30568- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30569- (exit $ac_status); }; }; then 30570- 30571+ 30572+EOF 30573+if { (eval echo configure:17310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30574+then 30575+ 30576 eval $php_cache_value=`cat conftestval` 30577- 30578+ 30579 else 30580- echo "$as_me: program exited with status $ac_status" >&5 30581-echo "$as_me: failed program was:" >&5 30582-sed 's/^/| /' conftest.$ac_ext >&5 30583- 30584-( exit $ac_status ) 30585- 30586+ echo "configure: failed program was:" >&5 30587+ cat conftest.$ac_ext >&5 30588+ rm -fr conftest* 30589+ 30590 eval $php_cache_value=0 30591- 30592+ 30593 fi 30594-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 30595+rm -fr conftest* 30596 fi 30597+ 30598 LDFLAGS=$old_LDFLAGS 30599 LIBS=$old_LIBS 30600 30601@@ -25826,47 +17329,41 @@ 30602 30603 if eval test "\$$php_cache_value" != "0"; then 30604 30605- 30606-cat >>confdefs.h <<_ACEOF 30607+ cat >> confdefs.h <<EOF 30608 #define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t 30609-_ACEOF 30610- 30611+EOF 30612 30613-cat >>confdefs.h <<_ACEOF 30614+ cat >> confdefs.h <<EOF 30615 #define HAVE_SSIZE_T 1 30616-_ACEOF 30617- 30618+EOF 30619 30620+ 30621 30622 fi 30623 30624- echo "$as_me:$LINENO: result: $php_cv_sizeof_ssize_t" >&5 30625-echo "${ECHO_T}$php_cv_sizeof_ssize_t" >&6 30626- 30627+ echo "$ac_t""$php_cv_sizeof_ssize_t" 1>&6 30628 30629- echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5 30630-echo $ECHO_N "checking size of ptrdiff_t... $ECHO_C" >&6 30631 30632+ echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 30633+echo "configure:17349: checking size of ptrdiff_t" >&5 30634+ 30635 php_cache_value=php_cv_sizeof_ptrdiff_t 30636- if test "${php_cv_sizeof_ptrdiff_t+set}" = set; then 30637- echo $ECHO_N "(cached) $ECHO_C" >&6 30638+ if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then 30639+ echo $ac_n "(cached) $ac_c" 1>&6 30640 else 30641- 30642+ 30643 old_LIBS=$LIBS 30644 LIBS= 30645 old_LDFLAGS=$LDFLAGS 30646 LDFLAGS= 30647 if test "$cross_compiling" = yes; then 30648- 30649+ 30650 eval $php_cache_value=8 30651 30652 else 30653- cat >conftest.$ac_ext <<_ACEOF 30654-/* confdefs.h. */ 30655-_ACEOF 30656-cat confdefs.h >>conftest.$ac_ext 30657-cat >>conftest.$ac_ext <<_ACEOF 30658-/* end confdefs.h. */ 30659+ cat > conftest.$ac_ext <<EOF 30660+#line 17366 "configure" 30661+#include "confdefs.h" 30662 #include <stdio.h> 30663 #if STDC_HEADERS 30664 #include <stdlib.h> 30665@@ -25887,34 +17384,24 @@ 30666 fprintf(fp, "%d\n", sizeof(ptrdiff_t)); 30667 return(0); 30668 } 30669- 30670-_ACEOF 30671-rm -f conftest$ac_exeext 30672-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 30673- (eval $ac_link) 2>&5 30674- ac_status=$? 30675- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30676- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 30677- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30678- (eval $ac_try) 2>&5 30679- ac_status=$? 30680- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30681- (exit $ac_status); }; }; then 30682- 30683+ 30684+EOF 30685+if { (eval echo configure:17390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 30686+then 30687+ 30688 eval $php_cache_value=`cat conftestval` 30689- 30690+ 30691 else 30692- echo "$as_me: program exited with status $ac_status" >&5 30693-echo "$as_me: failed program was:" >&5 30694-sed 's/^/| /' conftest.$ac_ext >&5 30695- 30696-( exit $ac_status ) 30697- 30698+ echo "configure: failed program was:" >&5 30699+ cat conftest.$ac_ext >&5 30700+ rm -fr conftest* 30701+ 30702 eval $php_cache_value=0 30703- 30704+ 30705 fi 30706-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 30707+rm -fr conftest* 30708 fi 30709+ 30710 LDFLAGS=$old_LDFLAGS 30711 LIBS=$old_LIBS 30712 30713@@ -25922,960 +17409,405 @@ 30714 30715 if eval test "\$$php_cache_value" != "0"; then 30716 30717- 30718-cat >>confdefs.h <<_ACEOF 30719+ cat >> confdefs.h <<EOF 30720 #define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t 30721-_ACEOF 30722- 30723+EOF 30724 30725-cat >>confdefs.h <<_ACEOF 30726+ cat >> confdefs.h <<EOF 30727 #define HAVE_PTRDIFF_T 1 30728-_ACEOF 30729- 30730+EOF 30731 30732+ 30733 30734 fi 30735 30736- echo "$as_me:$LINENO: result: $php_cv_sizeof_ptrdiff_t" >&5 30737-echo "${ECHO_T}$php_cv_sizeof_ptrdiff_t" >&6 30738+ echo "$ac_t""$php_cv_sizeof_ptrdiff_t" 1>&6 30739 30740 30741- 30742-echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 30743-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 30744-if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then 30745- echo $ECHO_N "(cached) $ECHO_C" >&6 30746+echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 30747+echo "configure:17429: checking for st_blksize in struct stat" >&5 30748+if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then 30749+ echo $ac_n "(cached) $ac_c" 1>&6 30750 else 30751- cat >conftest.$ac_ext <<_ACEOF 30752-/* confdefs.h. */ 30753-_ACEOF 30754-cat confdefs.h >>conftest.$ac_ext 30755-cat >>conftest.$ac_ext <<_ACEOF 30756-/* end confdefs.h. */ 30757-$ac_includes_default 30758-int 30759-main () 30760-{ 30761-static struct stat ac_aggr; 30762-if (ac_aggr.st_blksize) 30763-return 0; 30764- ; 30765- return 0; 30766-} 30767-_ACEOF 30768-rm -f conftest.$ac_objext 30769-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30770- (eval $ac_compile) 2>conftest.er1 30771- ac_status=$? 30772- grep -v '^ *+' conftest.er1 >conftest.err 30773- rm -f conftest.er1 30774- cat conftest.err >&5 30775- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30776- (exit $ac_status); } && 30777- { ac_try='test -z "$ac_c_werror_flag" 30778- || test ! -s conftest.err' 30779- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30780- (eval $ac_try) 2>&5 30781- ac_status=$? 30782- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30783- (exit $ac_status); }; } && 30784- { ac_try='test -s conftest.$ac_objext' 30785- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30786- (eval $ac_try) 2>&5 30787- ac_status=$? 30788- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30789- (exit $ac_status); }; }; then 30790- ac_cv_member_struct_stat_st_blksize=yes 30791-else 30792- echo "$as_me: failed program was:" >&5 30793-sed 's/^/| /' conftest.$ac_ext >&5 30794- 30795-cat >conftest.$ac_ext <<_ACEOF 30796-/* confdefs.h. */ 30797-_ACEOF 30798-cat confdefs.h >>conftest.$ac_ext 30799-cat >>conftest.$ac_ext <<_ACEOF 30800-/* end confdefs.h. */ 30801-$ac_includes_default 30802-int 30803-main () 30804-{ 30805-static struct stat ac_aggr; 30806-if (sizeof ac_aggr.st_blksize) 30807-return 0; 30808- ; 30809- return 0; 30810-} 30811-_ACEOF 30812-rm -f conftest.$ac_objext 30813-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30814- (eval $ac_compile) 2>conftest.er1 30815- ac_status=$? 30816- grep -v '^ *+' conftest.er1 >conftest.err 30817- rm -f conftest.er1 30818- cat conftest.err >&5 30819- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30820- (exit $ac_status); } && 30821- { ac_try='test -z "$ac_c_werror_flag" 30822- || test ! -s conftest.err' 30823- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30824- (eval $ac_try) 2>&5 30825- ac_status=$? 30826- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30827- (exit $ac_status); }; } && 30828- { ac_try='test -s conftest.$ac_objext' 30829- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30830- (eval $ac_try) 2>&5 30831- ac_status=$? 30832- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30833- (exit $ac_status); }; }; then 30834- ac_cv_member_struct_stat_st_blksize=yes 30835-else 30836- echo "$as_me: failed program was:" >&5 30837-sed 's/^/| /' conftest.$ac_ext >&5 30838- 30839-ac_cv_member_struct_stat_st_blksize=no 30840-fi 30841-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30842-fi 30843-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30844-fi 30845-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 30846-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 30847-if test $ac_cv_member_struct_stat_st_blksize = yes; then 30848- 30849-cat >>confdefs.h <<_ACEOF 30850-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 30851-_ACEOF 30852- 30853+ cat > conftest.$ac_ext <<EOF 30854+#line 17434 "configure" 30855+#include "confdefs.h" 30856+#include <sys/types.h> 30857+#include <sys/stat.h> 30858+int main() { 30859+struct stat s; s.st_blksize; 30860+; return 0; } 30861+EOF 30862+if { (eval echo configure:17442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 30863+ rm -rf conftest* 30864+ ac_cv_struct_st_blksize=yes 30865+else 30866+ echo "configure: failed program was:" >&5 30867+ cat conftest.$ac_ext >&5 30868+ rm -rf conftest* 30869+ ac_cv_struct_st_blksize=no 30870+fi 30871+rm -f conftest* 30872+fi 30873 30874-cat >>confdefs.h <<\_ACEOF 30875+echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6 30876+if test $ac_cv_struct_st_blksize = yes; then 30877+ cat >> confdefs.h <<\EOF 30878 #define HAVE_ST_BLKSIZE 1 30879-_ACEOF 30880+EOF 30881 30882 fi 30883 30884- 30885 if test "`uname -s 2>/dev/null`" != "QNX"; then 30886- echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 30887-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 30888-if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then 30889- echo $ECHO_N "(cached) $ECHO_C" >&6 30890-else 30891- cat >conftest.$ac_ext <<_ACEOF 30892-/* confdefs.h. */ 30893-_ACEOF 30894-cat confdefs.h >>conftest.$ac_ext 30895-cat >>conftest.$ac_ext <<_ACEOF 30896-/* end confdefs.h. */ 30897-$ac_includes_default 30898-int 30899-main () 30900-{ 30901-static struct stat ac_aggr; 30902-if (ac_aggr.st_blocks) 30903-return 0; 30904- ; 30905- return 0; 30906-} 30907-_ACEOF 30908-rm -f conftest.$ac_objext 30909-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30910- (eval $ac_compile) 2>conftest.er1 30911- ac_status=$? 30912- grep -v '^ *+' conftest.er1 >conftest.err 30913- rm -f conftest.er1 30914- cat conftest.err >&5 30915- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30916- (exit $ac_status); } && 30917- { ac_try='test -z "$ac_c_werror_flag" 30918- || test ! -s conftest.err' 30919- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30920- (eval $ac_try) 2>&5 30921- ac_status=$? 30922- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30923- (exit $ac_status); }; } && 30924- { ac_try='test -s conftest.$ac_objext' 30925- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30926- (eval $ac_try) 2>&5 30927- ac_status=$? 30928- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30929- (exit $ac_status); }; }; then 30930- ac_cv_member_struct_stat_st_blocks=yes 30931-else 30932- echo "$as_me: failed program was:" >&5 30933-sed 's/^/| /' conftest.$ac_ext >&5 30934- 30935-cat >conftest.$ac_ext <<_ACEOF 30936-/* confdefs.h. */ 30937-_ACEOF 30938-cat confdefs.h >>conftest.$ac_ext 30939-cat >>conftest.$ac_ext <<_ACEOF 30940-/* end confdefs.h. */ 30941-$ac_includes_default 30942-int 30943-main () 30944-{ 30945-static struct stat ac_aggr; 30946-if (sizeof ac_aggr.st_blocks) 30947-return 0; 30948- ; 30949- return 0; 30950-} 30951-_ACEOF 30952-rm -f conftest.$ac_objext 30953-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 30954- (eval $ac_compile) 2>conftest.er1 30955- ac_status=$? 30956- grep -v '^ *+' conftest.er1 >conftest.err 30957- rm -f conftest.er1 30958- cat conftest.err >&5 30959- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30960- (exit $ac_status); } && 30961- { ac_try='test -z "$ac_c_werror_flag" 30962- || test ! -s conftest.err' 30963- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30964- (eval $ac_try) 2>&5 30965- ac_status=$? 30966- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30967- (exit $ac_status); }; } && 30968- { ac_try='test -s conftest.$ac_objext' 30969- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 30970- (eval $ac_try) 2>&5 30971- ac_status=$? 30972- echo "$as_me:$LINENO: \$? = $ac_status" >&5 30973- (exit $ac_status); }; }; then 30974- ac_cv_member_struct_stat_st_blocks=yes 30975-else 30976- echo "$as_me: failed program was:" >&5 30977-sed 's/^/| /' conftest.$ac_ext >&5 30978- 30979-ac_cv_member_struct_stat_st_blocks=no 30980-fi 30981-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30982-fi 30983-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 30984-fi 30985-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5 30986-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6 30987-if test $ac_cv_member_struct_stat_st_blocks = yes; then 30988- 30989-cat >>confdefs.h <<_ACEOF 30990-#define HAVE_STRUCT_STAT_ST_BLOCKS 1 30991-_ACEOF 30992- 30993+ echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 30994+echo "configure:17464: checking for st_blocks in struct stat" >&5 30995+if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then 30996+ echo $ac_n "(cached) $ac_c" 1>&6 30997+else 30998+ cat > conftest.$ac_ext <<EOF 30999+#line 17469 "configure" 31000+#include "confdefs.h" 31001+#include <sys/types.h> 31002+#include <sys/stat.h> 31003+int main() { 31004+struct stat s; s.st_blocks; 31005+; return 0; } 31006+EOF 31007+if { (eval echo configure:17477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 31008+ rm -rf conftest* 31009+ ac_cv_struct_st_blocks=yes 31010+else 31011+ echo "configure: failed program was:" >&5 31012+ cat conftest.$ac_ext >&5 31013+ rm -rf conftest* 31014+ ac_cv_struct_st_blocks=no 31015+fi 31016+rm -f conftest* 31017+fi 31018 31019-cat >>confdefs.h <<\_ACEOF 31020+echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6 31021+if test $ac_cv_struct_st_blocks = yes; then 31022+ cat >> confdefs.h <<\EOF 31023 #define HAVE_ST_BLOCKS 1 31024-_ACEOF 31025+EOF 31026 31027 else 31028- case $LIBOBJS in 31029- "fileblocks.$ac_objext" | \ 31030- *" fileblocks.$ac_objext" | \ 31031- "fileblocks.$ac_objext "* | \ 31032- *" fileblocks.$ac_objext "* ) ;; 31033- *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" ;; 31034-esac 31035- 31036+ LIBOBJS="$LIBOBJS fileblocks.${ac_objext}" 31037 fi 31038 31039- 31040 else 31041- { echo "$as_me:$LINENO: WARNING: warnings level for cc set to 0" >&5 31042-echo "$as_me: WARNING: warnings level for cc set to 0" >&2;} 31043+ echo "configure: warning: warnings level for cc set to 0" 1>&2 31044 WARNING_LEVEL=0 31045 fi 31046+echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 31047+echo "configure:17504: checking for st_rdev in struct stat" >&5 31048+if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then 31049+ echo $ac_n "(cached) $ac_c" 1>&6 31050+else 31051+ cat > conftest.$ac_ext <<EOF 31052+#line 17509 "configure" 31053+#include "confdefs.h" 31054+#include <sys/types.h> 31055+#include <sys/stat.h> 31056+int main() { 31057+struct stat s; s.st_rdev; 31058+; return 0; } 31059+EOF 31060+if { (eval echo configure:17517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 31061+ rm -rf conftest* 31062+ ac_cv_struct_st_rdev=yes 31063+else 31064+ echo "configure: failed program was:" >&5 31065+ cat conftest.$ac_ext >&5 31066+ rm -rf conftest* 31067+ ac_cv_struct_st_rdev=no 31068+fi 31069+rm -f conftest* 31070+fi 31071 31072-echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 31073-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 31074-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then 31075- echo $ECHO_N "(cached) $ECHO_C" >&6 31076-else 31077- cat >conftest.$ac_ext <<_ACEOF 31078-/* confdefs.h. */ 31079-_ACEOF 31080-cat confdefs.h >>conftest.$ac_ext 31081-cat >>conftest.$ac_ext <<_ACEOF 31082-/* end confdefs.h. */ 31083-$ac_includes_default 31084-int 31085-main () 31086-{ 31087-static struct stat ac_aggr; 31088-if (ac_aggr.st_rdev) 31089-return 0; 31090- ; 31091- return 0; 31092-} 31093-_ACEOF 31094-rm -f conftest.$ac_objext 31095-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 31096- (eval $ac_compile) 2>conftest.er1 31097- ac_status=$? 31098- grep -v '^ *+' conftest.er1 >conftest.err 31099- rm -f conftest.er1 31100- cat conftest.err >&5 31101- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31102- (exit $ac_status); } && 31103- { ac_try='test -z "$ac_c_werror_flag" 31104- || test ! -s conftest.err' 31105- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31106- (eval $ac_try) 2>&5 31107- ac_status=$? 31108- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31109- (exit $ac_status); }; } && 31110- { ac_try='test -s conftest.$ac_objext' 31111- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31112- (eval $ac_try) 2>&5 31113- ac_status=$? 31114- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31115- (exit $ac_status); }; }; then 31116- ac_cv_member_struct_stat_st_rdev=yes 31117-else 31118- echo "$as_me: failed program was:" >&5 31119-sed 's/^/| /' conftest.$ac_ext >&5 31120- 31121-cat >conftest.$ac_ext <<_ACEOF 31122-/* confdefs.h. */ 31123-_ACEOF 31124-cat confdefs.h >>conftest.$ac_ext 31125-cat >>conftest.$ac_ext <<_ACEOF 31126-/* end confdefs.h. */ 31127-$ac_includes_default 31128-int 31129-main () 31130-{ 31131-static struct stat ac_aggr; 31132-if (sizeof ac_aggr.st_rdev) 31133-return 0; 31134- ; 31135- return 0; 31136-} 31137-_ACEOF 31138-rm -f conftest.$ac_objext 31139-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 31140- (eval $ac_compile) 2>conftest.er1 31141- ac_status=$? 31142- grep -v '^ *+' conftest.er1 >conftest.err 31143- rm -f conftest.er1 31144- cat conftest.err >&5 31145- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31146- (exit $ac_status); } && 31147- { ac_try='test -z "$ac_c_werror_flag" 31148- || test ! -s conftest.err' 31149- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31150- (eval $ac_try) 2>&5 31151- ac_status=$? 31152- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31153- (exit $ac_status); }; } && 31154- { ac_try='test -s conftest.$ac_objext' 31155- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31156- (eval $ac_try) 2>&5 31157- ac_status=$? 31158- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31159- (exit $ac_status); }; }; then 31160- ac_cv_member_struct_stat_st_rdev=yes 31161-else 31162- echo "$as_me: failed program was:" >&5 31163-sed 's/^/| /' conftest.$ac_ext >&5 31164- 31165-ac_cv_member_struct_stat_st_rdev=no 31166-fi 31167-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 31168-fi 31169-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 31170-fi 31171-echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 31172-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 31173-if test $ac_cv_member_struct_stat_st_rdev = yes; then 31174- 31175-cat >>confdefs.h <<_ACEOF 31176-#define HAVE_STRUCT_STAT_ST_RDEV 1 31177-_ACEOF 31178- 31179- 31180-cat >>confdefs.h <<\_ACEOF 31181+echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6 31182+if test $ac_cv_struct_st_rdev = yes; then 31183+ cat >> confdefs.h <<\EOF 31184 #define HAVE_ST_RDEV 1 31185-_ACEOF 31186+EOF 31187 31188 fi 31189 31190 31191- 31192-echo "$as_me:$LINENO: checking for size_t" >&5 31193-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 31194-if test "${ac_cv_type_size_t+set}" = set; then 31195- echo $ECHO_N "(cached) $ECHO_C" >&6 31196+echo $ac_n "checking for size_t""... $ac_c" 1>&6 31197+echo "configure:17539: checking for size_t" >&5 31198+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 31199+ echo $ac_n "(cached) $ac_c" 1>&6 31200 else 31201- cat >conftest.$ac_ext <<_ACEOF 31202-/* confdefs.h. */ 31203-_ACEOF 31204-cat confdefs.h >>conftest.$ac_ext 31205-cat >>conftest.$ac_ext <<_ACEOF 31206-/* end confdefs.h. */ 31207-$ac_includes_default 31208-int 31209-main () 31210-{ 31211-if ((size_t *) 0) 31212- return 0; 31213-if (sizeof (size_t)) 31214- return 0; 31215- ; 31216- return 0; 31217-} 31218-_ACEOF 31219-rm -f conftest.$ac_objext 31220-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 31221- (eval $ac_compile) 2>conftest.er1 31222- ac_status=$? 31223- grep -v '^ *+' conftest.er1 >conftest.err 31224- rm -f conftest.er1 31225- cat conftest.err >&5 31226- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31227- (exit $ac_status); } && 31228- { ac_try='test -z "$ac_c_werror_flag" 31229- || test ! -s conftest.err' 31230- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31231- (eval $ac_try) 2>&5 31232- ac_status=$? 31233- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31234- (exit $ac_status); }; } && 31235- { ac_try='test -s conftest.$ac_objext' 31236- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31237- (eval $ac_try) 2>&5 31238- ac_status=$? 31239- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31240- (exit $ac_status); }; }; then 31241+ cat > conftest.$ac_ext <<EOF 31242+#line 17544 "configure" 31243+#include "confdefs.h" 31244+#include <sys/types.h> 31245+#if STDC_HEADERS 31246+#include <stdlib.h> 31247+#include <stddef.h> 31248+#endif 31249+EOF 31250+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 31251+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then 31252+ rm -rf conftest* 31253 ac_cv_type_size_t=yes 31254 else 31255- echo "$as_me: failed program was:" >&5 31256-sed 's/^/| /' conftest.$ac_ext >&5 31257- 31258-ac_cv_type_size_t=no 31259-fi 31260-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 31261+ rm -rf conftest* 31262+ ac_cv_type_size_t=no 31263 fi 31264-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 31265-echo "${ECHO_T}$ac_cv_type_size_t" >&6 31266-if test $ac_cv_type_size_t = yes; then 31267- : 31268-else 31269+rm -f conftest* 31270 31271-cat >>confdefs.h <<_ACEOF 31272+fi 31273+echo "$ac_t""$ac_cv_type_size_t" 1>&6 31274+if test $ac_cv_type_size_t = no; then 31275+ cat >> confdefs.h <<\EOF 31276 #define size_t unsigned 31277-_ACEOF 31278+EOF 31279 31280 fi 31281 31282-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 31283-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 31284-if test "${ac_cv_type_uid_t+set}" = set; then 31285- echo $ECHO_N "(cached) $ECHO_C" >&6 31286+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 31287+echo "configure:17572: checking for uid_t in sys/types.h" >&5 31288+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then 31289+ echo $ac_n "(cached) $ac_c" 1>&6 31290 else 31291- cat >conftest.$ac_ext <<_ACEOF 31292-/* confdefs.h. */ 31293-_ACEOF 31294-cat confdefs.h >>conftest.$ac_ext 31295-cat >>conftest.$ac_ext <<_ACEOF 31296-/* end confdefs.h. */ 31297+ cat > conftest.$ac_ext <<EOF 31298+#line 17577 "configure" 31299+#include "confdefs.h" 31300 #include <sys/types.h> 31301- 31302-_ACEOF 31303+EOF 31304 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 31305- $EGREP "uid_t" >/dev/null 2>&1; then 31306+ egrep "uid_t" >/dev/null 2>&1; then 31307+ rm -rf conftest* 31308 ac_cv_type_uid_t=yes 31309 else 31310+ rm -rf conftest* 31311 ac_cv_type_uid_t=no 31312 fi 31313 rm -f conftest* 31314 31315 fi 31316-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 31317-echo "${ECHO_T}$ac_cv_type_uid_t" >&6 31318-if test $ac_cv_type_uid_t = no; then 31319 31320-cat >>confdefs.h <<\_ACEOF 31321+echo "$ac_t""$ac_cv_type_uid_t" 1>&6 31322+if test $ac_cv_type_uid_t = no; then 31323+ cat >> confdefs.h <<\EOF 31324 #define uid_t int 31325-_ACEOF 31326- 31327+EOF 31328 31329-cat >>confdefs.h <<\_ACEOF 31330+ cat >> confdefs.h <<\EOF 31331 #define gid_t int 31332-_ACEOF 31333+EOF 31334 31335 fi 31336 31337 31338 31339- echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5 31340-echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6 31341-if test "${ac_cv_sockaddr_storage+set}" = set; then 31342- echo $ECHO_N "(cached) $ECHO_C" >&6 31343+ echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 31344+echo "configure:17608: checking for struct sockaddr_storage" >&5 31345+if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then 31346+ echo $ac_n "(cached) $ac_c" 1>&6 31347 else 31348- cat >conftest.$ac_ext <<_ACEOF 31349-/* confdefs.h. */ 31350-_ACEOF 31351-cat confdefs.h >>conftest.$ac_ext 31352-cat >>conftest.$ac_ext <<_ACEOF 31353-/* end confdefs.h. */ 31354+ cat > conftest.$ac_ext <<EOF 31355+#line 17613 "configure" 31356+#include "confdefs.h" 31357 #include <sys/types.h> 31358 #include <sys/socket.h> 31359-int 31360-main () 31361-{ 31362+int main() { 31363 struct sockaddr_storage s; s 31364- ; 31365- return 0; 31366-} 31367-_ACEOF 31368-rm -f conftest.$ac_objext 31369-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 31370- (eval $ac_compile) 2>conftest.er1 31371- ac_status=$? 31372- grep -v '^ *+' conftest.er1 >conftest.err 31373- rm -f conftest.er1 31374- cat conftest.err >&5 31375- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31376- (exit $ac_status); } && 31377- { ac_try='test -z "$ac_c_werror_flag" 31378- || test ! -s conftest.err' 31379- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31380- (eval $ac_try) 2>&5 31381- ac_status=$? 31382- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31383- (exit $ac_status); }; } && 31384- { ac_try='test -s conftest.$ac_objext' 31385- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31386- (eval $ac_try) 2>&5 31387- ac_status=$? 31388- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31389- (exit $ac_status); }; }; then 31390+; return 0; } 31391+EOF 31392+if { (eval echo configure:17621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 31393+ rm -rf conftest* 31394 ac_cv_sockaddr_storage=yes 31395 else 31396- echo "$as_me: failed program was:" >&5 31397-sed 's/^/| /' conftest.$ac_ext >&5 31398- 31399-ac_cv_sockaddr_storage=no 31400+ echo "configure: failed program was:" >&5 31401+ cat conftest.$ac_ext >&5 31402+ rm -rf conftest* 31403+ ac_cv_sockaddr_storage=no 31404 fi 31405-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 31406- 31407+rm -f conftest* 31408+ 31409 fi 31410-echo "$as_me:$LINENO: result: $ac_cv_sockaddr_storage" >&5 31411-echo "${ECHO_T}$ac_cv_sockaddr_storage" >&6 31412- if test "$ac_cv_sockaddr_storage" = "yes"; then 31413 31414-cat >>confdefs.h <<\_ACEOF 31415+echo "$ac_t""$ac_cv_sockaddr_storage" 1>&6 31416+ if test "$ac_cv_sockaddr_storage" = "yes"; then 31417+ cat >> confdefs.h <<\EOF 31418 #define HAVE_SOCKADDR_STORAGE 1 31419-_ACEOF 31420+EOF 31421 31422 fi 31423- echo "$as_me:$LINENO: checking for field sa_len in struct sockaddr" >&5 31424-echo $ECHO_N "checking for field sa_len in struct sockaddr... $ECHO_C" >&6 31425-if test "${ac_cv_sockaddr_sa_len+set}" = set; then 31426- echo $ECHO_N "(cached) $ECHO_C" >&6 31427-else 31428- 31429- cat >conftest.$ac_ext <<_ACEOF 31430-/* confdefs.h. */ 31431-_ACEOF 31432-cat confdefs.h >>conftest.$ac_ext 31433-cat >>conftest.$ac_ext <<_ACEOF 31434-/* end confdefs.h. */ 31435+ echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 31436+echo "configure:17642: checking for field sa_len in struct sockaddr" >&5 31437+if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then 31438+ echo $ac_n "(cached) $ac_c" 1>&6 31439+else 31440+ 31441+ cat > conftest.$ac_ext <<EOF 31442+#line 17648 "configure" 31443+#include "confdefs.h" 31444 #include <sys/types.h> 31445 #include <sys/socket.h> 31446-int 31447-main () 31448-{ 31449+int main() { 31450 static struct sockaddr sa; int n = (int) sa.sa_len; return n; 31451- ; 31452- return 0; 31453-} 31454-_ACEOF 31455-rm -f conftest.$ac_objext 31456-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 31457- (eval $ac_compile) 2>conftest.er1 31458- ac_status=$? 31459- grep -v '^ *+' conftest.er1 >conftest.err 31460- rm -f conftest.er1 31461- cat conftest.err >&5 31462- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31463- (exit $ac_status); } && 31464- { ac_try='test -z "$ac_c_werror_flag" 31465- || test ! -s conftest.err' 31466- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31467- (eval $ac_try) 2>&5 31468- ac_status=$? 31469- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31470- (exit $ac_status); }; } && 31471- { ac_try='test -s conftest.$ac_objext' 31472- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31473- (eval $ac_try) 2>&5 31474- ac_status=$? 31475- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31476- (exit $ac_status); }; }; then 31477+; return 0; } 31478+EOF 31479+if { (eval echo configure:17656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 31480+ rm -rf conftest* 31481 ac_cv_sockaddr_sa_len=yes 31482 else 31483- echo "$as_me: failed program was:" >&5 31484-sed 's/^/| /' conftest.$ac_ext >&5 31485- 31486-ac_cv_sockaddr_sa_len=no 31487+ echo "configure: failed program was:" >&5 31488+ cat conftest.$ac_ext >&5 31489+ rm -rf conftest* 31490+ ac_cv_sockaddr_sa_len=no 31491 fi 31492-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 31493- 31494+rm -f conftest* 31495+ 31496 fi 31497-echo "$as_me:$LINENO: result: $ac_cv_sockaddr_sa_len" >&5 31498-echo "${ECHO_T}$ac_cv_sockaddr_sa_len" >&6 31499- if test "$ac_cv_sockaddr_sa_len" = "yes"; then 31500 31501-cat >>confdefs.h <<\_ACEOF 31502+echo "$ac_t""$ac_cv_sockaddr_sa_len" 1>&6 31503+ if test "$ac_cv_sockaddr_sa_len" = "yes"; then 31504+ cat >> confdefs.h <<\EOF 31505 #define HAVE_SOCKADDR_SA_LEN 1 31506-_ACEOF 31507+EOF 31508 31509 fi 31510 31511 31512-echo "$as_me:$LINENO: checking for IPv6 support" >&5 31513-echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6 31514-if test "${ac_cv_ipv6_support+set}" = set; then 31515- echo $ECHO_N "(cached) $ECHO_C" >&6 31516+echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 31517+echo "configure:17679: checking for IPv6 support" >&5 31518+if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then 31519+ echo $ac_n "(cached) $ac_c" 1>&6 31520 else 31521- cat >conftest.$ac_ext <<_ACEOF 31522-/* confdefs.h. */ 31523-_ACEOF 31524-cat confdefs.h >>conftest.$ac_ext 31525-cat >>conftest.$ac_ext <<_ACEOF 31526-/* end confdefs.h. */ 31527+ cat > conftest.$ac_ext <<EOF 31528+#line 17684 "configure" 31529+#include "confdefs.h" 31530 #include <sys/types.h> 31531 #include <sys/socket.h> 31532 #include <netinet/in.h> 31533-int 31534-main () 31535-{ 31536+int main() { 31537 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; 31538- ; 31539- return 0; 31540-} 31541-_ACEOF 31542-rm -f conftest.$ac_objext conftest$ac_exeext 31543-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 31544- (eval $ac_link) 2>conftest.er1 31545- ac_status=$? 31546- grep -v '^ *+' conftest.er1 >conftest.err 31547- rm -f conftest.er1 31548- cat conftest.err >&5 31549- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31550- (exit $ac_status); } && 31551- { ac_try='test -z "$ac_c_werror_flag" 31552- || test ! -s conftest.err' 31553- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31554- (eval $ac_try) 2>&5 31555- ac_status=$? 31556- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31557- (exit $ac_status); }; } && 31558- { ac_try='test -s conftest$ac_exeext' 31559- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31560- (eval $ac_try) 2>&5 31561- ac_status=$? 31562- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31563- (exit $ac_status); }; }; then 31564+; return 0; } 31565+EOF 31566+if { (eval echo configure:17693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 31567+ rm -rf conftest* 31568 ac_cv_ipv6_support=yes 31569 else 31570- echo "$as_me: failed program was:" >&5 31571-sed 's/^/| /' conftest.$ac_ext >&5 31572- 31573-ac_cv_ipv6_support=no 31574+ echo "configure: failed program was:" >&5 31575+ cat conftest.$ac_ext >&5 31576+ rm -rf conftest* 31577+ ac_cv_ipv6_support=no 31578 fi 31579-rm -f conftest.err conftest.$ac_objext \ 31580- conftest$ac_exeext conftest.$ac_ext 31581+rm -f conftest* 31582 fi 31583-echo "$as_me:$LINENO: result: $ac_cv_ipv6_support" >&5 31584-echo "${ECHO_T}$ac_cv_ipv6_support" >&6 31585- 31586 31587+echo "$ac_t""$ac_cv_ipv6_support" 1>&6 31588 31589-for ac_func in vprintf 31590-do 31591-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 31592-echo "$as_me:$LINENO: checking for $ac_func" >&5 31593-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 31594-if eval "test \"\${$as_ac_var+set}\" = set"; then 31595- echo $ECHO_N "(cached) $ECHO_C" >&6 31596-else 31597- cat >conftest.$ac_ext <<_ACEOF 31598-/* confdefs.h. */ 31599-_ACEOF 31600-cat confdefs.h >>conftest.$ac_ext 31601-cat >>conftest.$ac_ext <<_ACEOF 31602-/* end confdefs.h. */ 31603-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 31604- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 31605-#define $ac_func innocuous_$ac_func 31606 31607+echo $ac_n "checking for vprintf""... $ac_c" 1>&6 31608+echo "configure:17709: checking for vprintf" >&5 31609+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then 31610+ echo $ac_n "(cached) $ac_c" 1>&6 31611+else 31612+ cat > conftest.$ac_ext <<EOF 31613+#line 17714 "configure" 31614+#include "confdefs.h" 31615 /* System header to define __stub macros and hopefully few prototypes, 31616- which can conflict with char $ac_func (); below. 31617- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 31618- <limits.h> exists even on freestanding compilers. */ 31619- 31620-#ifdef __STDC__ 31621-# include <limits.h> 31622-#else 31623-# include <assert.h> 31624-#endif 31625- 31626-#undef $ac_func 31627- 31628+ which can conflict with char vprintf(); below. */ 31629+#include <assert.h> 31630 /* Override any gcc2 internal prototype to avoid an error. */ 31631-#ifdef __cplusplus 31632-extern "C" 31633-{ 31634-#endif 31635 /* We use char because int might match the return type of a gcc2 31636- builtin and then its argument prototype would still apply. */ 31637-char $ac_func (); 31638+ builtin and then its argument prototype would still apply. */ 31639+char vprintf(); 31640+ 31641+int main() { 31642+ 31643 /* The GNU C library defines this for functions which it implements 31644 to always fail with ENOSYS. Some functions are actually named 31645 something starting with __ and the normal name is an alias. */ 31646-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) 31647+#if defined (__stub_vprintf) || defined (__stub___vprintf) 31648 choke me 31649 #else 31650-char (*f) () = $ac_func; 31651+vprintf(); 31652 #endif 31653-#ifdef __cplusplus 31654-} 31655-#endif 31656- 31657-int 31658-main () 31659-{ 31660-return f != $ac_func; 31661- ; 31662- return 0; 31663-} 31664-_ACEOF 31665-rm -f conftest.$ac_objext conftest$ac_exeext 31666-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 31667- (eval $ac_link) 2>conftest.er1 31668- ac_status=$? 31669- grep -v '^ *+' conftest.er1 >conftest.err 31670- rm -f conftest.er1 31671- cat conftest.err >&5 31672- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31673- (exit $ac_status); } && 31674- { ac_try='test -z "$ac_c_werror_flag" 31675- || test ! -s conftest.err' 31676- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31677- (eval $ac_try) 2>&5 31678- ac_status=$? 31679- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31680- (exit $ac_status); }; } && 31681- { ac_try='test -s conftest$ac_exeext' 31682- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31683- (eval $ac_try) 2>&5 31684- ac_status=$? 31685- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31686- (exit $ac_status); }; }; then 31687- eval "$as_ac_var=yes" 31688-else 31689- echo "$as_me: failed program was:" >&5 31690-sed 's/^/| /' conftest.$ac_ext >&5 31691- 31692-eval "$as_ac_var=no" 31693-fi 31694-rm -f conftest.err conftest.$ac_objext \ 31695- conftest$ac_exeext conftest.$ac_ext 31696-fi 31697-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 31698-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 31699-if test `eval echo '${'$as_ac_var'}'` = yes; then 31700- cat >>confdefs.h <<_ACEOF 31701-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 31702-_ACEOF 31703- 31704-echo "$as_me:$LINENO: checking for _doprnt" >&5 31705-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 31706-if test "${ac_cv_func__doprnt+set}" = set; then 31707- echo $ECHO_N "(cached) $ECHO_C" >&6 31708-else 31709- cat >conftest.$ac_ext <<_ACEOF 31710-/* confdefs.h. */ 31711-_ACEOF 31712-cat confdefs.h >>conftest.$ac_ext 31713-cat >>conftest.$ac_ext <<_ACEOF 31714-/* end confdefs.h. */ 31715-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. 31716- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 31717-#define _doprnt innocuous__doprnt 31718 31719-/* System header to define __stub macros and hopefully few prototypes, 31720- which can conflict with char _doprnt (); below. 31721- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 31722- <limits.h> exists even on freestanding compilers. */ 31723+; return 0; } 31724+EOF 31725+if { (eval echo configure:17737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 31726+ rm -rf conftest* 31727+ eval "ac_cv_func_vprintf=yes" 31728+else 31729+ echo "configure: failed program was:" >&5 31730+ cat conftest.$ac_ext >&5 31731+ rm -rf conftest* 31732+ eval "ac_cv_func_vprintf=no" 31733+fi 31734+rm -f conftest* 31735+fi 31736 31737-#ifdef __STDC__ 31738-# include <limits.h> 31739-#else 31740-# include <assert.h> 31741-#endif 31742+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then 31743+ echo "$ac_t""yes" 1>&6 31744+ cat >> confdefs.h <<\EOF 31745+#define HAVE_VPRINTF 1 31746+EOF 31747 31748-#undef _doprnt 31749+else 31750+ echo "$ac_t""no" 1>&6 31751+fi 31752 31753+if test "$ac_cv_func_vprintf" != yes; then 31754+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 31755+echo "configure:17761: checking for _doprnt" >&5 31756+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then 31757+ echo $ac_n "(cached) $ac_c" 1>&6 31758+else 31759+ cat > conftest.$ac_ext <<EOF 31760+#line 17766 "configure" 31761+#include "confdefs.h" 31762+/* System header to define __stub macros and hopefully few prototypes, 31763+ which can conflict with char _doprnt(); below. */ 31764+#include <assert.h> 31765 /* Override any gcc2 internal prototype to avoid an error. */ 31766-#ifdef __cplusplus 31767-extern "C" 31768-{ 31769-#endif 31770 /* We use char because int might match the return type of a gcc2 31771- builtin and then its argument prototype would still apply. */ 31772-char _doprnt (); 31773+ builtin and then its argument prototype would still apply. */ 31774+char _doprnt(); 31775+ 31776+int main() { 31777+ 31778 /* The GNU C library defines this for functions which it implements 31779 to always fail with ENOSYS. Some functions are actually named 31780 something starting with __ and the normal name is an alias. */ 31781 #if defined (__stub__doprnt) || defined (__stub____doprnt) 31782 choke me 31783 #else 31784-char (*f) () = _doprnt; 31785-#endif 31786-#ifdef __cplusplus 31787-} 31788+_doprnt(); 31789 #endif 31790 31791-int 31792-main () 31793-{ 31794-return f != _doprnt; 31795- ; 31796- return 0; 31797-} 31798-_ACEOF 31799-rm -f conftest.$ac_objext conftest$ac_exeext 31800-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 31801- (eval $ac_link) 2>conftest.er1 31802- ac_status=$? 31803- grep -v '^ *+' conftest.er1 >conftest.err 31804- rm -f conftest.er1 31805- cat conftest.err >&5 31806- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31807- (exit $ac_status); } && 31808- { ac_try='test -z "$ac_c_werror_flag" 31809- || test ! -s conftest.err' 31810- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31811- (eval $ac_try) 2>&5 31812- ac_status=$? 31813- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31814- (exit $ac_status); }; } && 31815- { ac_try='test -s conftest$ac_exeext' 31816- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 31817- (eval $ac_try) 2>&5 31818- ac_status=$? 31819- echo "$as_me:$LINENO: \$? = $ac_status" >&5 31820- (exit $ac_status); }; }; then 31821- ac_cv_func__doprnt=yes 31822-else 31823- echo "$as_me: failed program was:" >&5 31824-sed 's/^/| /' conftest.$ac_ext >&5 31825- 31826-ac_cv_func__doprnt=no 31827-fi 31828-rm -f conftest.err conftest.$ac_objext \ 31829- conftest$ac_exeext conftest.$ac_ext 31830-fi 31831-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 31832-echo "${ECHO_T}$ac_cv_func__doprnt" >&6 31833-if test $ac_cv_func__doprnt = yes; then 31834+; return 0; } 31835+EOF 31836+if { (eval echo configure:17789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 31837+ rm -rf conftest* 31838+ eval "ac_cv_func__doprnt=yes" 31839+else 31840+ echo "configure: failed program was:" >&5 31841+ cat conftest.$ac_ext >&5 31842+ rm -rf conftest* 31843+ eval "ac_cv_func__doprnt=no" 31844+fi 31845+rm -f conftest* 31846+fi 31847 31848-cat >>confdefs.h <<\_ACEOF 31849+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then 31850+ echo "$ac_t""yes" 1>&6 31851+ cat >> confdefs.h <<\EOF 31852 #define HAVE_DOPRNT 1 31853-_ACEOF 31854+EOF 31855 31856+else 31857+ echo "$ac_t""no" 1>&6 31858 fi 31859 31860 fi 31861-done 31862- 31863- 31864- 31865- 31866- 31867- 31868- 31869- 31870- 31871- 31872- 31873- 31874- 31875- 31876- 31877- 31878- 31879- 31880- 31881- 31882- 31883- 31884- 31885- 31886- 31887- 31888- 31889- 31890- 31891- 31892- 31893- 31894- 31895- 31896- 31897- 31898- 31899- 31900- 31901- 31902- 31903- 31904- 31905- 31906- 31907- 31908- 31909- 31910- 31911- 31912- 31913- 31914- 31915- 31916- 31917- 31918- 31919- 31920- 31921- 31922- 31923- 31924- 31925- 31926- 31927- 31928- 31929- 31930- 31931- 31932- 31933- 31934- 31935- 31936- 31937- 31938- 31939- 31940- 31941- 31942- 31943- 31944- 31945 31946 for ac_func in alphasort \ 31947 asctime_r \ 31948@@ -26961,250 +17893,146 @@ 31949 nanosleep \ 31950 31951 do 31952-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 31953-echo "$as_me:$LINENO: checking for $ac_func" >&5 31954-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 31955-if eval "test \"\${$as_ac_var+set}\" = set"; then 31956- echo $ECHO_N "(cached) $ECHO_C" >&6 31957-else 31958- cat >conftest.$ac_ext <<_ACEOF 31959-/* confdefs.h. */ 31960-_ACEOF 31961-cat confdefs.h >>conftest.$ac_ext 31962-cat >>conftest.$ac_ext <<_ACEOF 31963-/* end confdefs.h. */ 31964-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 31965- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 31966-#define $ac_func innocuous_$ac_func 31967- 31968+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 31969+echo "configure:17898: checking for $ac_func" >&5 31970+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 31971+ echo $ac_n "(cached) $ac_c" 1>&6 31972+else 31973+ cat > conftest.$ac_ext <<EOF 31974+#line 17903 "configure" 31975+#include "confdefs.h" 31976 /* System header to define __stub macros and hopefully few prototypes, 31977- which can conflict with char $ac_func (); below. 31978- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 31979- <limits.h> exists even on freestanding compilers. */ 31980- 31981-#ifdef __STDC__ 31982-# include <limits.h> 31983-#else 31984-# include <assert.h> 31985-#endif 31986- 31987-#undef $ac_func 31988- 31989+ which can conflict with char $ac_func(); below. */ 31990+#include <assert.h> 31991 /* Override any gcc2 internal prototype to avoid an error. */ 31992-#ifdef __cplusplus 31993-extern "C" 31994-{ 31995-#endif 31996 /* We use char because int might match the return type of a gcc2 31997- builtin and then its argument prototype would still apply. */ 31998-char $ac_func (); 31999+ builtin and then its argument prototype would still apply. */ 32000+char $ac_func(); 32001+ 32002+int main() { 32003+ 32004 /* The GNU C library defines this for functions which it implements 32005 to always fail with ENOSYS. Some functions are actually named 32006 something starting with __ and the normal name is an alias. */ 32007 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 32008 choke me 32009 #else 32010-char (*f) () = $ac_func; 32011-#endif 32012-#ifdef __cplusplus 32013-} 32014+$ac_func(); 32015 #endif 32016 32017-int 32018-main () 32019-{ 32020-return f != $ac_func; 32021- ; 32022- return 0; 32023-} 32024-_ACEOF 32025-rm -f conftest.$ac_objext conftest$ac_exeext 32026-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32027- (eval $ac_link) 2>conftest.er1 32028- ac_status=$? 32029- grep -v '^ *+' conftest.er1 >conftest.err 32030- rm -f conftest.er1 32031- cat conftest.err >&5 32032- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32033- (exit $ac_status); } && 32034- { ac_try='test -z "$ac_c_werror_flag" 32035- || test ! -s conftest.err' 32036- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32037- (eval $ac_try) 2>&5 32038- ac_status=$? 32039- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32040- (exit $ac_status); }; } && 32041- { ac_try='test -s conftest$ac_exeext' 32042- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32043- (eval $ac_try) 2>&5 32044- ac_status=$? 32045- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32046- (exit $ac_status); }; }; then 32047- eval "$as_ac_var=yes" 32048-else 32049- echo "$as_me: failed program was:" >&5 32050-sed 's/^/| /' conftest.$ac_ext >&5 32051- 32052-eval "$as_ac_var=no" 32053-fi 32054-rm -f conftest.err conftest.$ac_objext \ 32055- conftest$ac_exeext conftest.$ac_ext 32056-fi 32057-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 32058-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 32059-if test `eval echo '${'$as_ac_var'}'` = yes; then 32060- cat >>confdefs.h <<_ACEOF 32061-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 32062-_ACEOF 32063+; return 0; } 32064+EOF 32065+if { (eval echo configure:17926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32066+ rm -rf conftest* 32067+ eval "ac_cv_func_$ac_func=yes" 32068+else 32069+ echo "configure: failed program was:" >&5 32070+ cat conftest.$ac_ext >&5 32071+ rm -rf conftest* 32072+ eval "ac_cv_func_$ac_func=no" 32073+fi 32074+rm -f conftest* 32075+fi 32076 32077+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 32078+ echo "$ac_t""yes" 1>&6 32079+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 32080+ cat >> confdefs.h <<EOF 32081+#define $ac_tr_func 1 32082+EOF 32083+ 32084+else 32085+ echo "$ac_t""no" 1>&6 32086 fi 32087 done 32088 32089 32090 32091- 32092+ 32093 unset ac_cv_lib_rt_nanosleep 32094 unset ac_cv_lib_rt___nanosleep 32095 unset found 32096- echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 32097-echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6 32098-if test "${ac_cv_lib_rt_nanosleep+set}" = set; then 32099- echo $ECHO_N "(cached) $ECHO_C" >&6 32100+ echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 32101+echo "configure:17957: checking for nanosleep in -lrt" >&5 32102+ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` 32103+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 32104+ echo $ac_n "(cached) $ac_c" 1>&6 32105 else 32106- ac_check_lib_save_LIBS=$LIBS 32107+ ac_save_LIBS="$LIBS" 32108 LIBS="-lrt $LIBS" 32109-cat >conftest.$ac_ext <<_ACEOF 32110-/* confdefs.h. */ 32111-_ACEOF 32112-cat confdefs.h >>conftest.$ac_ext 32113-cat >>conftest.$ac_ext <<_ACEOF 32114-/* end confdefs.h. */ 32115- 32116+cat > conftest.$ac_ext <<EOF 32117+#line 17965 "configure" 32118+#include "confdefs.h" 32119 /* Override any gcc2 internal prototype to avoid an error. */ 32120-#ifdef __cplusplus 32121-extern "C" 32122-#endif 32123 /* We use char because int might match the return type of a gcc2 32124- builtin and then its argument prototype would still apply. */ 32125-char nanosleep (); 32126-int 32127-main () 32128-{ 32129-nanosleep (); 32130- ; 32131- return 0; 32132-} 32133-_ACEOF 32134-rm -f conftest.$ac_objext conftest$ac_exeext 32135-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32136- (eval $ac_link) 2>conftest.er1 32137- ac_status=$? 32138- grep -v '^ *+' conftest.er1 >conftest.err 32139- rm -f conftest.er1 32140- cat conftest.err >&5 32141- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32142- (exit $ac_status); } && 32143- { ac_try='test -z "$ac_c_werror_flag" 32144- || test ! -s conftest.err' 32145- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32146- (eval $ac_try) 2>&5 32147- ac_status=$? 32148- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32149- (exit $ac_status); }; } && 32150- { ac_try='test -s conftest$ac_exeext' 32151- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32152- (eval $ac_try) 2>&5 32153- ac_status=$? 32154- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32155- (exit $ac_status); }; }; then 32156- ac_cv_lib_rt_nanosleep=yes 32157-else 32158- echo "$as_me: failed program was:" >&5 32159-sed 's/^/| /' conftest.$ac_ext >&5 32160- 32161-ac_cv_lib_rt_nanosleep=no 32162-fi 32163-rm -f conftest.err conftest.$ac_objext \ 32164- conftest$ac_exeext conftest.$ac_ext 32165-LIBS=$ac_check_lib_save_LIBS 32166-fi 32167-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5 32168-echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6 32169-if test $ac_cv_lib_rt_nanosleep = yes; then 32170+ builtin and then its argument prototype would still apply. */ 32171+char nanosleep(); 32172+ 32173+int main() { 32174+nanosleep() 32175+; return 0; } 32176+EOF 32177+if { (eval echo configure:17976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32178+ rm -rf conftest* 32179+ eval "ac_cv_lib_$ac_lib_var=yes" 32180+else 32181+ echo "configure: failed program was:" >&5 32182+ cat conftest.$ac_ext >&5 32183+ rm -rf conftest* 32184+ eval "ac_cv_lib_$ac_lib_var=no" 32185+fi 32186+rm -f conftest* 32187+LIBS="$ac_save_LIBS" 32188+ 32189+fi 32190+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 32191+ echo "$ac_t""yes" 1>&6 32192 found=yes 32193 else 32194+ echo "$ac_t""no" 1>&6 32195 32196- echo "$as_me:$LINENO: checking for __nanosleep in -lrt" >&5 32197-echo $ECHO_N "checking for __nanosleep in -lrt... $ECHO_C" >&6 32198-if test "${ac_cv_lib_rt___nanosleep+set}" = set; then 32199- echo $ECHO_N "(cached) $ECHO_C" >&6 32200+ echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6 32201+echo "configure:17996: checking for __nanosleep in -lrt" >&5 32202+ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'` 32203+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 32204+ echo $ac_n "(cached) $ac_c" 1>&6 32205 else 32206- ac_check_lib_save_LIBS=$LIBS 32207+ ac_save_LIBS="$LIBS" 32208 LIBS="-lrt $LIBS" 32209-cat >conftest.$ac_ext <<_ACEOF 32210-/* confdefs.h. */ 32211-_ACEOF 32212-cat confdefs.h >>conftest.$ac_ext 32213-cat >>conftest.$ac_ext <<_ACEOF 32214-/* end confdefs.h. */ 32215- 32216+cat > conftest.$ac_ext <<EOF 32217+#line 18004 "configure" 32218+#include "confdefs.h" 32219 /* Override any gcc2 internal prototype to avoid an error. */ 32220-#ifdef __cplusplus 32221-extern "C" 32222-#endif 32223 /* We use char because int might match the return type of a gcc2 32224- builtin and then its argument prototype would still apply. */ 32225-char __nanosleep (); 32226-int 32227-main () 32228-{ 32229-__nanosleep (); 32230- ; 32231- return 0; 32232-} 32233-_ACEOF 32234-rm -f conftest.$ac_objext conftest$ac_exeext 32235-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32236- (eval $ac_link) 2>conftest.er1 32237- ac_status=$? 32238- grep -v '^ *+' conftest.er1 >conftest.err 32239- rm -f conftest.er1 32240- cat conftest.err >&5 32241- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32242- (exit $ac_status); } && 32243- { ac_try='test -z "$ac_c_werror_flag" 32244- || test ! -s conftest.err' 32245- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32246- (eval $ac_try) 2>&5 32247- ac_status=$? 32248- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32249- (exit $ac_status); }; } && 32250- { ac_try='test -s conftest$ac_exeext' 32251- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32252- (eval $ac_try) 2>&5 32253- ac_status=$? 32254- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32255- (exit $ac_status); }; }; then 32256- ac_cv_lib_rt___nanosleep=yes 32257-else 32258- echo "$as_me: failed program was:" >&5 32259-sed 's/^/| /' conftest.$ac_ext >&5 32260- 32261-ac_cv_lib_rt___nanosleep=no 32262-fi 32263-rm -f conftest.err conftest.$ac_objext \ 32264- conftest$ac_exeext conftest.$ac_ext 32265-LIBS=$ac_check_lib_save_LIBS 32266-fi 32267-echo "$as_me:$LINENO: result: $ac_cv_lib_rt___nanosleep" >&5 32268-echo "${ECHO_T}$ac_cv_lib_rt___nanosleep" >&6 32269-if test $ac_cv_lib_rt___nanosleep = yes; then 32270- found=yes 32271+ builtin and then its argument prototype would still apply. */ 32272+char __nanosleep(); 32273+ 32274+int main() { 32275+__nanosleep() 32276+; return 0; } 32277+EOF 32278+if { (eval echo configure:18015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32279+ rm -rf conftest* 32280+ eval "ac_cv_lib_$ac_lib_var=yes" 32281 else 32282- found=no 32283+ echo "configure: failed program was:" >&5 32284+ cat conftest.$ac_ext >&5 32285+ rm -rf conftest* 32286+ eval "ac_cv_lib_$ac_lib_var=no" 32287 fi 32288+rm -f conftest* 32289+LIBS="$ac_save_LIBS" 32290 32291+fi 32292+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 32293+ echo "$ac_t""yes" 1>&6 32294+ found=yes 32295+else 32296+ echo "$ac_t""no" 1>&6 32297+found=no 32298+fi 32299 32300+ 32301 fi 32302 32303 32304@@ -27214,120 +18042,75 @@ 32305 if test "$cross_compiling" = yes; then 32306 found=no 32307 else 32308- cat >conftest.$ac_ext <<_ACEOF 32309-/* confdefs.h. */ 32310-_ACEOF 32311-cat confdefs.h >>conftest.$ac_ext 32312-cat >>conftest.$ac_ext <<_ACEOF 32313-/* end confdefs.h. */ 32314+ cat > conftest.$ac_ext <<EOF 32315+#line 18047 "configure" 32316+#include "confdefs.h" 32317 main() { return (0); } 32318-_ACEOF 32319-rm -f conftest$ac_exeext 32320-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32321- (eval $ac_link) 2>&5 32322- ac_status=$? 32323- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32324- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 32325- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32326- (eval $ac_try) 2>&5 32327- ac_status=$? 32328- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32329- (exit $ac_status); }; }; then 32330+EOF 32331+if { (eval echo configure:18051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 32332+then 32333 found=yes 32334 else 32335- echo "$as_me: program exited with status $ac_status" >&5 32336-echo "$as_me: failed program was:" >&5 32337-sed 's/^/| /' conftest.$ac_ext >&5 32338- 32339-( exit $ac_status ) 32340-found=no 32341+ echo "configure: failed program was:" >&5 32342+ cat conftest.$ac_ext >&5 32343+ rm -fr conftest* 32344+ found=no 32345 fi 32346-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 32347+rm -fr conftest* 32348 fi 32349+ 32350 LIBS=$ac_libs 32351 fi 32352 32353 if test "$found" = "yes"; then 32354- 32355- 32356+ 32357+ 32358 case rt in 32359 c|c_r|pthread*) ;; 32360- *) 32361- LIBS="-lrt $LIBS" 32362+ *) 32363+ LIBS="-lrt $LIBS" 32364 ;; 32365 esac 32366 32367 32368- 32369-cat >>confdefs.h <<\_ACEOF 32370+ cat >> confdefs.h <<\EOF 32371 #define HAVE_NANOSLEEP 1 32372-_ACEOF 32373- 32374+EOF 32375 32376-cat >>confdefs.h <<\_ACEOF 32377+ cat >> confdefs.h <<\EOF 32378 #define HAVE_LIBRT 1 32379-_ACEOF 32380+EOF 32381 32382 ac_cv_func_nanosleep=yes 32383 else 32384- 32385+ 32386 : 32387 32388 fi 32389+ 32390 32391 32392- 32393-echo "$as_me:$LINENO: checking for getaddrinfo" >&5 32394-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 32395-if test "${ac_cv_func_getaddrinfo+set}" = set; then 32396- echo $ECHO_N "(cached) $ECHO_C" >&6 32397-else 32398- cat >conftest.$ac_ext <<_ACEOF 32399-/* confdefs.h. */ 32400-_ACEOF 32401-cat confdefs.h >>conftest.$ac_ext 32402-cat >>conftest.$ac_ext <<_ACEOF 32403-/* end confdefs.h. */ 32404+echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 32405+echo "configure:18095: checking for getaddrinfo" >&5 32406+if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then 32407+ echo $ac_n "(cached) $ac_c" 1>&6 32408+else 32409+ cat > conftest.$ac_ext <<EOF 32410+#line 18100 "configure" 32411+#include "confdefs.h" 32412 #include <netdb.h> 32413-int 32414-main () 32415-{ 32416+int main() { 32417 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g); 32418- ; 32419- return 0; 32420-} 32421-_ACEOF 32422-rm -f conftest.$ac_objext conftest$ac_exeext 32423-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32424- (eval $ac_link) 2>conftest.er1 32425- ac_status=$? 32426- grep -v '^ *+' conftest.er1 >conftest.err 32427- rm -f conftest.er1 32428- cat conftest.err >&5 32429- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32430- (exit $ac_status); } && 32431- { ac_try='test -z "$ac_c_werror_flag" 32432- || test ! -s conftest.err' 32433- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32434- (eval $ac_try) 2>&5 32435- ac_status=$? 32436- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32437- (exit $ac_status); }; } && 32438- { ac_try='test -s conftest$ac_exeext' 32439- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32440- (eval $ac_try) 2>&5 32441- ac_status=$? 32442- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32443- (exit $ac_status); }; }; then 32444+; return 0; } 32445+EOF 32446+if { (eval echo configure:18107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32447+ rm -rf conftest* 32448 if test "$cross_compiling" = yes; then 32449 ac_cv_func_getaddrinfo=no 32450 else 32451- cat >conftest.$ac_ext <<_ACEOF 32452-/* confdefs.h. */ 32453-_ACEOF 32454-cat confdefs.h >>conftest.$ac_ext 32455-cat >>conftest.$ac_ext <<_ACEOF 32456-/* end confdefs.h. */ 32457+ cat > conftest.$ac_ext <<EOF 32458+#line 18113 "configure" 32459+#include "confdefs.h" 32460 32461 #include <netdb.h> 32462 #include <sys/types.h> 32463@@ -27349,7 +18132,7 @@ 32464 } 32465 32466 pai = ai; 32467- 32468+ 32469 while (pai) { 32470 if (pai->ai_family != AF_INET) { 32471 /* 127.0.0.1/NUMERICHOST should only resolve ONE way */ 32472@@ -27364,365 +18147,216 @@ 32473 freeaddrinfo(ai); 32474 exit(0); 32475 } 32476- 32477-_ACEOF 32478-rm -f conftest$ac_exeext 32479-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32480- (eval $ac_link) 2>&5 32481- ac_status=$? 32482- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32483- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 32484- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32485- (eval $ac_try) 2>&5 32486- ac_status=$? 32487- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32488- (exit $ac_status); }; }; then 32489+ 32490+EOF 32491+if { (eval echo configure:18153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 32492+then 32493 ac_cv_func_getaddrinfo=yes 32494 else 32495- echo "$as_me: program exited with status $ac_status" >&5 32496-echo "$as_me: failed program was:" >&5 32497-sed 's/^/| /' conftest.$ac_ext >&5 32498- 32499-( exit $ac_status ) 32500-ac_cv_func_getaddrinfo=no 32501+ echo "configure: failed program was:" >&5 32502+ cat conftest.$ac_ext >&5 32503+ rm -fr conftest* 32504+ ac_cv_func_getaddrinfo=no 32505 fi 32506-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 32507+rm -fr conftest* 32508 fi 32509-else 32510- echo "$as_me: failed program was:" >&5 32511-sed 's/^/| /' conftest.$ac_ext >&5 32512 32513-ac_cv_func_getaddrinfo=no 32514+else 32515+ echo "configure: failed program was:" >&5 32516+ cat conftest.$ac_ext >&5 32517+ rm -rf conftest* 32518+ ac_cv_func_getaddrinfo=no 32519 fi 32520-rm -f conftest.err conftest.$ac_objext \ 32521- conftest$ac_exeext conftest.$ac_ext 32522+rm -f conftest* 32523 fi 32524-echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 32525-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 32526-if test "$ac_cv_func_getaddrinfo" = yes; then 32527 32528-cat >>confdefs.h <<\_ACEOF 32529+echo "$ac_t""$ac_cv_func_getaddrinfo" 1>&6 32530+if test "$ac_cv_func_getaddrinfo" = yes; then 32531+ cat >> confdefs.h <<\EOF 32532 #define HAVE_GETADDRINFO 1 32533-_ACEOF 32534+EOF 32535 32536 fi 32537 32538-echo "$as_me:$LINENO: checking for __sync_fetch_and_add" >&5 32539-echo $ECHO_N "checking for __sync_fetch_and_add... $ECHO_C" >&6 32540-if test "${ac_cv_func_sync_fetch_and_add+set}" = set; then 32541- echo $ECHO_N "(cached) $ECHO_C" >&6 32542+echo $ac_n "checking for __sync_fetch_and_add""... $ac_c" 1>&6 32543+echo "configure:18183: checking for __sync_fetch_and_add" >&5 32544+if eval "test \"`echo '$''{'ac_cv_func_sync_fetch_and_add'+set}'`\" = set"; then 32545+ echo $ac_n "(cached) $ac_c" 1>&6 32546 else 32547- cat >conftest.$ac_ext <<_ACEOF 32548-/* confdefs.h. */ 32549-_ACEOF 32550-cat confdefs.h >>conftest.$ac_ext 32551-cat >>conftest.$ac_ext <<_ACEOF 32552-/* end confdefs.h. */ 32553+ cat > conftest.$ac_ext <<EOF 32554+#line 18188 "configure" 32555+#include "confdefs.h" 32556 32557-int 32558-main () 32559-{ 32560+int main() { 32561 int x;__sync_fetch_and_add(&x,1); 32562- ; 32563- return 0; 32564-} 32565-_ACEOF 32566-rm -f conftest.$ac_objext conftest$ac_exeext 32567-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32568- (eval $ac_link) 2>conftest.er1 32569- ac_status=$? 32570- grep -v '^ *+' conftest.er1 >conftest.err 32571- rm -f conftest.er1 32572- cat conftest.err >&5 32573- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32574- (exit $ac_status); } && 32575- { ac_try='test -z "$ac_c_werror_flag" 32576- || test ! -s conftest.err' 32577- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32578- (eval $ac_try) 2>&5 32579- ac_status=$? 32580- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32581- (exit $ac_status); }; } && 32582- { ac_try='test -s conftest$ac_exeext' 32583- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32584- (eval $ac_try) 2>&5 32585- ac_status=$? 32586- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32587- (exit $ac_status); }; }; then 32588+; return 0; } 32589+EOF 32590+if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32591+ rm -rf conftest* 32592 ac_cv_func_sync_fetch_and_add=yes 32593 else 32594- echo "$as_me: failed program was:" >&5 32595-sed 's/^/| /' conftest.$ac_ext >&5 32596- 32597-ac_cv_func_sync_fetch_and_add=no 32598+ echo "configure: failed program was:" >&5 32599+ cat conftest.$ac_ext >&5 32600+ rm -rf conftest* 32601+ ac_cv_func_sync_fetch_and_add=no 32602 fi 32603-rm -f conftest.err conftest.$ac_objext \ 32604- conftest$ac_exeext conftest.$ac_ext 32605+rm -f conftest* 32606 fi 32607-echo "$as_me:$LINENO: result: $ac_cv_func_sync_fetch_and_add" >&5 32608-echo "${ECHO_T}$ac_cv_func_sync_fetch_and_add" >&6 32609-if test "$ac_cv_func_sync_fetch_and_add" = yes; then 32610 32611-cat >>confdefs.h <<\_ACEOF 32612+echo "$ac_t""$ac_cv_func_sync_fetch_and_add" 1>&6 32613+if test "$ac_cv_func_sync_fetch_and_add" = yes; then 32614+ cat >> confdefs.h <<\EOF 32615 #define HAVE_SYNC_FETCH_AND_ADD 1 32616-_ACEOF 32617+EOF 32618 32619 fi 32620 32621- 32622- 32623- 32624 for ac_func in strlcat strlcpy getopt 32625 do 32626-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 32627-echo "$as_me:$LINENO: checking for $ac_func" >&5 32628-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 32629-if eval "test \"\${$as_ac_var+set}\" = set"; then 32630- echo $ECHO_N "(cached) $ECHO_C" >&6 32631-else 32632- cat >conftest.$ac_ext <<_ACEOF 32633-/* confdefs.h. */ 32634-_ACEOF 32635-cat confdefs.h >>conftest.$ac_ext 32636-cat >>conftest.$ac_ext <<_ACEOF 32637-/* end confdefs.h. */ 32638-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 32639- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 32640-#define $ac_func innocuous_$ac_func 32641- 32642+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 32643+echo "configure:18218: checking for $ac_func" >&5 32644+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 32645+ echo $ac_n "(cached) $ac_c" 1>&6 32646+else 32647+ cat > conftest.$ac_ext <<EOF 32648+#line 18223 "configure" 32649+#include "confdefs.h" 32650 /* System header to define __stub macros and hopefully few prototypes, 32651- which can conflict with char $ac_func (); below. 32652- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 32653- <limits.h> exists even on freestanding compilers. */ 32654- 32655-#ifdef __STDC__ 32656-# include <limits.h> 32657-#else 32658-# include <assert.h> 32659-#endif 32660- 32661-#undef $ac_func 32662- 32663+ which can conflict with char $ac_func(); below. */ 32664+#include <assert.h> 32665 /* Override any gcc2 internal prototype to avoid an error. */ 32666-#ifdef __cplusplus 32667-extern "C" 32668-{ 32669-#endif 32670 /* We use char because int might match the return type of a gcc2 32671- builtin and then its argument prototype would still apply. */ 32672-char $ac_func (); 32673+ builtin and then its argument prototype would still apply. */ 32674+char $ac_func(); 32675+ 32676+int main() { 32677+ 32678 /* The GNU C library defines this for functions which it implements 32679 to always fail with ENOSYS. Some functions are actually named 32680 something starting with __ and the normal name is an alias. */ 32681 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 32682 choke me 32683 #else 32684-char (*f) () = $ac_func; 32685-#endif 32686-#ifdef __cplusplus 32687-} 32688+$ac_func(); 32689 #endif 32690 32691-int 32692-main () 32693-{ 32694-return f != $ac_func; 32695- ; 32696- return 0; 32697-} 32698-_ACEOF 32699-rm -f conftest.$ac_objext conftest$ac_exeext 32700-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32701- (eval $ac_link) 2>conftest.er1 32702- ac_status=$? 32703- grep -v '^ *+' conftest.er1 >conftest.err 32704- rm -f conftest.er1 32705- cat conftest.err >&5 32706- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32707- (exit $ac_status); } && 32708- { ac_try='test -z "$ac_c_werror_flag" 32709- || test ! -s conftest.err' 32710- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32711- (eval $ac_try) 2>&5 32712- ac_status=$? 32713- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32714- (exit $ac_status); }; } && 32715- { ac_try='test -s conftest$ac_exeext' 32716- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32717- (eval $ac_try) 2>&5 32718- ac_status=$? 32719- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32720- (exit $ac_status); }; }; then 32721- eval "$as_ac_var=yes" 32722-else 32723- echo "$as_me: failed program was:" >&5 32724-sed 's/^/| /' conftest.$ac_ext >&5 32725- 32726-eval "$as_ac_var=no" 32727-fi 32728-rm -f conftest.err conftest.$ac_objext \ 32729- conftest$ac_exeext conftest.$ac_ext 32730-fi 32731-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 32732-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 32733-if test `eval echo '${'$as_ac_var'}'` = yes; then 32734- cat >>confdefs.h <<_ACEOF 32735-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 32736-_ACEOF 32737- 32738-else 32739- case $LIBOBJS in 32740- "$ac_func.$ac_objext" | \ 32741- *" $ac_func.$ac_objext" | \ 32742- "$ac_func.$ac_objext "* | \ 32743- *" $ac_func.$ac_objext "* ) ;; 32744- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;; 32745-esac 32746+; return 0; } 32747+EOF 32748+if { (eval echo configure:18246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32749+ rm -rf conftest* 32750+ eval "ac_cv_func_$ac_func=yes" 32751+else 32752+ echo "configure: failed program was:" >&5 32753+ cat conftest.$ac_ext >&5 32754+ rm -rf conftest* 32755+ eval "ac_cv_func_$ac_func=no" 32756+fi 32757+rm -f conftest* 32758+fi 32759 32760+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 32761+ echo "$ac_t""yes" 1>&6 32762+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 32763+ cat >> confdefs.h <<EOF 32764+#define $ac_tr_func 1 32765+EOF 32766+ 32767+else 32768+ echo "$ac_t""no" 1>&6 32769+LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" 32770 fi 32771 done 32772 32773 32774-echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 32775-echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 32776-if test "${ac_cv_func_utime_null+set}" = set; then 32777- echo $ECHO_N "(cached) $ECHO_C" >&6 32778+echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 32779+echo "configure:18273: checking whether utime accepts a null argument" >&5 32780+if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then 32781+ echo $ac_n "(cached) $ac_c" 1>&6 32782 else 32783- rm -f conftest.data; >conftest.data 32784+ rm -f conftestdata; > conftestdata 32785 # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. 32786 if test "$cross_compiling" = yes; then 32787 ac_cv_func_utime_null=no 32788 else 32789- cat >conftest.$ac_ext <<_ACEOF 32790-/* confdefs.h. */ 32791-_ACEOF 32792-cat confdefs.h >>conftest.$ac_ext 32793-cat >>conftest.$ac_ext <<_ACEOF 32794-/* end confdefs.h. */ 32795-$ac_includes_default 32796-int 32797-main () 32798-{ 32799+ cat > conftest.$ac_ext <<EOF 32800+#line 18283 "configure" 32801+#include "confdefs.h" 32802+#include <sys/types.h> 32803+#include <sys/stat.h> 32804+main() { 32805 struct stat s, t; 32806- exit (!(stat ("conftest.data", &s) == 0 32807- && utime ("conftest.data", (long *)0) == 0 32808- && stat ("conftest.data", &t) == 0 32809- && t.st_mtime >= s.st_mtime 32810- && t.st_mtime - s.st_mtime < 120)); 32811- ; 32812- return 0; 32813+exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 32814+&& stat("conftestdata", &t) == 0 && t.st_mtime >= s.st_mtime 32815+&& t.st_mtime - s.st_mtime < 120)); 32816 } 32817-_ACEOF 32818-rm -f conftest$ac_exeext 32819-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32820- (eval $ac_link) 2>&5 32821- ac_status=$? 32822- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32823- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 32824- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32825- (eval $ac_try) 2>&5 32826- ac_status=$? 32827- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32828- (exit $ac_status); }; }; then 32829+EOF 32830+if { (eval echo configure:18294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 32831+then 32832 ac_cv_func_utime_null=yes 32833 else 32834- echo "$as_me: program exited with status $ac_status" >&5 32835-echo "$as_me: failed program was:" >&5 32836-sed 's/^/| /' conftest.$ac_ext >&5 32837- 32838-( exit $ac_status ) 32839-ac_cv_func_utime_null=no 32840+ echo "configure: failed program was:" >&5 32841+ cat conftest.$ac_ext >&5 32842+ rm -fr conftest* 32843+ ac_cv_func_utime_null=no 32844 fi 32845-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 32846+rm -fr conftest* 32847 fi 32848-rm -f core *.core 32849+ 32850+rm -f core core.* *.core 32851 fi 32852-echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 32853-echo "${ECHO_T}$ac_cv_func_utime_null" >&6 32854-if test $ac_cv_func_utime_null = yes; then 32855 32856-cat >>confdefs.h <<\_ACEOF 32857+echo "$ac_t""$ac_cv_func_utime_null" 1>&6 32858+if test $ac_cv_func_utime_null = yes; then 32859+ cat >> confdefs.h <<\EOF 32860 #define HAVE_UTIME_NULL 1 32861-_ACEOF 32862+EOF 32863 32864 fi 32865-rm -f conftest.data 32866 32867 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works 32868 # for constant arguments. Useless! 32869-echo "$as_me:$LINENO: checking for working alloca.h" >&5 32870-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 32871-if test "${ac_cv_working_alloca_h+set}" = set; then 32872- echo $ECHO_N "(cached) $ECHO_C" >&6 32873-else 32874- cat >conftest.$ac_ext <<_ACEOF 32875-/* confdefs.h. */ 32876-_ACEOF 32877-cat confdefs.h >>conftest.$ac_ext 32878-cat >>conftest.$ac_ext <<_ACEOF 32879-/* end confdefs.h. */ 32880+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 32881+echo "configure:18320: checking for working alloca.h" >&5 32882+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 32883+ echo $ac_n "(cached) $ac_c" 1>&6 32884+else 32885+ cat > conftest.$ac_ext <<EOF 32886+#line 18325 "configure" 32887+#include "confdefs.h" 32888 #include <alloca.h> 32889-int 32890-main () 32891-{ 32892-char *p = (char *) alloca (2 * sizeof (int)); 32893- ; 32894- return 0; 32895-} 32896-_ACEOF 32897-rm -f conftest.$ac_objext conftest$ac_exeext 32898-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32899- (eval $ac_link) 2>conftest.er1 32900- ac_status=$? 32901- grep -v '^ *+' conftest.er1 >conftest.err 32902- rm -f conftest.er1 32903- cat conftest.err >&5 32904- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32905- (exit $ac_status); } && 32906- { ac_try='test -z "$ac_c_werror_flag" 32907- || test ! -s conftest.err' 32908- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32909- (eval $ac_try) 2>&5 32910- ac_status=$? 32911- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32912- (exit $ac_status); }; } && 32913- { ac_try='test -s conftest$ac_exeext' 32914- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 32915- (eval $ac_try) 2>&5 32916- ac_status=$? 32917- echo "$as_me:$LINENO: \$? = $ac_status" >&5 32918- (exit $ac_status); }; }; then 32919- ac_cv_working_alloca_h=yes 32920-else 32921- echo "$as_me: failed program was:" >&5 32922-sed 's/^/| /' conftest.$ac_ext >&5 32923- 32924-ac_cv_working_alloca_h=no 32925-fi 32926-rm -f conftest.err conftest.$ac_objext \ 32927- conftest$ac_exeext conftest.$ac_ext 32928-fi 32929-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 32930-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 32931-if test $ac_cv_working_alloca_h = yes; then 32932+int main() { 32933+char *p = alloca(2 * sizeof(int)); 32934+; return 0; } 32935+EOF 32936+if { (eval echo configure:18332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 32937+ rm -rf conftest* 32938+ ac_cv_header_alloca_h=yes 32939+else 32940+ echo "configure: failed program was:" >&5 32941+ cat conftest.$ac_ext >&5 32942+ rm -rf conftest* 32943+ ac_cv_header_alloca_h=no 32944+fi 32945+rm -f conftest* 32946+fi 32947 32948-cat >>confdefs.h <<\_ACEOF 32949+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 32950+if test $ac_cv_header_alloca_h = yes; then 32951+ cat >> confdefs.h <<\EOF 32952 #define HAVE_ALLOCA_H 1 32953-_ACEOF 32954+EOF 32955 32956 fi 32957 32958-echo "$as_me:$LINENO: checking for alloca" >&5 32959-echo $ECHO_N "checking for alloca... $ECHO_C" >&6 32960-if test "${ac_cv_func_alloca_works+set}" = set; then 32961- echo $ECHO_N "(cached) $ECHO_C" >&6 32962+echo $ac_n "checking for alloca""... $ac_c" 1>&6 32963+echo "configure:18353: checking for alloca" >&5 32964+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 32965+ echo $ac_n "(cached) $ac_c" 1>&6 32966 else 32967- cat >conftest.$ac_ext <<_ACEOF 32968-/* confdefs.h. */ 32969-_ACEOF 32970-cat confdefs.h >>conftest.$ac_ext 32971-cat >>conftest.$ac_ext <<_ACEOF 32972-/* end confdefs.h. */ 32973+ cat > conftest.$ac_ext <<EOF 32974+#line 18358 "configure" 32975+#include "confdefs.h" 32976+ 32977 #ifdef __GNUC__ 32978 # define alloca __builtin_alloca 32979 #else 32980@@ -27744,217 +18378,137 @@ 32981 # endif 32982 #endif 32983 32984-int 32985-main () 32986-{ 32987-char *p = (char *) alloca (1); 32988- ; 32989- return 0; 32990-} 32991-_ACEOF 32992-rm -f conftest.$ac_objext conftest$ac_exeext 32993-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 32994- (eval $ac_link) 2>conftest.er1 32995- ac_status=$? 32996- grep -v '^ *+' conftest.er1 >conftest.err 32997- rm -f conftest.er1 32998- cat conftest.err >&5 32999- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33000- (exit $ac_status); } && 33001- { ac_try='test -z "$ac_c_werror_flag" 33002- || test ! -s conftest.err' 33003- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33004- (eval $ac_try) 2>&5 33005- ac_status=$? 33006- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33007- (exit $ac_status); }; } && 33008- { ac_try='test -s conftest$ac_exeext' 33009- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33010- (eval $ac_try) 2>&5 33011- ac_status=$? 33012- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33013- (exit $ac_status); }; }; then 33014+int main() { 33015+char *p = (char *) alloca(1); 33016+; return 0; } 33017+EOF 33018+if { (eval echo configure:18386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33019+ rm -rf conftest* 33020 ac_cv_func_alloca_works=yes 33021 else 33022- echo "$as_me: failed program was:" >&5 33023-sed 's/^/| /' conftest.$ac_ext >&5 33024- 33025-ac_cv_func_alloca_works=no 33026+ echo "configure: failed program was:" >&5 33027+ cat conftest.$ac_ext >&5 33028+ rm -rf conftest* 33029+ ac_cv_func_alloca_works=no 33030 fi 33031-rm -f conftest.err conftest.$ac_objext \ 33032- conftest$ac_exeext conftest.$ac_ext 33033+rm -f conftest* 33034 fi 33035-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 33036-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 33037 33038+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 33039 if test $ac_cv_func_alloca_works = yes; then 33040- 33041-cat >>confdefs.h <<\_ACEOF 33042+ cat >> confdefs.h <<\EOF 33043 #define HAVE_ALLOCA 1 33044-_ACEOF 33045- 33046-else 33047- # The SVR3 libPW and SVR4 libucb both contain incompatible functions 33048-# that cause trouble. Some versions do not even contain alloca or 33049-# contain a buggy version. If you still want to use their alloca, 33050-# use ar to extract alloca.o from them instead of compiling alloca.c. 33051+EOF 33052 33053-ALLOCA=alloca.$ac_objext 33054+fi 33055 33056-cat >>confdefs.h <<\_ACEOF 33057+if test $ac_cv_func_alloca_works = no; then 33058+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions 33059+ # that cause trouble. Some versions do not even contain alloca or 33060+ # contain a buggy version. If you still want to use their alloca, 33061+ # use ar to extract alloca.o from them instead of compiling alloca.c. 33062+ ALLOCA=alloca.${ac_objext} 33063+ cat >> confdefs.h <<\EOF 33064 #define C_ALLOCA 1 33065-_ACEOF 33066+EOF 33067 33068 33069-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 33070-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 33071-if test "${ac_cv_os_cray+set}" = set; then 33072- echo $ECHO_N "(cached) $ECHO_C" >&6 33073-else 33074- cat >conftest.$ac_ext <<_ACEOF 33075-/* confdefs.h. */ 33076-_ACEOF 33077-cat confdefs.h >>conftest.$ac_ext 33078-cat >>conftest.$ac_ext <<_ACEOF 33079-/* end confdefs.h. */ 33080+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 33081+echo "configure:18418: checking whether alloca needs Cray hooks" >&5 33082+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 33083+ echo $ac_n "(cached) $ac_c" 1>&6 33084+else 33085+ cat > conftest.$ac_ext <<EOF 33086+#line 18423 "configure" 33087+#include "confdefs.h" 33088 #if defined(CRAY) && ! defined(CRAY2) 33089 webecray 33090 #else 33091 wenotbecray 33092 #endif 33093 33094-_ACEOF 33095+EOF 33096 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 33097- $EGREP "webecray" >/dev/null 2>&1; then 33098+ egrep "webecray" >/dev/null 2>&1; then 33099+ rm -rf conftest* 33100 ac_cv_os_cray=yes 33101 else 33102+ rm -rf conftest* 33103 ac_cv_os_cray=no 33104 fi 33105 rm -f conftest* 33106 33107 fi 33108-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 33109-echo "${ECHO_T}$ac_cv_os_cray" >&6 33110-if test $ac_cv_os_cray = yes; then 33111- for ac_func in _getb67 GETB67 getb67; do 33112- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 33113-echo "$as_me:$LINENO: checking for $ac_func" >&5 33114-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 33115-if eval "test \"\${$as_ac_var+set}\" = set"; then 33116- echo $ECHO_N "(cached) $ECHO_C" >&6 33117-else 33118- cat >conftest.$ac_ext <<_ACEOF 33119-/* confdefs.h. */ 33120-_ACEOF 33121-cat confdefs.h >>conftest.$ac_ext 33122-cat >>conftest.$ac_ext <<_ACEOF 33123-/* end confdefs.h. */ 33124-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 33125- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 33126-#define $ac_func innocuous_$ac_func 33127 33128+echo "$ac_t""$ac_cv_os_cray" 1>&6 33129+if test $ac_cv_os_cray = yes; then 33130+for ac_func in _getb67 GETB67 getb67; do 33131+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 33132+echo "configure:18448: checking for $ac_func" >&5 33133+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 33134+ echo $ac_n "(cached) $ac_c" 1>&6 33135+else 33136+ cat > conftest.$ac_ext <<EOF 33137+#line 18453 "configure" 33138+#include "confdefs.h" 33139 /* System header to define __stub macros and hopefully few prototypes, 33140- which can conflict with char $ac_func (); below. 33141- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 33142- <limits.h> exists even on freestanding compilers. */ 33143- 33144-#ifdef __STDC__ 33145-# include <limits.h> 33146-#else 33147-# include <assert.h> 33148-#endif 33149- 33150-#undef $ac_func 33151- 33152+ which can conflict with char $ac_func(); below. */ 33153+#include <assert.h> 33154 /* Override any gcc2 internal prototype to avoid an error. */ 33155-#ifdef __cplusplus 33156-extern "C" 33157-{ 33158-#endif 33159 /* We use char because int might match the return type of a gcc2 33160- builtin and then its argument prototype would still apply. */ 33161-char $ac_func (); 33162+ builtin and then its argument prototype would still apply. */ 33163+char $ac_func(); 33164+ 33165+int main() { 33166+ 33167 /* The GNU C library defines this for functions which it implements 33168 to always fail with ENOSYS. Some functions are actually named 33169 something starting with __ and the normal name is an alias. */ 33170 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 33171 choke me 33172 #else 33173-char (*f) () = $ac_func; 33174-#endif 33175-#ifdef __cplusplus 33176-} 33177+$ac_func(); 33178 #endif 33179 33180-int 33181-main () 33182-{ 33183-return f != $ac_func; 33184- ; 33185- return 0; 33186-} 33187-_ACEOF 33188-rm -f conftest.$ac_objext conftest$ac_exeext 33189-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33190- (eval $ac_link) 2>conftest.er1 33191- ac_status=$? 33192- grep -v '^ *+' conftest.er1 >conftest.err 33193- rm -f conftest.er1 33194- cat conftest.err >&5 33195- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33196- (exit $ac_status); } && 33197- { ac_try='test -z "$ac_c_werror_flag" 33198- || test ! -s conftest.err' 33199- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33200- (eval $ac_try) 2>&5 33201- ac_status=$? 33202- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33203- (exit $ac_status); }; } && 33204- { ac_try='test -s conftest$ac_exeext' 33205- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33206- (eval $ac_try) 2>&5 33207- ac_status=$? 33208- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33209- (exit $ac_status); }; }; then 33210- eval "$as_ac_var=yes" 33211-else 33212- echo "$as_me: failed program was:" >&5 33213-sed 's/^/| /' conftest.$ac_ext >&5 33214- 33215-eval "$as_ac_var=no" 33216-fi 33217-rm -f conftest.err conftest.$ac_objext \ 33218- conftest$ac_exeext conftest.$ac_ext 33219-fi 33220-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 33221-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 33222-if test `eval echo '${'$as_ac_var'}'` = yes; then 33223+; return 0; } 33224+EOF 33225+if { (eval echo configure:18476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33226+ rm -rf conftest* 33227+ eval "ac_cv_func_$ac_func=yes" 33228+else 33229+ echo "configure: failed program was:" >&5 33230+ cat conftest.$ac_ext >&5 33231+ rm -rf conftest* 33232+ eval "ac_cv_func_$ac_func=no" 33233+fi 33234+rm -f conftest* 33235+fi 33236 33237-cat >>confdefs.h <<_ACEOF 33238+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 33239+ echo "$ac_t""yes" 1>&6 33240+ cat >> confdefs.h <<EOF 33241 #define CRAY_STACKSEG_END $ac_func 33242-_ACEOF 33243+EOF 33244 33245- break 33246+ break 33247+else 33248+ echo "$ac_t""no" 1>&6 33249 fi 33250 33251- done 33252+done 33253 fi 33254 33255-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 33256-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 33257-if test "${ac_cv_c_stack_direction+set}" = set; then 33258- echo $ECHO_N "(cached) $ECHO_C" >&6 33259+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 33260+echo "configure:18503: checking stack direction for C alloca" >&5 33261+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 33262+ echo $ac_n "(cached) $ac_c" 1>&6 33263 else 33264 if test "$cross_compiling" = yes; then 33265 ac_cv_c_stack_direction=0 33266 else 33267- cat >conftest.$ac_ext <<_ACEOF 33268-/* confdefs.h. */ 33269-_ACEOF 33270-cat confdefs.h >>conftest.$ac_ext 33271-cat >>conftest.$ac_ext <<_ACEOF 33272-/* end confdefs.h. */ 33273-int 33274+ cat > conftest.$ac_ext <<EOF 33275+#line 18511 "configure" 33276+#include "confdefs.h" 33277 find_stack_direction () 33278 { 33279 static char *addr = 0; 33280@@ -27967,59 +18521,42 @@ 33281 else 33282 return (&dummy > addr) ? 1 : -1; 33283 } 33284- 33285-int 33286 main () 33287 { 33288- exit (find_stack_direction () < 0); 33289+ exit (find_stack_direction() < 0); 33290 } 33291-_ACEOF 33292-rm -f conftest$ac_exeext 33293-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33294- (eval $ac_link) 2>&5 33295- ac_status=$? 33296- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33297- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 33298- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33299- (eval $ac_try) 2>&5 33300- ac_status=$? 33301- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33302- (exit $ac_status); }; }; then 33303+EOF 33304+if { (eval echo configure:18530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 33305+then 33306 ac_cv_c_stack_direction=1 33307 else 33308- echo "$as_me: program exited with status $ac_status" >&5 33309-echo "$as_me: failed program was:" >&5 33310-sed 's/^/| /' conftest.$ac_ext >&5 33311- 33312-( exit $ac_status ) 33313-ac_cv_c_stack_direction=-1 33314+ echo "configure: failed program was:" >&5 33315+ cat conftest.$ac_ext >&5 33316+ rm -fr conftest* 33317+ ac_cv_c_stack_direction=-1 33318 fi 33319-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 33320+rm -fr conftest* 33321 fi 33322+ 33323 fi 33324-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 33325-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 33326 33327-cat >>confdefs.h <<_ACEOF 33328+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 33329+cat >> confdefs.h <<EOF 33330 #define STACK_DIRECTION $ac_cv_c_stack_direction 33331-_ACEOF 33332- 33333+EOF 33334 33335 fi 33336 33337 33338- echo "$as_me:$LINENO: checking for declared timezone" >&5 33339-echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6 33340-if test "${ac_cv_declared_timezone+set}" = set; then 33341- echo $ECHO_N "(cached) $ECHO_C" >&6 33342-else 33343- 33344- cat >conftest.$ac_ext <<_ACEOF 33345-/* confdefs.h. */ 33346-_ACEOF 33347-cat confdefs.h >>conftest.$ac_ext 33348-cat >>conftest.$ac_ext <<_ACEOF 33349-/* end confdefs.h. */ 33350+ echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 33351+echo "configure:18553: checking for declared timezone" >&5 33352+if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then 33353+ echo $ac_n "(cached) $ac_c" 1>&6 33354+else 33355+ 33356+ cat > conftest.$ac_ext <<EOF 33357+#line 18559 "configure" 33358+#include "confdefs.h" 33359 33360 #include <sys/types.h> 33361 #include <time.h> 33362@@ -28027,79 +18564,51 @@ 33363 #include <sys/time.h> 33364 #endif 33365 33366-int 33367-main () 33368-{ 33369+int main() { 33370 33371 time_t foo = (time_t) timezone; 33372 33373- ; 33374- return 0; 33375-} 33376-_ACEOF 33377-rm -f conftest.$ac_objext 33378-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 33379- (eval $ac_compile) 2>conftest.er1 33380- ac_status=$? 33381- grep -v '^ *+' conftest.er1 >conftest.err 33382- rm -f conftest.er1 33383- cat conftest.err >&5 33384- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33385- (exit $ac_status); } && 33386- { ac_try='test -z "$ac_c_werror_flag" 33387- || test ! -s conftest.err' 33388- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33389- (eval $ac_try) 2>&5 33390- ac_status=$? 33391- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33392- (exit $ac_status); }; } && 33393- { ac_try='test -s conftest.$ac_objext' 33394- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33395- (eval $ac_try) 2>&5 33396- ac_status=$? 33397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33398- (exit $ac_status); }; }; then 33399- 33400+; return 0; } 33401+EOF 33402+if { (eval echo configure:18574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 33403+ rm -rf conftest* 33404+ 33405 ac_cv_declared_timezone=yes 33406 33407 else 33408- echo "$as_me: failed program was:" >&5 33409-sed 's/^/| /' conftest.$ac_ext >&5 33410- 33411- 33412+ echo "configure: failed program was:" >&5 33413+ cat conftest.$ac_ext >&5 33414+ rm -rf conftest* 33415+ 33416 ac_cv_declared_timezone=no 33417 33418 fi 33419-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 33420+rm -f conftest* 33421 fi 33422-echo "$as_me:$LINENO: result: $ac_cv_declared_timezone" >&5 33423-echo "${ECHO_T}$ac_cv_declared_timezone" >&6 33424- if test "$ac_cv_declared_timezone" = "yes"; then 33425 33426-cat >>confdefs.h <<\_ACEOF 33427+echo "$ac_t""$ac_cv_declared_timezone" 1>&6 33428+ if test "$ac_cv_declared_timezone" = "yes"; then 33429+ cat >> confdefs.h <<\EOF 33430 #define HAVE_DECLARED_TIMEZONE 1 33431-_ACEOF 33432+EOF 33433 33434 fi 33435 33436 33437-echo "$as_me:$LINENO: checking for type of reentrant time-related functions" >&5 33438-echo $ECHO_N "checking for type of reentrant time-related functions... $ECHO_C" >&6 33439-if test "${ac_cv_time_r_type+set}" = set; then 33440- echo $ECHO_N "(cached) $ECHO_C" >&6 33441+echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 33442+echo "configure:18600: checking for type of reentrant time-related functions" >&5 33443+if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then 33444+ echo $ac_n "(cached) $ac_c" 1>&6 33445 else 33446- 33447+ 33448 if test "$cross_compiling" = yes; then 33449- 33450+ 33451 ac_cv_time_r_type=POSIX 33452 33453 else 33454- cat >conftest.$ac_ext <<_ACEOF 33455-/* confdefs.h. */ 33456-_ACEOF 33457-cat confdefs.h >>conftest.$ac_ext 33458-cat >>conftest.$ac_ext <<_ACEOF 33459-/* end confdefs.h. */ 33460+ cat > conftest.$ac_ext <<EOF 33461+#line 18611 "configure" 33462+#include "confdefs.h" 33463 33464 #include <time.h> 33465 33466@@ -28115,215 +18624,140 @@ 33467 return (1); 33468 } 33469 33470-_ACEOF 33471-rm -f conftest$ac_exeext 33472-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33473- (eval $ac_link) 2>&5 33474- ac_status=$? 33475- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33476- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 33477- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33478- (eval $ac_try) 2>&5 33479- ac_status=$? 33480- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33481- (exit $ac_status); }; }; then 33482- 33483+EOF 33484+if { (eval echo configure:18629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 33485+then 33486+ 33487 ac_cv_time_r_type=hpux 33488 33489 else 33490- echo "$as_me: program exited with status $ac_status" >&5 33491-echo "$as_me: failed program was:" >&5 33492-sed 's/^/| /' conftest.$ac_ext >&5 33493- 33494-( exit $ac_status ) 33495- 33496+ echo "configure: failed program was:" >&5 33497+ cat conftest.$ac_ext >&5 33498+ rm -fr conftest* 33499+ 33500 if test "$cross_compiling" = yes; then 33501- 33502+ 33503 ac_cv_time_r_type=POSIX 33504- 33505+ 33506 else 33507- cat >conftest.$ac_ext <<_ACEOF 33508-/* confdefs.h. */ 33509-_ACEOF 33510-cat confdefs.h >>conftest.$ac_ext 33511-cat >>conftest.$ac_ext <<_ACEOF 33512-/* end confdefs.h. */ 33513+ cat > conftest.$ac_ext <<EOF 33514+#line 18645 "configure" 33515+#include "confdefs.h" 33516 33517 #include <time.h> 33518 main() { 33519 struct tm t, *s; 33520 time_t old = 0; 33521 char buf[27], *p; 33522- 33523+ 33524 s = gmtime_r(&old, &t); 33525 p = asctime_r(&t, buf, 26); 33526 if (p == buf && s == &t) return (0); 33527 return (1); 33528 } 33529- 33530-_ACEOF 33531-rm -f conftest$ac_exeext 33532-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33533- (eval $ac_link) 2>&5 33534- ac_status=$? 33535- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33536- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 33537- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33538- (eval $ac_try) 2>&5 33539- ac_status=$? 33540- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33541- (exit $ac_status); }; }; then 33542- 33543+ 33544+EOF 33545+if { (eval echo configure:18661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 33546+then 33547+ 33548 ac_cv_time_r_type=irix 33549- 33550+ 33551 else 33552- echo "$as_me: program exited with status $ac_status" >&5 33553-echo "$as_me: failed program was:" >&5 33554-sed 's/^/| /' conftest.$ac_ext >&5 33555- 33556-( exit $ac_status ) 33557- 33558+ echo "configure: failed program was:" >&5 33559+ cat conftest.$ac_ext >&5 33560+ rm -fr conftest* 33561+ 33562 ac_cv_time_r_type=POSIX 33563- 33564+ 33565 fi 33566-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 33567+rm -fr conftest* 33568 fi 33569 33570+ 33571 fi 33572-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 33573+rm -fr conftest* 33574 fi 33575 33576+ 33577 fi 33578-echo "$as_me:$LINENO: result: $ac_cv_time_r_type" >&5 33579-echo "${ECHO_T}$ac_cv_time_r_type" >&6 33580+ 33581+echo "$ac_t""$ac_cv_time_r_type" 1>&6 33582 case $ac_cv_time_r_type in 33583- hpux) 33584-cat >>confdefs.h <<\_ACEOF 33585+ hpux) cat >> confdefs.h <<\EOF 33586 #define PHP_HPUX_TIME_R 1 33587-_ACEOF 33588+EOF 33589 ;; 33590- irix) 33591-cat >>confdefs.h <<\_ACEOF 33592+ irix) cat >> confdefs.h <<\EOF 33593 #define PHP_IRIX_TIME_R 1 33594-_ACEOF 33595+EOF 33596 ;; 33597 esac 33598 33599 33600- echo "$as_me:$LINENO: checking for readdir_r" >&5 33601-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6 33602-if test "${ac_cv_func_readdir_r+set}" = set; then 33603- echo $ECHO_N "(cached) $ECHO_C" >&6 33604-else 33605- cat >conftest.$ac_ext <<_ACEOF 33606-/* confdefs.h. */ 33607-_ACEOF 33608-cat confdefs.h >>conftest.$ac_ext 33609-cat >>conftest.$ac_ext <<_ACEOF 33610-/* end confdefs.h. */ 33611-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r. 33612- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 33613-#define readdir_r innocuous_readdir_r 33614- 33615+ echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 33616+echo "configure:18699: checking for readdir_r" >&5 33617+if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then 33618+ echo $ac_n "(cached) $ac_c" 1>&6 33619+else 33620+ cat > conftest.$ac_ext <<EOF 33621+#line 18704 "configure" 33622+#include "confdefs.h" 33623 /* System header to define __stub macros and hopefully few prototypes, 33624- which can conflict with char readdir_r (); below. 33625- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 33626- <limits.h> exists even on freestanding compilers. */ 33627- 33628-#ifdef __STDC__ 33629-# include <limits.h> 33630-#else 33631-# include <assert.h> 33632-#endif 33633- 33634-#undef readdir_r 33635- 33636+ which can conflict with char readdir_r(); below. */ 33637+#include <assert.h> 33638 /* Override any gcc2 internal prototype to avoid an error. */ 33639-#ifdef __cplusplus 33640-extern "C" 33641-{ 33642-#endif 33643 /* We use char because int might match the return type of a gcc2 33644- builtin and then its argument prototype would still apply. */ 33645-char readdir_r (); 33646+ builtin and then its argument prototype would still apply. */ 33647+char readdir_r(); 33648+ 33649+int main() { 33650+ 33651 /* The GNU C library defines this for functions which it implements 33652 to always fail with ENOSYS. Some functions are actually named 33653 something starting with __ and the normal name is an alias. */ 33654 #if defined (__stub_readdir_r) || defined (__stub___readdir_r) 33655 choke me 33656 #else 33657-char (*f) () = readdir_r; 33658-#endif 33659-#ifdef __cplusplus 33660-} 33661+readdir_r(); 33662 #endif 33663 33664-int 33665-main () 33666-{ 33667-return f != readdir_r; 33668- ; 33669- return 0; 33670-} 33671-_ACEOF 33672-rm -f conftest.$ac_objext conftest$ac_exeext 33673-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33674- (eval $ac_link) 2>conftest.er1 33675- ac_status=$? 33676- grep -v '^ *+' conftest.er1 >conftest.err 33677- rm -f conftest.er1 33678- cat conftest.err >&5 33679- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33680- (exit $ac_status); } && 33681- { ac_try='test -z "$ac_c_werror_flag" 33682- || test ! -s conftest.err' 33683- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33684- (eval $ac_try) 2>&5 33685- ac_status=$? 33686- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33687- (exit $ac_status); }; } && 33688- { ac_try='test -s conftest$ac_exeext' 33689- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33690- (eval $ac_try) 2>&5 33691- ac_status=$? 33692- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33693- (exit $ac_status); }; }; then 33694- ac_cv_func_readdir_r=yes 33695+; return 0; } 33696+EOF 33697+if { (eval echo configure:18727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 33698+ rm -rf conftest* 33699+ eval "ac_cv_func_readdir_r=yes" 33700 else 33701- echo "$as_me: failed program was:" >&5 33702-sed 's/^/| /' conftest.$ac_ext >&5 33703- 33704-ac_cv_func_readdir_r=no 33705+ echo "configure: failed program was:" >&5 33706+ cat conftest.$ac_ext >&5 33707+ rm -rf conftest* 33708+ eval "ac_cv_func_readdir_r=no" 33709 fi 33710-rm -f conftest.err conftest.$ac_objext \ 33711- conftest$ac_exeext conftest.$ac_ext 33712+rm -f conftest* 33713 fi 33714-echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5 33715-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6 33716-if test $ac_cv_func_readdir_r = yes; then 33717+ 33718+if eval "test \"`echo '$ac_cv_func_'readdir_r`\" = yes"; then 33719+ echo "$ac_t""yes" 1>&6 33720 ac_cv_func_readdir_r=yes 33721 else 33722- ac_cv_func_readdir=no 33723+ echo "$ac_t""no" 1>&6 33724+ac_cv_func_readdir=no 33725 fi 33726 33727 if test "$ac_cv_func_readdir_r" = "yes"; then 33728- echo "$as_me:$LINENO: checking for type of readdir_r" >&5 33729-echo $ECHO_N "checking for type of readdir_r... $ECHO_C" >&6 33730-if test "${ac_cv_what_readdir_r+set}" = set; then 33731- echo $ECHO_N "(cached) $ECHO_C" >&6 33732+ echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6 33733+echo "configure:18749: checking for type of readdir_r" >&5 33734+if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then 33735+ echo $ac_n "(cached) $ac_c" 1>&6 33736 else 33737- 33738+ 33739 if test "$cross_compiling" = yes; then 33740- 33741+ 33742 ac_cv_what_readdir_r=none 33743- 33744+ 33745 else 33746- cat >conftest.$ac_ext <<_ACEOF 33747-/* confdefs.h. */ 33748-_ACEOF 33749-cat confdefs.h >>conftest.$ac_ext 33750-cat >>conftest.$ac_ext <<_ACEOF 33751-/* end confdefs.h. */ 33752+ cat > conftest.$ac_ext <<EOF 33753+#line 18760 "configure" 33754+#include "confdefs.h" 33755 33756 #define _REENTRANT 33757 #include <sys/types.h> 33758@@ -28339,114 +18773,84 @@ 33759 struct dirent *pentry = (struct dirent *) &entry; 33760 33761 dir = opendir("/"); 33762- if (!dir) 33763+ if (!dir) 33764 exit(1); 33765 if (readdir_r(dir, (struct dirent *) entry, &pentry) == 0) 33766 exit(0); 33767 exit(1); 33768 } 33769- 33770-_ACEOF 33771-rm -f conftest$ac_exeext 33772-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 33773- (eval $ac_link) 2>&5 33774- ac_status=$? 33775- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33776- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 33777- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 33778- (eval $ac_try) 2>&5 33779- ac_status=$? 33780- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33781- (exit $ac_status); }; }; then 33782- 33783+ 33784+EOF 33785+if { (eval echo configure:18785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 33786+then 33787+ 33788 ac_cv_what_readdir_r=POSIX 33789- 33790+ 33791 else 33792- echo "$as_me: program exited with status $ac_status" >&5 33793-echo "$as_me: failed program was:" >&5 33794-sed 's/^/| /' conftest.$ac_ext >&5 33795- 33796-( exit $ac_status ) 33797- 33798- cat >conftest.$ac_ext <<_ACEOF 33799-/* confdefs.h. */ 33800-_ACEOF 33801-cat confdefs.h >>conftest.$ac_ext 33802-cat >>conftest.$ac_ext <<_ACEOF 33803-/* end confdefs.h. */ 33804+ echo "configure: failed program was:" >&5 33805+ cat conftest.$ac_ext >&5 33806+ rm -fr conftest* 33807+ 33808+ cat > conftest.$ac_ext <<EOF 33809+#line 18796 "configure" 33810+#include "confdefs.h" 33811 33812 #define _REENTRANT 33813 #include <sys/types.h> 33814 #include <dirent.h> 33815 int readdir_r(DIR *, struct dirent *); 33816- 33817-_ACEOF 33818-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 33819- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 33820- ac_status=$? 33821- grep -v '^ *+' conftest.er1 >conftest.err 33822- rm -f conftest.er1 33823- cat conftest.err >&5 33824- echo "$as_me:$LINENO: \$? = $ac_status" >&5 33825- (exit $ac_status); } >/dev/null; then 33826- if test -s conftest.err; then 33827- ac_cpp_err=$ac_c_preproc_warn_flag 33828- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 33829- else 33830- ac_cpp_err= 33831- fi 33832-else 33833- ac_cpp_err=yes 33834-fi 33835-if test -z "$ac_cpp_err"; then 33836- 33837+ 33838+EOF 33839+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 33840+{ (eval echo configure:18806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 33841+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 33842+if test -z "$ac_err"; then 33843+ rm -rf conftest* 33844+ 33845 ac_cv_what_readdir_r=old-style 33846- 33847+ 33848 else 33849- echo "$as_me: failed program was:" >&5 33850-sed 's/^/| /' conftest.$ac_ext >&5 33851- 33852- 33853+ echo "$ac_err" >&5 33854+ echo "configure: failed program was:" >&5 33855+ cat conftest.$ac_ext >&5 33856+ rm -rf conftest* 33857+ 33858 ac_cv_what_readdir_r=none 33859- 33860+ 33861 fi 33862-rm -f conftest.err conftest.$ac_ext 33863- 33864+rm -f conftest* 33865+ 33866 fi 33867-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 33868+rm -fr conftest* 33869 fi 33870 33871+ 33872 fi 33873-echo "$as_me:$LINENO: result: $ac_cv_what_readdir_r" >&5 33874-echo "${ECHO_T}$ac_cv_what_readdir_r" >&6 33875+ 33876+echo "$ac_t""$ac_cv_what_readdir_r" 1>&6 33877 case $ac_cv_what_readdir_r in 33878 POSIX) 33879- 33880-cat >>confdefs.h <<\_ACEOF 33881+ cat >> confdefs.h <<\EOF 33882 #define HAVE_POSIX_READDIR_R 1 33883-_ACEOF 33884+EOF 33885 ;; 33886 old-style) 33887- 33888-cat >>confdefs.h <<\_ACEOF 33889+ cat >> confdefs.h <<\EOF 33890 #define HAVE_OLD_READDIR_R 1 33891-_ACEOF 33892+EOF 33893 ;; 33894 esac 33895 fi 33896 33897 33898-echo "$as_me:$LINENO: checking for in_addr_t" >&5 33899-echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6 33900-if test "${ac_cv_type_in_addr_t+set}" = set; then 33901- echo $ECHO_N "(cached) $ECHO_C" >&6 33902-else 33903- cat >conftest.$ac_ext <<_ACEOF 33904-/* confdefs.h. */ 33905-_ACEOF 33906-cat confdefs.h >>conftest.$ac_ext 33907-cat >>conftest.$ac_ext <<_ACEOF 33908-/* end confdefs.h. */ 33909+echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 33910+echo "configure:18848: checking for in_addr_t" >&5 33911+if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then 33912+ echo $ac_n "(cached) $ac_c" 1>&6 33913+else 33914+ cat > conftest.$ac_ext <<EOF 33915+#line 18853 "configure" 33916+#include "confdefs.h" 33917 #include <sys/types.h> 33918 #if STDC_HEADERS 33919 #include <stdlib.h> 33920@@ -28455,365 +18859,230 @@ 33921 #ifdef HAVE_NETINET_IN_H 33922 #include <netinet/in.h> 33923 #endif 33924-_ACEOF 33925+EOF 33926 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 33927- $EGREP "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then 33928+ egrep "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then 33929+ rm -rf conftest* 33930 ac_cv_type_in_addr_t=yes 33931 else 33932+ rm -rf conftest* 33933 ac_cv_type_in_addr_t=no 33934 fi 33935 rm -f conftest* 33936 33937 fi 33938-echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5 33939-echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6 33940+echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 33941 if test $ac_cv_type_in_addr_t = no; then 33942- 33943-cat >>confdefs.h <<\_ACEOF 33944+ cat >> confdefs.h <<\EOF 33945 #define in_addr_t u_int 33946-_ACEOF 33947+EOF 33948 33949 fi 33950 33951 33952- 33953 for ac_func in crypt_r 33954 do 33955-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 33956-echo "$as_me:$LINENO: checking for $ac_func" >&5 33957-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 33958-if eval "test \"\${$as_ac_var+set}\" = set"; then 33959- echo $ECHO_N "(cached) $ECHO_C" >&6 33960-else 33961- cat >conftest.$ac_ext <<_ACEOF 33962-/* confdefs.h. */ 33963-_ACEOF 33964-cat confdefs.h >>conftest.$ac_ext 33965-cat >>conftest.$ac_ext <<_ACEOF 33966-/* end confdefs.h. */ 33967-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 33968- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 33969-#define $ac_func innocuous_$ac_func 33970- 33971+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 33972+echo "configure:18887: checking for $ac_func" >&5 33973+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 33974+ echo $ac_n "(cached) $ac_c" 1>&6 33975+else 33976+ cat > conftest.$ac_ext <<EOF 33977+#line 18892 "configure" 33978+#include "confdefs.h" 33979 /* System header to define __stub macros and hopefully few prototypes, 33980- which can conflict with char $ac_func (); below. 33981- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 33982- <limits.h> exists even on freestanding compilers. */ 33983- 33984-#ifdef __STDC__ 33985-# include <limits.h> 33986-#else 33987-# include <assert.h> 33988-#endif 33989- 33990-#undef $ac_func 33991- 33992+ which can conflict with char $ac_func(); below. */ 33993+#include <assert.h> 33994 /* Override any gcc2 internal prototype to avoid an error. */ 33995-#ifdef __cplusplus 33996-extern "C" 33997-{ 33998-#endif 33999 /* We use char because int might match the return type of a gcc2 34000- builtin and then its argument prototype would still apply. */ 34001-char $ac_func (); 34002+ builtin and then its argument prototype would still apply. */ 34003+char $ac_func(); 34004+ 34005+int main() { 34006+ 34007 /* The GNU C library defines this for functions which it implements 34008 to always fail with ENOSYS. Some functions are actually named 34009 something starting with __ and the normal name is an alias. */ 34010 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 34011 choke me 34012 #else 34013-char (*f) () = $ac_func; 34014-#endif 34015-#ifdef __cplusplus 34016-} 34017+$ac_func(); 34018 #endif 34019 34020-int 34021-main () 34022-{ 34023-return f != $ac_func; 34024- ; 34025- return 0; 34026-} 34027-_ACEOF 34028-rm -f conftest.$ac_objext conftest$ac_exeext 34029-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 34030- (eval $ac_link) 2>conftest.er1 34031- ac_status=$? 34032- grep -v '^ *+' conftest.er1 >conftest.err 34033- rm -f conftest.er1 34034- cat conftest.err >&5 34035- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34036- (exit $ac_status); } && 34037- { ac_try='test -z "$ac_c_werror_flag" 34038- || test ! -s conftest.err' 34039- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34040- (eval $ac_try) 2>&5 34041- ac_status=$? 34042- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34043- (exit $ac_status); }; } && 34044- { ac_try='test -s conftest$ac_exeext' 34045- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34046- (eval $ac_try) 2>&5 34047- ac_status=$? 34048- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34049- (exit $ac_status); }; }; then 34050- eval "$as_ac_var=yes" 34051-else 34052- echo "$as_me: failed program was:" >&5 34053-sed 's/^/| /' conftest.$ac_ext >&5 34054- 34055-eval "$as_ac_var=no" 34056-fi 34057-rm -f conftest.err conftest.$ac_objext \ 34058- conftest$ac_exeext conftest.$ac_ext 34059-fi 34060-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 34061-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 34062-if test `eval echo '${'$as_ac_var'}'` = yes; then 34063- cat >>confdefs.h <<_ACEOF 34064-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 34065-_ACEOF 34066- php_crypt_r="1" 34067+; return 0; } 34068+EOF 34069+if { (eval echo configure:18915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 34070+ rm -rf conftest* 34071+ eval "ac_cv_func_$ac_func=yes" 34072+else 34073+ echo "configure: failed program was:" >&5 34074+ cat conftest.$ac_ext >&5 34075+ rm -rf conftest* 34076+ eval "ac_cv_func_$ac_func=no" 34077+fi 34078+rm -f conftest* 34079+fi 34080+ 34081+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 34082+ echo "$ac_t""yes" 1>&6 34083+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 34084+ cat >> confdefs.h <<EOF 34085+#define $ac_tr_func 1 34086+EOF 34087+ php_crypt_r="1" 34088 else 34089- php_crypt_r="0" 34090+ echo "$ac_t""no" 1>&6 34091+php_crypt_r="0" 34092 fi 34093 done 34094 34095 if test "x$php_crypt_r" = "x1"; then 34096- 34097- echo "$as_me:$LINENO: checking which data struct is used by crypt_r" >&5 34098-echo $ECHO_N "checking which data struct is used by crypt_r... $ECHO_C" >&6 34099-if test "${php_cv_crypt_r_style+set}" = set; then 34100- echo $ECHO_N "(cached) $ECHO_C" >&6 34101+ 34102+ echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6 34103+echo "configure:18943: checking which data struct is used by crypt_r" >&5 34104+if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then 34105+ echo $ac_n "(cached) $ac_c" 1>&6 34106 else 34107- 34108+ 34109 php_cv_crypt_r_style=none 34110- cat >conftest.$ac_ext <<_ACEOF 34111-/* confdefs.h. */ 34112-_ACEOF 34113-cat confdefs.h >>conftest.$ac_ext 34114-cat >>conftest.$ac_ext <<_ACEOF 34115-/* end confdefs.h. */ 34116+ cat > conftest.$ac_ext <<EOF 34117+#line 18950 "configure" 34118+#include "confdefs.h" 34119 34120 #define _REENTRANT 1 34121 #include <crypt.h> 34122 34123-int 34124-main () 34125-{ 34126+int main() { 34127 34128 CRYPTD buffer; 34129 crypt_r("passwd", "hash", &buffer); 34130 34131- ; 34132- return 0; 34133-} 34134-_ACEOF 34135-rm -f conftest.$ac_objext 34136-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 34137- (eval $ac_compile) 2>conftest.er1 34138- ac_status=$? 34139- grep -v '^ *+' conftest.er1 >conftest.err 34140- rm -f conftest.er1 34141- cat conftest.err >&5 34142- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34143- (exit $ac_status); } && 34144- { ac_try='test -z "$ac_c_werror_flag" 34145- || test ! -s conftest.err' 34146- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34147- (eval $ac_try) 2>&5 34148- ac_status=$? 34149- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34150- (exit $ac_status); }; } && 34151- { ac_try='test -s conftest.$ac_objext' 34152- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34153- (eval $ac_try) 2>&5 34154- ac_status=$? 34155- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34156- (exit $ac_status); }; }; then 34157+; return 0; } 34158+EOF 34159+if { (eval echo configure:18963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34160+ rm -rf conftest* 34161 php_cv_crypt_r_style=cryptd 34162 else 34163- echo "$as_me: failed program was:" >&5 34164-sed 's/^/| /' conftest.$ac_ext >&5 34165- 34166+ echo "configure: failed program was:" >&5 34167+ cat conftest.$ac_ext >&5 34168 fi 34169-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 34170+rm -f conftest* 34171 34172 if test "$php_cv_crypt_r_style" = "none"; then 34173- cat >conftest.$ac_ext <<_ACEOF 34174-/* confdefs.h. */ 34175-_ACEOF 34176-cat confdefs.h >>conftest.$ac_ext 34177-cat >>conftest.$ac_ext <<_ACEOF 34178-/* end confdefs.h. */ 34179+ cat > conftest.$ac_ext <<EOF 34180+#line 18974 "configure" 34181+#include "confdefs.h" 34182 34183 #define _REENTRANT 1 34184 #include <crypt.h> 34185 34186-int 34187-main () 34188-{ 34189+int main() { 34190 34191 struct crypt_data buffer; 34192 crypt_r("passwd", "hash", &buffer); 34193 34194- ; 34195- return 0; 34196-} 34197-_ACEOF 34198-rm -f conftest.$ac_objext 34199-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 34200- (eval $ac_compile) 2>conftest.er1 34201- ac_status=$? 34202- grep -v '^ *+' conftest.er1 >conftest.err 34203- rm -f conftest.er1 34204- cat conftest.err >&5 34205- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34206- (exit $ac_status); } && 34207- { ac_try='test -z "$ac_c_werror_flag" 34208- || test ! -s conftest.err' 34209- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34210- (eval $ac_try) 2>&5 34211- ac_status=$? 34212- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34213- (exit $ac_status); }; } && 34214- { ac_try='test -s conftest.$ac_objext' 34215- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34216- (eval $ac_try) 2>&5 34217- ac_status=$? 34218- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34219- (exit $ac_status); }; }; then 34220+; return 0; } 34221+EOF 34222+if { (eval echo configure:18987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34223+ rm -rf conftest* 34224 php_cv_crypt_r_style=struct_crypt_data 34225 else 34226- echo "$as_me: failed program was:" >&5 34227-sed 's/^/| /' conftest.$ac_ext >&5 34228- 34229+ echo "configure: failed program was:" >&5 34230+ cat conftest.$ac_ext >&5 34231 fi 34232-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 34233+rm -f conftest* 34234 fi 34235 34236 if test "$php_cv_crypt_r_style" = "none"; then 34237- cat >conftest.$ac_ext <<_ACEOF 34238-/* confdefs.h. */ 34239-_ACEOF 34240-cat confdefs.h >>conftest.$ac_ext 34241-cat >>conftest.$ac_ext <<_ACEOF 34242-/* end confdefs.h. */ 34243+ cat > conftest.$ac_ext <<EOF 34244+#line 18999 "configure" 34245+#include "confdefs.h" 34246 34247 #define _REENTRANT 1 34248 #define _GNU_SOURCE 34249 #include <crypt.h> 34250 34251-int 34252-main () 34253-{ 34254+int main() { 34255 34256 struct crypt_data buffer; 34257 crypt_r("passwd", "hash", &buffer); 34258 34259- ; 34260- return 0; 34261-} 34262-_ACEOF 34263-rm -f conftest.$ac_objext 34264-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 34265- (eval $ac_compile) 2>conftest.er1 34266- ac_status=$? 34267- grep -v '^ *+' conftest.er1 >conftest.err 34268- rm -f conftest.er1 34269- cat conftest.err >&5 34270- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34271- (exit $ac_status); } && 34272- { ac_try='test -z "$ac_c_werror_flag" 34273- || test ! -s conftest.err' 34274- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34275- (eval $ac_try) 2>&5 34276- ac_status=$? 34277- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34278- (exit $ac_status); }; } && 34279- { ac_try='test -s conftest.$ac_objext' 34280- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 34281- (eval $ac_try) 2>&5 34282- ac_status=$? 34283- echo "$as_me:$LINENO: \$? = $ac_status" >&5 34284- (exit $ac_status); }; }; then 34285+; return 0; } 34286+EOF 34287+if { (eval echo configure:19013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 34288+ rm -rf conftest* 34289 php_cv_crypt_r_style=struct_crypt_data_gnu_source 34290 else 34291- echo "$as_me: failed program was:" >&5 34292-sed 's/^/| /' conftest.$ac_ext >&5 34293- 34294+ echo "configure: failed program was:" >&5 34295+ cat conftest.$ac_ext >&5 34296 fi 34297-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 34298+rm -f conftest* 34299 fi 34300- 34301+ 34302 fi 34303-echo "$as_me:$LINENO: result: $php_cv_crypt_r_style" >&5 34304-echo "${ECHO_T}$php_cv_crypt_r_style" >&6 34305 34306- if test "$php_cv_crypt_r_style" = "cryptd"; then 34307+echo "$ac_t""$php_cv_crypt_r_style" 1>&6 34308 34309-cat >>confdefs.h <<\_ACEOF 34310+ if test "$php_cv_crypt_r_style" = "cryptd"; then 34311+ cat >> confdefs.h <<\EOF 34312 #define CRYPT_R_CRYPTD 1 34313-_ACEOF 34314+EOF 34315 34316 fi 34317 if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then 34318- 34319-cat >>confdefs.h <<\_ACEOF 34320+ cat >> confdefs.h <<\EOF 34321 #define CRYPT_R_STRUCT_CRYPT_DATA 1 34322-_ACEOF 34323+EOF 34324 34325 fi 34326 if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then 34327- 34328-cat >>confdefs.h <<\_ACEOF 34329+ cat >> confdefs.h <<\EOF 34330 #define CRYPT_R_GNU_SOURCE 1 34331-_ACEOF 34332+EOF 34333 34334 fi 34335 if test "$php_cv_crypt_r_style" = "none"; then 34336- { { echo "$as_me:$LINENO: error: Unable to detect data struct used by crypt_r" >&5 34337-echo "$as_me: error: Unable to detect data struct used by crypt_r" >&2;} 34338- { (exit 1); exit 1; }; } 34339+ { echo "configure: error: Unable to detect data struct used by crypt_r" 1>&2; exit 1; } 34340 fi 34341 34342 fi 34343 34344 34345- echo "$as_me:$LINENO: result: " >&5 34346-echo "${ECHO_T}" >&6 34347- echo "$as_me:$LINENO: result: ${T_MD}General settings${T_ME}" >&5 34348-echo "${ECHO_T}${T_MD}General settings${T_ME}" >&6 34349+ 34350+ 34351+ 34352+ echo "$ac_t""" 1>&6 34353+ echo "$ac_t""${T_MD}General settings${T_ME}" 1>&6 34354 34355 34356 34357 # Check whether --enable- or --disable- was given. 34358 if test "${enable_+set}" = set; then 34359 enableval="$enable_" 34360+ : 34361+fi 34362 34363-fi; 34364 34365 34366 34367 php_enable_gcov=no 34368 34369-echo "$as_me:$LINENO: checking whether to include gcov symbols" >&5 34370-echo $ECHO_N "checking whether to include gcov symbols... $ECHO_C" >&6 34371+echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 34372+echo "configure:19072: checking whether to include gcov symbols" >&5 34373 # Check whether --enable-gcov or --disable-gcov was given. 34374 if test "${enable_gcov+set}" = set; then 34375 enableval="$enable_gcov" 34376 PHP_GCOV=$enableval 34377 else 34378- 34379+ 34380 PHP_GCOV=no 34381+ 34382 34383+fi 34384 34385-fi; 34386 34387 ext_output=$PHP_GCOV 34388-echo "$as_me:$LINENO: result: $ext_output" >&5 34389-echo "${ECHO_T}$ext_output" >&6 34390+echo "$ac_t""$ext_output" 1>&6 34391 34392 34393 34394@@ -28821,108 +19090,92 @@ 34395 if test "$PHP_GCOV" = "yes"; then 34396 34397 if test "$GCC" != "yes"; then 34398- { { echo "$as_me:$LINENO: error: GCC is required for --enable-gcov" >&5 34399-echo "$as_me: error: GCC is required for --enable-gcov" >&2;} 34400- { (exit 1); exit 1; }; } 34401+ { echo "configure: error: GCC is required for --enable-gcov" 1>&2; exit 1; } 34402 fi 34403- 34404+ 34405 case `$php_shtool path $CC` in 34406 *ccache*) gcc_ccache=yes;; 34407 *) gcc_ccache=no;; 34408 esac 34409 34410 if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then 34411- { { echo "$as_me:$LINENO: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&5 34412-echo "$as_me: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&2;} 34413- { (exit 1); exit 1; }; } 34414+ { echo "configure: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." 1>&2; exit 1; } 34415 fi 34416- 34417+ 34418 ltp_version_list="1.5 1.6 1.7" 34419 34420 # Extract the first word of "lcov", so it can be a program name with args. 34421-set dummy lcov; ac_word=$2 34422-echo "$as_me:$LINENO: checking for $ac_word" >&5 34423-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 34424-if test "${ac_cv_prog_LTP+set}" = set; then 34425- echo $ECHO_N "(cached) $ECHO_C" >&6 34426-else 34427- if test -n "$LTP"; then 34428- ac_cv_prog_LTP="$LTP" # Let the user override the test. 34429-else 34430-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34431-for as_dir in $PATH 34432-do 34433- IFS=$as_save_IFS 34434- test -z "$as_dir" && as_dir=. 34435- for ac_exec_ext in '' $ac_executable_extensions; do 34436- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34437- ac_cv_prog_LTP="lcov" 34438- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 34439- break 2 34440- fi 34441-done 34442-done 34443- 34444+set dummy lcov; ac_word=$2 34445+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 34446+echo "configure:19111: checking for $ac_word" >&5 34447+if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then 34448+ echo $ac_n "(cached) $ac_c" 1>&6 34449+else 34450+ if test -n "$LTP"; then 34451+ ac_cv_prog_LTP="$LTP" # Let the user override the test. 34452+else 34453+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 34454+ ac_dummy="$PATH" 34455+ for ac_dir in $ac_dummy; do 34456+ test -z "$ac_dir" && ac_dir=. 34457+ if test -f $ac_dir/$ac_word; then 34458+ ac_cv_prog_LTP="lcov" 34459+ break 34460+ fi 34461+ done 34462+ IFS="$ac_save_ifs" 34463 fi 34464 fi 34465-LTP=$ac_cv_prog_LTP 34466+LTP="$ac_cv_prog_LTP" 34467 if test -n "$LTP"; then 34468- echo "$as_me:$LINENO: result: $LTP" >&5 34469-echo "${ECHO_T}$LTP" >&6 34470+ echo "$ac_t""$LTP" 1>&6 34471 else 34472- echo "$as_me:$LINENO: result: no" >&5 34473-echo "${ECHO_T}no" >&6 34474+ echo "$ac_t""no" 1>&6 34475 fi 34476 34477 # Extract the first word of "genhtml", so it can be a program name with args. 34478 set dummy genhtml; ac_word=$2 34479-echo "$as_me:$LINENO: checking for $ac_word" >&5 34480-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 34481-if test "${ac_cv_prog_LTP_GENHTML+set}" = set; then 34482- echo $ECHO_N "(cached) $ECHO_C" >&6 34483+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 34484+echo "configure:19140: checking for $ac_word" >&5 34485+if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then 34486+ echo $ac_n "(cached) $ac_c" 1>&6 34487 else 34488 if test -n "$LTP_GENHTML"; then 34489 ac_cv_prog_LTP_GENHTML="$LTP_GENHTML" # Let the user override the test. 34490 else 34491-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 34492-for as_dir in $PATH 34493-do 34494- IFS=$as_save_IFS 34495- test -z "$as_dir" && as_dir=. 34496- for ac_exec_ext in '' $ac_executable_extensions; do 34497- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 34498- ac_cv_prog_LTP_GENHTML="genhtml" 34499- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 34500- break 2 34501- fi 34502-done 34503-done 34504- 34505+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 34506+ ac_dummy="$PATH" 34507+ for ac_dir in $ac_dummy; do 34508+ test -z "$ac_dir" && ac_dir=. 34509+ if test -f $ac_dir/$ac_word; then 34510+ ac_cv_prog_LTP_GENHTML="genhtml" 34511+ break 34512+ fi 34513+ done 34514+ IFS="$ac_save_ifs" 34515 fi 34516 fi 34517-LTP_GENHTML=$ac_cv_prog_LTP_GENHTML 34518+LTP_GENHTML="$ac_cv_prog_LTP_GENHTML" 34519 if test -n "$LTP_GENHTML"; then 34520- echo "$as_me:$LINENO: result: $LTP_GENHTML" >&5 34521-echo "${ECHO_T}$LTP_GENHTML" >&6 34522+ echo "$ac_t""$LTP_GENHTML" 1>&6 34523 else 34524- echo "$as_me:$LINENO: result: no" >&5 34525-echo "${ECHO_T}no" >&6 34526+ echo "$ac_t""no" 1>&6 34527 fi 34528 34529- 34530+ 34531 PHP_VAR_SUBST="$PHP_VAR_SUBST LTP" 34532 34533- 34534+ 34535 PHP_VAR_SUBST="$PHP_VAR_SUBST LTP_GENHTML" 34536 34537 34538 if test "$LTP"; then 34539- echo "$as_me:$LINENO: checking for ltp version" >&5 34540-echo $ECHO_N "checking for ltp version... $ECHO_C" >&6 34541-if test "${php_cv_ltp_version+set}" = set; then 34542- echo $ECHO_N "(cached) $ECHO_C" >&6 34543+ echo $ac_n "checking for ltp version""... $ac_c" 1>&6 34544+echo "configure:19175: checking for ltp version" >&5 34545+if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then 34546+ echo $ac_n "(cached) $ac_c" 1>&6 34547 else 34548- 34549+ 34550 php_cv_ltp_version=invalid 34551 ltp_version=`$LTP -v 2>/dev/null | $SED -e 's/^.* //'` 34552 for ltp_check_version in $ltp_version_list; do 34553@@ -28930,49 +19183,42 @@ 34554 php_cv_ltp_version="$ltp_check_version (ok)" 34555 fi 34556 done 34557- 34558+ 34559 fi 34560-echo "$as_me:$LINENO: result: $php_cv_ltp_version" >&5 34561-echo "${ECHO_T}$php_cv_ltp_version" >&6 34562+ 34563+echo "$ac_t""$php_cv_ltp_version" 1>&6 34564 else 34565- ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list" 34566- { { echo "$as_me:$LINENO: error: $ltp_msg" >&5 34567-echo "$as_me: error: $ltp_msg" >&2;} 34568- { (exit 1); exit 1; }; } 34569+ ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list" 34570+ { echo "configure: error: $ltp_msg" 1>&2; exit 1; } 34571 fi 34572 34573 case $php_cv_ltp_version in 34574 ""|invalid) 34575 ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)." 34576- { { echo "$as_me:$LINENO: error: $ltp_msg" >&5 34577-echo "$as_me: error: $ltp_msg" >&2;} 34578- { (exit 1); exit 1; }; } 34579+ { echo "configure: error: $ltp_msg" 1>&2; exit 1; } 34580 LTP="exit 0;" 34581 ;; 34582 esac 34583 34584 if test -z "$LTP_GENHTML"; then 34585- { { echo "$as_me:$LINENO: error: Could not find genhtml from the LTP package" >&5 34586-echo "$as_me: error: Could not find genhtml from the LTP package" >&2;} 34587- { (exit 1); exit 1; }; } 34588+ { echo "configure: error: Could not find genhtml from the LTP package" 1>&2; exit 1; } 34589 fi 34590 34591- 34592-cat >>confdefs.h <<\_ACEOF 34593+ cat >> confdefs.h <<\EOF 34594 #define HAVE_GCOV 1 34595-_ACEOF 34596- 34597+EOF 34598 34599+ 34600 src=$abs_srcdir/Makefile.gcov 34601 ac_srcdir=$abs_srcdir 34602 ac_builddir=$ext_builddir 34603 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 34604 34605 34606- 34607+ 34608 CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` 34609 CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` 34610- 34611+ 34612 34613 CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage" 34614 CXXFLAGS="$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage" 34615@@ -28981,22 +19227,22 @@ 34616 34617 php_enable_debug=no 34618 34619-echo "$as_me:$LINENO: checking whether to include debugging symbols" >&5 34620-echo $ECHO_N "checking whether to include debugging symbols... $ECHO_C" >&6 34621+echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 34622+echo "configure:19232: checking whether to include debugging symbols" >&5 34623 # Check whether --enable-debug or --disable-debug was given. 34624 if test "${enable_debug+set}" = set; then 34625 enableval="$enable_debug" 34626 PHP_DEBUG=$enableval 34627 else 34628- 34629+ 34630 PHP_DEBUG=no 34631+ 34632 34633+fi 34634 34635-fi; 34636 34637 ext_output=$PHP_DEBUG 34638-echo "$as_me:$LINENO: result: $ext_output" >&5 34639-echo "${ECHO_T}$ext_output" >&6 34640+echo "$ac_t""$ext_output" 1>&6 34641 34642 34643 34644@@ -29004,10 +19250,10 @@ 34645 if test "$PHP_DEBUG" = "yes"; then 34646 PHP_DEBUG=1 34647 ZEND_DEBUG=yes 34648- 34649+ 34650 CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9s]*//g'` 34651 CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9s]*//g'` 34652- 34653+ 34654 if test "$GCC" = "yes" || test "$ICC" = "yes"; then 34655 CFLAGS="$CFLAGS -O0" 34656 CXXFLAGS="$CXXFLAGS -g -O0" 34657@@ -29029,23 +19275,22 @@ 34658 34659 php_with_layout=PHP 34660 34661-echo "$as_me:$LINENO: checking layout of installed files" >&5 34662-echo $ECHO_N "checking layout of installed files... $ECHO_C" >&6 34663- 34664+echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 34665+echo "configure:19280: checking layout of installed files" >&5 34666 # Check whether --with-layout or --without-layout was given. 34667 if test "${with_layout+set}" = set; then 34668 withval="$with_layout" 34669 PHP_LAYOUT=$withval 34670 else 34671- 34672+ 34673 PHP_LAYOUT=PHP 34674+ 34675 34676+fi 34677 34678-fi; 34679 34680 ext_output=$PHP_LAYOUT 34681-echo "$as_me:$LINENO: result: $ext_output" >&5 34682-echo "${ECHO_T}$ext_output" >&6 34683+echo "$ac_t""$ext_output" 1>&6 34684 34685 34686 34687@@ -29062,23 +19307,22 @@ 34688 34689 php_with_config_file_path=DEFAULT 34690 34691-echo "$as_me:$LINENO: checking path to configuration file" >&5 34692-echo $ECHO_N "checking path to configuration file... $ECHO_C" >&6 34693- 34694+echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 34695+echo "configure:19312: checking path to configuration file" >&5 34696 # Check whether --with-config-file-path or --without-config-file-path was given. 34697 if test "${with_config_file_path+set}" = set; then 34698 withval="$with_config_file_path" 34699 PHP_CONFIG_FILE_PATH=$withval 34700 else 34701- 34702+ 34703 PHP_CONFIG_FILE_PATH=DEFAULT 34704+ 34705 34706+fi 34707 34708-fi; 34709 34710 ext_output=$PHP_CONFIG_FILE_PATH 34711-echo "$as_me:$LINENO: result: $ext_output" >&5 34712-echo "${ECHO_T}$ext_output" >&6 34713+echo "$ac_t""$ext_output" 1>&6 34714 34715 34716 34717@@ -29094,91 +19338,88 @@ 34718 esac 34719 fi 34720 34721-echo "$as_me:$LINENO: checking where to scan for configuration files" >&5 34722-echo $ECHO_N "checking where to scan for configuration files... $ECHO_C" >&6 34723+echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 34724+echo "configure:19343: checking where to scan for configuration files" >&5 34725 34726 php_with_config_file_scan_dir=DEFAULT 34727 34728 34729- 34730 # Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given. 34731 if test "${with_config_file_scan_dir+set}" = set; then 34732 withval="$with_config_file_scan_dir" 34733 PHP_CONFIG_FILE_SCAN_DIR=$withval 34734 else 34735- 34736+ 34737 PHP_CONFIG_FILE_SCAN_DIR=DEFAULT 34738+ 34739 34740+fi 34741 34742-fi; 34743 34744 ext_output=$PHP_CONFIG_FILE_SCAN_DIR 34745 34746 34747 34748- 34749+ 34750 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then 34751 PHP_CONFIG_FILE_SCAN_DIR= 34752 fi 34753-echo "$as_me:$LINENO: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5 34754-echo "${ECHO_T}$PHP_CONFIG_FILE_SCAN_DIR" >&6 34755+echo "$ac_t""$PHP_CONFIG_FILE_SCAN_DIR" 1>&6 34756 34757 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" 34758 34759 34760 php_enable_safe_mode=no 34761 34762-echo "$as_me:$LINENO: checking whether to enable safe mode by default" >&5 34763-echo $ECHO_N "checking whether to enable safe mode by default... $ECHO_C" >&6 34764+echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 34765+echo "configure:19376: checking whether to enable safe mode by default" >&5 34766 # Check whether --enable-safe-mode or --disable-safe-mode was given. 34767 if test "${enable_safe_mode+set}" = set; then 34768 enableval="$enable_safe_mode" 34769 PHP_SAFE_MODE=$enableval 34770 else 34771- 34772+ 34773 PHP_SAFE_MODE=no 34774+ 34775 34776+fi 34777 34778-fi; 34779 34780 ext_output=$PHP_SAFE_MODE 34781-echo "$as_me:$LINENO: result: $ext_output" >&5 34782-echo "${ECHO_T}$ext_output" >&6 34783+echo "$ac_t""$ext_output" 1>&6 34784 34785 34786 34787 34788 if test "$PHP_SAFE_MODE" = "yes"; then 34789- 34790-cat >>confdefs.h <<\_ACEOF 34791+ cat >> confdefs.h <<\EOF 34792 #define PHP_SAFE_MODE 1 34793-_ACEOF 34794+EOF 34795 34796 else 34797- 34798-cat >>confdefs.h <<\_ACEOF 34799+ cat >> confdefs.h <<\EOF 34800 #define PHP_SAFE_MODE 0 34801-_ACEOF 34802+EOF 34803 34804 fi 34805 34806-echo "$as_me:$LINENO: checking for safe mode exec dir" >&5 34807-echo $ECHO_N "checking for safe mode exec dir... $ECHO_C" >&6 34808+echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 34809+echo "configure:19408: checking for safe mode exec dir" >&5 34810 34811 php_with_exec_dir=no 34812 34813 34814- 34815 # Check whether --with-exec-dir or --without-exec-dir was given. 34816 if test "${with_exec_dir+set}" = set; then 34817 withval="$with_exec_dir" 34818 PHP_EXEC_DIR=$withval 34819 else 34820- 34821+ 34822 PHP_EXEC_DIR=no 34823+ 34824 34825+fi 34826 34827-fi; 34828 34829 ext_output=$PHP_EXEC_DIR 34830 34831@@ -29187,170 +19428,160 @@ 34832 34833 34834 if test "$PHP_EXEC_DIR" != "no" && test "$PHP_EXEC_DIR" != "yes" ; then 34835- 34836-cat >>confdefs.h <<_ACEOF 34837+ cat >> confdefs.h <<EOF 34838 #define PHP_SAFE_MODE_EXEC_DIR "$PHP_EXEC_DIR" 34839-_ACEOF 34840+EOF 34841 34842- echo "$as_me:$LINENO: result: $PHP_EXEC_DIR" >&5 34843-echo "${ECHO_T}$PHP_EXEC_DIR" >&6 34844+ echo "$ac_t""$PHP_EXEC_DIR" 1>&6 34845 else 34846- 34847-cat >>confdefs.h <<\_ACEOF 34848+ cat >> confdefs.h <<\EOF 34849 #define PHP_SAFE_MODE_EXEC_DIR "/usr/local/php/bin" 34850-_ACEOF 34851+EOF 34852 34853- echo "$as_me:$LINENO: result: /usr/local/php/bin" >&5 34854-echo "${ECHO_T}/usr/local/php/bin" >&6 34855+ echo "$ac_t""/usr/local/php/bin" 1>&6 34856 fi 34857 34858 34859 php_enable_sigchild=no 34860 34861-echo "$as_me:$LINENO: checking whether to enable PHP's own SIGCHLD handler" >&5 34862-echo $ECHO_N "checking whether to enable PHP's own SIGCHLD handler... $ECHO_C" >&6 34863+echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 34864+echo "configure:19449: checking whether to enable PHP's own SIGCHLD handler" >&5 34865 # Check whether --enable-sigchild or --disable-sigchild was given. 34866 if test "${enable_sigchild+set}" = set; then 34867 enableval="$enable_sigchild" 34868 PHP_SIGCHILD=$enableval 34869 else 34870- 34871+ 34872 PHP_SIGCHILD=no 34873+ 34874 34875+fi 34876 34877-fi; 34878 34879 ext_output=$PHP_SIGCHILD 34880-echo "$as_me:$LINENO: result: $ext_output" >&5 34881-echo "${ECHO_T}$ext_output" >&6 34882+echo "$ac_t""$ext_output" 1>&6 34883 34884 34885 34886 34887 if test "$PHP_SIGCHILD" = "yes"; then 34888- 34889-cat >>confdefs.h <<\_ACEOF 34890+ cat >> confdefs.h <<\EOF 34891 #define PHP_SIGCHILD 1 34892-_ACEOF 34893+EOF 34894 34895 else 34896- 34897-cat >>confdefs.h <<\_ACEOF 34898+ cat >> confdefs.h <<\EOF 34899 #define PHP_SIGCHILD 0 34900-_ACEOF 34901+EOF 34902 34903 fi 34904 34905 34906 php_enable_magic_quotes=no 34907 34908-echo "$as_me:$LINENO: checking whether to enable magic quotes by default" >&5 34909-echo $ECHO_N "checking whether to enable magic quotes by default... $ECHO_C" >&6 34910+echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 34911+echo "configure:19484: checking whether to enable magic quotes by default" >&5 34912 # Check whether --enable-magic-quotes or --disable-magic-quotes was given. 34913 if test "${enable_magic_quotes+set}" = set; then 34914 enableval="$enable_magic_quotes" 34915 PHP_MAGIC_QUOTES=$enableval 34916 else 34917- 34918+ 34919 PHP_MAGIC_QUOTES=no 34920+ 34921 34922+fi 34923 34924-fi; 34925 34926 ext_output=$PHP_MAGIC_QUOTES 34927-echo "$as_me:$LINENO: result: $ext_output" >&5 34928-echo "${ECHO_T}$ext_output" >&6 34929+echo "$ac_t""$ext_output" 1>&6 34930 34931 34932 34933 34934 if test "$PHP_MAGIC_QUOTES" = "yes"; then 34935- 34936-cat >>confdefs.h <<\_ACEOF 34937+ cat >> confdefs.h <<\EOF 34938 #define MAGIC_QUOTES 1 34939-_ACEOF 34940+EOF 34941 34942 else 34943- 34944-cat >>confdefs.h <<\_ACEOF 34945+ cat >> confdefs.h <<\EOF 34946 #define MAGIC_QUOTES 0 34947-_ACEOF 34948+EOF 34949 34950 fi 34951 34952 34953 php_enable_libgcc=no 34954 34955-echo "$as_me:$LINENO: checking whether to explicitly link against libgcc" >&5 34956-echo $ECHO_N "checking whether to explicitly link against libgcc... $ECHO_C" >&6 34957+echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 34958+echo "configure:19519: checking whether to explicitly link against libgcc" >&5 34959 # Check whether --enable-libgcc or --disable-libgcc was given. 34960 if test "${enable_libgcc+set}" = set; then 34961 enableval="$enable_libgcc" 34962 PHP_LIBGCC=$enableval 34963 else 34964- 34965+ 34966 PHP_LIBGCC=no 34967+ 34968 34969+fi 34970 34971-fi; 34972 34973 ext_output=$PHP_LIBGCC 34974-echo "$as_me:$LINENO: result: $ext_output" >&5 34975-echo "${ECHO_T}$ext_output" >&6 34976+echo "$ac_t""$ext_output" 1>&6 34977 34978 34979 34980 34981 if test "$PHP_LIBGCC" = "yes"; then 34982- 34983- 34984+ 34985+ 34986 libgcc_libpath=`gcc --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'` 34987- 34988+ 34989 34990 if test -z "$libgcc_libpath"; then 34991- { { echo "$as_me:$LINENO: error: Cannot locate libgcc. Make sure that gcc is in your path" >&5 34992-echo "$as_me: error: Cannot locate libgcc. Make sure that gcc is in your path" >&2;} 34993- { (exit 1); exit 1; }; } 34994+ { echo "configure: error: Cannot locate libgcc. Make sure that gcc is in your path" 1>&2; exit 1; } 34995 fi 34996- 34997+ 34998 if test "$libgcc_libpath" != "/usr/$PHP_LIBDIR" && test "$libgcc_libpath" != "/usr/lib"; then 34999- 35000+ 35001 if test -z "$libgcc_libpath" || echo "$libgcc_libpath" | grep '^/' >/dev/null ; then 35002 ai_p=$libgcc_libpath 35003 else 35004- 35005+ 35006 ep_dir="`echo $libgcc_libpath|$SED 's%/*[^/][^/]*/*$%%'`" 35007- 35008+ 35009 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 35010 ai_p="$ep_realdir/`basename \"$libgcc_libpath\"`" 35011 fi 35012 35013- 35014- 35015- 35016- 35017+ 35018+ 35019+ 35020+ 35021 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 35022- 35023+ 35024 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 35025 if test -n "$unique" && test "`eval $cmd`" = "" ; then 35026 eval "LIBPATH$unique=set" 35027- 35028+ 35029 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 35030 LDFLAGS="$LDFLAGS -L$ai_p" 35031 PHP_RPATHS="$PHP_RPATHS $ai_p" 35032- 35033+ 35034 fi 35035 35036 35037- 35038+ 35039 fi 35040 35041- 35042- 35043+ 35044+ 35045 case gcc in 35046 c|c_r|pthread*) ;; 35047- *) 35048- LIBS="$LIBS -lgcc" 35049+ *) 35050+ LIBS="$LIBS -lgcc" 35051 ;; 35052 esac 35053 35054@@ -29360,153 +19591,119 @@ 35055 35056 php_enable_short_tags=yes 35057 35058-echo "$as_me:$LINENO: checking whether to enable short tags by default" >&5 35059-echo $ECHO_N "checking whether to enable short tags by default... $ECHO_C" >&6 35060+echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 35061+echo "configure:19596: checking whether to enable short tags by default" >&5 35062 # Check whether --enable-short-tags or --disable-short-tags was given. 35063 if test "${enable_short_tags+set}" = set; then 35064 enableval="$enable_short_tags" 35065 PHP_SHORT_TAGS=$enableval 35066 else 35067- 35068+ 35069 PHP_SHORT_TAGS=yes 35070+ 35071 35072+fi 35073 35074-fi; 35075 35076 ext_output=$PHP_SHORT_TAGS 35077-echo "$as_me:$LINENO: result: $ext_output" >&5 35078-echo "${ECHO_T}$ext_output" >&6 35079+echo "$ac_t""$ext_output" 1>&6 35080 35081 35082 35083 35084 if test "$PHP_SHORT_TAGS" = "yes"; then 35085- 35086-cat >>confdefs.h <<\_ACEOF 35087+ cat >> confdefs.h <<\EOF 35088 #define DEFAULT_SHORT_OPEN_TAG "1" 35089-_ACEOF 35090+EOF 35091 35092 else 35093- 35094-cat >>confdefs.h <<\_ACEOF 35095+ cat >> confdefs.h <<\EOF 35096 #define DEFAULT_SHORT_OPEN_TAG "0" 35097-_ACEOF 35098+EOF 35099 35100 fi 35101 35102 35103 php_enable_dmalloc=no 35104 35105-echo "$as_me:$LINENO: checking whether to enable dmalloc" >&5 35106-echo $ECHO_N "checking whether to enable dmalloc... $ECHO_C" >&6 35107+echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 35108+echo "configure:19631: checking whether to enable dmalloc" >&5 35109 # Check whether --enable-dmalloc or --disable-dmalloc was given. 35110 if test "${enable_dmalloc+set}" = set; then 35111 enableval="$enable_dmalloc" 35112 PHP_DMALLOC=$enableval 35113 else 35114- 35115+ 35116 PHP_DMALLOC=no 35117+ 35118 35119+fi 35120 35121-fi; 35122 35123 ext_output=$PHP_DMALLOC 35124-echo "$as_me:$LINENO: result: $ext_output" >&5 35125-echo "${ECHO_T}$ext_output" >&6 35126+echo "$ac_t""$ext_output" 1>&6 35127 35128 35129 35130 35131 if test "$PHP_DMALLOC" = "yes"; then 35132- echo "$as_me:$LINENO: checking for dmalloc_error in -ldmalloc" >&5 35133-echo $ECHO_N "checking for dmalloc_error in -ldmalloc... $ECHO_C" >&6 35134-if test "${ac_cv_lib_dmalloc_dmalloc_error+set}" = set; then 35135- echo $ECHO_N "(cached) $ECHO_C" >&6 35136+ echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6 35137+echo "configure:19652: checking for dmalloc_error in -ldmalloc" >&5 35138+ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'` 35139+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 35140+ echo $ac_n "(cached) $ac_c" 1>&6 35141 else 35142- ac_check_lib_save_LIBS=$LIBS 35143+ ac_save_LIBS="$LIBS" 35144 LIBS="-ldmalloc $LIBS" 35145-cat >conftest.$ac_ext <<_ACEOF 35146-/* confdefs.h. */ 35147-_ACEOF 35148-cat confdefs.h >>conftest.$ac_ext 35149-cat >>conftest.$ac_ext <<_ACEOF 35150-/* end confdefs.h. */ 35151- 35152+cat > conftest.$ac_ext <<EOF 35153+#line 19660 "configure" 35154+#include "confdefs.h" 35155 /* Override any gcc2 internal prototype to avoid an error. */ 35156-#ifdef __cplusplus 35157-extern "C" 35158-#endif 35159 /* We use char because int might match the return type of a gcc2 35160- builtin and then its argument prototype would still apply. */ 35161-char dmalloc_error (); 35162-int 35163-main () 35164-{ 35165-dmalloc_error (); 35166- ; 35167- return 0; 35168-} 35169-_ACEOF 35170-rm -f conftest.$ac_objext conftest$ac_exeext 35171-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 35172- (eval $ac_link) 2>conftest.er1 35173- ac_status=$? 35174- grep -v '^ *+' conftest.er1 >conftest.err 35175- rm -f conftest.er1 35176- cat conftest.err >&5 35177- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35178- (exit $ac_status); } && 35179- { ac_try='test -z "$ac_c_werror_flag" 35180- || test ! -s conftest.err' 35181- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35182- (eval $ac_try) 2>&5 35183- ac_status=$? 35184- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35185- (exit $ac_status); }; } && 35186- { ac_try='test -s conftest$ac_exeext' 35187- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35188- (eval $ac_try) 2>&5 35189- ac_status=$? 35190- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35191- (exit $ac_status); }; }; then 35192- ac_cv_lib_dmalloc_dmalloc_error=yes 35193-else 35194- echo "$as_me: failed program was:" >&5 35195-sed 's/^/| /' conftest.$ac_ext >&5 35196- 35197-ac_cv_lib_dmalloc_dmalloc_error=no 35198-fi 35199-rm -f conftest.err conftest.$ac_objext \ 35200- conftest$ac_exeext conftest.$ac_ext 35201-LIBS=$ac_check_lib_save_LIBS 35202-fi 35203-echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5 35204-echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_error" >&6 35205-if test $ac_cv_lib_dmalloc_dmalloc_error = yes; then 35206- 35207+ builtin and then its argument prototype would still apply. */ 35208+char dmalloc_error(); 35209 35210+int main() { 35211+dmalloc_error() 35212+; return 0; } 35213+EOF 35214+if { (eval echo configure:19671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 35215+ rm -rf conftest* 35216+ eval "ac_cv_lib_$ac_lib_var=yes" 35217+else 35218+ echo "configure: failed program was:" >&5 35219+ cat conftest.$ac_ext >&5 35220+ rm -rf conftest* 35221+ eval "ac_cv_lib_$ac_lib_var=no" 35222+fi 35223+rm -f conftest* 35224+LIBS="$ac_save_LIBS" 35225 35226+fi 35227+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 35228+ echo "$ac_t""yes" 1>&6 35229+ 35230+ 35231+ 35232 case dmalloc in 35233 c|c_r|pthread*) ;; 35234- *) 35235- LIBS="-ldmalloc $LIBS" 35236+ *) 35237+ LIBS="-ldmalloc $LIBS" 35238 ;; 35239 esac 35240 35241 35242- 35243-cat >>confdefs.h <<\_ACEOF 35244+ cat >> confdefs.h <<\EOF 35245 #define HAVE_DMALLOC 1 35246-_ACEOF 35247+EOF 35248 35249 CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK" 35250- 35251+ 35252 else 35253+ echo "$ac_t""no" 1>&6 35254 35255- { { echo "$as_me:$LINENO: error: Problem with enabling dmalloc. Please check config.log for details." >&5 35256-echo "$as_me: error: Problem with enabling dmalloc. Please check config.log for details." >&2;} 35257- { (exit 1); exit 1; }; } 35258- 35259+ { echo "configure: error: Problem with enabling dmalloc. Please check config.log for details." 1>&2; exit 1; } 35260+ 35261 fi 35262 35263 fi 35264@@ -29514,36 +19711,35 @@ 35265 35266 php_enable_ipv6=yes 35267 35268-echo "$as_me:$LINENO: checking whether to enable IPv6 support" >&5 35269-echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6 35270+echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 35271+echo "configure:19716: checking whether to enable IPv6 support" >&5 35272 # Check whether --enable-ipv6 or --disable-ipv6 was given. 35273 if test "${enable_ipv6+set}" = set; then 35274 enableval="$enable_ipv6" 35275 PHP_IPV6=$enableval 35276 else 35277- 35278+ 35279 PHP_IPV6=yes 35280+ 35281 35282+fi 35283 35284-fi; 35285 35286 ext_output=$PHP_IPV6 35287-echo "$as_me:$LINENO: result: $ext_output" >&5 35288-echo "${ECHO_T}$ext_output" >&6 35289+echo "$ac_t""$ext_output" 1>&6 35290 35291 35292 35293 35294 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then 35295- 35296-cat >>confdefs.h <<\_ACEOF 35297+ cat >> confdefs.h <<\EOF 35298 #define HAVE_IPV6 1 35299-_ACEOF 35300+EOF 35301 35302 fi 35303 35304-echo "$as_me:$LINENO: checking how big to make fd sets" >&5 35305-echo $ECHO_N "checking how big to make fd sets... $ECHO_C" >&6 35306+echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 35307+echo "configure:19743: checking how big to make fd sets" >&5 35308 35309 php_enable_fd_setsize=no 35310 35311@@ -29553,11 +19749,12 @@ 35312 enableval="$enable_fd_setsize" 35313 PHP_FD_SETSIZE=$enableval 35314 else 35315- 35316+ 35317 PHP_FD_SETSIZE=no 35318+ 35319 35320+fi 35321 35322-fi; 35323 35324 ext_output=$PHP_FD_SETSIZE 35325 35326@@ -29568,1034 +19765,223 @@ 35327 if test "$PHP_FD_SETSIZE" != "no"; then 35328 if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then 35329 CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE" 35330- echo "$as_me:$LINENO: result: using $PHP_FD_SETSIZE" >&5 35331-echo "${ECHO_T}using $PHP_FD_SETSIZE" >&6 35332+ echo "$ac_t""using $PHP_FD_SETSIZE" 1>&6 35333 else 35334- { { echo "$as_me:$LINENO: error: Invalid value passed to --enable-fd-setsize!" >&5 35335-echo "$as_me: error: Invalid value passed to --enable-fd-setsize!" >&2;} 35336- { (exit 1); exit 1; }; } 35337+ { echo "configure: error: Invalid value passed to --enable-fd-setsize!" 1>&2; exit 1; } 35338 fi 35339 else 35340- echo "$as_me:$LINENO: result: using system default" >&5 35341-echo "${ECHO_T}using system default" >&6 35342+ echo "$ac_t""using system default" 1>&6 35343 fi 35344 35345 35346+ 35347+ 35348+ 35349+ 35350 # Check whether --enable- or --disable- was given. 35351 if test "${enable_+set}" = set; then 35352 enableval="$enable_" 35353+ : 35354+fi 35355 35356-fi; 35357 35358 35359 35360- echo "$as_me:$LINENO: result: " >&5 35361-echo "${ECHO_T}" >&6 35362- echo "$as_me:$LINENO: result: ${T_MD}Configuring extensions${T_ME}" >&5 35363-echo "${ECHO_T}${T_MD}Configuring extensions${T_ME}" >&6 35364+ echo "$ac_t""" 1>&6 35365+ echo "$ac_t""${T_MD}Configuring extensions${T_ME}" 1>&6 35366 35367 35368 35369 # Check whether --enable-all or --disable-all was given. 35370 if test "${enable_all+set}" = set; then 35371 enableval="$enable_all" 35372- 35373+ 35374 PHP_ENABLE_ALL=$enableval 35375 35376-fi; 35377- 35378-# reading config stubs 35379- 35380- 35381- 35382- 35383-echo "$as_me:$LINENO: checking for long" >&5 35384-echo $ECHO_N "checking for long... $ECHO_C" >&6 35385-if test "${ac_cv_type_long+set}" = set; then 35386- echo $ECHO_N "(cached) $ECHO_C" >&6 35387-else 35388- cat >conftest.$ac_ext <<_ACEOF 35389-/* confdefs.h. */ 35390-_ACEOF 35391-cat confdefs.h >>conftest.$ac_ext 35392-cat >>conftest.$ac_ext <<_ACEOF 35393-/* end confdefs.h. */ 35394-$ac_includes_default 35395-int 35396-main () 35397-{ 35398-if ((long *) 0) 35399- return 0; 35400-if (sizeof (long)) 35401- return 0; 35402- ; 35403- return 0; 35404-} 35405-_ACEOF 35406-rm -f conftest.$ac_objext 35407-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35408- (eval $ac_compile) 2>conftest.er1 35409- ac_status=$? 35410- grep -v '^ *+' conftest.er1 >conftest.err 35411- rm -f conftest.er1 35412- cat conftest.err >&5 35413- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35414- (exit $ac_status); } && 35415- { ac_try='test -z "$ac_c_werror_flag" 35416- || test ! -s conftest.err' 35417- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35418- (eval $ac_try) 2>&5 35419- ac_status=$? 35420- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35421- (exit $ac_status); }; } && 35422- { ac_try='test -s conftest.$ac_objext' 35423- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35424- (eval $ac_try) 2>&5 35425- ac_status=$? 35426- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35427- (exit $ac_status); }; }; then 35428- ac_cv_type_long=yes 35429-else 35430- echo "$as_me: failed program was:" >&5 35431-sed 's/^/| /' conftest.$ac_ext >&5 35432- 35433-ac_cv_type_long=no 35434-fi 35435-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35436-fi 35437-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 35438-echo "${ECHO_T}$ac_cv_type_long" >&6 35439- 35440-echo "$as_me:$LINENO: checking size of long" >&5 35441-echo $ECHO_N "checking size of long... $ECHO_C" >&6 35442-if test "${ac_cv_sizeof_long+set}" = set; then 35443- echo $ECHO_N "(cached) $ECHO_C" >&6 35444-else 35445- if test "$ac_cv_type_long" = yes; then 35446- # The cast to unsigned long works around a bug in the HP C Compiler 35447- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 35448- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 35449- # This bug is HP SR number 8606223364. 35450- if test "$cross_compiling" = yes; then 35451- # Depending upon the size, compute the lo and hi bounds. 35452-cat >conftest.$ac_ext <<_ACEOF 35453-/* confdefs.h. */ 35454-_ACEOF 35455-cat confdefs.h >>conftest.$ac_ext 35456-cat >>conftest.$ac_ext <<_ACEOF 35457-/* end confdefs.h. */ 35458-$ac_includes_default 35459-int 35460-main () 35461-{ 35462-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; 35463-test_array [0] = 0 35464+fi 35465 35466- ; 35467- return 0; 35468-} 35469-_ACEOF 35470-rm -f conftest.$ac_objext 35471-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35472- (eval $ac_compile) 2>conftest.er1 35473- ac_status=$? 35474- grep -v '^ *+' conftest.er1 >conftest.err 35475- rm -f conftest.er1 35476- cat conftest.err >&5 35477- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35478- (exit $ac_status); } && 35479- { ac_try='test -z "$ac_c_werror_flag" 35480- || test ! -s conftest.err' 35481- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35482- (eval $ac_try) 2>&5 35483- ac_status=$? 35484- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35485- (exit $ac_status); }; } && 35486- { ac_try='test -s conftest.$ac_objext' 35487- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35488- (eval $ac_try) 2>&5 35489- ac_status=$? 35490- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35491- (exit $ac_status); }; }; then 35492- ac_lo=0 ac_mid=0 35493- while :; do 35494- cat >conftest.$ac_ext <<_ACEOF 35495-/* confdefs.h. */ 35496-_ACEOF 35497-cat confdefs.h >>conftest.$ac_ext 35498-cat >>conftest.$ac_ext <<_ACEOF 35499-/* end confdefs.h. */ 35500-$ac_includes_default 35501-int 35502-main () 35503-{ 35504-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 35505-test_array [0] = 0 35506 35507- ; 35508- return 0; 35509-} 35510-_ACEOF 35511-rm -f conftest.$ac_objext 35512-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35513- (eval $ac_compile) 2>conftest.er1 35514- ac_status=$? 35515- grep -v '^ *+' conftest.er1 >conftest.err 35516- rm -f conftest.er1 35517- cat conftest.err >&5 35518- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35519- (exit $ac_status); } && 35520- { ac_try='test -z "$ac_c_werror_flag" 35521- || test ! -s conftest.err' 35522- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35523- (eval $ac_try) 2>&5 35524- ac_status=$? 35525- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35526- (exit $ac_status); }; } && 35527- { ac_try='test -s conftest.$ac_objext' 35528- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35529- (eval $ac_try) 2>&5 35530- ac_status=$? 35531- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35532- (exit $ac_status); }; }; then 35533- ac_hi=$ac_mid; break 35534-else 35535- echo "$as_me: failed program was:" >&5 35536-sed 's/^/| /' conftest.$ac_ext >&5 35537- 35538-ac_lo=`expr $ac_mid + 1` 35539- if test $ac_lo -le $ac_mid; then 35540- ac_lo= ac_hi= 35541- break 35542- fi 35543- ac_mid=`expr 2 '*' $ac_mid + 1` 35544-fi 35545-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35546- done 35547-else 35548- echo "$as_me: failed program was:" >&5 35549-sed 's/^/| /' conftest.$ac_ext >&5 35550- 35551-cat >conftest.$ac_ext <<_ACEOF 35552-/* confdefs.h. */ 35553-_ACEOF 35554-cat confdefs.h >>conftest.$ac_ext 35555-cat >>conftest.$ac_ext <<_ACEOF 35556-/* end confdefs.h. */ 35557-$ac_includes_default 35558-int 35559-main () 35560-{ 35561-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; 35562-test_array [0] = 0 35563+# reading config stubs 35564 35565- ; 35566- return 0; 35567-} 35568-_ACEOF 35569-rm -f conftest.$ac_objext 35570-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35571- (eval $ac_compile) 2>conftest.er1 35572- ac_status=$? 35573- grep -v '^ *+' conftest.er1 >conftest.err 35574- rm -f conftest.er1 35575- cat conftest.err >&5 35576- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35577- (exit $ac_status); } && 35578- { ac_try='test -z "$ac_c_werror_flag" 35579- || test ! -s conftest.err' 35580- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35581- (eval $ac_try) 2>&5 35582- ac_status=$? 35583- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35584- (exit $ac_status); }; } && 35585- { ac_try='test -s conftest.$ac_objext' 35586- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35587- (eval $ac_try) 2>&5 35588- ac_status=$? 35589- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35590- (exit $ac_status); }; }; then 35591- ac_hi=-1 ac_mid=-1 35592- while :; do 35593- cat >conftest.$ac_ext <<_ACEOF 35594-/* confdefs.h. */ 35595-_ACEOF 35596-cat confdefs.h >>conftest.$ac_ext 35597-cat >>conftest.$ac_ext <<_ACEOF 35598-/* end confdefs.h. */ 35599-$ac_includes_default 35600-int 35601-main () 35602-{ 35603-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; 35604-test_array [0] = 0 35605 35606- ; 35607- return 0; 35608-} 35609-_ACEOF 35610-rm -f conftest.$ac_objext 35611-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35612- (eval $ac_compile) 2>conftest.er1 35613- ac_status=$? 35614- grep -v '^ *+' conftest.er1 >conftest.err 35615- rm -f conftest.er1 35616- cat conftest.err >&5 35617- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35618- (exit $ac_status); } && 35619- { ac_try='test -z "$ac_c_werror_flag" 35620- || test ! -s conftest.err' 35621- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35622- (eval $ac_try) 2>&5 35623- ac_status=$? 35624- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35625- (exit $ac_status); }; } && 35626- { ac_try='test -s conftest.$ac_objext' 35627- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35628- (eval $ac_try) 2>&5 35629- ac_status=$? 35630- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35631- (exit $ac_status); }; }; then 35632- ac_lo=$ac_mid; break 35633-else 35634- echo "$as_me: failed program was:" >&5 35635-sed 's/^/| /' conftest.$ac_ext >&5 35636- 35637-ac_hi=`expr '(' $ac_mid ')' - 1` 35638- if test $ac_mid -le $ac_hi; then 35639- ac_lo= ac_hi= 35640- break 35641- fi 35642- ac_mid=`expr 2 '*' $ac_mid` 35643-fi 35644-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35645- done 35646-else 35647- echo "$as_me: failed program was:" >&5 35648-sed 's/^/| /' conftest.$ac_ext >&5 35649- 35650-ac_lo= ac_hi= 35651-fi 35652-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35653-fi 35654-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35655-# Binary search between lo and hi bounds. 35656-while test "x$ac_lo" != "x$ac_hi"; do 35657- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 35658- cat >conftest.$ac_ext <<_ACEOF 35659-/* confdefs.h. */ 35660-_ACEOF 35661-cat confdefs.h >>conftest.$ac_ext 35662-cat >>conftest.$ac_ext <<_ACEOF 35663-/* end confdefs.h. */ 35664-$ac_includes_default 35665-int 35666-main () 35667-{ 35668-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 35669-test_array [0] = 0 35670 35671- ; 35672- return 0; 35673-} 35674-_ACEOF 35675-rm -f conftest.$ac_objext 35676-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35677- (eval $ac_compile) 2>conftest.er1 35678- ac_status=$? 35679- grep -v '^ *+' conftest.er1 >conftest.err 35680- rm -f conftest.er1 35681- cat conftest.err >&5 35682- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35683- (exit $ac_status); } && 35684- { ac_try='test -z "$ac_c_werror_flag" 35685- || test ! -s conftest.err' 35686- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35687- (eval $ac_try) 2>&5 35688- ac_status=$? 35689- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35690- (exit $ac_status); }; } && 35691- { ac_try='test -s conftest.$ac_objext' 35692- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35693- (eval $ac_try) 2>&5 35694- ac_status=$? 35695- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35696- (exit $ac_status); }; }; then 35697- ac_hi=$ac_mid 35698-else 35699- echo "$as_me: failed program was:" >&5 35700-sed 's/^/| /' conftest.$ac_ext >&5 35701 35702-ac_lo=`expr '(' $ac_mid ')' + 1` 35703-fi 35704-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35705-done 35706-case $ac_lo in 35707-?*) ac_cv_sizeof_long=$ac_lo;; 35708-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 35709-See \`config.log' for more details." >&5 35710-echo "$as_me: error: cannot compute sizeof (long), 77 35711-See \`config.log' for more details." >&2;} 35712- { (exit 1); exit 1; }; } ;; 35713-esac 35714+echo $ac_n "checking size of long""... $ac_c" 1>&6 35715+echo "configure:19811: checking size of long" >&5 35716+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 35717+ echo $ac_n "(cached) $ac_c" 1>&6 35718 else 35719 if test "$cross_compiling" = yes; then 35720- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 35721-See \`config.log' for more details." >&5 35722-echo "$as_me: error: cannot run test program while cross compiling 35723-See \`config.log' for more details." >&2;} 35724- { (exit 1); exit 1; }; } 35725-else 35726- cat >conftest.$ac_ext <<_ACEOF 35727-/* confdefs.h. */ 35728-_ACEOF 35729-cat confdefs.h >>conftest.$ac_ext 35730-cat >>conftest.$ac_ext <<_ACEOF 35731-/* end confdefs.h. */ 35732-$ac_includes_default 35733-long longval () { return (long) (sizeof (long)); } 35734-unsigned long ulongval () { return (long) (sizeof (long)); } 35735+ ac_cv_sizeof_long=8 35736+else 35737+ cat > conftest.$ac_ext <<EOF 35738+#line 19819 "configure" 35739+#include "confdefs.h" 35740 #include <stdio.h> 35741-#include <stdlib.h> 35742-int 35743-main () 35744+main() 35745 { 35746- 35747- FILE *f = fopen ("conftest.val", "w"); 35748- if (! f) 35749- exit (1); 35750- if (((long) (sizeof (long))) < 0) 35751- { 35752- long i = longval (); 35753- if (i != ((long) (sizeof (long)))) 35754- exit (1); 35755- fprintf (f, "%ld\n", i); 35756- } 35757- else 35758- { 35759- unsigned long i = ulongval (); 35760- if (i != ((long) (sizeof (long)))) 35761- exit (1); 35762- fprintf (f, "%lu\n", i); 35763- } 35764- exit (ferror (f) || fclose (f) != 0); 35765- 35766- ; 35767- return 0; 35768+ FILE *f=fopen("conftestval", "w"); 35769+ if (!f) exit(1); 35770+ fprintf(f, "%d\n", sizeof(long)); 35771+ exit(0); 35772 } 35773-_ACEOF 35774-rm -f conftest$ac_exeext 35775-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 35776- (eval $ac_link) 2>&5 35777- ac_status=$? 35778- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35779- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 35780- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35781- (eval $ac_try) 2>&5 35782- ac_status=$? 35783- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35784- (exit $ac_status); }; }; then 35785- ac_cv_sizeof_long=`cat conftest.val` 35786-else 35787- echo "$as_me: program exited with status $ac_status" >&5 35788-echo "$as_me: failed program was:" >&5 35789-sed 's/^/| /' conftest.$ac_ext >&5 35790- 35791-( exit $ac_status ) 35792-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 35793-See \`config.log' for more details." >&5 35794-echo "$as_me: error: cannot compute sizeof (long), 77 35795-See \`config.log' for more details." >&2;} 35796- { (exit 1); exit 1; }; } 35797-fi 35798-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 35799-fi 35800-fi 35801-rm -f conftest.val 35802+EOF 35803+if { (eval echo configure:19830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 35804+then 35805+ ac_cv_sizeof_long=`cat conftestval` 35806 else 35807+ echo "configure: failed program was:" >&5 35808+ cat conftest.$ac_ext >&5 35809+ rm -fr conftest* 35810 ac_cv_sizeof_long=0 35811 fi 35812+rm -fr conftest* 35813 fi 35814-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 35815-echo "${ECHO_T}$ac_cv_sizeof_long" >&6 35816-cat >>confdefs.h <<_ACEOF 35817-#define SIZEOF_LONG $ac_cv_sizeof_long 35818-_ACEOF 35819- 35820- 35821-echo "$as_me:$LINENO: checking for int" >&5 35822-echo $ECHO_N "checking for int... $ECHO_C" >&6 35823-if test "${ac_cv_type_int+set}" = set; then 35824- echo $ECHO_N "(cached) $ECHO_C" >&6 35825-else 35826- cat >conftest.$ac_ext <<_ACEOF 35827-/* confdefs.h. */ 35828-_ACEOF 35829-cat confdefs.h >>conftest.$ac_ext 35830-cat >>conftest.$ac_ext <<_ACEOF 35831-/* end confdefs.h. */ 35832-$ac_includes_default 35833-int 35834-main () 35835-{ 35836-if ((int *) 0) 35837- return 0; 35838-if (sizeof (int)) 35839- return 0; 35840- ; 35841- return 0; 35842-} 35843-_ACEOF 35844-rm -f conftest.$ac_objext 35845-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35846- (eval $ac_compile) 2>conftest.er1 35847- ac_status=$? 35848- grep -v '^ *+' conftest.er1 >conftest.err 35849- rm -f conftest.er1 35850- cat conftest.err >&5 35851- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35852- (exit $ac_status); } && 35853- { ac_try='test -z "$ac_c_werror_flag" 35854- || test ! -s conftest.err' 35855- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35856- (eval $ac_try) 2>&5 35857- ac_status=$? 35858- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35859- (exit $ac_status); }; } && 35860- { ac_try='test -s conftest.$ac_objext' 35861- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35862- (eval $ac_try) 2>&5 35863- ac_status=$? 35864- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35865- (exit $ac_status); }; }; then 35866- ac_cv_type_int=yes 35867-else 35868- echo "$as_me: failed program was:" >&5 35869-sed 's/^/| /' conftest.$ac_ext >&5 35870- 35871-ac_cv_type_int=no 35872-fi 35873-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35874-fi 35875-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 35876-echo "${ECHO_T}$ac_cv_type_int" >&6 35877- 35878-echo "$as_me:$LINENO: checking size of int" >&5 35879-echo $ECHO_N "checking size of int... $ECHO_C" >&6 35880-if test "${ac_cv_sizeof_int+set}" = set; then 35881- echo $ECHO_N "(cached) $ECHO_C" >&6 35882-else 35883- if test "$ac_cv_type_int" = yes; then 35884- # The cast to unsigned long works around a bug in the HP C Compiler 35885- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 35886- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 35887- # This bug is HP SR number 8606223364. 35888- if test "$cross_compiling" = yes; then 35889- # Depending upon the size, compute the lo and hi bounds. 35890-cat >conftest.$ac_ext <<_ACEOF 35891-/* confdefs.h. */ 35892-_ACEOF 35893-cat confdefs.h >>conftest.$ac_ext 35894-cat >>conftest.$ac_ext <<_ACEOF 35895-/* end confdefs.h. */ 35896-$ac_includes_default 35897-int 35898-main () 35899-{ 35900-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; 35901-test_array [0] = 0 35902- 35903- ; 35904- return 0; 35905-} 35906-_ACEOF 35907-rm -f conftest.$ac_objext 35908-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35909- (eval $ac_compile) 2>conftest.er1 35910- ac_status=$? 35911- grep -v '^ *+' conftest.er1 >conftest.err 35912- rm -f conftest.er1 35913- cat conftest.err >&5 35914- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35915- (exit $ac_status); } && 35916- { ac_try='test -z "$ac_c_werror_flag" 35917- || test ! -s conftest.err' 35918- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35919- (eval $ac_try) 2>&5 35920- ac_status=$? 35921- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35922- (exit $ac_status); }; } && 35923- { ac_try='test -s conftest.$ac_objext' 35924- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35925- (eval $ac_try) 2>&5 35926- ac_status=$? 35927- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35928- (exit $ac_status); }; }; then 35929- ac_lo=0 ac_mid=0 35930- while :; do 35931- cat >conftest.$ac_ext <<_ACEOF 35932-/* confdefs.h. */ 35933-_ACEOF 35934-cat confdefs.h >>conftest.$ac_ext 35935-cat >>conftest.$ac_ext <<_ACEOF 35936-/* end confdefs.h. */ 35937-$ac_includes_default 35938-int 35939-main () 35940-{ 35941-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 35942-test_array [0] = 0 35943- 35944- ; 35945- return 0; 35946-} 35947-_ACEOF 35948-rm -f conftest.$ac_objext 35949-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 35950- (eval $ac_compile) 2>conftest.er1 35951- ac_status=$? 35952- grep -v '^ *+' conftest.er1 >conftest.err 35953- rm -f conftest.er1 35954- cat conftest.err >&5 35955- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35956- (exit $ac_status); } && 35957- { ac_try='test -z "$ac_c_werror_flag" 35958- || test ! -s conftest.err' 35959- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35960- (eval $ac_try) 2>&5 35961- ac_status=$? 35962- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35963- (exit $ac_status); }; } && 35964- { ac_try='test -s conftest.$ac_objext' 35965- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 35966- (eval $ac_try) 2>&5 35967- ac_status=$? 35968- echo "$as_me:$LINENO: \$? = $ac_status" >&5 35969- (exit $ac_status); }; }; then 35970- ac_hi=$ac_mid; break 35971-else 35972- echo "$as_me: failed program was:" >&5 35973-sed 's/^/| /' conftest.$ac_ext >&5 35974- 35975-ac_lo=`expr $ac_mid + 1` 35976- if test $ac_lo -le $ac_mid; then 35977- ac_lo= ac_hi= 35978- break 35979- fi 35980- ac_mid=`expr 2 '*' $ac_mid + 1` 35981-fi 35982-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 35983- done 35984-else 35985- echo "$as_me: failed program was:" >&5 35986-sed 's/^/| /' conftest.$ac_ext >&5 35987- 35988-cat >conftest.$ac_ext <<_ACEOF 35989-/* confdefs.h. */ 35990-_ACEOF 35991-cat confdefs.h >>conftest.$ac_ext 35992-cat >>conftest.$ac_ext <<_ACEOF 35993-/* end confdefs.h. */ 35994-$ac_includes_default 35995-int 35996-main () 35997-{ 35998-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; 35999-test_array [0] = 0 36000- 36001- ; 36002- return 0; 36003-} 36004-_ACEOF 36005-rm -f conftest.$ac_objext 36006-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36007- (eval $ac_compile) 2>conftest.er1 36008- ac_status=$? 36009- grep -v '^ *+' conftest.er1 >conftest.err 36010- rm -f conftest.er1 36011- cat conftest.err >&5 36012- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36013- (exit $ac_status); } && 36014- { ac_try='test -z "$ac_c_werror_flag" 36015- || test ! -s conftest.err' 36016- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36017- (eval $ac_try) 2>&5 36018- ac_status=$? 36019- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36020- (exit $ac_status); }; } && 36021- { ac_try='test -s conftest.$ac_objext' 36022- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36023- (eval $ac_try) 2>&5 36024- ac_status=$? 36025- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36026- (exit $ac_status); }; }; then 36027- ac_hi=-1 ac_mid=-1 36028- while :; do 36029- cat >conftest.$ac_ext <<_ACEOF 36030-/* confdefs.h. */ 36031-_ACEOF 36032-cat confdefs.h >>conftest.$ac_ext 36033-cat >>conftest.$ac_ext <<_ACEOF 36034-/* end confdefs.h. */ 36035-$ac_includes_default 36036-int 36037-main () 36038-{ 36039-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; 36040-test_array [0] = 0 36041 36042- ; 36043- return 0; 36044-} 36045-_ACEOF 36046-rm -f conftest.$ac_objext 36047-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36048- (eval $ac_compile) 2>conftest.er1 36049- ac_status=$? 36050- grep -v '^ *+' conftest.er1 >conftest.err 36051- rm -f conftest.er1 36052- cat conftest.err >&5 36053- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36054- (exit $ac_status); } && 36055- { ac_try='test -z "$ac_c_werror_flag" 36056- || test ! -s conftest.err' 36057- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36058- (eval $ac_try) 2>&5 36059- ac_status=$? 36060- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36061- (exit $ac_status); }; } && 36062- { ac_try='test -s conftest.$ac_objext' 36063- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36064- (eval $ac_try) 2>&5 36065- ac_status=$? 36066- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36067- (exit $ac_status); }; }; then 36068- ac_lo=$ac_mid; break 36069-else 36070- echo "$as_me: failed program was:" >&5 36071-sed 's/^/| /' conftest.$ac_ext >&5 36072- 36073-ac_hi=`expr '(' $ac_mid ')' - 1` 36074- if test $ac_mid -le $ac_hi; then 36075- ac_lo= ac_hi= 36076- break 36077- fi 36078- ac_mid=`expr 2 '*' $ac_mid` 36079-fi 36080-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36081- done 36082-else 36083- echo "$as_me: failed program was:" >&5 36084-sed 's/^/| /' conftest.$ac_ext >&5 36085- 36086-ac_lo= ac_hi= 36087-fi 36088-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36089-fi 36090-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36091-# Binary search between lo and hi bounds. 36092-while test "x$ac_lo" != "x$ac_hi"; do 36093- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 36094- cat >conftest.$ac_ext <<_ACEOF 36095-/* confdefs.h. */ 36096-_ACEOF 36097-cat confdefs.h >>conftest.$ac_ext 36098-cat >>conftest.$ac_ext <<_ACEOF 36099-/* end confdefs.h. */ 36100-$ac_includes_default 36101-int 36102-main () 36103-{ 36104-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 36105-test_array [0] = 0 36106+fi 36107+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 36108+cat >> confdefs.h <<EOF 36109+#define SIZEOF_LONG $ac_cv_sizeof_long 36110+EOF 36111 36112- ; 36113- return 0; 36114-} 36115-_ACEOF 36116-rm -f conftest.$ac_objext 36117-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36118- (eval $ac_compile) 2>conftest.er1 36119- ac_status=$? 36120- grep -v '^ *+' conftest.er1 >conftest.err 36121- rm -f conftest.er1 36122- cat conftest.err >&5 36123- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36124- (exit $ac_status); } && 36125- { ac_try='test -z "$ac_c_werror_flag" 36126- || test ! -s conftest.err' 36127- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36128- (eval $ac_try) 2>&5 36129- ac_status=$? 36130- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36131- (exit $ac_status); }; } && 36132- { ac_try='test -s conftest.$ac_objext' 36133- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36134- (eval $ac_try) 2>&5 36135- ac_status=$? 36136- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36137- (exit $ac_status); }; }; then 36138- ac_hi=$ac_mid 36139-else 36140- echo "$as_me: failed program was:" >&5 36141-sed 's/^/| /' conftest.$ac_ext >&5 36142 36143-ac_lo=`expr '(' $ac_mid ')' + 1` 36144-fi 36145-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36146-done 36147-case $ac_lo in 36148-?*) ac_cv_sizeof_int=$ac_lo;; 36149-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 36150-See \`config.log' for more details." >&5 36151-echo "$as_me: error: cannot compute sizeof (int), 77 36152-See \`config.log' for more details." >&2;} 36153- { (exit 1); exit 1; }; } ;; 36154-esac 36155+echo $ac_n "checking size of int""... $ac_c" 1>&6 36156+echo "configure:19850: checking size of int" >&5 36157+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 36158+ echo $ac_n "(cached) $ac_c" 1>&6 36159 else 36160 if test "$cross_compiling" = yes; then 36161- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 36162-See \`config.log' for more details." >&5 36163-echo "$as_me: error: cannot run test program while cross compiling 36164-See \`config.log' for more details." >&2;} 36165- { (exit 1); exit 1; }; } 36166-else 36167- cat >conftest.$ac_ext <<_ACEOF 36168-/* confdefs.h. */ 36169-_ACEOF 36170-cat confdefs.h >>conftest.$ac_ext 36171-cat >>conftest.$ac_ext <<_ACEOF 36172-/* end confdefs.h. */ 36173-$ac_includes_default 36174-long longval () { return (long) (sizeof (int)); } 36175-unsigned long ulongval () { return (long) (sizeof (int)); } 36176+ ac_cv_sizeof_int=4 36177+else 36178+ cat > conftest.$ac_ext <<EOF 36179+#line 19858 "configure" 36180+#include "confdefs.h" 36181 #include <stdio.h> 36182-#include <stdlib.h> 36183-int 36184-main () 36185+main() 36186 { 36187- 36188- FILE *f = fopen ("conftest.val", "w"); 36189- if (! f) 36190- exit (1); 36191- if (((long) (sizeof (int))) < 0) 36192- { 36193- long i = longval (); 36194- if (i != ((long) (sizeof (int)))) 36195- exit (1); 36196- fprintf (f, "%ld\n", i); 36197- } 36198- else 36199- { 36200- unsigned long i = ulongval (); 36201- if (i != ((long) (sizeof (int)))) 36202- exit (1); 36203- fprintf (f, "%lu\n", i); 36204- } 36205- exit (ferror (f) || fclose (f) != 0); 36206- 36207- ; 36208- return 0; 36209+ FILE *f=fopen("conftestval", "w"); 36210+ if (!f) exit(1); 36211+ fprintf(f, "%d\n", sizeof(int)); 36212+ exit(0); 36213 } 36214-_ACEOF 36215-rm -f conftest$ac_exeext 36216-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 36217- (eval $ac_link) 2>&5 36218- ac_status=$? 36219- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36220- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 36221- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36222- (eval $ac_try) 2>&5 36223- ac_status=$? 36224- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36225- (exit $ac_status); }; }; then 36226- ac_cv_sizeof_int=`cat conftest.val` 36227-else 36228- echo "$as_me: program exited with status $ac_status" >&5 36229-echo "$as_me: failed program was:" >&5 36230-sed 's/^/| /' conftest.$ac_ext >&5 36231- 36232-( exit $ac_status ) 36233-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 36234-See \`config.log' for more details." >&5 36235-echo "$as_me: error: cannot compute sizeof (int), 77 36236-See \`config.log' for more details." >&2;} 36237- { (exit 1); exit 1; }; } 36238-fi 36239-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 36240-fi 36241-fi 36242-rm -f conftest.val 36243+EOF 36244+if { (eval echo configure:19869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 36245+then 36246+ ac_cv_sizeof_int=`cat conftestval` 36247 else 36248+ echo "configure: failed program was:" >&5 36249+ cat conftest.$ac_ext >&5 36250+ rm -fr conftest* 36251 ac_cv_sizeof_int=0 36252 fi 36253+rm -fr conftest* 36254+fi 36255+ 36256 fi 36257-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 36258-echo "${ECHO_T}$ac_cv_sizeof_int" >&6 36259-cat >>confdefs.h <<_ACEOF 36260+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 36261+cat >> confdefs.h <<EOF 36262 #define SIZEOF_INT $ac_cv_sizeof_int 36263-_ACEOF 36264+EOF 36265 36266 36267 36268-echo "$as_me:$LINENO: checking for int32_t" >&5 36269-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6 36270-if test "${ac_cv_int_type_int32_t+set}" = set; then 36271- echo $ECHO_N "(cached) $ECHO_C" >&6 36272+echo $ac_n "checking for int32_t""... $ac_c" 1>&6 36273+echo "configure:19890: checking for int32_t" >&5 36274+if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then 36275+ echo $ac_n "(cached) $ac_c" 1>&6 36276 else 36277- 36278-cat >conftest.$ac_ext <<_ACEOF 36279-/* confdefs.h. */ 36280-_ACEOF 36281-cat confdefs.h >>conftest.$ac_ext 36282-cat >>conftest.$ac_ext <<_ACEOF 36283-/* end confdefs.h. */ 36284+ 36285+cat > conftest.$ac_ext <<EOF 36286+#line 19896 "configure" 36287+#include "confdefs.h" 36288 36289 #if HAVE_SYS_TYPES_H 36290 # include <sys/types.h> 36291 #endif 36292 #if HAVE_INTTYPES_H 36293 # include <inttypes.h> 36294-#elif HAVE_STDINT_H 36295-# include <stdint.h> 36296+#elif HAVE_STDINT_H 36297+# include <stdint.h> 36298 #endif 36299-int 36300-main () 36301-{ 36302+int main() { 36303 if ((int32_t *) 0) 36304- return 0; 36305+ return 0; 36306 if (sizeof (int32_t)) 36307 return 0; 36308 36309- ; 36310- return 0; 36311-} 36312-_ACEOF 36313-rm -f conftest.$ac_objext 36314-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36315- (eval $ac_compile) 2>conftest.er1 36316- ac_status=$? 36317- grep -v '^ *+' conftest.er1 >conftest.err 36318- rm -f conftest.er1 36319- cat conftest.err >&5 36320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36321- (exit $ac_status); } && 36322- { ac_try='test -z "$ac_c_werror_flag" 36323- || test ! -s conftest.err' 36324- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36325- (eval $ac_try) 2>&5 36326- ac_status=$? 36327- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36328- (exit $ac_status); }; } && 36329- { ac_try='test -s conftest.$ac_objext' 36330- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36331- (eval $ac_try) 2>&5 36332- ac_status=$? 36333- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36334- (exit $ac_status); }; }; then 36335+; return 0; } 36336+EOF 36337+if { (eval echo configure:19915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36338+ rm -rf conftest* 36339 ac_cv_int_type_int32_t=yes 36340 else 36341- echo "$as_me: failed program was:" >&5 36342-sed 's/^/| /' conftest.$ac_ext >&5 36343- 36344-ac_cv_int_type_int32_t=no 36345+ echo "configure: failed program was:" >&5 36346+ cat conftest.$ac_ext >&5 36347+ rm -rf conftest* 36348+ ac_cv_int_type_int32_t=no 36349 fi 36350-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36351+rm -f conftest* 36352 36353 fi 36354-echo "$as_me:$LINENO: result: $ac_cv_int_type_int32_t" >&5 36355-echo "${ECHO_T}$ac_cv_int_type_int32_t" >&6 36356-if test "$ac_cv_int_type_int32_t" = "yes"; then 36357 36358-cat >>confdefs.h <<\_ACEOF 36359+echo "$ac_t""$ac_cv_int_type_int32_t" 1>&6 36360+if test "$ac_cv_int_type_int32_t" = "yes"; then 36361+ cat >> confdefs.h <<\EOF 36362 #define HAVE_INT32_T 1 36363-_ACEOF 36364+EOF 36365 36366 fi 36367 36368 36369-echo "$as_me:$LINENO: checking for uint32_t" >&5 36370-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6 36371-if test "${ac_cv_int_type_uint32_t+set}" = set; then 36372- echo $ECHO_N "(cached) $ECHO_C" >&6 36373+echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 36374+echo "configure:19938: checking for uint32_t" >&5 36375+if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then 36376+ echo $ac_n "(cached) $ac_c" 1>&6 36377 else 36378- 36379-cat >conftest.$ac_ext <<_ACEOF 36380-/* confdefs.h. */ 36381-_ACEOF 36382-cat confdefs.h >>conftest.$ac_ext 36383-cat >>conftest.$ac_ext <<_ACEOF 36384-/* end confdefs.h. */ 36385+ 36386+cat > conftest.$ac_ext <<EOF 36387+#line 19944 "configure" 36388+#include "confdefs.h" 36389 36390 #if HAVE_SYS_TYPES_H 36391 # include <sys/types.h> 36392 #endif 36393 #if HAVE_INTTYPES_H 36394 # include <inttypes.h> 36395-#elif HAVE_STDINT_H 36396-# include <stdint.h> 36397+#elif HAVE_STDINT_H 36398+# include <stdint.h> 36399 #endif 36400-int 36401-main () 36402-{ 36403+int main() { 36404 if ((uint32_t *) 0) 36405- return 0; 36406+ return 0; 36407 if (sizeof (uint32_t)) 36408 return 0; 36409 36410- ; 36411- return 0; 36412-} 36413-_ACEOF 36414-rm -f conftest.$ac_objext 36415-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36416- (eval $ac_compile) 2>conftest.er1 36417- ac_status=$? 36418- grep -v '^ *+' conftest.er1 >conftest.err 36419- rm -f conftest.er1 36420- cat conftest.err >&5 36421- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36422- (exit $ac_status); } && 36423- { ac_try='test -z "$ac_c_werror_flag" 36424- || test ! -s conftest.err' 36425- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36426- (eval $ac_try) 2>&5 36427- ac_status=$? 36428- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36429- (exit $ac_status); }; } && 36430- { ac_try='test -s conftest.$ac_objext' 36431- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36432- (eval $ac_try) 2>&5 36433- ac_status=$? 36434- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36435- (exit $ac_status); }; }; then 36436+; return 0; } 36437+EOF 36438+if { (eval echo configure:19963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 36439+ rm -rf conftest* 36440 ac_cv_int_type_uint32_t=yes 36441 else 36442- echo "$as_me: failed program was:" >&5 36443-sed 's/^/| /' conftest.$ac_ext >&5 36444- 36445-ac_cv_int_type_uint32_t=no 36446+ echo "configure: failed program was:" >&5 36447+ cat conftest.$ac_ext >&5 36448+ rm -rf conftest* 36449+ ac_cv_int_type_uint32_t=no 36450 fi 36451-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36452+rm -f conftest* 36453 36454 fi 36455-echo "$as_me:$LINENO: result: $ac_cv_int_type_uint32_t" >&5 36456-echo "${ECHO_T}$ac_cv_int_type_uint32_t" >&6 36457-if test "$ac_cv_int_type_uint32_t" = "yes"; then 36458 36459-cat >>confdefs.h <<\_ACEOF 36460+echo "$ac_t""$ac_cv_int_type_uint32_t" 1>&6 36461+if test "$ac_cv_int_type_uint32_t" = "yes"; then 36462+ cat >> confdefs.h <<\EOF 36463 #define HAVE_UINT32_T 1 36464-_ACEOF 36465+EOF 36466 36467 fi 36468 36469 36470- 36471- 36472- 36473- 36474- 36475-for ac_header in \ 36476+for ac_hdr in \ 36477 sys/types.h \ 36478 inttypes.h \ 36479 stdint.h \ 36480@@ -30603,255 +19989,97 @@ 36481 stdlib.h 36482 36483 do 36484-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 36485-if eval "test \"\${$as_ac_Header+set}\" = set"; then 36486- echo "$as_me:$LINENO: checking for $ac_header" >&5 36487-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 36488-if eval "test \"\${$as_ac_Header+set}\" = set"; then 36489- echo $ECHO_N "(cached) $ECHO_C" >&6 36490-fi 36491-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 36492-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 36493-else 36494- # Is the header compilable? 36495-echo "$as_me:$LINENO: checking $ac_header usability" >&5 36496-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 36497-cat >conftest.$ac_ext <<_ACEOF 36498-/* confdefs.h. */ 36499-_ACEOF 36500-cat confdefs.h >>conftest.$ac_ext 36501-cat >>conftest.$ac_ext <<_ACEOF 36502-/* end confdefs.h. */ 36503-$ac_includes_default 36504-#include <$ac_header> 36505-_ACEOF 36506-rm -f conftest.$ac_objext 36507-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 36508- (eval $ac_compile) 2>conftest.er1 36509- ac_status=$? 36510- grep -v '^ *+' conftest.er1 >conftest.err 36511- rm -f conftest.er1 36512- cat conftest.err >&5 36513- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36514- (exit $ac_status); } && 36515- { ac_try='test -z "$ac_c_werror_flag" 36516- || test ! -s conftest.err' 36517- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36518- (eval $ac_try) 2>&5 36519- ac_status=$? 36520- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36521- (exit $ac_status); }; } && 36522- { ac_try='test -s conftest.$ac_objext' 36523- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36524- (eval $ac_try) 2>&5 36525- ac_status=$? 36526- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36527- (exit $ac_status); }; }; then 36528- ac_header_compiler=yes 36529-else 36530- echo "$as_me: failed program was:" >&5 36531-sed 's/^/| /' conftest.$ac_ext >&5 36532- 36533-ac_header_compiler=no 36534-fi 36535-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 36536-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 36537-echo "${ECHO_T}$ac_header_compiler" >&6 36538- 36539-# Is the header present? 36540-echo "$as_me:$LINENO: checking $ac_header presence" >&5 36541-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 36542-cat >conftest.$ac_ext <<_ACEOF 36543-/* confdefs.h. */ 36544-_ACEOF 36545-cat confdefs.h >>conftest.$ac_ext 36546-cat >>conftest.$ac_ext <<_ACEOF 36547-/* end confdefs.h. */ 36548-#include <$ac_header> 36549-_ACEOF 36550-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 36551- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 36552- ac_status=$? 36553- grep -v '^ *+' conftest.er1 >conftest.err 36554- rm -f conftest.er1 36555- cat conftest.err >&5 36556- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36557- (exit $ac_status); } >/dev/null; then 36558- if test -s conftest.err; then 36559- ac_cpp_err=$ac_c_preproc_warn_flag 36560- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 36561- else 36562- ac_cpp_err= 36563- fi 36564-else 36565- ac_cpp_err=yes 36566-fi 36567-if test -z "$ac_cpp_err"; then 36568- ac_header_preproc=yes 36569-else 36570- echo "$as_me: failed program was:" >&5 36571-sed 's/^/| /' conftest.$ac_ext >&5 36572- 36573- ac_header_preproc=no 36574-fi 36575-rm -f conftest.err conftest.$ac_ext 36576-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 36577-echo "${ECHO_T}$ac_header_preproc" >&6 36578- 36579-# So? What about this header? 36580-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 36581- yes:no: ) 36582- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 36583-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 36584- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 36585-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 36586- ac_header_preproc=yes 36587- ;; 36588- no:yes:* ) 36589- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 36590-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 36591- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 36592-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 36593- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 36594-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 36595- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 36596-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 36597- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 36598-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 36599- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 36600-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 36601- ( 36602- cat <<\_ASBOX 36603-## ------------------------------------------ ## 36604-## Report this to the AC_PACKAGE_NAME lists. ## 36605-## ------------------------------------------ ## 36606-_ASBOX 36607- ) | 36608- sed "s/^/$as_me: WARNING: /" >&2 36609- ;; 36610-esac 36611-echo "$as_me:$LINENO: checking for $ac_header" >&5 36612-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 36613-if eval "test \"\${$as_ac_Header+set}\" = set"; then 36614- echo $ECHO_N "(cached) $ECHO_C" >&6 36615+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 36616+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 36617+echo "configure:19995: checking for $ac_hdr" >&5 36618+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 36619+ echo $ac_n "(cached) $ac_c" 1>&6 36620+else 36621+ cat > conftest.$ac_ext <<EOF 36622+#line 20000 "configure" 36623+#include "confdefs.h" 36624+#include <$ac_hdr> 36625+EOF 36626+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 36627+{ (eval echo configure:20005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 36628+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 36629+if test -z "$ac_err"; then 36630+ rm -rf conftest* 36631+ eval "ac_cv_header_$ac_safe=yes" 36632 else 36633- eval "$as_ac_Header=\$ac_header_preproc" 36634+ echo "$ac_err" >&5 36635+ echo "configure: failed program was:" >&5 36636+ cat conftest.$ac_ext >&5 36637+ rm -rf conftest* 36638+ eval "ac_cv_header_$ac_safe=no" 36639 fi 36640-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 36641-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 36642- 36643+rm -f conftest* 36644 fi 36645-if test `eval echo '${'$as_ac_Header'}'` = yes; then 36646- cat >>confdefs.h <<_ACEOF 36647-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 36648-_ACEOF 36649- 36650+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 36651+ echo "$ac_t""yes" 1>&6 36652+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 36653+ cat >> confdefs.h <<EOF 36654+#define $ac_tr_hdr 1 36655+EOF 36656+ 36657+else 36658+ echo "$ac_t""no" 1>&6 36659 fi 36660- 36661 done 36662 36663 36664- 36665- 36666- 36667 for ac_func in strtoll atoll strftime 36668 do 36669-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 36670-echo "$as_me:$LINENO: checking for $ac_func" >&5 36671-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 36672-if eval "test \"\${$as_ac_var+set}\" = set"; then 36673- echo $ECHO_N "(cached) $ECHO_C" >&6 36674-else 36675- cat >conftest.$ac_ext <<_ACEOF 36676-/* confdefs.h. */ 36677-_ACEOF 36678-cat confdefs.h >>conftest.$ac_ext 36679-cat >>conftest.$ac_ext <<_ACEOF 36680-/* end confdefs.h. */ 36681-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 36682- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 36683-#define $ac_func innocuous_$ac_func 36684- 36685+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 36686+echo "configure:20035: checking for $ac_func" >&5 36687+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 36688+ echo $ac_n "(cached) $ac_c" 1>&6 36689+else 36690+ cat > conftest.$ac_ext <<EOF 36691+#line 20040 "configure" 36692+#include "confdefs.h" 36693 /* System header to define __stub macros and hopefully few prototypes, 36694- which can conflict with char $ac_func (); below. 36695- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 36696- <limits.h> exists even on freestanding compilers. */ 36697- 36698-#ifdef __STDC__ 36699-# include <limits.h> 36700-#else 36701-# include <assert.h> 36702-#endif 36703- 36704-#undef $ac_func 36705- 36706+ which can conflict with char $ac_func(); below. */ 36707+#include <assert.h> 36708 /* Override any gcc2 internal prototype to avoid an error. */ 36709-#ifdef __cplusplus 36710-extern "C" 36711-{ 36712-#endif 36713 /* We use char because int might match the return type of a gcc2 36714- builtin and then its argument prototype would still apply. */ 36715-char $ac_func (); 36716+ builtin and then its argument prototype would still apply. */ 36717+char $ac_func(); 36718+ 36719+int main() { 36720+ 36721 /* The GNU C library defines this for functions which it implements 36722 to always fail with ENOSYS. Some functions are actually named 36723 something starting with __ and the normal name is an alias. */ 36724 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 36725 choke me 36726 #else 36727-char (*f) () = $ac_func; 36728-#endif 36729-#ifdef __cplusplus 36730-} 36731+$ac_func(); 36732 #endif 36733 36734-int 36735-main () 36736-{ 36737-return f != $ac_func; 36738- ; 36739- return 0; 36740-} 36741-_ACEOF 36742-rm -f conftest.$ac_objext conftest$ac_exeext 36743-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 36744- (eval $ac_link) 2>conftest.er1 36745- ac_status=$? 36746- grep -v '^ *+' conftest.er1 >conftest.err 36747- rm -f conftest.er1 36748- cat conftest.err >&5 36749- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36750- (exit $ac_status); } && 36751- { ac_try='test -z "$ac_c_werror_flag" 36752- || test ! -s conftest.err' 36753- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36754- (eval $ac_try) 2>&5 36755- ac_status=$? 36756- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36757- (exit $ac_status); }; } && 36758- { ac_try='test -s conftest$ac_exeext' 36759- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 36760- (eval $ac_try) 2>&5 36761- ac_status=$? 36762- echo "$as_me:$LINENO: \$? = $ac_status" >&5 36763- (exit $ac_status); }; }; then 36764- eval "$as_ac_var=yes" 36765-else 36766- echo "$as_me: failed program was:" >&5 36767-sed 's/^/| /' conftest.$ac_ext >&5 36768- 36769-eval "$as_ac_var=no" 36770-fi 36771-rm -f conftest.err conftest.$ac_objext \ 36772- conftest$ac_exeext conftest.$ac_ext 36773-fi 36774-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 36775-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 36776-if test `eval echo '${'$as_ac_var'}'` = yes; then 36777- cat >>confdefs.h <<_ACEOF 36778-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 36779-_ACEOF 36780+; return 0; } 36781+EOF 36782+if { (eval echo configure:20063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 36783+ rm -rf conftest* 36784+ eval "ac_cv_func_$ac_func=yes" 36785+else 36786+ echo "configure: failed program was:" >&5 36787+ cat conftest.$ac_ext >&5 36788+ rm -rf conftest* 36789+ eval "ac_cv_func_$ac_func=no" 36790+fi 36791+rm -f conftest* 36792+fi 36793 36794+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 36795+ echo "$ac_t""yes" 1>&6 36796+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 36797+ cat >> confdefs.h <<EOF 36798+#define $ac_tr_func 1 36799+EOF 36800+ 36801+else 36802+ echo "$ac_t""no" 1>&6 36803 fi 36804 done 36805 36806@@ -30859,7 +20087,7 @@ 36807 36808 36809 PHP_DATE_CFLAGS="-I@ext_builddir@/lib" 36810-timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c 36811+timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c 36812 lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" 36813 36814 36815@@ -30870,15 +20098,15 @@ 36816 36817 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 36818 PHP_DATE_SHARED=no 36819- 36820- 36821+ 36822+ 36823 case ext/date in 36824 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 36825 /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 36826 *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 36827 esac 36828- 36829- 36830+ 36831+ 36832 36833 b_c_pre=$php_c_pre 36834 b_cxx_pre=$php_cxx_pre 36835@@ -30891,12 +20119,12 @@ 36836 36837 old_IFS=$IFS 36838 for ac_src in php_date.c $timelib_sources; do 36839- 36840+ 36841 IFS=. 36842 set $ac_src 36843 ac_obj=$1 36844 IFS=$old_IFS 36845- 36846+ 36847 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 36848 36849 case $ac_src in 36850@@ -30920,14 +20148,14 @@ 36851 else 36852 if test "no" = "shared" || test "no" = "yes"; then 36853 PHP_DATE_SHARED=yes 36854- 36855+ 36856 case ext/date in 36857 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 36858 /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 36859 *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 36860 esac 36861- 36862- 36863+ 36864+ 36865 36866 b_c_pre=$shared_c_pre 36867 b_cxx_pre=$shared_cxx_pre 36868@@ -30940,12 +20168,12 @@ 36869 36870 old_IFS=$IFS 36871 for ac_src in php_date.c $timelib_sources; do 36872- 36873+ 36874 IFS=. 36875 set $ac_src 36876 ac_obj=$1 36877 IFS=$old_IFS 36878- 36879+ 36880 shared_objects_date="$shared_objects_date $ac_bdir$ac_obj.lo" 36881 36882 case $ac_src in 36883@@ -30963,7 +20191,7 @@ 36884 36885 case $host_alias in 36886 *netware*) 36887- 36888+ 36889 install_modules="install-modules" 36890 36891 case $host_alias in 36892@@ -30973,7 +20201,7 @@ 36893 ;; 36894 *netware*) 36895 suffix=nlm 36896- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(DATE_SHARED_LIBADD)' 36897+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDATE, 3)_SHARED_LIBADD)' 36898 ;; 36899 *) 36900 suffix=la 36901@@ -30986,7 +20214,7 @@ 36902 else 36903 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdate.$suffix" 36904 fi 36905- 36906+ 36907 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date" 36908 36909 cat >>Makefile.objects<<EOF 36910@@ -31000,7 +20228,7 @@ 36911 36912 ;; 36913 *) 36914- 36915+ 36916 install_modules="install-modules" 36917 36918 case $host_alias in 36919@@ -31010,7 +20238,7 @@ 36920 ;; 36921 *netware*) 36922 suffix=nlm 36923- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(E_SHARED_LIBADD)' 36924+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_date) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DATE, 3)_SHARED_LIBADD)' 36925 ;; 36926 *) 36927 suffix=la 36928@@ -31023,7 +20251,7 @@ 36929 else 36930 PHP_MODULES="$PHP_MODULES \$(phplibdir)/date.$suffix" 36931 fi 36932- 36933+ 36934 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_date" 36935 36936 cat >>Makefile.objects<<EOF 36937@@ -31037,10 +20265,9 @@ 36938 36939 ;; 36940 esac 36941- 36942-cat >>confdefs.h <<_ACEOF 36943+ cat >> confdefs.h <<EOF 36944 #define COMPILE_DL_DATE 1 36945-_ACEOF 36946+EOF 36947 36948 fi 36949 fi 36950@@ -31049,15 +20276,15 @@ 36951 PHP_DATE_SHARED=no 36952 case "$PHP_SAPI" in 36953 cgi|embed) 36954- 36955- 36956+ 36957+ 36958 case ext/date in 36959 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 36960 /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 36961 *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 36962 esac 36963- 36964- 36965+ 36966+ 36967 36968 b_c_pre=$php_c_pre 36969 b_cxx_pre=$php_cxx_pre 36970@@ -31070,12 +20297,12 @@ 36971 36972 old_IFS=$IFS 36973 for ac_src in php_date.c $timelib_sources; do 36974- 36975+ 36976 IFS=. 36977 set $ac_src 36978 ac_obj=$1 36979 IFS=$old_IFS 36980- 36981+ 36982 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 36983 36984 case $ac_src in 36985@@ -31095,15 +20322,15 @@ 36986 EXT_STATIC="$EXT_STATIC date" 36987 ;; 36988 *) 36989- 36990- 36991+ 36992+ 36993 case ext/date in 36994 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 36995 /*) ac_srcdir=`echo "ext/date"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 36996 *) ac_srcdir="$abs_srcdir/ext/date/"; ac_bdir="ext/date/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 36997 esac 36998- 36999- 37000+ 37001+ 37002 37003 b_c_pre=$php_c_pre 37004 b_cxx_pre=$php_cxx_pre 37005@@ -31116,13 +20343,13 @@ 37006 37007 old_IFS=$IFS 37008 for ac_src in php_date.c $timelib_sources; do 37009- 37010+ 37011 IFS=. 37012 set $ac_src 37013 ac_obj=$1 37014 IFS=$old_IFS 37015- 37016- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 37017+ 37018+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 37019 37020 case $ac_src in 37021 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 37022@@ -31142,107 +20369,107 @@ 37023 esac 37024 EXT_CLI_STATIC="$EXT_CLI_STATIC date" 37025 fi 37026- 37027- 37028+ 37029+ 37030 BUILD_DIR="$BUILD_DIR $ext_builddir" 37031- 37032+ 37033 37034 37035 if test "$ext_builddir" = "."; then 37036 PHP_PECL_EXTENSION=date 37037- 37038+ 37039 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 37040 37041 fi 37042 37043 37044 37045- 37046+ 37047 $php_shtool mkdir -p $ext_builddir/lib 37048- 37049+ 37050 37051 37052 if test "$ext_builddir/lib" != "/usr/include"; then 37053- 37054+ 37055 if test -z "$ext_builddir/lib" || echo "$ext_builddir/lib" | grep '^/' >/dev/null ; then 37056 ai_p=$ext_builddir/lib 37057 else 37058- 37059+ 37060 ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`" 37061- 37062+ 37063 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 37064 ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`" 37065 fi 37066 37067- 37068- 37069+ 37070+ 37071 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 37072- 37073+ 37074 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 37075 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37076 eval "INCLUDEPATH$unique=set" 37077- 37078+ 37079 if test ""; then 37080 INCLUDES="-I$ai_p $INCLUDES" 37081 else 37082 INCLUDES="$INCLUDES -I$ai_p" 37083 fi 37084- 37085+ 37086 fi 37087 37088 fi 37089 37090 37091 if test "$ext_srcdir/lib" != "/usr/include"; then 37092- 37093+ 37094 if test -z "$ext_srcdir/lib" || echo "$ext_srcdir/lib" | grep '^/' >/dev/null ; then 37095 ai_p=$ext_srcdir/lib 37096 else 37097- 37098+ 37099 ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`" 37100- 37101+ 37102 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 37103 ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`" 37104 fi 37105 37106- 37107- 37108+ 37109+ 37110 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 37111- 37112+ 37113 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 37114 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37115 eval "INCLUDEPATH$unique=set" 37116- 37117+ 37118 if test ""; then 37119 INCLUDES="-I$ai_p $INCLUDES" 37120 else 37121 INCLUDES="$INCLUDES -I$ai_p" 37122 fi 37123- 37124+ 37125 fi 37126 37127 fi 37128 37129 37130 37131- 37132+ 37133 header_path=ext/date 37134 for header_file in php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h; do 37135 hp_hf="$header_path/$header_file" 37136- 37137- 37138+ 37139+ 37140 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 37141- 37142+ 37143 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 37144 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37145 eval "INSTALLHEADERS$unique=set" 37146- 37147+ 37148 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 37149- 37150+ 37151 fi 37152 37153- done 37154- 37155+ done 37156+ 37157 37158 37159 cat > $ext_builddir/lib/timelib_config.h <<EOF 37160@@ -31258,17 +20485,17 @@ 37161 php_with_regex=php 37162 37163 37164- 37165 # Check whether --with-regex or --without-regex was given. 37166 if test "${with_regex+set}" = set; then 37167 withval="$with_regex" 37168 PHP_REGEX=$withval 37169 else 37170- 37171+ 37172 PHP_REGEX=php 37173+ 37174 37175+fi 37176 37177-fi; 37178 37179 ext_output=$PHP_REGEX 37180 37181@@ -31289,15 +20516,13 @@ 37182 ;; 37183 *) 37184 REGEX_TYPE=php 37185- { echo "$as_me:$LINENO: WARNING: Invalid regex library type selected. Using default value: php" >&5 37186-echo "$as_me: WARNING: Invalid regex library type selected. Using default value: php" >&2;} 37187+ echo "configure: warning: Invalid regex library type selected. Using default value: php" 1>&2 37188 ;; 37189 esac 37190 37191-echo "$as_me:$LINENO: checking which regex library to use" >&5 37192-echo $ECHO_N "checking which regex library to use... $ECHO_C" >&6 37193-echo "$as_me:$LINENO: result: $REGEX_TYPE" >&5 37194-echo "${ECHO_T}$REGEX_TYPE" >&6 37195+echo $ac_n "checking which regex library to use""... $ac_c" 1>&6 37196+echo "configure:20525: checking which regex library to use" >&5 37197+echo "$ac_t""$REGEX_TYPE" 1>&6 37198 37199 if test "$REGEX_TYPE" = "php"; then 37200 ereg_regex_sources="regex/regcomp.c regex/regexec.c regex/regerror.c regex/regfree.c" 37201@@ -31313,15 +20538,15 @@ 37202 37203 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 37204 PHP_EREG_SHARED=no 37205- 37206- 37207+ 37208+ 37209 case ext/ereg in 37210 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 37211 /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 37212 *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 37213 esac 37214- 37215- 37216+ 37217+ 37218 37219 b_c_pre=$php_c_pre 37220 b_cxx_pre=$php_cxx_pre 37221@@ -31334,12 +20559,12 @@ 37222 37223 old_IFS=$IFS 37224 for ac_src in ereg.c $ereg_regex_sources; do 37225- 37226+ 37227 IFS=. 37228 set $ac_src 37229 ac_obj=$1 37230 IFS=$old_IFS 37231- 37232+ 37233 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 37234 37235 case $ac_src in 37236@@ -31363,14 +20588,14 @@ 37237 else 37238 if test "no" = "shared" || test "no" = "yes"; then 37239 PHP_EREG_SHARED=yes 37240- 37241+ 37242 case ext/ereg in 37243 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 37244 /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 37245 *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 37246 esac 37247- 37248- 37249+ 37250+ 37251 37252 b_c_pre=$shared_c_pre 37253 b_cxx_pre=$shared_cxx_pre 37254@@ -31383,12 +20608,12 @@ 37255 37256 old_IFS=$IFS 37257 for ac_src in ereg.c $ereg_regex_sources; do 37258- 37259+ 37260 IFS=. 37261 set $ac_src 37262 ac_obj=$1 37263 IFS=$old_IFS 37264- 37265+ 37266 shared_objects_ereg="$shared_objects_ereg $ac_bdir$ac_obj.lo" 37267 37268 case $ac_src in 37269@@ -31406,7 +20631,7 @@ 37270 37271 case $host_alias in 37272 *netware*) 37273- 37274+ 37275 install_modules="install-modules" 37276 37277 case $host_alias in 37278@@ -31416,7 +20641,7 @@ 37279 ;; 37280 *netware*) 37281 suffix=nlm 37282- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(EREG_SHARED_LIBADD)' 37283+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEREG, 3)_SHARED_LIBADD)' 37284 ;; 37285 *) 37286 suffix=la 37287@@ -31429,7 +20654,7 @@ 37288 else 37289 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpereg.$suffix" 37290 fi 37291- 37292+ 37293 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ereg" 37294 37295 cat >>Makefile.objects<<EOF 37296@@ -31443,7 +20668,7 @@ 37297 37298 ;; 37299 *) 37300- 37301+ 37302 install_modules="install-modules" 37303 37304 case $host_alias in 37305@@ -31453,7 +20678,7 @@ 37306 ;; 37307 *netware*) 37308 suffix=nlm 37309- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(G_SHARED_LIBADD)' 37310+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ereg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(EREG, 3)_SHARED_LIBADD)' 37311 ;; 37312 *) 37313 suffix=la 37314@@ -31466,7 +20691,7 @@ 37315 else 37316 PHP_MODULES="$PHP_MODULES \$(phplibdir)/ereg.$suffix" 37317 fi 37318- 37319+ 37320 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ereg" 37321 37322 cat >>Makefile.objects<<EOF 37323@@ -31480,10 +20705,9 @@ 37324 37325 ;; 37326 esac 37327- 37328-cat >>confdefs.h <<_ACEOF 37329+ cat >> confdefs.h <<EOF 37330 #define COMPILE_DL_EREG 1 37331-_ACEOF 37332+EOF 37333 37334 fi 37335 fi 37336@@ -31492,15 +20716,15 @@ 37337 PHP_EREG_SHARED=no 37338 case "$PHP_SAPI" in 37339 cgi|embed) 37340- 37341- 37342+ 37343+ 37344 case ext/ereg in 37345 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 37346 /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 37347 *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 37348 esac 37349- 37350- 37351+ 37352+ 37353 37354 b_c_pre=$php_c_pre 37355 b_cxx_pre=$php_cxx_pre 37356@@ -31513,12 +20737,12 @@ 37357 37358 old_IFS=$IFS 37359 for ac_src in ereg.c $ereg_regex_sources; do 37360- 37361+ 37362 IFS=. 37363 set $ac_src 37364 ac_obj=$1 37365 IFS=$old_IFS 37366- 37367+ 37368 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 37369 37370 case $ac_src in 37371@@ -31538,15 +20762,15 @@ 37372 EXT_STATIC="$EXT_STATIC ereg" 37373 ;; 37374 *) 37375- 37376- 37377+ 37378+ 37379 case ext/ereg in 37380 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 37381 /*) ac_srcdir=`echo "ext/ereg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 37382 *) ac_srcdir="$abs_srcdir/ext/ereg/"; ac_bdir="ext/ereg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 37383 esac 37384- 37385- 37386+ 37387+ 37388 37389 b_c_pre=$php_c_pre 37390 b_cxx_pre=$php_cxx_pre 37391@@ -31559,13 +20783,13 @@ 37392 37393 old_IFS=$IFS 37394 for ac_src in ereg.c $ereg_regex_sources; do 37395- 37396+ 37397 IFS=. 37398 set $ac_src 37399 ac_obj=$1 37400 IFS=$old_IFS 37401- 37402- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 37403+ 37404+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 37405 37406 case $ac_src in 37407 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 37408@@ -31585,178 +20809,147 @@ 37409 esac 37410 EXT_CLI_STATIC="$EXT_CLI_STATIC ereg" 37411 fi 37412- 37413- 37414+ 37415+ 37416 BUILD_DIR="$BUILD_DIR $ext_builddir" 37417- 37418+ 37419 37420 37421 if test "$ext_builddir" = "."; then 37422 PHP_PECL_EXTENSION=ereg 37423- 37424+ 37425 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 37426 37427 fi 37428 37429 37430- 37431+ 37432 header_path=ext/ereg 37433 for header_file in php_ereg.h php_regex.h $ereg_regex_headers; do 37434 hp_hf="$header_path/$header_file" 37435- 37436- 37437+ 37438+ 37439 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 37440- 37441+ 37442 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 37443 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37444 eval "INSTALLHEADERS$unique=set" 37445- 37446+ 37447 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 37448- 37449+ 37450 fi 37451 37452- done 37453- 37454+ done 37455+ 37456 37457 37458 if test "$REGEX_TYPE" = "php"; then 37459- 37460-cat >>confdefs.h <<\_ACEOF 37461+ cat >> confdefs.h <<\EOF 37462 #define HAVE_REGEX_T_RE_MAGIC 1 37463-_ACEOF 37464- 37465+EOF 37466 37467-cat >>confdefs.h <<\_ACEOF 37468+ cat >> confdefs.h <<\EOF 37469 #define HSREGEX 1 37470-_ACEOF 37471- 37472+EOF 37473 37474-cat >>confdefs.h <<\_ACEOF 37475+ cat >> confdefs.h <<\EOF 37476 #define REGEX 1 37477-_ACEOF 37478- 37479- 37480- 37481+EOF 37482+ 37483+ 37484+ 37485 $php_shtool mkdir -p $ext_builddir/regex 37486+ 37487 37488- 37489- 37490+ 37491 if test "$ext_srcdir/regex" != "/usr/include"; then 37492- 37493+ 37494 if test -z "$ext_srcdir/regex" || echo "$ext_srcdir/regex" | grep '^/' >/dev/null ; then 37495 ai_p=$ext_srcdir/regex 37496 else 37497- 37498+ 37499 ep_dir="`echo $ext_srcdir/regex|$SED 's%/*[^/][^/]*/*$%%'`" 37500- 37501+ 37502 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 37503 ai_p="$ep_realdir/`basename \"$ext_srcdir/regex\"`" 37504 fi 37505 37506- 37507- 37508+ 37509+ 37510 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 37511- 37512+ 37513 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 37514 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37515 eval "INCLUDEPATH$unique=set" 37516- 37517+ 37518 if test ""; then 37519 INCLUDES="-I$ai_p $INCLUDES" 37520 else 37521 INCLUDES="$INCLUDES -I$ai_p" 37522 fi 37523- 37524+ 37525 fi 37526 37527 fi 37528 37529 elif test "$REGEX_TYPE" = "system"; then 37530- 37531-cat >>confdefs.h <<\_ACEOF 37532+ cat >> confdefs.h <<\EOF 37533 #define REGEX 0 37534-_ACEOF 37535+EOF 37536 37537- echo "$as_me:$LINENO: checking whether field re_magic exists in struct regex_t" >&5 37538-echo $ECHO_N "checking whether field re_magic exists in struct regex_t... $ECHO_C" >&6 37539-if test "${ac_cv_regex_t_re_magic+set}" = set; then 37540- echo $ECHO_N "(cached) $ECHO_C" >&6 37541+ echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 37542+echo "configure:20902: checking whether field re_magic exists in struct regex_t" >&5 37543+if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then 37544+ echo $ac_n "(cached) $ac_c" 1>&6 37545 else 37546- 37547- cat >conftest.$ac_ext <<_ACEOF 37548-/* confdefs.h. */ 37549-_ACEOF 37550-cat confdefs.h >>conftest.$ac_ext 37551-cat >>conftest.$ac_ext <<_ACEOF 37552-/* end confdefs.h. */ 37553+ 37554+ cat > conftest.$ac_ext <<EOF 37555+#line 20908 "configure" 37556+#include "confdefs.h" 37557 #include <sys/types.h> 37558-#include <regex.h> 37559-int 37560-main () 37561-{ 37562+#include <regex.h> 37563+int main() { 37564 regex_t rt; rt.re_magic; 37565- ; 37566- return 0; 37567-} 37568-_ACEOF 37569-rm -f conftest.$ac_objext 37570-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 37571- (eval $ac_compile) 2>conftest.er1 37572- ac_status=$? 37573- grep -v '^ *+' conftest.er1 >conftest.err 37574- rm -f conftest.er1 37575- cat conftest.err >&5 37576- echo "$as_me:$LINENO: \$? = $ac_status" >&5 37577- (exit $ac_status); } && 37578- { ac_try='test -z "$ac_c_werror_flag" 37579- || test ! -s conftest.err' 37580- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 37581- (eval $ac_try) 2>&5 37582- ac_status=$? 37583- echo "$as_me:$LINENO: \$? = $ac_status" >&5 37584- (exit $ac_status); }; } && 37585- { ac_try='test -s conftest.$ac_objext' 37586- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 37587- (eval $ac_try) 2>&5 37588- ac_status=$? 37589- echo "$as_me:$LINENO: \$? = $ac_status" >&5 37590- (exit $ac_status); }; }; then 37591+; return 0; } 37592+EOF 37593+if { (eval echo configure:20916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 37594+ rm -rf conftest* 37595 ac_cv_regex_t_re_magic=yes 37596 else 37597- echo "$as_me: failed program was:" >&5 37598-sed 's/^/| /' conftest.$ac_ext >&5 37599- 37600-ac_cv_regex_t_re_magic=no 37601+ echo "configure: failed program was:" >&5 37602+ cat conftest.$ac_ext >&5 37603+ rm -rf conftest* 37604+ ac_cv_regex_t_re_magic=no 37605 fi 37606-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 37607+rm -f conftest* 37608 fi 37609-echo "$as_me:$LINENO: result: $ac_cv_regex_t_re_magic" >&5 37610-echo "${ECHO_T}$ac_cv_regex_t_re_magic" >&6 37611- if test "$ac_cv_regex_t_re_magic" = "yes"; then 37612 37613-cat >>confdefs.h <<\_ACEOF 37614-#define HAVE_REGEX_T_RE_MAGIC 37615-_ACEOF 37616- 37617- fi 37618-fi 37619+echo "$ac_t""$ac_cv_regex_t_re_magic" 1>&6 37620+ if test "$ac_cv_regex_t_re_magic" = "yes"; then 37621+ cat >> confdefs.h <<\EOF 37622+#define HAVE_REGEX_T_RE_MAGIC 37623+EOF 37624+ 37625+ fi 37626+fi 37627 37628 37629 37630 php_enable_libxml=yes 37631 37632-echo "$as_me:$LINENO: checking whether to enable LIBXML support" >&5 37633-echo $ECHO_N "checking whether to enable LIBXML support... $ECHO_C" >&6 37634+echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 37635+echo "configure:20942: checking whether to enable LIBXML support" >&5 37636 # Check whether --enable-libxml or --disable-libxml was given. 37637 if test "${enable_libxml+set}" = set; then 37638 enableval="$enable_libxml" 37639 PHP_LIBXML=$enableval 37640 else 37641- 37642+ 37643 PHP_LIBXML=yes 37644 test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL 37645 37646-fi; 37647+fi 37648+ 37649 37650 37651 ext_output="yes, shared" 37652@@ -31780,33 +20973,31 @@ 37653 37654 37655 37656-echo "$as_me:$LINENO: result: $ext_output" >&5 37657-echo "${ECHO_T}$ext_output" >&6 37658+echo "$ac_t""$ext_output" 1>&6 37659 37660 37661 37662 37663 if test -z "$PHP_LIBXML_DIR"; then 37664- 37665+ 37666 php_with_libxml_dir=no 37667 37668-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 37669-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 37670- 37671+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 37672+echo "configure:20987: checking libxml2 install dir" >&5 37673 # Check whether --with-libxml-dir or --without-libxml-dir was given. 37674 if test "${with_libxml_dir+set}" = set; then 37675 withval="$with_libxml_dir" 37676 PHP_LIBXML_DIR=$withval 37677 else 37678- 37679+ 37680 PHP_LIBXML_DIR=no 37681+ 37682 37683+fi 37684 37685-fi; 37686 37687 ext_output=$PHP_LIBXML_DIR 37688-echo "$as_me:$LINENO: result: $ext_output" >&5 37689-echo "${ECHO_T}$ext_output" >&6 37690+echo "$ac_t""$ext_output" 1>&6 37691 37692 37693 37694@@ -31816,13 +21007,13 @@ 37695 37696 ext_shared=no 37697 37698- 37699-echo "$as_me:$LINENO: checking for xml2-config path" >&5 37700-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 37701-if test "${ac_cv_php_xml2_config_path+set}" = set; then 37702- echo $ECHO_N "(cached) $ECHO_C" >&6 37703+ 37704+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 37705+echo "configure:21013: checking for xml2-config path" >&5 37706+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 37707+ echo $ac_n "(cached) $ac_c" 1>&6 37708 else 37709- 37710+ 37711 for i in $PHP_LIBXML_DIR /usr/local /usr; do 37712 if test -x "$i/bin/xml2-config"; then 37713 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 37714@@ -31831,8 +21022,8 @@ 37715 done 37716 37717 fi 37718-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 37719-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 37720+ 37721+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 37722 37723 if test -x "$ac_cv_php_xml2_config_path"; then 37724 XML2_CONFIG="$ac_cv_php_xml2_config_path" 37725@@ -31845,17 +21036,17 @@ 37726 if test "$LIBXML_VERSION" -ge "2006011"; then 37727 LIBXML_LIBS=`$XML2_CONFIG --libs` 37728 LIBXML_INCS=`$XML2_CONFIG --cflags` 37729- 37730+ 37731 for ac_i in $LIBXML_LIBS; do 37732 case $ac_i in 37733 -pthread) 37734 if test "$ext_shared" = "yes"; then 37735 LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -pthread" 37736 else 37737- 37738- 37739+ 37740+ 37741 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 37742- 37743+ 37744 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 37745 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37746 eval "EXTRA_LDFLAGS$unique=set" 37747@@ -31866,20 +21057,20 @@ 37748 ;; 37749 -l*) 37750 ac_ii=`echo $ac_i|cut -c 3-` 37751- 37752- 37753+ 37754+ 37755 case $ac_ii in 37756 c|c_r|pthread*) ;; 37757- *) 37758+ *) 37759 if test "$ext_shared" = "yes"; then 37760- LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii" 37761+ LIBXML_SHARED_LIBADD="$LIBXML_SHARED_LIBADD -l$ac_ii" 37762 else 37763- 37764- 37765+ 37766+ 37767 case $ac_ii in 37768 c|c_r|pthread*) ;; 37769- *) 37770- LIBS="$LIBS -l$ac_ii" 37771+ *) 37772+ LIBS="$LIBS -l$ac_ii" 37773 ;; 37774 esac 37775 37776@@ -31892,80 +21083,80 @@ 37777 ;; 37778 -L*) 37779 ac_ii=`echo $ac_i|cut -c 3-` 37780- 37781+ 37782 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 37783- 37784+ 37785 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 37786 ai_p=$ac_ii 37787 else 37788- 37789+ 37790 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 37791- 37792+ 37793 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 37794 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 37795 fi 37796 37797- 37798+ 37799 if test "$ext_shared" = "yes"; then 37800 LIBXML_SHARED_LIBADD="-L$ai_p $LIBXML_SHARED_LIBADD" 37801 test -n "$ld_runpath_switch" && LIBXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBXML_SHARED_LIBADD" 37802 else 37803- 37804- 37805- 37806+ 37807+ 37808+ 37809 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 37810- 37811+ 37812 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 37813 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37814 eval "LIBPATH$unique=set" 37815- 37816+ 37817 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 37818 LDFLAGS="$LDFLAGS -L$ai_p" 37819 PHP_RPATHS="$PHP_RPATHS $ai_p" 37820- 37821+ 37822 fi 37823 37824 37825 fi 37826- 37827+ 37828 fi 37829 37830 ;; 37831 esac 37832 done 37833 37834- 37835+ 37836 for ac_i in $LIBXML_INCS; do 37837 case $ac_i in 37838 -I*) 37839 ac_ii=`echo $ac_i|cut -c 3-` 37840- 37841+ 37842 if test "$ac_ii" != "/usr/include"; then 37843- 37844+ 37845 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 37846 ai_p=$ac_ii 37847 else 37848- 37849+ 37850 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 37851- 37852+ 37853 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 37854 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 37855 fi 37856 37857- 37858- 37859+ 37860+ 37861 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 37862- 37863+ 37864 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 37865 if test -n "$unique" && test "`eval $cmd`" = "" ; then 37866 eval "INCLUDEPATH$unique=set" 37867- 37868+ 37869 if test ""; then 37870 INCLUDES="-I$ai_p $INCLUDES" 37871 else 37872 INCLUDES="$INCLUDES -I$ai_p" 37873 fi 37874- 37875+ 37876 fi 37877 37878 fi 37879@@ -31975,92 +21166,74 @@ 37880 done 37881 37882 37883- echo "$as_me:$LINENO: checking whether libxml build works" >&5 37884-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 37885-if test "${php_cv_libxml_build_works+set}" = set; then 37886- echo $ECHO_N "(cached) $ECHO_C" >&6 37887+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 37888+echo "configure:21171: checking whether libxml build works" >&5 37889+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 37890+ echo $ac_n "(cached) $ac_c" 1>&6 37891 else 37892- 37893- 37894+ 37895+ 37896 old_LIBS=$LIBS 37897 LIBS=" 37898 $LIBXML_SHARED_LIBADD 37899 $LIBS" 37900 if test "$cross_compiling" = yes; then 37901- 37902+ 37903 LIBS=$old_LIBS 37904- 37905+ 37906 else 37907- cat >conftest.$ac_ext <<_ACEOF 37908-/* confdefs.h. */ 37909-_ACEOF 37910-cat confdefs.h >>conftest.$ac_ext 37911-cat >>conftest.$ac_ext <<_ACEOF 37912-/* end confdefs.h. */ 37913- 37914+ cat > conftest.$ac_ext <<EOF 37915+#line 21187 "configure" 37916+#include "confdefs.h" 37917 37918+ 37919 char xmlInitParser(); 37920 int main() { 37921 xmlInitParser(); 37922 return 0; 37923 } 37924- 37925-_ACEOF 37926-rm -f conftest$ac_exeext 37927-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 37928- (eval $ac_link) 2>&5 37929- ac_status=$? 37930- echo "$as_me:$LINENO: \$? = $ac_status" >&5 37931- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 37932- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 37933- (eval $ac_try) 2>&5 37934- ac_status=$? 37935- echo "$as_me:$LINENO: \$? = $ac_status" >&5 37936- (exit $ac_status); }; }; then 37937- 37938+ 37939+EOF 37940+if { (eval echo configure:21198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 37941+then 37942+ 37943 LIBS=$old_LIBS 37944- 37945+ 37946 php_cv_libxml_build_works=yes 37947- 37948- 37949+ 37950+ 37951 else 37952- echo "$as_me: program exited with status $ac_status" >&5 37953-echo "$as_me: failed program was:" >&5 37954-sed 's/^/| /' conftest.$ac_ext >&5 37955- 37956-( exit $ac_status ) 37957- 37958+ echo "configure: failed program was:" >&5 37959+ cat conftest.$ac_ext >&5 37960+ rm -fr conftest* 37961+ 37962 LIBS=$old_LIBS 37963- 37964- echo "$as_me:$LINENO: result: no" >&5 37965-echo "${ECHO_T}no" >&6 37966- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 37967-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 37968- { (exit 1); exit 1; }; } 37969- 37970- 37971+ 37972+ echo "$ac_t""no" 1>&6 37973+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 37974+ 37975+ 37976 fi 37977-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 37978+rm -fr conftest* 37979 fi 37980 37981 37982+ 37983 fi 37984-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 37985-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 37986- if test "$php_cv_libxml_build_works" = "yes"; then 37987 37988-cat >>confdefs.h <<\_ACEOF 37989+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 37990+ if test "$php_cv_libxml_build_works" = "yes"; then 37991+ cat >> confdefs.h <<\EOF 37992 #define HAVE_LIBXML 1 37993-_ACEOF 37994+EOF 37995 37996 fi 37997- 37998- 37999-cat >>confdefs.h <<\_ACEOF 38000+ 38001+ cat >> confdefs.h <<\EOF 38002 #define HAVE_LIBXML 1 38003-_ACEOF 38004- 38005+EOF 38006 38007+ 38008 ext_builddir=ext/libxml 38009 ext_srcdir=$abs_srcdir/ext/libxml 38010 38011@@ -32068,15 +21241,15 @@ 38012 38013 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 38014 PHP_LIBXML_SHARED=no 38015- 38016- 38017+ 38018+ 38019 case ext/libxml in 38020 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38021 /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38022 *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38023 esac 38024- 38025- 38026+ 38027+ 38028 38029 b_c_pre=$php_c_pre 38030 b_cxx_pre=$php_cxx_pre 38031@@ -32089,12 +21262,12 @@ 38032 38033 old_IFS=$IFS 38034 for ac_src in libxml.c; do 38035- 38036+ 38037 IFS=. 38038 set $ac_src 38039 ac_obj=$1 38040 IFS=$old_IFS 38041- 38042+ 38043 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38044 38045 case $ac_src in 38046@@ -32118,14 +21291,14 @@ 38047 else 38048 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 38049 PHP_LIBXML_SHARED=yes 38050- 38051+ 38052 case ext/libxml in 38053 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38054 /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38055 *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38056 esac 38057- 38058- 38059+ 38060+ 38061 38062 b_c_pre=$shared_c_pre 38063 b_cxx_pre=$shared_cxx_pre 38064@@ -32138,12 +21311,12 @@ 38065 38066 old_IFS=$IFS 38067 for ac_src in libxml.c; do 38068- 38069+ 38070 IFS=. 38071 set $ac_src 38072 ac_obj=$1 38073 IFS=$old_IFS 38074- 38075+ 38076 shared_objects_libxml="$shared_objects_libxml $ac_bdir$ac_obj.lo" 38077 38078 case $ac_src in 38079@@ -32161,7 +21334,7 @@ 38080 38081 case $host_alias in 38082 *netware*) 38083- 38084+ 38085 install_modules="install-modules" 38086 38087 case $host_alias in 38088@@ -32171,7 +21344,7 @@ 38089 ;; 38090 *netware*) 38091 suffix=nlm 38092- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(LIBXML_SHARED_LIBADD)' 38093+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLIBXML, 3)_SHARED_LIBADD)' 38094 ;; 38095 *) 38096 suffix=la 38097@@ -32184,7 +21357,7 @@ 38098 else 38099 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibxml.$suffix" 38100 fi 38101- 38102+ 38103 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libxml" 38104 38105 cat >>Makefile.objects<<EOF 38106@@ -32198,7 +21371,7 @@ 38107 38108 ;; 38109 *) 38110- 38111+ 38112 install_modules="install-modules" 38113 38114 case $host_alias in 38115@@ -32208,7 +21381,7 @@ 38116 ;; 38117 *netware*) 38118 suffix=nlm 38119- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(XML_SHARED_LIBADD)' 38120+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libxml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LIBXML, 3)_SHARED_LIBADD)' 38121 ;; 38122 *) 38123 suffix=la 38124@@ -32221,7 +21394,7 @@ 38125 else 38126 PHP_MODULES="$PHP_MODULES \$(phplibdir)/libxml.$suffix" 38127 fi 38128- 38129+ 38130 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libxml" 38131 38132 cat >>Makefile.objects<<EOF 38133@@ -32235,10 +21408,9 @@ 38134 38135 ;; 38136 esac 38137- 38138-cat >>confdefs.h <<_ACEOF 38139+ cat >> confdefs.h <<EOF 38140 #define COMPILE_DL_LIBXML 1 38141-_ACEOF 38142+EOF 38143 38144 fi 38145 fi 38146@@ -32247,15 +21419,15 @@ 38147 PHP_LIBXML_SHARED=no 38148 case "$PHP_SAPI" in 38149 cgi|embed) 38150- 38151- 38152+ 38153+ 38154 case ext/libxml in 38155 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38156 /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38157 *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38158 esac 38159- 38160- 38161+ 38162+ 38163 38164 b_c_pre=$php_c_pre 38165 b_cxx_pre=$php_cxx_pre 38166@@ -32268,12 +21440,12 @@ 38167 38168 old_IFS=$IFS 38169 for ac_src in libxml.c; do 38170- 38171+ 38172 IFS=. 38173 set $ac_src 38174 ac_obj=$1 38175 IFS=$old_IFS 38176- 38177+ 38178 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38179 38180 case $ac_src in 38181@@ -32293,15 +21465,15 @@ 38182 EXT_STATIC="$EXT_STATIC libxml" 38183 ;; 38184 *) 38185- 38186- 38187+ 38188+ 38189 case ext/libxml in 38190 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38191 /*) ac_srcdir=`echo "ext/libxml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38192 *) ac_srcdir="$abs_srcdir/ext/libxml/"; ac_bdir="ext/libxml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38193 esac 38194- 38195- 38196+ 38197+ 38198 38199 b_c_pre=$php_c_pre 38200 b_cxx_pre=$php_cxx_pre 38201@@ -32314,13 +21486,13 @@ 38202 38203 old_IFS=$IFS 38204 for ac_src in libxml.c; do 38205- 38206+ 38207 IFS=. 38208 set $ac_src 38209 ac_obj=$1 38210 IFS=$old_IFS 38211- 38212- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 38213+ 38214+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38215 38216 case $ac_src in 38217 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 38218@@ -32340,48 +21512,44 @@ 38219 esac 38220 EXT_CLI_STATIC="$EXT_CLI_STATIC libxml" 38221 fi 38222- 38223- 38224+ 38225+ 38226 BUILD_DIR="$BUILD_DIR $ext_builddir" 38227- 38228+ 38229 38230 38231 if test "$ext_builddir" = "."; then 38232 PHP_PECL_EXTENSION=libxml 38233- 38234+ 38235 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 38236 38237 fi 38238 38239- 38240- 38241+ 38242+ 38243 for header_file in ext/libxml/php_libxml.h; do 38244- 38245- 38246+ 38247+ 38248 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 38249- 38250+ 38251 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 38252 if test -n "$unique" && test "`eval $cmd`" = "" ; then 38253 eval "INSTALLHEADERS$unique=set" 38254- 38255+ 38256 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 38257- 38258+ 38259 fi 38260 38261- done 38262- 38263- 38264+ done 38265+ 38266 38267+ 38268 else 38269- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 38270-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 38271- { (exit 1); exit 1; }; } 38272+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 38273 fi 38274-else 38275- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 38276-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 38277- { (exit 1); exit 1; }; } 38278- 38279+else 38280+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 38281+ 38282 fi 38283 38284 fi 38285@@ -32390,19 +21558,19 @@ 38286 38287 php_with_openssl=no 38288 38289-echo "$as_me:$LINENO: checking for OpenSSL support" >&5 38290-echo $ECHO_N "checking for OpenSSL support... $ECHO_C" >&6 38291- 38292+echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 38293+echo "configure:21563: checking for OpenSSL support" >&5 38294 # Check whether --with-openssl or --without-openssl was given. 38295 if test "${with_openssl+set}" = set; then 38296 withval="$with_openssl" 38297 PHP_OPENSSL=$withval 38298 else 38299- 38300+ 38301 PHP_OPENSSL=no 38302 test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL 38303 38304-fi; 38305+fi 38306+ 38307 38308 38309 ext_output="yes, shared" 38310@@ -32426,8 +21594,7 @@ 38311 38312 38313 38314-echo "$as_me:$LINENO: result: $ext_output" >&5 38315-echo "${ECHO_T}$ext_output" >&6 38316+echo "$ac_t""$ext_output" 1>&6 38317 38318 38319 38320@@ -32435,29 +21602,28 @@ 38321 38322 php_with_kerberos=no 38323 38324-echo "$as_me:$LINENO: checking for Kerberos support" >&5 38325-echo $ECHO_N "checking for Kerberos support... $ECHO_C" >&6 38326- 38327+echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 38328+echo "configure:21607: checking for Kerberos support" >&5 38329 # Check whether --with-kerberos or --without-kerberos was given. 38330 if test "${with_kerberos+set}" = set; then 38331 withval="$with_kerberos" 38332 PHP_KERBEROS=$withval 38333 else 38334- 38335+ 38336 PHP_KERBEROS=no 38337+ 38338 38339+fi 38340 38341-fi; 38342 38343 ext_output=$PHP_KERBEROS 38344-echo "$as_me:$LINENO: result: $ext_output" >&5 38345-echo "${ECHO_T}$ext_output" >&6 38346+echo "$ac_t""$ext_output" 1>&6 38347 38348 38349 38350 38351 if test "$PHP_OPENSSL" != "no"; then 38352- 38353+ 38354 ext_builddir=ext/openssl 38355 ext_srcdir=$abs_srcdir/ext/openssl 38356 38357@@ -32465,15 +21631,15 @@ 38358 38359 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 38360 PHP_OPENSSL_SHARED=no 38361- 38362- 38363+ 38364+ 38365 case ext/openssl in 38366 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38367 /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38368 *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38369 esac 38370- 38371- 38372+ 38373+ 38374 38375 b_c_pre=$php_c_pre 38376 b_cxx_pre=$php_cxx_pre 38377@@ -32486,12 +21652,12 @@ 38378 38379 old_IFS=$IFS 38380 for ac_src in openssl.c xp_ssl.c; do 38381- 38382+ 38383 IFS=. 38384 set $ac_src 38385 ac_obj=$1 38386 IFS=$old_IFS 38387- 38388+ 38389 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38390 38391 case $ac_src in 38392@@ -32515,14 +21681,14 @@ 38393 else 38394 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 38395 PHP_OPENSSL_SHARED=yes 38396- 38397+ 38398 case ext/openssl in 38399 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38400 /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38401 *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38402 esac 38403- 38404- 38405+ 38406+ 38407 38408 b_c_pre=$shared_c_pre 38409 b_cxx_pre=$shared_cxx_pre 38410@@ -32535,12 +21701,12 @@ 38411 38412 old_IFS=$IFS 38413 for ac_src in openssl.c xp_ssl.c; do 38414- 38415+ 38416 IFS=. 38417 set $ac_src 38418 ac_obj=$1 38419 IFS=$old_IFS 38420- 38421+ 38422 shared_objects_openssl="$shared_objects_openssl $ac_bdir$ac_obj.lo" 38423 38424 case $ac_src in 38425@@ -32558,7 +21724,7 @@ 38426 38427 case $host_alias in 38428 *netware*) 38429- 38430+ 38431 install_modules="install-modules" 38432 38433 case $host_alias in 38434@@ -32568,7 +21734,7 @@ 38435 ;; 38436 *netware*) 38437 suffix=nlm 38438- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(OPENSSL_SHARED_LIBADD)' 38439+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOPENSSL, 3)_SHARED_LIBADD)' 38440 ;; 38441 *) 38442 suffix=la 38443@@ -32581,7 +21747,7 @@ 38444 else 38445 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpopenssl.$suffix" 38446 fi 38447- 38448+ 38449 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_openssl" 38450 38451 cat >>Makefile.objects<<EOF 38452@@ -32595,7 +21761,7 @@ 38453 38454 ;; 38455 *) 38456- 38457+ 38458 install_modules="install-modules" 38459 38460 case $host_alias in 38461@@ -32605,7 +21771,7 @@ 38462 ;; 38463 *netware*) 38464 suffix=nlm 38465- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(NSSL_SHARED_LIBADD)' 38466+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_openssl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OPENSSL, 3)_SHARED_LIBADD)' 38467 ;; 38468 *) 38469 suffix=la 38470@@ -32618,7 +21784,7 @@ 38471 else 38472 PHP_MODULES="$PHP_MODULES \$(phplibdir)/openssl.$suffix" 38473 fi 38474- 38475+ 38476 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_openssl" 38477 38478 cat >>Makefile.objects<<EOF 38479@@ -32632,10 +21798,9 @@ 38480 38481 ;; 38482 esac 38483- 38484-cat >>confdefs.h <<_ACEOF 38485+ cat >> confdefs.h <<EOF 38486 #define COMPILE_DL_OPENSSL 1 38487-_ACEOF 38488+EOF 38489 38490 fi 38491 fi 38492@@ -32644,15 +21809,15 @@ 38493 PHP_OPENSSL_SHARED=no 38494 case "$PHP_SAPI" in 38495 cgi|embed) 38496- 38497- 38498+ 38499+ 38500 case ext/openssl in 38501 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38502 /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38503 *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38504 esac 38505- 38506- 38507+ 38508+ 38509 38510 b_c_pre=$php_c_pre 38511 b_cxx_pre=$php_cxx_pre 38512@@ -32665,12 +21830,12 @@ 38513 38514 old_IFS=$IFS 38515 for ac_src in openssl.c xp_ssl.c; do 38516- 38517+ 38518 IFS=. 38519 set $ac_src 38520 ac_obj=$1 38521 IFS=$old_IFS 38522- 38523+ 38524 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38525 38526 case $ac_src in 38527@@ -32690,15 +21855,15 @@ 38528 EXT_STATIC="$EXT_STATIC openssl" 38529 ;; 38530 *) 38531- 38532- 38533+ 38534+ 38535 case ext/openssl in 38536 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 38537 /*) ac_srcdir=`echo "ext/openssl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 38538 *) ac_srcdir="$abs_srcdir/ext/openssl/"; ac_bdir="ext/openssl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 38539 esac 38540- 38541- 38542+ 38543+ 38544 38545 b_c_pre=$php_c_pre 38546 b_cxx_pre=$php_cxx_pre 38547@@ -32711,13 +21876,13 @@ 38548 38549 old_IFS=$IFS 38550 for ac_src in openssl.c xp_ssl.c; do 38551- 38552+ 38553 IFS=. 38554 set $ac_src 38555 ac_obj=$1 38556 IFS=$old_IFS 38557- 38558- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 38559+ 38560+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 38561 38562 case $ac_src in 38563 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 38564@@ -32737,25 +21902,25 @@ 38565 esac 38566 EXT_CLI_STATIC="$EXT_CLI_STATIC openssl" 38567 fi 38568- 38569- 38570+ 38571+ 38572 BUILD_DIR="$BUILD_DIR $ext_builddir" 38573- 38574+ 38575 38576 38577 if test "$ext_builddir" = "."; then 38578 PHP_PECL_EXTENSION=openssl 38579- 38580+ 38581 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 38582 38583 fi 38584 38585- 38586+ 38587 PHP_VAR_SUBST="$PHP_VAR_SUBST OPENSSL_SHARED_LIBADD" 38588 38589 38590 if test "$PHP_KERBEROS" != "no"; then 38591- 38592+ 38593 found_kerberos=no 38594 unset KERBEROS_CFLAGS 38595 unset KERBEROS_LIBS 38596@@ -32763,43 +21928,38 @@ 38597 if test -z "$KRB5_CONFIG"; then 38598 # Extract the first word of "krb5-config", so it can be a program name with args. 38599 set dummy krb5-config; ac_word=$2 38600-echo "$as_me:$LINENO: checking for $ac_word" >&5 38601-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 38602-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then 38603- echo $ECHO_N "(cached) $ECHO_C" >&6 38604+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 38605+echo "configure:21933: checking for $ac_word" >&5 38606+if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then 38607+ echo $ac_n "(cached) $ac_c" 1>&6 38608 else 38609- case $KRB5_CONFIG in 38610- [\\/]* | ?:[\\/]*) 38611+ case "$KRB5_CONFIG" in 38612+ /*) 38613 ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. 38614 ;; 38615+ ?:/*) 38616+ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path. 38617+ ;; 38618 *) 38619- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 38620-as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" 38621-for as_dir in $as_dummy 38622-do 38623- IFS=$as_save_IFS 38624- test -z "$as_dir" && as_dir=. 38625- for ac_exec_ext in '' $ac_executable_extensions; do 38626- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 38627- ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" 38628- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 38629- break 2 38630- fi 38631-done 38632-done 38633- 38634+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 38635+ ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" 38636+ for ac_dir in $ac_dummy; do 38637+ test -z "$ac_dir" && ac_dir=. 38638+ if test -f $ac_dir/$ac_word; then 38639+ ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word" 38640+ break 38641+ fi 38642+ done 38643+ IFS="$ac_save_ifs" 38644 test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no" 38645 ;; 38646 esac 38647 fi 38648-KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG 38649- 38650+KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG" 38651 if test -n "$KRB5_CONFIG"; then 38652- echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5 38653-echo "${ECHO_T}$KRB5_CONFIG" >&6 38654+ echo "$ac_t""$KRB5_CONFIG" 1>&6 38655 else 38656- echo "$as_me:$LINENO: result: no" >&5 38657-echo "${ECHO_T}no" >&6 38658+ echo "$ac_t""no" 1>&6 38659 fi 38660 38661 fi 38662@@ -32810,17 +21970,17 @@ 38663 38664 if test -n "$KERBEROS_LIBS"; then 38665 found_kerberos=yes 38666- 38667+ 38668 for ac_i in $KERBEROS_LIBS; do 38669 case $ac_i in 38670 -pthread) 38671 if test "$ext_shared" = "yes"; then 38672 OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -pthread" 38673 else 38674- 38675- 38676+ 38677+ 38678 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 38679- 38680+ 38681 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 38682 if test -n "$unique" && test "`eval $cmd`" = "" ; then 38683 eval "EXTRA_LDFLAGS$unique=set" 38684@@ -32831,20 +21991,20 @@ 38685 ;; 38686 -l*) 38687 ac_ii=`echo $ac_i|cut -c 3-` 38688- 38689- 38690+ 38691+ 38692 case $ac_ii in 38693 c|c_r|pthread*) ;; 38694- *) 38695+ *) 38696 if test "$ext_shared" = "yes"; then 38697- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 38698+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 38699 else 38700- 38701- 38702+ 38703+ 38704 case $ac_ii in 38705 c|c_r|pthread*) ;; 38706- *) 38707- LIBS="$LIBS -l$ac_ii" 38708+ *) 38709+ LIBS="$LIBS -l$ac_ii" 38710 ;; 38711 esac 38712 38713@@ -32857,80 +22017,80 @@ 38714 ;; 38715 -L*) 38716 ac_ii=`echo $ac_i|cut -c 3-` 38717- 38718+ 38719 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 38720- 38721+ 38722 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 38723 ai_p=$ac_ii 38724 else 38725- 38726+ 38727 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 38728- 38729+ 38730 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 38731 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 38732 fi 38733 38734- 38735+ 38736 if test "$ext_shared" = "yes"; then 38737 OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" 38738 test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" 38739 else 38740- 38741- 38742- 38743+ 38744+ 38745+ 38746 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 38747- 38748+ 38749 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 38750 if test -n "$unique" && test "`eval $cmd`" = "" ; then 38751 eval "LIBPATH$unique=set" 38752- 38753+ 38754 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 38755 LDFLAGS="$LDFLAGS -L$ai_p" 38756 PHP_RPATHS="$PHP_RPATHS $ai_p" 38757- 38758+ 38759 fi 38760 38761 38762 fi 38763- 38764+ 38765 fi 38766 38767 ;; 38768 esac 38769 done 38770 38771- 38772+ 38773 for ac_i in $KERBEROS_CFLAGS; do 38774 case $ac_i in 38775 -I*) 38776 ac_ii=`echo $ac_i|cut -c 3-` 38777- 38778+ 38779 if test "$ac_ii" != "/usr/include"; then 38780- 38781+ 38782 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 38783 ai_p=$ac_ii 38784 else 38785- 38786+ 38787 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 38788- 38789+ 38790 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 38791 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 38792 fi 38793 38794- 38795- 38796+ 38797+ 38798 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 38799- 38800+ 38801 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 38802 if test -n "$unique" && test "`eval $cmd`" = "" ; then 38803 eval "INCLUDEPATH$unique=set" 38804- 38805+ 38806 if test ""; then 38807 INCLUDES="-I$ai_p $INCLUDES" 38808 else 38809 INCLUDES="$INCLUDES -I$ai_p" 38810 fi 38811- 38812+ 38813 fi 38814 38815 fi 38816@@ -32957,58 +22117,58 @@ 38817 38818 if test "$PHP_KERBEROS_DIR"; then 38819 found_kerberos=yes 38820- 38821+ 38822 if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then 38823- 38824+ 38825 if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 38826 ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR 38827 else 38828- 38829+ 38830 ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 38831- 38832+ 38833 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 38834 ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`" 38835 fi 38836 38837- 38838+ 38839 if test "$ext_shared" = "yes"; then 38840 OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" 38841 test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" 38842 else 38843- 38844- 38845- 38846+ 38847+ 38848+ 38849 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 38850- 38851+ 38852 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 38853 if test -n "$unique" && test "`eval $cmd`" = "" ; then 38854 eval "LIBPATH$unique=set" 38855- 38856+ 38857 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 38858 LDFLAGS="$LDFLAGS -L$ai_p" 38859 PHP_RPATHS="$PHP_RPATHS $ai_p" 38860- 38861+ 38862 fi 38863 38864 38865 fi 38866- 38867+ 38868 fi 38869 38870- 38871- 38872+ 38873+ 38874 case gssapi_krb5 in 38875 c|c_r|pthread*) ;; 38876- *) 38877+ *) 38878 if test "$ext_shared" = "yes"; then 38879- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5" 38880+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lgssapi_krb5" 38881 else 38882- 38883- 38884+ 38885+ 38886 case gssapi_krb5 in 38887 c|c_r|pthread*) ;; 38888- *) 38889- LIBS="$LIBS -lgssapi_krb5" 38890+ *) 38891+ LIBS="$LIBS -lgssapi_krb5" 38892 ;; 38893 esac 38894 38895@@ -33018,20 +22178,20 @@ 38896 esac 38897 38898 38899- 38900- 38901+ 38902+ 38903 case krb5 in 38904 c|c_r|pthread*) ;; 38905- *) 38906+ *) 38907 if test "$ext_shared" = "yes"; then 38908- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5" 38909+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lkrb5" 38910 else 38911- 38912- 38913+ 38914+ 38915 case krb5 in 38916 c|c_r|pthread*) ;; 38917- *) 38918- LIBS="$LIBS -lkrb5" 38919+ *) 38920+ LIBS="$LIBS -lkrb5" 38921 ;; 38922 esac 38923 38924@@ -33041,20 +22201,20 @@ 38925 esac 38926 38927 38928- 38929- 38930+ 38931+ 38932 case k5crypto in 38933 c|c_r|pthread*) ;; 38934- *) 38935+ *) 38936 if test "$ext_shared" = "yes"; then 38937- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto" 38938+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lk5crypto" 38939 else 38940- 38941- 38942+ 38943+ 38944 case k5crypto in 38945 c|c_r|pthread*) ;; 38946- *) 38947- LIBS="$LIBS -lk5crypto" 38948+ *) 38949+ LIBS="$LIBS -lk5crypto" 38950 ;; 38951 esac 38952 38953@@ -33064,20 +22224,20 @@ 38954 esac 38955 38956 38957- 38958- 38959+ 38960+ 38961 case com_err in 38962 c|c_r|pthread*) ;; 38963- *) 38964+ *) 38965 if test "$ext_shared" = "yes"; then 38966- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err" 38967+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -lcom_err" 38968 else 38969- 38970- 38971+ 38972+ 38973 case com_err in 38974 c|c_r|pthread*) ;; 38975- *) 38976- LIBS="$LIBS -lcom_err" 38977+ *) 38978+ LIBS="$LIBS -lcom_err" 38979 ;; 38980 esac 38981 38982@@ -33087,33 +22247,33 @@ 38983 esac 38984 38985 38986- 38987+ 38988 if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then 38989- 38990+ 38991 if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then 38992 ai_p=$PHP_KERBEROS_DIR/include 38993 else 38994- 38995+ 38996 ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 38997- 38998+ 38999 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39000 ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`" 39001 fi 39002 39003- 39004- 39005+ 39006+ 39007 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39008- 39009+ 39010 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 39011 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39012 eval "INCLUDEPATH$unique=set" 39013- 39014+ 39015 if test ""; then 39016 INCLUDES="-I$ai_p $INCLUDES" 39017 else 39018 INCLUDES="$INCLUDES -I$ai_p" 39019 fi 39020- 39021+ 39022 fi 39023 39024 fi 39025@@ -33128,152 +22288,94 @@ 39026 39027 fi 39028 39029- echo "$as_me:$LINENO: checking for DSA_get_default_method in -lssl" >&5 39030-echo $ECHO_N "checking for DSA_get_default_method in -lssl... $ECHO_C" >&6 39031-if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then 39032- echo $ECHO_N "(cached) $ECHO_C" >&6 39033+ echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 39034+echo "configure:22293: checking for DSA_get_default_method in -lssl" >&5 39035+ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'` 39036+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 39037+ echo $ac_n "(cached) $ac_c" 1>&6 39038 else 39039- ac_check_lib_save_LIBS=$LIBS 39040+ ac_save_LIBS="$LIBS" 39041 LIBS="-lssl $LIBS" 39042-cat >conftest.$ac_ext <<_ACEOF 39043-/* confdefs.h. */ 39044-_ACEOF 39045-cat confdefs.h >>conftest.$ac_ext 39046-cat >>conftest.$ac_ext <<_ACEOF 39047-/* end confdefs.h. */ 39048- 39049+cat > conftest.$ac_ext <<EOF 39050+#line 22301 "configure" 39051+#include "confdefs.h" 39052 /* Override any gcc2 internal prototype to avoid an error. */ 39053-#ifdef __cplusplus 39054-extern "C" 39055-#endif 39056 /* We use char because int might match the return type of a gcc2 39057- builtin and then its argument prototype would still apply. */ 39058-char DSA_get_default_method (); 39059-int 39060-main () 39061-{ 39062-DSA_get_default_method (); 39063- ; 39064- return 0; 39065-} 39066-_ACEOF 39067-rm -f conftest.$ac_objext conftest$ac_exeext 39068-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 39069- (eval $ac_link) 2>conftest.er1 39070- ac_status=$? 39071- grep -v '^ *+' conftest.er1 >conftest.err 39072- rm -f conftest.er1 39073- cat conftest.err >&5 39074- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39075- (exit $ac_status); } && 39076- { ac_try='test -z "$ac_c_werror_flag" 39077- || test ! -s conftest.err' 39078- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39079- (eval $ac_try) 2>&5 39080- ac_status=$? 39081- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39082- (exit $ac_status); }; } && 39083- { ac_try='test -s conftest$ac_exeext' 39084- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39085- (eval $ac_try) 2>&5 39086- ac_status=$? 39087- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39088- (exit $ac_status); }; }; then 39089- ac_cv_lib_ssl_DSA_get_default_method=yes 39090-else 39091- echo "$as_me: failed program was:" >&5 39092-sed 's/^/| /' conftest.$ac_ext >&5 39093- 39094-ac_cv_lib_ssl_DSA_get_default_method=no 39095-fi 39096-rm -f conftest.err conftest.$ac_objext \ 39097- conftest$ac_exeext conftest.$ac_ext 39098-LIBS=$ac_check_lib_save_LIBS 39099-fi 39100-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5 39101-echo "${ECHO_T}$ac_cv_lib_ssl_DSA_get_default_method" >&6 39102-if test $ac_cv_lib_ssl_DSA_get_default_method = yes; then 39103+ builtin and then its argument prototype would still apply. */ 39104+char DSA_get_default_method(); 39105+ 39106+int main() { 39107+DSA_get_default_method() 39108+; return 0; } 39109+EOF 39110+if { (eval echo configure:22312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 39111+ rm -rf conftest* 39112+ eval "ac_cv_lib_$ac_lib_var=yes" 39113+else 39114+ echo "configure: failed program was:" >&5 39115+ cat conftest.$ac_ext >&5 39116+ rm -rf conftest* 39117+ eval "ac_cv_lib_$ac_lib_var=no" 39118+fi 39119+rm -f conftest* 39120+LIBS="$ac_save_LIBS" 39121 39122-cat >>confdefs.h <<\_ACEOF 39123+fi 39124+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 39125+ echo "$ac_t""yes" 1>&6 39126+ cat >> confdefs.h <<\EOF 39127 #define HAVE_DSA_DEFAULT_METHOD 1 39128-_ACEOF 39129+EOF 39130 39131+else 39132+ echo "$ac_t""no" 1>&6 39133 fi 39134 39135- echo "$as_me:$LINENO: checking for X509_free in -lcrypto" >&5 39136-echo $ECHO_N "checking for X509_free in -lcrypto... $ECHO_C" >&6 39137-if test "${ac_cv_lib_crypto_X509_free+set}" = set; then 39138- echo $ECHO_N "(cached) $ECHO_C" >&6 39139+ echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6 39140+echo "configure:22336: checking for X509_free in -lcrypto" >&5 39141+ac_lib_var=`echo crypto'_'X509_free | sed 'y%./+-%__p_%'` 39142+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 39143+ echo $ac_n "(cached) $ac_c" 1>&6 39144 else 39145- ac_check_lib_save_LIBS=$LIBS 39146+ ac_save_LIBS="$LIBS" 39147 LIBS="-lcrypto $LIBS" 39148-cat >conftest.$ac_ext <<_ACEOF 39149-/* confdefs.h. */ 39150-_ACEOF 39151-cat confdefs.h >>conftest.$ac_ext 39152-cat >>conftest.$ac_ext <<_ACEOF 39153-/* end confdefs.h. */ 39154- 39155+cat > conftest.$ac_ext <<EOF 39156+#line 22344 "configure" 39157+#include "confdefs.h" 39158 /* Override any gcc2 internal prototype to avoid an error. */ 39159-#ifdef __cplusplus 39160-extern "C" 39161-#endif 39162 /* We use char because int might match the return type of a gcc2 39163- builtin and then its argument prototype would still apply. */ 39164-char X509_free (); 39165-int 39166-main () 39167-{ 39168-X509_free (); 39169- ; 39170- return 0; 39171-} 39172-_ACEOF 39173-rm -f conftest.$ac_objext conftest$ac_exeext 39174-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 39175- (eval $ac_link) 2>conftest.er1 39176- ac_status=$? 39177- grep -v '^ *+' conftest.er1 >conftest.err 39178- rm -f conftest.er1 39179- cat conftest.err >&5 39180- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39181- (exit $ac_status); } && 39182- { ac_try='test -z "$ac_c_werror_flag" 39183- || test ! -s conftest.err' 39184- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39185- (eval $ac_try) 2>&5 39186- ac_status=$? 39187- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39188- (exit $ac_status); }; } && 39189- { ac_try='test -s conftest$ac_exeext' 39190- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39191- (eval $ac_try) 2>&5 39192- ac_status=$? 39193- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39194- (exit $ac_status); }; }; then 39195- ac_cv_lib_crypto_X509_free=yes 39196-else 39197- echo "$as_me: failed program was:" >&5 39198-sed 's/^/| /' conftest.$ac_ext >&5 39199- 39200-ac_cv_lib_crypto_X509_free=no 39201-fi 39202-rm -f conftest.err conftest.$ac_objext \ 39203- conftest$ac_exeext conftest.$ac_ext 39204-LIBS=$ac_check_lib_save_LIBS 39205-fi 39206-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_X509_free" >&5 39207-echo "${ECHO_T}$ac_cv_lib_crypto_X509_free" >&6 39208-if test $ac_cv_lib_crypto_X509_free = yes; then 39209+ builtin and then its argument prototype would still apply. */ 39210+char X509_free(); 39211 39212-cat >>confdefs.h <<\_ACEOF 39213-#define HAVE_DSA_DEFAULT_METHOD 1 39214-_ACEOF 39215+int main() { 39216+X509_free() 39217+; return 0; } 39218+EOF 39219+if { (eval echo configure:22355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 39220+ rm -rf conftest* 39221+ eval "ac_cv_lib_$ac_lib_var=yes" 39222+else 39223+ echo "configure: failed program was:" >&5 39224+ cat conftest.$ac_ext >&5 39225+ rm -rf conftest* 39226+ eval "ac_cv_lib_$ac_lib_var=no" 39227+fi 39228+rm -f conftest* 39229+LIBS="$ac_save_LIBS" 39230 39231 fi 39232+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 39233+ echo "$ac_t""yes" 1>&6 39234+ cat >> confdefs.h <<\EOF 39235+#define HAVE_DSA_DEFAULT_METHOD 1 39236+EOF 39237 39238+else 39239+ echo "$ac_t""no" 1>&6 39240+fi 39241 39242 39243+ 39244 found_openssl=no 39245 unset OPENSSL_INCDIR 39246 unset OPENSSL_LIBDIR 39247@@ -33290,42 +22392,38 @@ 39248 if test -z "$PKG_CONFIG"; then 39249 # Extract the first word of "pkg-config", so it can be a program name with args. 39250 set dummy pkg-config; ac_word=$2 39251-echo "$as_me:$LINENO: checking for $ac_word" >&5 39252-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 39253-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then 39254- echo $ECHO_N "(cached) $ECHO_C" >&6 39255+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 39256+echo "configure:22397: checking for $ac_word" >&5 39257+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 39258+ echo $ac_n "(cached) $ac_c" 1>&6 39259 else 39260- case $PKG_CONFIG in 39261- [\\/]* | ?:[\\/]*) 39262+ case "$PKG_CONFIG" in 39263+ /*) 39264 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 39265 ;; 39266+ ?:/*) 39267+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 39268+ ;; 39269 *) 39270- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 39271-for as_dir in $PATH 39272-do 39273- IFS=$as_save_IFS 39274- test -z "$as_dir" && as_dir=. 39275- for ac_exec_ext in '' $ac_executable_extensions; do 39276- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 39277- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 39278- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 39279- break 2 39280- fi 39281-done 39282-done 39283- 39284+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 39285+ ac_dummy="$PATH" 39286+ for ac_dir in $ac_dummy; do 39287+ test -z "$ac_dir" && ac_dir=. 39288+ if test -f $ac_dir/$ac_word; then 39289+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 39290+ break 39291+ fi 39292+ done 39293+ IFS="$ac_save_ifs" 39294 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 39295 ;; 39296 esac 39297 fi 39298-PKG_CONFIG=$ac_cv_path_PKG_CONFIG 39299- 39300+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 39301 if test -n "$PKG_CONFIG"; then 39302- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 39303-echo "${ECHO_T}$PKG_CONFIG" >&6 39304+ echo "$ac_t""$PKG_CONFIG" 1>&6 39305 else 39306- echo "$as_me:$LINENO: result: no" >&5 39307-echo "${ECHO_T}no" >&6 39308+ echo "$ac_t""no" 1>&6 39309 fi 39310 39311 fi 39312@@ -33337,23 +22435,21 @@ 39313 OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` 39314 OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` 39315 else 39316- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 39317-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 39318- { (exit 1); exit 1; }; } 39319+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 39320 fi 39321 39322 if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then 39323- 39324+ 39325 for ac_i in $OPENSSL_LIBS; do 39326 case $ac_i in 39327 -pthread) 39328 if test "$ext_shared" = "yes"; then 39329 OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -pthread" 39330 else 39331- 39332- 39333+ 39334+ 39335 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 39336- 39337+ 39338 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 39339 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39340 eval "EXTRA_LDFLAGS$unique=set" 39341@@ -33364,20 +22460,20 @@ 39342 ;; 39343 -l*) 39344 ac_ii=`echo $ac_i|cut -c 3-` 39345- 39346- 39347+ 39348+ 39349 case $ac_ii in 39350 c|c_r|pthread*) ;; 39351- *) 39352+ *) 39353 if test "$ext_shared" = "yes"; then 39354- OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 39355+ OPENSSL_SHARED_LIBADD="$OPENSSL_SHARED_LIBADD -l$ac_ii" 39356 else 39357- 39358- 39359+ 39360+ 39361 case $ac_ii in 39362 c|c_r|pthread*) ;; 39363- *) 39364- LIBS="$LIBS -l$ac_ii" 39365+ *) 39366+ LIBS="$LIBS -l$ac_ii" 39367 ;; 39368 esac 39369 39370@@ -33390,80 +22486,80 @@ 39371 ;; 39372 -L*) 39373 ac_ii=`echo $ac_i|cut -c 3-` 39374- 39375+ 39376 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 39377- 39378+ 39379 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 39380 ai_p=$ac_ii 39381 else 39382- 39383+ 39384 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 39385- 39386+ 39387 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39388 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 39389 fi 39390 39391- 39392+ 39393 if test "$ext_shared" = "yes"; then 39394 OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" 39395 test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" 39396 else 39397- 39398- 39399- 39400+ 39401+ 39402+ 39403 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39404- 39405+ 39406 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 39407 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39408 eval "LIBPATH$unique=set" 39409- 39410+ 39411 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 39412 LDFLAGS="$LDFLAGS -L$ai_p" 39413 PHP_RPATHS="$PHP_RPATHS $ai_p" 39414- 39415+ 39416 fi 39417 39418 39419 fi 39420- 39421+ 39422 fi 39423 39424 ;; 39425 esac 39426 done 39427 39428- 39429+ 39430 for ac_i in $OPENSSL_INCS; do 39431 case $ac_i in 39432 -I*) 39433 ac_ii=`echo $ac_i|cut -c 3-` 39434- 39435+ 39436 if test "$ac_ii" != "/usr/include"; then 39437- 39438+ 39439 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 39440 ai_p=$ac_ii 39441 else 39442- 39443+ 39444 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 39445- 39446+ 39447 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39448 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 39449 fi 39450 39451- 39452- 39453+ 39454+ 39455 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39456- 39457+ 39458 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 39459 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39460 eval "INCLUDEPATH$unique=set" 39461- 39462+ 39463 if test ""; then 39464 INCLUDES="-I$ai_p $INCLUDES" 39465 else 39466 INCLUDES="$INCLUDES -I$ai_p" 39467 fi 39468- 39469+ 39470 fi 39471 39472 fi 39473@@ -33476,7 +22572,7 @@ 39474 fi 39475 39476 if test "$found_openssl" = "no"; then 39477- 39478+ 39479 if test "$PHP_OPENSSL_DIR" = "yes"; then 39480 PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 39481 fi 39482@@ -33492,102 +22588,94 @@ 39483 done 39484 39485 if test -z "$OPENSSL_INCDIR"; then 39486- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5 39487-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;} 39488- { (exit 1); exit 1; }; } 39489+ { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; } 39490 fi 39491 39492 if test -z "$OPENSSL_LIBDIR"; then 39493- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5 39494-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;} 39495- { (exit 1); exit 1; }; } 39496+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } 39497 fi 39498 39499 old_CPPFLAGS=$CPPFLAGS 39500 CPPFLAGS=-I$OPENSSL_INCDIR 39501- echo "$as_me:$LINENO: checking for OpenSSL version" >&5 39502-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 39503- cat >conftest.$ac_ext <<_ACEOF 39504-/* confdefs.h. */ 39505-_ACEOF 39506-cat confdefs.h >>conftest.$ac_ext 39507-cat >>conftest.$ac_ext <<_ACEOF 39508-/* end confdefs.h. */ 39509+ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 39510+echo "configure:22602: checking for OpenSSL version" >&5 39511+ cat > conftest.$ac_ext <<EOF 39512+#line 22604 "configure" 39513+#include "confdefs.h" 39514 39515 #include <openssl/opensslv.h> 39516 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL 39517 yes 39518 #endif 39519- 39520-_ACEOF 39521+ 39522+EOF 39523 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 39524- $EGREP "yes" >/dev/null 2>&1; then 39525- 39526- echo "$as_me:$LINENO: result: >= 0.9.6" >&5 39527-echo "${ECHO_T}>= 0.9.6" >&6 39528- 39529+ egrep "yes" >/dev/null 2>&1; then 39530+ rm -rf conftest* 39531+ 39532+ echo "$ac_t"">= 0.9.6" 1>&6 39533+ 39534 else 39535- 39536- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 39537-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 39538- { (exit 1); exit 1; }; } 39539- 39540+ rm -rf conftest* 39541+ 39542+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 39543+ 39544 fi 39545 rm -f conftest* 39546 39547 CPPFLAGS=$old_CPPFLAGS 39548 39549- 39550+ 39551 if test "$OPENSSL_INCDIR" != "/usr/include"; then 39552- 39553+ 39554 if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then 39555 ai_p=$OPENSSL_INCDIR 39556 else 39557- 39558+ 39559 ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 39560- 39561+ 39562 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39563 ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 39564 fi 39565 39566- 39567- 39568+ 39569+ 39570 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39571- 39572+ 39573 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 39574 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39575 eval "INCLUDEPATH$unique=set" 39576- 39577+ 39578 if test ""; then 39579 INCLUDES="-I$ai_p $INCLUDES" 39580 else 39581 INCLUDES="$INCLUDES -I$ai_p" 39582 fi 39583- 39584+ 39585 fi 39586 39587 fi 39588 39589- 39590- 39591+ 39592+ 39593 save_old_LDFLAGS=$LDFLAGS 39594 ac_stuff=" 39595 -L$OPENSSL_LIBDIR 39596 " 39597- 39598+ 39599 save_ext_shared=$ext_shared 39600 ext_shared=yes 39601- 39602+ 39603 for ac_i in $ac_stuff; do 39604 case $ac_i in 39605 -pthread) 39606 if test "$ext_shared" = "yes"; then 39607 LDFLAGS="$LDFLAGS -pthread" 39608 else 39609- 39610- 39611+ 39612+ 39613 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 39614- 39615+ 39616 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 39617 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39618 eval "EXTRA_LDFLAGS$unique=set" 39619@@ -33598,20 +22686,20 @@ 39620 ;; 39621 -l*) 39622 ac_ii=`echo $ac_i|cut -c 3-` 39623- 39624- 39625+ 39626+ 39627 case $ac_ii in 39628 c|c_r|pthread*) ;; 39629- *) 39630+ *) 39631 if test "$ext_shared" = "yes"; then 39632- LDFLAGS="$LDFLAGS -l$ac_ii" 39633+ LDFLAGS="$LDFLAGS -l$ac_ii" 39634 else 39635- 39636- 39637+ 39638+ 39639 case $ac_ii in 39640 c|c_r|pthread*) ;; 39641- *) 39642- LIBS="$LIBS -l$ac_ii" 39643+ *) 39644+ LIBS="$LIBS -l$ac_ii" 39645 ;; 39646 esac 39647 39648@@ -33624,131 +22712,101 @@ 39649 ;; 39650 -L*) 39651 ac_ii=`echo $ac_i|cut -c 3-` 39652- 39653+ 39654 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 39655- 39656+ 39657 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 39658 ai_p=$ac_ii 39659 else 39660- 39661+ 39662 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 39663- 39664+ 39665 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39666 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 39667 fi 39668 39669- 39670+ 39671 if test "$ext_shared" = "yes"; then 39672 LDFLAGS="-L$ai_p $LDFLAGS" 39673 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 39674 else 39675- 39676- 39677- 39678+ 39679+ 39680+ 39681 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39682- 39683+ 39684 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 39685 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39686 eval "LIBPATH$unique=set" 39687- 39688+ 39689 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 39690 LDFLAGS="$LDFLAGS -L$ai_p" 39691 PHP_RPATHS="$PHP_RPATHS $ai_p" 39692- 39693+ 39694 fi 39695 39696 39697 fi 39698- 39699+ 39700 fi 39701 39702 ;; 39703 esac 39704 done 39705 39706- echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5 39707-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6 39708-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then 39709- echo $ECHO_N "(cached) $ECHO_C" >&6 39710+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 39711+echo "configure:22759: checking for CRYPTO_free in -lcrypto" >&5 39712+ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` 39713+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 39714+ echo $ac_n "(cached) $ac_c" 1>&6 39715 else 39716- ac_check_lib_save_LIBS=$LIBS 39717+ ac_save_LIBS="$LIBS" 39718 LIBS="-lcrypto $LIBS" 39719-cat >conftest.$ac_ext <<_ACEOF 39720-/* confdefs.h. */ 39721-_ACEOF 39722-cat confdefs.h >>conftest.$ac_ext 39723-cat >>conftest.$ac_ext <<_ACEOF 39724-/* end confdefs.h. */ 39725- 39726+cat > conftest.$ac_ext <<EOF 39727+#line 22767 "configure" 39728+#include "confdefs.h" 39729 /* Override any gcc2 internal prototype to avoid an error. */ 39730-#ifdef __cplusplus 39731-extern "C" 39732-#endif 39733 /* We use char because int might match the return type of a gcc2 39734- builtin and then its argument prototype would still apply. */ 39735-char CRYPTO_free (); 39736-int 39737-main () 39738-{ 39739-CRYPTO_free (); 39740- ; 39741- return 0; 39742-} 39743-_ACEOF 39744-rm -f conftest.$ac_objext conftest$ac_exeext 39745-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 39746- (eval $ac_link) 2>conftest.er1 39747- ac_status=$? 39748- grep -v '^ *+' conftest.er1 >conftest.err 39749- rm -f conftest.er1 39750- cat conftest.err >&5 39751- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39752- (exit $ac_status); } && 39753- { ac_try='test -z "$ac_c_werror_flag" 39754- || test ! -s conftest.err' 39755- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39756- (eval $ac_try) 2>&5 39757- ac_status=$? 39758- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39759- (exit $ac_status); }; } && 39760- { ac_try='test -s conftest$ac_exeext' 39761- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 39762- (eval $ac_try) 2>&5 39763- ac_status=$? 39764- echo "$as_me:$LINENO: \$? = $ac_status" >&5 39765- (exit $ac_status); }; }; then 39766- ac_cv_lib_crypto_CRYPTO_free=yes 39767-else 39768- echo "$as_me: failed program was:" >&5 39769-sed 's/^/| /' conftest.$ac_ext >&5 39770- 39771-ac_cv_lib_crypto_CRYPTO_free=no 39772-fi 39773-rm -f conftest.err conftest.$ac_objext \ 39774- conftest$ac_exeext conftest.$ac_ext 39775-LIBS=$ac_check_lib_save_LIBS 39776-fi 39777-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 39778-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6 39779-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then 39780+ builtin and then its argument prototype would still apply. */ 39781+char CRYPTO_free(); 39782+ 39783+int main() { 39784+CRYPTO_free() 39785+; return 0; } 39786+EOF 39787+if { (eval echo configure:22778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 39788+ rm -rf conftest* 39789+ eval "ac_cv_lib_$ac_lib_var=yes" 39790+else 39791+ echo "configure: failed program was:" >&5 39792+ cat conftest.$ac_ext >&5 39793+ rm -rf conftest* 39794+ eval "ac_cv_lib_$ac_lib_var=no" 39795+fi 39796+rm -f conftest* 39797+LIBS="$ac_save_LIBS" 39798 39799+fi 39800+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 39801+ echo "$ac_t""yes" 1>&6 39802+ 39803 LDFLAGS=$save_old_LDFLAGS 39804 ext_shared=$save_ext_shared 39805- 39806- 39807- 39808+ 39809+ 39810+ 39811 case crypto in 39812 c|c_r|pthread*) ;; 39813- *) 39814+ *) 39815 if test "$ext_shared" = "yes"; then 39816- OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 39817+ OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 39818 else 39819- 39820- 39821+ 39822+ 39823 case crypto in 39824 c|c_r|pthread*) ;; 39825- *) 39826- LIBS="-lcrypto $LIBS" 39827+ *) 39828+ LIBS="-lcrypto $LIBS" 39829 ;; 39830 esac 39831 39832@@ -33758,43 +22816,42 @@ 39833 esac 39834 39835 39836- 39837- 39838+ 39839+ 39840 else 39841+ echo "$ac_t""no" 1>&6 39842 39843 LDFLAGS=$save_old_LDFLAGS 39844 ext_shared=$save_ext_shared 39845 unset ac_cv_lib_crypto_CRYPTO_free 39846- 39847- { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5 39848-echo "$as_me: error: libcrypto not found!" >&2;} 39849- { (exit 1); exit 1; }; } 39850- 39851- 39852+ 39853+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } 39854+ 39855+ 39856 fi 39857 39858 39859 old_LIBS=$LIBS 39860 LIBS="$LIBS -lcrypto" 39861- 39862+ 39863 save_old_LDFLAGS=$LDFLAGS 39864 ac_stuff=" 39865 -L$OPENSSL_LIBDIR 39866 " 39867- 39868+ 39869 save_ext_shared=$ext_shared 39870 ext_shared=yes 39871- 39872+ 39873 for ac_i in $ac_stuff; do 39874 case $ac_i in 39875 -pthread) 39876 if test "$ext_shared" = "yes"; then 39877 LDFLAGS="$LDFLAGS -pthread" 39878 else 39879- 39880- 39881+ 39882+ 39883 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 39884- 39885+ 39886 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 39887 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39888 eval "EXTRA_LDFLAGS$unique=set" 39889@@ -33805,20 +22862,20 @@ 39890 ;; 39891 -l*) 39892 ac_ii=`echo $ac_i|cut -c 3-` 39893- 39894- 39895+ 39896+ 39897 case $ac_ii in 39898 c|c_r|pthread*) ;; 39899- *) 39900+ *) 39901 if test "$ext_shared" = "yes"; then 39902- LDFLAGS="$LDFLAGS -l$ac_ii" 39903+ LDFLAGS="$LDFLAGS -l$ac_ii" 39904 else 39905- 39906- 39907+ 39908+ 39909 case $ac_ii in 39910 c|c_r|pthread*) ;; 39911- *) 39912- LIBS="$LIBS -l$ac_ii" 39913+ *) 39914+ LIBS="$LIBS -l$ac_ii" 39915 ;; 39916 esac 39917 39918@@ -33831,148 +22888,117 @@ 39919 ;; 39920 -L*) 39921 ac_ii=`echo $ac_i|cut -c 3-` 39922- 39923+ 39924 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 39925- 39926+ 39927 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 39928 ai_p=$ac_ii 39929 else 39930- 39931+ 39932 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 39933- 39934+ 39935 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 39936 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 39937 fi 39938 39939- 39940+ 39941 if test "$ext_shared" = "yes"; then 39942 LDFLAGS="-L$ai_p $LDFLAGS" 39943 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 39944 else 39945- 39946- 39947- 39948+ 39949+ 39950+ 39951 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 39952- 39953+ 39954 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 39955 if test -n "$unique" && test "`eval $cmd`" = "" ; then 39956 eval "LIBPATH$unique=set" 39957- 39958+ 39959 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 39960 LDFLAGS="$LDFLAGS -L$ai_p" 39961 PHP_RPATHS="$PHP_RPATHS $ai_p" 39962- 39963+ 39964 fi 39965 39966 39967 fi 39968- 39969+ 39970 fi 39971 39972 ;; 39973 esac 39974 done 39975 39976- echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5 39977-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6 39978-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then 39979- echo $ECHO_N "(cached) $ECHO_C" >&6 39980+ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 39981+echo "configure:22935: checking for SSL_CTX_set_ssl_version in -lssl" >&5 39982+ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` 39983+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 39984+ echo $ac_n "(cached) $ac_c" 1>&6 39985 else 39986- ac_check_lib_save_LIBS=$LIBS 39987+ ac_save_LIBS="$LIBS" 39988 LIBS="-lssl $LIBS" 39989-cat >conftest.$ac_ext <<_ACEOF 39990-/* confdefs.h. */ 39991-_ACEOF 39992-cat confdefs.h >>conftest.$ac_ext 39993-cat >>conftest.$ac_ext <<_ACEOF 39994-/* end confdefs.h. */ 39995- 39996+cat > conftest.$ac_ext <<EOF 39997+#line 22943 "configure" 39998+#include "confdefs.h" 39999 /* Override any gcc2 internal prototype to avoid an error. */ 40000-#ifdef __cplusplus 40001-extern "C" 40002-#endif 40003 /* We use char because int might match the return type of a gcc2 40004- builtin and then its argument prototype would still apply. */ 40005-char SSL_CTX_set_ssl_version (); 40006-int 40007-main () 40008-{ 40009-SSL_CTX_set_ssl_version (); 40010- ; 40011- return 0; 40012-} 40013-_ACEOF 40014-rm -f conftest.$ac_objext conftest$ac_exeext 40015-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 40016- (eval $ac_link) 2>conftest.er1 40017- ac_status=$? 40018- grep -v '^ *+' conftest.er1 >conftest.err 40019- rm -f conftest.er1 40020- cat conftest.err >&5 40021- echo "$as_me:$LINENO: \$? = $ac_status" >&5 40022- (exit $ac_status); } && 40023- { ac_try='test -z "$ac_c_werror_flag" 40024- || test ! -s conftest.err' 40025- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 40026- (eval $ac_try) 2>&5 40027- ac_status=$? 40028- echo "$as_me:$LINENO: \$? = $ac_status" >&5 40029- (exit $ac_status); }; } && 40030- { ac_try='test -s conftest$ac_exeext' 40031- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 40032- (eval $ac_try) 2>&5 40033- ac_status=$? 40034- echo "$as_me:$LINENO: \$? = $ac_status" >&5 40035- (exit $ac_status); }; }; then 40036- ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes 40037-else 40038- echo "$as_me: failed program was:" >&5 40039-sed 's/^/| /' conftest.$ac_ext >&5 40040- 40041-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no 40042-fi 40043-rm -f conftest.err conftest.$ac_objext \ 40044- conftest$ac_exeext conftest.$ac_ext 40045-LIBS=$ac_check_lib_save_LIBS 40046-fi 40047-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 40048-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6 40049-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then 40050+ builtin and then its argument prototype would still apply. */ 40051+char SSL_CTX_set_ssl_version(); 40052+ 40053+int main() { 40054+SSL_CTX_set_ssl_version() 40055+; return 0; } 40056+EOF 40057+if { (eval echo configure:22954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 40058+ rm -rf conftest* 40059+ eval "ac_cv_lib_$ac_lib_var=yes" 40060+else 40061+ echo "configure: failed program was:" >&5 40062+ cat conftest.$ac_ext >&5 40063+ rm -rf conftest* 40064+ eval "ac_cv_lib_$ac_lib_var=no" 40065+fi 40066+rm -f conftest* 40067+LIBS="$ac_save_LIBS" 40068 40069+fi 40070+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 40071+ echo "$ac_t""yes" 1>&6 40072+ 40073 LDFLAGS=$save_old_LDFLAGS 40074 ext_shared=$save_ext_shared 40075- 40076+ 40077 found_openssl=yes 40078- 40079- 40080+ 40081+ 40082 else 40083+ echo "$ac_t""no" 1>&6 40084 40085 LDFLAGS=$save_old_LDFLAGS 40086 ext_shared=$save_ext_shared 40087 unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version 40088- 40089- { { echo "$as_me:$LINENO: error: libssl not found!" >&5 40090-echo "$as_me: error: libssl not found!" >&2;} 40091- { (exit 1); exit 1; }; } 40092- 40093- 40094+ 40095+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } 40096+ 40097+ 40098 fi 40099 40100 LIBS=$old_LIBS 40101- 40102- 40103+ 40104+ 40105 case ssl in 40106 c|c_r|pthread*) ;; 40107- *) 40108+ *) 40109 if test "$ext_shared" = "yes"; then 40110- OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD" 40111+ OPENSSL_SHARED_LIBADD="-lssl $OPENSSL_SHARED_LIBADD" 40112 else 40113- 40114- 40115+ 40116+ 40117 case ssl in 40118 c|c_r|pthread*) ;; 40119- *) 40120- LIBS="-lssl $LIBS" 40121+ *) 40122+ LIBS="-lssl $LIBS" 40123 ;; 40124 esac 40125 40126@@ -33982,20 +23008,20 @@ 40127 esac 40128 40129 40130- 40131- 40132+ 40133+ 40134 case crypto in 40135 c|c_r|pthread*) ;; 40136- *) 40137+ *) 40138 if test "$ext_shared" = "yes"; then 40139- OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 40140+ OPENSSL_SHARED_LIBADD="-lcrypto $OPENSSL_SHARED_LIBADD" 40141 else 40142- 40143- 40144+ 40145+ 40146 case crypto in 40147 c|c_r|pthread*) ;; 40148- *) 40149- LIBS="-lcrypto $LIBS" 40150+ *) 40151+ LIBS="-lcrypto $LIBS" 40152 ;; 40153 esac 40154 40155@@ -34006,62 +23032,59 @@ 40156 40157 40158 40159- 40160+ 40161 if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then 40162- 40163+ 40164 if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then 40165 ai_p=$OPENSSL_LIBDIR 40166 else 40167- 40168+ 40169 ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 40170- 40171+ 40172 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 40173 ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" 40174 fi 40175 40176- 40177+ 40178 if test "$ext_shared" = "yes"; then 40179 OPENSSL_SHARED_LIBADD="-L$ai_p $OPENSSL_SHARED_LIBADD" 40180 test -n "$ld_runpath_switch" && OPENSSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $OPENSSL_SHARED_LIBADD" 40181 else 40182- 40183- 40184- 40185+ 40186+ 40187+ 40188 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 40189- 40190+ 40191 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 40192 if test -n "$unique" && test "`eval $cmd`" = "" ; then 40193 eval "LIBPATH$unique=set" 40194- 40195+ 40196 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 40197 LDFLAGS="$LDFLAGS -L$ai_p" 40198 PHP_RPATHS="$PHP_RPATHS $ai_p" 40199- 40200+ 40201 fi 40202 40203 40204 fi 40205- 40206+ 40207 fi 40208 40209 fi 40210 40211 if test "$found_openssl" = "yes"; then 40212 OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR 40213+ 40214 40215 40216- 40217- 40218-cat >>confdefs.h <<\_ACEOF 40219+ cat >> confdefs.h <<\EOF 40220 #define HAVE_OPENSSL_EXT 1 40221-_ACEOF 40222- 40223- 40224-else 40225- { { echo "$as_me:$LINENO: error: OpenSSL check failed. Please check config.log for more information." >&5 40226-echo "$as_me: error: OpenSSL check failed. Please check config.log for more information." >&2;} 40227- { (exit 1); exit 1; }; } 40228+EOF 40229 40230+ 40231+else 40232+ { echo "configure: error: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } 40233+ 40234 fi 40235 40236 fi 40237@@ -34072,17 +23095,17 @@ 40238 php_with_pcre_regex=yes 40239 40240 40241- 40242 # Check whether --with-pcre-regex or --without-pcre-regex was given. 40243 if test "${with_pcre_regex+set}" = set; then 40244 withval="$with_pcre_regex" 40245 PHP_PCRE_REGEX=$withval 40246 else 40247- 40248+ 40249 PHP_PCRE_REGEX=yes 40250+ 40251 40252+fi 40253 40254-fi; 40255 40256 ext_output=$PHP_PCRE_REGEX 40257 40258@@ -34091,136 +23114,127 @@ 40259 40260 40261 if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then 40262- echo "$as_me:$LINENO: checking for PCRE headers location" >&5 40263-echo $ECHO_N "checking for PCRE headers location... $ECHO_C" >&6 40264+ echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6 40265+echo "configure:23119: checking for PCRE headers location" >&5 40266 for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do 40267 test -f $i/pcre.h && PCRE_INCDIR=$i 40268 done 40269 40270 if test -z "$PCRE_INCDIR"; then 40271- { { echo "$as_me:$LINENO: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&5 40272-echo "$as_me: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&2;} 40273- { (exit 1); exit 1; }; } 40274+ { echo "configure: error: Could not find pcre.h in $PHP_PCRE_REGEX" 1>&2; exit 1; } 40275 fi 40276- echo "$as_me:$LINENO: result: $PCRE_INCDIR" >&5 40277-echo "${ECHO_T}$PCRE_INCDIR" >&6 40278+ echo "$ac_t""$PCRE_INCDIR" 1>&6 40279 40280- echo "$as_me:$LINENO: checking for PCRE library location" >&5 40281-echo $ECHO_N "checking for PCRE library location... $ECHO_C" >&6 40282+ echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6 40283+echo "configure:23130: checking for PCRE library location" >&5 40284 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do 40285 test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j 40286 done 40287- 40288+ 40289 if test -z "$PCRE_LIBDIR" ; then 40290- { { echo "$as_me:$LINENO: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&5 40291-echo "$as_me: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&2;} 40292- { (exit 1); exit 1; }; } 40293+ { echo "configure: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" 1>&2; exit 1; } 40294 fi 40295- echo "$as_me:$LINENO: result: $PCRE_LIBDIR" >&5 40296-echo "${ECHO_T}$PCRE_LIBDIR" >&6 40297- 40298+ echo "$ac_t""$PCRE_LIBDIR" 1>&6 40299 40300+ 40301 pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` 40302 pcre_minor=`grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'` 40303- 40304+ 40305 pcre_minor_length=`echo "$pcre_minor" | wc -c | sed -e 's/^0-9//g'` 40306 if test "$pcre_minor_length" -eq 2 ; then 40307 pcre_minor="$pcre_minor"0 40308 fi 40309 pcre_version=$pcre_major$pcre_minor 40310 if test "$pcre_version" -lt 660; then 40311- { { echo "$as_me:$LINENO: error: The PCRE extension requires PCRE library version >= 6.6" >&5 40312-echo "$as_me: error: The PCRE extension requires PCRE library version >= 6.6" >&2;} 40313- { (exit 1); exit 1; }; } 40314+ { echo "configure: error: The PCRE extension requires PCRE library version >= 6.6" 1>&2; exit 1; } 40315 fi 40316 40317- 40318+ 40319 40320 if test -n "$PCRE_LIBDIR"; then 40321- 40322+ 40323 if test "$PCRE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PCRE_LIBDIR" != "/usr/lib"; then 40324- 40325+ 40326 if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then 40327 ai_p=$PCRE_LIBDIR 40328 else 40329- 40330+ 40331 ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 40332- 40333+ 40334 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 40335 ai_p="$ep_realdir/`basename \"$PCRE_LIBDIR\"`" 40336 fi 40337 40338- 40339- 40340- 40341- 40342+ 40343+ 40344+ 40345+ 40346 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 40347- 40348+ 40349 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 40350 if test -n "$unique" && test "`eval $cmd`" = "" ; then 40351 eval "LIBPATH$unique=set" 40352- 40353+ 40354 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 40355 LDFLAGS="$LDFLAGS -L$ai_p" 40356 PHP_RPATHS="$PHP_RPATHS $ai_p" 40357- 40358+ 40359 fi 40360 40361 40362- 40363+ 40364 fi 40365 40366 fi 40367- 40368- 40369+ 40370+ 40371 case pcre in 40372 c|c_r|pthread*) ;; 40373- *) 40374- LIBS="-lpcre $LIBS" 40375+ *) 40376+ LIBS="-lpcre $LIBS" 40377 ;; 40378 esac 40379 40380 40381 40382 40383- 40384- 40385-cat >>confdefs.h <<\_ACEOF 40386+ 40387+ cat >> confdefs.h <<\EOF 40388 #define HAVE_PCRE 1 40389-_ACEOF 40390- 40391+EOF 40392 40393+ 40394 if test "$PCRE_INCDIR" != "/usr/include"; then 40395- 40396+ 40397 if test -z "$PCRE_INCDIR" || echo "$PCRE_INCDIR" | grep '^/' >/dev/null ; then 40398 ai_p=$PCRE_INCDIR 40399 else 40400- 40401+ 40402 ep_dir="`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 40403- 40404+ 40405 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 40406 ai_p="$ep_realdir/`basename \"$PCRE_INCDIR\"`" 40407 fi 40408 40409- 40410- 40411+ 40412+ 40413 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 40414- 40415+ 40416 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 40417 if test -n "$unique" && test "`eval $cmd`" = "" ; then 40418 eval "INCLUDEPATH$unique=set" 40419- 40420+ 40421 if test ""; then 40422 INCLUDES="-I$ai_p $INCLUDES" 40423 else 40424 INCLUDES="$INCLUDES -I$ai_p" 40425 fi 40426- 40427+ 40428 fi 40429 40430 fi 40431 40432- 40433+ 40434 ext_builddir=ext/pcre 40435 ext_srcdir=$abs_srcdir/ext/pcre 40436 40437@@ -34228,15 +23242,15 @@ 40438 40439 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 40440 PHP_PCRE_SHARED=no 40441- 40442- 40443+ 40444+ 40445 case ext/pcre in 40446 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40447 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40448 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40449 esac 40450- 40451- 40452+ 40453+ 40454 40455 b_c_pre=$php_c_pre 40456 b_cxx_pre=$php_cxx_pre 40457@@ -34249,12 +23263,12 @@ 40458 40459 old_IFS=$IFS 40460 for ac_src in php_pcre.c; do 40461- 40462+ 40463 IFS=. 40464 set $ac_src 40465 ac_obj=$1 40466 IFS=$old_IFS 40467- 40468+ 40469 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40470 40471 case $ac_src in 40472@@ -34278,14 +23292,14 @@ 40473 else 40474 if test "no" = "shared" || test "no" = "yes"; then 40475 PHP_PCRE_SHARED=yes 40476- 40477+ 40478 case ext/pcre in 40479 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40480 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40481 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40482 esac 40483- 40484- 40485+ 40486+ 40487 40488 b_c_pre=$shared_c_pre 40489 b_cxx_pre=$shared_cxx_pre 40490@@ -34298,12 +23312,12 @@ 40491 40492 old_IFS=$IFS 40493 for ac_src in php_pcre.c; do 40494- 40495+ 40496 IFS=. 40497 set $ac_src 40498 ac_obj=$1 40499 IFS=$old_IFS 40500- 40501+ 40502 shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo" 40503 40504 case $ac_src in 40505@@ -34321,7 +23335,7 @@ 40506 40507 case $host_alias in 40508 *netware*) 40509- 40510+ 40511 install_modules="install-modules" 40512 40513 case $host_alias in 40514@@ -34331,7 +23345,7 @@ 40515 ;; 40516 *netware*) 40517 suffix=nlm 40518- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_SHARED_LIBADD)' 40519+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)' 40520 ;; 40521 *) 40522 suffix=la 40523@@ -34344,7 +23358,7 @@ 40524 else 40525 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix" 40526 fi 40527- 40528+ 40529 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" 40530 40531 cat >>Makefile.objects<<EOF 40532@@ -34358,7 +23372,7 @@ 40533 40534 ;; 40535 *) 40536- 40537+ 40538 install_modules="install-modules" 40539 40540 case $host_alias in 40541@@ -34368,7 +23382,7 @@ 40542 ;; 40543 *netware*) 40544 suffix=nlm 40545- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(E_SHARED_LIBADD)' 40546+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCRE, 3)_SHARED_LIBADD)' 40547 ;; 40548 *) 40549 suffix=la 40550@@ -34381,7 +23395,7 @@ 40551 else 40552 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcre.$suffix" 40553 fi 40554- 40555+ 40556 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" 40557 40558 cat >>Makefile.objects<<EOF 40559@@ -34395,10 +23409,9 @@ 40560 40561 ;; 40562 esac 40563- 40564-cat >>confdefs.h <<_ACEOF 40565+ cat >> confdefs.h <<EOF 40566 #define COMPILE_DL_PCRE 1 40567-_ACEOF 40568+EOF 40569 40570 fi 40571 fi 40572@@ -34407,15 +23420,15 @@ 40573 PHP_PCRE_SHARED=no 40574 case "$PHP_SAPI" in 40575 cgi|embed) 40576- 40577- 40578+ 40579+ 40580 case ext/pcre in 40581 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40582 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40583 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40584 esac 40585- 40586- 40587+ 40588+ 40589 40590 b_c_pre=$php_c_pre 40591 b_cxx_pre=$php_cxx_pre 40592@@ -34428,12 +23441,12 @@ 40593 40594 old_IFS=$IFS 40595 for ac_src in php_pcre.c; do 40596- 40597+ 40598 IFS=. 40599 set $ac_src 40600 ac_obj=$1 40601 IFS=$old_IFS 40602- 40603+ 40604 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40605 40606 case $ac_src in 40607@@ -34453,15 +23466,15 @@ 40608 EXT_STATIC="$EXT_STATIC pcre" 40609 ;; 40610 *) 40611- 40612- 40613+ 40614+ 40615 case ext/pcre in 40616 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40617 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40618 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40619 esac 40620- 40621- 40622+ 40623+ 40624 40625 b_c_pre=$php_c_pre 40626 b_cxx_pre=$php_cxx_pre 40627@@ -34474,13 +23487,13 @@ 40628 40629 old_IFS=$IFS 40630 for ac_src in php_pcre.c; do 40631- 40632+ 40633 IFS=. 40634 set $ac_src 40635 ac_obj=$1 40636 IFS=$old_IFS 40637- 40638- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 40639+ 40640+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40641 40642 case $ac_src in 40643 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 40644@@ -34500,44 +23513,43 @@ 40645 esac 40646 EXT_CLI_STATIC="$EXT_CLI_STATIC pcre" 40647 fi 40648- 40649- 40650+ 40651+ 40652 BUILD_DIR="$BUILD_DIR $ext_builddir" 40653- 40654+ 40655 40656 40657 if test "$ext_builddir" = "."; then 40658 PHP_PECL_EXTENSION=pcre 40659- 40660+ 40661 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 40662 40663 fi 40664 40665- 40666- 40667+ 40668+ 40669 header_path=ext/pcre 40670 for header_file in php_pcre.h; do 40671 hp_hf="$header_path/$header_file" 40672- 40673- 40674+ 40675+ 40676 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 40677- 40678+ 40679 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 40680 if test -n "$unique" && test "`eval $cmd`" = "" ; then 40681 eval "INSTALLHEADERS$unique=set" 40682- 40683+ 40684 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 40685- 40686+ 40687 fi 40688 40689- done 40690- 40691+ done 40692+ 40693 40694 else 40695- echo "$as_me:$LINENO: checking for PCRE library to use" >&5 40696-echo $ECHO_N "checking for PCRE library to use... $ECHO_C" >&6 40697- echo "$as_me:$LINENO: result: bundled" >&5 40698-echo "${ECHO_T}bundled" >&6 40699+ echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6 40700+echo "configure:23552: checking for PCRE library to use" >&5 40701+ echo "$ac_t""bundled" 1>&6 40702 pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \ 40703 pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ 40704 pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c \ 40705@@ -34545,7 +23557,7 @@ 40706 pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \ 40707 pcrelib/pcre_tables.c pcrelib/pcre_valid_utf8.c \ 40708 pcrelib/pcre_version.c pcrelib/pcre_xclass.c" 40709- 40710+ 40711 ext_builddir=ext/pcre 40712 ext_srcdir=$abs_srcdir/ext/pcre 40713 40714@@ -34553,15 +23565,15 @@ 40715 40716 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 40717 PHP_PCRE_SHARED=no 40718- 40719- 40720+ 40721+ 40722 case ext/pcre in 40723 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40724 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40725 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40726 esac 40727- 40728- 40729+ 40730+ 40731 40732 b_c_pre=$php_c_pre 40733 b_cxx_pre=$php_cxx_pre 40734@@ -34574,12 +23586,12 @@ 40735 40736 old_IFS=$IFS 40737 for ac_src in $pcrelib_sources php_pcre.c; do 40738- 40739+ 40740 IFS=. 40741 set $ac_src 40742 ac_obj=$1 40743 IFS=$old_IFS 40744- 40745+ 40746 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40747 40748 case $ac_src in 40749@@ -34603,14 +23615,14 @@ 40750 else 40751 if test "no" = "shared" || test "no" = "yes"; then 40752 PHP_PCRE_SHARED=yes 40753- 40754+ 40755 case ext/pcre in 40756 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40757 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40758 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40759 esac 40760- 40761- 40762+ 40763+ 40764 40765 b_c_pre=$shared_c_pre 40766 b_cxx_pre=$shared_cxx_pre 40767@@ -34623,12 +23635,12 @@ 40768 40769 old_IFS=$IFS 40770 for ac_src in $pcrelib_sources php_pcre.c; do 40771- 40772+ 40773 IFS=. 40774 set $ac_src 40775 ac_obj=$1 40776 IFS=$old_IFS 40777- 40778+ 40779 shared_objects_pcre="$shared_objects_pcre $ac_bdir$ac_obj.lo" 40780 40781 case $ac_src in 40782@@ -34646,7 +23658,7 @@ 40783 40784 case $host_alias in 40785 *netware*) 40786- 40787+ 40788 install_modules="install-modules" 40789 40790 case $host_alias in 40791@@ -34656,7 +23668,7 @@ 40792 ;; 40793 *netware*) 40794 suffix=nlm 40795- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(PCRE_SHARED_LIBADD)' 40796+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCRE, 3)_SHARED_LIBADD)' 40797 ;; 40798 *) 40799 suffix=la 40800@@ -34669,7 +23681,7 @@ 40801 else 40802 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcre.$suffix" 40803 fi 40804- 40805+ 40806 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" 40807 40808 cat >>Makefile.objects<<EOF 40809@@ -34683,7 +23695,7 @@ 40810 40811 ;; 40812 *) 40813- 40814+ 40815 install_modules="install-modules" 40816 40817 case $host_alias in 40818@@ -34693,7 +23705,7 @@ 40819 ;; 40820 *netware*) 40821 suffix=nlm 40822- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(E_SHARED_LIBADD)' 40823+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcre) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCRE, 3)_SHARED_LIBADD)' 40824 ;; 40825 *) 40826 suffix=la 40827@@ -34706,7 +23718,7 @@ 40828 else 40829 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcre.$suffix" 40830 fi 40831- 40832+ 40833 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcre" 40834 40835 cat >>Makefile.objects<<EOF 40836@@ -34720,10 +23732,9 @@ 40837 40838 ;; 40839 esac 40840- 40841-cat >>confdefs.h <<_ACEOF 40842+ cat >> confdefs.h <<EOF 40843 #define COMPILE_DL_PCRE 1 40844-_ACEOF 40845+EOF 40846 40847 fi 40848 fi 40849@@ -34732,15 +23743,15 @@ 40850 PHP_PCRE_SHARED=no 40851 case "$PHP_SAPI" in 40852 cgi|embed) 40853- 40854- 40855+ 40856+ 40857 case ext/pcre in 40858 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40859 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40860 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40861 esac 40862- 40863- 40864+ 40865+ 40866 40867 b_c_pre=$php_c_pre 40868 b_cxx_pre=$php_cxx_pre 40869@@ -34753,12 +23764,12 @@ 40870 40871 old_IFS=$IFS 40872 for ac_src in $pcrelib_sources php_pcre.c; do 40873- 40874+ 40875 IFS=. 40876 set $ac_src 40877 ac_obj=$1 40878 IFS=$old_IFS 40879- 40880+ 40881 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40882 40883 case $ac_src in 40884@@ -34778,15 +23789,15 @@ 40885 EXT_STATIC="$EXT_STATIC pcre" 40886 ;; 40887 *) 40888- 40889- 40890+ 40891+ 40892 case ext/pcre in 40893 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 40894 /*) ac_srcdir=`echo "ext/pcre"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 40895 *) ac_srcdir="$abs_srcdir/ext/pcre/"; ac_bdir="ext/pcre/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 40896 esac 40897- 40898- 40899+ 40900+ 40901 40902 b_c_pre=$php_c_pre 40903 b_cxx_pre=$php_cxx_pre 40904@@ -34799,13 +23810,13 @@ 40905 40906 old_IFS=$IFS 40907 for ac_src in $pcrelib_sources php_pcre.c; do 40908- 40909+ 40910 IFS=. 40911 set $ac_src 40912 ac_obj=$1 40913 IFS=$old_IFS 40914- 40915- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 40916+ 40917+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 40918 40919 case $ac_src in 40920 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 40921@@ -34825,48 +23836,47 @@ 40922 esac 40923 EXT_CLI_STATIC="$EXT_CLI_STATIC pcre" 40924 fi 40925- 40926- 40927+ 40928+ 40929 BUILD_DIR="$BUILD_DIR $ext_builddir" 40930- 40931+ 40932 40933 40934 if test "$ext_builddir" = "."; then 40935 PHP_PECL_EXTENSION=pcre 40936- 40937+ 40938 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 40939 40940 fi 40941 40942- 40943- 40944+ 40945+ 40946 BUILD_DIR="$BUILD_DIR $ext_builddir/pcrelib" 40947+ 40948 40949- 40950- 40951- 40952+ 40953+ 40954 header_path=ext/pcre 40955 for header_file in php_pcre.h pcrelib/; do 40956 hp_hf="$header_path/$header_file" 40957- 40958- 40959+ 40960+ 40961 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 40962- 40963+ 40964 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 40965 if test -n "$unique" && test "`eval $cmd`" = "" ; then 40966 eval "INSTALLHEADERS$unique=set" 40967- 40968+ 40969 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 40970- 40971+ 40972 fi 40973 40974- done 40975- 40976+ done 40977+ 40978 40979- 40980-cat >>confdefs.h <<\_ACEOF 40981+ cat >> confdefs.h <<\EOF 40982 #define HAVE_BUNDLED_PCRE 1 40983-_ACEOF 40984+EOF 40985 40986 fi 40987 40988@@ -34874,19 +23884,19 @@ 40989 40990 php_with_sqlite3=yes 40991 40992-echo "$as_me:$LINENO: checking whether to enable the SQLite3 extension" >&5 40993-echo $ECHO_N "checking whether to enable the SQLite3 extension... $ECHO_C" >&6 40994- 40995+echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6 40996+echo "configure:23889: checking whether to enable the SQLite3 extension" >&5 40997 # Check whether --with-sqlite3 or --without-sqlite3 was given. 40998 if test "${with_sqlite3+set}" = set; then 40999 withval="$with_sqlite3" 41000 PHP_SQLITE3=$withval 41001 else 41002- 41003+ 41004 PHP_SQLITE3=yes 41005 test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL 41006 41007-fi; 41008+fi 41009+ 41010 41011 41012 ext_output="yes, shared" 41013@@ -34910,8 +23920,7 @@ 41014 41015 41016 41017-echo "$as_me:$LINENO: result: $ext_output" >&5 41018-echo "${ECHO_T}$ext_output" >&6 41019+echo "$ac_t""$ext_output" 1>&6 41020 41021 41022 41023@@ -34930,46 +23939,42 @@ 41024 fi 41025 41026 if test $PHP_SQLITE3 != "yes"; then 41027- echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5 41028-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6 41029+ echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 41030+echo "configure:23944: checking for sqlite3 files in default path" >&5 41031 for i in $PHP_SQLITE3 /usr/local /usr; do 41032 if test -r $i/include/sqlite3.h; then 41033 SQLITE3_DIR=$i 41034- echo "$as_me:$LINENO: result: found in $i" >&5 41035-echo "${ECHO_T}found in $i" >&6 41036+ echo "$ac_t""found in $i" 1>&6 41037 break 41038 fi 41039 done 41040 41041 if test -z "$SQLITE3_DIR"; then 41042- echo "$as_me:$LINENO: result: not found" >&5 41043-echo "${ECHO_T}not found" >&6 41044- { { echo "$as_me:$LINENO: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&5 41045-echo "$as_me: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&2;} 41046- { (exit 1); exit 1; }; } 41047+ echo "$ac_t""not found" 1>&6 41048+ { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } 41049 fi 41050 41051- echo "$as_me:$LINENO: checking for SQLite 3.3.9+" >&5 41052-echo $ECHO_N "checking for SQLite 3.3.9+... $ECHO_C" >&6 41053- 41054+ echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6 41055+echo "configure:23959: checking for SQLite 3.3.9+" >&5 41056+ 41057 save_old_LDFLAGS=$LDFLAGS 41058 ac_stuff=" 41059 -L$SQLITE3_DIR/$PHP_LIBDIR -lm 41060 " 41061- 41062+ 41063 save_ext_shared=$ext_shared 41064 ext_shared=yes 41065- 41066+ 41067 for ac_i in $ac_stuff; do 41068 case $ac_i in 41069 -pthread) 41070 if test "$ext_shared" = "yes"; then 41071 LDFLAGS="$LDFLAGS -pthread" 41072 else 41073- 41074- 41075+ 41076+ 41077 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 41078- 41079+ 41080 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 41081 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41082 eval "EXTRA_LDFLAGS$unique=set" 41083@@ -34980,20 +23985,20 @@ 41084 ;; 41085 -l*) 41086 ac_ii=`echo $ac_i|cut -c 3-` 41087- 41088- 41089+ 41090+ 41091 case $ac_ii in 41092 c|c_r|pthread*) ;; 41093- *) 41094+ *) 41095 if test "$ext_shared" = "yes"; then 41096- LDFLAGS="$LDFLAGS -l$ac_ii" 41097+ LDFLAGS="$LDFLAGS -l$ac_ii" 41098 else 41099- 41100- 41101+ 41102+ 41103 case $ac_ii in 41104 c|c_r|pthread*) ;; 41105- *) 41106- LIBS="$LIBS -l$ac_ii" 41107+ *) 41108+ LIBS="$LIBS -l$ac_ii" 41109 ;; 41110 esac 41111 41112@@ -35006,207 +24011,176 @@ 41113 ;; 41114 -L*) 41115 ac_ii=`echo $ac_i|cut -c 3-` 41116- 41117+ 41118 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 41119- 41120+ 41121 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 41122 ai_p=$ac_ii 41123 else 41124- 41125+ 41126 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 41127- 41128+ 41129 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41130 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 41131 fi 41132 41133- 41134+ 41135 if test "$ext_shared" = "yes"; then 41136 LDFLAGS="-L$ai_p $LDFLAGS" 41137 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 41138 else 41139- 41140- 41141- 41142+ 41143+ 41144+ 41145 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41146- 41147+ 41148 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 41149 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41150 eval "LIBPATH$unique=set" 41151- 41152+ 41153 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 41154 LDFLAGS="$LDFLAGS -L$ai_p" 41155 PHP_RPATHS="$PHP_RPATHS $ai_p" 41156- 41157+ 41158 fi 41159 41160 41161 fi 41162- 41163+ 41164 fi 41165 41166 ;; 41167 esac 41168 done 41169 41170- echo "$as_me:$LINENO: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 41171-echo $ECHO_N "checking for sqlite3_prepare_v2 in -lsqlite3... $ECHO_C" >&6 41172-if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then 41173- echo $ECHO_N "(cached) $ECHO_C" >&6 41174+ echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6 41175+echo "configure:24058: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 41176+ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'` 41177+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 41178+ echo $ac_n "(cached) $ac_c" 1>&6 41179 else 41180- ac_check_lib_save_LIBS=$LIBS 41181+ ac_save_LIBS="$LIBS" 41182 LIBS="-lsqlite3 $LIBS" 41183-cat >conftest.$ac_ext <<_ACEOF 41184-/* confdefs.h. */ 41185-_ACEOF 41186-cat confdefs.h >>conftest.$ac_ext 41187-cat >>conftest.$ac_ext <<_ACEOF 41188-/* end confdefs.h. */ 41189- 41190+cat > conftest.$ac_ext <<EOF 41191+#line 24066 "configure" 41192+#include "confdefs.h" 41193 /* Override any gcc2 internal prototype to avoid an error. */ 41194-#ifdef __cplusplus 41195-extern "C" 41196-#endif 41197 /* We use char because int might match the return type of a gcc2 41198- builtin and then its argument prototype would still apply. */ 41199-char sqlite3_prepare_v2 (); 41200-int 41201-main () 41202-{ 41203-sqlite3_prepare_v2 (); 41204- ; 41205- return 0; 41206-} 41207-_ACEOF 41208-rm -f conftest.$ac_objext conftest$ac_exeext 41209-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 41210- (eval $ac_link) 2>conftest.er1 41211- ac_status=$? 41212- grep -v '^ *+' conftest.er1 >conftest.err 41213- rm -f conftest.er1 41214- cat conftest.err >&5 41215- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41216- (exit $ac_status); } && 41217- { ac_try='test -z "$ac_c_werror_flag" 41218- || test ! -s conftest.err' 41219- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41220- (eval $ac_try) 2>&5 41221- ac_status=$? 41222- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41223- (exit $ac_status); }; } && 41224- { ac_try='test -s conftest$ac_exeext' 41225- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41226- (eval $ac_try) 2>&5 41227- ac_status=$? 41228- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41229- (exit $ac_status); }; }; then 41230- ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes 41231-else 41232- echo "$as_me: failed program was:" >&5 41233-sed 's/^/| /' conftest.$ac_ext >&5 41234- 41235-ac_cv_lib_sqlite3_sqlite3_prepare_v2=no 41236-fi 41237-rm -f conftest.err conftest.$ac_objext \ 41238- conftest$ac_exeext conftest.$ac_ext 41239-LIBS=$ac_check_lib_save_LIBS 41240-fi 41241-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5 41242-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6 41243-if test $ac_cv_lib_sqlite3_sqlite3_prepare_v2 = yes; then 41244+ builtin and then its argument prototype would still apply. */ 41245+char sqlite3_prepare_v2(); 41246 41247+int main() { 41248+sqlite3_prepare_v2() 41249+; return 0; } 41250+EOF 41251+if { (eval echo configure:24077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 41252+ rm -rf conftest* 41253+ eval "ac_cv_lib_$ac_lib_var=yes" 41254+else 41255+ echo "configure: failed program was:" >&5 41256+ cat conftest.$ac_ext >&5 41257+ rm -rf conftest* 41258+ eval "ac_cv_lib_$ac_lib_var=no" 41259+fi 41260+rm -f conftest* 41261+LIBS="$ac_save_LIBS" 41262+ 41263+fi 41264+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 41265+ echo "$ac_t""yes" 1>&6 41266+ 41267 LDFLAGS=$save_old_LDFLAGS 41268 ext_shared=$save_ext_shared 41269- 41270- echo "$as_me:$LINENO: result: found" >&5 41271-echo "${ECHO_T}found" >&6 41272- 41273+ 41274+ echo "$ac_t""found" 1>&6 41275+ 41276 41277 if test "$ext_shared" = "yes"; then 41278 SQLITE3_SHARED_LIBADD="-lsqlite3 $SQLITE3_SHARED_LIBADD" 41279 if test -n "$SQLITE3_DIR/$PHP_LIBDIR"; then 41280- 41281+ 41282 if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then 41283- 41284+ 41285 if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 41286 ai_p=$SQLITE3_DIR/$PHP_LIBDIR 41287 else 41288- 41289+ 41290 ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 41291- 41292+ 41293 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41294 ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`" 41295 fi 41296 41297- 41298+ 41299 if test "$ext_shared" = "yes"; then 41300 SQLITE3_SHARED_LIBADD="-L$ai_p $SQLITE3_SHARED_LIBADD" 41301 test -n "$ld_runpath_switch" && SQLITE3_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE3_SHARED_LIBADD" 41302 else 41303- 41304- 41305- 41306+ 41307+ 41308+ 41309 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41310- 41311+ 41312 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 41313 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41314 eval "LIBPATH$unique=set" 41315- 41316+ 41317 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 41318 LDFLAGS="$LDFLAGS -L$ai_p" 41319 PHP_RPATHS="$PHP_RPATHS $ai_p" 41320- 41321+ 41322 fi 41323 41324 41325 fi 41326- 41327+ 41328 fi 41329 41330 fi 41331 else 41332- 41333+ 41334 41335 if test -n "$SQLITE3_DIR/$PHP_LIBDIR"; then 41336- 41337+ 41338 if test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE3_DIR/$PHP_LIBDIR" != "/usr/lib"; then 41339- 41340+ 41341 if test -z "$SQLITE3_DIR/$PHP_LIBDIR" || echo "$SQLITE3_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 41342 ai_p=$SQLITE3_DIR/$PHP_LIBDIR 41343 else 41344- 41345+ 41346 ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 41347- 41348+ 41349 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41350 ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`" 41351 fi 41352 41353- 41354- 41355- 41356- 41357+ 41358+ 41359+ 41360+ 41361 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41362- 41363+ 41364 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 41365 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41366 eval "LIBPATH$unique=set" 41367- 41368+ 41369 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 41370 LDFLAGS="$LDFLAGS -L$ai_p" 41371 PHP_RPATHS="$PHP_RPATHS $ai_p" 41372- 41373+ 41374 fi 41375 41376 41377- 41378+ 41379 fi 41380 41381 fi 41382- 41383- 41384+ 41385+ 41386 case sqlite3 in 41387 c|c_r|pthread*) ;; 41388- *) 41389- LIBS="-lsqlite3 $LIBS" 41390+ *) 41391+ LIBS="-lsqlite3 $LIBS" 41392 ;; 41393 esac 41394 41395@@ -35216,72 +24190,70 @@ 41396 fi 41397 41398 41399- 41400+ 41401 if test "$SQLITE3_DIR/include" != "/usr/include"; then 41402- 41403+ 41404 if test -z "$SQLITE3_DIR/include" || echo "$SQLITE3_DIR/include" | grep '^/' >/dev/null ; then 41405 ai_p=$SQLITE3_DIR/include 41406 else 41407- 41408+ 41409 ep_dir="`echo $SQLITE3_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 41410- 41411+ 41412 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41413 ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/include\"`" 41414 fi 41415 41416- 41417- 41418+ 41419+ 41420 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41421- 41422+ 41423 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 41424 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41425 eval "INCLUDEPATH$unique=set" 41426- 41427+ 41428 if test ""; then 41429 INCLUDES="-I$ai_p $INCLUDES" 41430 else 41431 INCLUDES="$INCLUDES -I$ai_p" 41432 fi 41433- 41434+ 41435 fi 41436 41437 fi 41438 41439- 41440- 41441+ 41442+ 41443 else 41444+ echo "$ac_t""no" 1>&6 41445 41446 LDFLAGS=$save_old_LDFLAGS 41447 ext_shared=$save_ext_shared 41448 unset ac_cv_lib_sqlite3_sqlite3_prepare_v2 41449- 41450- echo "$as_me:$LINENO: result: not found" >&5 41451-echo "${ECHO_T}not found" >&6 41452- { { echo "$as_me:$LINENO: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&5 41453-echo "$as_me: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&2;} 41454- { (exit 1); exit 1; }; } 41455- 41456- 41457+ 41458+ echo "$ac_t""not found" 1>&6 41459+ { echo "configure: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" 1>&2; exit 1; } 41460+ 41461+ 41462 fi 41463 41464 41465- 41466+ 41467 save_old_LDFLAGS=$LDFLAGS 41468 ac_stuff="" 41469- 41470+ 41471 save_ext_shared=$ext_shared 41472 ext_shared=yes 41473- 41474+ 41475 for ac_i in $ac_stuff; do 41476 case $ac_i in 41477 -pthread) 41478 if test "$ext_shared" = "yes"; then 41479 LDFLAGS="$LDFLAGS -pthread" 41480 else 41481- 41482- 41483+ 41484+ 41485 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 41486- 41487+ 41488 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 41489 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41490 eval "EXTRA_LDFLAGS$unique=set" 41491@@ -35292,20 +24264,20 @@ 41492 ;; 41493 -l*) 41494 ac_ii=`echo $ac_i|cut -c 3-` 41495- 41496- 41497+ 41498+ 41499 case $ac_ii in 41500 c|c_r|pthread*) ;; 41501- *) 41502+ *) 41503 if test "$ext_shared" = "yes"; then 41504- LDFLAGS="$LDFLAGS -l$ac_ii" 41505+ LDFLAGS="$LDFLAGS -l$ac_ii" 41506 else 41507- 41508- 41509+ 41510+ 41511 case $ac_ii in 41512 c|c_r|pthread*) ;; 41513- *) 41514- LIBS="$LIBS -l$ac_ii" 41515+ *) 41516+ LIBS="$LIBS -l$ac_ii" 41517 ;; 41518 esac 41519 41520@@ -35318,151 +24290,121 @@ 41521 ;; 41522 -L*) 41523 ac_ii=`echo $ac_i|cut -c 3-` 41524- 41525+ 41526 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 41527- 41528+ 41529 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 41530 ai_p=$ac_ii 41531 else 41532- 41533+ 41534 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 41535- 41536+ 41537 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41538 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 41539 fi 41540 41541- 41542+ 41543 if test "$ext_shared" = "yes"; then 41544 LDFLAGS="-L$ai_p $LDFLAGS" 41545 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 41546 else 41547- 41548- 41549- 41550+ 41551+ 41552+ 41553 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41554- 41555+ 41556 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 41557 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41558 eval "LIBPATH$unique=set" 41559- 41560+ 41561 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 41562 LDFLAGS="$LDFLAGS -L$ai_p" 41563 PHP_RPATHS="$PHP_RPATHS $ai_p" 41564- 41565+ 41566 fi 41567 41568 41569 fi 41570- 41571+ 41572 fi 41573 41574 ;; 41575 esac 41576 done 41577 41578- echo "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5 41579-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6 41580-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then 41581- echo $ECHO_N "(cached) $ECHO_C" >&6 41582+ echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 41583+echo "configure:24337: checking for sqlite3_key in -lsqlite3" >&5 41584+ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` 41585+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 41586+ echo $ac_n "(cached) $ac_c" 1>&6 41587 else 41588- ac_check_lib_save_LIBS=$LIBS 41589+ ac_save_LIBS="$LIBS" 41590 LIBS="-lsqlite3 $LIBS" 41591-cat >conftest.$ac_ext <<_ACEOF 41592-/* confdefs.h. */ 41593-_ACEOF 41594-cat confdefs.h >>conftest.$ac_ext 41595-cat >>conftest.$ac_ext <<_ACEOF 41596-/* end confdefs.h. */ 41597- 41598+cat > conftest.$ac_ext <<EOF 41599+#line 24345 "configure" 41600+#include "confdefs.h" 41601 /* Override any gcc2 internal prototype to avoid an error. */ 41602-#ifdef __cplusplus 41603-extern "C" 41604-#endif 41605 /* We use char because int might match the return type of a gcc2 41606- builtin and then its argument prototype would still apply. */ 41607-char sqlite3_key (); 41608-int 41609-main () 41610-{ 41611-sqlite3_key (); 41612- ; 41613- return 0; 41614-} 41615-_ACEOF 41616-rm -f conftest.$ac_objext conftest$ac_exeext 41617-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 41618- (eval $ac_link) 2>conftest.er1 41619- ac_status=$? 41620- grep -v '^ *+' conftest.er1 >conftest.err 41621- rm -f conftest.er1 41622- cat conftest.err >&5 41623- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41624- (exit $ac_status); } && 41625- { ac_try='test -z "$ac_c_werror_flag" 41626- || test ! -s conftest.err' 41627- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41628- (eval $ac_try) 2>&5 41629- ac_status=$? 41630- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41631- (exit $ac_status); }; } && 41632- { ac_try='test -s conftest$ac_exeext' 41633- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41634- (eval $ac_try) 2>&5 41635- ac_status=$? 41636- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41637- (exit $ac_status); }; }; then 41638- ac_cv_lib_sqlite3_sqlite3_key=yes 41639-else 41640- echo "$as_me: failed program was:" >&5 41641-sed 's/^/| /' conftest.$ac_ext >&5 41642- 41643-ac_cv_lib_sqlite3_sqlite3_key=no 41644-fi 41645-rm -f conftest.err conftest.$ac_objext \ 41646- conftest$ac_exeext conftest.$ac_ext 41647-LIBS=$ac_check_lib_save_LIBS 41648-fi 41649-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 41650-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6 41651-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then 41652+ builtin and then its argument prototype would still apply. */ 41653+char sqlite3_key(); 41654+ 41655+int main() { 41656+sqlite3_key() 41657+; return 0; } 41658+EOF 41659+if { (eval echo configure:24356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 41660+ rm -rf conftest* 41661+ eval "ac_cv_lib_$ac_lib_var=yes" 41662+else 41663+ echo "configure: failed program was:" >&5 41664+ cat conftest.$ac_ext >&5 41665+ rm -rf conftest* 41666+ eval "ac_cv_lib_$ac_lib_var=no" 41667+fi 41668+rm -f conftest* 41669+LIBS="$ac_save_LIBS" 41670 41671+fi 41672+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 41673+ echo "$ac_t""yes" 1>&6 41674+ 41675 LDFLAGS=$save_old_LDFLAGS 41676 ext_shared=$save_ext_shared 41677- 41678- 41679-cat >>confdefs.h <<\_ACEOF 41680+ 41681+ cat >> confdefs.h <<\EOF 41682 #define HAVE_SQLITE3_KEY 1 41683-_ACEOF 41684- 41685- 41686+EOF 41687 41688+ 41689+ 41690 else 41691+ echo "$ac_t""no" 1>&6 41692 41693 LDFLAGS=$save_old_LDFLAGS 41694 ext_shared=$save_ext_shared 41695 unset ac_cv_lib_sqlite3_sqlite3_key 41696- 41697- 41698+ 41699+ 41700 fi 41701 41702 41703- 41704+ 41705 save_old_LDFLAGS=$LDFLAGS 41706 ac_stuff="" 41707- 41708+ 41709 save_ext_shared=$ext_shared 41710 ext_shared=yes 41711- 41712+ 41713 for ac_i in $ac_stuff; do 41714 case $ac_i in 41715 -pthread) 41716 if test "$ext_shared" = "yes"; then 41717 LDFLAGS="$LDFLAGS -pthread" 41718 else 41719- 41720- 41721+ 41722+ 41723 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 41724- 41725+ 41726 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 41727 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41728 eval "EXTRA_LDFLAGS$unique=set" 41729@@ -35473,20 +24415,20 @@ 41730 ;; 41731 -l*) 41732 ac_ii=`echo $ac_i|cut -c 3-` 41733- 41734- 41735+ 41736+ 41737 case $ac_ii in 41738 c|c_r|pthread*) ;; 41739- *) 41740+ *) 41741 if test "$ext_shared" = "yes"; then 41742- LDFLAGS="$LDFLAGS -l$ac_ii" 41743+ LDFLAGS="$LDFLAGS -l$ac_ii" 41744 else 41745- 41746- 41747+ 41748+ 41749 case $ac_ii in 41750 c|c_r|pthread*) ;; 41751- *) 41752- LIBS="$LIBS -l$ac_ii" 41753+ *) 41754+ LIBS="$LIBS -l$ac_ii" 41755 ;; 41756 esac 41757 41758@@ -35499,138 +24441,107 @@ 41759 ;; 41760 -L*) 41761 ac_ii=`echo $ac_i|cut -c 3-` 41762- 41763+ 41764 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 41765- 41766+ 41767 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 41768 ai_p=$ac_ii 41769 else 41770- 41771+ 41772 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 41773- 41774+ 41775 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 41776 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 41777 fi 41778 41779- 41780+ 41781 if test "$ext_shared" = "yes"; then 41782 LDFLAGS="-L$ai_p $LDFLAGS" 41783 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 41784 else 41785- 41786- 41787- 41788+ 41789+ 41790+ 41791 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 41792- 41793+ 41794 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 41795 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41796 eval "LIBPATH$unique=set" 41797- 41798+ 41799 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 41800 LDFLAGS="$LDFLAGS -L$ai_p" 41801 PHP_RPATHS="$PHP_RPATHS $ai_p" 41802- 41803+ 41804 fi 41805 41806 41807 fi 41808- 41809+ 41810 fi 41811 41812 ;; 41813 esac 41814 done 41815 41816- echo "$as_me:$LINENO: checking for sqlite3_load_extension in -lsqlite3" >&5 41817-echo $ECHO_N "checking for sqlite3_load_extension in -lsqlite3... $ECHO_C" >&6 41818-if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then 41819- echo $ECHO_N "(cached) $ECHO_C" >&6 41820+ echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6 41821+echo "configure:24488: checking for sqlite3_load_extension in -lsqlite3" >&5 41822+ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'` 41823+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 41824+ echo $ac_n "(cached) $ac_c" 1>&6 41825 else 41826- ac_check_lib_save_LIBS=$LIBS 41827+ ac_save_LIBS="$LIBS" 41828 LIBS="-lsqlite3 $LIBS" 41829-cat >conftest.$ac_ext <<_ACEOF 41830-/* confdefs.h. */ 41831-_ACEOF 41832-cat confdefs.h >>conftest.$ac_ext 41833-cat >>conftest.$ac_ext <<_ACEOF 41834-/* end confdefs.h. */ 41835- 41836+cat > conftest.$ac_ext <<EOF 41837+#line 24496 "configure" 41838+#include "confdefs.h" 41839 /* Override any gcc2 internal prototype to avoid an error. */ 41840-#ifdef __cplusplus 41841-extern "C" 41842-#endif 41843 /* We use char because int might match the return type of a gcc2 41844- builtin and then its argument prototype would still apply. */ 41845-char sqlite3_load_extension (); 41846-int 41847-main () 41848-{ 41849-sqlite3_load_extension (); 41850- ; 41851- return 0; 41852-} 41853-_ACEOF 41854-rm -f conftest.$ac_objext conftest$ac_exeext 41855-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 41856- (eval $ac_link) 2>conftest.er1 41857- ac_status=$? 41858- grep -v '^ *+' conftest.er1 >conftest.err 41859- rm -f conftest.er1 41860- cat conftest.err >&5 41861- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41862- (exit $ac_status); } && 41863- { ac_try='test -z "$ac_c_werror_flag" 41864- || test ! -s conftest.err' 41865- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41866- (eval $ac_try) 2>&5 41867- ac_status=$? 41868- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41869- (exit $ac_status); }; } && 41870- { ac_try='test -s conftest$ac_exeext' 41871- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 41872- (eval $ac_try) 2>&5 41873- ac_status=$? 41874- echo "$as_me:$LINENO: \$? = $ac_status" >&5 41875- (exit $ac_status); }; }; then 41876- ac_cv_lib_sqlite3_sqlite3_load_extension=yes 41877-else 41878- echo "$as_me: failed program was:" >&5 41879-sed 's/^/| /' conftest.$ac_ext >&5 41880- 41881-ac_cv_lib_sqlite3_sqlite3_load_extension=no 41882-fi 41883-rm -f conftest.err conftest.$ac_objext \ 41884- conftest$ac_exeext conftest.$ac_ext 41885-LIBS=$ac_check_lib_save_LIBS 41886-fi 41887-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5 41888-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6 41889-if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then 41890+ builtin and then its argument prototype would still apply. */ 41891+char sqlite3_load_extension(); 41892+ 41893+int main() { 41894+sqlite3_load_extension() 41895+; return 0; } 41896+EOF 41897+if { (eval echo configure:24507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 41898+ rm -rf conftest* 41899+ eval "ac_cv_lib_$ac_lib_var=yes" 41900+else 41901+ echo "configure: failed program was:" >&5 41902+ cat conftest.$ac_ext >&5 41903+ rm -rf conftest* 41904+ eval "ac_cv_lib_$ac_lib_var=no" 41905+fi 41906+rm -f conftest* 41907+LIBS="$ac_save_LIBS" 41908 41909+fi 41910+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 41911+ echo "$ac_t""yes" 1>&6 41912+ 41913 LDFLAGS=$save_old_LDFLAGS 41914 ext_shared=$save_ext_shared 41915- 41916- 41917+ 41918+ 41919 else 41920+ echo "$ac_t""no" 1>&6 41921 41922 LDFLAGS=$save_old_LDFLAGS 41923 ext_shared=$save_ext_shared 41924 unset ac_cv_lib_sqlite3_sqlite3_load_extension 41925- 41926-cat >>confdefs.h <<\_ACEOF 41927+ cat >> confdefs.h <<\EOF 41928 #define SQLITE_OMIT_LOAD_EXTENSION 1 41929-_ACEOF 41930- 41931- 41932+EOF 41933 41934+ 41935+ 41936 fi 41937 41938 41939 else 41940- echo "$as_me:$LINENO: checking bundled sqlite3 library" >&5 41941-echo $ECHO_N "checking bundled sqlite3 library... $ECHO_C" >&6 41942- echo "$as_me:$LINENO: result: yes" >&5 41943-echo "${ECHO_T}yes" >&6 41944+ echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6 41945+echo "configure:24544: checking bundled sqlite3 library" >&5 41946+ echo "$ac_t""yes" 1>&6 41947 41948 sqlite3_extra_sources="libsqlite/sqlite3.c" 41949 41950@@ -35651,35 +24562,34 @@ 41951 fi 41952 41953 PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" 41954- 41955- 41956+ 41957+ 41958 for header_file in ext/sqlite3/libsqlite/sqlite3.h; do 41959- 41960- 41961+ 41962+ 41963 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 41964- 41965+ 41966 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 41967 if test -n "$unique" && test "`eval $cmd`" = "" ; then 41968 eval "INSTALLHEADERS$unique=set" 41969- 41970+ 41971 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 41972- 41973+ 41974 fi 41975 41976- done 41977- 41978+ done 41979+ 41980 41981 fi 41982 41983- 41984-cat >>confdefs.h <<\_ACEOF 41985+ cat >> confdefs.h <<\EOF 41986 #define HAVE_SQLITE3 1 41987-_ACEOF 41988+EOF 41989 41990 41991 sqlite3_sources="sqlite3.c $sqlite3_extra_sources" 41992 41993- 41994+ 41995 ext_builddir=ext/sqlite3 41996 ext_srcdir=$abs_srcdir/ext/sqlite3 41997 41998@@ -35687,15 +24597,15 @@ 41999 42000 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 42001 PHP_SQLITE3_SHARED=no 42002- 42003- 42004+ 42005+ 42006 case ext/sqlite3 in 42007 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42008 /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42009 *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42010 esac 42011- 42012- 42013+ 42014+ 42015 42016 b_c_pre=$php_c_pre 42017 b_cxx_pre=$php_cxx_pre 42018@@ -35708,12 +24618,12 @@ 42019 42020 old_IFS=$IFS 42021 for ac_src in $sqlite3_sources; do 42022- 42023+ 42024 IFS=. 42025 set $ac_src 42026 ac_obj=$1 42027 IFS=$old_IFS 42028- 42029+ 42030 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42031 42032 case $ac_src in 42033@@ -35737,14 +24647,14 @@ 42034 else 42035 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 42036 PHP_SQLITE3_SHARED=yes 42037- 42038+ 42039 case ext/sqlite3 in 42040 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42041 /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42042 *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42043 esac 42044- 42045- 42046+ 42047+ 42048 42049 b_c_pre=$shared_c_pre 42050 b_cxx_pre=$shared_cxx_pre 42051@@ -35757,12 +24667,12 @@ 42052 42053 old_IFS=$IFS 42054 for ac_src in $sqlite3_sources; do 42055- 42056+ 42057 IFS=. 42058 set $ac_src 42059 ac_obj=$1 42060 IFS=$old_IFS 42061- 42062+ 42063 shared_objects_sqlite3="$shared_objects_sqlite3 $ac_bdir$ac_obj.lo" 42064 42065 case $ac_src in 42066@@ -35780,7 +24690,7 @@ 42067 42068 case $host_alias in 42069 *netware*) 42070- 42071+ 42072 install_modules="install-modules" 42073 42074 case $host_alias in 42075@@ -35790,7 +24700,7 @@ 42076 ;; 42077 *netware*) 42078 suffix=nlm 42079- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(SQLITE3_SHARED_LIBADD)' 42080+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE3, 3)_SHARED_LIBADD)' 42081 ;; 42082 *) 42083 suffix=la 42084@@ -35803,7 +24713,7 @@ 42085 else 42086 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite3.$suffix" 42087 fi 42088- 42089+ 42090 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite3" 42091 42092 cat >>Makefile.objects<<EOF 42093@@ -35817,7 +24727,7 @@ 42094 42095 ;; 42096 *) 42097- 42098+ 42099 install_modules="install-modules" 42100 42101 case $host_alias in 42102@@ -35827,7 +24737,7 @@ 42103 ;; 42104 *netware*) 42105 suffix=nlm 42106- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(ITE3_SHARED_LIBADD)' 42107+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite3) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE3, 3)_SHARED_LIBADD)' 42108 ;; 42109 *) 42110 suffix=la 42111@@ -35840,7 +24750,7 @@ 42112 else 42113 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite3.$suffix" 42114 fi 42115- 42116+ 42117 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite3" 42118 42119 cat >>Makefile.objects<<EOF 42120@@ -35854,10 +24764,9 @@ 42121 42122 ;; 42123 esac 42124- 42125-cat >>confdefs.h <<_ACEOF 42126+ cat >> confdefs.h <<EOF 42127 #define COMPILE_DL_SQLITE3 1 42128-_ACEOF 42129+EOF 42130 42131 fi 42132 fi 42133@@ -35866,15 +24775,15 @@ 42134 PHP_SQLITE3_SHARED=no 42135 case "$PHP_SAPI" in 42136 cgi|embed) 42137- 42138- 42139+ 42140+ 42141 case ext/sqlite3 in 42142 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42143 /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42144 *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42145 esac 42146- 42147- 42148+ 42149+ 42150 42151 b_c_pre=$php_c_pre 42152 b_cxx_pre=$php_cxx_pre 42153@@ -35887,12 +24796,12 @@ 42154 42155 old_IFS=$IFS 42156 for ac_src in $sqlite3_sources; do 42157- 42158+ 42159 IFS=. 42160 set $ac_src 42161 ac_obj=$1 42162 IFS=$old_IFS 42163- 42164+ 42165 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42166 42167 case $ac_src in 42168@@ -35912,15 +24821,15 @@ 42169 EXT_STATIC="$EXT_STATIC sqlite3" 42170 ;; 42171 *) 42172- 42173- 42174+ 42175+ 42176 case ext/sqlite3 in 42177 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42178 /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42179 *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42180 esac 42181- 42182- 42183+ 42184+ 42185 42186 b_c_pre=$php_c_pre 42187 b_cxx_pre=$php_cxx_pre 42188@@ -35933,13 +24842,13 @@ 42189 42190 old_IFS=$IFS 42191 for ac_src in $sqlite3_sources; do 42192- 42193+ 42194 IFS=. 42195 set $ac_src 42196 ac_obj=$1 42197 IFS=$old_IFS 42198- 42199- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 42200+ 42201+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42202 42203 case $ac_src in 42204 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 42205@@ -35959,25 +24868,25 @@ 42206 esac 42207 EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite3" 42208 fi 42209- 42210- 42211+ 42212+ 42213 BUILD_DIR="$BUILD_DIR $ext_builddir" 42214- 42215+ 42216 42217 42218 if test "$ext_builddir" = "."; then 42219 PHP_PECL_EXTENSION=sqlite3 42220- 42221+ 42222 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 42223 42224 fi 42225 42226- 42227- 42228+ 42229+ 42230 BUILD_DIR="$BUILD_DIR $ext_builddir/libsqlite" 42231+ 42232 42233- 42234- 42235+ 42236 PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE3_SHARED_LIBADD" 42237 42238 fi 42239@@ -35986,19 +24895,19 @@ 42240 42241 php_with_zlib=no 42242 42243-echo "$as_me:$LINENO: checking for ZLIB support" >&5 42244-echo $ECHO_N "checking for ZLIB support... $ECHO_C" >&6 42245- 42246+echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 42247+echo "configure:24900: checking for ZLIB support" >&5 42248 # Check whether --with-zlib or --without-zlib was given. 42249 if test "${with_zlib+set}" = set; then 42250 withval="$with_zlib" 42251 PHP_ZLIB=$withval 42252 else 42253- 42254+ 42255 PHP_ZLIB=no 42256 test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL 42257 42258-fi; 42259+fi 42260+ 42261 42262 42263 ext_output="yes, shared" 42264@@ -36022,8 +24931,7 @@ 42265 42266 42267 42268-echo "$as_me:$LINENO: result: $ext_output" >&5 42269-echo "${ECHO_T}$ext_output" >&6 42270+echo "$ac_t""$ext_output" 1>&6 42271 42272 42273 42274@@ -36031,29 +24939,28 @@ 42275 42276 php_with_zlib_dir=no 42277 42278-echo "$as_me:$LINENO: checking if the location of ZLIB install directory is defined" >&5 42279-echo $ECHO_N "checking if the location of ZLIB install directory is defined... $ECHO_C" >&6 42280- 42281+echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 42282+echo "configure:24944: checking if the location of ZLIB install directory is defined" >&5 42283 # Check whether --with-zlib-dir or --without-zlib-dir was given. 42284 if test "${with_zlib_dir+set}" = set; then 42285 withval="$with_zlib_dir" 42286 PHP_ZLIB_DIR=$withval 42287 else 42288- 42289+ 42290 PHP_ZLIB_DIR=no 42291+ 42292 42293+fi 42294 42295-fi; 42296 42297 ext_output=$PHP_ZLIB_DIR 42298-echo "$as_me:$LINENO: result: $ext_output" >&5 42299-echo "${ECHO_T}$ext_output" >&6 42300+echo "$ac_t""$ext_output" 1>&6 42301 42302 42303 42304 42305 if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then 42306- 42307+ 42308 ext_builddir=ext/zlib 42309 ext_srcdir=$abs_srcdir/ext/zlib 42310 42311@@ -36061,15 +24968,15 @@ 42312 42313 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 42314 PHP_ZLIB_SHARED=no 42315- 42316- 42317+ 42318+ 42319 case ext/zlib in 42320 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42321 /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42322 *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42323 esac 42324- 42325- 42326+ 42327+ 42328 42329 b_c_pre=$php_c_pre 42330 b_cxx_pre=$php_cxx_pre 42331@@ -36082,12 +24989,12 @@ 42332 42333 old_IFS=$IFS 42334 for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do 42335- 42336+ 42337 IFS=. 42338 set $ac_src 42339 ac_obj=$1 42340 IFS=$old_IFS 42341- 42342+ 42343 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42344 42345 case $ac_src in 42346@@ -36111,14 +25018,14 @@ 42347 else 42348 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 42349 PHP_ZLIB_SHARED=yes 42350- 42351+ 42352 case ext/zlib in 42353 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42354 /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42355 *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42356 esac 42357- 42358- 42359+ 42360+ 42361 42362 b_c_pre=$shared_c_pre 42363 b_cxx_pre=$shared_cxx_pre 42364@@ -36131,12 +25038,12 @@ 42365 42366 old_IFS=$IFS 42367 for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do 42368- 42369+ 42370 IFS=. 42371 set $ac_src 42372 ac_obj=$1 42373 IFS=$old_IFS 42374- 42375+ 42376 shared_objects_zlib="$shared_objects_zlib $ac_bdir$ac_obj.lo" 42377 42378 case $ac_src in 42379@@ -36154,7 +25061,7 @@ 42380 42381 case $host_alias in 42382 *netware*) 42383- 42384+ 42385 install_modules="install-modules" 42386 42387 case $host_alias in 42388@@ -36164,7 +25071,7 @@ 42389 ;; 42390 *netware*) 42391 suffix=nlm 42392- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(ZLIB_SHARED_LIBADD)' 42393+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZLIB, 3)_SHARED_LIBADD)' 42394 ;; 42395 *) 42396 suffix=la 42397@@ -36177,7 +25084,7 @@ 42398 else 42399 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzlib.$suffix" 42400 fi 42401- 42402+ 42403 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zlib" 42404 42405 cat >>Makefile.objects<<EOF 42406@@ -36191,7 +25098,7 @@ 42407 42408 ;; 42409 *) 42410- 42411+ 42412 install_modules="install-modules" 42413 42414 case $host_alias in 42415@@ -36201,7 +25108,7 @@ 42416 ;; 42417 *netware*) 42418 suffix=nlm 42419- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(B_SHARED_LIBADD)' 42420+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zlib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZLIB, 3)_SHARED_LIBADD)' 42421 ;; 42422 *) 42423 suffix=la 42424@@ -36214,7 +25121,7 @@ 42425 else 42426 PHP_MODULES="$PHP_MODULES \$(phplibdir)/zlib.$suffix" 42427 fi 42428- 42429+ 42430 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zlib" 42431 42432 cat >>Makefile.objects<<EOF 42433@@ -36228,10 +25135,9 @@ 42434 42435 ;; 42436 esac 42437- 42438-cat >>confdefs.h <<_ACEOF 42439+ cat >> confdefs.h <<EOF 42440 #define COMPILE_DL_ZLIB 1 42441-_ACEOF 42442+EOF 42443 42444 fi 42445 fi 42446@@ -36240,15 +25146,15 @@ 42447 PHP_ZLIB_SHARED=no 42448 case "$PHP_SAPI" in 42449 cgi|embed) 42450- 42451- 42452+ 42453+ 42454 case ext/zlib in 42455 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42456 /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42457 *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42458 esac 42459- 42460- 42461+ 42462+ 42463 42464 b_c_pre=$php_c_pre 42465 b_cxx_pre=$php_cxx_pre 42466@@ -36261,12 +25167,12 @@ 42467 42468 old_IFS=$IFS 42469 for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do 42470- 42471+ 42472 IFS=. 42473 set $ac_src 42474 ac_obj=$1 42475 IFS=$old_IFS 42476- 42477+ 42478 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42479 42480 case $ac_src in 42481@@ -36286,15 +25192,15 @@ 42482 EXT_STATIC="$EXT_STATIC zlib" 42483 ;; 42484 *) 42485- 42486- 42487+ 42488+ 42489 case ext/zlib in 42490 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42491 /*) ac_srcdir=`echo "ext/zlib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42492 *) ac_srcdir="$abs_srcdir/ext/zlib/"; ac_bdir="ext/zlib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42493 esac 42494- 42495- 42496+ 42497+ 42498 42499 b_c_pre=$php_c_pre 42500 b_cxx_pre=$php_cxx_pre 42501@@ -36307,13 +25213,13 @@ 42502 42503 old_IFS=$IFS 42504 for ac_src in zlib.c zlib_fopen_wrapper.c zlib_filter.c; do 42505- 42506+ 42507 IFS=. 42508 set $ac_src 42509 ac_obj=$1 42510 IFS=$old_IFS 42511- 42512- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 42513+ 42514+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 42515 42516 case $ac_src in 42517 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 42518@@ -36333,24 +25239,24 @@ 42519 esac 42520 EXT_CLI_STATIC="$EXT_CLI_STATIC zlib" 42521 fi 42522- 42523- 42524+ 42525+ 42526 BUILD_DIR="$BUILD_DIR $ext_builddir" 42527- 42528+ 42529 42530 42531 if test "$ext_builddir" = "."; then 42532 PHP_PECL_EXTENSION=zlib 42533- 42534+ 42535 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 42536 42537 fi 42538 42539- 42540+ 42541 PHP_VAR_SUBST="$PHP_VAR_SUBST ZLIB_SHARED_LIBADD" 42542 42543- 42544- if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 42545+ 42546+ if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 42547 if test -f $PHP_ZLIB/include/zlib/zlib.h; then 42548 ZLIB_DIR=$PHP_ZLIB 42549 ZLIB_INCDIR=$ZLIB_DIR/include/zlib 42550@@ -36358,7 +25264,7 @@ 42551 ZLIB_DIR=$PHP_ZLIB 42552 ZLIB_INCDIR=$ZLIB_DIR/include 42553 fi 42554- else 42555+ else 42556 for i in /usr/local /usr $PHP_ZLIB_DIR; do 42557 if test -f $i/include/zlib/zlib.h; then 42558 ZLIB_DIR=$i 42559@@ -36369,37 +25275,35 @@ 42560 fi 42561 done 42562 fi 42563- 42564+ 42565 if test -z "$ZLIB_DIR"; then 42566- { { echo "$as_me:$LINENO: error: Cannot find libz" >&5 42567-echo "$as_me: error: Cannot find libz" >&2;} 42568- { (exit 1); exit 1; }; } 42569+ { echo "configure: error: Cannot find libz" 1>&2; exit 1; } 42570 fi 42571 42572 case $ZLIB_DIR in 42573- /usr) ac_extra= ;; 42574+ /usr) ac_extra= ;; 42575 *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; 42576 esac 42577 42578- 42579+ 42580 save_old_LDFLAGS=$LDFLAGS 42581 ac_stuff=" 42582 $ac_extra 42583 " 42584- 42585+ 42586 save_ext_shared=$ext_shared 42587 ext_shared=yes 42588- 42589+ 42590 for ac_i in $ac_stuff; do 42591 case $ac_i in 42592 -pthread) 42593 if test "$ext_shared" = "yes"; then 42594 LDFLAGS="$LDFLAGS -pthread" 42595 else 42596- 42597- 42598+ 42599+ 42600 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 42601- 42602+ 42603 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 42604 if test -n "$unique" && test "`eval $cmd`" = "" ; then 42605 eval "EXTRA_LDFLAGS$unique=set" 42606@@ -36410,20 +25314,20 @@ 42607 ;; 42608 -l*) 42609 ac_ii=`echo $ac_i|cut -c 3-` 42610- 42611- 42612+ 42613+ 42614 case $ac_ii in 42615 c|c_r|pthread*) ;; 42616- *) 42617+ *) 42618 if test "$ext_shared" = "yes"; then 42619- LDFLAGS="$LDFLAGS -l$ac_ii" 42620+ LDFLAGS="$LDFLAGS -l$ac_ii" 42621 else 42622- 42623- 42624+ 42625+ 42626 case $ac_ii in 42627 c|c_r|pthread*) ;; 42628- *) 42629- LIBS="$LIBS -l$ac_ii" 42630+ *) 42631+ LIBS="$LIBS -l$ac_ii" 42632 ;; 42633 esac 42634 42635@@ -36436,192 +25340,160 @@ 42636 ;; 42637 -L*) 42638 ac_ii=`echo $ac_i|cut -c 3-` 42639- 42640+ 42641 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 42642- 42643+ 42644 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 42645 ai_p=$ac_ii 42646 else 42647- 42648+ 42649 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 42650- 42651+ 42652 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 42653 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 42654 fi 42655 42656- 42657+ 42658 if test "$ext_shared" = "yes"; then 42659 LDFLAGS="-L$ai_p $LDFLAGS" 42660 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 42661 else 42662- 42663- 42664- 42665+ 42666+ 42667+ 42668 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 42669- 42670+ 42671 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 42672 if test -n "$unique" && test "`eval $cmd`" = "" ; then 42673 eval "LIBPATH$unique=set" 42674- 42675+ 42676 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 42677 LDFLAGS="$LDFLAGS -L$ai_p" 42678 PHP_RPATHS="$PHP_RPATHS $ai_p" 42679- 42680+ 42681 fi 42682 42683 42684 fi 42685- 42686+ 42687 fi 42688 42689 ;; 42690 esac 42691 done 42692 42693- echo "$as_me:$LINENO: checking for gzgets in -lz" >&5 42694-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6 42695-if test "${ac_cv_lib_z_gzgets+set}" = set; then 42696- echo $ECHO_N "(cached) $ECHO_C" >&6 42697+ echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 42698+echo "configure:25387: checking for gzgets in -lz" >&5 42699+ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'` 42700+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 42701+ echo $ac_n "(cached) $ac_c" 1>&6 42702 else 42703- ac_check_lib_save_LIBS=$LIBS 42704+ ac_save_LIBS="$LIBS" 42705 LIBS="-lz $LIBS" 42706-cat >conftest.$ac_ext <<_ACEOF 42707-/* confdefs.h. */ 42708-_ACEOF 42709-cat confdefs.h >>conftest.$ac_ext 42710-cat >>conftest.$ac_ext <<_ACEOF 42711-/* end confdefs.h. */ 42712- 42713+cat > conftest.$ac_ext <<EOF 42714+#line 25395 "configure" 42715+#include "confdefs.h" 42716 /* Override any gcc2 internal prototype to avoid an error. */ 42717-#ifdef __cplusplus 42718-extern "C" 42719-#endif 42720 /* We use char because int might match the return type of a gcc2 42721- builtin and then its argument prototype would still apply. */ 42722-char gzgets (); 42723-int 42724-main () 42725-{ 42726-gzgets (); 42727- ; 42728- return 0; 42729-} 42730-_ACEOF 42731-rm -f conftest.$ac_objext conftest$ac_exeext 42732-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 42733- (eval $ac_link) 2>conftest.er1 42734- ac_status=$? 42735- grep -v '^ *+' conftest.er1 >conftest.err 42736- rm -f conftest.er1 42737- cat conftest.err >&5 42738- echo "$as_me:$LINENO: \$? = $ac_status" >&5 42739- (exit $ac_status); } && 42740- { ac_try='test -z "$ac_c_werror_flag" 42741- || test ! -s conftest.err' 42742- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 42743- (eval $ac_try) 2>&5 42744- ac_status=$? 42745- echo "$as_me:$LINENO: \$? = $ac_status" >&5 42746- (exit $ac_status); }; } && 42747- { ac_try='test -s conftest$ac_exeext' 42748- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 42749- (eval $ac_try) 2>&5 42750- ac_status=$? 42751- echo "$as_me:$LINENO: \$? = $ac_status" >&5 42752- (exit $ac_status); }; }; then 42753- ac_cv_lib_z_gzgets=yes 42754-else 42755- echo "$as_me: failed program was:" >&5 42756-sed 's/^/| /' conftest.$ac_ext >&5 42757- 42758-ac_cv_lib_z_gzgets=no 42759-fi 42760-rm -f conftest.err conftest.$ac_objext \ 42761- conftest$ac_exeext conftest.$ac_ext 42762-LIBS=$ac_check_lib_save_LIBS 42763-fi 42764-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5 42765-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6 42766-if test $ac_cv_lib_z_gzgets = yes; then 42767+ builtin and then its argument prototype would still apply. */ 42768+char gzgets(); 42769+ 42770+int main() { 42771+gzgets() 42772+; return 0; } 42773+EOF 42774+if { (eval echo configure:25406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 42775+ rm -rf conftest* 42776+ eval "ac_cv_lib_$ac_lib_var=yes" 42777+else 42778+ echo "configure: failed program was:" >&5 42779+ cat conftest.$ac_ext >&5 42780+ rm -rf conftest* 42781+ eval "ac_cv_lib_$ac_lib_var=no" 42782+fi 42783+rm -f conftest* 42784+LIBS="$ac_save_LIBS" 42785 42786+fi 42787+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 42788+ echo "$ac_t""yes" 1>&6 42789+ 42790 LDFLAGS=$save_old_LDFLAGS 42791 ext_shared=$save_ext_shared 42792- 42793- 42794-cat >>confdefs.h <<\_ACEOF 42795+ 42796+ cat >> confdefs.h <<\EOF 42797 #define HAVE_ZLIB 1 42798-_ACEOF 42799- 42800- 42801- 42802+EOF 42803+ 42804+ 42805+ 42806 else 42807+ echo "$ac_t""no" 1>&6 42808 42809 LDFLAGS=$save_old_LDFLAGS 42810 ext_shared=$save_ext_shared 42811 unset ac_cv_lib_z_gzgets 42812- 42813- { { echo "$as_me:$LINENO: error: ZLIB extension requires zlib >= 1.0.9" >&5 42814-echo "$as_me: error: ZLIB extension requires zlib >= 1.0.9" >&2;} 42815- { (exit 1); exit 1; }; } 42816- 42817- 42818+ 42819+ { echo "configure: error: ZLIB extension requires zlib >= 1.0.9" 1>&2; exit 1; } 42820+ 42821+ 42822 fi 42823 42824 42825- 42826+ 42827 if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 42828- 42829+ 42830 if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 42831 ai_p=$ZLIB_DIR/$PHP_LIBDIR 42832 else 42833- 42834+ 42835 ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 42836- 42837+ 42838 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 42839 ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" 42840 fi 42841 42842- 42843+ 42844 if test "$ext_shared" = "yes"; then 42845 ZLIB_SHARED_LIBADD="-L$ai_p $ZLIB_SHARED_LIBADD" 42846 test -n "$ld_runpath_switch" && ZLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZLIB_SHARED_LIBADD" 42847 else 42848- 42849- 42850- 42851+ 42852+ 42853+ 42854 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 42855- 42856+ 42857 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 42858 if test -n "$unique" && test "`eval $cmd`" = "" ; then 42859 eval "LIBPATH$unique=set" 42860- 42861+ 42862 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 42863 LDFLAGS="$LDFLAGS -L$ai_p" 42864 PHP_RPATHS="$PHP_RPATHS $ai_p" 42865- 42866+ 42867 fi 42868 42869 42870 fi 42871- 42872+ 42873 fi 42874 42875 42876 PHP_ZLIB_DIR=$ZLIB_DIR 42877- 42878- 42879+ 42880+ 42881 case z in 42882 c|c_r|pthread*) ;; 42883- *) 42884+ *) 42885 if test "$ext_shared" = "yes"; then 42886- ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD" 42887+ ZLIB_SHARED_LIBADD="-lz $ZLIB_SHARED_LIBADD" 42888 else 42889- 42890- 42891+ 42892+ 42893 case z in 42894 c|c_r|pthread*) ;; 42895- *) 42896- LIBS="-lz $LIBS" 42897+ *) 42898+ LIBS="-lz $LIBS" 42899 ;; 42900 esac 42901 42902@@ -36631,33 +25503,33 @@ 42903 esac 42904 42905 42906- 42907+ 42908 if test "$ZLIB_INCDIR" != "/usr/include"; then 42909- 42910+ 42911 if test -z "$ZLIB_INCDIR" || echo "$ZLIB_INCDIR" | grep '^/' >/dev/null ; then 42912 ai_p=$ZLIB_INCDIR 42913 else 42914- 42915+ 42916 ep_dir="`echo $ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 42917- 42918+ 42919 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 42920 ai_p="$ep_realdir/`basename \"$ZLIB_INCDIR\"`" 42921 fi 42922 42923- 42924- 42925+ 42926+ 42927 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 42928- 42929+ 42930 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 42931 if test -n "$unique" && test "`eval $cmd`" = "" ; then 42932 eval "INCLUDEPATH$unique=set" 42933- 42934+ 42935 if test ""; then 42936 INCLUDES="-I$ai_p $INCLUDES" 42937 else 42938 INCLUDES="$INCLUDES -I$ai_p" 42939 fi 42940- 42941+ 42942 fi 42943 42944 fi 42945@@ -36669,18 +25541,19 @@ 42946 42947 php_enable_bcmath=no 42948 42949-echo "$as_me:$LINENO: checking whether to enable bc style precision math functions" >&5 42950-echo $ECHO_N "checking whether to enable bc style precision math functions... $ECHO_C" >&6 42951+echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 42952+echo "configure:25546: checking whether to enable bc style precision math functions" >&5 42953 # Check whether --enable-bcmath or --disable-bcmath was given. 42954 if test "${enable_bcmath+set}" = set; then 42955 enableval="$enable_bcmath" 42956 PHP_BCMATH=$enableval 42957 else 42958- 42959+ 42960 PHP_BCMATH=no 42961 test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL 42962 42963-fi; 42964+fi 42965+ 42966 42967 42968 ext_output="yes, shared" 42969@@ -36704,14 +25577,13 @@ 42970 42971 42972 42973-echo "$as_me:$LINENO: result: $ext_output" >&5 42974-echo "${ECHO_T}$ext_output" >&6 42975+echo "$ac_t""$ext_output" 1>&6 42976 42977 42978 42979 42980 if test "$PHP_BCMATH" != "no"; then 42981- 42982+ 42983 ext_builddir=ext/bcmath 42984 ext_srcdir=$abs_srcdir/ext/bcmath 42985 42986@@ -36719,15 +25591,15 @@ 42987 42988 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 42989 PHP_BCMATH_SHARED=no 42990- 42991- 42992+ 42993+ 42994 case ext/bcmath in 42995 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 42996 /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 42997 *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 42998 esac 42999- 43000- 43001+ 43002+ 43003 43004 b_c_pre=$php_c_pre 43005 b_cxx_pre=$php_cxx_pre 43006@@ -36744,12 +25616,12 @@ 43007 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ 43008 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ 43009 libbcmath/src/rmzero.c libbcmath/src/str2num.c; do 43010- 43011+ 43012 IFS=. 43013 set $ac_src 43014 ac_obj=$1 43015 IFS=$old_IFS 43016- 43017+ 43018 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43019 43020 case $ac_src in 43021@@ -36773,14 +25645,14 @@ 43022 else 43023 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 43024 PHP_BCMATH_SHARED=yes 43025- 43026+ 43027 case ext/bcmath in 43028 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43029 /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43030 *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43031 esac 43032- 43033- 43034+ 43035+ 43036 43037 b_c_pre=$shared_c_pre 43038 b_cxx_pre=$shared_cxx_pre 43039@@ -36797,12 +25669,12 @@ 43040 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ 43041 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ 43042 libbcmath/src/rmzero.c libbcmath/src/str2num.c; do 43043- 43044+ 43045 IFS=. 43046 set $ac_src 43047 ac_obj=$1 43048 IFS=$old_IFS 43049- 43050+ 43051 shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo" 43052 43053 case $ac_src in 43054@@ -36820,7 +25692,7 @@ 43055 43056 case $host_alias in 43057 *netware*) 43058- 43059+ 43060 install_modules="install-modules" 43061 43062 case $host_alias in 43063@@ -36830,7 +25702,7 @@ 43064 ;; 43065 *netware*) 43066 suffix=nlm 43067- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(BCMATH_SHARED_LIBADD)' 43068+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)' 43069 ;; 43070 *) 43071 suffix=la 43072@@ -36843,7 +25715,7 @@ 43073 else 43074 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" 43075 fi 43076- 43077+ 43078 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" 43079 43080 cat >>Makefile.objects<<EOF 43081@@ -36857,7 +25729,7 @@ 43082 43083 ;; 43084 *) 43085- 43086+ 43087 install_modules="install-modules" 43088 43089 case $host_alias in 43090@@ -36867,7 +25739,7 @@ 43091 ;; 43092 *netware*) 43093 suffix=nlm 43094- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(ATH_SHARED_LIBADD)' 43095+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 3)_SHARED_LIBADD)' 43096 ;; 43097 *) 43098 suffix=la 43099@@ -36880,7 +25752,7 @@ 43100 else 43101 PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix" 43102 fi 43103- 43104+ 43105 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" 43106 43107 cat >>Makefile.objects<<EOF 43108@@ -36894,10 +25766,9 @@ 43109 43110 ;; 43111 esac 43112- 43113-cat >>confdefs.h <<_ACEOF 43114+ cat >> confdefs.h <<EOF 43115 #define COMPILE_DL_BCMATH 1 43116-_ACEOF 43117+EOF 43118 43119 fi 43120 fi 43121@@ -36906,15 +25777,15 @@ 43122 PHP_BCMATH_SHARED=no 43123 case "$PHP_SAPI" in 43124 cgi|embed) 43125- 43126- 43127+ 43128+ 43129 case ext/bcmath in 43130 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43131 /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43132 *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43133 esac 43134- 43135- 43136+ 43137+ 43138 43139 b_c_pre=$php_c_pre 43140 b_cxx_pre=$php_cxx_pre 43141@@ -36931,12 +25802,12 @@ 43142 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ 43143 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ 43144 libbcmath/src/rmzero.c libbcmath/src/str2num.c; do 43145- 43146+ 43147 IFS=. 43148 set $ac_src 43149 ac_obj=$1 43150 IFS=$old_IFS 43151- 43152+ 43153 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43154 43155 case $ac_src in 43156@@ -36956,15 +25827,15 @@ 43157 EXT_STATIC="$EXT_STATIC bcmath" 43158 ;; 43159 *) 43160- 43161- 43162+ 43163+ 43164 case ext/bcmath in 43165 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43166 /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43167 *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43168 esac 43169- 43170- 43171+ 43172+ 43173 43174 b_c_pre=$php_c_pre 43175 b_cxx_pre=$php_cxx_pre 43176@@ -36981,13 +25852,13 @@ 43177 libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ 43178 libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ 43179 libbcmath/src/rmzero.c libbcmath/src/str2num.c; do 43180- 43181+ 43182 IFS=. 43183 set $ac_src 43184 ac_obj=$1 43185 IFS=$old_IFS 43186- 43187- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 43188+ 43189+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43190 43191 case $ac_src in 43192 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 43193@@ -37007,28 +25878,27 @@ 43194 esac 43195 EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" 43196 fi 43197- 43198- 43199+ 43200+ 43201 BUILD_DIR="$BUILD_DIR $ext_builddir" 43202- 43203+ 43204 43205 43206 if test "$ext_builddir" = "."; then 43207 PHP_PECL_EXTENSION=bcmath 43208- 43209+ 43210 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 43211 43212 fi 43213 43214- 43215- 43216+ 43217+ 43218 BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" 43219+ 43220 43221- 43222- 43223-cat >>confdefs.h <<\_ACEOF 43224+ cat >> confdefs.h <<\EOF 43225 #define HAVE_BCMATH 1 43226-_ACEOF 43227+EOF 43228 43229 fi 43230 43231@@ -37036,19 +25906,19 @@ 43232 43233 php_with_bz2=no 43234 43235-echo "$as_me:$LINENO: checking for BZip2 support" >&5 43236-echo $ECHO_N "checking for BZip2 support... $ECHO_C" >&6 43237- 43238+echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 43239+echo "configure:25911: checking for BZip2 support" >&5 43240 # Check whether --with-bz2 or --without-bz2 was given. 43241 if test "${with_bz2+set}" = set; then 43242 withval="$with_bz2" 43243 PHP_BZ2=$withval 43244 else 43245- 43246+ 43247 PHP_BZ2=no 43248 test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL 43249 43250-fi; 43251+fi 43252+ 43253 43254 43255 ext_output="yes, shared" 43256@@ -37072,8 +25942,7 @@ 43257 43258 43259 43260-echo "$as_me:$LINENO: result: $ext_output" >&5 43261-echo "${ECHO_T}$ext_output" >&6 43262+echo "$ac_t""$ext_output" 1>&6 43263 43264 43265 43266@@ -37082,45 +25951,41 @@ 43267 if test -r $PHP_BZ2/include/bzlib.h; then 43268 BZIP_DIR=$PHP_BZ2 43269 else 43270- echo "$as_me:$LINENO: checking for BZip2 in default path" >&5 43271-echo $ECHO_N "checking for BZip2 in default path... $ECHO_C" >&6 43272+ echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 43273+echo "configure:25956: checking for BZip2 in default path" >&5 43274 for i in /usr/local /usr; do 43275 if test -r $i/include/bzlib.h; then 43276 BZIP_DIR=$i 43277- echo "$as_me:$LINENO: result: found in $i" >&5 43278-echo "${ECHO_T}found in $i" >&6 43279+ echo "$ac_t""found in $i" 1>&6 43280 break 43281 fi 43282 done 43283 fi 43284 43285 if test -z "$BZIP_DIR"; then 43286- echo "$as_me:$LINENO: result: not found" >&5 43287-echo "${ECHO_T}not found" >&6 43288- { { echo "$as_me:$LINENO: error: Please reinstall the BZip2 distribution" >&5 43289-echo "$as_me: error: Please reinstall the BZip2 distribution" >&2;} 43290- { (exit 1); exit 1; }; } 43291+ echo "$ac_t""not found" 1>&6 43292+ { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; } 43293 fi 43294 43295- 43296+ 43297 save_old_LDFLAGS=$LDFLAGS 43298 ac_stuff=" 43299 -L$BZIP_DIR/$PHP_LIBDIR 43300 " 43301- 43302+ 43303 save_ext_shared=$ext_shared 43304 ext_shared=yes 43305- 43306+ 43307 for ac_i in $ac_stuff; do 43308 case $ac_i in 43309 -pthread) 43310 if test "$ext_shared" = "yes"; then 43311 LDFLAGS="$LDFLAGS -pthread" 43312 else 43313- 43314- 43315+ 43316+ 43317 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 43318- 43319+ 43320 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 43321 if test -n "$unique" && test "`eval $cmd`" = "" ; then 43322 eval "EXTRA_LDFLAGS$unique=set" 43323@@ -37131,20 +25996,20 @@ 43324 ;; 43325 -l*) 43326 ac_ii=`echo $ac_i|cut -c 3-` 43327- 43328- 43329+ 43330+ 43331 case $ac_ii in 43332 c|c_r|pthread*) ;; 43333- *) 43334+ *) 43335 if test "$ext_shared" = "yes"; then 43336- LDFLAGS="$LDFLAGS -l$ac_ii" 43337+ LDFLAGS="$LDFLAGS -l$ac_ii" 43338 else 43339- 43340- 43341+ 43342+ 43343 case $ac_ii in 43344 c|c_r|pthread*) ;; 43345- *) 43346- LIBS="$LIBS -l$ac_ii" 43347+ *) 43348+ LIBS="$LIBS -l$ac_ii" 43349 ;; 43350 esac 43351 43352@@ -37157,236 +26022,206 @@ 43353 ;; 43354 -L*) 43355 ac_ii=`echo $ac_i|cut -c 3-` 43356- 43357+ 43358 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 43359- 43360+ 43361 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 43362 ai_p=$ac_ii 43363 else 43364- 43365+ 43366 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 43367- 43368+ 43369 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 43370 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 43371 fi 43372 43373- 43374+ 43375 if test "$ext_shared" = "yes"; then 43376 LDFLAGS="-L$ai_p $LDFLAGS" 43377 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 43378 else 43379- 43380- 43381- 43382+ 43383+ 43384+ 43385 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 43386- 43387+ 43388 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 43389 if test -n "$unique" && test "`eval $cmd`" = "" ; then 43390 eval "LIBPATH$unique=set" 43391- 43392+ 43393 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 43394 LDFLAGS="$LDFLAGS -L$ai_p" 43395 PHP_RPATHS="$PHP_RPATHS $ai_p" 43396- 43397+ 43398 fi 43399 43400 43401 fi 43402- 43403+ 43404 fi 43405 43406 ;; 43407 esac 43408 done 43409 43410- echo "$as_me:$LINENO: checking for BZ2_bzerror in -lbz2" >&5 43411-echo $ECHO_N "checking for BZ2_bzerror in -lbz2... $ECHO_C" >&6 43412-if test "${ac_cv_lib_bz2_BZ2_bzerror+set}" = set; then 43413- echo $ECHO_N "(cached) $ECHO_C" >&6 43414+ echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 43415+echo "configure:26069: checking for BZ2_bzerror in -lbz2" >&5 43416+ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` 43417+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 43418+ echo $ac_n "(cached) $ac_c" 1>&6 43419 else 43420- ac_check_lib_save_LIBS=$LIBS 43421+ ac_save_LIBS="$LIBS" 43422 LIBS="-lbz2 $LIBS" 43423-cat >conftest.$ac_ext <<_ACEOF 43424-/* confdefs.h. */ 43425-_ACEOF 43426-cat confdefs.h >>conftest.$ac_ext 43427-cat >>conftest.$ac_ext <<_ACEOF 43428-/* end confdefs.h. */ 43429- 43430+cat > conftest.$ac_ext <<EOF 43431+#line 26077 "configure" 43432+#include "confdefs.h" 43433 /* Override any gcc2 internal prototype to avoid an error. */ 43434-#ifdef __cplusplus 43435-extern "C" 43436-#endif 43437 /* We use char because int might match the return type of a gcc2 43438- builtin and then its argument prototype would still apply. */ 43439-char BZ2_bzerror (); 43440-int 43441-main () 43442-{ 43443-BZ2_bzerror (); 43444- ; 43445- return 0; 43446-} 43447-_ACEOF 43448-rm -f conftest.$ac_objext conftest$ac_exeext 43449-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 43450- (eval $ac_link) 2>conftest.er1 43451- ac_status=$? 43452- grep -v '^ *+' conftest.er1 >conftest.err 43453- rm -f conftest.er1 43454- cat conftest.err >&5 43455- echo "$as_me:$LINENO: \$? = $ac_status" >&5 43456- (exit $ac_status); } && 43457- { ac_try='test -z "$ac_c_werror_flag" 43458- || test ! -s conftest.err' 43459- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 43460- (eval $ac_try) 2>&5 43461- ac_status=$? 43462- echo "$as_me:$LINENO: \$? = $ac_status" >&5 43463- (exit $ac_status); }; } && 43464- { ac_try='test -s conftest$ac_exeext' 43465- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 43466- (eval $ac_try) 2>&5 43467- ac_status=$? 43468- echo "$as_me:$LINENO: \$? = $ac_status" >&5 43469- (exit $ac_status); }; }; then 43470- ac_cv_lib_bz2_BZ2_bzerror=yes 43471-else 43472- echo "$as_me: failed program was:" >&5 43473-sed 's/^/| /' conftest.$ac_ext >&5 43474- 43475-ac_cv_lib_bz2_BZ2_bzerror=no 43476-fi 43477-rm -f conftest.err conftest.$ac_objext \ 43478- conftest$ac_exeext conftest.$ac_ext 43479-LIBS=$ac_check_lib_save_LIBS 43480-fi 43481-echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5 43482-echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzerror" >&6 43483-if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then 43484+ builtin and then its argument prototype would still apply. */ 43485+char BZ2_bzerror(); 43486+ 43487+int main() { 43488+BZ2_bzerror() 43489+; return 0; } 43490+EOF 43491+if { (eval echo configure:26088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 43492+ rm -rf conftest* 43493+ eval "ac_cv_lib_$ac_lib_var=yes" 43494+else 43495+ echo "configure: failed program was:" >&5 43496+ cat conftest.$ac_ext >&5 43497+ rm -rf conftest* 43498+ eval "ac_cv_lib_$ac_lib_var=no" 43499+fi 43500+rm -f conftest* 43501+LIBS="$ac_save_LIBS" 43502 43503+fi 43504+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 43505+ echo "$ac_t""yes" 1>&6 43506+ 43507 LDFLAGS=$save_old_LDFLAGS 43508 ext_shared=$save_ext_shared 43509- 43510- 43511+ 43512+ 43513 if test "$BZIP_DIR/include" != "/usr/include"; then 43514- 43515+ 43516 if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then 43517 ai_p=$BZIP_DIR/include 43518 else 43519- 43520+ 43521 ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 43522- 43523+ 43524 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 43525 ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`" 43526 fi 43527 43528- 43529- 43530+ 43531+ 43532 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 43533- 43534+ 43535 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 43536 if test -n "$unique" && test "`eval $cmd`" = "" ; then 43537 eval "INCLUDEPATH$unique=set" 43538- 43539+ 43540 if test ""; then 43541 INCLUDES="-I$ai_p $INCLUDES" 43542 else 43543 INCLUDES="$INCLUDES -I$ai_p" 43544 fi 43545- 43546+ 43547 fi 43548 43549 fi 43550 43551- 43552+ 43553 43554 if test "$ext_shared" = "yes"; then 43555 BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD" 43556 if test -n "$BZIP_DIR/$PHP_LIBDIR"; then 43557- 43558+ 43559 if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then 43560- 43561+ 43562 if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 43563 ai_p=$BZIP_DIR/$PHP_LIBDIR 43564 else 43565- 43566+ 43567 ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 43568- 43569+ 43570 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 43571 ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" 43572 fi 43573 43574- 43575+ 43576 if test "$ext_shared" = "yes"; then 43577 BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD" 43578 test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD" 43579 else 43580- 43581- 43582- 43583+ 43584+ 43585+ 43586 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 43587- 43588+ 43589 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 43590 if test -n "$unique" && test "`eval $cmd`" = "" ; then 43591 eval "LIBPATH$unique=set" 43592- 43593+ 43594 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 43595 LDFLAGS="$LDFLAGS -L$ai_p" 43596 PHP_RPATHS="$PHP_RPATHS $ai_p" 43597- 43598+ 43599 fi 43600 43601 43602 fi 43603- 43604+ 43605 fi 43606 43607 fi 43608 else 43609- 43610+ 43611 43612 if test -n "$BZIP_DIR/$PHP_LIBDIR"; then 43613- 43614+ 43615 if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then 43616- 43617+ 43618 if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 43619 ai_p=$BZIP_DIR/$PHP_LIBDIR 43620 else 43621- 43622+ 43623 ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 43624- 43625+ 43626 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 43627 ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" 43628 fi 43629 43630- 43631- 43632- 43633- 43634+ 43635+ 43636+ 43637+ 43638 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 43639- 43640+ 43641 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 43642 if test -n "$unique" && test "`eval $cmd`" = "" ; then 43643 eval "LIBPATH$unique=set" 43644- 43645+ 43646 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 43647 LDFLAGS="$LDFLAGS -L$ai_p" 43648 PHP_RPATHS="$PHP_RPATHS $ai_p" 43649- 43650+ 43651 fi 43652 43653 43654- 43655+ 43656 fi 43657 43658 fi 43659- 43660- 43661+ 43662+ 43663 case bz2 in 43664 c|c_r|pthread*) ;; 43665- *) 43666- LIBS="-lbz2 $LIBS" 43667+ *) 43668+ LIBS="-lbz2 $LIBS" 43669 ;; 43670 esac 43671 43672@@ -37396,28 +26231,26 @@ 43673 fi 43674 43675 43676- 43677-cat >>confdefs.h <<\_ACEOF 43678+ cat >> confdefs.h <<\EOF 43679 #define HAVE_BZ2 1 43680-_ACEOF 43681- 43682- 43683+EOF 43684 43685+ 43686+ 43687 else 43688+ echo "$ac_t""no" 1>&6 43689 43690 LDFLAGS=$save_old_LDFLAGS 43691 ext_shared=$save_ext_shared 43692 unset ac_cv_lib_bz2_BZ2_bzerror 43693- 43694- { { echo "$as_me:$LINENO: error: bz2 module requires libbz2 >= 1.0.0" >&5 43695-echo "$as_me: error: bz2 module requires libbz2 >= 1.0.0" >&2;} 43696- { (exit 1); exit 1; }; } 43697- 43698- 43699+ 43700+ { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; } 43701+ 43702+ 43703 fi 43704 43705 43706- 43707+ 43708 ext_builddir=ext/bz2 43709 ext_srcdir=$abs_srcdir/ext/bz2 43710 43711@@ -37425,15 +26258,15 @@ 43712 43713 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 43714 PHP_BZ2_SHARED=no 43715- 43716- 43717+ 43718+ 43719 case ext/bz2 in 43720 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43721 /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43722 *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43723 esac 43724- 43725- 43726+ 43727+ 43728 43729 b_c_pre=$php_c_pre 43730 b_cxx_pre=$php_cxx_pre 43731@@ -37446,12 +26279,12 @@ 43732 43733 old_IFS=$IFS 43734 for ac_src in bz2.c bz2_filter.c; do 43735- 43736+ 43737 IFS=. 43738 set $ac_src 43739 ac_obj=$1 43740 IFS=$old_IFS 43741- 43742+ 43743 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43744 43745 case $ac_src in 43746@@ -37475,14 +26308,14 @@ 43747 else 43748 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 43749 PHP_BZ2_SHARED=yes 43750- 43751+ 43752 case ext/bz2 in 43753 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43754 /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43755 *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43756 esac 43757- 43758- 43759+ 43760+ 43761 43762 b_c_pre=$shared_c_pre 43763 b_cxx_pre=$shared_cxx_pre 43764@@ -37495,12 +26328,12 @@ 43765 43766 old_IFS=$IFS 43767 for ac_src in bz2.c bz2_filter.c; do 43768- 43769+ 43770 IFS=. 43771 set $ac_src 43772 ac_obj=$1 43773 IFS=$old_IFS 43774- 43775+ 43776 shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo" 43777 43778 case $ac_src in 43779@@ -37518,7 +26351,7 @@ 43780 43781 case $host_alias in 43782 *netware*) 43783- 43784+ 43785 install_modules="install-modules" 43786 43787 case $host_alias in 43788@@ -37528,7 +26361,7 @@ 43789 ;; 43790 *netware*) 43791 suffix=nlm 43792- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(BZ2_SHARED_LIBADD)' 43793+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBZ2, 3)_SHARED_LIBADD)' 43794 ;; 43795 *) 43796 suffix=la 43797@@ -37541,7 +26374,7 @@ 43798 else 43799 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix" 43800 fi 43801- 43802+ 43803 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2" 43804 43805 cat >>Makefile.objects<<EOF 43806@@ -37555,7 +26388,7 @@ 43807 43808 ;; 43809 *) 43810- 43811+ 43812 install_modules="install-modules" 43813 43814 case $host_alias in 43815@@ -37565,7 +26398,7 @@ 43816 ;; 43817 *netware*) 43818 suffix=nlm 43819- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 43820+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bz2) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BZ2, 3)_SHARED_LIBADD)' 43821 ;; 43822 *) 43823 suffix=la 43824@@ -37578,7 +26411,7 @@ 43825 else 43826 PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix" 43827 fi 43828- 43829+ 43830 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2" 43831 43832 cat >>Makefile.objects<<EOF 43833@@ -37592,10 +26425,9 @@ 43834 43835 ;; 43836 esac 43837- 43838-cat >>confdefs.h <<_ACEOF 43839+ cat >> confdefs.h <<EOF 43840 #define COMPILE_DL_BZ2 1 43841-_ACEOF 43842+EOF 43843 43844 fi 43845 fi 43846@@ -37604,15 +26436,15 @@ 43847 PHP_BZ2_SHARED=no 43848 case "$PHP_SAPI" in 43849 cgi|embed) 43850- 43851- 43852+ 43853+ 43854 case ext/bz2 in 43855 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43856 /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43857 *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43858 esac 43859- 43860- 43861+ 43862+ 43863 43864 b_c_pre=$php_c_pre 43865 b_cxx_pre=$php_cxx_pre 43866@@ -37625,12 +26457,12 @@ 43867 43868 old_IFS=$IFS 43869 for ac_src in bz2.c bz2_filter.c; do 43870- 43871+ 43872 IFS=. 43873 set $ac_src 43874 ac_obj=$1 43875 IFS=$old_IFS 43876- 43877+ 43878 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43879 43880 case $ac_src in 43881@@ -37650,15 +26482,15 @@ 43882 EXT_STATIC="$EXT_STATIC bz2" 43883 ;; 43884 *) 43885- 43886- 43887+ 43888+ 43889 case ext/bz2 in 43890 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 43891 /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 43892 *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 43893 esac 43894- 43895- 43896+ 43897+ 43898 43899 b_c_pre=$php_c_pre 43900 b_cxx_pre=$php_cxx_pre 43901@@ -37671,13 +26503,13 @@ 43902 43903 old_IFS=$IFS 43904 for ac_src in bz2.c bz2_filter.c; do 43905- 43906+ 43907 IFS=. 43908 set $ac_src 43909 ac_obj=$1 43910 IFS=$old_IFS 43911- 43912- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 43913+ 43914+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 43915 43916 case $ac_src in 43917 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 43918@@ -37697,20 +26529,20 @@ 43919 esac 43920 EXT_CLI_STATIC="$EXT_CLI_STATIC bz2" 43921 fi 43922- 43923- 43924+ 43925+ 43926 BUILD_DIR="$BUILD_DIR $ext_builddir" 43927- 43928+ 43929 43930 43931 if test "$ext_builddir" = "."; then 43932 PHP_PECL_EXTENSION=bz2 43933- 43934+ 43935 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 43936 43937 fi 43938 43939- 43940+ 43941 PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD" 43942 43943 fi 43944@@ -37719,18 +26551,19 @@ 43945 43946 php_enable_calendar=no 43947 43948-echo "$as_me:$LINENO: checking whether to enable calendar conversion support" >&5 43949-echo $ECHO_N "checking whether to enable calendar conversion support... $ECHO_C" >&6 43950+echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 43951+echo "configure:26556: checking whether to enable calendar conversion support" >&5 43952 # Check whether --enable-calendar or --disable-calendar was given. 43953 if test "${enable_calendar+set}" = set; then 43954 enableval="$enable_calendar" 43955 PHP_CALENDAR=$enableval 43956 else 43957- 43958+ 43959 PHP_CALENDAR=no 43960 test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL 43961 43962-fi; 43963+fi 43964+ 43965 43966 43967 ext_output="yes, shared" 43968@@ -37754,19 +26587,17 @@ 43969 43970 43971 43972-echo "$as_me:$LINENO: result: $ext_output" >&5 43973-echo "${ECHO_T}$ext_output" >&6 43974+echo "$ac_t""$ext_output" 1>&6 43975 43976 43977 43978 43979 if test "$PHP_CALENDAR" = "yes"; then 43980- 43981-cat >>confdefs.h <<\_ACEOF 43982+ cat >> confdefs.h <<\EOF 43983 #define HAVE_CALENDAR 1 43984-_ACEOF 43985- 43986+EOF 43987 43988+ 43989 ext_builddir=ext/calendar 43990 ext_srcdir=$abs_srcdir/ext/calendar 43991 43992@@ -37774,15 +26605,15 @@ 43993 43994 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 43995 PHP_CALENDAR_SHARED=no 43996- 43997- 43998+ 43999+ 44000 case ext/calendar in 44001 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44002 /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44003 *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44004 esac 44005- 44006- 44007+ 44008+ 44009 44010 b_c_pre=$php_c_pre 44011 b_cxx_pre=$php_cxx_pre 44012@@ -37795,12 +26626,12 @@ 44013 44014 old_IFS=$IFS 44015 for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do 44016- 44017+ 44018 IFS=. 44019 set $ac_src 44020 ac_obj=$1 44021 IFS=$old_IFS 44022- 44023+ 44024 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44025 44026 case $ac_src in 44027@@ -37824,14 +26655,14 @@ 44028 else 44029 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 44030 PHP_CALENDAR_SHARED=yes 44031- 44032+ 44033 case ext/calendar in 44034 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44035 /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44036 *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44037 esac 44038- 44039- 44040+ 44041+ 44042 44043 b_c_pre=$shared_c_pre 44044 b_cxx_pre=$shared_cxx_pre 44045@@ -37844,12 +26675,12 @@ 44046 44047 old_IFS=$IFS 44048 for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do 44049- 44050+ 44051 IFS=. 44052 set $ac_src 44053 ac_obj=$1 44054 IFS=$old_IFS 44055- 44056+ 44057 shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo" 44058 44059 case $ac_src in 44060@@ -37867,7 +26698,7 @@ 44061 44062 case $host_alias in 44063 *netware*) 44064- 44065+ 44066 install_modules="install-modules" 44067 44068 case $host_alias in 44069@@ -37877,7 +26708,7 @@ 44070 ;; 44071 *netware*) 44072 suffix=nlm 44073- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(CALENDAR_SHARED_LIBADD)' 44074+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)' 44075 ;; 44076 *) 44077 suffix=la 44078@@ -37890,7 +26721,7 @@ 44079 else 44080 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix" 44081 fi 44082- 44083+ 44084 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" 44085 44086 cat >>Makefile.objects<<EOF 44087@@ -37904,7 +26735,7 @@ 44088 44089 ;; 44090 *) 44091- 44092+ 44093 install_modules="install-modules" 44094 44095 case $host_alias in 44096@@ -37914,7 +26745,7 @@ 44097 ;; 44098 *netware*) 44099 suffix=nlm 44100- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(ENDAR_SHARED_LIBADD)' 44101+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CALENDAR, 3)_SHARED_LIBADD)' 44102 ;; 44103 *) 44104 suffix=la 44105@@ -37927,7 +26758,7 @@ 44106 else 44107 PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix" 44108 fi 44109- 44110+ 44111 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" 44112 44113 cat >>Makefile.objects<<EOF 44114@@ -37941,10 +26772,9 @@ 44115 44116 ;; 44117 esac 44118- 44119-cat >>confdefs.h <<_ACEOF 44120+ cat >> confdefs.h <<EOF 44121 #define COMPILE_DL_CALENDAR 1 44122-_ACEOF 44123+EOF 44124 44125 fi 44126 fi 44127@@ -37953,15 +26783,15 @@ 44128 PHP_CALENDAR_SHARED=no 44129 case "$PHP_SAPI" in 44130 cgi|embed) 44131- 44132- 44133+ 44134+ 44135 case ext/calendar in 44136 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44137 /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44138 *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44139 esac 44140- 44141- 44142+ 44143+ 44144 44145 b_c_pre=$php_c_pre 44146 b_cxx_pre=$php_cxx_pre 44147@@ -37974,12 +26804,12 @@ 44148 44149 old_IFS=$IFS 44150 for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do 44151- 44152+ 44153 IFS=. 44154 set $ac_src 44155 ac_obj=$1 44156 IFS=$old_IFS 44157- 44158+ 44159 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44160 44161 case $ac_src in 44162@@ -37999,15 +26829,15 @@ 44163 EXT_STATIC="$EXT_STATIC calendar" 44164 ;; 44165 *) 44166- 44167- 44168+ 44169+ 44170 case ext/calendar in 44171 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44172 /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44173 *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44174 esac 44175- 44176- 44177+ 44178+ 44179 44180 b_c_pre=$php_c_pre 44181 b_cxx_pre=$php_cxx_pre 44182@@ -38020,13 +26850,13 @@ 44183 44184 old_IFS=$IFS 44185 for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do 44186- 44187+ 44188 IFS=. 44189 set $ac_src 44190 ac_obj=$1 44191 IFS=$old_IFS 44192- 44193- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 44194+ 44195+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44196 44197 case $ac_src in 44198 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 44199@@ -38046,15 +26876,15 @@ 44200 esac 44201 EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" 44202 fi 44203- 44204- 44205+ 44206+ 44207 BUILD_DIR="$BUILD_DIR $ext_builddir" 44208- 44209+ 44210 44211 44212 if test "$ext_builddir" = "."; then 44213 PHP_PECL_EXTENSION=calendar 44214- 44215+ 44216 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 44217 44218 fi 44219@@ -38065,18 +26895,19 @@ 44220 44221 php_enable_ctype=yes 44222 44223-echo "$as_me:$LINENO: checking whether to enable ctype functions" >&5 44224-echo $ECHO_N "checking whether to enable ctype functions... $ECHO_C" >&6 44225+echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 44226+echo "configure:26900: checking whether to enable ctype functions" >&5 44227 # Check whether --enable-ctype or --disable-ctype was given. 44228 if test "${enable_ctype+set}" = set; then 44229 enableval="$enable_ctype" 44230 PHP_CTYPE=$enableval 44231 else 44232- 44233+ 44234 PHP_CTYPE=yes 44235 test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL 44236 44237-fi; 44238+fi 44239+ 44240 44241 44242 ext_output="yes, shared" 44243@@ -38100,19 +26931,17 @@ 44244 44245 44246 44247-echo "$as_me:$LINENO: result: $ext_output" >&5 44248-echo "${ECHO_T}$ext_output" >&6 44249+echo "$ac_t""$ext_output" 1>&6 44250 44251 44252 44253 44254 if test "$PHP_CTYPE" != "no"; then 44255- 44256-cat >>confdefs.h <<\_ACEOF 44257+ cat >> confdefs.h <<\EOF 44258 #define HAVE_CTYPE 1 44259-_ACEOF 44260- 44261+EOF 44262 44263+ 44264 ext_builddir=ext/ctype 44265 ext_srcdir=$abs_srcdir/ext/ctype 44266 44267@@ -38120,15 +26949,15 @@ 44268 44269 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 44270 PHP_CTYPE_SHARED=no 44271- 44272- 44273+ 44274+ 44275 case ext/ctype in 44276 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44277 /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44278 *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44279 esac 44280- 44281- 44282+ 44283+ 44284 44285 b_c_pre=$php_c_pre 44286 b_cxx_pre=$php_cxx_pre 44287@@ -38141,12 +26970,12 @@ 44288 44289 old_IFS=$IFS 44290 for ac_src in ctype.c; do 44291- 44292+ 44293 IFS=. 44294 set $ac_src 44295 ac_obj=$1 44296 IFS=$old_IFS 44297- 44298+ 44299 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44300 44301 case $ac_src in 44302@@ -38170,14 +26999,14 @@ 44303 else 44304 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 44305 PHP_CTYPE_SHARED=yes 44306- 44307+ 44308 case ext/ctype in 44309 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44310 /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44311 *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44312 esac 44313- 44314- 44315+ 44316+ 44317 44318 b_c_pre=$shared_c_pre 44319 b_cxx_pre=$shared_cxx_pre 44320@@ -38190,12 +27019,12 @@ 44321 44322 old_IFS=$IFS 44323 for ac_src in ctype.c; do 44324- 44325+ 44326 IFS=. 44327 set $ac_src 44328 ac_obj=$1 44329 IFS=$old_IFS 44330- 44331+ 44332 shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo" 44333 44334 case $ac_src in 44335@@ -38213,7 +27042,7 @@ 44336 44337 case $host_alias in 44338 *netware*) 44339- 44340+ 44341 install_modules="install-modules" 44342 44343 case $host_alias in 44344@@ -38223,7 +27052,7 @@ 44345 ;; 44346 *netware*) 44347 suffix=nlm 44348- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(CTYPE_SHARED_LIBADD)' 44349+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)' 44350 ;; 44351 *) 44352 suffix=la 44353@@ -38236,7 +27065,7 @@ 44354 else 44355 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix" 44356 fi 44357- 44358+ 44359 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" 44360 44361 cat >>Makefile.objects<<EOF 44362@@ -38250,7 +27079,7 @@ 44363 44364 ;; 44365 *) 44366- 44367+ 44368 install_modules="install-modules" 44369 44370 case $host_alias in 44371@@ -38260,7 +27089,7 @@ 44372 ;; 44373 *netware*) 44374 suffix=nlm 44375- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(PE_SHARED_LIBADD)' 44376+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CTYPE, 3)_SHARED_LIBADD)' 44377 ;; 44378 *) 44379 suffix=la 44380@@ -38273,7 +27102,7 @@ 44381 else 44382 PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix" 44383 fi 44384- 44385+ 44386 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" 44387 44388 cat >>Makefile.objects<<EOF 44389@@ -38287,10 +27116,9 @@ 44390 44391 ;; 44392 esac 44393- 44394-cat >>confdefs.h <<_ACEOF 44395+ cat >> confdefs.h <<EOF 44396 #define COMPILE_DL_CTYPE 1 44397-_ACEOF 44398+EOF 44399 44400 fi 44401 fi 44402@@ -38299,15 +27127,15 @@ 44403 PHP_CTYPE_SHARED=no 44404 case "$PHP_SAPI" in 44405 cgi|embed) 44406- 44407- 44408+ 44409+ 44410 case ext/ctype in 44411 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44412 /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44413 *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44414 esac 44415- 44416- 44417+ 44418+ 44419 44420 b_c_pre=$php_c_pre 44421 b_cxx_pre=$php_cxx_pre 44422@@ -38320,12 +27148,12 @@ 44423 44424 old_IFS=$IFS 44425 for ac_src in ctype.c; do 44426- 44427+ 44428 IFS=. 44429 set $ac_src 44430 ac_obj=$1 44431 IFS=$old_IFS 44432- 44433+ 44434 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44435 44436 case $ac_src in 44437@@ -38345,15 +27173,15 @@ 44438 EXT_STATIC="$EXT_STATIC ctype" 44439 ;; 44440 *) 44441- 44442- 44443+ 44444+ 44445 case ext/ctype in 44446 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 44447 /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 44448 *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 44449 esac 44450- 44451- 44452+ 44453+ 44454 44455 b_c_pre=$php_c_pre 44456 b_cxx_pre=$php_cxx_pre 44457@@ -38366,13 +27194,13 @@ 44458 44459 old_IFS=$IFS 44460 for ac_src in ctype.c; do 44461- 44462+ 44463 IFS=. 44464 set $ac_src 44465 ac_obj=$1 44466 IFS=$old_IFS 44467- 44468- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 44469+ 44470+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 44471 44472 case $ac_src in 44473 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 44474@@ -38392,15 +27220,15 @@ 44475 esac 44476 EXT_CLI_STATIC="$EXT_CLI_STATIC ctype" 44477 fi 44478- 44479- 44480+ 44481+ 44482 BUILD_DIR="$BUILD_DIR $ext_builddir" 44483- 44484+ 44485 44486 44487 if test "$ext_builddir" = "."; then 44488 PHP_PECL_EXTENSION=ctype 44489- 44490+ 44491 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 44492 44493 fi 44494@@ -38411,19 +27239,19 @@ 44495 44496 php_with_curl=no 44497 44498-echo "$as_me:$LINENO: checking for cURL support" >&5 44499-echo $ECHO_N "checking for cURL support... $ECHO_C" >&6 44500- 44501+echo $ac_n "checking for cURL support""... $ac_c" 1>&6 44502+echo "configure:27244: checking for cURL support" >&5 44503 # Check whether --with-curl or --without-curl was given. 44504 if test "${with_curl+set}" = set; then 44505 withval="$with_curl" 44506 PHP_CURL=$withval 44507 else 44508- 44509+ 44510 PHP_CURL=no 44511 test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL 44512 44513-fi; 44514+fi 44515+ 44516 44517 44518 ext_output="yes, shared" 44519@@ -38447,8 +27275,7 @@ 44520 44521 44522 44523-echo "$as_me:$LINENO: result: $ext_output" >&5 44524-echo "${ECHO_T}$ext_output" >&6 44525+echo "$ac_t""$ext_output" 1>&6 44526 44527 44528 44529@@ -38456,23 +27283,22 @@ 44530 44531 php_with_curlwrappers=no 44532 44533-echo "$as_me:$LINENO: checking if we should use cURL for url streams" >&5 44534-echo $ECHO_N "checking if we should use cURL for url streams... $ECHO_C" >&6 44535- 44536+echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 44537+echo "configure:27288: checking if we should use cURL for url streams" >&5 44538 # Check whether --with-curlwrappers or --without-curlwrappers was given. 44539 if test "${with_curlwrappers+set}" = set; then 44540 withval="$with_curlwrappers" 44541 PHP_CURLWRAPPERS=$withval 44542 else 44543- 44544+ 44545 PHP_CURLWRAPPERS=no 44546+ 44547 44548+fi 44549 44550-fi; 44551 44552 ext_output=$PHP_CURLWRAPPERS 44553-echo "$as_me:$LINENO: result: $ext_output" >&5 44554-echo "${ECHO_T}$ext_output" >&6 44555+echo "$ac_t""$ext_output" 1>&6 44556 44557 44558 44559@@ -38481,31 +27307,26 @@ 44560 if test -r $PHP_CURL/include/curl/easy.h; then 44561 CURL_DIR=$PHP_CURL 44562 else 44563- echo "$as_me:$LINENO: checking for cURL in default path" >&5 44564-echo $ECHO_N "checking for cURL in default path... $ECHO_C" >&6 44565+ echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 44566+echo "configure:27312: checking for cURL in default path" >&5 44567 for i in /usr/local /usr; do 44568 if test -r $i/include/curl/easy.h; then 44569 CURL_DIR=$i 44570- echo "$as_me:$LINENO: result: found in $i" >&5 44571-echo "${ECHO_T}found in $i" >&6 44572+ echo "$ac_t""found in $i" 1>&6 44573 break 44574 fi 44575 done 44576 fi 44577 44578 if test -z "$CURL_DIR"; then 44579- echo "$as_me:$LINENO: result: not found" >&5 44580-echo "${ECHO_T}not found" >&6 44581- { { echo "$as_me:$LINENO: error: Please reinstall the libcurl distribution - 44582- easy.h should be in <curl-dir>/include/curl/" >&5 44583-echo "$as_me: error: Please reinstall the libcurl distribution - 44584- easy.h should be in <curl-dir>/include/curl/" >&2;} 44585- { (exit 1); exit 1; }; } 44586+ echo "$ac_t""not found" 1>&6 44587+ { echo "configure: error: Please reinstall the libcurl distribution - 44588+ easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; } 44589 fi 44590 44591 CURL_CONFIG="curl-config" 44592- echo "$as_me:$LINENO: checking for cURL 7.10.5 or greater" >&5 44593-echo $ECHO_N "checking for cURL 7.10.5 or greater... $ECHO_C" >&6 44594+ echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 44595+echo "configure:27330: checking for cURL 7.10.5 or greater" >&5 44596 44597 if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then 44598 CURL_CONFIG=${CURL_DIR}/bin/curl-config 44599@@ -38518,57 +27339,54 @@ 44600 curl_version_full=`$CURL_CONFIG --version` 44601 curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 44602 if test "$curl_version" -ge 7010005; then 44603- echo "$as_me:$LINENO: result: $curl_version_full" >&5 44604-echo "${ECHO_T}$curl_version_full" >&6 44605+ echo "$ac_t""$curl_version_full" 1>&6 44606 CURL_LIBS=`$CURL_CONFIG --libs` 44607 else 44608- { { echo "$as_me:$LINENO: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&5 44609-echo "$as_me: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&2;} 44610- { (exit 1); exit 1; }; } 44611+ { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; } 44612 fi 44613 44614- 44615+ 44616 if test "$CURL_DIR/include" != "/usr/include"; then 44617- 44618+ 44619 if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then 44620 ai_p=$CURL_DIR/include 44621 else 44622- 44623+ 44624 ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 44625- 44626+ 44627 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 44628 ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" 44629 fi 44630 44631- 44632- 44633+ 44634+ 44635 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 44636- 44637+ 44638 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 44639 if test -n "$unique" && test "`eval $cmd`" = "" ; then 44640 eval "INCLUDEPATH$unique=set" 44641- 44642+ 44643 if test ""; then 44644 INCLUDES="-I$ai_p $INCLUDES" 44645 else 44646 INCLUDES="$INCLUDES -I$ai_p" 44647 fi 44648- 44649+ 44650 fi 44651 44652 fi 44653 44654- 44655+ 44656 for ac_i in $CURL_LIBS; do 44657 case $ac_i in 44658 -pthread) 44659 if test "$ext_shared" = "yes"; then 44660 CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread" 44661 else 44662- 44663- 44664+ 44665+ 44666 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 44667- 44668+ 44669 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 44670 if test -n "$unique" && test "`eval $cmd`" = "" ; then 44671 eval "EXTRA_LDFLAGS$unique=set" 44672@@ -38579,20 +27397,20 @@ 44673 ;; 44674 -l*) 44675 ac_ii=`echo $ac_i|cut -c 3-` 44676- 44677- 44678+ 44679+ 44680 case $ac_ii in 44681 c|c_r|pthread*) ;; 44682- *) 44683+ *) 44684 if test "$ext_shared" = "yes"; then 44685- CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" 44686+ CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" 44687 else 44688- 44689- 44690+ 44691+ 44692 case $ac_ii in 44693 c|c_r|pthread*) ;; 44694- *) 44695- LIBS="$LIBS -l$ac_ii" 44696+ *) 44697+ LIBS="$LIBS -l$ac_ii" 44698 ;; 44699 esac 44700 44701@@ -38605,136 +27423,136 @@ 44702 ;; 44703 -L*) 44704 ac_ii=`echo $ac_i|cut -c 3-` 44705- 44706+ 44707 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 44708- 44709+ 44710 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 44711 ai_p=$ac_ii 44712 else 44713- 44714+ 44715 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 44716- 44717+ 44718 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 44719 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 44720 fi 44721 44722- 44723+ 44724 if test "$ext_shared" = "yes"; then 44725 CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" 44726 test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" 44727 else 44728- 44729- 44730- 44731+ 44732+ 44733+ 44734 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 44735- 44736+ 44737 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 44738 if test -n "$unique" && test "`eval $cmd`" = "" ; then 44739 eval "LIBPATH$unique=set" 44740- 44741+ 44742 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 44743 LDFLAGS="$LDFLAGS -L$ai_p" 44744 PHP_RPATHS="$PHP_RPATHS $ai_p" 44745- 44746+ 44747 fi 44748 44749 44750 fi 44751- 44752+ 44753 fi 44754 44755 ;; 44756 esac 44757 done 44758 44759- 44760+ 44761 44762 if test "$ext_shared" = "yes"; then 44763 CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD" 44764 if test -n "$CURL_DIR/$PHP_LIBDIR"; then 44765- 44766+ 44767 if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then 44768- 44769+ 44770 if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 44771 ai_p=$CURL_DIR/$PHP_LIBDIR 44772 else 44773- 44774+ 44775 ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 44776- 44777+ 44778 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 44779 ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" 44780 fi 44781 44782- 44783+ 44784 if test "$ext_shared" = "yes"; then 44785 CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" 44786 test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" 44787 else 44788- 44789- 44790- 44791+ 44792+ 44793+ 44794 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 44795- 44796+ 44797 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 44798 if test -n "$unique" && test "`eval $cmd`" = "" ; then 44799 eval "LIBPATH$unique=set" 44800- 44801+ 44802 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 44803 LDFLAGS="$LDFLAGS -L$ai_p" 44804 PHP_RPATHS="$PHP_RPATHS $ai_p" 44805- 44806+ 44807 fi 44808 44809 44810 fi 44811- 44812+ 44813 fi 44814 44815 fi 44816 else 44817- 44818+ 44819 44820 if test -n "$CURL_DIR/$PHP_LIBDIR"; then 44821- 44822+ 44823 if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then 44824- 44825+ 44826 if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 44827 ai_p=$CURL_DIR/$PHP_LIBDIR 44828 else 44829- 44830+ 44831 ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 44832- 44833+ 44834 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 44835 ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" 44836 fi 44837 44838- 44839- 44840- 44841- 44842+ 44843+ 44844+ 44845+ 44846 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 44847- 44848+ 44849 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 44850 if test -n "$unique" && test "`eval $cmd`" = "" ; then 44851 eval "LIBPATH$unique=set" 44852- 44853+ 44854 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 44855 LDFLAGS="$LDFLAGS -L$ai_p" 44856 PHP_RPATHS="$PHP_RPATHS $ai_p" 44857- 44858+ 44859 fi 44860 44861 44862- 44863+ 44864 fi 44865 44866 fi 44867- 44868- 44869+ 44870+ 44871 case curl in 44872 c|c_r|pthread*) ;; 44873- *) 44874- LIBS="-lcurl $LIBS" 44875+ *) 44876+ LIBS="-lcurl $LIBS" 44877 ;; 44878 esac 44879 44880@@ -38744,270 +27562,110 @@ 44881 fi 44882 44883 44884- 44885- echo "$as_me:$LINENO: checking for SSL support in libcurl" >&5 44886-echo $ECHO_N "checking for SSL support in libcurl... $ECHO_C" >&6 44887+ 44888+ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 44889+echo "configure:27568: checking for SSL support in libcurl" >&5 44890 CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` 44891 if test "$CURL_SSL" = "SSL"; then 44892- echo "$as_me:$LINENO: result: yes" >&5 44893-echo "${ECHO_T}yes" >&6 44894- 44895-cat >>confdefs.h <<\_ACEOF 44896+ echo "$ac_t""yes" 1>&6 44897+ cat >> confdefs.h <<\EOF 44898 #define HAVE_CURL_SSL 1 44899-_ACEOF 44900- 44901+EOF 44902 44903+ 44904 save_CFLAGS="$CFLAGS" 44905 CFLAGS="`$CURL_CONFIG --cflags`" 44906- 44907- ac_ext=c 44908-ac_cpp='$CPP $CPPFLAGS' 44909-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 44910-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 44911-ac_compiler_gnu=$ac_cv_c_compiler_gnu 44912-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 44913-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 44914+ 44915+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 44916+echo "configure:27581: checking how to run the C preprocessor" >&5 44917 # On Suns, sometimes $CPP names a directory. 44918 if test -n "$CPP" && test -d "$CPP"; then 44919 CPP= 44920 fi 44921 if test -z "$CPP"; then 44922- if test "${ac_cv_prog_CPP+set}" = set; then 44923- echo $ECHO_N "(cached) $ECHO_C" >&6 44924+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then 44925+ echo $ac_n "(cached) $ac_c" 1>&6 44926 else 44927- # Double quotes because CPP needs to be expanded 44928- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" 44929- do 44930- ac_preproc_ok=false 44931-for ac_c_preproc_warn_flag in '' yes 44932-do 44933- # Use a header file that comes with gcc, so configuring glibc 44934- # with a fresh cross-compiler works. 44935- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 44936- # <limits.h> exists even on freestanding compilers. 44937+ # This must be in double quotes, not single quotes, because CPP may get 44938+ # substituted into the Makefile and "${CC-cc}" will confuse make. 44939+ CPP="${CC-cc} -E" 44940 # On the NeXT, cc -E runs the code through the compiler's parser, 44941- # not just through cpp. "Syntax error" is here to catch this case. 44942- cat >conftest.$ac_ext <<_ACEOF 44943-/* confdefs.h. */ 44944-_ACEOF 44945-cat confdefs.h >>conftest.$ac_ext 44946-cat >>conftest.$ac_ext <<_ACEOF 44947-/* end confdefs.h. */ 44948-#ifdef __STDC__ 44949-# include <limits.h> 44950-#else 44951-# include <assert.h> 44952-#endif 44953- Syntax error 44954-_ACEOF 44955-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 44956- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 44957- ac_status=$? 44958- grep -v '^ *+' conftest.er1 >conftest.err 44959- rm -f conftest.er1 44960- cat conftest.err >&5 44961- echo "$as_me:$LINENO: \$? = $ac_status" >&5 44962- (exit $ac_status); } >/dev/null; then 44963- if test -s conftest.err; then 44964- ac_cpp_err=$ac_c_preproc_warn_flag 44965- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 44966- else 44967- ac_cpp_err= 44968- fi 44969-else 44970- ac_cpp_err=yes 44971-fi 44972-if test -z "$ac_cpp_err"; then 44973+ # not just through cpp. 44974+ cat > conftest.$ac_ext <<EOF 44975+#line 27596 "configure" 44976+#include "confdefs.h" 44977+#include <assert.h> 44978+Syntax Error 44979+EOF 44980+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 44981+{ (eval echo configure:27602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 44982+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 44983+if test -z "$ac_err"; then 44984 : 44985 else 44986- echo "$as_me: failed program was:" >&5 44987-sed 's/^/| /' conftest.$ac_ext >&5 44988- 44989- # Broken: fails on valid input. 44990-continue 44991-fi 44992-rm -f conftest.err conftest.$ac_ext 44993- 44994- # OK, works on sane cases. Now check whether non-existent headers 44995- # can be detected and how. 44996- cat >conftest.$ac_ext <<_ACEOF 44997-/* confdefs.h. */ 44998-_ACEOF 44999-cat confdefs.h >>conftest.$ac_ext 45000-cat >>conftest.$ac_ext <<_ACEOF 45001-/* end confdefs.h. */ 45002-#include <ac_nonexistent.h> 45003-_ACEOF 45004-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 45005- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 45006- ac_status=$? 45007- grep -v '^ *+' conftest.er1 >conftest.err 45008- rm -f conftest.er1 45009- cat conftest.err >&5 45010- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45011- (exit $ac_status); } >/dev/null; then 45012- if test -s conftest.err; then 45013- ac_cpp_err=$ac_c_preproc_warn_flag 45014- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 45015- else 45016- ac_cpp_err= 45017- fi 45018-else 45019- ac_cpp_err=yes 45020-fi 45021-if test -z "$ac_cpp_err"; then 45022- # Broken: success on invalid input. 45023-continue 45024+ echo "$ac_err" >&5 45025+ echo "configure: failed program was:" >&5 45026+ cat conftest.$ac_ext >&5 45027+ rm -rf conftest* 45028+ CPP="${CC-cc} -E -traditional-cpp" 45029+ cat > conftest.$ac_ext <<EOF 45030+#line 27613 "configure" 45031+#include "confdefs.h" 45032+#include <assert.h> 45033+Syntax Error 45034+EOF 45035+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 45036+{ (eval echo configure:27619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 45037+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 45038+if test -z "$ac_err"; then 45039+ : 45040 else 45041- echo "$as_me: failed program was:" >&5 45042-sed 's/^/| /' conftest.$ac_ext >&5 45043- 45044- # Passes both tests. 45045-ac_preproc_ok=: 45046-break 45047-fi 45048-rm -f conftest.err conftest.$ac_ext 45049- 45050-done 45051-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 45052-rm -f conftest.err conftest.$ac_ext 45053-if $ac_preproc_ok; then 45054- break 45055-fi 45056- 45057- done 45058- ac_cv_prog_CPP=$CPP 45059- 45060-fi 45061- CPP=$ac_cv_prog_CPP 45062+ echo "$ac_err" >&5 45063+ echo "configure: failed program was:" >&5 45064+ cat conftest.$ac_ext >&5 45065+ rm -rf conftest* 45066+ CPP="${CC-cc} -nologo -E" 45067+ cat > conftest.$ac_ext <<EOF 45068+#line 27630 "configure" 45069+#include "confdefs.h" 45070+#include <assert.h> 45071+Syntax Error 45072+EOF 45073+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 45074+{ (eval echo configure:27636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 45075+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 45076+if test -z "$ac_err"; then 45077+ : 45078 else 45079- ac_cv_prog_CPP=$CPP 45080+ echo "$ac_err" >&5 45081+ echo "configure: failed program was:" >&5 45082+ cat conftest.$ac_ext >&5 45083+ rm -rf conftest* 45084+ CPP=/lib/cpp 45085 fi 45086-echo "$as_me:$LINENO: result: $CPP" >&5 45087-echo "${ECHO_T}$CPP" >&6 45088-ac_preproc_ok=false 45089-for ac_c_preproc_warn_flag in '' yes 45090-do 45091- # Use a header file that comes with gcc, so configuring glibc 45092- # with a fresh cross-compiler works. 45093- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 45094- # <limits.h> exists even on freestanding compilers. 45095- # On the NeXT, cc -E runs the code through the compiler's parser, 45096- # not just through cpp. "Syntax error" is here to catch this case. 45097- cat >conftest.$ac_ext <<_ACEOF 45098-/* confdefs.h. */ 45099-_ACEOF 45100-cat confdefs.h >>conftest.$ac_ext 45101-cat >>conftest.$ac_ext <<_ACEOF 45102-/* end confdefs.h. */ 45103-#ifdef __STDC__ 45104-# include <limits.h> 45105-#else 45106-# include <assert.h> 45107-#endif 45108- Syntax error 45109-_ACEOF 45110-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 45111- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 45112- ac_status=$? 45113- grep -v '^ *+' conftest.er1 >conftest.err 45114- rm -f conftest.er1 45115- cat conftest.err >&5 45116- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45117- (exit $ac_status); } >/dev/null; then 45118- if test -s conftest.err; then 45119- ac_cpp_err=$ac_c_preproc_warn_flag 45120- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 45121- else 45122- ac_cpp_err= 45123- fi 45124-else 45125- ac_cpp_err=yes 45126+rm -f conftest* 45127 fi 45128-if test -z "$ac_cpp_err"; then 45129- : 45130-else 45131- echo "$as_me: failed program was:" >&5 45132-sed 's/^/| /' conftest.$ac_ext >&5 45133- 45134- # Broken: fails on valid input. 45135-continue 45136+rm -f conftest* 45137 fi 45138-rm -f conftest.err conftest.$ac_ext 45139- 45140- # OK, works on sane cases. Now check whether non-existent headers 45141- # can be detected and how. 45142- cat >conftest.$ac_ext <<_ACEOF 45143-/* confdefs.h. */ 45144-_ACEOF 45145-cat confdefs.h >>conftest.$ac_ext 45146-cat >>conftest.$ac_ext <<_ACEOF 45147-/* end confdefs.h. */ 45148-#include <ac_nonexistent.h> 45149-_ACEOF 45150-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 45151- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 45152- ac_status=$? 45153- grep -v '^ *+' conftest.er1 >conftest.err 45154- rm -f conftest.er1 45155- cat conftest.err >&5 45156- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45157- (exit $ac_status); } >/dev/null; then 45158- if test -s conftest.err; then 45159- ac_cpp_err=$ac_c_preproc_warn_flag 45160- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 45161- else 45162- ac_cpp_err= 45163- fi 45164-else 45165- ac_cpp_err=yes 45166-fi 45167-if test -z "$ac_cpp_err"; then 45168- # Broken: success on invalid input. 45169-continue 45170-else 45171- echo "$as_me: failed program was:" >&5 45172-sed 's/^/| /' conftest.$ac_ext >&5 45173- 45174- # Passes both tests. 45175-ac_preproc_ok=: 45176-break 45177+rm -f conftest* 45178+ ac_cv_prog_CPP="$CPP" 45179 fi 45180-rm -f conftest.err conftest.$ac_ext 45181- 45182-done 45183-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 45184-rm -f conftest.err conftest.$ac_ext 45185-if $ac_preproc_ok; then 45186- : 45187+ CPP="$ac_cv_prog_CPP" 45188 else 45189- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check 45190-See \`config.log' for more details." >&5 45191-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check 45192-See \`config.log' for more details." >&2;} 45193- { (exit 1); exit 1; }; } 45194+ ac_cv_prog_CPP="$CPP" 45195 fi 45196+echo "$ac_t""$CPP" 1>&6 45197 45198-ac_ext=c 45199-ac_cpp='$CPP $CPPFLAGS' 45200-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 45201-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 45202-ac_compiler_gnu=$ac_cv_c_compiler_gnu 45203- 45204- echo "$as_me:$LINENO: checking for openssl support in libcurl" >&5 45205-echo $ECHO_N "checking for openssl support in libcurl... $ECHO_C" >&6 45206+ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 45207+echo "configure:27661: checking for openssl support in libcurl" >&5 45208 if test "$cross_compiling" = yes; then 45209- 45210- echo "$as_me:$LINENO: result: no" >&5 45211-echo "${ECHO_T}no" >&6 45212- 45213+ 45214+ echo "$ac_t""no" 1>&6 45215+ 45216 else 45217- cat >conftest.$ac_ext <<_ACEOF 45218-/* confdefs.h. */ 45219-_ACEOF 45220-cat confdefs.h >>conftest.$ac_ext 45221-cat >>conftest.$ac_ext <<_ACEOF 45222-/* end confdefs.h. */ 45223+ cat > conftest.$ac_ext <<EOF 45224+#line 27668 "configure" 45225+#include "confdefs.h" 45226 45227 #include <curl/curl.h> 45228 45229@@ -39023,214 +27681,87 @@ 45230 } 45231 return 1; 45232 } 45233- 45234-_ACEOF 45235-rm -f conftest$ac_exeext 45236-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 45237- (eval $ac_link) 2>&5 45238- ac_status=$? 45239- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45240- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 45241- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45242- (eval $ac_try) 2>&5 45243- ac_status=$? 45244- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45245- (exit $ac_status); }; }; then 45246- 45247- echo "$as_me:$LINENO: result: yes" >&5 45248-echo "${ECHO_T}yes" >&6 45249- 45250-for ac_header in openssl/crypto.h 45251+ 45252+EOF 45253+if { (eval echo configure:27687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 45254+then 45255+ 45256+ echo "$ac_t""yes" 1>&6 45257+ for ac_hdr in openssl/crypto.h 45258 do 45259-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 45260-if eval "test \"\${$as_ac_Header+set}\" = set"; then 45261- echo "$as_me:$LINENO: checking for $ac_header" >&5 45262-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 45263-if eval "test \"\${$as_ac_Header+set}\" = set"; then 45264- echo $ECHO_N "(cached) $ECHO_C" >&6 45265-fi 45266-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 45267-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 45268-else 45269- # Is the header compilable? 45270-echo "$as_me:$LINENO: checking $ac_header usability" >&5 45271-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 45272-cat >conftest.$ac_ext <<_ACEOF 45273-/* confdefs.h. */ 45274-_ACEOF 45275-cat confdefs.h >>conftest.$ac_ext 45276-cat >>conftest.$ac_ext <<_ACEOF 45277-/* end confdefs.h. */ 45278-$ac_includes_default 45279-#include <$ac_header> 45280-_ACEOF 45281-rm -f conftest.$ac_objext 45282-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 45283- (eval $ac_compile) 2>conftest.er1 45284- ac_status=$? 45285- grep -v '^ *+' conftest.er1 >conftest.err 45286- rm -f conftest.er1 45287- cat conftest.err >&5 45288- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45289- (exit $ac_status); } && 45290- { ac_try='test -z "$ac_c_werror_flag" 45291- || test ! -s conftest.err' 45292- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45293- (eval $ac_try) 2>&5 45294- ac_status=$? 45295- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45296- (exit $ac_status); }; } && 45297- { ac_try='test -s conftest.$ac_objext' 45298- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45299- (eval $ac_try) 2>&5 45300- ac_status=$? 45301- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45302- (exit $ac_status); }; }; then 45303- ac_header_compiler=yes 45304-else 45305- echo "$as_me: failed program was:" >&5 45306-sed 's/^/| /' conftest.$ac_ext >&5 45307- 45308-ac_header_compiler=no 45309-fi 45310-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 45311-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 45312-echo "${ECHO_T}$ac_header_compiler" >&6 45313- 45314-# Is the header present? 45315-echo "$as_me:$LINENO: checking $ac_header presence" >&5 45316-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 45317-cat >conftest.$ac_ext <<_ACEOF 45318-/* confdefs.h. */ 45319-_ACEOF 45320-cat confdefs.h >>conftest.$ac_ext 45321-cat >>conftest.$ac_ext <<_ACEOF 45322-/* end confdefs.h. */ 45323-#include <$ac_header> 45324-_ACEOF 45325-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 45326- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 45327- ac_status=$? 45328- grep -v '^ *+' conftest.er1 >conftest.err 45329- rm -f conftest.er1 45330- cat conftest.err >&5 45331- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45332- (exit $ac_status); } >/dev/null; then 45333- if test -s conftest.err; then 45334- ac_cpp_err=$ac_c_preproc_warn_flag 45335- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 45336- else 45337- ac_cpp_err= 45338- fi 45339-else 45340- ac_cpp_err=yes 45341-fi 45342-if test -z "$ac_cpp_err"; then 45343- ac_header_preproc=yes 45344-else 45345- echo "$as_me: failed program was:" >&5 45346-sed 's/^/| /' conftest.$ac_ext >&5 45347- 45348- ac_header_preproc=no 45349-fi 45350-rm -f conftest.err conftest.$ac_ext 45351-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 45352-echo "${ECHO_T}$ac_header_preproc" >&6 45353- 45354-# So? What about this header? 45355-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 45356- yes:no: ) 45357- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 45358-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 45359- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 45360-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 45361- ac_header_preproc=yes 45362- ;; 45363- no:yes:* ) 45364- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 45365-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 45366- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 45367-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 45368- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 45369-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 45370- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 45371-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 45372- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 45373-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 45374- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 45375-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 45376- ( 45377- cat <<\_ASBOX 45378-## ------------------------------------------ ## 45379-## Report this to the AC_PACKAGE_NAME lists. ## 45380-## ------------------------------------------ ## 45381-_ASBOX 45382- ) | 45383- sed "s/^/$as_me: WARNING: /" >&2 45384- ;; 45385-esac 45386-echo "$as_me:$LINENO: checking for $ac_header" >&5 45387-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 45388-if eval "test \"\${$as_ac_Header+set}\" = set"; then 45389- echo $ECHO_N "(cached) $ECHO_C" >&6 45390+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 45391+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 45392+echo "configure:27695: checking for $ac_hdr" >&5 45393+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 45394+ echo $ac_n "(cached) $ac_c" 1>&6 45395+else 45396+ cat > conftest.$ac_ext <<EOF 45397+#line 27700 "configure" 45398+#include "confdefs.h" 45399+#include <$ac_hdr> 45400+EOF 45401+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 45402+{ (eval echo configure:27705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 45403+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 45404+if test -z "$ac_err"; then 45405+ rm -rf conftest* 45406+ eval "ac_cv_header_$ac_safe=yes" 45407 else 45408- eval "$as_ac_Header=\$ac_header_preproc" 45409+ echo "$ac_err" >&5 45410+ echo "configure: failed program was:" >&5 45411+ cat conftest.$ac_ext >&5 45412+ rm -rf conftest* 45413+ eval "ac_cv_header_$ac_safe=no" 45414 fi 45415-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 45416-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 45417- 45418+rm -f conftest* 45419 fi 45420-if test `eval echo '${'$as_ac_Header'}'` = yes; then 45421- cat >>confdefs.h <<_ACEOF 45422-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 45423-_ACEOF 45424- 45425- 45426-cat >>confdefs.h <<\_ACEOF 45427+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 45428+ echo "$ac_t""yes" 1>&6 45429+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 45430+ cat >> confdefs.h <<EOF 45431+#define $ac_tr_hdr 1 45432+EOF 45433+ 45434+ cat >> confdefs.h <<\EOF 45435 #define HAVE_CURL_OPENSSL 1 45436-_ACEOF 45437- 45438+EOF 45439 45440+ 45441+else 45442+ echo "$ac_t""no" 1>&6 45443 fi 45444- 45445 done 45446 45447- 45448+ 45449 else 45450- echo "$as_me: program exited with status $ac_status" >&5 45451-echo "$as_me: failed program was:" >&5 45452-sed 's/^/| /' conftest.$ac_ext >&5 45453- 45454-( exit $ac_status ) 45455- 45456- echo "$as_me:$LINENO: result: no" >&5 45457-echo "${ECHO_T}no" >&6 45458- 45459+ echo "configure: failed program was:" >&5 45460+ cat conftest.$ac_ext >&5 45461+ rm -fr conftest* 45462+ 45463+ echo "$ac_t""no" 1>&6 45464+ 45465 fi 45466-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 45467+rm -fr conftest* 45468 fi 45469 45470- echo "$as_me:$LINENO: checking for gnutls support in libcurl" >&5 45471-echo $ECHO_N "checking for gnutls support in libcurl... $ECHO_C" >&6 45472+ 45473+ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 45474+echo "configure:27750: checking for gnutls support in libcurl" >&5 45475 if test "$cross_compiling" = yes; then 45476- 45477- echo "$as_me:$LINENO: result: no" >&5 45478-echo "${ECHO_T}no" >&6 45479- 45480+ 45481+ echo "$ac_t""no" 1>&6 45482+ 45483 else 45484- cat >conftest.$ac_ext <<_ACEOF 45485-/* confdefs.h. */ 45486-_ACEOF 45487-cat confdefs.h >>conftest.$ac_ext 45488-cat >>conftest.$ac_ext <<_ACEOF 45489-/* end confdefs.h. */ 45490+ cat > conftest.$ac_ext <<EOF 45491+#line 27757 "configure" 45492+#include "confdefs.h" 45493 45494 #include <curl/curl.h> 45495 45496 int main(int argc, char *argv[]) 45497 { 45498 curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); 45499- 45500+ 45501 if (data && data->ssl_version && *data->ssl_version) { 45502 const char *ptr = data->ssl_version; 45503 45504@@ -39240,209 +27771,86 @@ 45505 return 1; 45506 } 45507 45508-_ACEOF 45509-rm -f conftest$ac_exeext 45510-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 45511- (eval $ac_link) 2>&5 45512- ac_status=$? 45513- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45514- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 45515- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45516- (eval $ac_try) 2>&5 45517- ac_status=$? 45518- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45519- (exit $ac_status); }; }; then 45520- 45521- echo "$as_me:$LINENO: result: yes" >&5 45522-echo "${ECHO_T}yes" >&6 45523- if test "${ac_cv_header_gcrypt_h+set}" = set; then 45524- echo "$as_me:$LINENO: checking for gcrypt.h" >&5 45525-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6 45526-if test "${ac_cv_header_gcrypt_h+set}" = set; then 45527- echo $ECHO_N "(cached) $ECHO_C" >&6 45528-fi 45529-echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5 45530-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6 45531-else 45532- # Is the header compilable? 45533-echo "$as_me:$LINENO: checking gcrypt.h usability" >&5 45534-echo $ECHO_N "checking gcrypt.h usability... $ECHO_C" >&6 45535-cat >conftest.$ac_ext <<_ACEOF 45536-/* confdefs.h. */ 45537-_ACEOF 45538-cat confdefs.h >>conftest.$ac_ext 45539-cat >>conftest.$ac_ext <<_ACEOF 45540-/* end confdefs.h. */ 45541-$ac_includes_default 45542-#include <gcrypt.h> 45543-_ACEOF 45544-rm -f conftest.$ac_objext 45545-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 45546- (eval $ac_compile) 2>conftest.er1 45547- ac_status=$? 45548- grep -v '^ *+' conftest.er1 >conftest.err 45549- rm -f conftest.er1 45550- cat conftest.err >&5 45551- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45552- (exit $ac_status); } && 45553- { ac_try='test -z "$ac_c_werror_flag" 45554- || test ! -s conftest.err' 45555- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45556- (eval $ac_try) 2>&5 45557- ac_status=$? 45558- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45559- (exit $ac_status); }; } && 45560- { ac_try='test -s conftest.$ac_objext' 45561- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45562- (eval $ac_try) 2>&5 45563- ac_status=$? 45564- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45565- (exit $ac_status); }; }; then 45566- ac_header_compiler=yes 45567-else 45568- echo "$as_me: failed program was:" >&5 45569-sed 's/^/| /' conftest.$ac_ext >&5 45570- 45571-ac_header_compiler=no 45572-fi 45573-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 45574-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 45575-echo "${ECHO_T}$ac_header_compiler" >&6 45576- 45577-# Is the header present? 45578-echo "$as_me:$LINENO: checking gcrypt.h presence" >&5 45579-echo $ECHO_N "checking gcrypt.h presence... $ECHO_C" >&6 45580-cat >conftest.$ac_ext <<_ACEOF 45581-/* confdefs.h. */ 45582-_ACEOF 45583-cat confdefs.h >>conftest.$ac_ext 45584-cat >>conftest.$ac_ext <<_ACEOF 45585-/* end confdefs.h. */ 45586+EOF 45587+if { (eval echo configure:27776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 45588+then 45589+ 45590+ echo "$ac_t""yes" 1>&6 45591+ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` 45592+echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 45593+echo "configure:27782: checking for gcrypt.h" >&5 45594+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 45595+ echo $ac_n "(cached) $ac_c" 1>&6 45596+else 45597+ cat > conftest.$ac_ext <<EOF 45598+#line 27787 "configure" 45599+#include "confdefs.h" 45600 #include <gcrypt.h> 45601-_ACEOF 45602-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 45603- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 45604- ac_status=$? 45605- grep -v '^ *+' conftest.er1 >conftest.err 45606- rm -f conftest.er1 45607- cat conftest.err >&5 45608- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45609- (exit $ac_status); } >/dev/null; then 45610- if test -s conftest.err; then 45611- ac_cpp_err=$ac_c_preproc_warn_flag 45612- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 45613- else 45614- ac_cpp_err= 45615- fi 45616-else 45617- ac_cpp_err=yes 45618-fi 45619-if test -z "$ac_cpp_err"; then 45620- ac_header_preproc=yes 45621-else 45622- echo "$as_me: failed program was:" >&5 45623-sed 's/^/| /' conftest.$ac_ext >&5 45624- 45625- ac_header_preproc=no 45626-fi 45627-rm -f conftest.err conftest.$ac_ext 45628-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 45629-echo "${ECHO_T}$ac_header_preproc" >&6 45630- 45631-# So? What about this header? 45632-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 45633- yes:no: ) 45634- { echo "$as_me:$LINENO: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&5 45635-echo "$as_me: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 45636- { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the compiler's result" >&5 45637-echo "$as_me: WARNING: gcrypt.h: proceeding with the compiler's result" >&2;} 45638- ac_header_preproc=yes 45639- ;; 45640- no:yes:* ) 45641- { echo "$as_me:$LINENO: WARNING: gcrypt.h: present but cannot be compiled" >&5 45642-echo "$as_me: WARNING: gcrypt.h: present but cannot be compiled" >&2;} 45643- { echo "$as_me:$LINENO: WARNING: gcrypt.h: check for missing prerequisite headers?" >&5 45644-echo "$as_me: WARNING: gcrypt.h: check for missing prerequisite headers?" >&2;} 45645- { echo "$as_me:$LINENO: WARNING: gcrypt.h: see the Autoconf documentation" >&5 45646-echo "$as_me: WARNING: gcrypt.h: see the Autoconf documentation" >&2;} 45647- { echo "$as_me:$LINENO: WARNING: gcrypt.h: section \"Present But Cannot Be Compiled\"" >&5 45648-echo "$as_me: WARNING: gcrypt.h: section \"Present But Cannot Be Compiled\"" >&2;} 45649- { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&5 45650-echo "$as_me: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&2;} 45651- { echo "$as_me:$LINENO: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&5 45652-echo "$as_me: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&2;} 45653- ( 45654- cat <<\_ASBOX 45655-## ------------------------------------------ ## 45656-## Report this to the AC_PACKAGE_NAME lists. ## 45657-## ------------------------------------------ ## 45658-_ASBOX 45659- ) | 45660- sed "s/^/$as_me: WARNING: /" >&2 45661- ;; 45662-esac 45663-echo "$as_me:$LINENO: checking for gcrypt.h" >&5 45664-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6 45665-if test "${ac_cv_header_gcrypt_h+set}" = set; then 45666- echo $ECHO_N "(cached) $ECHO_C" >&6 45667+EOF 45668+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 45669+{ (eval echo configure:27792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 45670+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 45671+if test -z "$ac_err"; then 45672+ rm -rf conftest* 45673+ eval "ac_cv_header_$ac_safe=yes" 45674 else 45675- ac_cv_header_gcrypt_h=$ac_header_preproc 45676+ echo "$ac_err" >&5 45677+ echo "configure: failed program was:" >&5 45678+ cat conftest.$ac_ext >&5 45679+ rm -rf conftest* 45680+ eval "ac_cv_header_$ac_safe=no" 45681 fi 45682-echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5 45683-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6 45684- 45685+rm -f conftest* 45686 fi 45687-if test $ac_cv_header_gcrypt_h = yes; then 45688- 45689- 45690-cat >>confdefs.h <<\_ACEOF 45691+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 45692+ echo "$ac_t""yes" 1>&6 45693+ 45694+ cat >> confdefs.h <<\EOF 45695 #define HAVE_CURL_GNUTLS 1 45696-_ACEOF 45697- 45698+EOF 45699 45700+ 45701+else 45702+ echo "$ac_t""no" 1>&6 45703 fi 45704 45705- 45706- 45707+ 45708 else 45709- echo "$as_me: program exited with status $ac_status" >&5 45710-echo "$as_me: failed program was:" >&5 45711-sed 's/^/| /' conftest.$ac_ext >&5 45712- 45713-( exit $ac_status ) 45714- 45715- echo "$as_me:$LINENO: result: no" >&5 45716-echo "${ECHO_T}no" >&6 45717- 45718+ echo "configure: failed program was:" >&5 45719+ cat conftest.$ac_ext >&5 45720+ rm -fr conftest* 45721+ 45722+ echo "$ac_t""no" 1>&6 45723+ 45724 fi 45725-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 45726+rm -fr conftest* 45727 fi 45728 45729+ 45730 CFLAGS="$save_CFLAGS" 45731 else 45732- echo "$as_me:$LINENO: result: no" >&5 45733-echo "${ECHO_T}no" >&6 45734+ echo "$ac_t""no" 1>&6 45735 fi 45736 45737- 45738+ 45739 save_old_LDFLAGS=$LDFLAGS 45740 ac_stuff=" 45741 $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR 45742 " 45743- 45744+ 45745 save_ext_shared=$ext_shared 45746 ext_shared=yes 45747- 45748+ 45749 for ac_i in $ac_stuff; do 45750 case $ac_i in 45751 -pthread) 45752 if test "$ext_shared" = "yes"; then 45753 LDFLAGS="$LDFLAGS -pthread" 45754 else 45755- 45756- 45757+ 45758+ 45759 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 45760- 45761+ 45762 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 45763 if test -n "$unique" && test "`eval $cmd`" = "" ; then 45764 eval "EXTRA_LDFLAGS$unique=set" 45765@@ -39453,20 +27861,20 @@ 45766 ;; 45767 -l*) 45768 ac_ii=`echo $ac_i|cut -c 3-` 45769- 45770- 45771+ 45772+ 45773 case $ac_ii in 45774 c|c_r|pthread*) ;; 45775- *) 45776+ *) 45777 if test "$ext_shared" = "yes"; then 45778- LDFLAGS="$LDFLAGS -l$ac_ii" 45779+ LDFLAGS="$LDFLAGS -l$ac_ii" 45780 else 45781- 45782- 45783+ 45784+ 45785 case $ac_ii in 45786 c|c_r|pthread*) ;; 45787- *) 45788- LIBS="$LIBS -l$ac_ii" 45789+ *) 45790+ LIBS="$LIBS -l$ac_ii" 45791 ;; 45792 esac 45793 45794@@ -39479,157 +27887,125 @@ 45795 ;; 45796 -L*) 45797 ac_ii=`echo $ac_i|cut -c 3-` 45798- 45799+ 45800 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 45801- 45802+ 45803 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 45804 ai_p=$ac_ii 45805 else 45806- 45807+ 45808 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 45809- 45810+ 45811 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 45812 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 45813 fi 45814 45815- 45816+ 45817 if test "$ext_shared" = "yes"; then 45818 LDFLAGS="-L$ai_p $LDFLAGS" 45819 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 45820 else 45821- 45822- 45823- 45824+ 45825+ 45826+ 45827 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 45828- 45829+ 45830 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 45831 if test -n "$unique" && test "`eval $cmd`" = "" ; then 45832 eval "LIBPATH$unique=set" 45833- 45834+ 45835 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 45836 LDFLAGS="$LDFLAGS -L$ai_p" 45837 PHP_RPATHS="$PHP_RPATHS $ai_p" 45838- 45839+ 45840 fi 45841 45842 45843 fi 45844- 45845+ 45846 fi 45847 45848 ;; 45849 esac 45850 done 45851 45852- echo "$as_me:$LINENO: checking for curl_easy_perform in -lcurl" >&5 45853-echo $ECHO_N "checking for curl_easy_perform in -lcurl... $ECHO_C" >&6 45854-if test "${ac_cv_lib_curl_curl_easy_perform+set}" = set; then 45855- echo $ECHO_N "(cached) $ECHO_C" >&6 45856+ echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 45857+echo "configure:27934: checking for curl_easy_perform in -lcurl" >&5 45858+ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'` 45859+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 45860+ echo $ac_n "(cached) $ac_c" 1>&6 45861 else 45862- ac_check_lib_save_LIBS=$LIBS 45863+ ac_save_LIBS="$LIBS" 45864 LIBS="-lcurl $LIBS" 45865-cat >conftest.$ac_ext <<_ACEOF 45866-/* confdefs.h. */ 45867-_ACEOF 45868-cat confdefs.h >>conftest.$ac_ext 45869-cat >>conftest.$ac_ext <<_ACEOF 45870-/* end confdefs.h. */ 45871- 45872+cat > conftest.$ac_ext <<EOF 45873+#line 27942 "configure" 45874+#include "confdefs.h" 45875 /* Override any gcc2 internal prototype to avoid an error. */ 45876-#ifdef __cplusplus 45877-extern "C" 45878-#endif 45879 /* We use char because int might match the return type of a gcc2 45880- builtin and then its argument prototype would still apply. */ 45881-char curl_easy_perform (); 45882-int 45883-main () 45884-{ 45885-curl_easy_perform (); 45886- ; 45887- return 0; 45888-} 45889-_ACEOF 45890-rm -f conftest.$ac_objext conftest$ac_exeext 45891-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 45892- (eval $ac_link) 2>conftest.er1 45893- ac_status=$? 45894- grep -v '^ *+' conftest.er1 >conftest.err 45895- rm -f conftest.er1 45896- cat conftest.err >&5 45897- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45898- (exit $ac_status); } && 45899- { ac_try='test -z "$ac_c_werror_flag" 45900- || test ! -s conftest.err' 45901- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45902- (eval $ac_try) 2>&5 45903- ac_status=$? 45904- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45905- (exit $ac_status); }; } && 45906- { ac_try='test -s conftest$ac_exeext' 45907- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 45908- (eval $ac_try) 2>&5 45909- ac_status=$? 45910- echo "$as_me:$LINENO: \$? = $ac_status" >&5 45911- (exit $ac_status); }; }; then 45912- ac_cv_lib_curl_curl_easy_perform=yes 45913-else 45914- echo "$as_me: failed program was:" >&5 45915-sed 's/^/| /' conftest.$ac_ext >&5 45916- 45917-ac_cv_lib_curl_curl_easy_perform=no 45918-fi 45919-rm -f conftest.err conftest.$ac_objext \ 45920- conftest$ac_exeext conftest.$ac_ext 45921-LIBS=$ac_check_lib_save_LIBS 45922-fi 45923-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_perform" >&5 45924-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_perform" >&6 45925-if test $ac_cv_lib_curl_curl_easy_perform = yes; then 45926+ builtin and then its argument prototype would still apply. */ 45927+char curl_easy_perform(); 45928 45929+int main() { 45930+curl_easy_perform() 45931+; return 0; } 45932+EOF 45933+if { (eval echo configure:27953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 45934+ rm -rf conftest* 45935+ eval "ac_cv_lib_$ac_lib_var=yes" 45936+else 45937+ echo "configure: failed program was:" >&5 45938+ cat conftest.$ac_ext >&5 45939+ rm -rf conftest* 45940+ eval "ac_cv_lib_$ac_lib_var=no" 45941+fi 45942+rm -f conftest* 45943+LIBS="$ac_save_LIBS" 45944+ 45945+fi 45946+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 45947+ echo "$ac_t""yes" 1>&6 45948+ 45949 LDFLAGS=$save_old_LDFLAGS 45950 ext_shared=$save_ext_shared 45951+ 45952+ cat >> confdefs.h <<\EOF 45953+#define HAVE_CURL 1 45954+EOF 45955 45956- 45957-cat >>confdefs.h <<\_ACEOF 45958-#define HAVE_CURL 1 45959-_ACEOF 45960- 45961- 45962- 45963+ 45964+ 45965 else 45966+ echo "$ac_t""no" 1>&6 45967 45968 LDFLAGS=$save_old_LDFLAGS 45969 ext_shared=$save_ext_shared 45970 unset ac_cv_lib_curl_curl_easy_perform 45971- 45972- { { echo "$as_me:$LINENO: error: There is something wrong. Please check config.log for more information." >&5 45973-echo "$as_me: error: There is something wrong. Please check config.log for more information." >&2;} 45974- { (exit 1); exit 1; }; } 45975- 45976- 45977+ 45978+ { echo "configure: error: There is something wrong. Please check config.log for more information." 1>&2; exit 1; } 45979+ 45980+ 45981 fi 45982 45983 45984- 45985+ 45986 save_old_LDFLAGS=$LDFLAGS 45987 ac_stuff=" 45988 $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR 45989 " 45990- 45991+ 45992 save_ext_shared=$ext_shared 45993 ext_shared=yes 45994- 45995+ 45996 for ac_i in $ac_stuff; do 45997 case $ac_i in 45998 -pthread) 45999 if test "$ext_shared" = "yes"; then 46000 LDFLAGS="$LDFLAGS -pthread" 46001 else 46002- 46003- 46004+ 46005+ 46006 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 46007- 46008+ 46009 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 46010 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46011 eval "EXTRA_LDFLAGS$unique=set" 46012@@ -39640,20 +28016,20 @@ 46013 ;; 46014 -l*) 46015 ac_ii=`echo $ac_i|cut -c 3-` 46016- 46017- 46018+ 46019+ 46020 case $ac_ii in 46021 c|c_r|pthread*) ;; 46022- *) 46023+ *) 46024 if test "$ext_shared" = "yes"; then 46025- LDFLAGS="$LDFLAGS -l$ac_ii" 46026+ LDFLAGS="$LDFLAGS -l$ac_ii" 46027 else 46028- 46029- 46030+ 46031+ 46032 case $ac_ii in 46033 c|c_r|pthread*) ;; 46034- *) 46035- LIBS="$LIBS -l$ac_ii" 46036+ *) 46037+ LIBS="$LIBS -l$ac_ii" 46038 ;; 46039 esac 46040 46041@@ -39666,153 +28042,123 @@ 46042 ;; 46043 -L*) 46044 ac_ii=`echo $ac_i|cut -c 3-` 46045- 46046+ 46047 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 46048- 46049+ 46050 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 46051 ai_p=$ac_ii 46052 else 46053- 46054+ 46055 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 46056- 46057+ 46058 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 46059 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 46060 fi 46061 46062- 46063+ 46064 if test "$ext_shared" = "yes"; then 46065 LDFLAGS="-L$ai_p $LDFLAGS" 46066 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 46067 else 46068- 46069- 46070- 46071+ 46072+ 46073+ 46074 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 46075- 46076+ 46077 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 46078 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46079 eval "LIBPATH$unique=set" 46080- 46081+ 46082 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 46083 LDFLAGS="$LDFLAGS -L$ai_p" 46084 PHP_RPATHS="$PHP_RPATHS $ai_p" 46085- 46086+ 46087 fi 46088 46089 46090 fi 46091- 46092+ 46093 fi 46094 46095 ;; 46096 esac 46097 done 46098 46099- echo "$as_me:$LINENO: checking for curl_version_info in -lcurl" >&5 46100-echo $ECHO_N "checking for curl_version_info in -lcurl... $ECHO_C" >&6 46101-if test "${ac_cv_lib_curl_curl_version_info+set}" = set; then 46102- echo $ECHO_N "(cached) $ECHO_C" >&6 46103+ echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 46104+echo "configure:28089: checking for curl_version_info in -lcurl" >&5 46105+ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` 46106+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 46107+ echo $ac_n "(cached) $ac_c" 1>&6 46108 else 46109- ac_check_lib_save_LIBS=$LIBS 46110+ ac_save_LIBS="$LIBS" 46111 LIBS="-lcurl $LIBS" 46112-cat >conftest.$ac_ext <<_ACEOF 46113-/* confdefs.h. */ 46114-_ACEOF 46115-cat confdefs.h >>conftest.$ac_ext 46116-cat >>conftest.$ac_ext <<_ACEOF 46117-/* end confdefs.h. */ 46118- 46119+cat > conftest.$ac_ext <<EOF 46120+#line 28097 "configure" 46121+#include "confdefs.h" 46122 /* Override any gcc2 internal prototype to avoid an error. */ 46123-#ifdef __cplusplus 46124-extern "C" 46125-#endif 46126 /* We use char because int might match the return type of a gcc2 46127- builtin and then its argument prototype would still apply. */ 46128-char curl_version_info (); 46129-int 46130-main () 46131-{ 46132-curl_version_info (); 46133- ; 46134- return 0; 46135-} 46136-_ACEOF 46137-rm -f conftest.$ac_objext conftest$ac_exeext 46138-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 46139- (eval $ac_link) 2>conftest.er1 46140- ac_status=$? 46141- grep -v '^ *+' conftest.er1 >conftest.err 46142- rm -f conftest.er1 46143- cat conftest.err >&5 46144- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46145- (exit $ac_status); } && 46146- { ac_try='test -z "$ac_c_werror_flag" 46147- || test ! -s conftest.err' 46148- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46149- (eval $ac_try) 2>&5 46150- ac_status=$? 46151- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46152- (exit $ac_status); }; } && 46153- { ac_try='test -s conftest$ac_exeext' 46154- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46155- (eval $ac_try) 2>&5 46156- ac_status=$? 46157- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46158- (exit $ac_status); }; }; then 46159- ac_cv_lib_curl_curl_version_info=yes 46160-else 46161- echo "$as_me: failed program was:" >&5 46162-sed 's/^/| /' conftest.$ac_ext >&5 46163- 46164-ac_cv_lib_curl_curl_version_info=no 46165-fi 46166-rm -f conftest.err conftest.$ac_objext \ 46167- conftest$ac_exeext conftest.$ac_ext 46168-LIBS=$ac_check_lib_save_LIBS 46169-fi 46170-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_version_info" >&5 46171-echo "${ECHO_T}$ac_cv_lib_curl_curl_version_info" >&6 46172-if test $ac_cv_lib_curl_curl_version_info = yes; then 46173+ builtin and then its argument prototype would still apply. */ 46174+char curl_version_info(); 46175+ 46176+int main() { 46177+curl_version_info() 46178+; return 0; } 46179+EOF 46180+if { (eval echo configure:28108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 46181+ rm -rf conftest* 46182+ eval "ac_cv_lib_$ac_lib_var=yes" 46183+else 46184+ echo "configure: failed program was:" >&5 46185+ cat conftest.$ac_ext >&5 46186+ rm -rf conftest* 46187+ eval "ac_cv_lib_$ac_lib_var=no" 46188+fi 46189+rm -f conftest* 46190+LIBS="$ac_save_LIBS" 46191 46192+fi 46193+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 46194+ echo "$ac_t""yes" 1>&6 46195+ 46196 LDFLAGS=$save_old_LDFLAGS 46197 ext_shared=$save_ext_shared 46198- 46199- 46200-cat >>confdefs.h <<\_ACEOF 46201+ 46202+ cat >> confdefs.h <<\EOF 46203 #define HAVE_CURL_VERSION_INFO 1 46204-_ACEOF 46205- 46206- 46207+EOF 46208 46209+ 46210+ 46211 else 46212+ echo "$ac_t""no" 1>&6 46213 46214 LDFLAGS=$save_old_LDFLAGS 46215 ext_shared=$save_ext_shared 46216 unset ac_cv_lib_curl_curl_version_info 46217- 46218- 46219+ 46220+ 46221 fi 46222 46223 46224- 46225+ 46226 save_old_LDFLAGS=$LDFLAGS 46227 ac_stuff=" 46228 $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR 46229 " 46230- 46231+ 46232 save_ext_shared=$ext_shared 46233 ext_shared=yes 46234- 46235+ 46236 for ac_i in $ac_stuff; do 46237 case $ac_i in 46238 -pthread) 46239 if test "$ext_shared" = "yes"; then 46240 LDFLAGS="$LDFLAGS -pthread" 46241 else 46242- 46243- 46244+ 46245+ 46246 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 46247- 46248+ 46249 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 46250 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46251 eval "EXTRA_LDFLAGS$unique=set" 46252@@ -39823,20 +28169,20 @@ 46253 ;; 46254 -l*) 46255 ac_ii=`echo $ac_i|cut -c 3-` 46256- 46257- 46258+ 46259+ 46260 case $ac_ii in 46261 c|c_r|pthread*) ;; 46262- *) 46263+ *) 46264 if test "$ext_shared" = "yes"; then 46265- LDFLAGS="$LDFLAGS -l$ac_ii" 46266+ LDFLAGS="$LDFLAGS -l$ac_ii" 46267 else 46268- 46269- 46270+ 46271+ 46272 case $ac_ii in 46273 c|c_r|pthread*) ;; 46274- *) 46275- LIBS="$LIBS -l$ac_ii" 46276+ *) 46277+ LIBS="$LIBS -l$ac_ii" 46278 ;; 46279 esac 46280 46281@@ -39849,153 +28195,123 @@ 46282 ;; 46283 -L*) 46284 ac_ii=`echo $ac_i|cut -c 3-` 46285- 46286+ 46287 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 46288- 46289+ 46290 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 46291 ai_p=$ac_ii 46292 else 46293- 46294+ 46295 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 46296- 46297+ 46298 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 46299 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 46300 fi 46301 46302- 46303+ 46304 if test "$ext_shared" = "yes"; then 46305 LDFLAGS="-L$ai_p $LDFLAGS" 46306 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 46307 else 46308- 46309- 46310- 46311+ 46312+ 46313+ 46314 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 46315- 46316+ 46317 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 46318 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46319 eval "LIBPATH$unique=set" 46320- 46321+ 46322 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 46323 LDFLAGS="$LDFLAGS -L$ai_p" 46324 PHP_RPATHS="$PHP_RPATHS $ai_p" 46325- 46326+ 46327 fi 46328 46329 46330 fi 46331- 46332+ 46333 fi 46334 46335 ;; 46336 esac 46337 done 46338 46339- echo "$as_me:$LINENO: checking for curl_easy_strerror in -lcurl" >&5 46340-echo $ECHO_N "checking for curl_easy_strerror in -lcurl... $ECHO_C" >&6 46341-if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then 46342- echo $ECHO_N "(cached) $ECHO_C" >&6 46343+ echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 46344+echo "configure:28242: checking for curl_easy_strerror in -lcurl" >&5 46345+ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` 46346+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 46347+ echo $ac_n "(cached) $ac_c" 1>&6 46348 else 46349- ac_check_lib_save_LIBS=$LIBS 46350+ ac_save_LIBS="$LIBS" 46351 LIBS="-lcurl $LIBS" 46352-cat >conftest.$ac_ext <<_ACEOF 46353-/* confdefs.h. */ 46354-_ACEOF 46355-cat confdefs.h >>conftest.$ac_ext 46356-cat >>conftest.$ac_ext <<_ACEOF 46357-/* end confdefs.h. */ 46358- 46359+cat > conftest.$ac_ext <<EOF 46360+#line 28250 "configure" 46361+#include "confdefs.h" 46362 /* Override any gcc2 internal prototype to avoid an error. */ 46363-#ifdef __cplusplus 46364-extern "C" 46365-#endif 46366 /* We use char because int might match the return type of a gcc2 46367- builtin and then its argument prototype would still apply. */ 46368-char curl_easy_strerror (); 46369-int 46370-main () 46371-{ 46372-curl_easy_strerror (); 46373- ; 46374- return 0; 46375-} 46376-_ACEOF 46377-rm -f conftest.$ac_objext conftest$ac_exeext 46378-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 46379- (eval $ac_link) 2>conftest.er1 46380- ac_status=$? 46381- grep -v '^ *+' conftest.er1 >conftest.err 46382- rm -f conftest.er1 46383- cat conftest.err >&5 46384- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46385- (exit $ac_status); } && 46386- { ac_try='test -z "$ac_c_werror_flag" 46387- || test ! -s conftest.err' 46388- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46389- (eval $ac_try) 2>&5 46390- ac_status=$? 46391- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46392- (exit $ac_status); }; } && 46393- { ac_try='test -s conftest$ac_exeext' 46394- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46395- (eval $ac_try) 2>&5 46396- ac_status=$? 46397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46398- (exit $ac_status); }; }; then 46399- ac_cv_lib_curl_curl_easy_strerror=yes 46400-else 46401- echo "$as_me: failed program was:" >&5 46402-sed 's/^/| /' conftest.$ac_ext >&5 46403- 46404-ac_cv_lib_curl_curl_easy_strerror=no 46405-fi 46406-rm -f conftest.err conftest.$ac_objext \ 46407- conftest$ac_exeext conftest.$ac_ext 46408-LIBS=$ac_check_lib_save_LIBS 46409-fi 46410-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_strerror" >&5 46411-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_strerror" >&6 46412-if test $ac_cv_lib_curl_curl_easy_strerror = yes; then 46413+ builtin and then its argument prototype would still apply. */ 46414+char curl_easy_strerror(); 46415+ 46416+int main() { 46417+curl_easy_strerror() 46418+; return 0; } 46419+EOF 46420+if { (eval echo configure:28261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 46421+ rm -rf conftest* 46422+ eval "ac_cv_lib_$ac_lib_var=yes" 46423+else 46424+ echo "configure: failed program was:" >&5 46425+ cat conftest.$ac_ext >&5 46426+ rm -rf conftest* 46427+ eval "ac_cv_lib_$ac_lib_var=no" 46428+fi 46429+rm -f conftest* 46430+LIBS="$ac_save_LIBS" 46431 46432+fi 46433+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 46434+ echo "$ac_t""yes" 1>&6 46435+ 46436 LDFLAGS=$save_old_LDFLAGS 46437 ext_shared=$save_ext_shared 46438- 46439- 46440-cat >>confdefs.h <<\_ACEOF 46441+ 46442+ cat >> confdefs.h <<\EOF 46443 #define HAVE_CURL_EASY_STRERROR 1 46444-_ACEOF 46445- 46446- 46447+EOF 46448 46449+ 46450+ 46451 else 46452+ echo "$ac_t""no" 1>&6 46453 46454 LDFLAGS=$save_old_LDFLAGS 46455 ext_shared=$save_ext_shared 46456 unset ac_cv_lib_curl_curl_easy_strerror 46457- 46458- 46459+ 46460+ 46461 fi 46462 46463 46464- 46465+ 46466 save_old_LDFLAGS=$LDFLAGS 46467 ac_stuff=" 46468 $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR 46469 " 46470- 46471+ 46472 save_ext_shared=$ext_shared 46473 ext_shared=yes 46474- 46475+ 46476 for ac_i in $ac_stuff; do 46477 case $ac_i in 46478 -pthread) 46479 if test "$ext_shared" = "yes"; then 46480 LDFLAGS="$LDFLAGS -pthread" 46481 else 46482- 46483- 46484+ 46485+ 46486 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 46487- 46488+ 46489 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 46490 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46491 eval "EXTRA_LDFLAGS$unique=set" 46492@@ -40006,20 +28322,20 @@ 46493 ;; 46494 -l*) 46495 ac_ii=`echo $ac_i|cut -c 3-` 46496- 46497- 46498+ 46499+ 46500 case $ac_ii in 46501 c|c_r|pthread*) ;; 46502- *) 46503+ *) 46504 if test "$ext_shared" = "yes"; then 46505- LDFLAGS="$LDFLAGS -l$ac_ii" 46506+ LDFLAGS="$LDFLAGS -l$ac_ii" 46507 else 46508- 46509- 46510+ 46511+ 46512 case $ac_ii in 46513 c|c_r|pthread*) ;; 46514- *) 46515- LIBS="$LIBS -l$ac_ii" 46516+ *) 46517+ LIBS="$LIBS -l$ac_ii" 46518 ;; 46519 esac 46520 46521@@ -40032,143 +28348,112 @@ 46522 ;; 46523 -L*) 46524 ac_ii=`echo $ac_i|cut -c 3-` 46525- 46526+ 46527 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 46528- 46529+ 46530 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 46531 ai_p=$ac_ii 46532 else 46533- 46534+ 46535 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 46536- 46537+ 46538 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 46539 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 46540 fi 46541 46542- 46543+ 46544 if test "$ext_shared" = "yes"; then 46545 LDFLAGS="-L$ai_p $LDFLAGS" 46546 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 46547 else 46548- 46549- 46550- 46551+ 46552+ 46553+ 46554 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 46555- 46556+ 46557 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 46558 if test -n "$unique" && test "`eval $cmd`" = "" ; then 46559 eval "LIBPATH$unique=set" 46560- 46561+ 46562 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 46563 LDFLAGS="$LDFLAGS -L$ai_p" 46564 PHP_RPATHS="$PHP_RPATHS $ai_p" 46565- 46566+ 46567 fi 46568 46569 46570 fi 46571- 46572+ 46573 fi 46574 46575 ;; 46576 esac 46577 done 46578 46579- echo "$as_me:$LINENO: checking for curl_multi_strerror in -lcurl" >&5 46580-echo $ECHO_N "checking for curl_multi_strerror in -lcurl... $ECHO_C" >&6 46581-if test "${ac_cv_lib_curl_curl_multi_strerror+set}" = set; then 46582- echo $ECHO_N "(cached) $ECHO_C" >&6 46583+ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 46584+echo "configure:28395: checking for curl_multi_strerror in -lcurl" >&5 46585+ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` 46586+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 46587+ echo $ac_n "(cached) $ac_c" 1>&6 46588 else 46589- ac_check_lib_save_LIBS=$LIBS 46590+ ac_save_LIBS="$LIBS" 46591 LIBS="-lcurl $LIBS" 46592-cat >conftest.$ac_ext <<_ACEOF 46593-/* confdefs.h. */ 46594-_ACEOF 46595-cat confdefs.h >>conftest.$ac_ext 46596-cat >>conftest.$ac_ext <<_ACEOF 46597-/* end confdefs.h. */ 46598- 46599+cat > conftest.$ac_ext <<EOF 46600+#line 28403 "configure" 46601+#include "confdefs.h" 46602 /* Override any gcc2 internal prototype to avoid an error. */ 46603-#ifdef __cplusplus 46604-extern "C" 46605-#endif 46606 /* We use char because int might match the return type of a gcc2 46607- builtin and then its argument prototype would still apply. */ 46608-char curl_multi_strerror (); 46609-int 46610-main () 46611-{ 46612-curl_multi_strerror (); 46613- ; 46614- return 0; 46615-} 46616-_ACEOF 46617-rm -f conftest.$ac_objext conftest$ac_exeext 46618-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 46619- (eval $ac_link) 2>conftest.er1 46620- ac_status=$? 46621- grep -v '^ *+' conftest.er1 >conftest.err 46622- rm -f conftest.er1 46623- cat conftest.err >&5 46624- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46625- (exit $ac_status); } && 46626- { ac_try='test -z "$ac_c_werror_flag" 46627- || test ! -s conftest.err' 46628- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46629- (eval $ac_try) 2>&5 46630- ac_status=$? 46631- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46632- (exit $ac_status); }; } && 46633- { ac_try='test -s conftest$ac_exeext' 46634- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 46635- (eval $ac_try) 2>&5 46636- ac_status=$? 46637- echo "$as_me:$LINENO: \$? = $ac_status" >&5 46638- (exit $ac_status); }; }; then 46639- ac_cv_lib_curl_curl_multi_strerror=yes 46640-else 46641- echo "$as_me: failed program was:" >&5 46642-sed 's/^/| /' conftest.$ac_ext >&5 46643- 46644-ac_cv_lib_curl_curl_multi_strerror=no 46645-fi 46646-rm -f conftest.err conftest.$ac_objext \ 46647- conftest$ac_exeext conftest.$ac_ext 46648-LIBS=$ac_check_lib_save_LIBS 46649-fi 46650-echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_multi_strerror" >&5 46651-echo "${ECHO_T}$ac_cv_lib_curl_curl_multi_strerror" >&6 46652-if test $ac_cv_lib_curl_curl_multi_strerror = yes; then 46653+ builtin and then its argument prototype would still apply. */ 46654+char curl_multi_strerror(); 46655+ 46656+int main() { 46657+curl_multi_strerror() 46658+; return 0; } 46659+EOF 46660+if { (eval echo configure:28414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 46661+ rm -rf conftest* 46662+ eval "ac_cv_lib_$ac_lib_var=yes" 46663+else 46664+ echo "configure: failed program was:" >&5 46665+ cat conftest.$ac_ext >&5 46666+ rm -rf conftest* 46667+ eval "ac_cv_lib_$ac_lib_var=no" 46668+fi 46669+rm -f conftest* 46670+LIBS="$ac_save_LIBS" 46671 46672+fi 46673+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 46674+ echo "$ac_t""yes" 1>&6 46675+ 46676 LDFLAGS=$save_old_LDFLAGS 46677 ext_shared=$save_ext_shared 46678- 46679- 46680-cat >>confdefs.h <<\_ACEOF 46681+ 46682+ cat >> confdefs.h <<\EOF 46683 #define HAVE_CURL_MULTI_STRERROR 1 46684-_ACEOF 46685- 46686- 46687+EOF 46688 46689+ 46690+ 46691 else 46692+ echo "$ac_t""no" 1>&6 46693 46694 LDFLAGS=$save_old_LDFLAGS 46695 ext_shared=$save_ext_shared 46696 unset ac_cv_lib_curl_curl_multi_strerror 46697- 46698- 46699+ 46700+ 46701 fi 46702 46703 46704 if test "$PHP_CURLWRAPPERS" != "no" ; then 46705- 46706-cat >>confdefs.h <<\_ACEOF 46707+ cat >> confdefs.h <<\EOF 46708 #define PHP_CURL_URL_WRAPPERS 1 46709-_ACEOF 46710+EOF 46711 46712 fi 46713 46714- 46715+ 46716 ext_builddir=ext/curl 46717 ext_srcdir=$abs_srcdir/ext/curl 46718 46719@@ -40176,15 +28461,15 @@ 46720 46721 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 46722 PHP_CURL_SHARED=no 46723- 46724- 46725+ 46726+ 46727 case ext/curl in 46728 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 46729 /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 46730 *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 46731 esac 46732- 46733- 46734+ 46735+ 46736 46737 b_c_pre=$php_c_pre 46738 b_cxx_pre=$php_cxx_pre 46739@@ -40197,12 +28482,12 @@ 46740 46741 old_IFS=$IFS 46742 for ac_src in interface.c multi.c streams.c; do 46743- 46744+ 46745 IFS=. 46746 set $ac_src 46747 ac_obj=$1 46748 IFS=$old_IFS 46749- 46750+ 46751 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 46752 46753 case $ac_src in 46754@@ -40226,14 +28511,14 @@ 46755 else 46756 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 46757 PHP_CURL_SHARED=yes 46758- 46759+ 46760 case ext/curl in 46761 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 46762 /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 46763 *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 46764 esac 46765- 46766- 46767+ 46768+ 46769 46770 b_c_pre=$shared_c_pre 46771 b_cxx_pre=$shared_cxx_pre 46772@@ -40246,12 +28531,12 @@ 46773 46774 old_IFS=$IFS 46775 for ac_src in interface.c multi.c streams.c; do 46776- 46777+ 46778 IFS=. 46779 set $ac_src 46780 ac_obj=$1 46781 IFS=$old_IFS 46782- 46783+ 46784 shared_objects_curl="$shared_objects_curl $ac_bdir$ac_obj.lo" 46785 46786 case $ac_src in 46787@@ -40269,7 +28554,7 @@ 46788 46789 case $host_alias in 46790 *netware*) 46791- 46792+ 46793 install_modules="install-modules" 46794 46795 case $host_alias in 46796@@ -40279,7 +28564,7 @@ 46797 ;; 46798 *netware*) 46799 suffix=nlm 46800- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(CURL_SHARED_LIBADD)' 46801+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCURL, 3)_SHARED_LIBADD)' 46802 ;; 46803 *) 46804 suffix=la 46805@@ -40292,7 +28577,7 @@ 46806 else 46807 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcurl.$suffix" 46808 fi 46809- 46810+ 46811 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_curl" 46812 46813 cat >>Makefile.objects<<EOF 46814@@ -40306,7 +28591,7 @@ 46815 46816 ;; 46817 *) 46818- 46819+ 46820 install_modules="install-modules" 46821 46822 case $host_alias in 46823@@ -40316,7 +28601,7 @@ 46824 ;; 46825 *netware*) 46826 suffix=nlm 46827- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(L_SHARED_LIBADD)' 46828+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_curl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CURL, 3)_SHARED_LIBADD)' 46829 ;; 46830 *) 46831 suffix=la 46832@@ -40329,7 +28614,7 @@ 46833 else 46834 PHP_MODULES="$PHP_MODULES \$(phplibdir)/curl.$suffix" 46835 fi 46836- 46837+ 46838 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_curl" 46839 46840 cat >>Makefile.objects<<EOF 46841@@ -40343,10 +28628,9 @@ 46842 46843 ;; 46844 esac 46845- 46846-cat >>confdefs.h <<_ACEOF 46847+ cat >> confdefs.h <<EOF 46848 #define COMPILE_DL_CURL 1 46849-_ACEOF 46850+EOF 46851 46852 fi 46853 fi 46854@@ -40355,15 +28639,15 @@ 46855 PHP_CURL_SHARED=no 46856 case "$PHP_SAPI" in 46857 cgi|embed) 46858- 46859- 46860+ 46861+ 46862 case ext/curl in 46863 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 46864 /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 46865 *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 46866 esac 46867- 46868- 46869+ 46870+ 46871 46872 b_c_pre=$php_c_pre 46873 b_cxx_pre=$php_cxx_pre 46874@@ -40376,12 +28660,12 @@ 46875 46876 old_IFS=$IFS 46877 for ac_src in interface.c multi.c streams.c; do 46878- 46879+ 46880 IFS=. 46881 set $ac_src 46882 ac_obj=$1 46883 IFS=$old_IFS 46884- 46885+ 46886 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 46887 46888 case $ac_src in 46889@@ -40401,15 +28685,15 @@ 46890 EXT_STATIC="$EXT_STATIC curl" 46891 ;; 46892 *) 46893- 46894- 46895+ 46896+ 46897 case ext/curl in 46898 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 46899 /*) ac_srcdir=`echo "ext/curl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 46900 *) ac_srcdir="$abs_srcdir/ext/curl/"; ac_bdir="ext/curl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 46901 esac 46902- 46903- 46904+ 46905+ 46906 46907 b_c_pre=$php_c_pre 46908 b_cxx_pre=$php_cxx_pre 46909@@ -40422,13 +28706,13 @@ 46910 46911 old_IFS=$IFS 46912 for ac_src in interface.c multi.c streams.c; do 46913- 46914+ 46915 IFS=. 46916 set $ac_src 46917 ac_obj=$1 46918 IFS=$old_IFS 46919- 46920- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 46921+ 46922+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 46923 46924 case $ac_src in 46925 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 46926@@ -40448,20 +28732,20 @@ 46927 esac 46928 EXT_CLI_STATIC="$EXT_CLI_STATIC curl" 46929 fi 46930- 46931- 46932+ 46933+ 46934 BUILD_DIR="$BUILD_DIR $ext_builddir" 46935- 46936+ 46937 46938 46939 if test "$ext_builddir" = "."; then 46940 PHP_PECL_EXTENSION=curl 46941- 46942+ 46943 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 46944 46945 fi 46946 46947- 46948+ 46949 PHP_VAR_SUBST="$PHP_VAR_SUBST CURL_SHARED_LIBADD" 46950 46951 fi 46952@@ -40490,11 +28774,12 @@ 46953 enableval="$enable_dba" 46954 PHP_DBA=$enableval 46955 else 46956- 46957+ 46958 PHP_DBA=no 46959 test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL 46960 46961-fi; 46962+fi 46963+ 46964 46965 46966 ext_output="yes, shared" 46967@@ -40527,17 +28812,17 @@ 46968 php_with_qdbm=no 46969 46970 46971- 46972 # Check whether --with-qdbm or --without-qdbm was given. 46973 if test "${with_qdbm+set}" = set; then 46974 withval="$with_qdbm" 46975 PHP_QDBM=$withval 46976 else 46977- 46978+ 46979 PHP_QDBM=no 46980+ 46981 46982+fi 46983 46984-fi; 46985 46986 ext_output=$PHP_QDBM 46987 46988@@ -40549,17 +28834,17 @@ 46989 php_with_gdbm=no 46990 46991 46992- 46993 # Check whether --with-gdbm or --without-gdbm was given. 46994 if test "${with_gdbm+set}" = set; then 46995 withval="$with_gdbm" 46996 PHP_GDBM=$withval 46997 else 46998- 46999+ 47000 PHP_GDBM=no 47001+ 47002 47003+fi 47004 47005-fi; 47006 47007 ext_output=$PHP_GDBM 47008 47009@@ -40571,17 +28856,17 @@ 47010 php_with_ndbm=no 47011 47012 47013- 47014 # Check whether --with-ndbm or --without-ndbm was given. 47015 if test "${with_ndbm+set}" = set; then 47016 withval="$with_ndbm" 47017 PHP_NDBM=$withval 47018 else 47019- 47020+ 47021 PHP_NDBM=no 47022+ 47023 47024+fi 47025 47026-fi; 47027 47028 ext_output=$PHP_NDBM 47029 47030@@ -40593,17 +28878,17 @@ 47031 php_with_db4=no 47032 47033 47034- 47035 # Check whether --with-db4 or --without-db4 was given. 47036 if test "${with_db4+set}" = set; then 47037 withval="$with_db4" 47038 PHP_DB4=$withval 47039 else 47040- 47041+ 47042 PHP_DB4=no 47043+ 47044 47045+fi 47046 47047-fi; 47048 47049 ext_output=$PHP_DB4 47050 47051@@ -40615,17 +28900,17 @@ 47052 php_with_db3=no 47053 47054 47055- 47056 # Check whether --with-db3 or --without-db3 was given. 47057 if test "${with_db3+set}" = set; then 47058 withval="$with_db3" 47059 PHP_DB3=$withval 47060 else 47061- 47062+ 47063 PHP_DB3=no 47064+ 47065 47066+fi 47067 47068-fi; 47069 47070 ext_output=$PHP_DB3 47071 47072@@ -40637,17 +28922,17 @@ 47073 php_with_db2=no 47074 47075 47076- 47077 # Check whether --with-db2 or --without-db2 was given. 47078 if test "${with_db2+set}" = set; then 47079 withval="$with_db2" 47080 PHP_DB2=$withval 47081 else 47082- 47083+ 47084 PHP_DB2=no 47085+ 47086 47087+fi 47088 47089-fi; 47090 47091 ext_output=$PHP_DB2 47092 47093@@ -40659,17 +28944,17 @@ 47094 php_with_db1=no 47095 47096 47097- 47098 # Check whether --with-db1 or --without-db1 was given. 47099 if test "${with_db1+set}" = set; then 47100 withval="$with_db1" 47101 PHP_DB1=$withval 47102 else 47103- 47104+ 47105 PHP_DB1=no 47106+ 47107 47108+fi 47109 47110-fi; 47111 47112 ext_output=$PHP_DB1 47113 47114@@ -40681,17 +28966,17 @@ 47115 php_with_dbm=no 47116 47117 47118- 47119 # Check whether --with-dbm or --without-dbm was given. 47120 if test "${with_dbm+set}" = set; then 47121 withval="$with_dbm" 47122 PHP_DBM=$withval 47123 else 47124- 47125+ 47126 PHP_DBM=no 47127+ 47128 47129+fi 47130 47131-fi; 47132 47133 ext_output=$PHP_DBM 47134 47135@@ -40702,7 +28987,7 @@ 47136 47137 # QDBM 47138 if test "$PHP_QDBM" != "no"; then 47139- 47140+ 47141 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 47142 47143 for i in $PHP_QDBM /usr/local /usr; do 47144@@ -40715,23 +29000,23 @@ 47145 47146 if test -n "$THIS_INCLUDE"; then 47147 for LIB in qdbm; do 47148- 47149+ 47150 save_old_LDFLAGS=$LDFLAGS 47151 ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" 47152- 47153+ 47154 save_ext_shared=$ext_shared 47155 ext_shared=yes 47156- 47157+ 47158 for ac_i in $ac_stuff; do 47159 case $ac_i in 47160 -pthread) 47161 if test "$ext_shared" = "yes"; then 47162 LDFLAGS="$LDFLAGS -pthread" 47163 else 47164- 47165- 47166+ 47167+ 47168 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 47169- 47170+ 47171 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 47172 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47173 eval "EXTRA_LDFLAGS$unique=set" 47174@@ -40742,20 +29027,20 @@ 47175 ;; 47176 -l*) 47177 ac_ii=`echo $ac_i|cut -c 3-` 47178- 47179- 47180+ 47181+ 47182 case $ac_ii in 47183 c|c_r|pthread*) ;; 47184- *) 47185+ *) 47186 if test "$ext_shared" = "yes"; then 47187- LDFLAGS="$LDFLAGS -l$ac_ii" 47188+ LDFLAGS="$LDFLAGS -l$ac_ii" 47189 else 47190- 47191- 47192+ 47193+ 47194 case $ac_ii in 47195 c|c_r|pthread*) ;; 47196- *) 47197- LIBS="$LIBS -l$ac_ii" 47198+ *) 47199+ LIBS="$LIBS -l$ac_ii" 47200 ;; 47201 esac 47202 47203@@ -40768,138 +29053,106 @@ 47204 ;; 47205 -L*) 47206 ac_ii=`echo $ac_i|cut -c 3-` 47207- 47208+ 47209 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 47210- 47211+ 47212 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 47213 ai_p=$ac_ii 47214 else 47215- 47216+ 47217 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 47218- 47219+ 47220 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47221 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 47222 fi 47223 47224- 47225+ 47226 if test "$ext_shared" = "yes"; then 47227 LDFLAGS="-L$ai_p $LDFLAGS" 47228 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 47229 else 47230- 47231- 47232- 47233+ 47234+ 47235+ 47236 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47237- 47238+ 47239 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47240 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47241 eval "LIBPATH$unique=set" 47242- 47243+ 47244 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47245 LDFLAGS="$LDFLAGS -L$ai_p" 47246 PHP_RPATHS="$PHP_RPATHS $ai_p" 47247- 47248+ 47249 fi 47250 47251 47252 fi 47253- 47254+ 47255 fi 47256 47257 ;; 47258 esac 47259 done 47260 47261- as_ac_Lib=`echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh` 47262-echo "$as_me:$LINENO: checking for dpopen in -l$LIB" >&5 47263-echo $ECHO_N "checking for dpopen in -l$LIB... $ECHO_C" >&6 47264-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 47265- echo $ECHO_N "(cached) $ECHO_C" >&6 47266+ echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 47267+echo "configure:29100: checking for dpopen in -l$LIB" >&5 47268+ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` 47269+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 47270+ echo $ac_n "(cached) $ac_c" 1>&6 47271 else 47272- ac_check_lib_save_LIBS=$LIBS 47273+ ac_save_LIBS="$LIBS" 47274 LIBS="-l$LIB $LIBS" 47275-cat >conftest.$ac_ext <<_ACEOF 47276-/* confdefs.h. */ 47277-_ACEOF 47278-cat confdefs.h >>conftest.$ac_ext 47279-cat >>conftest.$ac_ext <<_ACEOF 47280-/* end confdefs.h. */ 47281- 47282+cat > conftest.$ac_ext <<EOF 47283+#line 29108 "configure" 47284+#include "confdefs.h" 47285 /* Override any gcc2 internal prototype to avoid an error. */ 47286-#ifdef __cplusplus 47287-extern "C" 47288-#endif 47289 /* We use char because int might match the return type of a gcc2 47290- builtin and then its argument prototype would still apply. */ 47291-char dpopen (); 47292-int 47293-main () 47294-{ 47295-dpopen (); 47296- ; 47297- return 0; 47298-} 47299-_ACEOF 47300-rm -f conftest.$ac_objext conftest$ac_exeext 47301-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 47302- (eval $ac_link) 2>conftest.er1 47303- ac_status=$? 47304- grep -v '^ *+' conftest.er1 >conftest.err 47305- rm -f conftest.er1 47306- cat conftest.err >&5 47307- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47308- (exit $ac_status); } && 47309- { ac_try='test -z "$ac_c_werror_flag" 47310- || test ! -s conftest.err' 47311- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 47312- (eval $ac_try) 2>&5 47313- ac_status=$? 47314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47315- (exit $ac_status); }; } && 47316- { ac_try='test -s conftest$ac_exeext' 47317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 47318- (eval $ac_try) 2>&5 47319- ac_status=$? 47320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47321- (exit $ac_status); }; }; then 47322- eval "$as_ac_Lib=yes" 47323-else 47324- echo "$as_me: failed program was:" >&5 47325-sed 's/^/| /' conftest.$ac_ext >&5 47326- 47327-eval "$as_ac_Lib=no" 47328-fi 47329-rm -f conftest.err conftest.$ac_objext \ 47330- conftest$ac_exeext conftest.$ac_ext 47331-LIBS=$ac_check_lib_save_LIBS 47332-fi 47333-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 47334-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 47335-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 47336+ builtin and then its argument prototype would still apply. */ 47337+char dpopen(); 47338+ 47339+int main() { 47340+dpopen() 47341+; return 0; } 47342+EOF 47343+if { (eval echo configure:29119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 47344+ rm -rf conftest* 47345+ eval "ac_cv_lib_$ac_lib_var=yes" 47346+else 47347+ echo "configure: failed program was:" >&5 47348+ cat conftest.$ac_ext >&5 47349+ rm -rf conftest* 47350+ eval "ac_cv_lib_$ac_lib_var=no" 47351+fi 47352+rm -f conftest* 47353+LIBS="$ac_save_LIBS" 47354 47355+fi 47356+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 47357+ echo "$ac_t""yes" 1>&6 47358+ 47359 LDFLAGS=$save_old_LDFLAGS 47360 ext_shared=$save_ext_shared 47361- 47362- 47363-cat >>confdefs.h <<_ACEOF 47364+ 47365+ cat >> confdefs.h <<EOF 47366 #define QDBM_INCLUDE_FILE "$THIS_INCLUDE" 47367-_ACEOF 47368- 47369+EOF 47370 47371-cat >>confdefs.h <<\_ACEOF 47372+ cat >> confdefs.h <<\EOF 47373 #define DBA_QDBM 1 47374-_ACEOF 47375+EOF 47376 47377 THIS_LIBS=$LIB 47378- 47379- 47380+ 47381+ 47382 else 47383+ echo "$ac_t""no" 1>&6 47384 47385 LDFLAGS=$save_old_LDFLAGS 47386 ext_shared=$save_ext_shared 47387 unset ac_cv_lib_$LIB_dpopen 47388- 47389- 47390+ 47391+ 47392 fi 47393 47394 if test -n "$THIS_LIBS"; then 47395@@ -40908,113 +29161,109 @@ 47396 done 47397 fi 47398 47399- 47400+ 47401 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 47402 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 47403 fi 47404 47405- 47406+ 47407 THIS_RESULT=yes 47408 if test -z "$THIS_INCLUDE"; then 47409- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 47410-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 47411- { (exit 1); exit 1; }; } 47412+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 47413 fi 47414 if test -z "$THIS_LIBS"; then 47415- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 47416-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 47417- { (exit 1); exit 1; }; } 47418+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 47419 fi 47420 47421- 47422- 47423+ 47424+ 47425 47426 if test "$ext_shared" = "yes"; then 47427 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 47428 if test -n "$THIS_LFLAGS"; then 47429- 47430+ 47431 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 47432- 47433+ 47434 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 47435 ai_p=$THIS_LFLAGS 47436 else 47437- 47438+ 47439 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 47440- 47441+ 47442 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47443 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 47444 fi 47445 47446- 47447+ 47448 if test "$ext_shared" = "yes"; then 47449 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 47450 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 47451 else 47452- 47453- 47454- 47455+ 47456+ 47457+ 47458 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47459- 47460+ 47461 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47462 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47463 eval "LIBPATH$unique=set" 47464- 47465+ 47466 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47467 LDFLAGS="$LDFLAGS -L$ai_p" 47468 PHP_RPATHS="$PHP_RPATHS $ai_p" 47469- 47470+ 47471 fi 47472 47473 47474 fi 47475- 47476+ 47477 fi 47478 47479 fi 47480 else 47481- 47482+ 47483 47484 if test -n "$THIS_LFLAGS"; then 47485- 47486+ 47487 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 47488- 47489+ 47490 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 47491 ai_p=$THIS_LFLAGS 47492 else 47493- 47494+ 47495 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 47496- 47497+ 47498 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47499 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 47500 fi 47501 47502- 47503- 47504- 47505- 47506+ 47507+ 47508+ 47509+ 47510 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47511- 47512+ 47513 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47514 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47515 eval "LIBPATH$unique=set" 47516- 47517+ 47518 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47519 LDFLAGS="$LDFLAGS -L$ai_p" 47520 PHP_RPATHS="$PHP_RPATHS $ai_p" 47521- 47522+ 47523 fi 47524 47525 47526- 47527+ 47528 fi 47529 47530 fi 47531- 47532- 47533+ 47534+ 47535 case $THIS_LIBS in 47536 c|c_r|pthread*) ;; 47537- *) 47538- LIBS="-l$THIS_LIBS $LIBS" 47539+ *) 47540+ LIBS="-l$THIS_LIBS $LIBS" 47541 ;; 47542 esac 47543 47544@@ -41034,53 +29283,45 @@ 47545 else 47546 THIS_FULL_NAME="$THIS_NAME" 47547 fi 47548- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 47549-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 47550+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 47551+echo "configure:29288: checking for $THIS_FULL_NAME support" >&5 47552 if test -n ""; then 47553- { { echo "$as_me:$LINENO: error: " >&5 47554-echo "$as_me: error: " >&2;} 47555- { (exit 1); exit 1; }; } 47556+ { echo "configure: error: " 1>&2; exit 1; } 47557 fi 47558 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 47559 HAVE_DBA=1 47560 eval HAVE_$THIS_NAME=1 47561- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 47562-echo "${ECHO_T}$THIS_RESULT" >&6 47563+ echo "$ac_t""$THIS_RESULT" 1>&6 47564 else 47565- echo "$as_me:$LINENO: result: no" >&5 47566-echo "${ECHO_T}no" >&6 47567+ echo "$ac_t""no" 1>&6 47568 fi 47569 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 47570 47571 47572 # GDBM 47573 if test "$PHP_GDBM" != "no"; then 47574- 47575+ 47576 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 47577 47578 if test "$HAVE_QDBM" = "1"; then 47579- 47580+ 47581 THIS_NAME=GDBM 47582 if test -n "gdbm"; then 47583 THIS_FULL_NAME="gdbm" 47584 else 47585 THIS_FULL_NAME="$THIS_NAME" 47586 fi 47587- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 47588-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 47589+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 47590+echo "configure:29316: checking for $THIS_FULL_NAME support" >&5 47591 if test -n "You cannot combine --with-gdbm with --with-qdbm"; then 47592- { { echo "$as_me:$LINENO: error: You cannot combine --with-gdbm with --with-qdbm" >&5 47593-echo "$as_me: error: You cannot combine --with-gdbm with --with-qdbm" >&2;} 47594- { (exit 1); exit 1; }; } 47595+ { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } 47596 fi 47597 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 47598 HAVE_DBA=1 47599 eval HAVE_$THIS_NAME=1 47600- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 47601-echo "${ECHO_T}$THIS_RESULT" >&6 47602+ echo "$ac_t""$THIS_RESULT" 1>&6 47603 else 47604- echo "$as_me:$LINENO: result: no" >&5 47605-echo "${ECHO_T}no" >&6 47606+ echo "$ac_t""no" 1>&6 47607 fi 47608 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 47609 47610@@ -41094,23 +29335,23 @@ 47611 done 47612 47613 if test -n "$THIS_INCLUDE"; then 47614- 47615+ 47616 save_old_LDFLAGS=$LDFLAGS 47617 ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" 47618- 47619+ 47620 save_ext_shared=$ext_shared 47621 ext_shared=yes 47622- 47623+ 47624 for ac_i in $ac_stuff; do 47625 case $ac_i in 47626 -pthread) 47627 if test "$ext_shared" = "yes"; then 47628 LDFLAGS="$LDFLAGS -pthread" 47629 else 47630- 47631- 47632+ 47633+ 47634 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 47635- 47636+ 47637 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 47638 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47639 eval "EXTRA_LDFLAGS$unique=set" 47640@@ -41121,20 +29362,20 @@ 47641 ;; 47642 -l*) 47643 ac_ii=`echo $ac_i|cut -c 3-` 47644- 47645- 47646+ 47647+ 47648 case $ac_ii in 47649 c|c_r|pthread*) ;; 47650- *) 47651+ *) 47652 if test "$ext_shared" = "yes"; then 47653- LDFLAGS="$LDFLAGS -l$ac_ii" 47654+ LDFLAGS="$LDFLAGS -l$ac_ii" 47655 else 47656- 47657- 47658+ 47659+ 47660 case $ac_ii in 47661 c|c_r|pthread*) ;; 47662- *) 47663- LIBS="$LIBS -l$ac_ii" 47664+ *) 47665+ LIBS="$LIBS -l$ac_ii" 47666 ;; 47667 esac 47668 47669@@ -41147,248 +29388,213 @@ 47670 ;; 47671 -L*) 47672 ac_ii=`echo $ac_i|cut -c 3-` 47673- 47674+ 47675 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 47676- 47677+ 47678 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 47679 ai_p=$ac_ii 47680 else 47681- 47682+ 47683 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 47684- 47685+ 47686 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47687 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 47688 fi 47689 47690- 47691+ 47692 if test "$ext_shared" = "yes"; then 47693 LDFLAGS="-L$ai_p $LDFLAGS" 47694 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 47695 else 47696- 47697- 47698- 47699+ 47700+ 47701+ 47702 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47703- 47704+ 47705 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47706 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47707 eval "LIBPATH$unique=set" 47708- 47709+ 47710 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47711 LDFLAGS="$LDFLAGS -L$ai_p" 47712 PHP_RPATHS="$PHP_RPATHS $ai_p" 47713- 47714+ 47715 fi 47716 47717 47718 fi 47719- 47720+ 47721 fi 47722 47723 ;; 47724 esac 47725 done 47726 47727- echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5 47728-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6 47729-if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then 47730- echo $ECHO_N "(cached) $ECHO_C" >&6 47731+ echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 47732+echo "configure:29435: checking for gdbm_open in -lgdbm" >&5 47733+ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` 47734+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 47735+ echo $ac_n "(cached) $ac_c" 1>&6 47736 else 47737- ac_check_lib_save_LIBS=$LIBS 47738+ ac_save_LIBS="$LIBS" 47739 LIBS="-lgdbm $LIBS" 47740-cat >conftest.$ac_ext <<_ACEOF 47741-/* confdefs.h. */ 47742-_ACEOF 47743-cat confdefs.h >>conftest.$ac_ext 47744-cat >>conftest.$ac_ext <<_ACEOF 47745-/* end confdefs.h. */ 47746- 47747+cat > conftest.$ac_ext <<EOF 47748+#line 29443 "configure" 47749+#include "confdefs.h" 47750 /* Override any gcc2 internal prototype to avoid an error. */ 47751-#ifdef __cplusplus 47752-extern "C" 47753-#endif 47754 /* We use char because int might match the return type of a gcc2 47755- builtin and then its argument prototype would still apply. */ 47756-char gdbm_open (); 47757-int 47758-main () 47759-{ 47760-gdbm_open (); 47761- ; 47762- return 0; 47763-} 47764-_ACEOF 47765-rm -f conftest.$ac_objext conftest$ac_exeext 47766-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 47767- (eval $ac_link) 2>conftest.er1 47768- ac_status=$? 47769- grep -v '^ *+' conftest.er1 >conftest.err 47770- rm -f conftest.er1 47771- cat conftest.err >&5 47772- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47773- (exit $ac_status); } && 47774- { ac_try='test -z "$ac_c_werror_flag" 47775- || test ! -s conftest.err' 47776- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 47777- (eval $ac_try) 2>&5 47778- ac_status=$? 47779- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47780- (exit $ac_status); }; } && 47781- { ac_try='test -s conftest$ac_exeext' 47782- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 47783- (eval $ac_try) 2>&5 47784- ac_status=$? 47785- echo "$as_me:$LINENO: \$? = $ac_status" >&5 47786- (exit $ac_status); }; }; then 47787- ac_cv_lib_gdbm_gdbm_open=yes 47788-else 47789- echo "$as_me: failed program was:" >&5 47790-sed 's/^/| /' conftest.$ac_ext >&5 47791- 47792-ac_cv_lib_gdbm_gdbm_open=no 47793-fi 47794-rm -f conftest.err conftest.$ac_objext \ 47795- conftest$ac_exeext conftest.$ac_ext 47796-LIBS=$ac_check_lib_save_LIBS 47797-fi 47798-echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5 47799-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6 47800-if test $ac_cv_lib_gdbm_gdbm_open = yes; then 47801+ builtin and then its argument prototype would still apply. */ 47802+char gdbm_open(); 47803+ 47804+int main() { 47805+gdbm_open() 47806+; return 0; } 47807+EOF 47808+if { (eval echo configure:29454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 47809+ rm -rf conftest* 47810+ eval "ac_cv_lib_$ac_lib_var=yes" 47811+else 47812+ echo "configure: failed program was:" >&5 47813+ cat conftest.$ac_ext >&5 47814+ rm -rf conftest* 47815+ eval "ac_cv_lib_$ac_lib_var=no" 47816+fi 47817+rm -f conftest* 47818+LIBS="$ac_save_LIBS" 47819 47820+fi 47821+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 47822+ echo "$ac_t""yes" 1>&6 47823+ 47824 LDFLAGS=$save_old_LDFLAGS 47825 ext_shared=$save_ext_shared 47826- 47827- 47828-cat >>confdefs.h <<_ACEOF 47829+ 47830+ cat >> confdefs.h <<EOF 47831 #define GDBM_INCLUDE_FILE "$THIS_INCLUDE" 47832-_ACEOF 47833- 47834+EOF 47835 47836-cat >>confdefs.h <<\_ACEOF 47837+ cat >> confdefs.h <<\EOF 47838 #define DBA_GDBM 1 47839-_ACEOF 47840- 47841+EOF 47842+ 47843 THIS_LIBS=gdbm 47844- 47845- 47846+ 47847+ 47848 else 47849+ echo "$ac_t""no" 1>&6 47850 47851 LDFLAGS=$save_old_LDFLAGS 47852 ext_shared=$save_ext_shared 47853 unset ac_cv_lib_gdbm_gdbm_open 47854- 47855- 47856+ 47857+ 47858 fi 47859 47860 fi 47861- 47862- 47863+ 47864+ 47865 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 47866 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 47867 fi 47868 47869- 47870+ 47871 THIS_RESULT=yes 47872 if test -z "$THIS_INCLUDE"; then 47873- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 47874-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 47875- { (exit 1); exit 1; }; } 47876+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 47877 fi 47878 if test -z "$THIS_LIBS"; then 47879- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 47880-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 47881- { (exit 1); exit 1; }; } 47882+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 47883 fi 47884 47885- 47886- 47887+ 47888+ 47889 47890 if test "$ext_shared" = "yes"; then 47891 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 47892 if test -n "$THIS_LFLAGS"; then 47893- 47894+ 47895 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 47896- 47897+ 47898 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 47899 ai_p=$THIS_LFLAGS 47900 else 47901- 47902+ 47903 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 47904- 47905+ 47906 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47907 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 47908 fi 47909 47910- 47911+ 47912 if test "$ext_shared" = "yes"; then 47913 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 47914 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 47915 else 47916- 47917- 47918- 47919+ 47920+ 47921+ 47922 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47923- 47924+ 47925 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47926 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47927 eval "LIBPATH$unique=set" 47928- 47929+ 47930 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47931 LDFLAGS="$LDFLAGS -L$ai_p" 47932 PHP_RPATHS="$PHP_RPATHS $ai_p" 47933- 47934+ 47935 fi 47936 47937 47938 fi 47939- 47940+ 47941 fi 47942 47943 fi 47944 else 47945- 47946+ 47947 47948 if test -n "$THIS_LFLAGS"; then 47949- 47950+ 47951 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 47952- 47953+ 47954 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 47955 ai_p=$THIS_LFLAGS 47956 else 47957- 47958+ 47959 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 47960- 47961+ 47962 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 47963 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 47964 fi 47965 47966- 47967- 47968- 47969- 47970+ 47971+ 47972+ 47973+ 47974 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 47975- 47976+ 47977 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 47978 if test -n "$unique" && test "`eval $cmd`" = "" ; then 47979 eval "LIBPATH$unique=set" 47980- 47981+ 47982 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 47983 LDFLAGS="$LDFLAGS -L$ai_p" 47984 PHP_RPATHS="$PHP_RPATHS $ai_p" 47985- 47986+ 47987 fi 47988 47989 47990- 47991+ 47992 fi 47993 47994 fi 47995- 47996- 47997+ 47998+ 47999 case $THIS_LIBS in 48000 c|c_r|pthread*) ;; 48001- *) 48002- LIBS="-l$THIS_LIBS $LIBS" 48003+ *) 48004+ LIBS="-l$THIS_LIBS $LIBS" 48005 ;; 48006 esac 48007 48008@@ -41408,28 +29614,24 @@ 48009 else 48010 THIS_FULL_NAME="$THIS_NAME" 48011 fi 48012- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 48013-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 48014+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 48015+echo "configure:29619: checking for $THIS_FULL_NAME support" >&5 48016 if test -n ""; then 48017- { { echo "$as_me:$LINENO: error: " >&5 48018-echo "$as_me: error: " >&2;} 48019- { (exit 1); exit 1; }; } 48020+ { echo "configure: error: " 1>&2; exit 1; } 48021 fi 48022 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 48023 HAVE_DBA=1 48024 eval HAVE_$THIS_NAME=1 48025- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 48026-echo "${ECHO_T}$THIS_RESULT" >&6 48027+ echo "$ac_t""$THIS_RESULT" 1>&6 48028 else 48029- echo "$as_me:$LINENO: result: no" >&5 48030-echo "${ECHO_T}no" >&6 48031+ echo "$ac_t""no" 1>&6 48032 fi 48033 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 48034 48035 48036 # NDBM 48037 if test "$PHP_NDBM" != "no"; then 48038- 48039+ 48040 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 48041 48042 for i in $PHP_NDBM /usr/local /usr; do 48043@@ -41443,26 +29645,26 @@ 48044 break 48045 fi 48046 done 48047- 48048+ 48049 if test -n "$THIS_INCLUDE"; then 48050 for LIB in ndbm db1 c; do 48051- 48052+ 48053 save_old_LDFLAGS=$LDFLAGS 48054 ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" 48055- 48056+ 48057 save_ext_shared=$ext_shared 48058 ext_shared=yes 48059- 48060+ 48061 for ac_i in $ac_stuff; do 48062 case $ac_i in 48063 -pthread) 48064 if test "$ext_shared" = "yes"; then 48065 LDFLAGS="$LDFLAGS -pthread" 48066 else 48067- 48068- 48069+ 48070+ 48071 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 48072- 48073+ 48074 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 48075 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48076 eval "EXTRA_LDFLAGS$unique=set" 48077@@ -41473,20 +29675,20 @@ 48078 ;; 48079 -l*) 48080 ac_ii=`echo $ac_i|cut -c 3-` 48081- 48082- 48083+ 48084+ 48085 case $ac_ii in 48086 c|c_r|pthread*) ;; 48087- *) 48088+ *) 48089 if test "$ext_shared" = "yes"; then 48090- LDFLAGS="$LDFLAGS -l$ac_ii" 48091+ LDFLAGS="$LDFLAGS -l$ac_ii" 48092 else 48093- 48094- 48095+ 48096+ 48097 case $ac_ii in 48098 c|c_r|pthread*) ;; 48099- *) 48100- LIBS="$LIBS -l$ac_ii" 48101+ *) 48102+ LIBS="$LIBS -l$ac_ii" 48103 ;; 48104 esac 48105 48106@@ -41499,138 +29701,106 @@ 48107 ;; 48108 -L*) 48109 ac_ii=`echo $ac_i|cut -c 3-` 48110- 48111+ 48112 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 48113- 48114+ 48115 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 48116 ai_p=$ac_ii 48117 else 48118- 48119+ 48120 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 48121- 48122+ 48123 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 48124 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 48125 fi 48126 48127- 48128+ 48129 if test "$ext_shared" = "yes"; then 48130 LDFLAGS="-L$ai_p $LDFLAGS" 48131 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 48132 else 48133- 48134- 48135- 48136+ 48137+ 48138+ 48139 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 48140- 48141+ 48142 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 48143 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48144 eval "LIBPATH$unique=set" 48145- 48146+ 48147 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 48148 LDFLAGS="$LDFLAGS -L$ai_p" 48149 PHP_RPATHS="$PHP_RPATHS $ai_p" 48150- 48151+ 48152 fi 48153 48154 48155 fi 48156- 48157+ 48158 fi 48159 48160 ;; 48161 esac 48162 done 48163 48164- as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh` 48165-echo "$as_me:$LINENO: checking for dbm_open in -l$LIB" >&5 48166-echo $ECHO_N "checking for dbm_open in -l$LIB... $ECHO_C" >&6 48167-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 48168- echo $ECHO_N "(cached) $ECHO_C" >&6 48169+ echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 48170+echo "configure:29748: checking for dbm_open in -l$LIB" >&5 48171+ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` 48172+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 48173+ echo $ac_n "(cached) $ac_c" 1>&6 48174 else 48175- ac_check_lib_save_LIBS=$LIBS 48176+ ac_save_LIBS="$LIBS" 48177 LIBS="-l$LIB $LIBS" 48178-cat >conftest.$ac_ext <<_ACEOF 48179-/* confdefs.h. */ 48180-_ACEOF 48181-cat confdefs.h >>conftest.$ac_ext 48182-cat >>conftest.$ac_ext <<_ACEOF 48183-/* end confdefs.h. */ 48184- 48185+cat > conftest.$ac_ext <<EOF 48186+#line 29756 "configure" 48187+#include "confdefs.h" 48188 /* Override any gcc2 internal prototype to avoid an error. */ 48189-#ifdef __cplusplus 48190-extern "C" 48191-#endif 48192 /* We use char because int might match the return type of a gcc2 48193- builtin and then its argument prototype would still apply. */ 48194-char dbm_open (); 48195-int 48196-main () 48197-{ 48198-dbm_open (); 48199- ; 48200- return 0; 48201-} 48202-_ACEOF 48203-rm -f conftest.$ac_objext conftest$ac_exeext 48204-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 48205- (eval $ac_link) 2>conftest.er1 48206- ac_status=$? 48207- grep -v '^ *+' conftest.er1 >conftest.err 48208- rm -f conftest.er1 48209- cat conftest.err >&5 48210- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48211- (exit $ac_status); } && 48212- { ac_try='test -z "$ac_c_werror_flag" 48213- || test ! -s conftest.err' 48214- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48215- (eval $ac_try) 2>&5 48216- ac_status=$? 48217- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48218- (exit $ac_status); }; } && 48219- { ac_try='test -s conftest$ac_exeext' 48220- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48221- (eval $ac_try) 2>&5 48222- ac_status=$? 48223- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48224- (exit $ac_status); }; }; then 48225- eval "$as_ac_Lib=yes" 48226-else 48227- echo "$as_me: failed program was:" >&5 48228-sed 's/^/| /' conftest.$ac_ext >&5 48229- 48230-eval "$as_ac_Lib=no" 48231-fi 48232-rm -f conftest.err conftest.$ac_objext \ 48233- conftest$ac_exeext conftest.$ac_ext 48234-LIBS=$ac_check_lib_save_LIBS 48235-fi 48236-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 48237-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 48238-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 48239+ builtin and then its argument prototype would still apply. */ 48240+char dbm_open(); 48241+ 48242+int main() { 48243+dbm_open() 48244+; return 0; } 48245+EOF 48246+if { (eval echo configure:29767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 48247+ rm -rf conftest* 48248+ eval "ac_cv_lib_$ac_lib_var=yes" 48249+else 48250+ echo "configure: failed program was:" >&5 48251+ cat conftest.$ac_ext >&5 48252+ rm -rf conftest* 48253+ eval "ac_cv_lib_$ac_lib_var=no" 48254+fi 48255+rm -f conftest* 48256+LIBS="$ac_save_LIBS" 48257 48258+fi 48259+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 48260+ echo "$ac_t""yes" 1>&6 48261+ 48262 LDFLAGS=$save_old_LDFLAGS 48263 ext_shared=$save_ext_shared 48264- 48265- 48266-cat >>confdefs.h <<_ACEOF 48267+ 48268+ cat >> confdefs.h <<EOF 48269 #define NDBM_INCLUDE_FILE "$THIS_INCLUDE" 48270-_ACEOF 48271- 48272+EOF 48273 48274-cat >>confdefs.h <<\_ACEOF 48275+ cat >> confdefs.h <<\EOF 48276 #define DBA_NDBM 1 48277-_ACEOF 48278- 48279+EOF 48280+ 48281 THIS_LIBS=$LIB 48282- 48283- 48284+ 48285+ 48286 else 48287+ echo "$ac_t""no" 1>&6 48288 48289 LDFLAGS=$save_old_LDFLAGS 48290 ext_shared=$save_ext_shared 48291 unset ac_cv_lib_$LIB_dbm_open 48292- 48293- 48294+ 48295+ 48296 fi 48297 48298 if test -n "$THIS_LIBS"; then 48299@@ -41639,113 +29809,109 @@ 48300 done 48301 fi 48302 48303- 48304+ 48305 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 48306 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 48307 fi 48308 48309- 48310+ 48311 THIS_RESULT=yes 48312 if test -z "$THIS_INCLUDE"; then 48313- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 48314-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 48315- { (exit 1); exit 1; }; } 48316+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 48317 fi 48318 if test -z "$THIS_LIBS"; then 48319- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 48320-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 48321- { (exit 1); exit 1; }; } 48322+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 48323 fi 48324 48325- 48326- 48327+ 48328+ 48329 48330 if test "$ext_shared" = "yes"; then 48331 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 48332 if test -n "$THIS_LFLAGS"; then 48333- 48334+ 48335 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 48336- 48337+ 48338 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 48339 ai_p=$THIS_LFLAGS 48340 else 48341- 48342+ 48343 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 48344- 48345+ 48346 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 48347 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 48348 fi 48349 48350- 48351+ 48352 if test "$ext_shared" = "yes"; then 48353 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 48354 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 48355 else 48356- 48357- 48358- 48359+ 48360+ 48361+ 48362 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 48363- 48364+ 48365 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 48366 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48367 eval "LIBPATH$unique=set" 48368- 48369+ 48370 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 48371 LDFLAGS="$LDFLAGS -L$ai_p" 48372 PHP_RPATHS="$PHP_RPATHS $ai_p" 48373- 48374+ 48375 fi 48376 48377 48378 fi 48379- 48380+ 48381 fi 48382 48383 fi 48384 else 48385- 48386+ 48387 48388 if test -n "$THIS_LFLAGS"; then 48389- 48390+ 48391 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 48392- 48393+ 48394 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 48395 ai_p=$THIS_LFLAGS 48396 else 48397- 48398+ 48399 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 48400- 48401+ 48402 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 48403 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 48404 fi 48405 48406- 48407- 48408- 48409- 48410+ 48411+ 48412+ 48413+ 48414 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 48415- 48416+ 48417 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 48418 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48419 eval "LIBPATH$unique=set" 48420- 48421+ 48422 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 48423 LDFLAGS="$LDFLAGS -L$ai_p" 48424 PHP_RPATHS="$PHP_RPATHS $ai_p" 48425- 48426+ 48427 fi 48428 48429 48430- 48431+ 48432 fi 48433 48434 fi 48435- 48436- 48437+ 48438+ 48439 case $THIS_LIBS in 48440 c|c_r|pthread*) ;; 48441- *) 48442- LIBS="-l$THIS_LIBS $LIBS" 48443+ *) 48444+ LIBS="-l$THIS_LIBS $LIBS" 48445 ;; 48446 esac 48447 48448@@ -41765,21 +29931,17 @@ 48449 else 48450 THIS_FULL_NAME="$THIS_NAME" 48451 fi 48452- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 48453-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 48454+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 48455+echo "configure:29936: checking for $THIS_FULL_NAME support" >&5 48456 if test -n ""; then 48457- { { echo "$as_me:$LINENO: error: " >&5 48458-echo "$as_me: error: " >&2;} 48459- { (exit 1); exit 1; }; } 48460+ { echo "configure: error: " 1>&2; exit 1; } 48461 fi 48462 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 48463 HAVE_DBA=1 48464 eval HAVE_$THIS_NAME=1 48465- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 48466-echo "${ECHO_T}$THIS_RESULT" >&6 48467+ echo "$ac_t""$THIS_RESULT" 1>&6 48468 else 48469- echo "$as_me:$LINENO: result: no" >&5 48470-echo "${ECHO_T}no" >&6 48471+ echo "$ac_t""no" 1>&6 48472 fi 48473 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 48474 48475@@ -41788,7 +29950,7 @@ 48476 48477 # DB4 48478 if test "$PHP_DB4" != "no"; then 48479- 48480+ 48481 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 48482 48483 dbdp4="/usr/local/BerkeleyDB.4." 48484@@ -41844,94 +30006,61 @@ 48485 break 48486 fi 48487 done 48488- 48489+ 48490 if test -z "$THIS_INCLUDE"; then 48491- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 48492-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 48493- { (exit 1); exit 1; }; } 48494+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 48495 fi 48496 for LIB in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do 48497 if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then 48498 lib_found=""; 48499- 48500+ 48501 old_LDFLAGS=$LDFLAGS 48502 LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" 48503 old_LIBS=$LIBS 48504 LIBS="-l$LIB $LIBS" 48505- 48506- cat >conftest.$ac_ext <<_ACEOF 48507-/* confdefs.h. */ 48508-_ACEOF 48509-cat confdefs.h >>conftest.$ac_ext 48510-cat >>conftest.$ac_ext <<_ACEOF 48511-/* end confdefs.h. */ 48512+ 48513+ cat > conftest.$ac_ext <<EOF 48514+#line 30024 "configure" 48515+#include "confdefs.h" 48516 48517 #include "$THIS_INCLUDE" 48518- 48519-int 48520-main () 48521-{ 48522+ 48523+int main() { 48524 48525 (void)db_create((DB**)0, (DB_ENV*)0, 0); 48526- 48527- ; 48528- return 0; 48529-} 48530-_ACEOF 48531-rm -f conftest.$ac_objext conftest$ac_exeext 48532-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 48533- (eval $ac_link) 2>conftest.er1 48534- ac_status=$? 48535- grep -v '^ *+' conftest.er1 >conftest.err 48536- rm -f conftest.er1 48537- cat conftest.err >&5 48538- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48539- (exit $ac_status); } && 48540- { ac_try='test -z "$ac_c_werror_flag" 48541- || test ! -s conftest.err' 48542- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48543- (eval $ac_try) 2>&5 48544- ac_status=$? 48545- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48546- (exit $ac_status); }; } && 48547- { ac_try='test -s conftest$ac_exeext' 48548- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48549- (eval $ac_try) 2>&5 48550- ac_status=$? 48551- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48552- (exit $ac_status); }; }; then 48553- 48554- cat >conftest.$ac_ext <<_ACEOF 48555-/* confdefs.h. */ 48556-_ACEOF 48557-cat confdefs.h >>conftest.$ac_ext 48558-cat >>conftest.$ac_ext <<_ACEOF 48559-/* end confdefs.h. */ 48560+ 48561+; return 0; } 48562+EOF 48563+if { (eval echo configure:30035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 48564+ rm -rf conftest* 48565+ 48566+ cat > conftest.$ac_ext <<EOF 48567+#line 30039 "configure" 48568+#include "confdefs.h" 48569 48570 #include "$THIS_INCLUDE" 48571 #if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR == 5) 48572 yes 48573 #endif 48574- 48575-_ACEOF 48576+ 48577+EOF 48578 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 48579- $EGREP "yes" >/dev/null 2>&1; then 48580- 48581+ egrep "yes" >/dev/null 2>&1; then 48582+ rm -rf conftest* 48583+ 48584 THIS_LIBS=$LIB 48585 lib_found=1 48586- 48587+ 48588 fi 48589 rm -f conftest* 48590 48591- 48592+ 48593 else 48594- echo "$as_me: failed program was:" >&5 48595-sed 's/^/| /' conftest.$ac_ext >&5 48596- 48597+ echo "configure: failed program was:" >&5 48598+ cat conftest.$ac_ext >&5 48599 fi 48600-rm -f conftest.err conftest.$ac_objext \ 48601- conftest$ac_exeext conftest.$ac_ext 48602- 48603+rm -f conftest* 48604+ 48605 LDFLAGS=$old_LDFLAGS 48606 LIBS=$old_LIBS 48607 48608@@ -41942,192 +30071,178 @@ 48609 fi 48610 done 48611 if test -z "$THIS_LIBS"; then 48612- echo "$as_me:$LINENO: checking for DB4 major version" >&5 48613-echo $ECHO_N "checking for DB4 major version... $ECHO_C" >&6 48614- { { echo "$as_me:$LINENO: error: Header contains different version" >&5 48615-echo "$as_me: error: Header contains different version" >&2;} 48616- { (exit 1); exit 1; }; } 48617+ echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6 48618+echo "configure:30076: checking for DB4 major version" >&5 48619+ { echo "configure: error: Header contains different version" 1>&2; exit 1; } 48620 fi 48621 if test "4" = "4"; then 48622- echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5 48623-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6 48624- cat >conftest.$ac_ext <<_ACEOF 48625-/* confdefs.h. */ 48626-_ACEOF 48627-cat confdefs.h >>conftest.$ac_ext 48628-cat >>conftest.$ac_ext <<_ACEOF 48629-/* end confdefs.h. */ 48630+ echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 48631+echo "configure:30081: checking for DB4 minor version and patch level" >&5 48632+ cat > conftest.$ac_ext <<EOF 48633+#line 30083 "configure" 48634+#include "confdefs.h" 48635 48636 #include "$THIS_INCLUDE" 48637 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) 48638 yes 48639 #endif 48640- 48641-_ACEOF 48642+ 48643+EOF 48644 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 48645- $EGREP "yes" >/dev/null 2>&1; then 48646- 48647- echo "$as_me:$LINENO: result: ok" >&5 48648-echo "${ECHO_T}ok" >&6 48649- 48650+ egrep "yes" >/dev/null 2>&1; then 48651+ rm -rf conftest* 48652+ 48653+ echo "$ac_t""ok" 1>&6 48654+ 48655 else 48656- 48657- { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5 48658-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;} 48659- { (exit 1); exit 1; }; } 48660- 48661+ rm -rf conftest* 48662+ 48663+ { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } 48664+ 48665 fi 48666 rm -f conftest* 48667 48668 fi 48669 if test "$ext_shared" = "yes"; then 48670- echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5 48671-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6 48672- cat >conftest.$ac_ext <<_ACEOF 48673-/* confdefs.h. */ 48674-_ACEOF 48675-cat confdefs.h >>conftest.$ac_ext 48676-cat >>conftest.$ac_ext <<_ACEOF 48677-/* end confdefs.h. */ 48678+ echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 48679+echo "configure:30109: checking if dba can be used as shared extension" >&5 48680+ cat > conftest.$ac_ext <<EOF 48681+#line 30111 "configure" 48682+#include "confdefs.h" 48683 48684 #include "$THIS_INCLUDE" 48685 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) 48686 yes 48687 #endif 48688- 48689-_ACEOF 48690+ 48691+EOF 48692 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 48693- $EGREP "yes" >/dev/null 2>&1; then 48694- 48695- echo "$as_me:$LINENO: result: yes" >&5 48696-echo "${ECHO_T}yes" >&6 48697- 48698+ egrep "yes" >/dev/null 2>&1; then 48699+ rm -rf conftest* 48700+ 48701+ echo "$ac_t""yes" 1>&6 48702+ 48703 else 48704- 48705- { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5 48706-echo "$as_me: error: At least version 3.3 is required" >&2;} 48707- { (exit 1); exit 1; }; } 48708- 48709+ rm -rf conftest* 48710+ 48711+ { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } 48712+ 48713 fi 48714 rm -f conftest* 48715 48716 fi 48717 if test -n "$THIS_LIBS"; then 48718- 48719-cat >>confdefs.h <<\_ACEOF 48720+ cat >> confdefs.h <<\EOF 48721 #define DBA_DB4 1 48722-_ACEOF 48723- 48724+EOF 48725+ 48726 if test -n "$THIS_INCLUDE"; then 48727- 48728-cat >>confdefs.h <<_ACEOF 48729+ cat >> confdefs.h <<EOF 48730 #define DB4_INCLUDE_FILE "$THIS_INCLUDE" 48731-_ACEOF 48732+EOF 48733 48734 fi 48735 else 48736- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 48737-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 48738- { (exit 1); exit 1; }; } 48739+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 48740 fi 48741 THIS_RESULT=yes 48742 DB4_LIBS=$THIS_LIBS 48743 DB4_PREFIX=$THIS_PREFIX 48744 DB4_INCLUDE=$THIS_INCLUDE 48745- 48746+ 48747 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 48748 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 48749 fi 48750 48751- 48752- 48753+ 48754+ 48755 48756 if test "$ext_shared" = "yes"; then 48757 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 48758 if test -n "$THIS_LFLAGS"; then 48759- 48760+ 48761 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 48762- 48763+ 48764 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 48765 ai_p=$THIS_LFLAGS 48766 else 48767- 48768+ 48769 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 48770- 48771+ 48772 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 48773 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 48774 fi 48775 48776- 48777+ 48778 if test "$ext_shared" = "yes"; then 48779 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 48780 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 48781 else 48782- 48783- 48784- 48785+ 48786+ 48787+ 48788 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 48789- 48790+ 48791 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 48792 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48793 eval "LIBPATH$unique=set" 48794- 48795+ 48796 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 48797 LDFLAGS="$LDFLAGS -L$ai_p" 48798 PHP_RPATHS="$PHP_RPATHS $ai_p" 48799- 48800+ 48801 fi 48802 48803 48804 fi 48805- 48806+ 48807 fi 48808 48809 fi 48810 else 48811- 48812+ 48813 48814 if test -n "$THIS_LFLAGS"; then 48815- 48816+ 48817 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 48818- 48819+ 48820 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 48821 ai_p=$THIS_LFLAGS 48822 else 48823- 48824+ 48825 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 48826- 48827+ 48828 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 48829 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 48830 fi 48831 48832- 48833- 48834- 48835- 48836+ 48837+ 48838+ 48839+ 48840 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 48841- 48842+ 48843 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 48844 if test -n "$unique" && test "`eval $cmd`" = "" ; then 48845 eval "LIBPATH$unique=set" 48846- 48847+ 48848 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 48849 LDFLAGS="$LDFLAGS -L$ai_p" 48850 PHP_RPATHS="$PHP_RPATHS $ai_p" 48851- 48852+ 48853 fi 48854 48855 48856- 48857+ 48858 fi 48859 48860 fi 48861- 48862- 48863+ 48864+ 48865 case $THIS_LIBS in 48866 c|c_r|pthread*) ;; 48867- *) 48868- LIBS="-l$THIS_LIBS $LIBS" 48869+ *) 48870+ LIBS="-l$THIS_LIBS $LIBS" 48871 ;; 48872 esac 48873 48874@@ -42148,53 +30263,45 @@ 48875 else 48876 THIS_FULL_NAME="$THIS_NAME" 48877 fi 48878- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 48879-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 48880+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 48881+echo "configure:30268: checking for $THIS_FULL_NAME support" >&5 48882 if test -n ""; then 48883- { { echo "$as_me:$LINENO: error: " >&5 48884-echo "$as_me: error: " >&2;} 48885- { (exit 1); exit 1; }; } 48886+ { echo "configure: error: " 1>&2; exit 1; } 48887 fi 48888 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 48889 HAVE_DBA=1 48890 eval HAVE_$THIS_NAME=1 48891- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 48892-echo "${ECHO_T}$THIS_RESULT" >&6 48893+ echo "$ac_t""$THIS_RESULT" 1>&6 48894 else 48895- echo "$as_me:$LINENO: result: no" >&5 48896-echo "${ECHO_T}no" >&6 48897+ echo "$ac_t""no" 1>&6 48898 fi 48899 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 48900 48901 48902 # DB3 48903 if test "$PHP_DB3" != "no"; then 48904- 48905+ 48906 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 48907 48908 if test "$HAVE_DB4" = "1"; then 48909- 48910+ 48911 THIS_NAME=DB3 48912 if test -n "Berkeley DB3"; then 48913 THIS_FULL_NAME="Berkeley DB3" 48914 else 48915 THIS_FULL_NAME="$THIS_NAME" 48916 fi 48917- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 48918-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 48919+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 48920+echo "configure:30296: checking for $THIS_FULL_NAME support" >&5 48921 if test -n "You cannot combine --with-db3 with --with-db4"; then 48922- { { echo "$as_me:$LINENO: error: You cannot combine --with-db3 with --with-db4" >&5 48923-echo "$as_me: error: You cannot combine --with-db3 with --with-db4" >&2;} 48924- { (exit 1); exit 1; }; } 48925+ { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } 48926 fi 48927 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 48928 HAVE_DBA=1 48929 eval HAVE_$THIS_NAME=1 48930- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 48931-echo "${ECHO_T}$THIS_RESULT" >&6 48932+ echo "$ac_t""$THIS_RESULT" 1>&6 48933 else 48934- echo "$as_me:$LINENO: result: no" >&5 48935-echo "${ECHO_T}no" >&6 48936+ echo "$ac_t""no" 1>&6 48937 fi 48938 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 48939 48940@@ -42222,94 +30329,61 @@ 48941 break 48942 fi 48943 done 48944- 48945+ 48946 if test -z "$THIS_INCLUDE"; then 48947- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 48948-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 48949- { (exit 1); exit 1; }; } 48950+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 48951 fi 48952 for LIB in db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db; do 48953 if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then 48954 lib_found=""; 48955- 48956+ 48957 old_LDFLAGS=$LDFLAGS 48958 LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" 48959 old_LIBS=$LIBS 48960 LIBS="-l$LIB $LIBS" 48961- 48962- cat >conftest.$ac_ext <<_ACEOF 48963-/* confdefs.h. */ 48964-_ACEOF 48965-cat confdefs.h >>conftest.$ac_ext 48966-cat >>conftest.$ac_ext <<_ACEOF 48967-/* end confdefs.h. */ 48968+ 48969+ cat > conftest.$ac_ext <<EOF 48970+#line 30347 "configure" 48971+#include "confdefs.h" 48972 48973 #include "$THIS_INCLUDE" 48974- 48975-int 48976-main () 48977-{ 48978+ 48979+int main() { 48980 48981 (void)db_create((DB**)0, (DB_ENV*)0, 0); 48982- 48983- ; 48984- return 0; 48985-} 48986-_ACEOF 48987-rm -f conftest.$ac_objext conftest$ac_exeext 48988-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 48989- (eval $ac_link) 2>conftest.er1 48990- ac_status=$? 48991- grep -v '^ *+' conftest.er1 >conftest.err 48992- rm -f conftest.er1 48993- cat conftest.err >&5 48994- echo "$as_me:$LINENO: \$? = $ac_status" >&5 48995- (exit $ac_status); } && 48996- { ac_try='test -z "$ac_c_werror_flag" 48997- || test ! -s conftest.err' 48998- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 48999- (eval $ac_try) 2>&5 49000- ac_status=$? 49001- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49002- (exit $ac_status); }; } && 49003- { ac_try='test -s conftest$ac_exeext' 49004- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 49005- (eval $ac_try) 2>&5 49006- ac_status=$? 49007- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49008- (exit $ac_status); }; }; then 49009- 49010- cat >conftest.$ac_ext <<_ACEOF 49011-/* confdefs.h. */ 49012-_ACEOF 49013-cat confdefs.h >>conftest.$ac_ext 49014-cat >>conftest.$ac_ext <<_ACEOF 49015-/* end confdefs.h. */ 49016+ 49017+; return 0; } 49018+EOF 49019+if { (eval echo configure:30358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 49020+ rm -rf conftest* 49021+ 49022+ cat > conftest.$ac_ext <<EOF 49023+#line 30362 "configure" 49024+#include "confdefs.h" 49025 49026 #include "$THIS_INCLUDE" 49027 #if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR == 5) 49028 yes 49029 #endif 49030- 49031-_ACEOF 49032+ 49033+EOF 49034 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49035- $EGREP "yes" >/dev/null 2>&1; then 49036- 49037+ egrep "yes" >/dev/null 2>&1; then 49038+ rm -rf conftest* 49039+ 49040 THIS_LIBS=$LIB 49041 lib_found=1 49042- 49043+ 49044 fi 49045 rm -f conftest* 49046 49047- 49048+ 49049 else 49050- echo "$as_me: failed program was:" >&5 49051-sed 's/^/| /' conftest.$ac_ext >&5 49052- 49053+ echo "configure: failed program was:" >&5 49054+ cat conftest.$ac_ext >&5 49055 fi 49056-rm -f conftest.err conftest.$ac_objext \ 49057- conftest$ac_exeext conftest.$ac_ext 49058- 49059+rm -f conftest* 49060+ 49061 LDFLAGS=$old_LDFLAGS 49062 LIBS=$old_LIBS 49063 49064@@ -42320,192 +30394,178 @@ 49065 fi 49066 done 49067 if test -z "$THIS_LIBS"; then 49068- echo "$as_me:$LINENO: checking for DB3 major version" >&5 49069-echo $ECHO_N "checking for DB3 major version... $ECHO_C" >&6 49070- { { echo "$as_me:$LINENO: error: Header contains different version" >&5 49071-echo "$as_me: error: Header contains different version" >&2;} 49072- { (exit 1); exit 1; }; } 49073+ echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6 49074+echo "configure:30399: checking for DB3 major version" >&5 49075+ { echo "configure: error: Header contains different version" 1>&2; exit 1; } 49076 fi 49077 if test "3" = "4"; then 49078- echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5 49079-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6 49080- cat >conftest.$ac_ext <<_ACEOF 49081-/* confdefs.h. */ 49082-_ACEOF 49083-cat confdefs.h >>conftest.$ac_ext 49084-cat >>conftest.$ac_ext <<_ACEOF 49085-/* end confdefs.h. */ 49086+ echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 49087+echo "configure:30404: checking for DB4 minor version and patch level" >&5 49088+ cat > conftest.$ac_ext <<EOF 49089+#line 30406 "configure" 49090+#include "confdefs.h" 49091 49092 #include "$THIS_INCLUDE" 49093 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) 49094 yes 49095 #endif 49096- 49097-_ACEOF 49098+ 49099+EOF 49100 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49101- $EGREP "yes" >/dev/null 2>&1; then 49102- 49103- echo "$as_me:$LINENO: result: ok" >&5 49104-echo "${ECHO_T}ok" >&6 49105- 49106+ egrep "yes" >/dev/null 2>&1; then 49107+ rm -rf conftest* 49108+ 49109+ echo "$ac_t""ok" 1>&6 49110+ 49111 else 49112- 49113- { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5 49114-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;} 49115- { (exit 1); exit 1; }; } 49116- 49117+ rm -rf conftest* 49118+ 49119+ { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } 49120+ 49121 fi 49122 rm -f conftest* 49123 49124 fi 49125 if test "$ext_shared" = "yes"; then 49126- echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5 49127-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6 49128- cat >conftest.$ac_ext <<_ACEOF 49129-/* confdefs.h. */ 49130-_ACEOF 49131-cat confdefs.h >>conftest.$ac_ext 49132-cat >>conftest.$ac_ext <<_ACEOF 49133-/* end confdefs.h. */ 49134+ echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 49135+echo "configure:30432: checking if dba can be used as shared extension" >&5 49136+ cat > conftest.$ac_ext <<EOF 49137+#line 30434 "configure" 49138+#include "confdefs.h" 49139 49140 #include "$THIS_INCLUDE" 49141 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) 49142 yes 49143 #endif 49144- 49145-_ACEOF 49146+ 49147+EOF 49148 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49149- $EGREP "yes" >/dev/null 2>&1; then 49150- 49151- echo "$as_me:$LINENO: result: yes" >&5 49152-echo "${ECHO_T}yes" >&6 49153- 49154+ egrep "yes" >/dev/null 2>&1; then 49155+ rm -rf conftest* 49156+ 49157+ echo "$ac_t""yes" 1>&6 49158+ 49159 else 49160- 49161- { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5 49162-echo "$as_me: error: At least version 3.3 is required" >&2;} 49163- { (exit 1); exit 1; }; } 49164- 49165+ rm -rf conftest* 49166+ 49167+ { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } 49168+ 49169 fi 49170 rm -f conftest* 49171 49172 fi 49173 if test -n "$THIS_LIBS"; then 49174- 49175-cat >>confdefs.h <<\_ACEOF 49176+ cat >> confdefs.h <<\EOF 49177 #define DBA_DB3 1 49178-_ACEOF 49179- 49180+EOF 49181+ 49182 if test -n "$THIS_INCLUDE"; then 49183- 49184-cat >>confdefs.h <<_ACEOF 49185+ cat >> confdefs.h <<EOF 49186 #define DB3_INCLUDE_FILE "$THIS_INCLUDE" 49187-_ACEOF 49188+EOF 49189 49190 fi 49191 else 49192- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 49193-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 49194- { (exit 1); exit 1; }; } 49195+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 49196 fi 49197 THIS_RESULT=yes 49198 DB3_LIBS=$THIS_LIBS 49199 DB3_PREFIX=$THIS_PREFIX 49200 DB3_INCLUDE=$THIS_INCLUDE 49201- 49202+ 49203 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 49204 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 49205 fi 49206 49207- 49208- 49209+ 49210+ 49211 49212 if test "$ext_shared" = "yes"; then 49213 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 49214 if test -n "$THIS_LFLAGS"; then 49215- 49216+ 49217 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 49218- 49219+ 49220 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 49221 ai_p=$THIS_LFLAGS 49222 else 49223- 49224+ 49225 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 49226- 49227+ 49228 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 49229 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 49230 fi 49231 49232- 49233+ 49234 if test "$ext_shared" = "yes"; then 49235 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 49236 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 49237 else 49238- 49239- 49240- 49241+ 49242+ 49243+ 49244 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 49245- 49246+ 49247 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 49248 if test -n "$unique" && test "`eval $cmd`" = "" ; then 49249 eval "LIBPATH$unique=set" 49250- 49251+ 49252 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 49253 LDFLAGS="$LDFLAGS -L$ai_p" 49254 PHP_RPATHS="$PHP_RPATHS $ai_p" 49255- 49256+ 49257 fi 49258 49259 49260 fi 49261- 49262+ 49263 fi 49264 49265 fi 49266 else 49267- 49268+ 49269 49270 if test -n "$THIS_LFLAGS"; then 49271- 49272+ 49273 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 49274- 49275+ 49276 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 49277 ai_p=$THIS_LFLAGS 49278 else 49279- 49280+ 49281 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 49282- 49283+ 49284 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 49285 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 49286 fi 49287 49288- 49289- 49290- 49291- 49292+ 49293+ 49294+ 49295+ 49296 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 49297- 49298+ 49299 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 49300 if test -n "$unique" && test "`eval $cmd`" = "" ; then 49301 eval "LIBPATH$unique=set" 49302- 49303+ 49304 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 49305 LDFLAGS="$LDFLAGS -L$ai_p" 49306 PHP_RPATHS="$PHP_RPATHS $ai_p" 49307- 49308+ 49309 fi 49310 49311 49312- 49313+ 49314 fi 49315 49316 fi 49317- 49318- 49319+ 49320+ 49321 case $THIS_LIBS in 49322 c|c_r|pthread*) ;; 49323- *) 49324- LIBS="-l$THIS_LIBS $LIBS" 49325+ *) 49326+ LIBS="-l$THIS_LIBS $LIBS" 49327 ;; 49328 esac 49329 49330@@ -42526,53 +30586,45 @@ 49331 else 49332 THIS_FULL_NAME="$THIS_NAME" 49333 fi 49334- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 49335-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 49336+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 49337+echo "configure:30591: checking for $THIS_FULL_NAME support" >&5 49338 if test -n ""; then 49339- { { echo "$as_me:$LINENO: error: " >&5 49340-echo "$as_me: error: " >&2;} 49341- { (exit 1); exit 1; }; } 49342+ { echo "configure: error: " 1>&2; exit 1; } 49343 fi 49344 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 49345 HAVE_DBA=1 49346 eval HAVE_$THIS_NAME=1 49347- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 49348-echo "${ECHO_T}$THIS_RESULT" >&6 49349+ echo "$ac_t""$THIS_RESULT" 1>&6 49350 else 49351- echo "$as_me:$LINENO: result: no" >&5 49352-echo "${ECHO_T}no" >&6 49353+ echo "$ac_t""no" 1>&6 49354 fi 49355 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 49356 49357 49358 # DB2 49359 if test "$PHP_DB2" != "no"; then 49360- 49361+ 49362 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 49363 49364 if test "$HAVE_DB3" = "1" || test "$HAVE_DB4" = "1"; then 49365- 49366+ 49367 THIS_NAME=DB2 49368 if test -n "Berkeley DB2"; then 49369 THIS_FULL_NAME="Berkeley DB2" 49370 else 49371 THIS_FULL_NAME="$THIS_NAME" 49372 fi 49373- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 49374-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 49375+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 49376+echo "configure:30619: checking for $THIS_FULL_NAME support" >&5 49377 if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then 49378- { { echo "$as_me:$LINENO: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&5 49379-echo "$as_me: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&2;} 49380- { (exit 1); exit 1; }; } 49381+ { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } 49382 fi 49383 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 49384 HAVE_DBA=1 49385 eval HAVE_$THIS_NAME=1 49386- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 49387-echo "${ECHO_T}$THIS_RESULT" >&6 49388+ echo "$ac_t""$THIS_RESULT" 1>&6 49389 else 49390- echo "$as_me:$LINENO: result: no" >&5 49391-echo "${ECHO_T}no" >&6 49392+ echo "$ac_t""no" 1>&6 49393 fi 49394 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 49395 49396@@ -42600,94 +30652,61 @@ 49397 break 49398 fi 49399 done 49400- 49401+ 49402 if test -z "$THIS_INCLUDE"; then 49403- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 49404-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 49405- { (exit 1); exit 1; }; } 49406+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 49407 fi 49408 for LIB in db-2 db2 db; do 49409 if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then 49410 lib_found=""; 49411- 49412+ 49413 old_LDFLAGS=$LDFLAGS 49414 LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" 49415 old_LIBS=$LIBS 49416 LIBS="-l$LIB $LIBS" 49417- 49418- cat >conftest.$ac_ext <<_ACEOF 49419-/* confdefs.h. */ 49420-_ACEOF 49421-cat confdefs.h >>conftest.$ac_ext 49422-cat >>conftest.$ac_ext <<_ACEOF 49423-/* end confdefs.h. */ 49424+ 49425+ cat > conftest.$ac_ext <<EOF 49426+#line 30670 "configure" 49427+#include "confdefs.h" 49428 49429 #include "$THIS_INCLUDE" 49430- 49431-int 49432-main () 49433-{ 49434+ 49435+int main() { 49436 49437 (void)db_appinit("", NULL, (DB_ENV*)0, 0); 49438- 49439- ; 49440- return 0; 49441-} 49442-_ACEOF 49443-rm -f conftest.$ac_objext conftest$ac_exeext 49444-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 49445- (eval $ac_link) 2>conftest.er1 49446- ac_status=$? 49447- grep -v '^ *+' conftest.er1 >conftest.err 49448- rm -f conftest.er1 49449- cat conftest.err >&5 49450- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49451- (exit $ac_status); } && 49452- { ac_try='test -z "$ac_c_werror_flag" 49453- || test ! -s conftest.err' 49454- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 49455- (eval $ac_try) 2>&5 49456- ac_status=$? 49457- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49458- (exit $ac_status); }; } && 49459- { ac_try='test -s conftest$ac_exeext' 49460- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 49461- (eval $ac_try) 2>&5 49462- ac_status=$? 49463- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49464- (exit $ac_status); }; }; then 49465- 49466- cat >conftest.$ac_ext <<_ACEOF 49467-/* confdefs.h. */ 49468-_ACEOF 49469-cat confdefs.h >>conftest.$ac_ext 49470-cat >>conftest.$ac_ext <<_ACEOF 49471-/* end confdefs.h. */ 49472+ 49473+; return 0; } 49474+EOF 49475+if { (eval echo configure:30681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 49476+ rm -rf conftest* 49477+ 49478+ cat > conftest.$ac_ext <<EOF 49479+#line 30685 "configure" 49480+#include "confdefs.h" 49481 49482 #include "$THIS_INCLUDE" 49483 #if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR == 5) 49484 yes 49485 #endif 49486- 49487-_ACEOF 49488+ 49489+EOF 49490 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49491- $EGREP "yes" >/dev/null 2>&1; then 49492- 49493+ egrep "yes" >/dev/null 2>&1; then 49494+ rm -rf conftest* 49495+ 49496 THIS_LIBS=$LIB 49497 lib_found=1 49498- 49499+ 49500 fi 49501 rm -f conftest* 49502 49503- 49504+ 49505 else 49506- echo "$as_me: failed program was:" >&5 49507-sed 's/^/| /' conftest.$ac_ext >&5 49508- 49509+ echo "configure: failed program was:" >&5 49510+ cat conftest.$ac_ext >&5 49511 fi 49512-rm -f conftest.err conftest.$ac_objext \ 49513- conftest$ac_exeext conftest.$ac_ext 49514- 49515+rm -f conftest* 49516+ 49517 LDFLAGS=$old_LDFLAGS 49518 LIBS=$old_LIBS 49519 49520@@ -42698,192 +30717,178 @@ 49521 fi 49522 done 49523 if test -z "$THIS_LIBS"; then 49524- echo "$as_me:$LINENO: checking for DB2 major version" >&5 49525-echo $ECHO_N "checking for DB2 major version... $ECHO_C" >&6 49526- { { echo "$as_me:$LINENO: error: Header contains different version" >&5 49527-echo "$as_me: error: Header contains different version" >&2;} 49528- { (exit 1); exit 1; }; } 49529+ echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6 49530+echo "configure:30722: checking for DB2 major version" >&5 49531+ { echo "configure: error: Header contains different version" 1>&2; exit 1; } 49532 fi 49533 if test "2" = "4"; then 49534- echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5 49535-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6 49536- cat >conftest.$ac_ext <<_ACEOF 49537-/* confdefs.h. */ 49538-_ACEOF 49539-cat confdefs.h >>conftest.$ac_ext 49540-cat >>conftest.$ac_ext <<_ACEOF 49541-/* end confdefs.h. */ 49542+ echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 49543+echo "configure:30727: checking for DB4 minor version and patch level" >&5 49544+ cat > conftest.$ac_ext <<EOF 49545+#line 30729 "configure" 49546+#include "confdefs.h" 49547 49548 #include "$THIS_INCLUDE" 49549 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) 49550 yes 49551 #endif 49552- 49553-_ACEOF 49554+ 49555+EOF 49556 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49557- $EGREP "yes" >/dev/null 2>&1; then 49558- 49559- echo "$as_me:$LINENO: result: ok" >&5 49560-echo "${ECHO_T}ok" >&6 49561- 49562+ egrep "yes" >/dev/null 2>&1; then 49563+ rm -rf conftest* 49564+ 49565+ echo "$ac_t""ok" 1>&6 49566+ 49567 else 49568- 49569- { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5 49570-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;} 49571- { (exit 1); exit 1; }; } 49572- 49573+ rm -rf conftest* 49574+ 49575+ { echo "configure: error: Version 4.1 requires patch level 25" 1>&2; exit 1; } 49576+ 49577 fi 49578 rm -f conftest* 49579 49580 fi 49581 if test "$ext_shared" = "yes"; then 49582- echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5 49583-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6 49584- cat >conftest.$ac_ext <<_ACEOF 49585-/* confdefs.h. */ 49586-_ACEOF 49587-cat confdefs.h >>conftest.$ac_ext 49588-cat >>conftest.$ac_ext <<_ACEOF 49589-/* end confdefs.h. */ 49590+ echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 49591+echo "configure:30755: checking if dba can be used as shared extension" >&5 49592+ cat > conftest.$ac_ext <<EOF 49593+#line 30757 "configure" 49594+#include "confdefs.h" 49595 49596 #include "$THIS_INCLUDE" 49597 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) 49598 yes 49599 #endif 49600- 49601-_ACEOF 49602+ 49603+EOF 49604 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 49605- $EGREP "yes" >/dev/null 2>&1; then 49606- 49607- echo "$as_me:$LINENO: result: yes" >&5 49608-echo "${ECHO_T}yes" >&6 49609- 49610+ egrep "yes" >/dev/null 2>&1; then 49611+ rm -rf conftest* 49612+ 49613+ echo "$ac_t""yes" 1>&6 49614+ 49615 else 49616- 49617- { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5 49618-echo "$as_me: error: At least version 3.3 is required" >&2;} 49619- { (exit 1); exit 1; }; } 49620- 49621+ rm -rf conftest* 49622+ 49623+ { echo "configure: error: At least version 3.3 is required" 1>&2; exit 1; } 49624+ 49625 fi 49626 rm -f conftest* 49627 49628 fi 49629 if test -n "$THIS_LIBS"; then 49630- 49631-cat >>confdefs.h <<\_ACEOF 49632+ cat >> confdefs.h <<\EOF 49633 #define DBA_DB2 1 49634-_ACEOF 49635- 49636+EOF 49637+ 49638 if test -n "$THIS_INCLUDE"; then 49639- 49640-cat >>confdefs.h <<_ACEOF 49641+ cat >> confdefs.h <<EOF 49642 #define DB2_INCLUDE_FILE "$THIS_INCLUDE" 49643-_ACEOF 49644+EOF 49645 49646 fi 49647 else 49648- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 49649-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 49650- { (exit 1); exit 1; }; } 49651+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 49652 fi 49653 THIS_RESULT=yes 49654 DB2_LIBS=$THIS_LIBS 49655 DB2_PREFIX=$THIS_PREFIX 49656 DB2_INCLUDE=$THIS_INCLUDE 49657- 49658+ 49659 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 49660 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 49661 fi 49662 49663- 49664- 49665+ 49666+ 49667 49668 if test "$ext_shared" = "yes"; then 49669 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 49670 if test -n "$THIS_LFLAGS"; then 49671- 49672+ 49673 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 49674- 49675+ 49676 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 49677 ai_p=$THIS_LFLAGS 49678 else 49679- 49680+ 49681 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 49682- 49683+ 49684 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 49685 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 49686 fi 49687 49688- 49689+ 49690 if test "$ext_shared" = "yes"; then 49691 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 49692 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 49693 else 49694- 49695- 49696- 49697+ 49698+ 49699+ 49700 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 49701- 49702+ 49703 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 49704 if test -n "$unique" && test "`eval $cmd`" = "" ; then 49705 eval "LIBPATH$unique=set" 49706- 49707+ 49708 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 49709 LDFLAGS="$LDFLAGS -L$ai_p" 49710 PHP_RPATHS="$PHP_RPATHS $ai_p" 49711- 49712+ 49713 fi 49714 49715 49716 fi 49717- 49718+ 49719 fi 49720 49721 fi 49722 else 49723- 49724+ 49725 49726 if test -n "$THIS_LFLAGS"; then 49727- 49728+ 49729 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 49730- 49731+ 49732 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 49733 ai_p=$THIS_LFLAGS 49734 else 49735- 49736+ 49737 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 49738- 49739+ 49740 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 49741 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 49742 fi 49743 49744- 49745- 49746- 49747- 49748+ 49749+ 49750+ 49751+ 49752 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 49753- 49754+ 49755 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 49756 if test -n "$unique" && test "`eval $cmd`" = "" ; then 49757 eval "LIBPATH$unique=set" 49758- 49759+ 49760 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 49761 LDFLAGS="$LDFLAGS -L$ai_p" 49762 PHP_RPATHS="$PHP_RPATHS $ai_p" 49763- 49764+ 49765 fi 49766 49767 49768- 49769+ 49770 fi 49771 49772 fi 49773- 49774- 49775+ 49776+ 49777 case $THIS_LIBS in 49778 c|c_r|pthread*) ;; 49779- *) 49780- LIBS="-l$THIS_LIBS $LIBS" 49781+ *) 49782+ LIBS="-l$THIS_LIBS $LIBS" 49783 ;; 49784 esac 49785 49786@@ -42904,32 +30909,28 @@ 49787 else 49788 THIS_FULL_NAME="$THIS_NAME" 49789 fi 49790- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 49791-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 49792+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 49793+echo "configure:30914: checking for $THIS_FULL_NAME support" >&5 49794 if test -n ""; then 49795- { { echo "$as_me:$LINENO: error: " >&5 49796-echo "$as_me: error: " >&2;} 49797- { (exit 1); exit 1; }; } 49798+ { echo "configure: error: " 1>&2; exit 1; } 49799 fi 49800 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 49801 HAVE_DBA=1 49802 eval HAVE_$THIS_NAME=1 49803- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 49804-echo "${ECHO_T}$THIS_RESULT" >&6 49805+ echo "$ac_t""$THIS_RESULT" 1>&6 49806 else 49807- echo "$as_me:$LINENO: result: no" >&5 49808-echo "${ECHO_T}no" >&6 49809+ echo "$ac_t""no" 1>&6 49810 fi 49811 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 49812 49813 49814 # DB1 49815 if test "$PHP_DB1" != "no"; then 49816- 49817+ 49818 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 49819 49820- echo "$as_me:$LINENO: checking for DB1 in library" >&5 49821-echo $ECHO_N "checking for DB1 in library... $ECHO_C" >&6 49822+ echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 49823+echo "configure:30934: checking for DB1 in library" >&5 49824 if test "$HAVE_DB4" = "1"; then 49825 THIS_VERSION=4 49826 THIS_LIBS=$DB4_LIBS 49827@@ -42943,10 +30944,9 @@ 49828 THIS_PREFIX=$DB2_PREFIX 49829 fi 49830 if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then 49831- 49832-cat >>confdefs.h <<_ACEOF 49833+ cat >> confdefs.h <<EOF 49834 #define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION" 49835-_ACEOF 49836+EOF 49837 49838 for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do 49839 if test -f "$THIS_PREFIX/$i"; then 49840@@ -42955,10 +30955,9 @@ 49841 fi 49842 done 49843 else 49844- 49845-cat >>confdefs.h <<_ACEOF 49846+ cat >> confdefs.h <<EOF 49847 #define DB1_VERSION "Unknown DB1" 49848-_ACEOF 49849+EOF 49850 49851 for i in $PHP_DB1 /usr/local /usr; do 49852 if test -f "$i/db1/db.h"; then 49853@@ -42977,195 +30976,159 @@ 49854 done 49855 THIS_LIBS=db 49856 fi 49857- echo "$as_me:$LINENO: result: $THIS_LIBS" >&5 49858-echo "${ECHO_T}$THIS_LIBS" >&6 49859- echo "$as_me:$LINENO: checking for DB1 in header" >&5 49860-echo $ECHO_N "checking for DB1 in header... $ECHO_C" >&6 49861- echo "$as_me:$LINENO: result: $THIS_INCLUDE" >&5 49862-echo "${ECHO_T}$THIS_INCLUDE" >&6 49863+ echo "$ac_t""$THIS_LIBS" 1>&6 49864+ echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 49865+echo "configure:30982: checking for DB1 in header" >&5 49866+ echo "$ac_t""$THIS_INCLUDE" 1>&6 49867 if test -n "$THIS_INCLUDE"; then 49868- 49869+ 49870 old_LDFLAGS=$LDFLAGS 49871 LDFLAGS="-L$THIS_PREFIX/$PHP_LIBDIR $LDFLAGS" 49872 old_LIBS=$LIBS 49873 LIBS="-l$THIS_LIBS $LIBS" 49874- 49875- cat >conftest.$ac_ext <<_ACEOF 49876-/* confdefs.h. */ 49877-_ACEOF 49878-cat confdefs.h >>conftest.$ac_ext 49879-cat >>conftest.$ac_ext <<_ACEOF 49880-/* end confdefs.h. */ 49881+ 49882+ cat > conftest.$ac_ext <<EOF 49883+#line 30992 "configure" 49884+#include "confdefs.h" 49885 49886 #include "$THIS_INCLUDE" 49887- 49888-int 49889-main () 49890-{ 49891+ 49892+int main() { 49893 49894 DB * dbp = dbopen("", 0, 0, DB_HASH, 0); 49895- 49896- ; 49897- return 0; 49898-} 49899-_ACEOF 49900-rm -f conftest.$ac_objext conftest$ac_exeext 49901-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 49902- (eval $ac_link) 2>conftest.er1 49903- ac_status=$? 49904- grep -v '^ *+' conftest.er1 >conftest.err 49905- rm -f conftest.er1 49906- cat conftest.err >&5 49907- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49908- (exit $ac_status); } && 49909- { ac_try='test -z "$ac_c_werror_flag" 49910- || test ! -s conftest.err' 49911- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 49912- (eval $ac_try) 2>&5 49913- ac_status=$? 49914- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49915- (exit $ac_status); }; } && 49916- { ac_try='test -s conftest$ac_exeext' 49917- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 49918- (eval $ac_try) 2>&5 49919- ac_status=$? 49920- echo "$as_me:$LINENO: \$? = $ac_status" >&5 49921- (exit $ac_status); }; }; then 49922- 49923- 49924-cat >>confdefs.h <<_ACEOF 49925+ 49926+; return 0; } 49927+EOF 49928+if { (eval echo configure:31003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 49929+ rm -rf conftest* 49930+ 49931+ cat >> confdefs.h <<EOF 49932 #define DB1_INCLUDE_FILE "$THIS_INCLUDE" 49933-_ACEOF 49934- 49935+EOF 49936 49937-cat >>confdefs.h <<\_ACEOF 49938+ cat >> confdefs.h <<\EOF 49939 #define DBA_DB1 1 49940-_ACEOF 49941+EOF 49942 49943 THIS_RESULT=yes 49944- 49945+ 49946 else 49947- echo "$as_me: failed program was:" >&5 49948-sed 's/^/| /' conftest.$ac_ext >&5 49949- 49950- 49951+ echo "configure: failed program was:" >&5 49952+ cat conftest.$ac_ext >&5 49953+ rm -rf conftest* 49954+ 49955 THIS_RESULT=no 49956- 49957+ 49958 fi 49959-rm -f conftest.err conftest.$ac_objext \ 49960- conftest$ac_exeext conftest.$ac_ext 49961- 49962+rm -f conftest* 49963+ 49964 LDFLAGS=$old_LDFLAGS 49965 LIBS=$old_LIBS 49966 49967 fi 49968- 49969+ 49970 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 49971 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 49972 fi 49973 49974- 49975+ 49976 THIS_RESULT=yes 49977 if test -z "$THIS_INCLUDE"; then 49978- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 49979-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 49980- { (exit 1); exit 1; }; } 49981+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 49982 fi 49983 if test -z "$THIS_LIBS"; then 49984- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 49985-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 49986- { (exit 1); exit 1; }; } 49987+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 49988 fi 49989 49990- 49991- 49992+ 49993+ 49994 49995 if test "$ext_shared" = "yes"; then 49996 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 49997 if test -n "$THIS_LFLAGS"; then 49998- 49999+ 50000 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 50001- 50002+ 50003 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 50004 ai_p=$THIS_LFLAGS 50005 else 50006- 50007+ 50008 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 50009- 50010+ 50011 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50012 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 50013 fi 50014 50015- 50016+ 50017 if test "$ext_shared" = "yes"; then 50018 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 50019 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 50020 else 50021- 50022- 50023- 50024+ 50025+ 50026+ 50027 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50028- 50029+ 50030 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50031 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50032 eval "LIBPATH$unique=set" 50033- 50034+ 50035 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50036 LDFLAGS="$LDFLAGS -L$ai_p" 50037 PHP_RPATHS="$PHP_RPATHS $ai_p" 50038- 50039+ 50040 fi 50041 50042 50043 fi 50044- 50045+ 50046 fi 50047 50048 fi 50049 else 50050- 50051+ 50052 50053 if test -n "$THIS_LFLAGS"; then 50054- 50055+ 50056 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 50057- 50058+ 50059 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 50060 ai_p=$THIS_LFLAGS 50061 else 50062- 50063+ 50064 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 50065- 50066+ 50067 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50068 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 50069 fi 50070 50071- 50072- 50073- 50074- 50075+ 50076+ 50077+ 50078+ 50079 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50080- 50081+ 50082 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50083 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50084 eval "LIBPATH$unique=set" 50085- 50086+ 50087 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50088 LDFLAGS="$LDFLAGS -L$ai_p" 50089 PHP_RPATHS="$PHP_RPATHS $ai_p" 50090- 50091+ 50092 fi 50093 50094 50095- 50096+ 50097 fi 50098 50099 fi 50100- 50101- 50102+ 50103+ 50104 case $THIS_LIBS in 50105 c|c_r|pthread*) ;; 50106- *) 50107- LIBS="-l$THIS_LIBS $LIBS" 50108+ *) 50109+ LIBS="-l$THIS_LIBS $LIBS" 50110 ;; 50111 esac 50112 50113@@ -43185,53 +31148,45 @@ 50114 else 50115 THIS_FULL_NAME="$THIS_NAME" 50116 fi 50117- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 50118-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 50119+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 50120+echo "configure:31153: checking for $THIS_FULL_NAME support" >&5 50121 if test -n ""; then 50122- { { echo "$as_me:$LINENO: error: " >&5 50123-echo "$as_me: error: " >&2;} 50124- { (exit 1); exit 1; }; } 50125+ { echo "configure: error: " 1>&2; exit 1; } 50126 fi 50127 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 50128 HAVE_DBA=1 50129 eval HAVE_$THIS_NAME=1 50130- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 50131-echo "${ECHO_T}$THIS_RESULT" >&6 50132+ echo "$ac_t""$THIS_RESULT" 1>&6 50133 else 50134- echo "$as_me:$LINENO: result: no" >&5 50135-echo "${ECHO_T}no" >&6 50136+ echo "$ac_t""no" 1>&6 50137 fi 50138 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 50139 50140 50141 # DBM 50142 if test "$PHP_DBM" != "no"; then 50143- 50144+ 50145 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 50146 50147 if test "$HAVE_QDBM" = "1"; then 50148- 50149+ 50150 THIS_NAME=DBM 50151 if test -n "dbm"; then 50152 THIS_FULL_NAME="dbm" 50153 else 50154 THIS_FULL_NAME="$THIS_NAME" 50155 fi 50156- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 50157-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 50158+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 50159+echo "configure:31181: checking for $THIS_FULL_NAME support" >&5 50160 if test -n "You cannot combine --with-dbm with --with-qdbm"; then 50161- { { echo "$as_me:$LINENO: error: You cannot combine --with-dbm with --with-qdbm" >&5 50162-echo "$as_me: error: You cannot combine --with-dbm with --with-qdbm" >&2;} 50163- { (exit 1); exit 1; }; } 50164+ { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } 50165 fi 50166 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 50167 HAVE_DBA=1 50168 eval HAVE_$THIS_NAME=1 50169- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 50170-echo "${ECHO_T}$THIS_RESULT" >&6 50171+ echo "$ac_t""$THIS_RESULT" 1>&6 50172 else 50173- echo "$as_me:$LINENO: result: no" >&5 50174-echo "${ECHO_T}no" >&6 50175+ echo "$ac_t""no" 1>&6 50176 fi 50177 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 50178 50179@@ -43250,23 +31205,23 @@ 50180 50181 if test -n "$THIS_INCLUDE"; then 50182 for LIB in dbm c gdbm; do 50183- 50184+ 50185 save_old_LDFLAGS=$LDFLAGS 50186 ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" 50187- 50188+ 50189 save_ext_shared=$ext_shared 50190 ext_shared=yes 50191- 50192+ 50193 for ac_i in $ac_stuff; do 50194 case $ac_i in 50195 -pthread) 50196 if test "$ext_shared" = "yes"; then 50197 LDFLAGS="$LDFLAGS -pthread" 50198 else 50199- 50200- 50201+ 50202+ 50203 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 50204- 50205+ 50206 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 50207 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50208 eval "EXTRA_LDFLAGS$unique=set" 50209@@ -43277,20 +31232,20 @@ 50210 ;; 50211 -l*) 50212 ac_ii=`echo $ac_i|cut -c 3-` 50213- 50214- 50215+ 50216+ 50217 case $ac_ii in 50218 c|c_r|pthread*) ;; 50219- *) 50220+ *) 50221 if test "$ext_shared" = "yes"; then 50222- LDFLAGS="$LDFLAGS -l$ac_ii" 50223+ LDFLAGS="$LDFLAGS -l$ac_ii" 50224 else 50225- 50226- 50227+ 50228+ 50229 case $ac_ii in 50230 c|c_r|pthread*) ;; 50231- *) 50232- LIBS="$LIBS -l$ac_ii" 50233+ *) 50234+ LIBS="$LIBS -l$ac_ii" 50235 ;; 50236 esac 50237 50238@@ -43303,157 +31258,121 @@ 50239 ;; 50240 -L*) 50241 ac_ii=`echo $ac_i|cut -c 3-` 50242- 50243+ 50244 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 50245- 50246+ 50247 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 50248 ai_p=$ac_ii 50249 else 50250- 50251+ 50252 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 50253- 50254+ 50255 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50256 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 50257 fi 50258 50259- 50260+ 50261 if test "$ext_shared" = "yes"; then 50262 LDFLAGS="-L$ai_p $LDFLAGS" 50263 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 50264 else 50265- 50266- 50267- 50268+ 50269+ 50270+ 50271 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50272- 50273+ 50274 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50275 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50276 eval "LIBPATH$unique=set" 50277- 50278+ 50279 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50280 LDFLAGS="$LDFLAGS -L$ai_p" 50281 PHP_RPATHS="$PHP_RPATHS $ai_p" 50282- 50283+ 50284 fi 50285 50286 50287 fi 50288- 50289+ 50290 fi 50291 50292 ;; 50293 esac 50294 done 50295 50296- as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh` 50297-echo "$as_me:$LINENO: checking for dbminit in -l$LIB" >&5 50298-echo $ECHO_N "checking for dbminit in -l$LIB... $ECHO_C" >&6 50299-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 50300- echo $ECHO_N "(cached) $ECHO_C" >&6 50301+ echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 50302+echo "configure:31305: checking for dbminit in -l$LIB" >&5 50303+ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` 50304+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 50305+ echo $ac_n "(cached) $ac_c" 1>&6 50306 else 50307- ac_check_lib_save_LIBS=$LIBS 50308+ ac_save_LIBS="$LIBS" 50309 LIBS="-l$LIB $LIBS" 50310-cat >conftest.$ac_ext <<_ACEOF 50311-/* confdefs.h. */ 50312-_ACEOF 50313-cat confdefs.h >>conftest.$ac_ext 50314-cat >>conftest.$ac_ext <<_ACEOF 50315-/* end confdefs.h. */ 50316- 50317+cat > conftest.$ac_ext <<EOF 50318+#line 31313 "configure" 50319+#include "confdefs.h" 50320 /* Override any gcc2 internal prototype to avoid an error. */ 50321-#ifdef __cplusplus 50322-extern "C" 50323-#endif 50324 /* We use char because int might match the return type of a gcc2 50325- builtin and then its argument prototype would still apply. */ 50326-char dbminit (); 50327-int 50328-main () 50329-{ 50330-dbminit (); 50331- ; 50332- return 0; 50333-} 50334-_ACEOF 50335-rm -f conftest.$ac_objext conftest$ac_exeext 50336-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 50337- (eval $ac_link) 2>conftest.er1 50338- ac_status=$? 50339- grep -v '^ *+' conftest.er1 >conftest.err 50340- rm -f conftest.er1 50341- cat conftest.err >&5 50342- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50343- (exit $ac_status); } && 50344- { ac_try='test -z "$ac_c_werror_flag" 50345- || test ! -s conftest.err' 50346- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 50347- (eval $ac_try) 2>&5 50348- ac_status=$? 50349- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50350- (exit $ac_status); }; } && 50351- { ac_try='test -s conftest$ac_exeext' 50352- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 50353- (eval $ac_try) 2>&5 50354- ac_status=$? 50355- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50356- (exit $ac_status); }; }; then 50357- eval "$as_ac_Lib=yes" 50358-else 50359- echo "$as_me: failed program was:" >&5 50360-sed 's/^/| /' conftest.$ac_ext >&5 50361- 50362-eval "$as_ac_Lib=no" 50363-fi 50364-rm -f conftest.err conftest.$ac_objext \ 50365- conftest$ac_exeext conftest.$ac_ext 50366-LIBS=$ac_check_lib_save_LIBS 50367-fi 50368-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 50369-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 50370-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 50371+ builtin and then its argument prototype would still apply. */ 50372+char dbminit(); 50373+ 50374+int main() { 50375+dbminit() 50376+; return 0; } 50377+EOF 50378+if { (eval echo configure:31324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 50379+ rm -rf conftest* 50380+ eval "ac_cv_lib_$ac_lib_var=yes" 50381+else 50382+ echo "configure: failed program was:" >&5 50383+ cat conftest.$ac_ext >&5 50384+ rm -rf conftest* 50385+ eval "ac_cv_lib_$ac_lib_var=no" 50386+fi 50387+rm -f conftest* 50388+LIBS="$ac_save_LIBS" 50389 50390+fi 50391+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 50392+ echo "$ac_t""yes" 1>&6 50393+ 50394 LDFLAGS=$save_old_LDFLAGS 50395 ext_shared=$save_ext_shared 50396- 50397- echo "$as_me:$LINENO: checking for DBM using GDBM" >&5 50398-echo $ECHO_N "checking for DBM using GDBM... $ECHO_C" >&6 50399- 50400-cat >>confdefs.h <<_ACEOF 50401+ 50402+ echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 50403+echo "configure:31344: checking for DBM using GDBM" >&5 50404+ cat >> confdefs.h <<EOF 50405 #define DBM_INCLUDE_FILE "$THIS_INCLUDE" 50406-_ACEOF 50407+EOF 50408 50409 if test "$LIB" = "gdbm"; then 50410- 50411-cat >>confdefs.h <<_ACEOF 50412+ cat >> confdefs.h <<EOF 50413 #define DBM_VERSION "GDBM" 50414-_ACEOF 50415+EOF 50416 50417- echo "$as_me:$LINENO: result: yes" >&5 50418-echo "${ECHO_T}yes" >&6 50419+ echo "$ac_t""yes" 1>&6 50420 else 50421- 50422-cat >>confdefs.h <<_ACEOF 50423+ cat >> confdefs.h <<EOF 50424 #define DBM_VERSION "DBM" 50425-_ACEOF 50426+EOF 50427 50428- echo "$as_me:$LINENO: result: no" >&5 50429-echo "${ECHO_T}no" >&6 50430+ echo "$ac_t""no" 1>&6 50431 fi 50432- 50433-cat >>confdefs.h <<\_ACEOF 50434+ cat >> confdefs.h <<\EOF 50435 #define DBA_DBM 1 50436-_ACEOF 50437- 50438+EOF 50439+ 50440 THIS_LIBS=$LIB 50441- 50442- 50443+ 50444+ 50445 else 50446+ echo "$ac_t""no" 1>&6 50447 50448 LDFLAGS=$save_old_LDFLAGS 50449 ext_shared=$save_ext_shared 50450 unset ac_cv_lib_$LIB_dbminit 50451- 50452- 50453+ 50454+ 50455 fi 50456 50457 if test -n "$THIS_LIBS"; then 50458@@ -43461,114 +31380,110 @@ 50459 fi 50460 done 50461 fi 50462- 50463- 50464+ 50465+ 50466 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 50467 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 50468 fi 50469 50470- 50471+ 50472 THIS_RESULT=yes 50473 if test -z "$THIS_INCLUDE"; then 50474- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 50475-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 50476- { (exit 1); exit 1; }; } 50477+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 50478 fi 50479 if test -z "$THIS_LIBS"; then 50480- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 50481-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 50482- { (exit 1); exit 1; }; } 50483+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 50484 fi 50485 50486- 50487- 50488+ 50489+ 50490 50491 if test "$ext_shared" = "yes"; then 50492 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 50493 if test -n "$THIS_LFLAGS"; then 50494- 50495+ 50496 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 50497- 50498+ 50499 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 50500 ai_p=$THIS_LFLAGS 50501 else 50502- 50503+ 50504 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 50505- 50506+ 50507 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50508 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 50509 fi 50510 50511- 50512+ 50513 if test "$ext_shared" = "yes"; then 50514 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 50515 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 50516 else 50517- 50518- 50519- 50520+ 50521+ 50522+ 50523 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50524- 50525+ 50526 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50527 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50528 eval "LIBPATH$unique=set" 50529- 50530+ 50531 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50532 LDFLAGS="$LDFLAGS -L$ai_p" 50533 PHP_RPATHS="$PHP_RPATHS $ai_p" 50534- 50535+ 50536 fi 50537 50538 50539 fi 50540- 50541+ 50542 fi 50543 50544 fi 50545 else 50546- 50547+ 50548 50549 if test -n "$THIS_LFLAGS"; then 50550- 50551+ 50552 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 50553- 50554+ 50555 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 50556 ai_p=$THIS_LFLAGS 50557 else 50558- 50559+ 50560 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 50561- 50562+ 50563 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50564 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 50565 fi 50566 50567- 50568- 50569- 50570- 50571+ 50572+ 50573+ 50574+ 50575 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50576- 50577+ 50578 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50579 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50580 eval "LIBPATH$unique=set" 50581- 50582+ 50583 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50584 LDFLAGS="$LDFLAGS -L$ai_p" 50585 PHP_RPATHS="$PHP_RPATHS $ai_p" 50586- 50587+ 50588 fi 50589 50590 50591- 50592+ 50593 fi 50594 50595 fi 50596- 50597- 50598+ 50599+ 50600 case $THIS_LIBS in 50601 c|c_r|pthread*) ;; 50602- *) 50603- LIBS="-l$THIS_LIBS $LIBS" 50604+ *) 50605+ LIBS="-l$THIS_LIBS $LIBS" 50606 ;; 50607 esac 50608 50609@@ -43588,21 +31503,17 @@ 50610 else 50611 THIS_FULL_NAME="$THIS_NAME" 50612 fi 50613- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 50614-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 50615+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 50616+echo "configure:31508: checking for $THIS_FULL_NAME support" >&5 50617 if test -n ""; then 50618- { { echo "$as_me:$LINENO: error: " >&5 50619-echo "$as_me: error: " >&2;} 50620- { (exit 1); exit 1; }; } 50621+ { echo "configure: error: " 1>&2; exit 1; } 50622 fi 50623 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 50624 HAVE_DBA=1 50625 eval HAVE_$THIS_NAME=1 50626- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 50627-echo "${ECHO_T}$THIS_RESULT" >&6 50628+ echo "$ac_t""$THIS_RESULT" 1>&6 50629 else 50630- echo "$as_me:$LINENO: result: no" >&5 50631-echo "${ECHO_T}no" >&6 50632+ echo "$ac_t""no" 1>&6 50633 fi 50634 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 50635 50636@@ -43617,17 +31528,17 @@ 50637 php_with_cdb=$php_dba_enable 50638 50639 50640- 50641 # Check whether --with-cdb or --without-cdb was given. 50642 if test "${with_cdb+set}" = set; then 50643 withval="$with_cdb" 50644 PHP_CDB=$withval 50645 else 50646- 50647+ 50648 PHP_CDB=$php_dba_enable 50649+ 50650 50651+fi 50652 50653-fi; 50654 50655 ext_output=$PHP_CDB 50656 50657@@ -43644,11 +31555,12 @@ 50658 enableval="$enable_inifile" 50659 PHP_INIFILE=$enableval 50660 else 50661- 50662+ 50663 PHP_INIFILE=$php_dba_enable 50664+ 50665 50666+fi 50667 50668-fi; 50669 50670 ext_output=$PHP_INIFILE 50671 50672@@ -43665,11 +31577,12 @@ 50673 enableval="$enable_flatfile" 50674 PHP_FLATFILE=$enableval 50675 else 50676- 50677+ 50678 PHP_FLATFILE=$php_dba_enable 50679+ 50680 50681+fi 50682 50683-fi; 50684 50685 ext_output=$PHP_FLATFILE 50686 50687@@ -43679,25 +31592,22 @@ 50688 50689 # CDB 50690 if test "$PHP_CDB" = "yes"; then 50691- 50692-cat >>confdefs.h <<\_ACEOF 50693+ cat >> confdefs.h <<\EOF 50694 #define DBA_CDB_BUILTIN 1 50695-_ACEOF 50696- 50697+EOF 50698 50699-cat >>confdefs.h <<\_ACEOF 50700+ cat >> confdefs.h <<\EOF 50701 #define DBA_CDB_MAKE 1 50702-_ACEOF 50703- 50704+EOF 50705 50706-cat >>confdefs.h <<\_ACEOF 50707+ cat >> confdefs.h <<\EOF 50708 #define DBA_CDB 1 50709-_ACEOF 50710+EOF 50711 50712 cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c" 50713 THIS_RESULT="builtin" 50714 elif test "$PHP_CDB" != "no"; then 50715- 50716+ 50717 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT 50718 50719 for i in $PHP_CDB /usr/local /usr; do 50720@@ -43710,23 +31620,23 @@ 50721 50722 if test -n "$THIS_INCLUDE"; then 50723 for LIB in cdb c; do 50724- 50725+ 50726 save_old_LDFLAGS=$LDFLAGS 50727 ac_stuff="-L$THIS_PREFIX/$PHP_LIBDIR" 50728- 50729+ 50730 save_ext_shared=$ext_shared 50731 ext_shared=yes 50732- 50733+ 50734 for ac_i in $ac_stuff; do 50735 case $ac_i in 50736 -pthread) 50737 if test "$ext_shared" = "yes"; then 50738 LDFLAGS="$LDFLAGS -pthread" 50739 else 50740- 50741- 50742+ 50743+ 50744 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 50745- 50746+ 50747 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 50748 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50749 eval "EXTRA_LDFLAGS$unique=set" 50750@@ -43737,20 +31647,20 @@ 50751 ;; 50752 -l*) 50753 ac_ii=`echo $ac_i|cut -c 3-` 50754- 50755- 50756+ 50757+ 50758 case $ac_ii in 50759 c|c_r|pthread*) ;; 50760- *) 50761+ *) 50762 if test "$ext_shared" = "yes"; then 50763- LDFLAGS="$LDFLAGS -l$ac_ii" 50764+ LDFLAGS="$LDFLAGS -l$ac_ii" 50765 else 50766- 50767- 50768+ 50769+ 50770 case $ac_ii in 50771 c|c_r|pthread*) ;; 50772- *) 50773- LIBS="$LIBS -l$ac_ii" 50774+ *) 50775+ LIBS="$LIBS -l$ac_ii" 50776 ;; 50777 esac 50778 50779@@ -43763,138 +31673,106 @@ 50780 ;; 50781 -L*) 50782 ac_ii=`echo $ac_i|cut -c 3-` 50783- 50784+ 50785 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 50786- 50787+ 50788 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 50789 ai_p=$ac_ii 50790 else 50791- 50792+ 50793 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 50794- 50795+ 50796 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 50797 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 50798 fi 50799 50800- 50801+ 50802 if test "$ext_shared" = "yes"; then 50803 LDFLAGS="-L$ai_p $LDFLAGS" 50804 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 50805 else 50806- 50807- 50808- 50809+ 50810+ 50811+ 50812 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 50813- 50814+ 50815 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 50816 if test -n "$unique" && test "`eval $cmd`" = "" ; then 50817 eval "LIBPATH$unique=set" 50818- 50819+ 50820 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 50821 LDFLAGS="$LDFLAGS -L$ai_p" 50822 PHP_RPATHS="$PHP_RPATHS $ai_p" 50823- 50824+ 50825 fi 50826 50827 50828 fi 50829- 50830+ 50831 fi 50832 50833 ;; 50834 esac 50835 done 50836 50837- as_ac_Lib=`echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh` 50838-echo "$as_me:$LINENO: checking for cdb_read in -l$LIB" >&5 50839-echo $ECHO_N "checking for cdb_read in -l$LIB... $ECHO_C" >&6 50840-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 50841- echo $ECHO_N "(cached) $ECHO_C" >&6 50842+ echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 50843+echo "configure:31720: checking for cdb_read in -l$LIB" >&5 50844+ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'` 50845+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 50846+ echo $ac_n "(cached) $ac_c" 1>&6 50847 else 50848- ac_check_lib_save_LIBS=$LIBS 50849+ ac_save_LIBS="$LIBS" 50850 LIBS="-l$LIB $LIBS" 50851-cat >conftest.$ac_ext <<_ACEOF 50852-/* confdefs.h. */ 50853-_ACEOF 50854-cat confdefs.h >>conftest.$ac_ext 50855-cat >>conftest.$ac_ext <<_ACEOF 50856-/* end confdefs.h. */ 50857- 50858+cat > conftest.$ac_ext <<EOF 50859+#line 31728 "configure" 50860+#include "confdefs.h" 50861 /* Override any gcc2 internal prototype to avoid an error. */ 50862-#ifdef __cplusplus 50863-extern "C" 50864-#endif 50865 /* We use char because int might match the return type of a gcc2 50866- builtin and then its argument prototype would still apply. */ 50867-char cdb_read (); 50868-int 50869-main () 50870-{ 50871-cdb_read (); 50872- ; 50873- return 0; 50874-} 50875-_ACEOF 50876-rm -f conftest.$ac_objext conftest$ac_exeext 50877-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 50878- (eval $ac_link) 2>conftest.er1 50879- ac_status=$? 50880- grep -v '^ *+' conftest.er1 >conftest.err 50881- rm -f conftest.er1 50882- cat conftest.err >&5 50883- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50884- (exit $ac_status); } && 50885- { ac_try='test -z "$ac_c_werror_flag" 50886- || test ! -s conftest.err' 50887- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 50888- (eval $ac_try) 2>&5 50889- ac_status=$? 50890- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50891- (exit $ac_status); }; } && 50892- { ac_try='test -s conftest$ac_exeext' 50893- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 50894- (eval $ac_try) 2>&5 50895- ac_status=$? 50896- echo "$as_me:$LINENO: \$? = $ac_status" >&5 50897- (exit $ac_status); }; }; then 50898- eval "$as_ac_Lib=yes" 50899-else 50900- echo "$as_me: failed program was:" >&5 50901-sed 's/^/| /' conftest.$ac_ext >&5 50902- 50903-eval "$as_ac_Lib=no" 50904-fi 50905-rm -f conftest.err conftest.$ac_objext \ 50906- conftest$ac_exeext conftest.$ac_ext 50907-LIBS=$ac_check_lib_save_LIBS 50908-fi 50909-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 50910-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 50911-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 50912+ builtin and then its argument prototype would still apply. */ 50913+char cdb_read(); 50914 50915+int main() { 50916+cdb_read() 50917+; return 0; } 50918+EOF 50919+if { (eval echo configure:31739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 50920+ rm -rf conftest* 50921+ eval "ac_cv_lib_$ac_lib_var=yes" 50922+else 50923+ echo "configure: failed program was:" >&5 50924+ cat conftest.$ac_ext >&5 50925+ rm -rf conftest* 50926+ eval "ac_cv_lib_$ac_lib_var=no" 50927+fi 50928+rm -f conftest* 50929+LIBS="$ac_save_LIBS" 50930+ 50931+fi 50932+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 50933+ echo "$ac_t""yes" 1>&6 50934+ 50935 LDFLAGS=$save_old_LDFLAGS 50936 ext_shared=$save_ext_shared 50937- 50938- 50939-cat >>confdefs.h <<_ACEOF 50940+ 50941+ cat >> confdefs.h <<EOF 50942 #define CDB_INCLUDE_FILE "$THIS_INCLUDE" 50943-_ACEOF 50944- 50945+EOF 50946 50947-cat >>confdefs.h <<\_ACEOF 50948+ cat >> confdefs.h <<\EOF 50949 #define DBA_CDB 1 50950-_ACEOF 50951- 50952+EOF 50953+ 50954 THIS_LIBS=$LIB 50955- 50956- 50957+ 50958+ 50959 else 50960+ echo "$ac_t""no" 1>&6 50961 50962 LDFLAGS=$save_old_LDFLAGS 50963 ext_shared=$save_ext_shared 50964 unset ac_cv_lib_$LIB_cdb_read 50965- 50966- 50967+ 50968+ 50969 fi 50970 50971 if test -n "$THIS_LIBS"; then 50972@@ -43903,113 +31781,109 @@ 50973 done 50974 fi 50975 50976- 50977+ 50978 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then 50979 THIS_LFLAGS=$THIS_PREFIX/$PHP_LIBDIR 50980 fi 50981 50982- 50983+ 50984 THIS_RESULT=yes 50985 if test -z "$THIS_INCLUDE"; then 50986- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5 50987-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;} 50988- { (exit 1); exit 1; }; } 50989+ { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } 50990 fi 50991 if test -z "$THIS_LIBS"; then 50992- { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5 50993-echo "$as_me: error: DBA: Could not find necessary library." >&2;} 50994- { (exit 1); exit 1; }; } 50995+ { echo "configure: error: DBA: Could not find necessary library." 1>&2; exit 1; } 50996 fi 50997 50998- 50999- 51000+ 51001+ 51002 51003 if test "$ext_shared" = "yes"; then 51004 DBA_SHARED_LIBADD="-l$THIS_LIBS $DBA_SHARED_LIBADD" 51005 if test -n "$THIS_LFLAGS"; then 51006- 51007+ 51008 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 51009- 51010+ 51011 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 51012 ai_p=$THIS_LFLAGS 51013 else 51014- 51015+ 51016 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 51017- 51018+ 51019 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 51020 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 51021 fi 51022 51023- 51024+ 51025 if test "$ext_shared" = "yes"; then 51026 DBA_SHARED_LIBADD="-L$ai_p $DBA_SHARED_LIBADD" 51027 test -n "$ld_runpath_switch" && DBA_SHARED_LIBADD="$ld_runpath_switch$ai_p $DBA_SHARED_LIBADD" 51028 else 51029- 51030- 51031- 51032+ 51033+ 51034+ 51035 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 51036- 51037+ 51038 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 51039 if test -n "$unique" && test "`eval $cmd`" = "" ; then 51040 eval "LIBPATH$unique=set" 51041- 51042+ 51043 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 51044 LDFLAGS="$LDFLAGS -L$ai_p" 51045 PHP_RPATHS="$PHP_RPATHS $ai_p" 51046- 51047+ 51048 fi 51049 51050 51051 fi 51052- 51053+ 51054 fi 51055 51056 fi 51057 else 51058- 51059+ 51060 51061 if test -n "$THIS_LFLAGS"; then 51062- 51063+ 51064 if test "$THIS_LFLAGS" != "/usr/$PHP_LIBDIR" && test "$THIS_LFLAGS" != "/usr/lib"; then 51065- 51066+ 51067 if test -z "$THIS_LFLAGS" || echo "$THIS_LFLAGS" | grep '^/' >/dev/null ; then 51068 ai_p=$THIS_LFLAGS 51069 else 51070- 51071+ 51072 ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`" 51073- 51074+ 51075 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 51076 ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`" 51077 fi 51078 51079- 51080- 51081- 51082- 51083+ 51084+ 51085+ 51086+ 51087 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 51088- 51089+ 51090 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 51091 if test -n "$unique" && test "`eval $cmd`" = "" ; then 51092 eval "LIBPATH$unique=set" 51093- 51094+ 51095 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 51096 LDFLAGS="$LDFLAGS -L$ai_p" 51097 PHP_RPATHS="$PHP_RPATHS $ai_p" 51098- 51099+ 51100 fi 51101 51102 51103- 51104+ 51105 fi 51106 51107 fi 51108- 51109- 51110+ 51111+ 51112 case $THIS_LIBS in 51113 c|c_r|pthread*) ;; 51114- *) 51115- LIBS="-l$THIS_LIBS $LIBS" 51116+ *) 51117+ LIBS="-l$THIS_LIBS $LIBS" 51118 ;; 51119 esac 51120 51121@@ -44029,31 +31903,26 @@ 51122 else 51123 THIS_FULL_NAME="$THIS_NAME" 51124 fi 51125- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 51126-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 51127+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 51128+echo "configure:31908: checking for $THIS_FULL_NAME support" >&5 51129 if test -n ""; then 51130- { { echo "$as_me:$LINENO: error: " >&5 51131-echo "$as_me: error: " >&2;} 51132- { (exit 1); exit 1; }; } 51133+ { echo "configure: error: " 1>&2; exit 1; } 51134 fi 51135 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 51136 HAVE_DBA=1 51137 eval HAVE_$THIS_NAME=1 51138- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 51139-echo "${ECHO_T}$THIS_RESULT" >&6 51140+ echo "$ac_t""$THIS_RESULT" 1>&6 51141 else 51142- echo "$as_me:$LINENO: result: no" >&5 51143-echo "${ECHO_T}no" >&6 51144+ echo "$ac_t""no" 1>&6 51145 fi 51146 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 51147 51148 51149 # INIFILE 51150 if test "$PHP_INIFILE" != "no"; then 51151- 51152-cat >>confdefs.h <<\_ACEOF 51153+ cat >> confdefs.h <<\EOF 51154 #define DBA_INIFILE 1 51155-_ACEOF 51156+EOF 51157 51158 ini_sources="libinifile/inifile.c" 51159 THIS_RESULT="builtin" 51160@@ -44065,31 +31934,26 @@ 51161 else 51162 THIS_FULL_NAME="$THIS_NAME" 51163 fi 51164- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 51165-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 51166+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 51167+echo "configure:31939: checking for $THIS_FULL_NAME support" >&5 51168 if test -n ""; then 51169- { { echo "$as_me:$LINENO: error: " >&5 51170-echo "$as_me: error: " >&2;} 51171- { (exit 1); exit 1; }; } 51172+ { echo "configure: error: " 1>&2; exit 1; } 51173 fi 51174 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 51175 HAVE_DBA=1 51176 eval HAVE_$THIS_NAME=1 51177- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 51178-echo "${ECHO_T}$THIS_RESULT" >&6 51179+ echo "$ac_t""$THIS_RESULT" 1>&6 51180 else 51181- echo "$as_me:$LINENO: result: no" >&5 51182-echo "${ECHO_T}no" >&6 51183+ echo "$ac_t""no" 1>&6 51184 fi 51185 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 51186 51187 51188 # FLATFILE 51189 if test "$PHP_FLATFILE" != "no"; then 51190- 51191-cat >>confdefs.h <<\_ACEOF 51192+ cat >> confdefs.h <<\EOF 51193 #define DBA_FLATFILE 1 51194-_ACEOF 51195+EOF 51196 51197 flat_sources="libflatfile/flatfile.c" 51198 THIS_RESULT="builtin" 51199@@ -44101,41 +31965,34 @@ 51200 else 51201 THIS_FULL_NAME="$THIS_NAME" 51202 fi 51203- echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5 51204-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6 51205+ echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 51206+echo "configure:31970: checking for $THIS_FULL_NAME support" >&5 51207 if test -n ""; then 51208- { { echo "$as_me:$LINENO: error: " >&5 51209-echo "$as_me: error: " >&2;} 51210- { (exit 1); exit 1; }; } 51211+ { echo "configure: error: " 1>&2; exit 1; } 51212 fi 51213 if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then 51214 HAVE_DBA=1 51215 eval HAVE_$THIS_NAME=1 51216- echo "$as_me:$LINENO: result: $THIS_RESULT" >&5 51217-echo "${ECHO_T}$THIS_RESULT" >&6 51218+ echo "$ac_t""$THIS_RESULT" 1>&6 51219 else 51220- echo "$as_me:$LINENO: result: no" >&5 51221-echo "${ECHO_T}no" >&6 51222+ echo "$ac_t""no" 1>&6 51223 fi 51224 unset THIS_RESULT THIS_NAME THIS_FULL_NAME 51225 51226 51227-echo "$as_me:$LINENO: checking whether to enable DBA interface" >&5 51228-echo $ECHO_N "checking whether to enable DBA interface... $ECHO_C" >&6 51229+echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 51230+echo "configure:31985: checking whether to enable DBA interface" >&5 51231 if test "$HAVE_DBA" = "1"; then 51232 if test "$ext_shared" = "yes"; then 51233- echo "$as_me:$LINENO: result: yes, shared" >&5 51234-echo "${ECHO_T}yes, shared" >&6 51235+ echo "$ac_t""yes, shared" 1>&6 51236 else 51237- echo "$as_me:$LINENO: result: yes" >&5 51238-echo "${ECHO_T}yes" >&6 51239+ echo "$ac_t""yes" 1>&6 51240 fi 51241- 51242-cat >>confdefs.h <<\_ACEOF 51243+ cat >> confdefs.h <<\EOF 51244 #define HAVE_DBA 1 51245-_ACEOF 51246- 51247+EOF 51248 51249+ 51250 ext_builddir=ext/dba 51251 ext_srcdir=$abs_srcdir/ext/dba 51252 51253@@ -44143,15 +32000,15 @@ 51254 51255 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 51256 PHP_DBA_SHARED=no 51257- 51258- 51259+ 51260+ 51261 case ext/dba in 51262 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51263 /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51264 *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51265 esac 51266- 51267- 51268+ 51269+ 51270 51271 b_c_pre=$php_c_pre 51272 b_cxx_pre=$php_cxx_pre 51273@@ -44164,12 +32021,12 @@ 51274 51275 old_IFS=$IFS 51276 for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do 51277- 51278+ 51279 IFS=. 51280 set $ac_src 51281 ac_obj=$1 51282 IFS=$old_IFS 51283- 51284+ 51285 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 51286 51287 case $ac_src in 51288@@ -44193,14 +32050,14 @@ 51289 else 51290 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 51291 PHP_DBA_SHARED=yes 51292- 51293+ 51294 case ext/dba in 51295 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51296 /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51297 *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51298 esac 51299- 51300- 51301+ 51302+ 51303 51304 b_c_pre=$shared_c_pre 51305 b_cxx_pre=$shared_cxx_pre 51306@@ -44213,12 +32070,12 @@ 51307 51308 old_IFS=$IFS 51309 for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do 51310- 51311+ 51312 IFS=. 51313 set $ac_src 51314 ac_obj=$1 51315 IFS=$old_IFS 51316- 51317+ 51318 shared_objects_dba="$shared_objects_dba $ac_bdir$ac_obj.lo" 51319 51320 case $ac_src in 51321@@ -44236,7 +32093,7 @@ 51322 51323 case $host_alias in 51324 *netware*) 51325- 51326+ 51327 install_modules="install-modules" 51328 51329 case $host_alias in 51330@@ -44246,7 +32103,7 @@ 51331 ;; 51332 *netware*) 51333 suffix=nlm 51334- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(DBA_SHARED_LIBADD)' 51335+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDBA, 3)_SHARED_LIBADD)' 51336 ;; 51337 *) 51338 suffix=la 51339@@ -44259,7 +32116,7 @@ 51340 else 51341 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdba.$suffix" 51342 fi 51343- 51344+ 51345 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba" 51346 51347 cat >>Makefile.objects<<EOF 51348@@ -44273,7 +32130,7 @@ 51349 51350 ;; 51351 *) 51352- 51353+ 51354 install_modules="install-modules" 51355 51356 case $host_alias in 51357@@ -44283,7 +32140,7 @@ 51358 ;; 51359 *netware*) 51360 suffix=nlm 51361- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 51362+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DBA, 3)_SHARED_LIBADD)' 51363 ;; 51364 *) 51365 suffix=la 51366@@ -44296,7 +32153,7 @@ 51367 else 51368 PHP_MODULES="$PHP_MODULES \$(phplibdir)/dba.$suffix" 51369 fi 51370- 51371+ 51372 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba" 51373 51374 cat >>Makefile.objects<<EOF 51375@@ -44310,10 +32167,9 @@ 51376 51377 ;; 51378 esac 51379- 51380-cat >>confdefs.h <<_ACEOF 51381+ cat >> confdefs.h <<EOF 51382 #define COMPILE_DL_DBA 1 51383-_ACEOF 51384+EOF 51385 51386 fi 51387 fi 51388@@ -44321,16 +32177,16 @@ 51389 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then 51390 PHP_DBA_SHARED=no 51391 case "$PHP_SAPI" in 51392- cgi|embed) 51393- 51394- 51395+ cgi|embed) 51396+ 51397+ 51398 case ext/dba in 51399 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51400 /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51401 *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51402 esac 51403- 51404- 51405+ 51406+ 51407 51408 b_c_pre=$php_c_pre 51409 b_cxx_pre=$php_cxx_pre 51410@@ -44343,12 +32199,12 @@ 51411 51412 old_IFS=$IFS 51413 for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do 51414- 51415+ 51416 IFS=. 51417 set $ac_src 51418 ac_obj=$1 51419 IFS=$old_IFS 51420- 51421+ 51422 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 51423 51424 case $ac_src in 51425@@ -44368,15 +32224,15 @@ 51426 EXT_STATIC="$EXT_STATIC dba" 51427 ;; 51428 *) 51429- 51430- 51431+ 51432+ 51433 case ext/dba in 51434 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51435 /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51436 *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51437 esac 51438- 51439- 51440+ 51441+ 51442 51443 b_c_pre=$php_c_pre 51444 b_cxx_pre=$php_cxx_pre 51445@@ -44389,13 +32245,13 @@ 51446 51447 old_IFS=$IFS 51448 for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do 51449- 51450+ 51451 IFS=. 51452 set $ac_src 51453 ac_obj=$1 51454 IFS=$old_IFS 51455- 51456- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 51457+ 51458+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 51459 51460 case $ac_src in 51461 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 51462@@ -44415,58 +32271,58 @@ 51463 esac 51464 EXT_CLI_STATIC="$EXT_CLI_STATIC dba" 51465 fi 51466- 51467- 51468+ 51469+ 51470 BUILD_DIR="$BUILD_DIR $ext_builddir" 51471- 51472+ 51473 51474 51475 if test "$ext_builddir" = "."; then 51476 PHP_PECL_EXTENSION=dba 51477- 51478+ 51479 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 51480 51481 fi 51482 51483- 51484- 51485+ 51486+ 51487 BUILD_DIR="$BUILD_DIR $ext_builddir/libinifile" 51488+ 51489 51490- 51491- 51492- 51493+ 51494+ 51495 BUILD_DIR="$BUILD_DIR $ext_builddir/libcdb" 51496+ 51497 51498- 51499- 51500- 51501+ 51502+ 51503 BUILD_DIR="$BUILD_DIR $ext_builddir/libflatfile" 51504+ 51505 51506- 51507- 51508+ 51509 PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD" 51510 51511 else 51512- echo "$as_me:$LINENO: result: no" >&5 51513-echo "${ECHO_T}no" >&6 51514+ echo "$ac_t""no" 1>&6 51515 fi 51516 51517 51518 51519 php_enable_dom=yes 51520 51521-echo "$as_me:$LINENO: checking whether to enable DOM support" >&5 51522-echo $ECHO_N "checking whether to enable DOM support... $ECHO_C" >&6 51523+echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 51524+echo "configure:32315: checking whether to enable DOM support" >&5 51525 # Check whether --enable-dom or --disable-dom was given. 51526 if test "${enable_dom+set}" = set; then 51527 enableval="$enable_dom" 51528 PHP_DOM=$enableval 51529 else 51530- 51531+ 51532 PHP_DOM=yes 51533 test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL 51534 51535-fi; 51536+fi 51537+ 51538 51539 51540 ext_output="yes, shared" 51541@@ -44490,33 +32346,31 @@ 51542 51543 51544 51545-echo "$as_me:$LINENO: result: $ext_output" >&5 51546-echo "${ECHO_T}$ext_output" >&6 51547+echo "$ac_t""$ext_output" 1>&6 51548 51549 51550 51551 51552 if test -z "$PHP_LIBXML_DIR"; then 51553- 51554+ 51555 php_with_libxml_dir=no 51556 51557-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 51558-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 51559- 51560+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 51561+echo "configure:32360: checking libxml2 install dir" >&5 51562 # Check whether --with-libxml-dir or --without-libxml-dir was given. 51563 if test "${with_libxml_dir+set}" = set; then 51564 withval="$with_libxml_dir" 51565 PHP_LIBXML_DIR=$withval 51566 else 51567- 51568+ 51569 PHP_LIBXML_DIR=no 51570+ 51571 51572+fi 51573 51574-fi; 51575 51576 ext_output=$PHP_LIBXML_DIR 51577-echo "$as_me:$LINENO: result: $ext_output" >&5 51578-echo "${ECHO_T}$ext_output" >&6 51579+echo "$ac_t""$ext_output" 1>&6 51580 51581 51582 51583@@ -44524,19 +32378,17 @@ 51584 51585 if test "$PHP_DOM" != "no"; then 51586 51587- if test "$PHP_LIBXML" = "no"; then 51588- { { echo "$as_me:$LINENO: error: DOM extension requires LIBXML extension, add --enable-libxml" >&5 51589-echo "$as_me: error: DOM extension requires LIBXML extension, add --enable-libxml" >&2;} 51590- { (exit 1); exit 1; }; } 51591+ if test "$PHP_LIBXML" = "no"; then 51592+ { echo "configure: error: DOM extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 51593 fi 51594 51595- 51596-echo "$as_me:$LINENO: checking for xml2-config path" >&5 51597-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 51598-if test "${ac_cv_php_xml2_config_path+set}" = set; then 51599- echo $ECHO_N "(cached) $ECHO_C" >&6 51600+ 51601+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 51602+echo "configure:32388: checking for xml2-config path" >&5 51603+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 51604+ echo $ac_n "(cached) $ac_c" 1>&6 51605 else 51606- 51607+ 51608 for i in $PHP_LIBXML_DIR /usr/local /usr; do 51609 if test -x "$i/bin/xml2-config"; then 51610 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 51611@@ -44545,8 +32397,8 @@ 51612 done 51613 51614 fi 51615-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 51616-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 51617+ 51618+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 51619 51620 if test -x "$ac_cv_php_xml2_config_path"; then 51621 XML2_CONFIG="$ac_cv_php_xml2_config_path" 51622@@ -44559,17 +32411,17 @@ 51623 if test "$LIBXML_VERSION" -ge "2006011"; then 51624 LIBXML_LIBS=`$XML2_CONFIG --libs` 51625 LIBXML_INCS=`$XML2_CONFIG --cflags` 51626- 51627+ 51628 for ac_i in $LIBXML_LIBS; do 51629 case $ac_i in 51630 -pthread) 51631 if test "$ext_shared" = "yes"; then 51632 DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -pthread" 51633 else 51634- 51635- 51636+ 51637+ 51638 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 51639- 51640+ 51641 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 51642 if test -n "$unique" && test "`eval $cmd`" = "" ; then 51643 eval "EXTRA_LDFLAGS$unique=set" 51644@@ -44580,20 +32432,20 @@ 51645 ;; 51646 -l*) 51647 ac_ii=`echo $ac_i|cut -c 3-` 51648- 51649- 51650+ 51651+ 51652 case $ac_ii in 51653 c|c_r|pthread*) ;; 51654- *) 51655+ *) 51656 if test "$ext_shared" = "yes"; then 51657- DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii" 51658+ DOM_SHARED_LIBADD="$DOM_SHARED_LIBADD -l$ac_ii" 51659 else 51660- 51661- 51662+ 51663+ 51664 case $ac_ii in 51665 c|c_r|pthread*) ;; 51666- *) 51667- LIBS="$LIBS -l$ac_ii" 51668+ *) 51669+ LIBS="$LIBS -l$ac_ii" 51670 ;; 51671 esac 51672 51673@@ -44606,80 +32458,80 @@ 51674 ;; 51675 -L*) 51676 ac_ii=`echo $ac_i|cut -c 3-` 51677- 51678+ 51679 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 51680- 51681+ 51682 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 51683 ai_p=$ac_ii 51684 else 51685- 51686+ 51687 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 51688- 51689+ 51690 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 51691 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 51692 fi 51693 51694- 51695+ 51696 if test "$ext_shared" = "yes"; then 51697 DOM_SHARED_LIBADD="-L$ai_p $DOM_SHARED_LIBADD" 51698 test -n "$ld_runpath_switch" && DOM_SHARED_LIBADD="$ld_runpath_switch$ai_p $DOM_SHARED_LIBADD" 51699 else 51700- 51701- 51702- 51703+ 51704+ 51705+ 51706 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 51707- 51708+ 51709 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 51710 if test -n "$unique" && test "`eval $cmd`" = "" ; then 51711 eval "LIBPATH$unique=set" 51712- 51713+ 51714 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 51715 LDFLAGS="$LDFLAGS -L$ai_p" 51716 PHP_RPATHS="$PHP_RPATHS $ai_p" 51717- 51718+ 51719 fi 51720 51721 51722 fi 51723- 51724+ 51725 fi 51726 51727 ;; 51728 esac 51729 done 51730 51731- 51732+ 51733 for ac_i in $LIBXML_INCS; do 51734 case $ac_i in 51735 -I*) 51736 ac_ii=`echo $ac_i|cut -c 3-` 51737- 51738+ 51739 if test "$ac_ii" != "/usr/include"; then 51740- 51741+ 51742 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 51743 ai_p=$ac_ii 51744 else 51745- 51746+ 51747 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 51748- 51749+ 51750 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 51751 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 51752 fi 51753 51754- 51755- 51756+ 51757+ 51758 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 51759- 51760+ 51761 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 51762 if test -n "$unique" && test "`eval $cmd`" = "" ; then 51763 eval "INCLUDEPATH$unique=set" 51764- 51765+ 51766 if test ""; then 51767 INCLUDES="-I$ai_p $INCLUDES" 51768 else 51769 INCLUDES="$INCLUDES -I$ai_p" 51770 fi 51771- 51772+ 51773 fi 51774 51775 fi 51776@@ -44689,92 +32541,74 @@ 51777 done 51778 51779 51780- echo "$as_me:$LINENO: checking whether libxml build works" >&5 51781-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 51782-if test "${php_cv_libxml_build_works+set}" = set; then 51783- echo $ECHO_N "(cached) $ECHO_C" >&6 51784+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 51785+echo "configure:32546: checking whether libxml build works" >&5 51786+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 51787+ echo $ac_n "(cached) $ac_c" 1>&6 51788 else 51789- 51790- 51791+ 51792+ 51793 old_LIBS=$LIBS 51794 LIBS=" 51795 $DOM_SHARED_LIBADD 51796 $LIBS" 51797 if test "$cross_compiling" = yes; then 51798- 51799+ 51800 LIBS=$old_LIBS 51801- 51802+ 51803 else 51804- cat >conftest.$ac_ext <<_ACEOF 51805-/* confdefs.h. */ 51806-_ACEOF 51807-cat confdefs.h >>conftest.$ac_ext 51808-cat >>conftest.$ac_ext <<_ACEOF 51809-/* end confdefs.h. */ 51810- 51811+ cat > conftest.$ac_ext <<EOF 51812+#line 32562 "configure" 51813+#include "confdefs.h" 51814 51815+ 51816 char xmlInitParser(); 51817 int main() { 51818 xmlInitParser(); 51819 return 0; 51820 } 51821- 51822-_ACEOF 51823-rm -f conftest$ac_exeext 51824-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 51825- (eval $ac_link) 2>&5 51826- ac_status=$? 51827- echo "$as_me:$LINENO: \$? = $ac_status" >&5 51828- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 51829- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 51830- (eval $ac_try) 2>&5 51831- ac_status=$? 51832- echo "$as_me:$LINENO: \$? = $ac_status" >&5 51833- (exit $ac_status); }; }; then 51834- 51835+ 51836+EOF 51837+if { (eval echo configure:32573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 51838+then 51839+ 51840 LIBS=$old_LIBS 51841- 51842+ 51843 php_cv_libxml_build_works=yes 51844- 51845- 51846+ 51847+ 51848 else 51849- echo "$as_me: program exited with status $ac_status" >&5 51850-echo "$as_me: failed program was:" >&5 51851-sed 's/^/| /' conftest.$ac_ext >&5 51852- 51853-( exit $ac_status ) 51854- 51855+ echo "configure: failed program was:" >&5 51856+ cat conftest.$ac_ext >&5 51857+ rm -fr conftest* 51858+ 51859 LIBS=$old_LIBS 51860- 51861- echo "$as_me:$LINENO: result: no" >&5 51862-echo "${ECHO_T}no" >&6 51863- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 51864-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 51865- { (exit 1); exit 1; }; } 51866- 51867- 51868+ 51869+ echo "$ac_t""no" 1>&6 51870+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 51871+ 51872+ 51873 fi 51874-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 51875+rm -fr conftest* 51876 fi 51877 51878 51879+ 51880 fi 51881-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 51882-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 51883- if test "$php_cv_libxml_build_works" = "yes"; then 51884 51885-cat >>confdefs.h <<\_ACEOF 51886+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 51887+ if test "$php_cv_libxml_build_works" = "yes"; then 51888+ cat >> confdefs.h <<\EOF 51889 #define HAVE_LIBXML 1 51890-_ACEOF 51891+EOF 51892 51893 fi 51894- 51895- 51896-cat >>confdefs.h <<\_ACEOF 51897+ 51898+ cat >> confdefs.h <<\EOF 51899 #define HAVE_DOM 1 51900-_ACEOF 51901- 51902+EOF 51903 51904+ 51905 ext_builddir=ext/dom 51906 ext_srcdir=$abs_srcdir/ext/dom 51907 51908@@ -44782,15 +32616,15 @@ 51909 51910 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 51911 PHP_DOM_SHARED=no 51912- 51913- 51914+ 51915+ 51916 case ext/dom in 51917 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51918 /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51919 *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51920 esac 51921- 51922- 51923+ 51924+ 51925 51926 b_c_pre=$php_c_pre 51927 b_cxx_pre=$php_cxx_pre 51928@@ -44812,12 +32646,12 @@ 51929 domimplementationsource.c entityreference.c \ 51930 notation.c xpath.c dom_iterators.c \ 51931 typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do 51932- 51933+ 51934 IFS=. 51935 set $ac_src 51936 ac_obj=$1 51937 IFS=$old_IFS 51938- 51939+ 51940 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 51941 51942 case $ac_src in 51943@@ -44841,14 +32675,14 @@ 51944 else 51945 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 51946 PHP_DOM_SHARED=yes 51947- 51948+ 51949 case ext/dom in 51950 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 51951 /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 51952 *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 51953 esac 51954- 51955- 51956+ 51957+ 51958 51959 b_c_pre=$shared_c_pre 51960 b_cxx_pre=$shared_cxx_pre 51961@@ -44870,12 +32704,12 @@ 51962 domimplementationsource.c entityreference.c \ 51963 notation.c xpath.c dom_iterators.c \ 51964 typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do 51965- 51966+ 51967 IFS=. 51968 set $ac_src 51969 ac_obj=$1 51970 IFS=$old_IFS 51971- 51972+ 51973 shared_objects_dom="$shared_objects_dom $ac_bdir$ac_obj.lo" 51974 51975 case $ac_src in 51976@@ -44893,7 +32727,7 @@ 51977 51978 case $host_alias in 51979 *netware*) 51980- 51981+ 51982 install_modules="install-modules" 51983 51984 case $host_alias in 51985@@ -44903,7 +32737,7 @@ 51986 ;; 51987 *netware*) 51988 suffix=nlm 51989- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(DOM_SHARED_LIBADD)' 51990+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDOM, 3)_SHARED_LIBADD)' 51991 ;; 51992 *) 51993 suffix=la 51994@@ -44916,7 +32750,7 @@ 51995 else 51996 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdom.$suffix" 51997 fi 51998- 51999+ 52000 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dom" 52001 52002 cat >>Makefile.objects<<EOF 52003@@ -44930,7 +32764,7 @@ 52004 52005 ;; 52006 *) 52007- 52008+ 52009 install_modules="install-modules" 52010 52011 case $host_alias in 52012@@ -44940,7 +32774,7 @@ 52013 ;; 52014 *netware*) 52015 suffix=nlm 52016- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 52017+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dom) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DOM, 3)_SHARED_LIBADD)' 52018 ;; 52019 *) 52020 suffix=la 52021@@ -44953,7 +32787,7 @@ 52022 else 52023 PHP_MODULES="$PHP_MODULES \$(phplibdir)/dom.$suffix" 52024 fi 52025- 52026+ 52027 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dom" 52028 52029 cat >>Makefile.objects<<EOF 52030@@ -44967,10 +32801,9 @@ 52031 52032 ;; 52033 esac 52034- 52035-cat >>confdefs.h <<_ACEOF 52036+ cat >> confdefs.h <<EOF 52037 #define COMPILE_DL_DOM 1 52038-_ACEOF 52039+EOF 52040 52041 fi 52042 fi 52043@@ -44979,15 +32812,15 @@ 52044 PHP_DOM_SHARED=no 52045 case "$PHP_SAPI" in 52046 cgi|embed) 52047- 52048- 52049+ 52050+ 52051 case ext/dom in 52052 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52053 /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52054 *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52055 esac 52056- 52057- 52058+ 52059+ 52060 52061 b_c_pre=$php_c_pre 52062 b_cxx_pre=$php_cxx_pre 52063@@ -45009,12 +32842,12 @@ 52064 domimplementationsource.c entityreference.c \ 52065 notation.c xpath.c dom_iterators.c \ 52066 typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do 52067- 52068+ 52069 IFS=. 52070 set $ac_src 52071 ac_obj=$1 52072 IFS=$old_IFS 52073- 52074+ 52075 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 52076 52077 case $ac_src in 52078@@ -45034,15 +32867,15 @@ 52079 EXT_STATIC="$EXT_STATIC dom" 52080 ;; 52081 *) 52082- 52083- 52084+ 52085+ 52086 case ext/dom in 52087 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52088 /*) ac_srcdir=`echo "ext/dom"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52089 *) ac_srcdir="$abs_srcdir/ext/dom/"; ac_bdir="ext/dom/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52090 esac 52091- 52092- 52093+ 52094+ 52095 52096 b_c_pre=$php_c_pre 52097 b_cxx_pre=$php_cxx_pre 52098@@ -45064,13 +32897,13 @@ 52099 domimplementationsource.c entityreference.c \ 52100 notation.c xpath.c dom_iterators.c \ 52101 typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c; do 52102- 52103+ 52104 IFS=. 52105 set $ac_src 52106 ac_obj=$1 52107 IFS=$old_IFS 52108- 52109- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 52110+ 52111+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 52112 52113 case $ac_src in 52114 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 52115@@ -45090,82 +32923,66 @@ 52116 esac 52117 EXT_CLI_STATIC="$EXT_CLI_STATIC dom" 52118 fi 52119- 52120- 52121+ 52122+ 52123 BUILD_DIR="$BUILD_DIR $ext_builddir" 52124- 52125+ 52126 52127 52128 if test "$ext_builddir" = "."; then 52129 PHP_PECL_EXTENSION=dom 52130- 52131+ 52132 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 52133 52134 fi 52135 52136- 52137+ 52138 PHP_VAR_SUBST="$PHP_VAR_SUBST DOM_SHARED_LIBADD" 52139 52140- 52141- 52142+ 52143+ 52144 for header_file in ext/dom/xml_common.h; do 52145- 52146- 52147+ 52148+ 52149 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 52150- 52151+ 52152 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 52153 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52154 eval "INSTALLHEADERS$unique=set" 52155- 52156+ 52157 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 52158- 52159+ 52160 fi 52161 52162- done 52163- 52164- 52165+ done 52166+ 52167 52168+ 52169 am_i_shared=$PHP_DOM_SHARED 52170 is_it_shared=$PHP_LIBXML_SHARED 52171 is_it_enabled=$PHP_LIBXML 52172 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 52173- { { echo "$as_me:$LINENO: error: 52174-You've configured extension dom to build statically, but it 52175-depends on extension libxml, which you've configured to build shared. 52176-You either need to build dom shared or build libxml statically for the 52177-build to be successful. 52178-" >&5 52179-echo "$as_me: error: 52180+ { echo "configure: error: 52181 You've configured extension dom to build statically, but it 52182 depends on extension libxml, which you've configured to build shared. 52183 You either need to build dom shared or build libxml statically for the 52184 build to be successful. 52185-" >&2;} 52186- { (exit 1); exit 1; }; } 52187+" 1>&2; exit 1; } 52188 fi 52189 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 52190- { { echo "$as_me:$LINENO: error: 52191-You've configured extension dom, which depends on extension libxml, 52192-but you've either not enabled libxml, or have disabled it. 52193-" >&5 52194-echo "$as_me: error: 52195+ { echo "configure: error: 52196 You've configured extension dom, which depends on extension libxml, 52197 but you've either not enabled libxml, or have disabled it. 52198-" >&2;} 52199- { (exit 1); exit 1; }; } 52200+" 1>&2; exit 1; } 52201 fi 52202- 52203- 52204+ 52205+ 52206 else 52207- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 52208-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 52209- { (exit 1); exit 1; }; } 52210+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 52211 fi 52212-else 52213- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 52214-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 52215- { (exit 1); exit 1; }; } 52216- 52217+else 52218+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 52219+ 52220 fi 52221 52222 fi 52223@@ -45174,19 +32991,19 @@ 52224 52225 php_with_enchant=no 52226 52227-echo "$as_me:$LINENO: checking for ENCHANT support" >&5 52228-echo $ECHO_N "checking for ENCHANT support... $ECHO_C" >&6 52229- 52230+echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 52231+echo "configure:32996: checking for ENCHANT support" >&5 52232 # Check whether --with-enchant or --without-enchant was given. 52233 if test "${with_enchant+set}" = set; then 52234 withval="$with_enchant" 52235 PHP_ENCHANT=$withval 52236 else 52237- 52238+ 52239 PHP_ENCHANT=no 52240 test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL 52241 52242-fi; 52243+fi 52244+ 52245 52246 52247 ext_output="yes, shared" 52248@@ -45210,14 +33027,13 @@ 52249 52250 52251 52252-echo "$as_me:$LINENO: result: $ext_output" >&5 52253-echo "${ECHO_T}$ext_output" >&6 52254+echo "$ac_t""$ext_output" 1>&6 52255 52256 52257 52258 52259 if test "$PHP_ENCHANT" != "no"; then 52260- 52261+ 52262 ext_builddir=ext/enchant 52263 ext_srcdir=$abs_srcdir/ext/enchant 52264 52265@@ -45225,15 +33041,15 @@ 52266 52267 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 52268 PHP_ENCHANT_SHARED=no 52269- 52270- 52271+ 52272+ 52273 case ext/enchant in 52274 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52275 /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52276 *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52277 esac 52278- 52279- 52280+ 52281+ 52282 52283 b_c_pre=$php_c_pre 52284 b_cxx_pre=$php_cxx_pre 52285@@ -45246,12 +33062,12 @@ 52286 52287 old_IFS=$IFS 52288 for ac_src in enchant.c; do 52289- 52290+ 52291 IFS=. 52292 set $ac_src 52293 ac_obj=$1 52294 IFS=$old_IFS 52295- 52296+ 52297 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 52298 52299 case $ac_src in 52300@@ -45275,14 +33091,14 @@ 52301 else 52302 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 52303 PHP_ENCHANT_SHARED=yes 52304- 52305+ 52306 case ext/enchant in 52307 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52308 /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52309 *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52310 esac 52311- 52312- 52313+ 52314+ 52315 52316 b_c_pre=$shared_c_pre 52317 b_cxx_pre=$shared_cxx_pre 52318@@ -45295,12 +33111,12 @@ 52319 52320 old_IFS=$IFS 52321 for ac_src in enchant.c; do 52322- 52323+ 52324 IFS=. 52325 set $ac_src 52326 ac_obj=$1 52327 IFS=$old_IFS 52328- 52329+ 52330 shared_objects_enchant="$shared_objects_enchant $ac_bdir$ac_obj.lo" 52331 52332 case $ac_src in 52333@@ -45318,7 +33134,7 @@ 52334 52335 case $host_alias in 52336 *netware*) 52337- 52338+ 52339 install_modules="install-modules" 52340 52341 case $host_alias in 52342@@ -45328,7 +33144,7 @@ 52343 ;; 52344 *netware*) 52345 suffix=nlm 52346- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(ENCHANT_SHARED_LIBADD)' 52347+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPENCHANT, 3)_SHARED_LIBADD)' 52348 ;; 52349 *) 52350 suffix=la 52351@@ -45341,7 +33157,7 @@ 52352 else 52353 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpenchant.$suffix" 52354 fi 52355- 52356+ 52357 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_enchant" 52358 52359 cat >>Makefile.objects<<EOF 52360@@ -45355,7 +33171,7 @@ 52361 52362 ;; 52363 *) 52364- 52365+ 52366 install_modules="install-modules" 52367 52368 case $host_alias in 52369@@ -45365,7 +33181,7 @@ 52370 ;; 52371 *netware*) 52372 suffix=nlm 52373- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(HANT_SHARED_LIBADD)' 52374+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_enchant) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ENCHANT, 3)_SHARED_LIBADD)' 52375 ;; 52376 *) 52377 suffix=la 52378@@ -45378,7 +33194,7 @@ 52379 else 52380 PHP_MODULES="$PHP_MODULES \$(phplibdir)/enchant.$suffix" 52381 fi 52382- 52383+ 52384 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_enchant" 52385 52386 cat >>Makefile.objects<<EOF 52387@@ -45392,10 +33208,9 @@ 52388 52389 ;; 52390 esac 52391- 52392-cat >>confdefs.h <<_ACEOF 52393+ cat >> confdefs.h <<EOF 52394 #define COMPILE_DL_ENCHANT 1 52395-_ACEOF 52396+EOF 52397 52398 fi 52399 fi 52400@@ -45404,15 +33219,15 @@ 52401 PHP_ENCHANT_SHARED=no 52402 case "$PHP_SAPI" in 52403 cgi|embed) 52404- 52405- 52406+ 52407+ 52408 case ext/enchant in 52409 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52410 /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52411 *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52412 esac 52413- 52414- 52415+ 52416+ 52417 52418 b_c_pre=$php_c_pre 52419 b_cxx_pre=$php_cxx_pre 52420@@ -45425,12 +33240,12 @@ 52421 52422 old_IFS=$IFS 52423 for ac_src in enchant.c; do 52424- 52425+ 52426 IFS=. 52427 set $ac_src 52428 ac_obj=$1 52429 IFS=$old_IFS 52430- 52431+ 52432 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 52433 52434 case $ac_src in 52435@@ -45450,15 +33265,15 @@ 52436 EXT_STATIC="$EXT_STATIC enchant" 52437 ;; 52438 *) 52439- 52440- 52441+ 52442+ 52443 case ext/enchant in 52444 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52445 /*) ac_srcdir=`echo "ext/enchant"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52446 *) ac_srcdir="$abs_srcdir/ext/enchant/"; ac_bdir="ext/enchant/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52447 esac 52448- 52449- 52450+ 52451+ 52452 52453 b_c_pre=$php_c_pre 52454 b_cxx_pre=$php_cxx_pre 52455@@ -45471,13 +33286,13 @@ 52456 52457 old_IFS=$IFS 52458 for ac_src in enchant.c; do 52459- 52460+ 52461 IFS=. 52462 set $ac_src 52463 ac_obj=$1 52464 IFS=$old_IFS 52465- 52466- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 52467+ 52468+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 52469 52470 case $ac_src in 52471 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 52472@@ -45497,15 +33312,15 @@ 52473 esac 52474 EXT_CLI_STATIC="$EXT_CLI_STATIC enchant" 52475 fi 52476- 52477- 52478+ 52479+ 52480 BUILD_DIR="$BUILD_DIR $ext_builddir" 52481- 52482+ 52483 52484 52485 if test "$ext_builddir" = "."; then 52486 PHP_PECL_EXTENSION=enchant 52487- 52488+ 52489 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 52490 52491 fi 52492@@ -45526,109 +33341,106 @@ 52493 done 52494 52495 if test -z "$ENCHANT_DIR"; then 52496- { { echo "$as_me:$LINENO: error: Cannot find enchant" >&5 52497-echo "$as_me: error: Cannot find enchant" >&2;} 52498- { (exit 1); exit 1; }; } 52499+ { echo "configure: error: Cannot find enchant" 1>&2; exit 1; } 52500 fi 52501 52502 ENCHANT_LIBDIR=$ENCHANT_DIR/lib 52503 52504- 52505-cat >>confdefs.h <<\_ACEOF 52506+ cat >> confdefs.h <<\EOF 52507 #define HAVE_ENCHANT 1 52508-_ACEOF 52509- 52510+EOF 52511 52512+ 52513 PHP_VAR_SUBST="$PHP_VAR_SUBST ENCHANT_SHARED_LIBADD" 52514 52515- 52516+ 52517 52518 if test "$ext_shared" = "yes"; then 52519 ENCHANT_SHARED_LIBADD="-lenchant $ENCHANT_SHARED_LIBADD" 52520 if test -n "$ENCHANT_LIBDIR"; then 52521- 52522+ 52523 if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then 52524- 52525+ 52526 if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then 52527 ai_p=$ENCHANT_LIBDIR 52528 else 52529- 52530+ 52531 ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 52532- 52533+ 52534 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 52535 ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`" 52536 fi 52537 52538- 52539+ 52540 if test "$ext_shared" = "yes"; then 52541 ENCHANT_SHARED_LIBADD="-L$ai_p $ENCHANT_SHARED_LIBADD" 52542 test -n "$ld_runpath_switch" && ENCHANT_SHARED_LIBADD="$ld_runpath_switch$ai_p $ENCHANT_SHARED_LIBADD" 52543 else 52544- 52545- 52546- 52547+ 52548+ 52549+ 52550 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 52551- 52552+ 52553 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 52554 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52555 eval "LIBPATH$unique=set" 52556- 52557+ 52558 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 52559 LDFLAGS="$LDFLAGS -L$ai_p" 52560 PHP_RPATHS="$PHP_RPATHS $ai_p" 52561- 52562+ 52563 fi 52564 52565 52566 fi 52567- 52568+ 52569 fi 52570 52571 fi 52572 else 52573- 52574+ 52575 52576 if test -n "$ENCHANT_LIBDIR"; then 52577- 52578+ 52579 if test "$ENCHANT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ENCHANT_LIBDIR" != "/usr/lib"; then 52580- 52581+ 52582 if test -z "$ENCHANT_LIBDIR" || echo "$ENCHANT_LIBDIR" | grep '^/' >/dev/null ; then 52583 ai_p=$ENCHANT_LIBDIR 52584 else 52585- 52586+ 52587 ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 52588- 52589+ 52590 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 52591 ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`" 52592 fi 52593 52594- 52595- 52596- 52597- 52598+ 52599+ 52600+ 52601+ 52602 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 52603- 52604+ 52605 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 52606 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52607 eval "LIBPATH$unique=set" 52608- 52609+ 52610 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 52611 LDFLAGS="$LDFLAGS -L$ai_p" 52612 PHP_RPATHS="$PHP_RPATHS $ai_p" 52613- 52614+ 52615 fi 52616 52617 52618- 52619+ 52620 fi 52621 52622 fi 52623- 52624- 52625+ 52626+ 52627 case enchant in 52628 c|c_r|pthread*) ;; 52629- *) 52630- LIBS="-lenchant $LIBS" 52631+ *) 52632+ LIBS="-lenchant $LIBS" 52633 ;; 52634 esac 52635 52636@@ -45638,54 +33450,54 @@ 52637 fi 52638 52639 52640- 52641+ 52642 if test "$ENCHANT_INCDIR" != "/usr/include"; then 52643- 52644+ 52645 if test -z "$ENCHANT_INCDIR" || echo "$ENCHANT_INCDIR" | grep '^/' >/dev/null ; then 52646 ai_p=$ENCHANT_INCDIR 52647 else 52648- 52649+ 52650 ep_dir="`echo $ENCHANT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 52651- 52652+ 52653 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 52654 ai_p="$ep_realdir/`basename \"$ENCHANT_INCDIR\"`" 52655 fi 52656 52657- 52658- 52659+ 52660+ 52661 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 52662- 52663+ 52664 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 52665 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52666 eval "INCLUDEPATH$unique=set" 52667- 52668+ 52669 if test ""; then 52670 INCLUDES="-I$ai_p $INCLUDES" 52671 else 52672 INCLUDES="$INCLUDES -I$ai_p" 52673 fi 52674- 52675+ 52676 fi 52677 52678 fi 52679 52680- 52681+ 52682 save_old_LDFLAGS=$LDFLAGS 52683 ac_stuff=" -L$ENCHANT_LIB $ENCHANT_SHARED_LIBADD" 52684- 52685+ 52686 save_ext_shared=$ext_shared 52687 ext_shared=yes 52688- 52689+ 52690 for ac_i in $ac_stuff; do 52691 case $ac_i in 52692 -pthread) 52693 if test "$ext_shared" = "yes"; then 52694 LDFLAGS="$LDFLAGS -pthread" 52695 else 52696- 52697- 52698+ 52699+ 52700 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 52701- 52702+ 52703 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 52704 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52705 eval "EXTRA_LDFLAGS$unique=set" 52706@@ -45696,20 +33508,20 @@ 52707 ;; 52708 -l*) 52709 ac_ii=`echo $ac_i|cut -c 3-` 52710- 52711- 52712+ 52713+ 52714 case $ac_ii in 52715 c|c_r|pthread*) ;; 52716- *) 52717+ *) 52718 if test "$ext_shared" = "yes"; then 52719- LDFLAGS="$LDFLAGS -l$ac_ii" 52720+ LDFLAGS="$LDFLAGS -l$ac_ii" 52721 else 52722- 52723- 52724+ 52725+ 52726 case $ac_ii in 52727 c|c_r|pthread*) ;; 52728- *) 52729- LIBS="$LIBS -l$ac_ii" 52730+ *) 52731+ LIBS="$LIBS -l$ac_ii" 52732 ;; 52733 esac 52734 52735@@ -45722,136 +33534,105 @@ 52736 ;; 52737 -L*) 52738 ac_ii=`echo $ac_i|cut -c 3-` 52739- 52740+ 52741 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 52742- 52743+ 52744 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 52745 ai_p=$ac_ii 52746 else 52747- 52748+ 52749 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 52750- 52751+ 52752 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 52753 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 52754 fi 52755 52756- 52757+ 52758 if test "$ext_shared" = "yes"; then 52759 LDFLAGS="-L$ai_p $LDFLAGS" 52760 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 52761 else 52762- 52763- 52764- 52765+ 52766+ 52767+ 52768 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 52769- 52770+ 52771 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 52772 if test -n "$unique" && test "`eval $cmd`" = "" ; then 52773 eval "LIBPATH$unique=set" 52774- 52775+ 52776 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 52777 LDFLAGS="$LDFLAGS -L$ai_p" 52778 PHP_RPATHS="$PHP_RPATHS $ai_p" 52779- 52780+ 52781 fi 52782 52783 52784 fi 52785- 52786+ 52787 fi 52788 52789 ;; 52790 esac 52791 done 52792 52793- echo "$as_me:$LINENO: checking for enchant_broker_set_param in -lenchant" >&5 52794-echo $ECHO_N "checking for enchant_broker_set_param in -lenchant... $ECHO_C" >&6 52795-if test "${ac_cv_lib_enchant_enchant_broker_set_param+set}" = set; then 52796- echo $ECHO_N "(cached) $ECHO_C" >&6 52797+ echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 52798+echo "configure:33581: checking for enchant_broker_set_param in -lenchant" >&5 52799+ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` 52800+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 52801+ echo $ac_n "(cached) $ac_c" 1>&6 52802 else 52803- ac_check_lib_save_LIBS=$LIBS 52804+ ac_save_LIBS="$LIBS" 52805 LIBS="-lenchant $LIBS" 52806-cat >conftest.$ac_ext <<_ACEOF 52807-/* confdefs.h. */ 52808-_ACEOF 52809-cat confdefs.h >>conftest.$ac_ext 52810-cat >>conftest.$ac_ext <<_ACEOF 52811-/* end confdefs.h. */ 52812- 52813+cat > conftest.$ac_ext <<EOF 52814+#line 33589 "configure" 52815+#include "confdefs.h" 52816 /* Override any gcc2 internal prototype to avoid an error. */ 52817-#ifdef __cplusplus 52818-extern "C" 52819-#endif 52820 /* We use char because int might match the return type of a gcc2 52821- builtin and then its argument prototype would still apply. */ 52822-char enchant_broker_set_param (); 52823-int 52824-main () 52825-{ 52826-enchant_broker_set_param (); 52827- ; 52828- return 0; 52829-} 52830-_ACEOF 52831-rm -f conftest.$ac_objext conftest$ac_exeext 52832-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 52833- (eval $ac_link) 2>conftest.er1 52834- ac_status=$? 52835- grep -v '^ *+' conftest.er1 >conftest.err 52836- rm -f conftest.er1 52837- cat conftest.err >&5 52838- echo "$as_me:$LINENO: \$? = $ac_status" >&5 52839- (exit $ac_status); } && 52840- { ac_try='test -z "$ac_c_werror_flag" 52841- || test ! -s conftest.err' 52842- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 52843- (eval $ac_try) 2>&5 52844- ac_status=$? 52845- echo "$as_me:$LINENO: \$? = $ac_status" >&5 52846- (exit $ac_status); }; } && 52847- { ac_try='test -s conftest$ac_exeext' 52848- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 52849- (eval $ac_try) 2>&5 52850- ac_status=$? 52851- echo "$as_me:$LINENO: \$? = $ac_status" >&5 52852- (exit $ac_status); }; }; then 52853- ac_cv_lib_enchant_enchant_broker_set_param=yes 52854-else 52855- echo "$as_me: failed program was:" >&5 52856-sed 's/^/| /' conftest.$ac_ext >&5 52857- 52858-ac_cv_lib_enchant_enchant_broker_set_param=no 52859-fi 52860-rm -f conftest.err conftest.$ac_objext \ 52861- conftest$ac_exeext conftest.$ac_ext 52862-LIBS=$ac_check_lib_save_LIBS 52863-fi 52864-echo "$as_me:$LINENO: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5 52865-echo "${ECHO_T}$ac_cv_lib_enchant_enchant_broker_set_param" >&6 52866-if test $ac_cv_lib_enchant_enchant_broker_set_param = yes; then 52867+ builtin and then its argument prototype would still apply. */ 52868+char enchant_broker_set_param(); 52869+ 52870+int main() { 52871+enchant_broker_set_param() 52872+; return 0; } 52873+EOF 52874+if { (eval echo configure:33600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 52875+ rm -rf conftest* 52876+ eval "ac_cv_lib_$ac_lib_var=yes" 52877+else 52878+ echo "configure: failed program was:" >&5 52879+ cat conftest.$ac_ext >&5 52880+ rm -rf conftest* 52881+ eval "ac_cv_lib_$ac_lib_var=no" 52882+fi 52883+rm -f conftest* 52884+LIBS="$ac_save_LIBS" 52885 52886+fi 52887+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 52888+ echo "$ac_t""yes" 1>&6 52889+ 52890 LDFLAGS=$save_old_LDFLAGS 52891 ext_shared=$save_ext_shared 52892- 52893- 52894-cat >>confdefs.h <<\_ACEOF 52895+ 52896+ cat >> confdefs.h <<\EOF 52897 #define HAVE_ENCHANT_BROKER_SET_PARAM 1 52898-_ACEOF 52899- 52900+EOF 52901 52902-cat >>confdefs.h <<\_ACEOF 52903+ cat >> confdefs.h <<\EOF 52904 #define ENCHANT_VERSION_STRING "1.5.x" 52905-_ACEOF 52906- 52907- 52908+EOF 52909 52910+ 52911+ 52912 else 52913+ echo "$ac_t""no" 1>&6 52914 52915 LDFLAGS=$save_old_LDFLAGS 52916 ext_shared=$save_ext_shared 52917 unset ac_cv_lib_enchant_enchant_broker_set_param 52918- 52919- 52920+ 52921+ 52922 fi 52923 52924 52925@@ -45861,18 +33642,19 @@ 52926 52927 php_enable_exif=no 52928 52929-echo "$as_me:$LINENO: checking whether to enable EXIF (metadata from images) support" >&5 52930-echo $ECHO_N "checking whether to enable EXIF (metadata from images) support... $ECHO_C" >&6 52931+echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 52932+echo "configure:33647: checking whether to enable EXIF (metadata from images) support" >&5 52933 # Check whether --enable-exif or --disable-exif was given. 52934 if test "${enable_exif+set}" = set; then 52935 enableval="$enable_exif" 52936 PHP_EXIF=$enableval 52937 else 52938- 52939+ 52940 PHP_EXIF=no 52941 test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL 52942 52943-fi; 52944+fi 52945+ 52946 52947 52948 ext_output="yes, shared" 52949@@ -45896,19 +33678,17 @@ 52950 52951 52952 52953-echo "$as_me:$LINENO: result: $ext_output" >&5 52954-echo "${ECHO_T}$ext_output" >&6 52955+echo "$ac_t""$ext_output" 1>&6 52956 52957 52958 52959 52960 if test "$PHP_EXIF" != "no"; then 52961- 52962-cat >>confdefs.h <<\_ACEOF 52963+ cat >> confdefs.h <<\EOF 52964 #define HAVE_EXIF 1 52965-_ACEOF 52966- 52967+EOF 52968 52969+ 52970 ext_builddir=ext/exif 52971 ext_srcdir=$abs_srcdir/ext/exif 52972 52973@@ -45916,15 +33696,15 @@ 52974 52975 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 52976 PHP_EXIF_SHARED=no 52977- 52978- 52979+ 52980+ 52981 case ext/exif in 52982 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 52983 /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 52984 *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 52985 esac 52986- 52987- 52988+ 52989+ 52990 52991 b_c_pre=$php_c_pre 52992 b_cxx_pre=$php_cxx_pre 52993@@ -45937,12 +33717,12 @@ 52994 52995 old_IFS=$IFS 52996 for ac_src in exif.c; do 52997- 52998+ 52999 IFS=. 53000 set $ac_src 53001 ac_obj=$1 53002 IFS=$old_IFS 53003- 53004+ 53005 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53006 53007 case $ac_src in 53008@@ -45966,14 +33746,14 @@ 53009 else 53010 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 53011 PHP_EXIF_SHARED=yes 53012- 53013+ 53014 case ext/exif in 53015 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53016 /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53017 *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53018 esac 53019- 53020- 53021+ 53022+ 53023 53024 b_c_pre=$shared_c_pre 53025 b_cxx_pre=$shared_cxx_pre 53026@@ -45986,12 +33766,12 @@ 53027 53028 old_IFS=$IFS 53029 for ac_src in exif.c; do 53030- 53031+ 53032 IFS=. 53033 set $ac_src 53034 ac_obj=$1 53035 IFS=$old_IFS 53036- 53037+ 53038 shared_objects_exif="$shared_objects_exif $ac_bdir$ac_obj.lo" 53039 53040 case $ac_src in 53041@@ -46009,7 +33789,7 @@ 53042 53043 case $host_alias in 53044 *netware*) 53045- 53046+ 53047 install_modules="install-modules" 53048 53049 case $host_alias in 53050@@ -46019,7 +33799,7 @@ 53051 ;; 53052 *netware*) 53053 suffix=nlm 53054- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(EXIF_SHARED_LIBADD)' 53055+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPEXIF, 3)_SHARED_LIBADD)' 53056 ;; 53057 *) 53058 suffix=la 53059@@ -46032,7 +33812,7 @@ 53060 else 53061 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpexif.$suffix" 53062 fi 53063- 53064+ 53065 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_exif" 53066 53067 cat >>Makefile.objects<<EOF 53068@@ -46046,7 +33826,7 @@ 53069 53070 ;; 53071 *) 53072- 53073+ 53074 install_modules="install-modules" 53075 53076 case $host_alias in 53077@@ -46056,7 +33836,7 @@ 53078 ;; 53079 *netware*) 53080 suffix=nlm 53081- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(F_SHARED_LIBADD)' 53082+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_exif) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(EXIF, 3)_SHARED_LIBADD)' 53083 ;; 53084 *) 53085 suffix=la 53086@@ -46069,7 +33849,7 @@ 53087 else 53088 PHP_MODULES="$PHP_MODULES \$(phplibdir)/exif.$suffix" 53089 fi 53090- 53091+ 53092 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_exif" 53093 53094 cat >>Makefile.objects<<EOF 53095@@ -46083,10 +33863,9 @@ 53096 53097 ;; 53098 esac 53099- 53100-cat >>confdefs.h <<_ACEOF 53101+ cat >> confdefs.h <<EOF 53102 #define COMPILE_DL_EXIF 1 53103-_ACEOF 53104+EOF 53105 53106 fi 53107 fi 53108@@ -46095,15 +33874,15 @@ 53109 PHP_EXIF_SHARED=no 53110 case "$PHP_SAPI" in 53111 cgi|embed) 53112- 53113- 53114+ 53115+ 53116 case ext/exif in 53117 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53118 /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53119 *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53120 esac 53121- 53122- 53123+ 53124+ 53125 53126 b_c_pre=$php_c_pre 53127 b_cxx_pre=$php_cxx_pre 53128@@ -46116,12 +33895,12 @@ 53129 53130 old_IFS=$IFS 53131 for ac_src in exif.c; do 53132- 53133+ 53134 IFS=. 53135 set $ac_src 53136 ac_obj=$1 53137 IFS=$old_IFS 53138- 53139+ 53140 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53141 53142 case $ac_src in 53143@@ -46141,15 +33920,15 @@ 53144 EXT_STATIC="$EXT_STATIC exif" 53145 ;; 53146 *) 53147- 53148- 53149+ 53150+ 53151 case ext/exif in 53152 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53153 /*) ac_srcdir=`echo "ext/exif"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53154 *) ac_srcdir="$abs_srcdir/ext/exif/"; ac_bdir="ext/exif/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53155 esac 53156- 53157- 53158+ 53159+ 53160 53161 b_c_pre=$php_c_pre 53162 b_cxx_pre=$php_cxx_pre 53163@@ -46162,13 +33941,13 @@ 53164 53165 old_IFS=$IFS 53166 for ac_src in exif.c; do 53167- 53168+ 53169 IFS=. 53170 set $ac_src 53171 ac_obj=$1 53172 IFS=$old_IFS 53173- 53174- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 53175+ 53176+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53177 53178 case $ac_src in 53179 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 53180@@ -46188,15 +33967,15 @@ 53181 esac 53182 EXT_CLI_STATIC="$EXT_CLI_STATIC exif" 53183 fi 53184- 53185- 53186+ 53187+ 53188 BUILD_DIR="$BUILD_DIR $ext_builddir" 53189- 53190+ 53191 53192 53193 if test "$ext_builddir" = "."; then 53194 PHP_PECL_EXTENSION=exif 53195- 53196+ 53197 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 53198 53199 fi 53200@@ -46207,18 +33986,19 @@ 53201 53202 php_enable_fileinfo=yes 53203 53204-echo "$as_me:$LINENO: checking for fileinfo support" >&5 53205-echo $ECHO_N "checking for fileinfo support... $ECHO_C" >&6 53206+echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 53207+echo "configure:33991: checking for fileinfo support" >&5 53208 # Check whether --enable-fileinfo or --disable-fileinfo was given. 53209 if test "${enable_fileinfo+set}" = set; then 53210 enableval="$enable_fileinfo" 53211 PHP_FILEINFO=$enableval 53212 else 53213- 53214+ 53215 PHP_FILEINFO=yes 53216 test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL 53217 53218-fi; 53219+fi 53220+ 53221 53222 53223 ext_output="yes, shared" 53224@@ -46242,8 +34022,7 @@ 53225 53226 53227 53228-echo "$as_me:$LINENO: result: $ext_output" >&5 53229-echo "${ECHO_T}$ext_output" >&6 53230+echo "$ac_t""$ext_output" 1>&6 53231 53232 53233 53234@@ -46257,7 +34036,7 @@ 53235 libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ 53236 libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" 53237 53238- 53239+ 53240 ext_builddir=ext/fileinfo 53241 ext_srcdir=$abs_srcdir/ext/fileinfo 53242 53243@@ -46265,15 +34044,15 @@ 53244 53245 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 53246 PHP_FILEINFO_SHARED=no 53247- 53248- 53249+ 53250+ 53251 case ext/fileinfo in 53252 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53253 /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53254 *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53255 esac 53256- 53257- 53258+ 53259+ 53260 53261 b_c_pre=$php_c_pre 53262 b_cxx_pre=$php_cxx_pre 53263@@ -46286,12 +34065,12 @@ 53264 53265 old_IFS=$IFS 53266 for ac_src in fileinfo.c $libmagic_sources; do 53267- 53268+ 53269 IFS=. 53270 set $ac_src 53271 ac_obj=$1 53272 IFS=$old_IFS 53273- 53274+ 53275 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53276 53277 case $ac_src in 53278@@ -46315,14 +34094,14 @@ 53279 else 53280 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 53281 PHP_FILEINFO_SHARED=yes 53282- 53283+ 53284 case ext/fileinfo in 53285 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53286 /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53287 *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53288 esac 53289- 53290- 53291+ 53292+ 53293 53294 b_c_pre=$shared_c_pre 53295 b_cxx_pre=$shared_cxx_pre 53296@@ -46335,12 +34114,12 @@ 53297 53298 old_IFS=$IFS 53299 for ac_src in fileinfo.c $libmagic_sources; do 53300- 53301+ 53302 IFS=. 53303 set $ac_src 53304 ac_obj=$1 53305 IFS=$old_IFS 53306- 53307+ 53308 shared_objects_fileinfo="$shared_objects_fileinfo $ac_bdir$ac_obj.lo" 53309 53310 case $ac_src in 53311@@ -46358,7 +34137,7 @@ 53312 53313 case $host_alias in 53314 *netware*) 53315- 53316+ 53317 install_modules="install-modules" 53318 53319 case $host_alias in 53320@@ -46368,7 +34147,7 @@ 53321 ;; 53322 *netware*) 53323 suffix=nlm 53324- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(FILEINFO_SHARED_LIBADD)' 53325+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILEINFO, 3)_SHARED_LIBADD)' 53326 ;; 53327 *) 53328 suffix=la 53329@@ -46381,7 +34160,7 @@ 53330 else 53331 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfileinfo.$suffix" 53332 fi 53333- 53334+ 53335 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_fileinfo" 53336 53337 cat >>Makefile.objects<<EOF 53338@@ -46395,7 +34174,7 @@ 53339 53340 ;; 53341 *) 53342- 53343+ 53344 install_modules="install-modules" 53345 53346 case $host_alias in 53347@@ -46405,7 +34184,7 @@ 53348 ;; 53349 *netware*) 53350 suffix=nlm 53351- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(EINFO_SHARED_LIBADD)' 53352+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_fileinfo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FILEINFO, 3)_SHARED_LIBADD)' 53353 ;; 53354 *) 53355 suffix=la 53356@@ -46418,7 +34197,7 @@ 53357 else 53358 PHP_MODULES="$PHP_MODULES \$(phplibdir)/fileinfo.$suffix" 53359 fi 53360- 53361+ 53362 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_fileinfo" 53363 53364 cat >>Makefile.objects<<EOF 53365@@ -46432,10 +34211,9 @@ 53366 53367 ;; 53368 esac 53369- 53370-cat >>confdefs.h <<_ACEOF 53371+ cat >> confdefs.h <<EOF 53372 #define COMPILE_DL_FILEINFO 1 53373-_ACEOF 53374+EOF 53375 53376 fi 53377 fi 53378@@ -46444,15 +34222,15 @@ 53379 PHP_FILEINFO_SHARED=no 53380 case "$PHP_SAPI" in 53381 cgi|embed) 53382- 53383- 53384+ 53385+ 53386 case ext/fileinfo in 53387 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53388 /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53389 *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53390 esac 53391- 53392- 53393+ 53394+ 53395 53396 b_c_pre=$php_c_pre 53397 b_cxx_pre=$php_cxx_pre 53398@@ -46465,12 +34243,12 @@ 53399 53400 old_IFS=$IFS 53401 for ac_src in fileinfo.c $libmagic_sources; do 53402- 53403+ 53404 IFS=. 53405 set $ac_src 53406 ac_obj=$1 53407 IFS=$old_IFS 53408- 53409+ 53410 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53411 53412 case $ac_src in 53413@@ -46490,15 +34268,15 @@ 53414 EXT_STATIC="$EXT_STATIC fileinfo" 53415 ;; 53416 *) 53417- 53418- 53419+ 53420+ 53421 case ext/fileinfo in 53422 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53423 /*) ac_srcdir=`echo "ext/fileinfo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53424 *) ac_srcdir="$abs_srcdir/ext/fileinfo/"; ac_bdir="ext/fileinfo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53425 esac 53426- 53427- 53428+ 53429+ 53430 53431 b_c_pre=$php_c_pre 53432 b_cxx_pre=$php_cxx_pre 53433@@ -46511,13 +34289,13 @@ 53434 53435 old_IFS=$IFS 53436 for ac_src in fileinfo.c $libmagic_sources; do 53437- 53438+ 53439 IFS=. 53440 set $ac_src 53441 ac_obj=$1 53442 IFS=$old_IFS 53443- 53444- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 53445+ 53446+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53447 53448 case $ac_src in 53449 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 53450@@ -46537,130 +34315,82 @@ 53451 esac 53452 EXT_CLI_STATIC="$EXT_CLI_STATIC fileinfo" 53453 fi 53454- 53455- 53456+ 53457+ 53458 BUILD_DIR="$BUILD_DIR $ext_builddir" 53459- 53460+ 53461 53462 53463 if test "$ext_builddir" = "."; then 53464 PHP_PECL_EXTENSION=fileinfo 53465- 53466+ 53467 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 53468 53469 fi 53470 53471- 53472- 53473+ 53474+ 53475 BUILD_DIR="$BUILD_DIR $ext_builddir/libmagic" 53476+ 53477 53478 53479- 53480- 53481- 53482-for ac_func in utimes strndup 53483+ for ac_func in utimes strndup 53484 do 53485-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 53486-echo "$as_me:$LINENO: checking for $ac_func" >&5 53487-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 53488-if eval "test \"\${$as_ac_var+set}\" = set"; then 53489- echo $ECHO_N "(cached) $ECHO_C" >&6 53490-else 53491- cat >conftest.$ac_ext <<_ACEOF 53492-/* confdefs.h. */ 53493-_ACEOF 53494-cat confdefs.h >>conftest.$ac_ext 53495-cat >>conftest.$ac_ext <<_ACEOF 53496-/* end confdefs.h. */ 53497-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 53498- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 53499-#define $ac_func innocuous_$ac_func 53500- 53501+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 53502+echo "configure:34341: checking for $ac_func" >&5 53503+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 53504+ echo $ac_n "(cached) $ac_c" 1>&6 53505+else 53506+ cat > conftest.$ac_ext <<EOF 53507+#line 34346 "configure" 53508+#include "confdefs.h" 53509 /* System header to define __stub macros and hopefully few prototypes, 53510- which can conflict with char $ac_func (); below. 53511- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 53512- <limits.h> exists even on freestanding compilers. */ 53513- 53514-#ifdef __STDC__ 53515-# include <limits.h> 53516-#else 53517-# include <assert.h> 53518-#endif 53519- 53520-#undef $ac_func 53521- 53522+ which can conflict with char $ac_func(); below. */ 53523+#include <assert.h> 53524 /* Override any gcc2 internal prototype to avoid an error. */ 53525-#ifdef __cplusplus 53526-extern "C" 53527-{ 53528-#endif 53529 /* We use char because int might match the return type of a gcc2 53530- builtin and then its argument prototype would still apply. */ 53531-char $ac_func (); 53532+ builtin and then its argument prototype would still apply. */ 53533+char $ac_func(); 53534+ 53535+int main() { 53536+ 53537 /* The GNU C library defines this for functions which it implements 53538 to always fail with ENOSYS. Some functions are actually named 53539 something starting with __ and the normal name is an alias. */ 53540 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 53541 choke me 53542 #else 53543-char (*f) () = $ac_func; 53544-#endif 53545-#ifdef __cplusplus 53546-} 53547+$ac_func(); 53548 #endif 53549 53550-int 53551-main () 53552-{ 53553-return f != $ac_func; 53554- ; 53555- return 0; 53556-} 53557-_ACEOF 53558-rm -f conftest.$ac_objext conftest$ac_exeext 53559-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 53560- (eval $ac_link) 2>conftest.er1 53561- ac_status=$? 53562- grep -v '^ *+' conftest.er1 >conftest.err 53563- rm -f conftest.er1 53564- cat conftest.err >&5 53565- echo "$as_me:$LINENO: \$? = $ac_status" >&5 53566- (exit $ac_status); } && 53567- { ac_try='test -z "$ac_c_werror_flag" 53568- || test ! -s conftest.err' 53569- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 53570- (eval $ac_try) 2>&5 53571- ac_status=$? 53572- echo "$as_me:$LINENO: \$? = $ac_status" >&5 53573- (exit $ac_status); }; } && 53574- { ac_try='test -s conftest$ac_exeext' 53575- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 53576- (eval $ac_try) 2>&5 53577- ac_status=$? 53578- echo "$as_me:$LINENO: \$? = $ac_status" >&5 53579- (exit $ac_status); }; }; then 53580- eval "$as_ac_var=yes" 53581-else 53582- echo "$as_me: failed program was:" >&5 53583-sed 's/^/| /' conftest.$ac_ext >&5 53584- 53585-eval "$as_ac_var=no" 53586-fi 53587-rm -f conftest.err conftest.$ac_objext \ 53588- conftest$ac_exeext conftest.$ac_ext 53589-fi 53590-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 53591-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 53592-if test `eval echo '${'$as_ac_var'}'` = yes; then 53593- cat >>confdefs.h <<_ACEOF 53594-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 53595-_ACEOF 53596+; return 0; } 53597+EOF 53598+if { (eval echo configure:34369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 53599+ rm -rf conftest* 53600+ eval "ac_cv_func_$ac_func=yes" 53601+else 53602+ echo "configure: failed program was:" >&5 53603+ cat conftest.$ac_ext >&5 53604+ rm -rf conftest* 53605+ eval "ac_cv_func_$ac_func=no" 53606+fi 53607+rm -f conftest* 53608+fi 53609 53610+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 53611+ echo "$ac_t""yes" 1>&6 53612+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 53613+ cat >> confdefs.h <<EOF 53614+#define $ac_tr_func 1 53615+EOF 53616+ 53617+else 53618+ echo "$ac_t""no" 1>&6 53619 fi 53620 done 53621 53622 53623- 53624+ 53625 src=$ext_srcdir/Makefile.frag 53626 ac_srcdir=$ext_srcdir 53627 ac_builddir=$ext_builddir 53628@@ -46672,18 +34402,19 @@ 53629 53630 php_enable_filter=yes 53631 53632-echo "$as_me:$LINENO: checking whether to enable input filter support" >&5 53633-echo $ECHO_N "checking whether to enable input filter support... $ECHO_C" >&6 53634+echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 53635+echo "configure:34407: checking whether to enable input filter support" >&5 53636 # Check whether --enable-filter or --disable-filter was given. 53637 if test "${enable_filter+set}" = set; then 53638 enableval="$enable_filter" 53639 PHP_FILTER=$enableval 53640 else 53641- 53642+ 53643 PHP_FILTER=yes 53644 test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL 53645 53646-fi; 53647+fi 53648+ 53649 53650 53651 ext_output="yes, shared" 53652@@ -46707,8 +34438,7 @@ 53653 53654 53655 53656-echo "$as_me:$LINENO: result: $ext_output" >&5 53657-echo "${ECHO_T}$ext_output" >&6 53658+echo "$ac_t""$ext_output" 1>&6 53659 53660 53661 53662@@ -46716,23 +34446,22 @@ 53663 53664 php_with_pcre_dir=no 53665 53666-echo "$as_me:$LINENO: checking pcre install prefix" >&5 53667-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6 53668- 53669+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 53670+echo "configure:34451: checking pcre install prefix" >&5 53671 # Check whether --with-pcre-dir or --without-pcre-dir was given. 53672 if test "${with_pcre_dir+set}" = set; then 53673 withval="$with_pcre_dir" 53674 PHP_PCRE_DIR=$withval 53675 else 53676- 53677+ 53678 PHP_PCRE_DIR=no 53679+ 53680 53681+fi 53682 53683-fi; 53684 53685 ext_output=$PHP_PCRE_DIR 53686-echo "$as_me:$LINENO: result: $ext_output" >&5 53687-echo "${ECHO_T}$ext_output" >&6 53688+echo "$ac_t""$ext_output" 1>&6 53689 53690 53691 53692@@ -46744,59 +34473,57 @@ 53693 else 53694 old_CPPFLAGS=$CPPFLAGS 53695 CPPFLAGS=$INCLUDES 53696- cat >conftest.$ac_ext <<_ACEOF 53697-/* confdefs.h. */ 53698-_ACEOF 53699-cat confdefs.h >>conftest.$ac_ext 53700-cat >>conftest.$ac_ext <<_ACEOF 53701-/* end confdefs.h. */ 53702+ cat > conftest.$ac_ext <<EOF 53703+#line 34478 "configure" 53704+#include "confdefs.h" 53705 53706 #include <main/php_config.h> 53707 #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) 53708 yes 53709 #endif 53710- 53711-_ACEOF 53712+ 53713+EOF 53714 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 53715- $EGREP "yes" >/dev/null 2>&1; then 53716- 53717+ egrep "yes" >/dev/null 2>&1; then 53718+ rm -rf conftest* 53719+ 53720 PHP_PCRE_REGEX=yes 53721- 53722+ 53723 else 53724- 53725- cat >conftest.$ac_ext <<_ACEOF 53726-/* confdefs.h. */ 53727-_ACEOF 53728-cat confdefs.h >>conftest.$ac_ext 53729-cat >>conftest.$ac_ext <<_ACEOF 53730-/* end confdefs.h. */ 53731+ rm -rf conftest* 53732+ 53733+ cat > conftest.$ac_ext <<EOF 53734+#line 34497 "configure" 53735+#include "confdefs.h" 53736 53737 #include <main/php_config.h> 53738 #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) 53739 yes 53740 #endif 53741- 53742-_ACEOF 53743+ 53744+EOF 53745 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 53746- $EGREP "yes" >/dev/null 2>&1; then 53747- 53748+ egrep "yes" >/dev/null 2>&1; then 53749+ rm -rf conftest* 53750+ 53751 PHP_PCRE_REGEX=pecl 53752- 53753+ 53754 else 53755- 53756+ rm -rf conftest* 53757+ 53758 PHP_PCRE_REGEX=no 53759- 53760+ 53761 fi 53762 rm -f conftest* 53763 53764- 53765+ 53766 fi 53767 rm -f conftest* 53768 53769 CPPFLAGS=$old_CPPFLAGS 53770 fi 53771 53772- 53773+ 53774 ext_builddir=ext/filter 53775 ext_srcdir=$abs_srcdir/ext/filter 53776 53777@@ -46804,15 +34531,15 @@ 53778 53779 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 53780 PHP_FILTER_SHARED=no 53781- 53782- 53783+ 53784+ 53785 case ext/filter in 53786 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53787 /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53788 *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53789 esac 53790- 53791- 53792+ 53793+ 53794 53795 b_c_pre=$php_c_pre 53796 b_cxx_pre=$php_cxx_pre 53797@@ -46825,12 +34552,12 @@ 53798 53799 old_IFS=$IFS 53800 for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do 53801- 53802+ 53803 IFS=. 53804 set $ac_src 53805 ac_obj=$1 53806 IFS=$old_IFS 53807- 53808+ 53809 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53810 53811 case $ac_src in 53812@@ -46854,14 +34581,14 @@ 53813 else 53814 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 53815 PHP_FILTER_SHARED=yes 53816- 53817+ 53818 case ext/filter in 53819 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53820 /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53821 *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53822 esac 53823- 53824- 53825+ 53826+ 53827 53828 b_c_pre=$shared_c_pre 53829 b_cxx_pre=$shared_cxx_pre 53830@@ -46874,12 +34601,12 @@ 53831 53832 old_IFS=$IFS 53833 for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do 53834- 53835+ 53836 IFS=. 53837 set $ac_src 53838 ac_obj=$1 53839 IFS=$old_IFS 53840- 53841+ 53842 shared_objects_filter="$shared_objects_filter $ac_bdir$ac_obj.lo" 53843 53844 case $ac_src in 53845@@ -46897,7 +34624,7 @@ 53846 53847 case $host_alias in 53848 *netware*) 53849- 53850+ 53851 install_modules="install-modules" 53852 53853 case $host_alias in 53854@@ -46907,7 +34634,7 @@ 53855 ;; 53856 *netware*) 53857 suffix=nlm 53858- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(FILTER_SHARED_LIBADD)' 53859+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFILTER, 3)_SHARED_LIBADD)' 53860 ;; 53861 *) 53862 suffix=la 53863@@ -46920,7 +34647,7 @@ 53864 else 53865 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpfilter.$suffix" 53866 fi 53867- 53868+ 53869 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_filter" 53870 53871 cat >>Makefile.objects<<EOF 53872@@ -46934,7 +34661,7 @@ 53873 53874 ;; 53875 *) 53876- 53877+ 53878 install_modules="install-modules" 53879 53880 case $host_alias in 53881@@ -46944,7 +34671,7 @@ 53882 ;; 53883 *netware*) 53884 suffix=nlm 53885- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(TER_SHARED_LIBADD)' 53886+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_filter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FILTER, 3)_SHARED_LIBADD)' 53887 ;; 53888 *) 53889 suffix=la 53890@@ -46957,7 +34684,7 @@ 53891 else 53892 PHP_MODULES="$PHP_MODULES \$(phplibdir)/filter.$suffix" 53893 fi 53894- 53895+ 53896 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_filter" 53897 53898 cat >>Makefile.objects<<EOF 53899@@ -46971,10 +34698,9 @@ 53900 53901 ;; 53902 esac 53903- 53904-cat >>confdefs.h <<_ACEOF 53905+ cat >> confdefs.h <<EOF 53906 #define COMPILE_DL_FILTER 1 53907-_ACEOF 53908+EOF 53909 53910 fi 53911 fi 53912@@ -46983,15 +34709,15 @@ 53913 PHP_FILTER_SHARED=no 53914 case "$PHP_SAPI" in 53915 cgi|embed) 53916- 53917- 53918+ 53919+ 53920 case ext/filter in 53921 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53922 /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53923 *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53924 esac 53925- 53926- 53927+ 53928+ 53929 53930 b_c_pre=$php_c_pre 53931 b_cxx_pre=$php_cxx_pre 53932@@ -47004,12 +34730,12 @@ 53933 53934 old_IFS=$IFS 53935 for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do 53936- 53937+ 53938 IFS=. 53939 set $ac_src 53940 ac_obj=$1 53941 IFS=$old_IFS 53942- 53943+ 53944 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53945 53946 case $ac_src in 53947@@ -47029,15 +34755,15 @@ 53948 EXT_STATIC="$EXT_STATIC filter" 53949 ;; 53950 *) 53951- 53952- 53953+ 53954+ 53955 case ext/filter in 53956 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 53957 /*) ac_srcdir=`echo "ext/filter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 53958 *) ac_srcdir="$abs_srcdir/ext/filter/"; ac_bdir="ext/filter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 53959 esac 53960- 53961- 53962+ 53963+ 53964 53965 b_c_pre=$php_c_pre 53966 b_cxx_pre=$php_cxx_pre 53967@@ -47050,13 +34776,13 @@ 53968 53969 old_IFS=$IFS 53970 for ac_src in filter.c sanitizing_filters.c logical_filters.c callback_filter.c; do 53971- 53972+ 53973 IFS=. 53974 set $ac_src 53975 ac_obj=$1 53976 IFS=$old_IFS 53977- 53978- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 53979+ 53980+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 53981 53982 case $ac_src in 53983 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 53984@@ -47076,90 +34802,79 @@ 53985 esac 53986 EXT_CLI_STATIC="$EXT_CLI_STATIC filter" 53987 fi 53988- 53989- 53990+ 53991+ 53992 BUILD_DIR="$BUILD_DIR $ext_builddir" 53993- 53994+ 53995 53996 53997 if test "$ext_builddir" = "."; then 53998 PHP_PECL_EXTENSION=filter 53999- 54000+ 54001 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 54002 54003 fi 54004 54005- 54006+ 54007 PHP_VAR_SUBST="$PHP_VAR_SUBST FILTER_SHARED_LIBADD" 54008 54009 54010- 54011- 54012+ 54013+ 54014 for header_file in ext/filter/php_filter.h; do 54015- 54016- 54017+ 54018+ 54019 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 54020- 54021+ 54022 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 54023 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54024 eval "INSTALLHEADERS$unique=set" 54025- 54026+ 54027 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 54028- 54029+ 54030 fi 54031 54032- done 54033- 54034- 54035+ done 54036+ 54037 54038+ 54039 am_i_shared=$PHP_FILTER_SHARED 54040 is_it_shared=$PHP_PCRE_SHARED 54041 is_it_enabled=$PHP_PCRE 54042 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 54043- { { echo "$as_me:$LINENO: error: 54044-You've configured extension filter to build statically, but it 54045-depends on extension pcre, which you've configured to build shared. 54046-You either need to build filter shared or build pcre statically for the 54047-build to be successful. 54048-" >&5 54049-echo "$as_me: error: 54050+ { echo "configure: error: 54051 You've configured extension filter to build statically, but it 54052 depends on extension pcre, which you've configured to build shared. 54053 You either need to build filter shared or build pcre statically for the 54054 build to be successful. 54055-" >&2;} 54056- { (exit 1); exit 1; }; } 54057+" 1>&2; exit 1; } 54058 fi 54059 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 54060- { { echo "$as_me:$LINENO: error: 54061-You've configured extension filter, which depends on extension pcre, 54062-but you've either not enabled pcre, or have disabled it. 54063-" >&5 54064-echo "$as_me: error: 54065+ { echo "configure: error: 54066 You've configured extension filter, which depends on extension pcre, 54067 but you've either not enabled pcre, or have disabled it. 54068-" >&2;} 54069- { (exit 1); exit 1; }; } 54070+" 1>&2; exit 1; } 54071 fi 54072- 54073+ 54074 fi 54075 54076 54077 54078 php_enable_ftp=no 54079 54080-echo "$as_me:$LINENO: checking whether to enable FTP support" >&5 54081-echo $ECHO_N "checking whether to enable FTP support... $ECHO_C" >&6 54082+echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 54083+echo "configure:34867: checking whether to enable FTP support" >&5 54084 # Check whether --enable-ftp or --disable-ftp was given. 54085 if test "${enable_ftp+set}" = set; then 54086 enableval="$enable_ftp" 54087 PHP_FTP=$enableval 54088 else 54089- 54090+ 54091 PHP_FTP=no 54092 test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL 54093 54094-fi; 54095+fi 54096+ 54097 54098 54099 ext_output="yes, shared" 54100@@ -47183,8 +34898,7 @@ 54101 54102 54103 54104-echo "$as_me:$LINENO: result: $ext_output" >&5 54105-echo "${ECHO_T}$ext_output" >&6 54106+echo "$ac_t""$ext_output" 1>&6 54107 54108 54109 54110@@ -47192,34 +34906,32 @@ 54111 54112 php_with_openssl_dir=no 54113 54114-echo "$as_me:$LINENO: checking OpenSSL dir for FTP" >&5 54115-echo $ECHO_N "checking OpenSSL dir for FTP... $ECHO_C" >&6 54116- 54117+echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 54118+echo "configure:34911: checking OpenSSL dir for FTP" >&5 54119 # Check whether --with-openssl-dir or --without-openssl-dir was given. 54120 if test "${with_openssl_dir+set}" = set; then 54121 withval="$with_openssl_dir" 54122 PHP_OPENSSL_DIR=$withval 54123 else 54124- 54125+ 54126 PHP_OPENSSL_DIR=no 54127+ 54128 54129+fi 54130 54131-fi; 54132 54133 ext_output=$PHP_OPENSSL_DIR 54134-echo "$as_me:$LINENO: result: $ext_output" >&5 54135-echo "${ECHO_T}$ext_output" >&6 54136+echo "$ac_t""$ext_output" 1>&6 54137 54138 54139 54140 54141 if test "$PHP_FTP" = "yes"; then 54142- 54143-cat >>confdefs.h <<\_ACEOF 54144+ cat >> confdefs.h <<\EOF 54145 #define HAVE_FTP 1 54146-_ACEOF 54147- 54148+EOF 54149 54150+ 54151 ext_builddir=ext/ftp 54152 ext_srcdir=$abs_srcdir/ext/ftp 54153 54154@@ -47227,15 +34939,15 @@ 54155 54156 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 54157 PHP_FTP_SHARED=no 54158- 54159- 54160+ 54161+ 54162 case ext/ftp in 54163 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 54164 /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 54165 *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 54166 esac 54167- 54168- 54169+ 54170+ 54171 54172 b_c_pre=$php_c_pre 54173 b_cxx_pre=$php_cxx_pre 54174@@ -47248,12 +34960,12 @@ 54175 54176 old_IFS=$IFS 54177 for ac_src in php_ftp.c ftp.c; do 54178- 54179+ 54180 IFS=. 54181 set $ac_src 54182 ac_obj=$1 54183 IFS=$old_IFS 54184- 54185+ 54186 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 54187 54188 case $ac_src in 54189@@ -47277,14 +34989,14 @@ 54190 else 54191 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 54192 PHP_FTP_SHARED=yes 54193- 54194+ 54195 case ext/ftp in 54196 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 54197 /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 54198 *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 54199 esac 54200- 54201- 54202+ 54203+ 54204 54205 b_c_pre=$shared_c_pre 54206 b_cxx_pre=$shared_cxx_pre 54207@@ -47297,12 +35009,12 @@ 54208 54209 old_IFS=$IFS 54210 for ac_src in php_ftp.c ftp.c; do 54211- 54212+ 54213 IFS=. 54214 set $ac_src 54215 ac_obj=$1 54216 IFS=$old_IFS 54217- 54218+ 54219 shared_objects_ftp="$shared_objects_ftp $ac_bdir$ac_obj.lo" 54220 54221 case $ac_src in 54222@@ -47320,7 +35032,7 @@ 54223 54224 case $host_alias in 54225 *netware*) 54226- 54227+ 54228 install_modules="install-modules" 54229 54230 case $host_alias in 54231@@ -47330,7 +35042,7 @@ 54232 ;; 54233 *netware*) 54234 suffix=nlm 54235- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(FTP_SHARED_LIBADD)' 54236+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPFTP, 3)_SHARED_LIBADD)' 54237 ;; 54238 *) 54239 suffix=la 54240@@ -47343,7 +35055,7 @@ 54241 else 54242 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpftp.$suffix" 54243 fi 54244- 54245+ 54246 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ftp" 54247 54248 cat >>Makefile.objects<<EOF 54249@@ -47357,7 +35069,7 @@ 54250 54251 ;; 54252 *) 54253- 54254+ 54255 install_modules="install-modules" 54256 54257 case $host_alias in 54258@@ -47367,7 +35079,7 @@ 54259 ;; 54260 *netware*) 54261 suffix=nlm 54262- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 54263+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ftp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(FTP, 3)_SHARED_LIBADD)' 54264 ;; 54265 *) 54266 suffix=la 54267@@ -47380,7 +35092,7 @@ 54268 else 54269 PHP_MODULES="$PHP_MODULES \$(phplibdir)/ftp.$suffix" 54270 fi 54271- 54272+ 54273 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ftp" 54274 54275 cat >>Makefile.objects<<EOF 54276@@ -47394,10 +35106,9 @@ 54277 54278 ;; 54279 esac 54280- 54281-cat >>confdefs.h <<_ACEOF 54282+ cat >> confdefs.h <<EOF 54283 #define COMPILE_DL_FTP 1 54284-_ACEOF 54285+EOF 54286 54287 fi 54288 fi 54289@@ -47406,15 +35117,15 @@ 54290 PHP_FTP_SHARED=no 54291 case "$PHP_SAPI" in 54292 cgi|embed) 54293- 54294- 54295+ 54296+ 54297 case ext/ftp in 54298 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 54299 /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 54300 *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 54301 esac 54302- 54303- 54304+ 54305+ 54306 54307 b_c_pre=$php_c_pre 54308 b_cxx_pre=$php_cxx_pre 54309@@ -47427,12 +35138,12 @@ 54310 54311 old_IFS=$IFS 54312 for ac_src in php_ftp.c ftp.c; do 54313- 54314+ 54315 IFS=. 54316 set $ac_src 54317 ac_obj=$1 54318 IFS=$old_IFS 54319- 54320+ 54321 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 54322 54323 case $ac_src in 54324@@ -47452,15 +35163,15 @@ 54325 EXT_STATIC="$EXT_STATIC ftp" 54326 ;; 54327 *) 54328- 54329- 54330+ 54331+ 54332 case ext/ftp in 54333 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 54334 /*) ac_srcdir=`echo "ext/ftp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 54335 *) ac_srcdir="$abs_srcdir/ext/ftp/"; ac_bdir="ext/ftp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 54336 esac 54337- 54338- 54339+ 54340+ 54341 54342 b_c_pre=$php_c_pre 54343 b_cxx_pre=$php_cxx_pre 54344@@ -47473,13 +35184,13 @@ 54345 54346 old_IFS=$IFS 54347 for ac_src in php_ftp.c ftp.c; do 54348- 54349+ 54350 IFS=. 54351 set $ac_src 54352 ac_obj=$1 54353 IFS=$old_IFS 54354- 54355- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 54356+ 54357+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 54358 54359 case $ac_src in 54360 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 54361@@ -47499,15 +35210,15 @@ 54362 esac 54363 EXT_CLI_STATIC="$EXT_CLI_STATIC ftp" 54364 fi 54365- 54366- 54367+ 54368+ 54369 BUILD_DIR="$BUILD_DIR $ext_builddir" 54370- 54371+ 54372 54373 54374 if test "$ext_builddir" = "."; then 54375 PHP_PECL_EXTENSION=ftp 54376- 54377+ 54378 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 54379 54380 fi 54381@@ -47516,7 +35227,7 @@ 54382 test -z "$PHP_OPENSSL" && PHP_OPENSSL=no 54383 54384 if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then 54385- 54386+ 54387 found_openssl=no 54388 unset OPENSSL_INCDIR 54389 unset OPENSSL_LIBDIR 54390@@ -47533,42 +35244,38 @@ 54391 if test -z "$PKG_CONFIG"; then 54392 # Extract the first word of "pkg-config", so it can be a program name with args. 54393 set dummy pkg-config; ac_word=$2 54394-echo "$as_me:$LINENO: checking for $ac_word" >&5 54395-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 54396-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then 54397- echo $ECHO_N "(cached) $ECHO_C" >&6 54398+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 54399+echo "configure:35249: checking for $ac_word" >&5 54400+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 54401+ echo $ac_n "(cached) $ac_c" 1>&6 54402 else 54403- case $PKG_CONFIG in 54404- [\\/]* | ?:[\\/]*) 54405+ case "$PKG_CONFIG" in 54406+ /*) 54407 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 54408 ;; 54409+ ?:/*) 54410+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 54411+ ;; 54412 *) 54413- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 54414-for as_dir in $PATH 54415-do 54416- IFS=$as_save_IFS 54417- test -z "$as_dir" && as_dir=. 54418- for ac_exec_ext in '' $ac_executable_extensions; do 54419- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 54420- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 54421- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 54422- break 2 54423- fi 54424-done 54425-done 54426- 54427+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 54428+ ac_dummy="$PATH" 54429+ for ac_dir in $ac_dummy; do 54430+ test -z "$ac_dir" && ac_dir=. 54431+ if test -f $ac_dir/$ac_word; then 54432+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 54433+ break 54434+ fi 54435+ done 54436+ IFS="$ac_save_ifs" 54437 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 54438 ;; 54439 esac 54440 fi 54441-PKG_CONFIG=$ac_cv_path_PKG_CONFIG 54442- 54443+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 54444 if test -n "$PKG_CONFIG"; then 54445- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 54446-echo "${ECHO_T}$PKG_CONFIG" >&6 54447+ echo "$ac_t""$PKG_CONFIG" 1>&6 54448 else 54449- echo "$as_me:$LINENO: result: no" >&5 54450-echo "${ECHO_T}no" >&6 54451+ echo "$ac_t""no" 1>&6 54452 fi 54453 54454 fi 54455@@ -47580,23 +35287,21 @@ 54456 OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` 54457 OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` 54458 else 54459- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 54460-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 54461- { (exit 1); exit 1; }; } 54462+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 54463 fi 54464 54465 if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then 54466- 54467+ 54468 for ac_i in $OPENSSL_LIBS; do 54469 case $ac_i in 54470 -pthread) 54471 if test "$ext_shared" = "yes"; then 54472 FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -pthread" 54473 else 54474- 54475- 54476+ 54477+ 54478 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 54479- 54480+ 54481 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 54482 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54483 eval "EXTRA_LDFLAGS$unique=set" 54484@@ -47607,20 +35312,20 @@ 54485 ;; 54486 -l*) 54487 ac_ii=`echo $ac_i|cut -c 3-` 54488- 54489- 54490+ 54491+ 54492 case $ac_ii in 54493 c|c_r|pthread*) ;; 54494- *) 54495+ *) 54496 if test "$ext_shared" = "yes"; then 54497- FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii" 54498+ FTP_SHARED_LIBADD="$FTP_SHARED_LIBADD -l$ac_ii" 54499 else 54500- 54501- 54502+ 54503+ 54504 case $ac_ii in 54505 c|c_r|pthread*) ;; 54506- *) 54507- LIBS="$LIBS -l$ac_ii" 54508+ *) 54509+ LIBS="$LIBS -l$ac_ii" 54510 ;; 54511 esac 54512 54513@@ -47633,80 +35338,80 @@ 54514 ;; 54515 -L*) 54516 ac_ii=`echo $ac_i|cut -c 3-` 54517- 54518+ 54519 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 54520- 54521+ 54522 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 54523 ai_p=$ac_ii 54524 else 54525- 54526+ 54527 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 54528- 54529+ 54530 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 54531 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 54532 fi 54533 54534- 54535+ 54536 if test "$ext_shared" = "yes"; then 54537 FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD" 54538 test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_SHARED_LIBADD" 54539 else 54540- 54541- 54542- 54543+ 54544+ 54545+ 54546 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 54547- 54548+ 54549 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 54550 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54551 eval "LIBPATH$unique=set" 54552- 54553+ 54554 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 54555 LDFLAGS="$LDFLAGS -L$ai_p" 54556 PHP_RPATHS="$PHP_RPATHS $ai_p" 54557- 54558+ 54559 fi 54560 54561 54562 fi 54563- 54564+ 54565 fi 54566 54567 ;; 54568 esac 54569 done 54570 54571- 54572+ 54573 for ac_i in $OPENSSL_INCS; do 54574 case $ac_i in 54575 -I*) 54576 ac_ii=`echo $ac_i|cut -c 3-` 54577- 54578+ 54579 if test "$ac_ii" != "/usr/include"; then 54580- 54581+ 54582 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 54583 ai_p=$ac_ii 54584 else 54585- 54586+ 54587 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 54588- 54589+ 54590 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 54591 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 54592 fi 54593 54594- 54595- 54596+ 54597+ 54598 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 54599- 54600+ 54601 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 54602 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54603 eval "INCLUDEPATH$unique=set" 54604- 54605+ 54606 if test ""; then 54607 INCLUDES="-I$ai_p $INCLUDES" 54608 else 54609 INCLUDES="$INCLUDES -I$ai_p" 54610 fi 54611- 54612+ 54613 fi 54614 54615 fi 54616@@ -47719,7 +35424,7 @@ 54617 fi 54618 54619 if test "$found_openssl" = "no"; then 54620- 54621+ 54622 if test "$PHP_OPENSSL_DIR" = "yes"; then 54623 PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 54624 fi 54625@@ -47735,102 +35440,94 @@ 54626 done 54627 54628 if test -z "$OPENSSL_INCDIR"; then 54629- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5 54630-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;} 54631- { (exit 1); exit 1; }; } 54632+ { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; } 54633 fi 54634 54635 if test -z "$OPENSSL_LIBDIR"; then 54636- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5 54637-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;} 54638- { (exit 1); exit 1; }; } 54639+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } 54640 fi 54641 54642 old_CPPFLAGS=$CPPFLAGS 54643 CPPFLAGS=-I$OPENSSL_INCDIR 54644- echo "$as_me:$LINENO: checking for OpenSSL version" >&5 54645-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 54646- cat >conftest.$ac_ext <<_ACEOF 54647-/* confdefs.h. */ 54648-_ACEOF 54649-cat confdefs.h >>conftest.$ac_ext 54650-cat >>conftest.$ac_ext <<_ACEOF 54651-/* end confdefs.h. */ 54652+ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 54653+echo "configure:35454: checking for OpenSSL version" >&5 54654+ cat > conftest.$ac_ext <<EOF 54655+#line 35456 "configure" 54656+#include "confdefs.h" 54657 54658 #include <openssl/opensslv.h> 54659 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL 54660 yes 54661 #endif 54662- 54663-_ACEOF 54664+ 54665+EOF 54666 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 54667- $EGREP "yes" >/dev/null 2>&1; then 54668- 54669- echo "$as_me:$LINENO: result: >= 0.9.6" >&5 54670-echo "${ECHO_T}>= 0.9.6" >&6 54671- 54672+ egrep "yes" >/dev/null 2>&1; then 54673+ rm -rf conftest* 54674+ 54675+ echo "$ac_t"">= 0.9.6" 1>&6 54676+ 54677 else 54678- 54679- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 54680-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 54681- { (exit 1); exit 1; }; } 54682- 54683+ rm -rf conftest* 54684+ 54685+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 54686+ 54687 fi 54688 rm -f conftest* 54689 54690 CPPFLAGS=$old_CPPFLAGS 54691 54692- 54693+ 54694 if test "$OPENSSL_INCDIR" != "/usr/include"; then 54695- 54696+ 54697 if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then 54698 ai_p=$OPENSSL_INCDIR 54699 else 54700- 54701+ 54702 ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 54703- 54704+ 54705 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 54706 ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 54707 fi 54708 54709- 54710- 54711+ 54712+ 54713 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 54714- 54715+ 54716 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 54717 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54718 eval "INCLUDEPATH$unique=set" 54719- 54720+ 54721 if test ""; then 54722 INCLUDES="-I$ai_p $INCLUDES" 54723 else 54724 INCLUDES="$INCLUDES -I$ai_p" 54725 fi 54726- 54727+ 54728 fi 54729 54730 fi 54731 54732- 54733- 54734+ 54735+ 54736 save_old_LDFLAGS=$LDFLAGS 54737 ac_stuff=" 54738 -L$OPENSSL_LIBDIR 54739 " 54740- 54741+ 54742 save_ext_shared=$ext_shared 54743 ext_shared=yes 54744- 54745+ 54746 for ac_i in $ac_stuff; do 54747 case $ac_i in 54748 -pthread) 54749 if test "$ext_shared" = "yes"; then 54750 LDFLAGS="$LDFLAGS -pthread" 54751 else 54752- 54753- 54754+ 54755+ 54756 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 54757- 54758+ 54759 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 54760 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54761 eval "EXTRA_LDFLAGS$unique=set" 54762@@ -47841,20 +35538,20 @@ 54763 ;; 54764 -l*) 54765 ac_ii=`echo $ac_i|cut -c 3-` 54766- 54767- 54768+ 54769+ 54770 case $ac_ii in 54771 c|c_r|pthread*) ;; 54772- *) 54773+ *) 54774 if test "$ext_shared" = "yes"; then 54775- LDFLAGS="$LDFLAGS -l$ac_ii" 54776+ LDFLAGS="$LDFLAGS -l$ac_ii" 54777 else 54778- 54779- 54780+ 54781+ 54782 case $ac_ii in 54783 c|c_r|pthread*) ;; 54784- *) 54785- LIBS="$LIBS -l$ac_ii" 54786+ *) 54787+ LIBS="$LIBS -l$ac_ii" 54788 ;; 54789 esac 54790 54791@@ -47867,131 +35564,101 @@ 54792 ;; 54793 -L*) 54794 ac_ii=`echo $ac_i|cut -c 3-` 54795- 54796+ 54797 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 54798- 54799+ 54800 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 54801 ai_p=$ac_ii 54802 else 54803- 54804+ 54805 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 54806- 54807+ 54808 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 54809 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 54810 fi 54811 54812- 54813+ 54814 if test "$ext_shared" = "yes"; then 54815 LDFLAGS="-L$ai_p $LDFLAGS" 54816 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 54817 else 54818- 54819- 54820- 54821+ 54822+ 54823+ 54824 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 54825- 54826+ 54827 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 54828 if test -n "$unique" && test "`eval $cmd`" = "" ; then 54829 eval "LIBPATH$unique=set" 54830- 54831+ 54832 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 54833 LDFLAGS="$LDFLAGS -L$ai_p" 54834 PHP_RPATHS="$PHP_RPATHS $ai_p" 54835- 54836+ 54837 fi 54838 54839 54840 fi 54841- 54842+ 54843 fi 54844 54845 ;; 54846 esac 54847 done 54848 54849- echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5 54850-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6 54851-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then 54852- echo $ECHO_N "(cached) $ECHO_C" >&6 54853+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 54854+echo "configure:35611: checking for CRYPTO_free in -lcrypto" >&5 54855+ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` 54856+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 54857+ echo $ac_n "(cached) $ac_c" 1>&6 54858 else 54859- ac_check_lib_save_LIBS=$LIBS 54860+ ac_save_LIBS="$LIBS" 54861 LIBS="-lcrypto $LIBS" 54862-cat >conftest.$ac_ext <<_ACEOF 54863-/* confdefs.h. */ 54864-_ACEOF 54865-cat confdefs.h >>conftest.$ac_ext 54866-cat >>conftest.$ac_ext <<_ACEOF 54867-/* end confdefs.h. */ 54868- 54869+cat > conftest.$ac_ext <<EOF 54870+#line 35619 "configure" 54871+#include "confdefs.h" 54872 /* Override any gcc2 internal prototype to avoid an error. */ 54873-#ifdef __cplusplus 54874-extern "C" 54875-#endif 54876 /* We use char because int might match the return type of a gcc2 54877- builtin and then its argument prototype would still apply. */ 54878-char CRYPTO_free (); 54879-int 54880-main () 54881-{ 54882-CRYPTO_free (); 54883- ; 54884- return 0; 54885-} 54886-_ACEOF 54887-rm -f conftest.$ac_objext conftest$ac_exeext 54888-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 54889- (eval $ac_link) 2>conftest.er1 54890- ac_status=$? 54891- grep -v '^ *+' conftest.er1 >conftest.err 54892- rm -f conftest.er1 54893- cat conftest.err >&5 54894- echo "$as_me:$LINENO: \$? = $ac_status" >&5 54895- (exit $ac_status); } && 54896- { ac_try='test -z "$ac_c_werror_flag" 54897- || test ! -s conftest.err' 54898- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 54899- (eval $ac_try) 2>&5 54900- ac_status=$? 54901- echo "$as_me:$LINENO: \$? = $ac_status" >&5 54902- (exit $ac_status); }; } && 54903- { ac_try='test -s conftest$ac_exeext' 54904- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 54905- (eval $ac_try) 2>&5 54906- ac_status=$? 54907- echo "$as_me:$LINENO: \$? = $ac_status" >&5 54908- (exit $ac_status); }; }; then 54909- ac_cv_lib_crypto_CRYPTO_free=yes 54910-else 54911- echo "$as_me: failed program was:" >&5 54912-sed 's/^/| /' conftest.$ac_ext >&5 54913- 54914-ac_cv_lib_crypto_CRYPTO_free=no 54915-fi 54916-rm -f conftest.err conftest.$ac_objext \ 54917- conftest$ac_exeext conftest.$ac_ext 54918-LIBS=$ac_check_lib_save_LIBS 54919-fi 54920-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 54921-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6 54922-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then 54923+ builtin and then its argument prototype would still apply. */ 54924+char CRYPTO_free(); 54925+ 54926+int main() { 54927+CRYPTO_free() 54928+; return 0; } 54929+EOF 54930+if { (eval echo configure:35630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 54931+ rm -rf conftest* 54932+ eval "ac_cv_lib_$ac_lib_var=yes" 54933+else 54934+ echo "configure: failed program was:" >&5 54935+ cat conftest.$ac_ext >&5 54936+ rm -rf conftest* 54937+ eval "ac_cv_lib_$ac_lib_var=no" 54938+fi 54939+rm -f conftest* 54940+LIBS="$ac_save_LIBS" 54941 54942+fi 54943+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 54944+ echo "$ac_t""yes" 1>&6 54945+ 54946 LDFLAGS=$save_old_LDFLAGS 54947 ext_shared=$save_ext_shared 54948- 54949- 54950- 54951+ 54952+ 54953+ 54954 case crypto in 54955 c|c_r|pthread*) ;; 54956- *) 54957+ *) 54958 if test "$ext_shared" = "yes"; then 54959- FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 54960+ FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 54961 else 54962- 54963- 54964+ 54965+ 54966 case crypto in 54967 c|c_r|pthread*) ;; 54968- *) 54969- LIBS="-lcrypto $LIBS" 54970+ *) 54971+ LIBS="-lcrypto $LIBS" 54972 ;; 54973 esac 54974 54975@@ -48001,43 +35668,42 @@ 54976 esac 54977 54978 54979- 54980- 54981+ 54982+ 54983 else 54984+ echo "$ac_t""no" 1>&6 54985 54986 LDFLAGS=$save_old_LDFLAGS 54987 ext_shared=$save_ext_shared 54988 unset ac_cv_lib_crypto_CRYPTO_free 54989- 54990- { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5 54991-echo "$as_me: error: libcrypto not found!" >&2;} 54992- { (exit 1); exit 1; }; } 54993- 54994- 54995+ 54996+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } 54997+ 54998+ 54999 fi 55000 55001 55002 old_LIBS=$LIBS 55003 LIBS="$LIBS -lcrypto" 55004- 55005+ 55006 save_old_LDFLAGS=$LDFLAGS 55007 ac_stuff=" 55008 -L$OPENSSL_LIBDIR 55009 " 55010- 55011+ 55012 save_ext_shared=$ext_shared 55013 ext_shared=yes 55014- 55015+ 55016 for ac_i in $ac_stuff; do 55017 case $ac_i in 55018 -pthread) 55019 if test "$ext_shared" = "yes"; then 55020 LDFLAGS="$LDFLAGS -pthread" 55021 else 55022- 55023- 55024+ 55025+ 55026 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 55027- 55028+ 55029 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 55030 if test -n "$unique" && test "`eval $cmd`" = "" ; then 55031 eval "EXTRA_LDFLAGS$unique=set" 55032@@ -48048,20 +35714,20 @@ 55033 ;; 55034 -l*) 55035 ac_ii=`echo $ac_i|cut -c 3-` 55036- 55037- 55038+ 55039+ 55040 case $ac_ii in 55041 c|c_r|pthread*) ;; 55042- *) 55043+ *) 55044 if test "$ext_shared" = "yes"; then 55045- LDFLAGS="$LDFLAGS -l$ac_ii" 55046+ LDFLAGS="$LDFLAGS -l$ac_ii" 55047 else 55048- 55049- 55050+ 55051+ 55052 case $ac_ii in 55053 c|c_r|pthread*) ;; 55054- *) 55055- LIBS="$LIBS -l$ac_ii" 55056+ *) 55057+ LIBS="$LIBS -l$ac_ii" 55058 ;; 55059 esac 55060 55061@@ -48074,148 +35740,117 @@ 55062 ;; 55063 -L*) 55064 ac_ii=`echo $ac_i|cut -c 3-` 55065- 55066+ 55067 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 55068- 55069+ 55070 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 55071 ai_p=$ac_ii 55072 else 55073- 55074+ 55075 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 55076- 55077+ 55078 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 55079 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 55080 fi 55081 55082- 55083+ 55084 if test "$ext_shared" = "yes"; then 55085 LDFLAGS="-L$ai_p $LDFLAGS" 55086 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 55087 else 55088- 55089- 55090- 55091+ 55092+ 55093+ 55094 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 55095- 55096+ 55097 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 55098 if test -n "$unique" && test "`eval $cmd`" = "" ; then 55099 eval "LIBPATH$unique=set" 55100- 55101+ 55102 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 55103 LDFLAGS="$LDFLAGS -L$ai_p" 55104 PHP_RPATHS="$PHP_RPATHS $ai_p" 55105- 55106+ 55107 fi 55108 55109 55110 fi 55111- 55112+ 55113 fi 55114 55115 ;; 55116 esac 55117 done 55118 55119- echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5 55120-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6 55121-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then 55122- echo $ECHO_N "(cached) $ECHO_C" >&6 55123+ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 55124+echo "configure:35787: checking for SSL_CTX_set_ssl_version in -lssl" >&5 55125+ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` 55126+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55127+ echo $ac_n "(cached) $ac_c" 1>&6 55128 else 55129- ac_check_lib_save_LIBS=$LIBS 55130+ ac_save_LIBS="$LIBS" 55131 LIBS="-lssl $LIBS" 55132-cat >conftest.$ac_ext <<_ACEOF 55133-/* confdefs.h. */ 55134-_ACEOF 55135-cat confdefs.h >>conftest.$ac_ext 55136-cat >>conftest.$ac_ext <<_ACEOF 55137-/* end confdefs.h. */ 55138- 55139+cat > conftest.$ac_ext <<EOF 55140+#line 35795 "configure" 55141+#include "confdefs.h" 55142 /* Override any gcc2 internal prototype to avoid an error. */ 55143-#ifdef __cplusplus 55144-extern "C" 55145-#endif 55146 /* We use char because int might match the return type of a gcc2 55147- builtin and then its argument prototype would still apply. */ 55148-char SSL_CTX_set_ssl_version (); 55149-int 55150-main () 55151-{ 55152-SSL_CTX_set_ssl_version (); 55153- ; 55154- return 0; 55155-} 55156-_ACEOF 55157-rm -f conftest.$ac_objext conftest$ac_exeext 55158-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 55159- (eval $ac_link) 2>conftest.er1 55160- ac_status=$? 55161- grep -v '^ *+' conftest.er1 >conftest.err 55162- rm -f conftest.er1 55163- cat conftest.err >&5 55164- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55165- (exit $ac_status); } && 55166- { ac_try='test -z "$ac_c_werror_flag" 55167- || test ! -s conftest.err' 55168- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 55169- (eval $ac_try) 2>&5 55170- ac_status=$? 55171- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55172- (exit $ac_status); }; } && 55173- { ac_try='test -s conftest$ac_exeext' 55174- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 55175- (eval $ac_try) 2>&5 55176- ac_status=$? 55177- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55178- (exit $ac_status); }; }; then 55179- ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes 55180-else 55181- echo "$as_me: failed program was:" >&5 55182-sed 's/^/| /' conftest.$ac_ext >&5 55183- 55184-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no 55185-fi 55186-rm -f conftest.err conftest.$ac_objext \ 55187- conftest$ac_exeext conftest.$ac_ext 55188-LIBS=$ac_check_lib_save_LIBS 55189-fi 55190-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 55191-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6 55192-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then 55193+ builtin and then its argument prototype would still apply. */ 55194+char SSL_CTX_set_ssl_version(); 55195+ 55196+int main() { 55197+SSL_CTX_set_ssl_version() 55198+; return 0; } 55199+EOF 55200+if { (eval echo configure:35806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55201+ rm -rf conftest* 55202+ eval "ac_cv_lib_$ac_lib_var=yes" 55203+else 55204+ echo "configure: failed program was:" >&5 55205+ cat conftest.$ac_ext >&5 55206+ rm -rf conftest* 55207+ eval "ac_cv_lib_$ac_lib_var=no" 55208+fi 55209+rm -f conftest* 55210+LIBS="$ac_save_LIBS" 55211 55212+fi 55213+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 55214+ echo "$ac_t""yes" 1>&6 55215+ 55216 LDFLAGS=$save_old_LDFLAGS 55217 ext_shared=$save_ext_shared 55218- 55219+ 55220 found_openssl=yes 55221- 55222- 55223+ 55224+ 55225 else 55226+ echo "$ac_t""no" 1>&6 55227 55228 LDFLAGS=$save_old_LDFLAGS 55229 ext_shared=$save_ext_shared 55230 unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version 55231- 55232- { { echo "$as_me:$LINENO: error: libssl not found!" >&5 55233-echo "$as_me: error: libssl not found!" >&2;} 55234- { (exit 1); exit 1; }; } 55235- 55236- 55237+ 55238+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } 55239+ 55240+ 55241 fi 55242 55243 LIBS=$old_LIBS 55244- 55245- 55246+ 55247+ 55248 case ssl in 55249 c|c_r|pthread*) ;; 55250- *) 55251+ *) 55252 if test "$ext_shared" = "yes"; then 55253- FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD" 55254+ FTP_SHARED_LIBADD="-lssl $FTP_SHARED_LIBADD" 55255 else 55256- 55257- 55258+ 55259+ 55260 case ssl in 55261 c|c_r|pthread*) ;; 55262- *) 55263- LIBS="-lssl $LIBS" 55264+ *) 55265+ LIBS="-lssl $LIBS" 55266 ;; 55267 esac 55268 55269@@ -48225,20 +35860,20 @@ 55270 esac 55271 55272 55273- 55274- 55275+ 55276+ 55277 case crypto in 55278 c|c_r|pthread*) ;; 55279- *) 55280+ *) 55281 if test "$ext_shared" = "yes"; then 55282- FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 55283+ FTP_SHARED_LIBADD="-lcrypto $FTP_SHARED_LIBADD" 55284 else 55285- 55286- 55287+ 55288+ 55289 case crypto in 55290 c|c_r|pthread*) ;; 55291- *) 55292- LIBS="-lcrypto $LIBS" 55293+ *) 55294+ LIBS="-lcrypto $LIBS" 55295 ;; 55296 esac 55297 55298@@ -48249,55 +35884,55 @@ 55299 55300 55301 55302- 55303+ 55304 if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then 55305- 55306+ 55307 if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then 55308 ai_p=$OPENSSL_LIBDIR 55309 else 55310- 55311+ 55312 ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 55313- 55314+ 55315 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 55316 ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" 55317 fi 55318 55319- 55320+ 55321 if test "$ext_shared" = "yes"; then 55322 FTP_SHARED_LIBADD="-L$ai_p $FTP_SHARED_LIBADD" 55323 test -n "$ld_runpath_switch" && FTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $FTP_SHARED_LIBADD" 55324 else 55325- 55326- 55327- 55328+ 55329+ 55330+ 55331 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 55332- 55333+ 55334 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 55335 if test -n "$unique" && test "`eval $cmd`" = "" ; then 55336 eval "LIBPATH$unique=set" 55337- 55338+ 55339 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 55340 LDFLAGS="$LDFLAGS -L$ai_p" 55341 PHP_RPATHS="$PHP_RPATHS $ai_p" 55342- 55343+ 55344 fi 55345 55346 55347 fi 55348- 55349+ 55350 fi 55351 55352 fi 55353 55354 if test "$found_openssl" = "yes"; then 55355 OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR 55356- 55357+ 55358 55359 : 55360 55361 fi 55362 55363- 55364+ 55365 PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD" 55366 55367 fi 55368@@ -48308,19 +35943,19 @@ 55369 55370 php_with_gd=no 55371 55372-echo "$as_me:$LINENO: checking for GD support" >&5 55373-echo $ECHO_N "checking for GD support... $ECHO_C" >&6 55374- 55375+echo $ac_n "checking for GD support""... $ac_c" 1>&6 55376+echo "configure:35948: checking for GD support" >&5 55377 # Check whether --with-gd or --without-gd was given. 55378 if test "${with_gd+set}" = set; then 55379 withval="$with_gd" 55380 PHP_GD=$withval 55381 else 55382- 55383+ 55384 PHP_GD=no 55385 test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL 55386 55387-fi; 55388+fi 55389+ 55390 55391 55392 ext_output="yes, shared" 55393@@ -48344,85 +35979,81 @@ 55394 55395 55396 55397-echo "$as_me:$LINENO: result: $ext_output" >&5 55398-echo "${ECHO_T}$ext_output" >&6 55399+echo "$ac_t""$ext_output" 1>&6 55400 55401 55402 55403 55404 if test -z "$PHP_JPEG_DIR"; then 55405- 55406+ 55407 php_with_jpeg_dir=no 55408 55409-echo "$as_me:$LINENO: checking for the location of libjpeg" >&5 55410-echo $ECHO_N "checking for the location of libjpeg... $ECHO_C" >&6 55411- 55412+echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 55413+echo "configure:35993: checking for the location of libjpeg" >&5 55414 # Check whether --with-jpeg-dir or --without-jpeg-dir was given. 55415 if test "${with_jpeg_dir+set}" = set; then 55416 withval="$with_jpeg_dir" 55417 PHP_JPEG_DIR=$withval 55418 else 55419- 55420+ 55421 PHP_JPEG_DIR=no 55422+ 55423 55424+fi 55425 55426-fi; 55427 55428 ext_output=$PHP_JPEG_DIR 55429-echo "$as_me:$LINENO: result: $ext_output" >&5 55430-echo "${ECHO_T}$ext_output" >&6 55431+echo "$ac_t""$ext_output" 1>&6 55432 55433 55434 55435 fi 55436 55437 if test -z "$PHP_PNG_DIR"; then 55438- 55439+ 55440 php_with_png_dir=no 55441 55442-echo "$as_me:$LINENO: checking for the location of libpng" >&5 55443-echo $ECHO_N "checking for the location of libpng... $ECHO_C" >&6 55444- 55445+echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 55446+echo "configure:36018: checking for the location of libpng" >&5 55447 # Check whether --with-png-dir or --without-png-dir was given. 55448 if test "${with_png_dir+set}" = set; then 55449 withval="$with_png_dir" 55450 PHP_PNG_DIR=$withval 55451 else 55452- 55453+ 55454 PHP_PNG_DIR=no 55455+ 55456 55457+fi 55458 55459-fi; 55460 55461 ext_output=$PHP_PNG_DIR 55462-echo "$as_me:$LINENO: result: $ext_output" >&5 55463-echo "${ECHO_T}$ext_output" >&6 55464+echo "$ac_t""$ext_output" 1>&6 55465 55466 55467 55468 fi 55469 55470 if test -z "$PHP_ZLIB_DIR"; then 55471- 55472+ 55473 php_with_zlib_dir=no 55474 55475-echo "$as_me:$LINENO: checking for the location of libz" >&5 55476-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6 55477- 55478+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 55479+echo "configure:36043: checking for the location of libz" >&5 55480 # Check whether --with-zlib-dir or --without-zlib-dir was given. 55481 if test "${with_zlib_dir+set}" = set; then 55482 withval="$with_zlib_dir" 55483 PHP_ZLIB_DIR=$withval 55484 else 55485- 55486+ 55487 PHP_ZLIB_DIR=no 55488+ 55489 55490+fi 55491 55492-fi; 55493 55494 ext_output=$PHP_ZLIB_DIR 55495-echo "$as_me:$LINENO: result: $ext_output" >&5 55496-echo "${ECHO_T}$ext_output" >&6 55497+echo "$ac_t""$ext_output" 1>&6 55498 55499 55500 55501@@ -48431,23 +36062,22 @@ 55502 55503 php_with_xpm_dir=no 55504 55505-echo "$as_me:$LINENO: checking for the location of libXpm" >&5 55506-echo $ECHO_N "checking for the location of libXpm... $ECHO_C" >&6 55507- 55508+echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 55509+echo "configure:36067: checking for the location of libXpm" >&5 55510 # Check whether --with-xpm-dir or --without-xpm-dir was given. 55511 if test "${with_xpm_dir+set}" = set; then 55512 withval="$with_xpm_dir" 55513 PHP_XPM_DIR=$withval 55514 else 55515- 55516+ 55517 PHP_XPM_DIR=no 55518+ 55519 55520+fi 55521 55522-fi; 55523 55524 ext_output=$PHP_XPM_DIR 55525-echo "$as_me:$LINENO: result: $ext_output" >&5 55526-echo "${ECHO_T}$ext_output" >&6 55527+echo "$ac_t""$ext_output" 1>&6 55528 55529 55530 55531@@ -48455,23 +36085,22 @@ 55532 55533 php_with_freetype_dir=no 55534 55535-echo "$as_me:$LINENO: checking for FreeType 2" >&5 55536-echo $ECHO_N "checking for FreeType 2... $ECHO_C" >&6 55537- 55538+echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 55539+echo "configure:36090: checking for FreeType 2" >&5 55540 # Check whether --with-freetype-dir or --without-freetype-dir was given. 55541 if test "${with_freetype_dir+set}" = set; then 55542 withval="$with_freetype_dir" 55543 PHP_FREETYPE_DIR=$withval 55544 else 55545- 55546+ 55547 PHP_FREETYPE_DIR=no 55548+ 55549 55550+fi 55551 55552-fi; 55553 55554 ext_output=$PHP_FREETYPE_DIR 55555-echo "$as_me:$LINENO: result: $ext_output" >&5 55556-echo "${ECHO_T}$ext_output" >&6 55557+echo "$ac_t""$ext_output" 1>&6 55558 55559 55560 55561@@ -48479,23 +36108,22 @@ 55562 55563 php_with_t1lib=no 55564 55565-echo "$as_me:$LINENO: checking for T1lib support" >&5 55566-echo $ECHO_N "checking for T1lib support... $ECHO_C" >&6 55567- 55568+echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 55569+echo "configure:36113: checking for T1lib support" >&5 55570 # Check whether --with-t1lib or --without-t1lib was given. 55571 if test "${with_t1lib+set}" = set; then 55572 withval="$with_t1lib" 55573 PHP_T1LIB=$withval 55574 else 55575- 55576+ 55577 PHP_T1LIB=no 55578+ 55579 55580+fi 55581 55582-fi; 55583 55584 ext_output=$PHP_T1LIB 55585-echo "$as_me:$LINENO: result: $ext_output" >&5 55586-echo "${ECHO_T}$ext_output" >&6 55587+echo "$ac_t""$ext_output" 1>&6 55588 55589 55590 55591@@ -48503,22 +36131,22 @@ 55592 55593 php_enable_gd_native_ttf=no 55594 55595-echo "$as_me:$LINENO: checking whether to enable truetype string function in GD" >&5 55596-echo $ECHO_N "checking whether to enable truetype string function in GD... $ECHO_C" >&6 55597+echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 55598+echo "configure:36136: checking whether to enable truetype string function in GD" >&5 55599 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given. 55600 if test "${enable_gd_native_ttf+set}" = set; then 55601 enableval="$enable_gd_native_ttf" 55602 PHP_GD_NATIVE_TTF=$enableval 55603 else 55604- 55605+ 55606 PHP_GD_NATIVE_TTF=no 55607+ 55608 55609+fi 55610 55611-fi; 55612 55613 ext_output=$PHP_GD_NATIVE_TTF 55614-echo "$as_me:$LINENO: result: $ext_output" >&5 55615-echo "${ECHO_T}$ext_output" >&6 55616+echo "$ac_t""$ext_output" 1>&6 55617 55618 55619 55620@@ -48526,22 +36154,22 @@ 55621 55622 php_enable_gd_jis_conv=no 55623 55624-echo "$as_me:$LINENO: checking whether to enable JIS-mapped Japanese font support in GD" >&5 55625-echo $ECHO_N "checking whether to enable JIS-mapped Japanese font support in GD... $ECHO_C" >&6 55626+echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 55627+echo "configure:36159: checking whether to enable JIS-mapped Japanese font support in GD" >&5 55628 # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. 55629 if test "${enable_gd_jis_conv+set}" = set; then 55630 enableval="$enable_gd_jis_conv" 55631 PHP_GD_JIS_CONV=$enableval 55632 else 55633- 55634+ 55635 PHP_GD_JIS_CONV=no 55636+ 55637 55638+fi 55639 55640-fi; 55641 55642 ext_output=$PHP_GD_JIS_CONV 55643-echo "$as_me:$LINENO: result: $ext_output" >&5 55644-echo "${ECHO_T}$ext_output" >&6 55645+echo "$ac_t""$ext_output" 1>&6 55646 55647 55648 55649@@ -48576,113 +36204,65 @@ 55650 libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c libgd/gd_filter.c \ 55651 libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c" 55652 55653- 55654- 55655-for ac_func in fabsf floorf 55656+ for ac_func in fabsf floorf 55657 do 55658-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 55659-echo "$as_me:$LINENO: checking for $ac_func" >&5 55660-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 55661-if eval "test \"\${$as_ac_var+set}\" = set"; then 55662- echo $ECHO_N "(cached) $ECHO_C" >&6 55663-else 55664- cat >conftest.$ac_ext <<_ACEOF 55665-/* confdefs.h. */ 55666-_ACEOF 55667-cat confdefs.h >>conftest.$ac_ext 55668-cat >>conftest.$ac_ext <<_ACEOF 55669-/* end confdefs.h. */ 55670-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 55671- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 55672-#define $ac_func innocuous_$ac_func 55673- 55674+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 55675+echo "configure:36211: checking for $ac_func" >&5 55676+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 55677+ echo $ac_n "(cached) $ac_c" 1>&6 55678+else 55679+ cat > conftest.$ac_ext <<EOF 55680+#line 36216 "configure" 55681+#include "confdefs.h" 55682 /* System header to define __stub macros and hopefully few prototypes, 55683- which can conflict with char $ac_func (); below. 55684- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 55685- <limits.h> exists even on freestanding compilers. */ 55686- 55687-#ifdef __STDC__ 55688-# include <limits.h> 55689-#else 55690-# include <assert.h> 55691-#endif 55692- 55693-#undef $ac_func 55694- 55695+ which can conflict with char $ac_func(); below. */ 55696+#include <assert.h> 55697 /* Override any gcc2 internal prototype to avoid an error. */ 55698-#ifdef __cplusplus 55699-extern "C" 55700-{ 55701-#endif 55702 /* We use char because int might match the return type of a gcc2 55703- builtin and then its argument prototype would still apply. */ 55704-char $ac_func (); 55705+ builtin and then its argument prototype would still apply. */ 55706+char $ac_func(); 55707+ 55708+int main() { 55709+ 55710 /* The GNU C library defines this for functions which it implements 55711 to always fail with ENOSYS. Some functions are actually named 55712 something starting with __ and the normal name is an alias. */ 55713 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 55714 choke me 55715 #else 55716-char (*f) () = $ac_func; 55717-#endif 55718-#ifdef __cplusplus 55719-} 55720+$ac_func(); 55721 #endif 55722 55723-int 55724-main () 55725-{ 55726-return f != $ac_func; 55727- ; 55728- return 0; 55729-} 55730-_ACEOF 55731-rm -f conftest.$ac_objext conftest$ac_exeext 55732-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 55733- (eval $ac_link) 2>conftest.er1 55734- ac_status=$? 55735- grep -v '^ *+' conftest.er1 >conftest.err 55736- rm -f conftest.er1 55737- cat conftest.err >&5 55738- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55739- (exit $ac_status); } && 55740- { ac_try='test -z "$ac_c_werror_flag" 55741- || test ! -s conftest.err' 55742- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 55743- (eval $ac_try) 2>&5 55744- ac_status=$? 55745- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55746- (exit $ac_status); }; } && 55747- { ac_try='test -s conftest$ac_exeext' 55748- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 55749- (eval $ac_try) 2>&5 55750- ac_status=$? 55751- echo "$as_me:$LINENO: \$? = $ac_status" >&5 55752- (exit $ac_status); }; }; then 55753- eval "$as_ac_var=yes" 55754-else 55755- echo "$as_me: failed program was:" >&5 55756-sed 's/^/| /' conftest.$ac_ext >&5 55757- 55758-eval "$as_ac_var=no" 55759-fi 55760-rm -f conftest.err conftest.$ac_objext \ 55761- conftest$ac_exeext conftest.$ac_ext 55762-fi 55763-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 55764-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 55765-if test `eval echo '${'$as_ac_var'}'` = yes; then 55766- cat >>confdefs.h <<_ACEOF 55767-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 55768-_ACEOF 55769+; return 0; } 55770+EOF 55771+if { (eval echo configure:36239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 55772+ rm -rf conftest* 55773+ eval "ac_cv_func_$ac_func=yes" 55774+else 55775+ echo "configure: failed program was:" >&5 55776+ cat conftest.$ac_ext >&5 55777+ rm -rf conftest* 55778+ eval "ac_cv_func_$ac_func=no" 55779+fi 55780+rm -f conftest* 55781+fi 55782 55783+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 55784+ echo "$ac_t""yes" 1>&6 55785+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 55786+ cat >> confdefs.h <<EOF 55787+#define $ac_tr_func 1 55788+EOF 55789+ 55790+else 55791+ echo "$ac_t""no" 1>&6 55792 fi 55793 done 55794 55795 55796 test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes 55797 55798- 55799+ 55800 if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then 55801 if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then 55802 PHP_ZLIB_DIR="$PHP_ZLIB_DIR" 55803@@ -48691,9 +36271,7 @@ 55804 PHP_ZLIB_DIR="$PHP_ZLIB_DIR" 55805 PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" 55806 else 55807- { { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5 55808-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;} 55809- { (exit 1); exit 1; }; } 55810+ { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } 55811 fi 55812 else 55813 for i in /usr/local /usr; do 55814@@ -48707,21 +36285,20 @@ 55815 done 55816 fi 55817 55818- 55819+ 55820 if test "$PHP_GD_NATIVE_TTF" = "yes"; then 55821- 55822-cat >>confdefs.h <<\_ACEOF 55823+ cat >> confdefs.h <<\EOF 55824 #define USE_GD_IMGSTRTTF 1 55825-_ACEOF 55826+EOF 55827 55828 fi 55829 55830- 55831+ 55832 if test "$PHP_GD_JIS_CONV" = "yes"; then 55833 USE_GD_JIS_CONV=1 55834 fi 55835 55836- 55837+ 55838 if test "$PHP_JPEG_DIR" != "no"; then 55839 55840 for i in $PHP_JPEG_DIR /usr/local /usr; do 55841@@ -48729,30 +36306,28 @@ 55842 done 55843 55844 if test -z "$GD_JPEG_DIR"; then 55845- { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5 55846-echo "$as_me: error: jpeglib.h not found." >&2;} 55847- { (exit 1); exit 1; }; } 55848+ { echo "configure: error: jpeglib.h not found." 1>&2; exit 1; } 55849 fi 55850 55851- 55852+ 55853 save_old_LDFLAGS=$LDFLAGS 55854 ac_stuff=" 55855 -L$GD_JPEG_DIR/$PHP_LIBDIR 55856 " 55857- 55858+ 55859 save_ext_shared=$ext_shared 55860 ext_shared=yes 55861- 55862+ 55863 for ac_i in $ac_stuff; do 55864 case $ac_i in 55865 -pthread) 55866 if test "$ext_shared" = "yes"; then 55867 LDFLAGS="$LDFLAGS -pthread" 55868 else 55869- 55870- 55871+ 55872+ 55873 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 55874- 55875+ 55876 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 55877 if test -n "$unique" && test "`eval $cmd`" = "" ; then 55878 eval "EXTRA_LDFLAGS$unique=set" 55879@@ -48763,20 +36338,20 @@ 55880 ;; 55881 -l*) 55882 ac_ii=`echo $ac_i|cut -c 3-` 55883- 55884- 55885+ 55886+ 55887 case $ac_ii in 55888 c|c_r|pthread*) ;; 55889- *) 55890+ *) 55891 if test "$ext_shared" = "yes"; then 55892- LDFLAGS="$LDFLAGS -l$ac_ii" 55893+ LDFLAGS="$LDFLAGS -l$ac_ii" 55894 else 55895- 55896- 55897+ 55898+ 55899 case $ac_ii in 55900 c|c_r|pthread*) ;; 55901- *) 55902- LIBS="$LIBS -l$ac_ii" 55903+ *) 55904+ LIBS="$LIBS -l$ac_ii" 55905 ;; 55906 esac 55907 55908@@ -48789,236 +36364,206 @@ 55909 ;; 55910 -L*) 55911 ac_ii=`echo $ac_i|cut -c 3-` 55912- 55913+ 55914 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 55915- 55916+ 55917 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 55918 ai_p=$ac_ii 55919 else 55920- 55921+ 55922 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 55923- 55924+ 55925 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 55926 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 55927 fi 55928 55929- 55930+ 55931 if test "$ext_shared" = "yes"; then 55932 LDFLAGS="-L$ai_p $LDFLAGS" 55933 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 55934 else 55935- 55936- 55937- 55938+ 55939+ 55940+ 55941 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 55942- 55943+ 55944 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 55945 if test -n "$unique" && test "`eval $cmd`" = "" ; then 55946 eval "LIBPATH$unique=set" 55947- 55948+ 55949 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 55950 LDFLAGS="$LDFLAGS -L$ai_p" 55951 PHP_RPATHS="$PHP_RPATHS $ai_p" 55952- 55953+ 55954 fi 55955 55956 55957 fi 55958- 55959+ 55960 fi 55961 55962 ;; 55963 esac 55964 done 55965 55966- echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 55967-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6 55968-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then 55969- echo $ECHO_N "(cached) $ECHO_C" >&6 55970+ echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 55971+echo "configure:36411: checking for jpeg_read_header in -ljpeg" >&5 55972+ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` 55973+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 55974+ echo $ac_n "(cached) $ac_c" 1>&6 55975 else 55976- ac_check_lib_save_LIBS=$LIBS 55977+ ac_save_LIBS="$LIBS" 55978 LIBS="-ljpeg $LIBS" 55979-cat >conftest.$ac_ext <<_ACEOF 55980-/* confdefs.h. */ 55981-_ACEOF 55982-cat confdefs.h >>conftest.$ac_ext 55983-cat >>conftest.$ac_ext <<_ACEOF 55984-/* end confdefs.h. */ 55985- 55986+cat > conftest.$ac_ext <<EOF 55987+#line 36419 "configure" 55988+#include "confdefs.h" 55989 /* Override any gcc2 internal prototype to avoid an error. */ 55990-#ifdef __cplusplus 55991-extern "C" 55992-#endif 55993 /* We use char because int might match the return type of a gcc2 55994- builtin and then its argument prototype would still apply. */ 55995-char jpeg_read_header (); 55996-int 55997-main () 55998-{ 55999-jpeg_read_header (); 56000- ; 56001- return 0; 56002-} 56003-_ACEOF 56004-rm -f conftest.$ac_objext conftest$ac_exeext 56005-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 56006- (eval $ac_link) 2>conftest.er1 56007- ac_status=$? 56008- grep -v '^ *+' conftest.er1 >conftest.err 56009- rm -f conftest.er1 56010- cat conftest.err >&5 56011- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56012- (exit $ac_status); } && 56013- { ac_try='test -z "$ac_c_werror_flag" 56014- || test ! -s conftest.err' 56015- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 56016- (eval $ac_try) 2>&5 56017- ac_status=$? 56018- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56019- (exit $ac_status); }; } && 56020- { ac_try='test -s conftest$ac_exeext' 56021- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 56022- (eval $ac_try) 2>&5 56023- ac_status=$? 56024- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56025- (exit $ac_status); }; }; then 56026- ac_cv_lib_jpeg_jpeg_read_header=yes 56027-else 56028- echo "$as_me: failed program was:" >&5 56029-sed 's/^/| /' conftest.$ac_ext >&5 56030- 56031-ac_cv_lib_jpeg_jpeg_read_header=no 56032-fi 56033-rm -f conftest.err conftest.$ac_objext \ 56034- conftest$ac_exeext conftest.$ac_ext 56035-LIBS=$ac_check_lib_save_LIBS 56036-fi 56037-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 56038-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6 56039-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then 56040+ builtin and then its argument prototype would still apply. */ 56041+char jpeg_read_header(); 56042+ 56043+int main() { 56044+jpeg_read_header() 56045+; return 0; } 56046+EOF 56047+if { (eval echo configure:36430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56048+ rm -rf conftest* 56049+ eval "ac_cv_lib_$ac_lib_var=yes" 56050+else 56051+ echo "configure: failed program was:" >&5 56052+ cat conftest.$ac_ext >&5 56053+ rm -rf conftest* 56054+ eval "ac_cv_lib_$ac_lib_var=no" 56055+fi 56056+rm -f conftest* 56057+LIBS="$ac_save_LIBS" 56058 56059+fi 56060+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56061+ echo "$ac_t""yes" 1>&6 56062+ 56063 LDFLAGS=$save_old_LDFLAGS 56064 ext_shared=$save_ext_shared 56065- 56066- 56067+ 56068+ 56069 if test "$GD_JPEG_DIR/include" != "/usr/include"; then 56070- 56071+ 56072 if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then 56073 ai_p=$GD_JPEG_DIR/include 56074 else 56075- 56076+ 56077 ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 56078- 56079+ 56080 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56081 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`" 56082 fi 56083 56084- 56085- 56086+ 56087+ 56088 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56089- 56090+ 56091 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 56092 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56093 eval "INCLUDEPATH$unique=set" 56094- 56095+ 56096 if test ""; then 56097 INCLUDES="-I$ai_p $INCLUDES" 56098 else 56099 INCLUDES="$INCLUDES -I$ai_p" 56100 fi 56101- 56102+ 56103 fi 56104 56105 fi 56106 56107- 56108+ 56109 56110 if test "$ext_shared" = "yes"; then 56111 GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD" 56112 if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then 56113- 56114+ 56115 if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56116- 56117+ 56118 if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56119 ai_p=$GD_JPEG_DIR/$PHP_LIBDIR 56120 else 56121- 56122+ 56123 ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56124- 56125+ 56126 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56127 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" 56128 fi 56129 56130- 56131+ 56132 if test "$ext_shared" = "yes"; then 56133 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 56134 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 56135 else 56136- 56137- 56138- 56139+ 56140+ 56141+ 56142 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56143- 56144+ 56145 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56146 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56147 eval "LIBPATH$unique=set" 56148- 56149+ 56150 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56151 LDFLAGS="$LDFLAGS -L$ai_p" 56152 PHP_RPATHS="$PHP_RPATHS $ai_p" 56153- 56154+ 56155 fi 56156 56157 56158 fi 56159- 56160+ 56161 fi 56162 56163 fi 56164 else 56165- 56166+ 56167 56168 if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then 56169- 56170+ 56171 if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56172- 56173+ 56174 if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56175 ai_p=$GD_JPEG_DIR/$PHP_LIBDIR 56176 else 56177- 56178+ 56179 ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56180- 56181+ 56182 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56183 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" 56184 fi 56185 56186- 56187- 56188- 56189- 56190+ 56191+ 56192+ 56193+ 56194 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56195- 56196+ 56197 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56198 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56199 eval "LIBPATH$unique=set" 56200- 56201+ 56202 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56203 LDFLAGS="$LDFLAGS -L$ai_p" 56204 PHP_RPATHS="$PHP_RPATHS $ai_p" 56205- 56206+ 56207 fi 56208 56209 56210- 56211+ 56212 fi 56213 56214 fi 56215- 56216- 56217+ 56218+ 56219 case jpeg in 56220 c|c_r|pthread*) ;; 56221- *) 56222- LIBS="-ljpeg $LIBS" 56223+ *) 56224+ LIBS="-ljpeg $LIBS" 56225 ;; 56226 esac 56227 56228@@ -49028,27 +36573,25 @@ 56229 fi 56230 56231 56232- 56233- 56234+ 56235+ 56236 else 56237+ echo "$ac_t""no" 1>&6 56238 56239 LDFLAGS=$save_old_LDFLAGS 56240 ext_shared=$save_ext_shared 56241 unset ac_cv_lib_jpeg_jpeg_read_header 56242- 56243- { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5 56244-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;} 56245- { (exit 1); exit 1; }; } 56246- 56247- 56248+ 56249+ { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } 56250+ 56251+ 56252 fi 56253 56254 else 56255- echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5 56256-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6 56257+ echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6 56258 fi 56259 56260- 56261+ 56262 if test "$PHP_PNG_DIR" != "no"; then 56263 56264 for i in $PHP_PNG_DIR /usr/local /usr; do 56265@@ -49056,36 +36599,32 @@ 56266 done 56267 56268 if test -z "$GD_PNG_DIR"; then 56269- { { echo "$as_me:$LINENO: error: png.h not found." >&5 56270-echo "$as_me: error: png.h not found." >&2;} 56271- { (exit 1); exit 1; }; } 56272+ { echo "configure: error: png.h not found." 1>&2; exit 1; } 56273 fi 56274 56275 if test "$PHP_ZLIB_DIR" = "no"; then 56276- { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5 56277-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;} 56278- { (exit 1); exit 1; }; } 56279+ { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" 1>&2; exit 1; } 56280 fi 56281 56282- 56283+ 56284 save_old_LDFLAGS=$LDFLAGS 56285 ac_stuff=" 56286 -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR 56287 " 56288- 56289+ 56290 save_ext_shared=$ext_shared 56291 ext_shared=yes 56292- 56293+ 56294 for ac_i in $ac_stuff; do 56295 case $ac_i in 56296 -pthread) 56297 if test "$ext_shared" = "yes"; then 56298 LDFLAGS="$LDFLAGS -pthread" 56299 else 56300- 56301- 56302+ 56303+ 56304 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 56305- 56306+ 56307 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 56308 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56309 eval "EXTRA_LDFLAGS$unique=set" 56310@@ -49096,20 +36635,20 @@ 56311 ;; 56312 -l*) 56313 ac_ii=`echo $ac_i|cut -c 3-` 56314- 56315- 56316+ 56317+ 56318 case $ac_ii in 56319 c|c_r|pthread*) ;; 56320- *) 56321+ *) 56322 if test "$ext_shared" = "yes"; then 56323- LDFLAGS="$LDFLAGS -l$ac_ii" 56324+ LDFLAGS="$LDFLAGS -l$ac_ii" 56325 else 56326- 56327- 56328+ 56329+ 56330 case $ac_ii in 56331 c|c_r|pthread*) ;; 56332- *) 56333- LIBS="$LIBS -l$ac_ii" 56334+ *) 56335+ LIBS="$LIBS -l$ac_ii" 56336 ;; 56337 esac 56338 56339@@ -49122,236 +36661,206 @@ 56340 ;; 56341 -L*) 56342 ac_ii=`echo $ac_i|cut -c 3-` 56343- 56344+ 56345 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 56346- 56347+ 56348 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 56349 ai_p=$ac_ii 56350 else 56351- 56352+ 56353 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 56354- 56355+ 56356 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56357 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 56358 fi 56359 56360- 56361+ 56362 if test "$ext_shared" = "yes"; then 56363 LDFLAGS="-L$ai_p $LDFLAGS" 56364 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 56365 else 56366- 56367- 56368- 56369+ 56370+ 56371+ 56372 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56373- 56374+ 56375 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56376 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56377 eval "LIBPATH$unique=set" 56378- 56379+ 56380 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56381 LDFLAGS="$LDFLAGS -L$ai_p" 56382 PHP_RPATHS="$PHP_RPATHS $ai_p" 56383- 56384+ 56385 fi 56386 56387 56388 fi 56389- 56390+ 56391 fi 56392 56393 ;; 56394 esac 56395 done 56396 56397- echo "$as_me:$LINENO: checking for png_write_image in -lpng" >&5 56398-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6 56399-if test "${ac_cv_lib_png_png_write_image+set}" = set; then 56400- echo $ECHO_N "(cached) $ECHO_C" >&6 56401+ echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 56402+echo "configure:36708: checking for png_write_image in -lpng" >&5 56403+ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` 56404+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56405+ echo $ac_n "(cached) $ac_c" 1>&6 56406 else 56407- ac_check_lib_save_LIBS=$LIBS 56408+ ac_save_LIBS="$LIBS" 56409 LIBS="-lpng $LIBS" 56410-cat >conftest.$ac_ext <<_ACEOF 56411-/* confdefs.h. */ 56412-_ACEOF 56413-cat confdefs.h >>conftest.$ac_ext 56414-cat >>conftest.$ac_ext <<_ACEOF 56415-/* end confdefs.h. */ 56416- 56417+cat > conftest.$ac_ext <<EOF 56418+#line 36716 "configure" 56419+#include "confdefs.h" 56420 /* Override any gcc2 internal prototype to avoid an error. */ 56421-#ifdef __cplusplus 56422-extern "C" 56423-#endif 56424 /* We use char because int might match the return type of a gcc2 56425- builtin and then its argument prototype would still apply. */ 56426-char png_write_image (); 56427-int 56428-main () 56429-{ 56430-png_write_image (); 56431- ; 56432- return 0; 56433-} 56434-_ACEOF 56435-rm -f conftest.$ac_objext conftest$ac_exeext 56436-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 56437- (eval $ac_link) 2>conftest.er1 56438- ac_status=$? 56439- grep -v '^ *+' conftest.er1 >conftest.err 56440- rm -f conftest.er1 56441- cat conftest.err >&5 56442- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56443- (exit $ac_status); } && 56444- { ac_try='test -z "$ac_c_werror_flag" 56445- || test ! -s conftest.err' 56446- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 56447- (eval $ac_try) 2>&5 56448- ac_status=$? 56449- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56450- (exit $ac_status); }; } && 56451- { ac_try='test -s conftest$ac_exeext' 56452- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 56453- (eval $ac_try) 2>&5 56454- ac_status=$? 56455- echo "$as_me:$LINENO: \$? = $ac_status" >&5 56456- (exit $ac_status); }; }; then 56457- ac_cv_lib_png_png_write_image=yes 56458-else 56459- echo "$as_me: failed program was:" >&5 56460-sed 's/^/| /' conftest.$ac_ext >&5 56461- 56462-ac_cv_lib_png_png_write_image=no 56463-fi 56464-rm -f conftest.err conftest.$ac_objext \ 56465- conftest$ac_exeext conftest.$ac_ext 56466-LIBS=$ac_check_lib_save_LIBS 56467-fi 56468-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5 56469-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6 56470-if test $ac_cv_lib_png_png_write_image = yes; then 56471+ builtin and then its argument prototype would still apply. */ 56472+char png_write_image(); 56473+ 56474+int main() { 56475+png_write_image() 56476+; return 0; } 56477+EOF 56478+if { (eval echo configure:36727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 56479+ rm -rf conftest* 56480+ eval "ac_cv_lib_$ac_lib_var=yes" 56481+else 56482+ echo "configure: failed program was:" >&5 56483+ cat conftest.$ac_ext >&5 56484+ rm -rf conftest* 56485+ eval "ac_cv_lib_$ac_lib_var=no" 56486+fi 56487+rm -f conftest* 56488+LIBS="$ac_save_LIBS" 56489 56490+fi 56491+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 56492+ echo "$ac_t""yes" 1>&6 56493+ 56494 LDFLAGS=$save_old_LDFLAGS 56495 ext_shared=$save_ext_shared 56496- 56497- 56498+ 56499+ 56500 if test "$GD_PNG_DIR/include" != "/usr/include"; then 56501- 56502+ 56503 if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then 56504 ai_p=$GD_PNG_DIR/include 56505 else 56506- 56507+ 56508 ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 56509- 56510+ 56511 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56512 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`" 56513 fi 56514 56515- 56516- 56517+ 56518+ 56519 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56520- 56521+ 56522 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 56523 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56524 eval "INCLUDEPATH$unique=set" 56525- 56526+ 56527 if test ""; then 56528 INCLUDES="-I$ai_p $INCLUDES" 56529 else 56530 INCLUDES="$INCLUDES -I$ai_p" 56531 fi 56532- 56533+ 56534 fi 56535 56536 fi 56537 56538- 56539+ 56540 56541 if test "$ext_shared" = "yes"; then 56542 GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD" 56543 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 56544- 56545+ 56546 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56547- 56548+ 56549 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56550 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 56551 else 56552- 56553+ 56554 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56555- 56556+ 56557 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56558 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 56559 fi 56560 56561- 56562+ 56563 if test "$ext_shared" = "yes"; then 56564 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 56565 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 56566 else 56567- 56568- 56569- 56570+ 56571+ 56572+ 56573 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56574- 56575+ 56576 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56577 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56578 eval "LIBPATH$unique=set" 56579- 56580+ 56581 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56582 LDFLAGS="$LDFLAGS -L$ai_p" 56583 PHP_RPATHS="$PHP_RPATHS $ai_p" 56584- 56585+ 56586 fi 56587 56588 56589 fi 56590- 56591+ 56592 fi 56593 56594 fi 56595 else 56596- 56597+ 56598 56599 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 56600- 56601+ 56602 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56603- 56604+ 56605 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56606 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 56607 else 56608- 56609+ 56610 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56611- 56612+ 56613 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56614 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 56615 fi 56616 56617- 56618- 56619- 56620- 56621+ 56622+ 56623+ 56624+ 56625 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56626- 56627+ 56628 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56629 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56630 eval "LIBPATH$unique=set" 56631- 56632+ 56633 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56634 LDFLAGS="$LDFLAGS -L$ai_p" 56635 PHP_RPATHS="$PHP_RPATHS $ai_p" 56636- 56637+ 56638 fi 56639 56640 56641- 56642+ 56643 fi 56644 56645 fi 56646- 56647- 56648+ 56649+ 56650 case z in 56651 c|c_r|pthread*) ;; 56652- *) 56653- LIBS="-lz $LIBS" 56654+ *) 56655+ LIBS="-lz $LIBS" 56656 ;; 56657 esac 56658 56659@@ -49361,94 +36870,94 @@ 56660 fi 56661 56662 56663- 56664+ 56665 56666 if test "$ext_shared" = "yes"; then 56667 GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD" 56668 if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then 56669- 56670+ 56671 if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56672- 56673+ 56674 if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56675 ai_p=$GD_PNG_DIR/$PHP_LIBDIR 56676 else 56677- 56678+ 56679 ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56680- 56681+ 56682 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56683 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" 56684 fi 56685 56686- 56687+ 56688 if test "$ext_shared" = "yes"; then 56689 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 56690 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 56691 else 56692- 56693- 56694- 56695+ 56696+ 56697+ 56698 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56699- 56700+ 56701 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56702 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56703 eval "LIBPATH$unique=set" 56704- 56705+ 56706 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56707 LDFLAGS="$LDFLAGS -L$ai_p" 56708 PHP_RPATHS="$PHP_RPATHS $ai_p" 56709- 56710+ 56711 fi 56712 56713 56714 fi 56715- 56716+ 56717 fi 56718 56719 fi 56720 else 56721- 56722+ 56723 56724 if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then 56725- 56726+ 56727 if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 56728- 56729+ 56730 if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 56731 ai_p=$GD_PNG_DIR/$PHP_LIBDIR 56732 else 56733- 56734+ 56735 ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 56736- 56737+ 56738 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56739 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" 56740 fi 56741 56742- 56743- 56744- 56745- 56746+ 56747+ 56748+ 56749+ 56750 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56751- 56752+ 56753 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56754 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56755 eval "LIBPATH$unique=set" 56756- 56757+ 56758 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56759 LDFLAGS="$LDFLAGS -L$ai_p" 56760 PHP_RPATHS="$PHP_RPATHS $ai_p" 56761- 56762+ 56763 fi 56764 56765 56766- 56767+ 56768 fi 56769 56770 fi 56771- 56772- 56773+ 56774+ 56775 case png in 56776 c|c_r|pthread*) ;; 56777- *) 56778- LIBS="-lpng $LIBS" 56779+ *) 56780+ LIBS="-lpng $LIBS" 56781 ;; 56782 esac 56783 56784@@ -49458,28 +36967,26 @@ 56785 fi 56786 56787 56788- 56789- 56790+ 56791+ 56792 else 56793+ echo "$ac_t""no" 1>&6 56794 56795 LDFLAGS=$save_old_LDFLAGS 56796- ext_shared=$save_ext_shared 56797- unset ac_cv_lib_png_png_write_image 56798- 56799- { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5 56800-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;} 56801- { (exit 1); exit 1; }; } 56802- 56803- 56804+ ext_shared=$save_ext_shared 56805+ unset ac_cv_lib_png_png_write_image 56806+ 56807+ { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } 56808+ 56809+ 56810 fi 56811 56812 56813 else 56814- echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5 56815-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6 56816+ echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6 56817 fi 56818 56819- 56820+ 56821 if test "$PHP_XPM_DIR" != "no"; then 56822 56823 for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do 56824@@ -49487,9 +36994,7 @@ 56825 done 56826 56827 if test -z "$GD_XPM_DIR"; then 56828- { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5 56829-echo "$as_me: error: libXpm.(a|so) not found." >&2;} 56830- { (exit 1); exit 1; }; } 56831+ { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; } 56832 fi 56833 56834 for i in include include/X11; do 56835@@ -49497,30 +37002,28 @@ 56836 done 56837 56838 if test -z "$GD_XPM_INC"; then 56839- { { echo "$as_me:$LINENO: error: xpm.h not found." >&5 56840-echo "$as_me: error: xpm.h not found." >&2;} 56841- { (exit 1); exit 1; }; } 56842+ { echo "configure: error: xpm.h not found." 1>&2; exit 1; } 56843 fi 56844 56845- 56846+ 56847 save_old_LDFLAGS=$LDFLAGS 56848 ac_stuff=" 56849 -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 56850 " 56851- 56852+ 56853 save_ext_shared=$ext_shared 56854 ext_shared=yes 56855- 56856+ 56857 for ac_i in $ac_stuff; do 56858 case $ac_i in 56859 -pthread) 56860 if test "$ext_shared" = "yes"; then 56861 LDFLAGS="$LDFLAGS -pthread" 56862 else 56863- 56864- 56865+ 56866+ 56867 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 56868- 56869+ 56870 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 56871 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56872 eval "EXTRA_LDFLAGS$unique=set" 56873@@ -49531,20 +37034,20 @@ 56874 ;; 56875 -l*) 56876 ac_ii=`echo $ac_i|cut -c 3-` 56877- 56878- 56879+ 56880+ 56881 case $ac_ii in 56882 c|c_r|pthread*) ;; 56883- *) 56884+ *) 56885 if test "$ext_shared" = "yes"; then 56886- LDFLAGS="$LDFLAGS -l$ac_ii" 56887+ LDFLAGS="$LDFLAGS -l$ac_ii" 56888 else 56889- 56890- 56891+ 56892+ 56893 case $ac_ii in 56894 c|c_r|pthread*) ;; 56895- *) 56896- LIBS="$LIBS -l$ac_ii" 56897+ *) 56898+ LIBS="$LIBS -l$ac_ii" 56899 ;; 56900 esac 56901 56902@@ -49557,236 +37060,206 @@ 56903 ;; 56904 -L*) 56905 ac_ii=`echo $ac_i|cut -c 3-` 56906- 56907+ 56908 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 56909- 56910+ 56911 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 56912 ai_p=$ac_ii 56913 else 56914- 56915+ 56916 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 56917- 56918+ 56919 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 56920 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 56921 fi 56922 56923- 56924+ 56925 if test "$ext_shared" = "yes"; then 56926 LDFLAGS="-L$ai_p $LDFLAGS" 56927 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 56928 else 56929- 56930- 56931- 56932+ 56933+ 56934+ 56935 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 56936- 56937+ 56938 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 56939 if test -n "$unique" && test "`eval $cmd`" = "" ; then 56940 eval "LIBPATH$unique=set" 56941- 56942+ 56943 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 56944 LDFLAGS="$LDFLAGS -L$ai_p" 56945 PHP_RPATHS="$PHP_RPATHS $ai_p" 56946- 56947+ 56948 fi 56949 56950 56951 fi 56952- 56953+ 56954 fi 56955 56956 ;; 56957 esac 56958 done 56959 56960- echo "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5 56961-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6 56962-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then 56963- echo $ECHO_N "(cached) $ECHO_C" >&6 56964+ echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 56965+echo "configure:37107: checking for XpmFreeXpmImage in -lXpm" >&5 56966+ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` 56967+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 56968+ echo $ac_n "(cached) $ac_c" 1>&6 56969 else 56970- ac_check_lib_save_LIBS=$LIBS 56971+ ac_save_LIBS="$LIBS" 56972 LIBS="-lXpm $LIBS" 56973-cat >conftest.$ac_ext <<_ACEOF 56974-/* confdefs.h. */ 56975-_ACEOF 56976-cat confdefs.h >>conftest.$ac_ext 56977-cat >>conftest.$ac_ext <<_ACEOF 56978-/* end confdefs.h. */ 56979- 56980+cat > conftest.$ac_ext <<EOF 56981+#line 37115 "configure" 56982+#include "confdefs.h" 56983 /* Override any gcc2 internal prototype to avoid an error. */ 56984-#ifdef __cplusplus 56985-extern "C" 56986-#endif 56987 /* We use char because int might match the return type of a gcc2 56988- builtin and then its argument prototype would still apply. */ 56989-char XpmFreeXpmImage (); 56990-int 56991-main () 56992-{ 56993-XpmFreeXpmImage (); 56994- ; 56995- return 0; 56996-} 56997-_ACEOF 56998-rm -f conftest.$ac_objext conftest$ac_exeext 56999-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 57000- (eval $ac_link) 2>conftest.er1 57001- ac_status=$? 57002- grep -v '^ *+' conftest.er1 >conftest.err 57003- rm -f conftest.er1 57004- cat conftest.err >&5 57005- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57006- (exit $ac_status); } && 57007- { ac_try='test -z "$ac_c_werror_flag" 57008- || test ! -s conftest.err' 57009- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 57010- (eval $ac_try) 2>&5 57011- ac_status=$? 57012- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57013- (exit $ac_status); }; } && 57014- { ac_try='test -s conftest$ac_exeext' 57015- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 57016- (eval $ac_try) 2>&5 57017- ac_status=$? 57018- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57019- (exit $ac_status); }; }; then 57020- ac_cv_lib_Xpm_XpmFreeXpmImage=yes 57021-else 57022- echo "$as_me: failed program was:" >&5 57023-sed 's/^/| /' conftest.$ac_ext >&5 57024- 57025-ac_cv_lib_Xpm_XpmFreeXpmImage=no 57026-fi 57027-rm -f conftest.err conftest.$ac_objext \ 57028- conftest$ac_exeext conftest.$ac_ext 57029-LIBS=$ac_check_lib_save_LIBS 57030-fi 57031-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 57032-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6 57033-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then 57034+ builtin and then its argument prototype would still apply. */ 57035+char XpmFreeXpmImage(); 57036+ 57037+int main() { 57038+XpmFreeXpmImage() 57039+; return 0; } 57040+EOF 57041+if { (eval echo configure:37126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 57042+ rm -rf conftest* 57043+ eval "ac_cv_lib_$ac_lib_var=yes" 57044+else 57045+ echo "configure: failed program was:" >&5 57046+ cat conftest.$ac_ext >&5 57047+ rm -rf conftest* 57048+ eval "ac_cv_lib_$ac_lib_var=no" 57049+fi 57050+rm -f conftest* 57051+LIBS="$ac_save_LIBS" 57052 57053+fi 57054+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57055+ echo "$ac_t""yes" 1>&6 57056+ 57057 LDFLAGS=$save_old_LDFLAGS 57058 ext_shared=$save_ext_shared 57059- 57060- 57061+ 57062+ 57063 if test "$GD_XPM_INC" != "/usr/include"; then 57064- 57065+ 57066 if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then 57067 ai_p=$GD_XPM_INC 57068 else 57069- 57070+ 57071 ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`" 57072- 57073+ 57074 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57075 ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`" 57076 fi 57077 57078- 57079- 57080+ 57081+ 57082 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57083- 57084+ 57085 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 57086 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57087 eval "INCLUDEPATH$unique=set" 57088- 57089+ 57090 if test ""; then 57091 INCLUDES="-I$ai_p $INCLUDES" 57092 else 57093 INCLUDES="$INCLUDES -I$ai_p" 57094 fi 57095- 57096+ 57097 fi 57098 57099 fi 57100 57101- 57102+ 57103 57104 if test "$ext_shared" = "yes"; then 57105 GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD" 57106 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 57107- 57108+ 57109 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57110- 57111+ 57112 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57113 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 57114 else 57115- 57116+ 57117 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57118- 57119+ 57120 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57121 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 57122 fi 57123 57124- 57125+ 57126 if test "$ext_shared" = "yes"; then 57127 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 57128 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 57129 else 57130- 57131- 57132- 57133+ 57134+ 57135+ 57136 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57137- 57138+ 57139 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57140 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57141 eval "LIBPATH$unique=set" 57142- 57143+ 57144 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57145 LDFLAGS="$LDFLAGS -L$ai_p" 57146 PHP_RPATHS="$PHP_RPATHS $ai_p" 57147- 57148+ 57149 fi 57150 57151 57152 fi 57153- 57154+ 57155 fi 57156 57157 fi 57158 else 57159- 57160+ 57161 57162 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 57163- 57164+ 57165 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57166- 57167+ 57168 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57169 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 57170 else 57171- 57172+ 57173 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57174- 57175+ 57176 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57177 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 57178 fi 57179 57180- 57181- 57182- 57183- 57184+ 57185+ 57186+ 57187+ 57188 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57189- 57190+ 57191 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57192 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57193 eval "LIBPATH$unique=set" 57194- 57195+ 57196 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57197 LDFLAGS="$LDFLAGS -L$ai_p" 57198 PHP_RPATHS="$PHP_RPATHS $ai_p" 57199- 57200+ 57201 fi 57202 57203 57204- 57205+ 57206 fi 57207 57208 fi 57209- 57210- 57211+ 57212+ 57213 case Xpm in 57214 c|c_r|pthread*) ;; 57215- *) 57216- LIBS="-lXpm $LIBS" 57217+ *) 57218+ LIBS="-lXpm $LIBS" 57219 ;; 57220 esac 57221 57222@@ -49796,94 +37269,94 @@ 57223 fi 57224 57225 57226- 57227+ 57228 57229 if test "$ext_shared" = "yes"; then 57230 GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD" 57231 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 57232- 57233+ 57234 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57235- 57236+ 57237 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57238 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 57239 else 57240- 57241+ 57242 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57243- 57244+ 57245 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57246 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 57247 fi 57248 57249- 57250+ 57251 if test "$ext_shared" = "yes"; then 57252 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 57253 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 57254 else 57255- 57256- 57257- 57258+ 57259+ 57260+ 57261 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57262- 57263+ 57264 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57265 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57266 eval "LIBPATH$unique=set" 57267- 57268+ 57269 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57270 LDFLAGS="$LDFLAGS -L$ai_p" 57271 PHP_RPATHS="$PHP_RPATHS $ai_p" 57272- 57273+ 57274 fi 57275 57276 57277 fi 57278- 57279+ 57280 fi 57281 57282 fi 57283 else 57284- 57285+ 57286 57287 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 57288- 57289+ 57290 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57291- 57292+ 57293 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57294 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 57295 else 57296- 57297+ 57298 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57299- 57300+ 57301 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57302 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 57303 fi 57304 57305- 57306- 57307- 57308- 57309+ 57310+ 57311+ 57312+ 57313 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57314- 57315+ 57316 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57317 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57318 eval "LIBPATH$unique=set" 57319- 57320+ 57321 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57322 LDFLAGS="$LDFLAGS -L$ai_p" 57323 PHP_RPATHS="$PHP_RPATHS $ai_p" 57324- 57325+ 57326 fi 57327 57328 57329- 57330+ 57331 fi 57332 57333 fi 57334- 57335- 57336+ 57337+ 57338 case X11 in 57339 c|c_r|pthread*) ;; 57340- *) 57341- LIBS="-lX11 $LIBS" 57342+ *) 57343+ LIBS="-lX11 $LIBS" 57344 ;; 57345 esac 57346 57347@@ -49893,27 +37366,25 @@ 57348 fi 57349 57350 57351- 57352- 57353+ 57354+ 57355 else 57356+ echo "$ac_t""no" 1>&6 57357 57358 LDFLAGS=$save_old_LDFLAGS 57359 ext_shared=$save_ext_shared 57360 unset ac_cv_lib_Xpm_XpmFreeXpmImage 57361- 57362- { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5 57363-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;} 57364- { (exit 1); exit 1; }; } 57365- 57366- 57367+ 57368+ { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } 57369+ 57370+ 57371 fi 57372 57373 else 57374- echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5 57375-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6 57376+ echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6 57377 fi 57378 57379- 57380+ 57381 if test "$PHP_FREETYPE_DIR" != "no"; then 57382 57383 for i in $PHP_FREETYPE_DIR /usr/local /usr; do 57384@@ -49925,30 +37396,28 @@ 57385 done 57386 57387 if test -z "$FREETYPE2_DIR"; then 57388- { { echo "$as_me:$LINENO: error: freetype.h not found." >&5 57389-echo "$as_me: error: freetype.h not found." >&2;} 57390- { (exit 1); exit 1; }; } 57391+ { echo "configure: error: freetype.h not found." 1>&2; exit 1; } 57392 fi 57393 57394- 57395+ 57396 save_old_LDFLAGS=$LDFLAGS 57397 ac_stuff=" 57398 -L$FREETYPE2_DIR/$PHP_LIBDIR 57399 " 57400- 57401+ 57402 save_ext_shared=$ext_shared 57403 ext_shared=yes 57404- 57405+ 57406 for ac_i in $ac_stuff; do 57407 case $ac_i in 57408 -pthread) 57409 if test "$ext_shared" = "yes"; then 57410 LDFLAGS="$LDFLAGS -pthread" 57411 else 57412- 57413- 57414+ 57415+ 57416 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 57417- 57418+ 57419 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 57420 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57421 eval "EXTRA_LDFLAGS$unique=set" 57422@@ -49959,20 +37428,20 @@ 57423 ;; 57424 -l*) 57425 ac_ii=`echo $ac_i|cut -c 3-` 57426- 57427- 57428+ 57429+ 57430 case $ac_ii in 57431 c|c_r|pthread*) ;; 57432- *) 57433+ *) 57434 if test "$ext_shared" = "yes"; then 57435- LDFLAGS="$LDFLAGS -l$ac_ii" 57436+ LDFLAGS="$LDFLAGS -l$ac_ii" 57437 else 57438- 57439- 57440+ 57441+ 57442 case $ac_ii in 57443 c|c_r|pthread*) ;; 57444- *) 57445- LIBS="$LIBS -l$ac_ii" 57446+ *) 57447+ LIBS="$LIBS -l$ac_ii" 57448 ;; 57449 esac 57450 57451@@ -49985,205 +37454,175 @@ 57452 ;; 57453 -L*) 57454 ac_ii=`echo $ac_i|cut -c 3-` 57455- 57456+ 57457 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 57458- 57459+ 57460 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 57461 ai_p=$ac_ii 57462 else 57463- 57464+ 57465 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 57466- 57467+ 57468 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57469 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 57470 fi 57471 57472- 57473+ 57474 if test "$ext_shared" = "yes"; then 57475 LDFLAGS="-L$ai_p $LDFLAGS" 57476 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 57477 else 57478- 57479- 57480- 57481+ 57482+ 57483+ 57484 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57485- 57486+ 57487 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57488 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57489 eval "LIBPATH$unique=set" 57490- 57491+ 57492 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57493 LDFLAGS="$LDFLAGS -L$ai_p" 57494 PHP_RPATHS="$PHP_RPATHS $ai_p" 57495- 57496+ 57497 fi 57498 57499 57500 fi 57501- 57502+ 57503 fi 57504 57505 ;; 57506 esac 57507 done 57508 57509- echo "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5 57510-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6 57511-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then 57512- echo $ECHO_N "(cached) $ECHO_C" >&6 57513+ echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 57514+echo "configure:37501: checking for FT_New_Face in -lfreetype" >&5 57515+ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` 57516+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 57517+ echo $ac_n "(cached) $ac_c" 1>&6 57518 else 57519- ac_check_lib_save_LIBS=$LIBS 57520+ ac_save_LIBS="$LIBS" 57521 LIBS="-lfreetype $LIBS" 57522-cat >conftest.$ac_ext <<_ACEOF 57523-/* confdefs.h. */ 57524-_ACEOF 57525-cat confdefs.h >>conftest.$ac_ext 57526-cat >>conftest.$ac_ext <<_ACEOF 57527-/* end confdefs.h. */ 57528- 57529+cat > conftest.$ac_ext <<EOF 57530+#line 37509 "configure" 57531+#include "confdefs.h" 57532 /* Override any gcc2 internal prototype to avoid an error. */ 57533-#ifdef __cplusplus 57534-extern "C" 57535-#endif 57536 /* We use char because int might match the return type of a gcc2 57537- builtin and then its argument prototype would still apply. */ 57538-char FT_New_Face (); 57539-int 57540-main () 57541-{ 57542-FT_New_Face (); 57543- ; 57544- return 0; 57545-} 57546-_ACEOF 57547-rm -f conftest.$ac_objext conftest$ac_exeext 57548-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 57549- (eval $ac_link) 2>conftest.er1 57550- ac_status=$? 57551- grep -v '^ *+' conftest.er1 >conftest.err 57552- rm -f conftest.er1 57553- cat conftest.err >&5 57554- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57555- (exit $ac_status); } && 57556- { ac_try='test -z "$ac_c_werror_flag" 57557- || test ! -s conftest.err' 57558- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 57559- (eval $ac_try) 2>&5 57560- ac_status=$? 57561- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57562- (exit $ac_status); }; } && 57563- { ac_try='test -s conftest$ac_exeext' 57564- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 57565- (eval $ac_try) 2>&5 57566- ac_status=$? 57567- echo "$as_me:$LINENO: \$? = $ac_status" >&5 57568- (exit $ac_status); }; }; then 57569- ac_cv_lib_freetype_FT_New_Face=yes 57570-else 57571- echo "$as_me: failed program was:" >&5 57572-sed 's/^/| /' conftest.$ac_ext >&5 57573- 57574-ac_cv_lib_freetype_FT_New_Face=no 57575-fi 57576-rm -f conftest.err conftest.$ac_objext \ 57577- conftest$ac_exeext conftest.$ac_ext 57578-LIBS=$ac_check_lib_save_LIBS 57579-fi 57580-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5 57581-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6 57582-if test $ac_cv_lib_freetype_FT_New_Face = yes; then 57583+ builtin and then its argument prototype would still apply. */ 57584+char FT_New_Face(); 57585+ 57586+int main() { 57587+FT_New_Face() 57588+; return 0; } 57589+EOF 57590+if { (eval echo configure:37520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 57591+ rm -rf conftest* 57592+ eval "ac_cv_lib_$ac_lib_var=yes" 57593+else 57594+ echo "configure: failed program was:" >&5 57595+ cat conftest.$ac_ext >&5 57596+ rm -rf conftest* 57597+ eval "ac_cv_lib_$ac_lib_var=no" 57598+fi 57599+rm -f conftest* 57600+LIBS="$ac_save_LIBS" 57601 57602+fi 57603+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 57604+ echo "$ac_t""yes" 1>&6 57605+ 57606 LDFLAGS=$save_old_LDFLAGS 57607 ext_shared=$save_ext_shared 57608- 57609- 57610+ 57611+ 57612 57613 if test "$ext_shared" = "yes"; then 57614 GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD" 57615 if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then 57616- 57617+ 57618 if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57619- 57620+ 57621 if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57622 ai_p=$FREETYPE2_DIR/$PHP_LIBDIR 57623 else 57624- 57625+ 57626 ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57627- 57628+ 57629 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57630 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" 57631 fi 57632 57633- 57634+ 57635 if test "$ext_shared" = "yes"; then 57636 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 57637 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 57638 else 57639- 57640- 57641- 57642+ 57643+ 57644+ 57645 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57646- 57647+ 57648 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57649 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57650 eval "LIBPATH$unique=set" 57651- 57652+ 57653 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57654 LDFLAGS="$LDFLAGS -L$ai_p" 57655 PHP_RPATHS="$PHP_RPATHS $ai_p" 57656- 57657+ 57658 fi 57659 57660 57661 fi 57662- 57663+ 57664 fi 57665 57666 fi 57667 else 57668- 57669+ 57670 57671 if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then 57672- 57673+ 57674 if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then 57675- 57676+ 57677 if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 57678 ai_p=$FREETYPE2_DIR/$PHP_LIBDIR 57679 else 57680- 57681+ 57682 ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 57683- 57684+ 57685 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57686 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" 57687 fi 57688 57689- 57690- 57691- 57692- 57693+ 57694+ 57695+ 57696+ 57697 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57698- 57699+ 57700 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57701 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57702 eval "LIBPATH$unique=set" 57703- 57704+ 57705 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57706 LDFLAGS="$LDFLAGS -L$ai_p" 57707 PHP_RPATHS="$PHP_RPATHS $ai_p" 57708- 57709+ 57710 fi 57711 57712 57713- 57714+ 57715 fi 57716 57717 fi 57718- 57719- 57720+ 57721+ 57722 case freetype in 57723 c|c_r|pthread*) ;; 57724- *) 57725- LIBS="-lfreetype $LIBS" 57726+ *) 57727+ LIBS="-lfreetype $LIBS" 57728 ;; 57729 esac 57730 57731@@ -50193,104 +37632,99 @@ 57732 fi 57733 57734 57735- 57736+ 57737 if test "$FREETYPE2_DIR/include" != "/usr/include"; then 57738- 57739+ 57740 if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then 57741 ai_p=$FREETYPE2_DIR/include 57742 else 57743- 57744+ 57745 ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 57746- 57747+ 57748 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57749 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`" 57750 fi 57751 57752- 57753- 57754+ 57755+ 57756 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57757- 57758+ 57759 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 57760 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57761 eval "INCLUDEPATH$unique=set" 57762- 57763+ 57764 if test ""; then 57765 INCLUDES="-I$ai_p $INCLUDES" 57766 else 57767 INCLUDES="$INCLUDES -I$ai_p" 57768 fi 57769- 57770+ 57771 fi 57772 57773 fi 57774 57775- 57776+ 57777 if test "$FREETYPE2_INC_DIR" != "/usr/include"; then 57778- 57779+ 57780 if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then 57781 ai_p=$FREETYPE2_INC_DIR 57782 else 57783- 57784+ 57785 ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 57786- 57787+ 57788 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57789 ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`" 57790 fi 57791 57792- 57793- 57794+ 57795+ 57796 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57797- 57798+ 57799 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 57800 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57801 eval "INCLUDEPATH$unique=set" 57802- 57803+ 57804 if test ""; then 57805 INCLUDES="-I$ai_p $INCLUDES" 57806 else 57807 INCLUDES="$INCLUDES -I$ai_p" 57808 fi 57809- 57810+ 57811 fi 57812 57813 fi 57814 57815- 57816-cat >>confdefs.h <<\_ACEOF 57817+ cat >> confdefs.h <<\EOF 57818 #define USE_GD_IMGSTRTTF 1 57819-_ACEOF 57820- 57821+EOF 57822 57823-cat >>confdefs.h <<\_ACEOF 57824+ cat >> confdefs.h <<\EOF 57825 #define HAVE_LIBFREETYPE 1 57826-_ACEOF 57827- 57828+EOF 57829 57830-cat >>confdefs.h <<\_ACEOF 57831+ cat >> confdefs.h <<\EOF 57832 #define ENABLE_GD_TTF 1 57833-_ACEOF 57834- 57835- 57836+EOF 57837 57838+ 57839+ 57840 else 57841+ echo "$ac_t""no" 1>&6 57842 57843 LDFLAGS=$save_old_LDFLAGS 57844 ext_shared=$save_ext_shared 57845 unset ac_cv_lib_freetype_FT_New_Face 57846- 57847- { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5 57848-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;} 57849- { (exit 1); exit 1; }; } 57850- 57851- 57852+ 57853+ { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; } 57854+ 57855+ 57856 fi 57857 57858 else 57859- echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5 57860-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6 57861+ echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6 57862 fi 57863 57864- 57865+ 57866 if test "$PHP_T1LIB" != "no"; then 57867 57868 for i in $PHP_T1LIB /usr/local /usr; do 57869@@ -50298,30 +37732,28 @@ 57870 done 57871 57872 if test -z "$GD_T1_DIR"; then 57873- { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5 57874-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;} 57875- { (exit 1); exit 1; }; } 57876+ { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } 57877 fi 57878 57879- 57880+ 57881 save_old_LDFLAGS=$LDFLAGS 57882 ac_stuff=" 57883 -L$GD_T1_DIR/$PHP_LIBDIR 57884 " 57885- 57886+ 57887 save_ext_shared=$ext_shared 57888 ext_shared=yes 57889- 57890+ 57891 for ac_i in $ac_stuff; do 57892 case $ac_i in 57893 -pthread) 57894 if test "$ext_shared" = "yes"; then 57895 LDFLAGS="$LDFLAGS -pthread" 57896 else 57897- 57898- 57899+ 57900+ 57901 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 57902- 57903+ 57904 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 57905 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57906 eval "EXTRA_LDFLAGS$unique=set" 57907@@ -50332,20 +37764,20 @@ 57908 ;; 57909 -l*) 57910 ac_ii=`echo $ac_i|cut -c 3-` 57911- 57912- 57913+ 57914+ 57915 case $ac_ii in 57916 c|c_r|pthread*) ;; 57917- *) 57918+ *) 57919 if test "$ext_shared" = "yes"; then 57920- LDFLAGS="$LDFLAGS -l$ac_ii" 57921+ LDFLAGS="$LDFLAGS -l$ac_ii" 57922 else 57923- 57924- 57925+ 57926+ 57927 case $ac_ii in 57928 c|c_r|pthread*) ;; 57929- *) 57930- LIBS="$LIBS -l$ac_ii" 57931+ *) 57932+ LIBS="$LIBS -l$ac_ii" 57933 ;; 57934 esac 57935 57936@@ -50358,241 +37790,210 @@ 57937 ;; 57938 -L*) 57939 ac_ii=`echo $ac_i|cut -c 3-` 57940- 57941+ 57942 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 57943- 57944+ 57945 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 57946 ai_p=$ac_ii 57947 else 57948- 57949+ 57950 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 57951- 57952+ 57953 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 57954 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 57955 fi 57956 57957- 57958+ 57959 if test "$ext_shared" = "yes"; then 57960 LDFLAGS="-L$ai_p $LDFLAGS" 57961 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 57962 else 57963- 57964- 57965- 57966+ 57967+ 57968+ 57969 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 57970- 57971+ 57972 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 57973 if test -n "$unique" && test "`eval $cmd`" = "" ; then 57974 eval "LIBPATH$unique=set" 57975- 57976+ 57977 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 57978 LDFLAGS="$LDFLAGS -L$ai_p" 57979 PHP_RPATHS="$PHP_RPATHS $ai_p" 57980- 57981+ 57982 fi 57983 57984 57985 fi 57986- 57987+ 57988 fi 57989 57990 ;; 57991 esac 57992 done 57993 57994- echo "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5 57995-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6 57996-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then 57997- echo $ECHO_N "(cached) $ECHO_C" >&6 57998+ echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 57999+echo "configure:37837: checking for T1_StrError in -lt1" >&5 58000+ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` 58001+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 58002+ echo $ac_n "(cached) $ac_c" 1>&6 58003 else 58004- ac_check_lib_save_LIBS=$LIBS 58005+ ac_save_LIBS="$LIBS" 58006 LIBS="-lt1 $LIBS" 58007-cat >conftest.$ac_ext <<_ACEOF 58008-/* confdefs.h. */ 58009-_ACEOF 58010-cat confdefs.h >>conftest.$ac_ext 58011-cat >>conftest.$ac_ext <<_ACEOF 58012-/* end confdefs.h. */ 58013- 58014+cat > conftest.$ac_ext <<EOF 58015+#line 37845 "configure" 58016+#include "confdefs.h" 58017 /* Override any gcc2 internal prototype to avoid an error. */ 58018-#ifdef __cplusplus 58019-extern "C" 58020-#endif 58021 /* We use char because int might match the return type of a gcc2 58022- builtin and then its argument prototype would still apply. */ 58023-char T1_StrError (); 58024-int 58025-main () 58026-{ 58027-T1_StrError (); 58028- ; 58029- return 0; 58030-} 58031-_ACEOF 58032-rm -f conftest.$ac_objext conftest$ac_exeext 58033-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 58034- (eval $ac_link) 2>conftest.er1 58035- ac_status=$? 58036- grep -v '^ *+' conftest.er1 >conftest.err 58037- rm -f conftest.er1 58038- cat conftest.err >&5 58039- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58040- (exit $ac_status); } && 58041- { ac_try='test -z "$ac_c_werror_flag" 58042- || test ! -s conftest.err' 58043- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 58044- (eval $ac_try) 2>&5 58045- ac_status=$? 58046- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58047- (exit $ac_status); }; } && 58048- { ac_try='test -s conftest$ac_exeext' 58049- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 58050- (eval $ac_try) 2>&5 58051- ac_status=$? 58052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58053- (exit $ac_status); }; }; then 58054- ac_cv_lib_t1_T1_StrError=yes 58055-else 58056- echo "$as_me: failed program was:" >&5 58057-sed 's/^/| /' conftest.$ac_ext >&5 58058- 58059-ac_cv_lib_t1_T1_StrError=no 58060-fi 58061-rm -f conftest.err conftest.$ac_objext \ 58062- conftest$ac_exeext conftest.$ac_ext 58063-LIBS=$ac_check_lib_save_LIBS 58064-fi 58065-echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5 58066-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6 58067-if test $ac_cv_lib_t1_T1_StrError = yes; then 58068+ builtin and then its argument prototype would still apply. */ 58069+char T1_StrError(); 58070+ 58071+int main() { 58072+T1_StrError() 58073+; return 0; } 58074+EOF 58075+if { (eval echo configure:37856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58076+ rm -rf conftest* 58077+ eval "ac_cv_lib_$ac_lib_var=yes" 58078+else 58079+ echo "configure: failed program was:" >&5 58080+ cat conftest.$ac_ext >&5 58081+ rm -rf conftest* 58082+ eval "ac_cv_lib_$ac_lib_var=no" 58083+fi 58084+rm -f conftest* 58085+LIBS="$ac_save_LIBS" 58086 58087+fi 58088+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 58089+ echo "$ac_t""yes" 1>&6 58090+ 58091 LDFLAGS=$save_old_LDFLAGS 58092 ext_shared=$save_ext_shared 58093- 58094- 58095-cat >>confdefs.h <<\_ACEOF 58096+ 58097+ cat >> confdefs.h <<\EOF 58098 #define HAVE_LIBT1 1 58099-_ACEOF 58100- 58101+EOF 58102 58103+ 58104 if test "$GD_T1_DIR/include" != "/usr/include"; then 58105- 58106+ 58107 if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then 58108 ai_p=$GD_T1_DIR/include 58109 else 58110- 58111+ 58112 ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 58113- 58114+ 58115 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58116 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`" 58117 fi 58118 58119- 58120- 58121+ 58122+ 58123 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58124- 58125+ 58126 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 58127 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58128 eval "INCLUDEPATH$unique=set" 58129- 58130+ 58131 if test ""; then 58132 INCLUDES="-I$ai_p $INCLUDES" 58133 else 58134 INCLUDES="$INCLUDES -I$ai_p" 58135 fi 58136- 58137+ 58138 fi 58139 58140 fi 58141 58142- 58143+ 58144 58145 if test "$ext_shared" = "yes"; then 58146 GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD" 58147 if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then 58148- 58149+ 58150 if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then 58151- 58152+ 58153 if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 58154 ai_p=$GD_T1_DIR/$PHP_LIBDIR 58155 else 58156- 58157+ 58158 ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 58159- 58160+ 58161 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58162 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" 58163 fi 58164 58165- 58166+ 58167 if test "$ext_shared" = "yes"; then 58168 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 58169 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 58170 else 58171- 58172- 58173- 58174+ 58175+ 58176+ 58177 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58178- 58179+ 58180 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 58181 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58182 eval "LIBPATH$unique=set" 58183- 58184+ 58185 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 58186 LDFLAGS="$LDFLAGS -L$ai_p" 58187 PHP_RPATHS="$PHP_RPATHS $ai_p" 58188- 58189+ 58190 fi 58191 58192 58193 fi 58194- 58195+ 58196 fi 58197 58198 fi 58199 else 58200- 58201+ 58202 58203 if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then 58204- 58205+ 58206 if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then 58207- 58208+ 58209 if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 58210 ai_p=$GD_T1_DIR/$PHP_LIBDIR 58211 else 58212- 58213+ 58214 ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 58215- 58216+ 58217 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58218 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" 58219 fi 58220 58221- 58222- 58223- 58224- 58225+ 58226+ 58227+ 58228+ 58229 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58230- 58231+ 58232 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 58233 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58234 eval "LIBPATH$unique=set" 58235- 58236+ 58237 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 58238 LDFLAGS="$LDFLAGS -L$ai_p" 58239 PHP_RPATHS="$PHP_RPATHS $ai_p" 58240- 58241+ 58242 fi 58243 58244 58245- 58246+ 58247 fi 58248 58249 fi 58250- 58251- 58252+ 58253+ 58254 case t1 in 58255 c|c_r|pthread*) ;; 58256- *) 58257- LIBS="-lt1 $LIBS" 58258+ *) 58259+ LIBS="-lt1 $LIBS" 58260 ;; 58261 esac 58262 58263@@ -50602,175 +38003,147 @@ 58264 fi 58265 58266 58267- 58268- 58269+ 58270+ 58271 else 58272+ echo "$ac_t""no" 1>&6 58273 58274 LDFLAGS=$save_old_LDFLAGS 58275 ext_shared=$save_ext_shared 58276 unset ac_cv_lib_t1_T1_StrError 58277- 58278- { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5 58279-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;} 58280- { (exit 1); exit 1; }; } 58281- 58282- 58283+ 58284+ { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } 58285+ 58286+ 58287 fi 58288 58289 fi 58290 58291 58292- 58293-cat >>confdefs.h <<\_ACEOF 58294+ cat >> confdefs.h <<\EOF 58295 #define HAVE_LIBGD 1 58296-_ACEOF 58297- 58298+EOF 58299 58300-cat >>confdefs.h <<\_ACEOF 58301+ cat >> confdefs.h <<\EOF 58302 #define HAVE_LIBGD13 1 58303-_ACEOF 58304- 58305+EOF 58306 58307-cat >>confdefs.h <<\_ACEOF 58308+ cat >> confdefs.h <<\EOF 58309 #define HAVE_LIBGD15 1 58310-_ACEOF 58311- 58312+EOF 58313 58314-cat >>confdefs.h <<\_ACEOF 58315+ cat >> confdefs.h <<\EOF 58316 #define HAVE_LIBGD20 1 58317-_ACEOF 58318- 58319+EOF 58320 58321-cat >>confdefs.h <<\_ACEOF 58322+ cat >> confdefs.h <<\EOF 58323 #define HAVE_LIBGD204 1 58324-_ACEOF 58325- 58326+EOF 58327 58328-cat >>confdefs.h <<\_ACEOF 58329+ cat >> confdefs.h <<\EOF 58330 #define HAVE_GD_IMAGESETTILE 1 58331-_ACEOF 58332- 58333+EOF 58334 58335-cat >>confdefs.h <<\_ACEOF 58336+ cat >> confdefs.h <<\EOF 58337 #define HAVE_GD_IMAGESETBRUSH 1 58338-_ACEOF 58339- 58340+EOF 58341 58342-cat >>confdefs.h <<\_ACEOF 58343+ cat >> confdefs.h <<\EOF 58344 #define HAVE_GDIMAGECOLORRESOLVE 1 58345-_ACEOF 58346- 58347+EOF 58348 58349-cat >>confdefs.h <<\_ACEOF 58350+ cat >> confdefs.h <<\EOF 58351 #define HAVE_COLORCLOSESTHWB 1 58352-_ACEOF 58353- 58354+EOF 58355 58356-cat >>confdefs.h <<\_ACEOF 58357+ cat >> confdefs.h <<\EOF 58358 #define HAVE_GD_WBMP 1 58359-_ACEOF 58360- 58361+EOF 58362 58363-cat >>confdefs.h <<\_ACEOF 58364+ cat >> confdefs.h <<\EOF 58365 #define HAVE_GD_GD2 1 58366-_ACEOF 58367- 58368+EOF 58369 58370-cat >>confdefs.h <<\_ACEOF 58371+ cat >> confdefs.h <<\EOF 58372 #define HAVE_GD_PNG 1 58373-_ACEOF 58374- 58375+EOF 58376 58377-cat >>confdefs.h <<\_ACEOF 58378+ cat >> confdefs.h <<\EOF 58379 #define HAVE_GD_XBM 1 58380-_ACEOF 58381- 58382+EOF 58383 58384-cat >>confdefs.h <<\_ACEOF 58385+ cat >> confdefs.h <<\EOF 58386 #define HAVE_GD_BUNDLED 1 58387-_ACEOF 58388- 58389+EOF 58390 58391-cat >>confdefs.h <<\_ACEOF 58392+ cat >> confdefs.h <<\EOF 58393 #define HAVE_GD_GIF_READ 1 58394-_ACEOF 58395- 58396+EOF 58397 58398-cat >>confdefs.h <<\_ACEOF 58399+ cat >> confdefs.h <<\EOF 58400 #define HAVE_GD_GIF_CREATE 1 58401-_ACEOF 58402- 58403+EOF 58404 58405-cat >>confdefs.h <<\_ACEOF 58406+ cat >> confdefs.h <<\EOF 58407 #define HAVE_GD_IMAGEELLIPSE 1 58408-_ACEOF 58409- 58410+EOF 58411 58412-cat >>confdefs.h <<\_ACEOF 58413+ cat >> confdefs.h <<\EOF 58414 #define HAVE_GD_FONTCACHESHUTDOWN 1 58415-_ACEOF 58416- 58417+EOF 58418 58419-cat >>confdefs.h <<\_ACEOF 58420+ cat >> confdefs.h <<\EOF 58421 #define HAVE_GD_FONTMUTEX 1 58422-_ACEOF 58423- 58424+EOF 58425 58426-cat >>confdefs.h <<\_ACEOF 58427+ cat >> confdefs.h <<\EOF 58428 #define HAVE_GD_DYNAMIC_CTX_EX 1 58429-_ACEOF 58430- 58431+EOF 58432 58433-cat >>confdefs.h <<\_ACEOF 58434+ cat >> confdefs.h <<\EOF 58435 #define HAVE_GD_GIF_CTX 1 58436-_ACEOF 58437+EOF 58438 58439 58440 GDLIB_CFLAGS="-DHAVE_LIBPNG" 58441 58442 58443 if test -n "$GD_JPEG_DIR"; then 58444- 58445-cat >>confdefs.h <<\_ACEOF 58446+ cat >> confdefs.h <<\EOF 58447 #define HAVE_GD_JPG 1 58448-_ACEOF 58449+EOF 58450 58451 GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG" 58452 fi 58453 58454 if test -n "$GD_XPM_DIR"; then 58455- 58456-cat >>confdefs.h <<\_ACEOF 58457+ cat >> confdefs.h <<\EOF 58458 #define HAVE_GD_XPM 1 58459-_ACEOF 58460+EOF 58461 58462 GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" 58463 fi 58464 58465 if test -n "$FREETYPE2_DIR"; then 58466- 58467-cat >>confdefs.h <<\_ACEOF 58468+ cat >> confdefs.h <<\EOF 58469 #define HAVE_GD_STRINGFT 1 58470-_ACEOF 58471- 58472+EOF 58473 58474-cat >>confdefs.h <<\_ACEOF 58475+ cat >> confdefs.h <<\EOF 58476 #define HAVE_GD_STRINGFTEX 1 58477-_ACEOF 58478- 58479+EOF 58480 58481-cat >>confdefs.h <<\_ACEOF 58482+ cat >> confdefs.h <<\EOF 58483 #define ENABLE_GD_TTF 1 58484-_ACEOF 58485+EOF 58486 58487 GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF" 58488 fi 58489 58490 if test -n "$USE_GD_JIS_CONV"; then 58491- 58492-cat >>confdefs.h <<\_ACEOF 58493+ cat >> confdefs.h <<\EOF 58494 #define USE_GD_JISX0208 1 58495-_ACEOF 58496+EOF 58497 58498 GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" 58499 fi 58500@@ -50782,7 +38155,7 @@ 58501 extra_sources="gdcache.c libgd/gd_compat.c libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c \ 58502 libgd/gd_rotate.c libgd/gd_color.c" 58503 58504- 58505+ 58506 if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then 58507 if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then 58508 PHP_ZLIB_DIR="$PHP_ZLIB_DIR" 58509@@ -50791,9 +38164,7 @@ 58510 PHP_ZLIB_DIR="$PHP_ZLIB_DIR" 58511 PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" 58512 else 58513- { { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5 58514-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;} 58515- { (exit 1); exit 1; }; } 58516+ { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } 58517 fi 58518 else 58519 for i in /usr/local /usr; do 58520@@ -50807,16 +38178,15 @@ 58521 done 58522 fi 58523 58524- 58525+ 58526 if test "$PHP_GD_NATIVE_TTF" = "yes"; then 58527- 58528-cat >>confdefs.h <<\_ACEOF 58529+ cat >> confdefs.h <<\EOF 58530 #define USE_GD_IMGSTRTTF 1 58531-_ACEOF 58532+EOF 58533 58534 fi 58535 58536- 58537+ 58538 if test "$PHP_JPEG_DIR" != "no"; then 58539 58540 for i in $PHP_JPEG_DIR /usr/local /usr; do 58541@@ -50824,30 +38194,28 @@ 58542 done 58543 58544 if test -z "$GD_JPEG_DIR"; then 58545- { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5 58546-echo "$as_me: error: jpeglib.h not found." >&2;} 58547- { (exit 1); exit 1; }; } 58548+ { echo "configure: error: jpeglib.h not found." 1>&2; exit 1; } 58549 fi 58550 58551- 58552+ 58553 save_old_LDFLAGS=$LDFLAGS 58554 ac_stuff=" 58555 -L$GD_JPEG_DIR/$PHP_LIBDIR 58556 " 58557- 58558+ 58559 save_ext_shared=$ext_shared 58560 ext_shared=yes 58561- 58562+ 58563 for ac_i in $ac_stuff; do 58564 case $ac_i in 58565 -pthread) 58566 if test "$ext_shared" = "yes"; then 58567 LDFLAGS="$LDFLAGS -pthread" 58568 else 58569- 58570- 58571+ 58572+ 58573 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 58574- 58575+ 58576 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 58577 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58578 eval "EXTRA_LDFLAGS$unique=set" 58579@@ -50858,20 +38226,20 @@ 58580 ;; 58581 -l*) 58582 ac_ii=`echo $ac_i|cut -c 3-` 58583- 58584- 58585+ 58586+ 58587 case $ac_ii in 58588 c|c_r|pthread*) ;; 58589- *) 58590+ *) 58591 if test "$ext_shared" = "yes"; then 58592- LDFLAGS="$LDFLAGS -l$ac_ii" 58593+ LDFLAGS="$LDFLAGS -l$ac_ii" 58594 else 58595- 58596- 58597+ 58598+ 58599 case $ac_ii in 58600 c|c_r|pthread*) ;; 58601- *) 58602- LIBS="$LIBS -l$ac_ii" 58603+ *) 58604+ LIBS="$LIBS -l$ac_ii" 58605 ;; 58606 esac 58607 58608@@ -50884,236 +38252,206 @@ 58609 ;; 58610 -L*) 58611 ac_ii=`echo $ac_i|cut -c 3-` 58612- 58613+ 58614 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 58615- 58616+ 58617 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 58618 ai_p=$ac_ii 58619 else 58620- 58621+ 58622 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 58623- 58624+ 58625 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58626 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 58627 fi 58628 58629- 58630+ 58631 if test "$ext_shared" = "yes"; then 58632 LDFLAGS="-L$ai_p $LDFLAGS" 58633 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 58634 else 58635- 58636- 58637- 58638+ 58639+ 58640+ 58641 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58642- 58643+ 58644 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 58645 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58646 eval "LIBPATH$unique=set" 58647- 58648+ 58649 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 58650 LDFLAGS="$LDFLAGS -L$ai_p" 58651 PHP_RPATHS="$PHP_RPATHS $ai_p" 58652- 58653+ 58654 fi 58655 58656 58657 fi 58658- 58659+ 58660 fi 58661 58662 ;; 58663 esac 58664 done 58665 58666- echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 58667-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6 58668-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then 58669- echo $ECHO_N "(cached) $ECHO_C" >&6 58670+ echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 58671+echo "configure:38299: checking for jpeg_read_header in -ljpeg" >&5 58672+ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` 58673+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 58674+ echo $ac_n "(cached) $ac_c" 1>&6 58675 else 58676- ac_check_lib_save_LIBS=$LIBS 58677+ ac_save_LIBS="$LIBS" 58678 LIBS="-ljpeg $LIBS" 58679-cat >conftest.$ac_ext <<_ACEOF 58680-/* confdefs.h. */ 58681-_ACEOF 58682-cat confdefs.h >>conftest.$ac_ext 58683-cat >>conftest.$ac_ext <<_ACEOF 58684-/* end confdefs.h. */ 58685- 58686+cat > conftest.$ac_ext <<EOF 58687+#line 38307 "configure" 58688+#include "confdefs.h" 58689 /* Override any gcc2 internal prototype to avoid an error. */ 58690-#ifdef __cplusplus 58691-extern "C" 58692-#endif 58693 /* We use char because int might match the return type of a gcc2 58694- builtin and then its argument prototype would still apply. */ 58695-char jpeg_read_header (); 58696-int 58697-main () 58698-{ 58699-jpeg_read_header (); 58700- ; 58701- return 0; 58702-} 58703-_ACEOF 58704-rm -f conftest.$ac_objext conftest$ac_exeext 58705-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 58706- (eval $ac_link) 2>conftest.er1 58707- ac_status=$? 58708- grep -v '^ *+' conftest.er1 >conftest.err 58709- rm -f conftest.er1 58710- cat conftest.err >&5 58711- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58712- (exit $ac_status); } && 58713- { ac_try='test -z "$ac_c_werror_flag" 58714- || test ! -s conftest.err' 58715- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 58716- (eval $ac_try) 2>&5 58717- ac_status=$? 58718- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58719- (exit $ac_status); }; } && 58720- { ac_try='test -s conftest$ac_exeext' 58721- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 58722- (eval $ac_try) 2>&5 58723- ac_status=$? 58724- echo "$as_me:$LINENO: \$? = $ac_status" >&5 58725- (exit $ac_status); }; }; then 58726- ac_cv_lib_jpeg_jpeg_read_header=yes 58727-else 58728- echo "$as_me: failed program was:" >&5 58729-sed 's/^/| /' conftest.$ac_ext >&5 58730- 58731-ac_cv_lib_jpeg_jpeg_read_header=no 58732-fi 58733-rm -f conftest.err conftest.$ac_objext \ 58734- conftest$ac_exeext conftest.$ac_ext 58735-LIBS=$ac_check_lib_save_LIBS 58736-fi 58737-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 58738-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6 58739-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then 58740+ builtin and then its argument prototype would still apply. */ 58741+char jpeg_read_header(); 58742+ 58743+int main() { 58744+jpeg_read_header() 58745+; return 0; } 58746+EOF 58747+if { (eval echo configure:38318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 58748+ rm -rf conftest* 58749+ eval "ac_cv_lib_$ac_lib_var=yes" 58750+else 58751+ echo "configure: failed program was:" >&5 58752+ cat conftest.$ac_ext >&5 58753+ rm -rf conftest* 58754+ eval "ac_cv_lib_$ac_lib_var=no" 58755+fi 58756+rm -f conftest* 58757+LIBS="$ac_save_LIBS" 58758 58759+fi 58760+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 58761+ echo "$ac_t""yes" 1>&6 58762+ 58763 LDFLAGS=$save_old_LDFLAGS 58764 ext_shared=$save_ext_shared 58765- 58766- 58767+ 58768+ 58769 if test "$GD_JPEG_DIR/include" != "/usr/include"; then 58770- 58771+ 58772 if test -z "$GD_JPEG_DIR/include" || echo "$GD_JPEG_DIR/include" | grep '^/' >/dev/null ; then 58773 ai_p=$GD_JPEG_DIR/include 58774 else 58775- 58776+ 58777 ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 58778- 58779+ 58780 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58781 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`" 58782 fi 58783 58784- 58785- 58786+ 58787+ 58788 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58789- 58790+ 58791 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 58792 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58793 eval "INCLUDEPATH$unique=set" 58794- 58795+ 58796 if test ""; then 58797 INCLUDES="-I$ai_p $INCLUDES" 58798 else 58799 INCLUDES="$INCLUDES -I$ai_p" 58800 fi 58801- 58802+ 58803 fi 58804 58805 fi 58806 58807- 58808+ 58809 58810 if test "$ext_shared" = "yes"; then 58811 GD_SHARED_LIBADD="-ljpeg $GD_SHARED_LIBADD" 58812 if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then 58813- 58814+ 58815 if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 58816- 58817+ 58818 if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 58819 ai_p=$GD_JPEG_DIR/$PHP_LIBDIR 58820 else 58821- 58822+ 58823 ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 58824- 58825+ 58826 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58827 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" 58828 fi 58829 58830- 58831+ 58832 if test "$ext_shared" = "yes"; then 58833 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 58834 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 58835 else 58836- 58837- 58838- 58839+ 58840+ 58841+ 58842 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58843- 58844+ 58845 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 58846 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58847 eval "LIBPATH$unique=set" 58848- 58849+ 58850 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 58851 LDFLAGS="$LDFLAGS -L$ai_p" 58852 PHP_RPATHS="$PHP_RPATHS $ai_p" 58853- 58854+ 58855 fi 58856 58857 58858 fi 58859- 58860+ 58861 fi 58862 58863 fi 58864 else 58865- 58866+ 58867 58868 if test -n "$GD_JPEG_DIR/$PHP_LIBDIR"; then 58869- 58870+ 58871 if test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_JPEG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 58872- 58873+ 58874 if test -z "$GD_JPEG_DIR/$PHP_LIBDIR" || echo "$GD_JPEG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 58875 ai_p=$GD_JPEG_DIR/$PHP_LIBDIR 58876 else 58877- 58878+ 58879 ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 58880- 58881+ 58882 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 58883 ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`" 58884 fi 58885 58886- 58887- 58888- 58889- 58890+ 58891+ 58892+ 58893+ 58894 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 58895- 58896+ 58897 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 58898 if test -n "$unique" && test "`eval $cmd`" = "" ; then 58899 eval "LIBPATH$unique=set" 58900- 58901+ 58902 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 58903 LDFLAGS="$LDFLAGS -L$ai_p" 58904 PHP_RPATHS="$PHP_RPATHS $ai_p" 58905- 58906+ 58907 fi 58908 58909 58910- 58911+ 58912 fi 58913 58914 fi 58915- 58916- 58917+ 58918+ 58919 case jpeg in 58920 c|c_r|pthread*) ;; 58921- *) 58922- LIBS="-ljpeg $LIBS" 58923+ *) 58924+ LIBS="-ljpeg $LIBS" 58925 ;; 58926 esac 58927 58928@@ -51123,27 +38461,25 @@ 58929 fi 58930 58931 58932- 58933- 58934+ 58935+ 58936 else 58937+ echo "$ac_t""no" 1>&6 58938 58939 LDFLAGS=$save_old_LDFLAGS 58940 ext_shared=$save_ext_shared 58941 unset ac_cv_lib_jpeg_jpeg_read_header 58942- 58943- { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5 58944-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;} 58945- { (exit 1); exit 1; }; } 58946- 58947- 58948+ 58949+ { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } 58950+ 58951+ 58952 fi 58953 58954 else 58955- echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5 58956-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6 58957+ echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6 58958 fi 58959 58960- 58961+ 58962 if test "$PHP_PNG_DIR" != "no"; then 58963 58964 for i in $PHP_PNG_DIR /usr/local /usr; do 58965@@ -51151,36 +38487,32 @@ 58966 done 58967 58968 if test -z "$GD_PNG_DIR"; then 58969- { { echo "$as_me:$LINENO: error: png.h not found." >&5 58970-echo "$as_me: error: png.h not found." >&2;} 58971- { (exit 1); exit 1; }; } 58972+ { echo "configure: error: png.h not found." 1>&2; exit 1; } 58973 fi 58974 58975 if test "$PHP_ZLIB_DIR" = "no"; then 58976- { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5 58977-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;} 58978- { (exit 1); exit 1; }; } 58979+ { echo "configure: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" 1>&2; exit 1; } 58980 fi 58981 58982- 58983+ 58984 save_old_LDFLAGS=$LDFLAGS 58985 ac_stuff=" 58986 -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR 58987 " 58988- 58989+ 58990 save_ext_shared=$ext_shared 58991 ext_shared=yes 58992- 58993+ 58994 for ac_i in $ac_stuff; do 58995 case $ac_i in 58996 -pthread) 58997 if test "$ext_shared" = "yes"; then 58998 LDFLAGS="$LDFLAGS -pthread" 58999 else 59000- 59001- 59002+ 59003+ 59004 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 59005- 59006+ 59007 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 59008 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59009 eval "EXTRA_LDFLAGS$unique=set" 59010@@ -51191,20 +38523,20 @@ 59011 ;; 59012 -l*) 59013 ac_ii=`echo $ac_i|cut -c 3-` 59014- 59015- 59016+ 59017+ 59018 case $ac_ii in 59019 c|c_r|pthread*) ;; 59020- *) 59021+ *) 59022 if test "$ext_shared" = "yes"; then 59023- LDFLAGS="$LDFLAGS -l$ac_ii" 59024+ LDFLAGS="$LDFLAGS -l$ac_ii" 59025 else 59026- 59027- 59028+ 59029+ 59030 case $ac_ii in 59031 c|c_r|pthread*) ;; 59032- *) 59033- LIBS="$LIBS -l$ac_ii" 59034+ *) 59035+ LIBS="$LIBS -l$ac_ii" 59036 ;; 59037 esac 59038 59039@@ -51217,236 +38549,206 @@ 59040 ;; 59041 -L*) 59042 ac_ii=`echo $ac_i|cut -c 3-` 59043- 59044+ 59045 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 59046- 59047+ 59048 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 59049 ai_p=$ac_ii 59050 else 59051- 59052+ 59053 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 59054- 59055+ 59056 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59057 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 59058 fi 59059 59060- 59061+ 59062 if test "$ext_shared" = "yes"; then 59063 LDFLAGS="-L$ai_p $LDFLAGS" 59064 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 59065 else 59066- 59067- 59068- 59069+ 59070+ 59071+ 59072 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59073- 59074+ 59075 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59076 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59077 eval "LIBPATH$unique=set" 59078- 59079+ 59080 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59081 LDFLAGS="$LDFLAGS -L$ai_p" 59082 PHP_RPATHS="$PHP_RPATHS $ai_p" 59083- 59084+ 59085 fi 59086 59087 59088 fi 59089- 59090+ 59091 fi 59092 59093 ;; 59094 esac 59095 done 59096 59097- echo "$as_me:$LINENO: checking for png_write_image in -lpng" >&5 59098-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6 59099-if test "${ac_cv_lib_png_png_write_image+set}" = set; then 59100- echo $ECHO_N "(cached) $ECHO_C" >&6 59101+ echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 59102+echo "configure:38596: checking for png_write_image in -lpng" >&5 59103+ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` 59104+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 59105+ echo $ac_n "(cached) $ac_c" 1>&6 59106 else 59107- ac_check_lib_save_LIBS=$LIBS 59108+ ac_save_LIBS="$LIBS" 59109 LIBS="-lpng $LIBS" 59110-cat >conftest.$ac_ext <<_ACEOF 59111-/* confdefs.h. */ 59112-_ACEOF 59113-cat confdefs.h >>conftest.$ac_ext 59114-cat >>conftest.$ac_ext <<_ACEOF 59115-/* end confdefs.h. */ 59116- 59117+cat > conftest.$ac_ext <<EOF 59118+#line 38604 "configure" 59119+#include "confdefs.h" 59120 /* Override any gcc2 internal prototype to avoid an error. */ 59121-#ifdef __cplusplus 59122-extern "C" 59123-#endif 59124 /* We use char because int might match the return type of a gcc2 59125- builtin and then its argument prototype would still apply. */ 59126-char png_write_image (); 59127-int 59128-main () 59129-{ 59130-png_write_image (); 59131- ; 59132- return 0; 59133-} 59134-_ACEOF 59135-rm -f conftest.$ac_objext conftest$ac_exeext 59136-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 59137- (eval $ac_link) 2>conftest.er1 59138- ac_status=$? 59139- grep -v '^ *+' conftest.er1 >conftest.err 59140- rm -f conftest.er1 59141- cat conftest.err >&5 59142- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59143- (exit $ac_status); } && 59144- { ac_try='test -z "$ac_c_werror_flag" 59145- || test ! -s conftest.err' 59146- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 59147- (eval $ac_try) 2>&5 59148- ac_status=$? 59149- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59150- (exit $ac_status); }; } && 59151- { ac_try='test -s conftest$ac_exeext' 59152- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 59153- (eval $ac_try) 2>&5 59154- ac_status=$? 59155- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59156- (exit $ac_status); }; }; then 59157- ac_cv_lib_png_png_write_image=yes 59158-else 59159- echo "$as_me: failed program was:" >&5 59160-sed 's/^/| /' conftest.$ac_ext >&5 59161- 59162-ac_cv_lib_png_png_write_image=no 59163-fi 59164-rm -f conftest.err conftest.$ac_objext \ 59165- conftest$ac_exeext conftest.$ac_ext 59166-LIBS=$ac_check_lib_save_LIBS 59167-fi 59168-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5 59169-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6 59170-if test $ac_cv_lib_png_png_write_image = yes; then 59171+ builtin and then its argument prototype would still apply. */ 59172+char png_write_image(); 59173 59174+int main() { 59175+png_write_image() 59176+; return 0; } 59177+EOF 59178+if { (eval echo configure:38615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 59179+ rm -rf conftest* 59180+ eval "ac_cv_lib_$ac_lib_var=yes" 59181+else 59182+ echo "configure: failed program was:" >&5 59183+ cat conftest.$ac_ext >&5 59184+ rm -rf conftest* 59185+ eval "ac_cv_lib_$ac_lib_var=no" 59186+fi 59187+rm -f conftest* 59188+LIBS="$ac_save_LIBS" 59189+ 59190+fi 59191+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 59192+ echo "$ac_t""yes" 1>&6 59193+ 59194 LDFLAGS=$save_old_LDFLAGS 59195 ext_shared=$save_ext_shared 59196- 59197- 59198+ 59199+ 59200 if test "$GD_PNG_DIR/include" != "/usr/include"; then 59201- 59202+ 59203 if test -z "$GD_PNG_DIR/include" || echo "$GD_PNG_DIR/include" | grep '^/' >/dev/null ; then 59204 ai_p=$GD_PNG_DIR/include 59205 else 59206- 59207+ 59208 ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 59209- 59210+ 59211 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59212 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`" 59213 fi 59214 59215- 59216- 59217+ 59218+ 59219 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59220- 59221+ 59222 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 59223 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59224 eval "INCLUDEPATH$unique=set" 59225- 59226+ 59227 if test ""; then 59228 INCLUDES="-I$ai_p $INCLUDES" 59229 else 59230 INCLUDES="$INCLUDES -I$ai_p" 59231 fi 59232- 59233+ 59234 fi 59235 59236 fi 59237 59238- 59239+ 59240 59241 if test "$ext_shared" = "yes"; then 59242 GD_SHARED_LIBADD="-lz $GD_SHARED_LIBADD" 59243 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 59244- 59245+ 59246 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59247- 59248+ 59249 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59250 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 59251 else 59252- 59253+ 59254 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59255- 59256+ 59257 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59258 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 59259 fi 59260 59261- 59262+ 59263 if test "$ext_shared" = "yes"; then 59264 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 59265 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 59266 else 59267- 59268- 59269- 59270+ 59271+ 59272+ 59273 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59274- 59275+ 59276 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59277 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59278 eval "LIBPATH$unique=set" 59279- 59280+ 59281 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59282 LDFLAGS="$LDFLAGS -L$ai_p" 59283 PHP_RPATHS="$PHP_RPATHS $ai_p" 59284- 59285+ 59286 fi 59287 59288 59289 fi 59290- 59291+ 59292 fi 59293 59294 fi 59295 else 59296- 59297+ 59298 59299 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 59300- 59301+ 59302 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59303- 59304+ 59305 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59306 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 59307 else 59308- 59309+ 59310 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59311- 59312+ 59313 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59314 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 59315 fi 59316 59317- 59318- 59319- 59320- 59321+ 59322+ 59323+ 59324+ 59325 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59326- 59327+ 59328 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59329 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59330 eval "LIBPATH$unique=set" 59331- 59332+ 59333 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59334 LDFLAGS="$LDFLAGS -L$ai_p" 59335 PHP_RPATHS="$PHP_RPATHS $ai_p" 59336- 59337+ 59338 fi 59339 59340 59341- 59342+ 59343 fi 59344 59345 fi 59346- 59347- 59348+ 59349+ 59350 case z in 59351 c|c_r|pthread*) ;; 59352- *) 59353- LIBS="-lz $LIBS" 59354+ *) 59355+ LIBS="-lz $LIBS" 59356 ;; 59357 esac 59358 59359@@ -51456,94 +38758,94 @@ 59360 fi 59361 59362 59363- 59364+ 59365 59366 if test "$ext_shared" = "yes"; then 59367 GD_SHARED_LIBADD="-lpng $GD_SHARED_LIBADD" 59368 if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then 59369- 59370+ 59371 if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59372- 59373+ 59374 if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59375 ai_p=$GD_PNG_DIR/$PHP_LIBDIR 59376 else 59377- 59378+ 59379 ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59380- 59381+ 59382 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59383 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" 59384 fi 59385 59386- 59387+ 59388 if test "$ext_shared" = "yes"; then 59389 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 59390 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 59391 else 59392- 59393- 59394- 59395+ 59396+ 59397+ 59398 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59399- 59400+ 59401 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59402 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59403 eval "LIBPATH$unique=set" 59404- 59405+ 59406 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59407 LDFLAGS="$LDFLAGS -L$ai_p" 59408 PHP_RPATHS="$PHP_RPATHS $ai_p" 59409- 59410+ 59411 fi 59412 59413 59414 fi 59415- 59416+ 59417 fi 59418 59419 fi 59420 else 59421- 59422+ 59423 59424 if test -n "$GD_PNG_DIR/$PHP_LIBDIR"; then 59425- 59426+ 59427 if test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_PNG_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59428- 59429+ 59430 if test -z "$GD_PNG_DIR/$PHP_LIBDIR" || echo "$GD_PNG_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59431 ai_p=$GD_PNG_DIR/$PHP_LIBDIR 59432 else 59433- 59434+ 59435 ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59436- 59437+ 59438 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59439 ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`" 59440 fi 59441 59442- 59443- 59444- 59445- 59446+ 59447+ 59448+ 59449+ 59450 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59451- 59452+ 59453 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59454 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59455 eval "LIBPATH$unique=set" 59456- 59457+ 59458 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59459 LDFLAGS="$LDFLAGS -L$ai_p" 59460 PHP_RPATHS="$PHP_RPATHS $ai_p" 59461- 59462+ 59463 fi 59464 59465 59466- 59467+ 59468 fi 59469 59470 fi 59471- 59472- 59473+ 59474+ 59475 case png in 59476 c|c_r|pthread*) ;; 59477- *) 59478- LIBS="-lpng $LIBS" 59479+ *) 59480+ LIBS="-lpng $LIBS" 59481 ;; 59482 esac 59483 59484@@ -51553,28 +38855,26 @@ 59485 fi 59486 59487 59488- 59489- 59490+ 59491+ 59492 else 59493+ echo "$ac_t""no" 1>&6 59494 59495 LDFLAGS=$save_old_LDFLAGS 59496 ext_shared=$save_ext_shared 59497 unset ac_cv_lib_png_png_write_image 59498- 59499- { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5 59500-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;} 59501- { (exit 1); exit 1; }; } 59502- 59503- 59504+ 59505+ { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } 59506+ 59507+ 59508 fi 59509 59510 59511 else 59512- echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5 59513-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6 59514+ echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6 59515 fi 59516 59517- 59518+ 59519 if test "$PHP_XPM_DIR" != "no"; then 59520 59521 for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do 59522@@ -51582,9 +38882,7 @@ 59523 done 59524 59525 if test -z "$GD_XPM_DIR"; then 59526- { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5 59527-echo "$as_me: error: libXpm.(a|so) not found." >&2;} 59528- { (exit 1); exit 1; }; } 59529+ { echo "configure: error: libXpm.(a|so) not found." 1>&2; exit 1; } 59530 fi 59531 59532 for i in include include/X11; do 59533@@ -51592,30 +38890,28 @@ 59534 done 59535 59536 if test -z "$GD_XPM_INC"; then 59537- { { echo "$as_me:$LINENO: error: xpm.h not found." >&5 59538-echo "$as_me: error: xpm.h not found." >&2;} 59539- { (exit 1); exit 1; }; } 59540+ { echo "configure: error: xpm.h not found." 1>&2; exit 1; } 59541 fi 59542 59543- 59544+ 59545 save_old_LDFLAGS=$LDFLAGS 59546 ac_stuff=" 59547 -L$GD_XPM_DIR/$PHP_LIBDIR -lX11 59548 " 59549- 59550+ 59551 save_ext_shared=$ext_shared 59552 ext_shared=yes 59553- 59554+ 59555 for ac_i in $ac_stuff; do 59556 case $ac_i in 59557 -pthread) 59558 if test "$ext_shared" = "yes"; then 59559 LDFLAGS="$LDFLAGS -pthread" 59560 else 59561- 59562- 59563+ 59564+ 59565 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 59566- 59567+ 59568 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 59569 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59570 eval "EXTRA_LDFLAGS$unique=set" 59571@@ -51626,20 +38922,20 @@ 59572 ;; 59573 -l*) 59574 ac_ii=`echo $ac_i|cut -c 3-` 59575- 59576- 59577+ 59578+ 59579 case $ac_ii in 59580 c|c_r|pthread*) ;; 59581- *) 59582+ *) 59583 if test "$ext_shared" = "yes"; then 59584- LDFLAGS="$LDFLAGS -l$ac_ii" 59585+ LDFLAGS="$LDFLAGS -l$ac_ii" 59586 else 59587- 59588- 59589+ 59590+ 59591 case $ac_ii in 59592 c|c_r|pthread*) ;; 59593- *) 59594- LIBS="$LIBS -l$ac_ii" 59595+ *) 59596+ LIBS="$LIBS -l$ac_ii" 59597 ;; 59598 esac 59599 59600@@ -51652,236 +38948,206 @@ 59601 ;; 59602 -L*) 59603 ac_ii=`echo $ac_i|cut -c 3-` 59604- 59605+ 59606 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 59607- 59608+ 59609 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 59610 ai_p=$ac_ii 59611 else 59612- 59613+ 59614 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 59615- 59616+ 59617 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59618 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 59619 fi 59620 59621- 59622+ 59623 if test "$ext_shared" = "yes"; then 59624 LDFLAGS="-L$ai_p $LDFLAGS" 59625 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 59626 else 59627- 59628- 59629- 59630+ 59631+ 59632+ 59633 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59634- 59635+ 59636 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59637 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59638 eval "LIBPATH$unique=set" 59639- 59640+ 59641 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59642 LDFLAGS="$LDFLAGS -L$ai_p" 59643 PHP_RPATHS="$PHP_RPATHS $ai_p" 59644- 59645+ 59646 fi 59647 59648 59649 fi 59650- 59651+ 59652 fi 59653 59654 ;; 59655 esac 59656 done 59657 59658- echo "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5 59659-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6 59660-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then 59661- echo $ECHO_N "(cached) $ECHO_C" >&6 59662+ echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 59663+echo "configure:38995: checking for XpmFreeXpmImage in -lXpm" >&5 59664+ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` 59665+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 59666+ echo $ac_n "(cached) $ac_c" 1>&6 59667 else 59668- ac_check_lib_save_LIBS=$LIBS 59669+ ac_save_LIBS="$LIBS" 59670 LIBS="-lXpm $LIBS" 59671-cat >conftest.$ac_ext <<_ACEOF 59672-/* confdefs.h. */ 59673-_ACEOF 59674-cat confdefs.h >>conftest.$ac_ext 59675-cat >>conftest.$ac_ext <<_ACEOF 59676-/* end confdefs.h. */ 59677- 59678+cat > conftest.$ac_ext <<EOF 59679+#line 39003 "configure" 59680+#include "confdefs.h" 59681 /* Override any gcc2 internal prototype to avoid an error. */ 59682-#ifdef __cplusplus 59683-extern "C" 59684-#endif 59685 /* We use char because int might match the return type of a gcc2 59686- builtin and then its argument prototype would still apply. */ 59687-char XpmFreeXpmImage (); 59688-int 59689-main () 59690-{ 59691-XpmFreeXpmImage (); 59692- ; 59693- return 0; 59694-} 59695-_ACEOF 59696-rm -f conftest.$ac_objext conftest$ac_exeext 59697-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 59698- (eval $ac_link) 2>conftest.er1 59699- ac_status=$? 59700- grep -v '^ *+' conftest.er1 >conftest.err 59701- rm -f conftest.er1 59702- cat conftest.err >&5 59703- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59704- (exit $ac_status); } && 59705- { ac_try='test -z "$ac_c_werror_flag" 59706- || test ! -s conftest.err' 59707- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 59708- (eval $ac_try) 2>&5 59709- ac_status=$? 59710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59711- (exit $ac_status); }; } && 59712- { ac_try='test -s conftest$ac_exeext' 59713- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 59714- (eval $ac_try) 2>&5 59715- ac_status=$? 59716- echo "$as_me:$LINENO: \$? = $ac_status" >&5 59717- (exit $ac_status); }; }; then 59718- ac_cv_lib_Xpm_XpmFreeXpmImage=yes 59719-else 59720- echo "$as_me: failed program was:" >&5 59721-sed 's/^/| /' conftest.$ac_ext >&5 59722- 59723-ac_cv_lib_Xpm_XpmFreeXpmImage=no 59724-fi 59725-rm -f conftest.err conftest.$ac_objext \ 59726- conftest$ac_exeext conftest.$ac_ext 59727-LIBS=$ac_check_lib_save_LIBS 59728-fi 59729-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5 59730-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6 59731-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then 59732+ builtin and then its argument prototype would still apply. */ 59733+char XpmFreeXpmImage(); 59734+ 59735+int main() { 59736+XpmFreeXpmImage() 59737+; return 0; } 59738+EOF 59739+if { (eval echo configure:39014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 59740+ rm -rf conftest* 59741+ eval "ac_cv_lib_$ac_lib_var=yes" 59742+else 59743+ echo "configure: failed program was:" >&5 59744+ cat conftest.$ac_ext >&5 59745+ rm -rf conftest* 59746+ eval "ac_cv_lib_$ac_lib_var=no" 59747+fi 59748+rm -f conftest* 59749+LIBS="$ac_save_LIBS" 59750 59751+fi 59752+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 59753+ echo "$ac_t""yes" 1>&6 59754+ 59755 LDFLAGS=$save_old_LDFLAGS 59756 ext_shared=$save_ext_shared 59757- 59758- 59759+ 59760+ 59761 if test "$GD_XPM_INC" != "/usr/include"; then 59762- 59763+ 59764 if test -z "$GD_XPM_INC" || echo "$GD_XPM_INC" | grep '^/' >/dev/null ; then 59765 ai_p=$GD_XPM_INC 59766 else 59767- 59768+ 59769 ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`" 59770- 59771+ 59772 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59773 ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`" 59774 fi 59775 59776- 59777- 59778+ 59779+ 59780 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59781- 59782+ 59783 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 59784 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59785 eval "INCLUDEPATH$unique=set" 59786- 59787+ 59788 if test ""; then 59789 INCLUDES="-I$ai_p $INCLUDES" 59790 else 59791 INCLUDES="$INCLUDES -I$ai_p" 59792 fi 59793- 59794+ 59795 fi 59796 59797 fi 59798 59799- 59800+ 59801 59802 if test "$ext_shared" = "yes"; then 59803 GD_SHARED_LIBADD="-lXpm $GD_SHARED_LIBADD" 59804 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 59805- 59806+ 59807 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59808- 59809+ 59810 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59811 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 59812 else 59813- 59814+ 59815 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59816- 59817+ 59818 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59819 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 59820 fi 59821 59822- 59823+ 59824 if test "$ext_shared" = "yes"; then 59825 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 59826 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 59827 else 59828- 59829- 59830- 59831+ 59832+ 59833+ 59834 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59835- 59836+ 59837 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59838 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59839 eval "LIBPATH$unique=set" 59840- 59841+ 59842 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59843 LDFLAGS="$LDFLAGS -L$ai_p" 59844 PHP_RPATHS="$PHP_RPATHS $ai_p" 59845- 59846+ 59847 fi 59848 59849 59850 fi 59851- 59852+ 59853 fi 59854 59855 fi 59856 else 59857- 59858+ 59859 59860 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 59861- 59862+ 59863 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59864- 59865+ 59866 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59867 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 59868 else 59869- 59870+ 59871 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59872- 59873+ 59874 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59875 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 59876 fi 59877 59878- 59879- 59880- 59881- 59882+ 59883+ 59884+ 59885+ 59886 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59887- 59888+ 59889 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59890 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59891 eval "LIBPATH$unique=set" 59892- 59893+ 59894 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59895 LDFLAGS="$LDFLAGS -L$ai_p" 59896 PHP_RPATHS="$PHP_RPATHS $ai_p" 59897- 59898+ 59899 fi 59900 59901 59902- 59903+ 59904 fi 59905 59906 fi 59907- 59908- 59909+ 59910+ 59911 case Xpm in 59912 c|c_r|pthread*) ;; 59913- *) 59914- LIBS="-lXpm $LIBS" 59915+ *) 59916+ LIBS="-lXpm $LIBS" 59917 ;; 59918 esac 59919 59920@@ -51891,94 +39157,94 @@ 59921 fi 59922 59923 59924- 59925+ 59926 59927 if test "$ext_shared" = "yes"; then 59928 GD_SHARED_LIBADD="-lX11 $GD_SHARED_LIBADD" 59929 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 59930- 59931+ 59932 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59933- 59934+ 59935 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59936 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 59937 else 59938- 59939+ 59940 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59941- 59942+ 59943 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 59944 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 59945 fi 59946 59947- 59948+ 59949 if test "$ext_shared" = "yes"; then 59950 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 59951 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 59952 else 59953- 59954- 59955- 59956+ 59957+ 59958+ 59959 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 59960- 59961+ 59962 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 59963 if test -n "$unique" && test "`eval $cmd`" = "" ; then 59964 eval "LIBPATH$unique=set" 59965- 59966+ 59967 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 59968 LDFLAGS="$LDFLAGS -L$ai_p" 59969 PHP_RPATHS="$PHP_RPATHS $ai_p" 59970- 59971+ 59972 fi 59973 59974 59975 fi 59976- 59977+ 59978 fi 59979 59980 fi 59981 else 59982- 59983+ 59984 59985 if test -n "$GD_XPM_DIR/$PHP_LIBDIR"; then 59986- 59987+ 59988 if test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_XPM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 59989- 59990+ 59991 if test -z "$GD_XPM_DIR/$PHP_LIBDIR" || echo "$GD_XPM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 59992 ai_p=$GD_XPM_DIR/$PHP_LIBDIR 59993 else 59994- 59995+ 59996 ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 59997- 59998+ 59999 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60000 ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`" 60001 fi 60002 60003- 60004- 60005- 60006- 60007+ 60008+ 60009+ 60010+ 60011 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60012- 60013+ 60014 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60015 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60016 eval "LIBPATH$unique=set" 60017- 60018+ 60019 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60020 LDFLAGS="$LDFLAGS -L$ai_p" 60021 PHP_RPATHS="$PHP_RPATHS $ai_p" 60022- 60023+ 60024 fi 60025 60026 60027- 60028+ 60029 fi 60030 60031 fi 60032- 60033- 60034+ 60035+ 60036 case X11 in 60037 c|c_r|pthread*) ;; 60038- *) 60039- LIBS="-lX11 $LIBS" 60040+ *) 60041+ LIBS="-lX11 $LIBS" 60042 ;; 60043 esac 60044 60045@@ -51988,27 +39254,25 @@ 60046 fi 60047 60048 60049- 60050- 60051+ 60052+ 60053 else 60054+ echo "$ac_t""no" 1>&6 60055 60056 LDFLAGS=$save_old_LDFLAGS 60057 ext_shared=$save_ext_shared 60058 unset ac_cv_lib_Xpm_XpmFreeXpmImage 60059- 60060- { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5 60061-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;} 60062- { (exit 1); exit 1; }; } 60063- 60064- 60065+ 60066+ { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } 60067+ 60068+ 60069 fi 60070 60071 else 60072- echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5 60073-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6 60074+ echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6 60075 fi 60076 60077- 60078+ 60079 if test "$PHP_FREETYPE_DIR" != "no"; then 60080 60081 for i in $PHP_FREETYPE_DIR /usr/local /usr; do 60082@@ -52020,30 +39284,28 @@ 60083 done 60084 60085 if test -z "$FREETYPE2_DIR"; then 60086- { { echo "$as_me:$LINENO: error: freetype.h not found." >&5 60087-echo "$as_me: error: freetype.h not found." >&2;} 60088- { (exit 1); exit 1; }; } 60089+ { echo "configure: error: freetype.h not found." 1>&2; exit 1; } 60090 fi 60091 60092- 60093+ 60094 save_old_LDFLAGS=$LDFLAGS 60095 ac_stuff=" 60096 -L$FREETYPE2_DIR/$PHP_LIBDIR 60097 " 60098- 60099+ 60100 save_ext_shared=$ext_shared 60101 ext_shared=yes 60102- 60103+ 60104 for ac_i in $ac_stuff; do 60105 case $ac_i in 60106 -pthread) 60107 if test "$ext_shared" = "yes"; then 60108 LDFLAGS="$LDFLAGS -pthread" 60109 else 60110- 60111- 60112+ 60113+ 60114 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 60115- 60116+ 60117 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 60118 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60119 eval "EXTRA_LDFLAGS$unique=set" 60120@@ -52054,20 +39316,20 @@ 60121 ;; 60122 -l*) 60123 ac_ii=`echo $ac_i|cut -c 3-` 60124- 60125- 60126+ 60127+ 60128 case $ac_ii in 60129 c|c_r|pthread*) ;; 60130- *) 60131+ *) 60132 if test "$ext_shared" = "yes"; then 60133- LDFLAGS="$LDFLAGS -l$ac_ii" 60134+ LDFLAGS="$LDFLAGS -l$ac_ii" 60135 else 60136- 60137- 60138+ 60139+ 60140 case $ac_ii in 60141 c|c_r|pthread*) ;; 60142- *) 60143- LIBS="$LIBS -l$ac_ii" 60144+ *) 60145+ LIBS="$LIBS -l$ac_ii" 60146 ;; 60147 esac 60148 60149@@ -52080,205 +39342,175 @@ 60150 ;; 60151 -L*) 60152 ac_ii=`echo $ac_i|cut -c 3-` 60153- 60154+ 60155 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 60156- 60157+ 60158 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 60159 ai_p=$ac_ii 60160 else 60161- 60162+ 60163 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 60164- 60165+ 60166 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60167 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 60168 fi 60169 60170- 60171+ 60172 if test "$ext_shared" = "yes"; then 60173 LDFLAGS="-L$ai_p $LDFLAGS" 60174 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 60175 else 60176- 60177- 60178- 60179+ 60180+ 60181+ 60182 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60183- 60184+ 60185 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60186 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60187 eval "LIBPATH$unique=set" 60188- 60189+ 60190 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60191 LDFLAGS="$LDFLAGS -L$ai_p" 60192 PHP_RPATHS="$PHP_RPATHS $ai_p" 60193- 60194+ 60195 fi 60196 60197 60198 fi 60199- 60200+ 60201 fi 60202 60203 ;; 60204 esac 60205 done 60206 60207- echo "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5 60208-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6 60209-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then 60210- echo $ECHO_N "(cached) $ECHO_C" >&6 60211+ echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 60212+echo "configure:39389: checking for FT_New_Face in -lfreetype" >&5 60213+ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` 60214+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 60215+ echo $ac_n "(cached) $ac_c" 1>&6 60216 else 60217- ac_check_lib_save_LIBS=$LIBS 60218+ ac_save_LIBS="$LIBS" 60219 LIBS="-lfreetype $LIBS" 60220-cat >conftest.$ac_ext <<_ACEOF 60221-/* confdefs.h. */ 60222-_ACEOF 60223-cat confdefs.h >>conftest.$ac_ext 60224-cat >>conftest.$ac_ext <<_ACEOF 60225-/* end confdefs.h. */ 60226- 60227+cat > conftest.$ac_ext <<EOF 60228+#line 39397 "configure" 60229+#include "confdefs.h" 60230 /* Override any gcc2 internal prototype to avoid an error. */ 60231-#ifdef __cplusplus 60232-extern "C" 60233-#endif 60234 /* We use char because int might match the return type of a gcc2 60235- builtin and then its argument prototype would still apply. */ 60236-char FT_New_Face (); 60237-int 60238-main () 60239-{ 60240-FT_New_Face (); 60241- ; 60242- return 0; 60243-} 60244-_ACEOF 60245-rm -f conftest.$ac_objext conftest$ac_exeext 60246-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 60247- (eval $ac_link) 2>conftest.er1 60248- ac_status=$? 60249- grep -v '^ *+' conftest.er1 >conftest.err 60250- rm -f conftest.er1 60251- cat conftest.err >&5 60252- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60253- (exit $ac_status); } && 60254- { ac_try='test -z "$ac_c_werror_flag" 60255- || test ! -s conftest.err' 60256- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 60257- (eval $ac_try) 2>&5 60258- ac_status=$? 60259- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60260- (exit $ac_status); }; } && 60261- { ac_try='test -s conftest$ac_exeext' 60262- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 60263- (eval $ac_try) 2>&5 60264- ac_status=$? 60265- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60266- (exit $ac_status); }; }; then 60267- ac_cv_lib_freetype_FT_New_Face=yes 60268-else 60269- echo "$as_me: failed program was:" >&5 60270-sed 's/^/| /' conftest.$ac_ext >&5 60271- 60272-ac_cv_lib_freetype_FT_New_Face=no 60273-fi 60274-rm -f conftest.err conftest.$ac_objext \ 60275- conftest$ac_exeext conftest.$ac_ext 60276-LIBS=$ac_check_lib_save_LIBS 60277-fi 60278-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5 60279-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6 60280-if test $ac_cv_lib_freetype_FT_New_Face = yes; then 60281+ builtin and then its argument prototype would still apply. */ 60282+char FT_New_Face(); 60283+ 60284+int main() { 60285+FT_New_Face() 60286+; return 0; } 60287+EOF 60288+if { (eval echo configure:39408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 60289+ rm -rf conftest* 60290+ eval "ac_cv_lib_$ac_lib_var=yes" 60291+else 60292+ echo "configure: failed program was:" >&5 60293+ cat conftest.$ac_ext >&5 60294+ rm -rf conftest* 60295+ eval "ac_cv_lib_$ac_lib_var=no" 60296+fi 60297+rm -f conftest* 60298+LIBS="$ac_save_LIBS" 60299 60300+fi 60301+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 60302+ echo "$ac_t""yes" 1>&6 60303+ 60304 LDFLAGS=$save_old_LDFLAGS 60305 ext_shared=$save_ext_shared 60306- 60307- 60308+ 60309+ 60310 60311 if test "$ext_shared" = "yes"; then 60312 GD_SHARED_LIBADD="-lfreetype $GD_SHARED_LIBADD" 60313 if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then 60314- 60315+ 60316 if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then 60317- 60318+ 60319 if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 60320 ai_p=$FREETYPE2_DIR/$PHP_LIBDIR 60321 else 60322- 60323+ 60324 ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 60325- 60326+ 60327 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60328 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" 60329 fi 60330 60331- 60332+ 60333 if test "$ext_shared" = "yes"; then 60334 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 60335 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 60336 else 60337- 60338- 60339- 60340+ 60341+ 60342+ 60343 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60344- 60345+ 60346 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60347 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60348 eval "LIBPATH$unique=set" 60349- 60350+ 60351 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60352 LDFLAGS="$LDFLAGS -L$ai_p" 60353 PHP_RPATHS="$PHP_RPATHS $ai_p" 60354- 60355+ 60356 fi 60357 60358 60359 fi 60360- 60361+ 60362 fi 60363 60364 fi 60365 else 60366- 60367+ 60368 60369 if test -n "$FREETYPE2_DIR/$PHP_LIBDIR"; then 60370- 60371+ 60372 if test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETYPE2_DIR/$PHP_LIBDIR" != "/usr/lib"; then 60373- 60374+ 60375 if test -z "$FREETYPE2_DIR/$PHP_LIBDIR" || echo "$FREETYPE2_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 60376 ai_p=$FREETYPE2_DIR/$PHP_LIBDIR 60377 else 60378- 60379+ 60380 ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 60381- 60382+ 60383 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60384 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`" 60385 fi 60386 60387- 60388- 60389- 60390- 60391+ 60392+ 60393+ 60394+ 60395 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60396- 60397+ 60398 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60399 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60400 eval "LIBPATH$unique=set" 60401- 60402+ 60403 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60404 LDFLAGS="$LDFLAGS -L$ai_p" 60405 PHP_RPATHS="$PHP_RPATHS $ai_p" 60406- 60407+ 60408 fi 60409 60410 60411- 60412+ 60413 fi 60414 60415 fi 60416- 60417- 60418+ 60419+ 60420 case freetype in 60421 c|c_r|pthread*) ;; 60422- *) 60423- LIBS="-lfreetype $LIBS" 60424+ *) 60425+ LIBS="-lfreetype $LIBS" 60426 ;; 60427 esac 60428 60429@@ -52288,104 +39520,99 @@ 60430 fi 60431 60432 60433- 60434+ 60435 if test "$FREETYPE2_DIR/include" != "/usr/include"; then 60436- 60437+ 60438 if test -z "$FREETYPE2_DIR/include" || echo "$FREETYPE2_DIR/include" | grep '^/' >/dev/null ; then 60439 ai_p=$FREETYPE2_DIR/include 60440 else 60441- 60442+ 60443 ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 60444- 60445+ 60446 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60447 ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`" 60448 fi 60449 60450- 60451- 60452+ 60453+ 60454 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60455- 60456+ 60457 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 60458 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60459 eval "INCLUDEPATH$unique=set" 60460- 60461+ 60462 if test ""; then 60463 INCLUDES="-I$ai_p $INCLUDES" 60464 else 60465 INCLUDES="$INCLUDES -I$ai_p" 60466 fi 60467- 60468+ 60469 fi 60470 60471 fi 60472 60473- 60474+ 60475 if test "$FREETYPE2_INC_DIR" != "/usr/include"; then 60476- 60477+ 60478 if test -z "$FREETYPE2_INC_DIR" || echo "$FREETYPE2_INC_DIR" | grep '^/' >/dev/null ; then 60479 ai_p=$FREETYPE2_INC_DIR 60480 else 60481- 60482+ 60483 ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 60484- 60485+ 60486 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60487 ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`" 60488 fi 60489 60490- 60491- 60492+ 60493+ 60494 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60495- 60496+ 60497 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 60498 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60499 eval "INCLUDEPATH$unique=set" 60500- 60501+ 60502 if test ""; then 60503 INCLUDES="-I$ai_p $INCLUDES" 60504 else 60505 INCLUDES="$INCLUDES -I$ai_p" 60506 fi 60507- 60508+ 60509 fi 60510 60511 fi 60512 60513- 60514-cat >>confdefs.h <<\_ACEOF 60515+ cat >> confdefs.h <<\EOF 60516 #define USE_GD_IMGSTRTTF 1 60517-_ACEOF 60518- 60519+EOF 60520 60521-cat >>confdefs.h <<\_ACEOF 60522+ cat >> confdefs.h <<\EOF 60523 #define HAVE_LIBFREETYPE 1 60524-_ACEOF 60525- 60526+EOF 60527 60528-cat >>confdefs.h <<\_ACEOF 60529+ cat >> confdefs.h <<\EOF 60530 #define ENABLE_GD_TTF 1 60531-_ACEOF 60532- 60533- 60534+EOF 60535 60536+ 60537+ 60538 else 60539+ echo "$ac_t""no" 1>&6 60540 60541 LDFLAGS=$save_old_LDFLAGS 60542 ext_shared=$save_ext_shared 60543 unset ac_cv_lib_freetype_FT_New_Face 60544- 60545- { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5 60546-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;} 60547- { (exit 1); exit 1; }; } 60548- 60549- 60550+ 60551+ { echo "configure: error: Problem with freetype.(a|so). Please check config.log for more information." 1>&2; exit 1; } 60552+ 60553+ 60554 fi 60555 60556 else 60557- echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5 60558-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6 60559+ echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6 60560 fi 60561 60562- 60563+ 60564 if test "$PHP_T1LIB" != "no"; then 60565 60566 for i in $PHP_T1LIB /usr/local /usr; do 60567@@ -52393,30 +39620,28 @@ 60568 done 60569 60570 if test -z "$GD_T1_DIR"; then 60571- { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5 60572-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;} 60573- { (exit 1); exit 1; }; } 60574+ { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } 60575 fi 60576 60577- 60578+ 60579 save_old_LDFLAGS=$LDFLAGS 60580 ac_stuff=" 60581 -L$GD_T1_DIR/$PHP_LIBDIR 60582 " 60583- 60584+ 60585 save_ext_shared=$ext_shared 60586 ext_shared=yes 60587- 60588+ 60589 for ac_i in $ac_stuff; do 60590 case $ac_i in 60591 -pthread) 60592 if test "$ext_shared" = "yes"; then 60593 LDFLAGS="$LDFLAGS -pthread" 60594 else 60595- 60596- 60597+ 60598+ 60599 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 60600- 60601+ 60602 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 60603 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60604 eval "EXTRA_LDFLAGS$unique=set" 60605@@ -52427,20 +39652,20 @@ 60606 ;; 60607 -l*) 60608 ac_ii=`echo $ac_i|cut -c 3-` 60609- 60610- 60611+ 60612+ 60613 case $ac_ii in 60614 c|c_r|pthread*) ;; 60615- *) 60616+ *) 60617 if test "$ext_shared" = "yes"; then 60618- LDFLAGS="$LDFLAGS -l$ac_ii" 60619+ LDFLAGS="$LDFLAGS -l$ac_ii" 60620 else 60621- 60622- 60623+ 60624+ 60625 case $ac_ii in 60626 c|c_r|pthread*) ;; 60627- *) 60628- LIBS="$LIBS -l$ac_ii" 60629+ *) 60630+ LIBS="$LIBS -l$ac_ii" 60631 ;; 60632 esac 60633 60634@@ -52453,241 +39678,210 @@ 60635 ;; 60636 -L*) 60637 ac_ii=`echo $ac_i|cut -c 3-` 60638- 60639+ 60640 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 60641- 60642+ 60643 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 60644 ai_p=$ac_ii 60645 else 60646- 60647+ 60648 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 60649- 60650+ 60651 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60652 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 60653 fi 60654 60655- 60656+ 60657 if test "$ext_shared" = "yes"; then 60658 LDFLAGS="-L$ai_p $LDFLAGS" 60659 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 60660 else 60661- 60662- 60663- 60664+ 60665+ 60666+ 60667 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60668- 60669+ 60670 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60671 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60672 eval "LIBPATH$unique=set" 60673- 60674+ 60675 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60676 LDFLAGS="$LDFLAGS -L$ai_p" 60677 PHP_RPATHS="$PHP_RPATHS $ai_p" 60678- 60679+ 60680 fi 60681 60682 60683 fi 60684- 60685+ 60686 fi 60687 60688 ;; 60689 esac 60690 done 60691 60692- echo "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5 60693-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6 60694-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then 60695- echo $ECHO_N "(cached) $ECHO_C" >&6 60696+ echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 60697+echo "configure:39725: checking for T1_StrError in -lt1" >&5 60698+ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` 60699+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 60700+ echo $ac_n "(cached) $ac_c" 1>&6 60701 else 60702- ac_check_lib_save_LIBS=$LIBS 60703+ ac_save_LIBS="$LIBS" 60704 LIBS="-lt1 $LIBS" 60705-cat >conftest.$ac_ext <<_ACEOF 60706-/* confdefs.h. */ 60707-_ACEOF 60708-cat confdefs.h >>conftest.$ac_ext 60709-cat >>conftest.$ac_ext <<_ACEOF 60710-/* end confdefs.h. */ 60711- 60712+cat > conftest.$ac_ext <<EOF 60713+#line 39733 "configure" 60714+#include "confdefs.h" 60715 /* Override any gcc2 internal prototype to avoid an error. */ 60716-#ifdef __cplusplus 60717-extern "C" 60718-#endif 60719 /* We use char because int might match the return type of a gcc2 60720- builtin and then its argument prototype would still apply. */ 60721-char T1_StrError (); 60722-int 60723-main () 60724-{ 60725-T1_StrError (); 60726- ; 60727- return 0; 60728-} 60729-_ACEOF 60730-rm -f conftest.$ac_objext conftest$ac_exeext 60731-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 60732- (eval $ac_link) 2>conftest.er1 60733- ac_status=$? 60734- grep -v '^ *+' conftest.er1 >conftest.err 60735- rm -f conftest.er1 60736- cat conftest.err >&5 60737- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60738- (exit $ac_status); } && 60739- { ac_try='test -z "$ac_c_werror_flag" 60740- || test ! -s conftest.err' 60741- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 60742- (eval $ac_try) 2>&5 60743- ac_status=$? 60744- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60745- (exit $ac_status); }; } && 60746- { ac_try='test -s conftest$ac_exeext' 60747- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 60748- (eval $ac_try) 2>&5 60749- ac_status=$? 60750- echo "$as_me:$LINENO: \$? = $ac_status" >&5 60751- (exit $ac_status); }; }; then 60752- ac_cv_lib_t1_T1_StrError=yes 60753-else 60754- echo "$as_me: failed program was:" >&5 60755-sed 's/^/| /' conftest.$ac_ext >&5 60756- 60757-ac_cv_lib_t1_T1_StrError=no 60758-fi 60759-rm -f conftest.err conftest.$ac_objext \ 60760- conftest$ac_exeext conftest.$ac_ext 60761-LIBS=$ac_check_lib_save_LIBS 60762-fi 60763-echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5 60764-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6 60765-if test $ac_cv_lib_t1_T1_StrError = yes; then 60766+ builtin and then its argument prototype would still apply. */ 60767+char T1_StrError(); 60768+ 60769+int main() { 60770+T1_StrError() 60771+; return 0; } 60772+EOF 60773+if { (eval echo configure:39744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 60774+ rm -rf conftest* 60775+ eval "ac_cv_lib_$ac_lib_var=yes" 60776+else 60777+ echo "configure: failed program was:" >&5 60778+ cat conftest.$ac_ext >&5 60779+ rm -rf conftest* 60780+ eval "ac_cv_lib_$ac_lib_var=no" 60781+fi 60782+rm -f conftest* 60783+LIBS="$ac_save_LIBS" 60784 60785+fi 60786+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 60787+ echo "$ac_t""yes" 1>&6 60788+ 60789 LDFLAGS=$save_old_LDFLAGS 60790 ext_shared=$save_ext_shared 60791- 60792- 60793-cat >>confdefs.h <<\_ACEOF 60794+ 60795+ cat >> confdefs.h <<\EOF 60796 #define HAVE_LIBT1 1 60797-_ACEOF 60798- 60799+EOF 60800 60801+ 60802 if test "$GD_T1_DIR/include" != "/usr/include"; then 60803- 60804+ 60805 if test -z "$GD_T1_DIR/include" || echo "$GD_T1_DIR/include" | grep '^/' >/dev/null ; then 60806 ai_p=$GD_T1_DIR/include 60807 else 60808- 60809+ 60810 ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 60811- 60812+ 60813 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60814 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`" 60815 fi 60816 60817- 60818- 60819+ 60820+ 60821 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60822- 60823+ 60824 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 60825 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60826 eval "INCLUDEPATH$unique=set" 60827- 60828+ 60829 if test ""; then 60830 INCLUDES="-I$ai_p $INCLUDES" 60831 else 60832 INCLUDES="$INCLUDES -I$ai_p" 60833 fi 60834- 60835+ 60836 fi 60837 60838 fi 60839 60840- 60841+ 60842 60843 if test "$ext_shared" = "yes"; then 60844 GD_SHARED_LIBADD="-lt1 $GD_SHARED_LIBADD" 60845 if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then 60846- 60847+ 60848 if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then 60849- 60850+ 60851 if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 60852 ai_p=$GD_T1_DIR/$PHP_LIBDIR 60853 else 60854- 60855+ 60856 ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 60857- 60858+ 60859 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60860 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" 60861 fi 60862 60863- 60864+ 60865 if test "$ext_shared" = "yes"; then 60866 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 60867 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 60868 else 60869- 60870- 60871- 60872+ 60873+ 60874+ 60875 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60876- 60877+ 60878 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60879 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60880 eval "LIBPATH$unique=set" 60881- 60882+ 60883 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60884 LDFLAGS="$LDFLAGS -L$ai_p" 60885 PHP_RPATHS="$PHP_RPATHS $ai_p" 60886- 60887+ 60888 fi 60889 60890 60891 fi 60892- 60893+ 60894 fi 60895 60896 fi 60897 else 60898- 60899+ 60900 60901 if test -n "$GD_T1_DIR/$PHP_LIBDIR"; then 60902- 60903+ 60904 if test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GD_T1_DIR/$PHP_LIBDIR" != "/usr/lib"; then 60905- 60906+ 60907 if test -z "$GD_T1_DIR/$PHP_LIBDIR" || echo "$GD_T1_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 60908 ai_p=$GD_T1_DIR/$PHP_LIBDIR 60909 else 60910- 60911+ 60912 ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 60913- 60914+ 60915 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 60916 ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`" 60917 fi 60918 60919- 60920- 60921- 60922- 60923+ 60924+ 60925+ 60926+ 60927 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 60928- 60929+ 60930 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 60931 if test -n "$unique" && test "`eval $cmd`" = "" ; then 60932 eval "LIBPATH$unique=set" 60933- 60934+ 60935 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 60936 LDFLAGS="$LDFLAGS -L$ai_p" 60937 PHP_RPATHS="$PHP_RPATHS $ai_p" 60938- 60939+ 60940 fi 60941 60942 60943- 60944+ 60945 fi 60946 60947 fi 60948- 60949- 60950+ 60951+ 60952 case t1 in 60953 c|c_r|pthread*) ;; 60954- *) 60955- LIBS="-lt1 $LIBS" 60956+ *) 60957+ LIBS="-lt1 $LIBS" 60958 ;; 60959 esac 60960 60961@@ -52697,19 +39891,18 @@ 60962 fi 60963 60964 60965- 60966- 60967+ 60968+ 60969 else 60970+ echo "$ac_t""no" 1>&6 60971 60972 LDFLAGS=$save_old_LDFLAGS 60973 ext_shared=$save_ext_shared 60974 unset ac_cv_lib_t1_T1_StrError 60975- 60976- { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5 60977-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;} 60978- { (exit 1); exit 1; }; } 60979- 60980- 60981+ 60982+ { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } 60983+ 60984+ 60985 fi 60986 60987 fi 60988@@ -52724,94 +39917,94 @@ 60989 done 60990 60991 if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then 60992- 60993+ 60994 60995 if test "$ext_shared" = "yes"; then 60996 GD_SHARED_LIBADD="-lgd $GD_SHARED_LIBADD" 60997 if test -n "$GD_LIB"; then 60998- 60999+ 61000 if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then 61001- 61002+ 61003 if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then 61004 ai_p=$GD_LIB 61005 else 61006- 61007+ 61008 ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 61009- 61010+ 61011 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61012 ai_p="$ep_realdir/`basename \"$GD_LIB\"`" 61013 fi 61014 61015- 61016+ 61017 if test "$ext_shared" = "yes"; then 61018 GD_SHARED_LIBADD="-L$ai_p $GD_SHARED_LIBADD" 61019 test -n "$ld_runpath_switch" && GD_SHARED_LIBADD="$ld_runpath_switch$ai_p $GD_SHARED_LIBADD" 61020 else 61021- 61022- 61023- 61024+ 61025+ 61026+ 61027 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61028- 61029+ 61030 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61031 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61032 eval "LIBPATH$unique=set" 61033- 61034+ 61035 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61036 LDFLAGS="$LDFLAGS -L$ai_p" 61037 PHP_RPATHS="$PHP_RPATHS $ai_p" 61038- 61039+ 61040 fi 61041 61042 61043 fi 61044- 61045+ 61046 fi 61047 61048 fi 61049 else 61050- 61051+ 61052 61053 if test -n "$GD_LIB"; then 61054- 61055+ 61056 if test "$GD_LIB" != "/usr/$PHP_LIBDIR" && test "$GD_LIB" != "/usr/lib"; then 61057- 61058+ 61059 if test -z "$GD_LIB" || echo "$GD_LIB" | grep '^/' >/dev/null ; then 61060 ai_p=$GD_LIB 61061 else 61062- 61063+ 61064 ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 61065- 61066+ 61067 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61068 ai_p="$ep_realdir/`basename \"$GD_LIB\"`" 61069 fi 61070 61071- 61072- 61073- 61074- 61075+ 61076+ 61077+ 61078+ 61079 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61080- 61081+ 61082 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61083 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61084 eval "LIBPATH$unique=set" 61085- 61086+ 61087 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61088 LDFLAGS="$LDFLAGS -L$ai_p" 61089 PHP_RPATHS="$PHP_RPATHS $ai_p" 61090- 61091+ 61092 fi 61093 61094 61095- 61096+ 61097 fi 61098 61099 fi 61100- 61101- 61102+ 61103+ 61104 case gd in 61105 c|c_r|pthread*) ;; 61106- *) 61107- LIBS="-lgd $LIBS" 61108+ *) 61109+ LIBS="-lgd $LIBS" 61110 ;; 61111 esac 61112 61113@@ -52821,29 +40014,28 @@ 61114 fi 61115 61116 61117- 61118-cat >>confdefs.h <<\_ACEOF 61119+ cat >> confdefs.h <<\EOF 61120 #define HAVE_LIBGD 1 61121-_ACEOF 61122- 61123- 61124+EOF 61125 61126+ 61127+ 61128 save_old_LDFLAGS=$LDFLAGS 61129 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 61130- 61131+ 61132 save_ext_shared=$ext_shared 61133 ext_shared=yes 61134- 61135+ 61136 for ac_i in $ac_stuff; do 61137 case $ac_i in 61138 -pthread) 61139 if test "$ext_shared" = "yes"; then 61140 LDFLAGS="$LDFLAGS -pthread" 61141 else 61142- 61143- 61144+ 61145+ 61146 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 61147- 61148+ 61149 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 61150 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61151 eval "EXTRA_LDFLAGS$unique=set" 61152@@ -52854,20 +40046,20 @@ 61153 ;; 61154 -l*) 61155 ac_ii=`echo $ac_i|cut -c 3-` 61156- 61157- 61158+ 61159+ 61160 case $ac_ii in 61161 c|c_r|pthread*) ;; 61162- *) 61163+ *) 61164 if test "$ext_shared" = "yes"; then 61165- LDFLAGS="$LDFLAGS -l$ac_ii" 61166+ LDFLAGS="$LDFLAGS -l$ac_ii" 61167 else 61168- 61169- 61170+ 61171+ 61172 case $ac_ii in 61173 c|c_r|pthread*) ;; 61174- *) 61175- LIBS="$LIBS -l$ac_ii" 61176+ *) 61177+ LIBS="$LIBS -l$ac_ii" 61178 ;; 61179 esac 61180 61181@@ -52880,148 +40072,118 @@ 61182 ;; 61183 -L*) 61184 ac_ii=`echo $ac_i|cut -c 3-` 61185- 61186+ 61187 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 61188- 61189+ 61190 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 61191 ai_p=$ac_ii 61192 else 61193- 61194+ 61195 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 61196- 61197+ 61198 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61199 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 61200 fi 61201 61202- 61203+ 61204 if test "$ext_shared" = "yes"; then 61205 LDFLAGS="-L$ai_p $LDFLAGS" 61206 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 61207 else 61208- 61209- 61210- 61211+ 61212+ 61213+ 61214 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61215- 61216+ 61217 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61218 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61219 eval "LIBPATH$unique=set" 61220- 61221+ 61222 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61223 LDFLAGS="$LDFLAGS -L$ai_p" 61224 PHP_RPATHS="$PHP_RPATHS $ai_p" 61225- 61226+ 61227 fi 61228 61229 61230 fi 61231- 61232+ 61233 fi 61234 61235 ;; 61236 esac 61237 done 61238 61239- echo "$as_me:$LINENO: checking for gdImageString16 in -lgd" >&5 61240-echo $ECHO_N "checking for gdImageString16 in -lgd... $ECHO_C" >&6 61241-if test "${ac_cv_lib_gd_gdImageString16+set}" = set; then 61242- echo $ECHO_N "(cached) $ECHO_C" >&6 61243+ echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 61244+echo "configure:40119: checking for gdImageString16 in -lgd" >&5 61245+ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` 61246+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 61247+ echo $ac_n "(cached) $ac_c" 1>&6 61248 else 61249- ac_check_lib_save_LIBS=$LIBS 61250+ ac_save_LIBS="$LIBS" 61251 LIBS="-lgd $LIBS" 61252-cat >conftest.$ac_ext <<_ACEOF 61253-/* confdefs.h. */ 61254-_ACEOF 61255-cat confdefs.h >>conftest.$ac_ext 61256-cat >>conftest.$ac_ext <<_ACEOF 61257-/* end confdefs.h. */ 61258- 61259+cat > conftest.$ac_ext <<EOF 61260+#line 40127 "configure" 61261+#include "confdefs.h" 61262 /* Override any gcc2 internal prototype to avoid an error. */ 61263-#ifdef __cplusplus 61264-extern "C" 61265-#endif 61266 /* We use char because int might match the return type of a gcc2 61267- builtin and then its argument prototype would still apply. */ 61268-char gdImageString16 (); 61269-int 61270-main () 61271-{ 61272-gdImageString16 (); 61273- ; 61274- return 0; 61275-} 61276-_ACEOF 61277-rm -f conftest.$ac_objext conftest$ac_exeext 61278-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 61279- (eval $ac_link) 2>conftest.er1 61280- ac_status=$? 61281- grep -v '^ *+' conftest.er1 >conftest.err 61282- rm -f conftest.er1 61283- cat conftest.err >&5 61284- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61285- (exit $ac_status); } && 61286- { ac_try='test -z "$ac_c_werror_flag" 61287- || test ! -s conftest.err' 61288- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61289- (eval $ac_try) 2>&5 61290- ac_status=$? 61291- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61292- (exit $ac_status); }; } && 61293- { ac_try='test -s conftest$ac_exeext' 61294- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61295- (eval $ac_try) 2>&5 61296- ac_status=$? 61297- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61298- (exit $ac_status); }; }; then 61299- ac_cv_lib_gd_gdImageString16=yes 61300-else 61301- echo "$as_me: failed program was:" >&5 61302-sed 's/^/| /' conftest.$ac_ext >&5 61303- 61304-ac_cv_lib_gd_gdImageString16=no 61305-fi 61306-rm -f conftest.err conftest.$ac_objext \ 61307- conftest$ac_exeext conftest.$ac_ext 61308-LIBS=$ac_check_lib_save_LIBS 61309-fi 61310-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageString16" >&5 61311-echo "${ECHO_T}$ac_cv_lib_gd_gdImageString16" >&6 61312-if test $ac_cv_lib_gd_gdImageString16 = yes; then 61313+ builtin and then its argument prototype would still apply. */ 61314+char gdImageString16(); 61315+ 61316+int main() { 61317+gdImageString16() 61318+; return 0; } 61319+EOF 61320+if { (eval echo configure:40138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 61321+ rm -rf conftest* 61322+ eval "ac_cv_lib_$ac_lib_var=yes" 61323+else 61324+ echo "configure: failed program was:" >&5 61325+ cat conftest.$ac_ext >&5 61326+ rm -rf conftest* 61327+ eval "ac_cv_lib_$ac_lib_var=no" 61328+fi 61329+rm -f conftest* 61330+LIBS="$ac_save_LIBS" 61331 61332+fi 61333+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 61334+ echo "$ac_t""yes" 1>&6 61335+ 61336 LDFLAGS=$save_old_LDFLAGS 61337 ext_shared=$save_ext_shared 61338- 61339-cat >>confdefs.h <<\_ACEOF 61340+ cat >> confdefs.h <<\EOF 61341 #define HAVE_LIBGD13 1 61342-_ACEOF 61343- 61344+EOF 61345 61346+ 61347 else 61348+ echo "$ac_t""no" 1>&6 61349 61350 LDFLAGS=$save_old_LDFLAGS 61351 ext_shared=$save_ext_shared 61352 unset ac_cv_lib_gd_gdImageString16 61353- 61354- 61355+ 61356+ 61357 fi 61358 61359- 61360+ 61361 save_old_LDFLAGS=$LDFLAGS 61362 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 61363- 61364+ 61365 save_ext_shared=$ext_shared 61366 ext_shared=yes 61367- 61368+ 61369 for ac_i in $ac_stuff; do 61370 case $ac_i in 61371 -pthread) 61372 if test "$ext_shared" = "yes"; then 61373 LDFLAGS="$LDFLAGS -pthread" 61374 else 61375- 61376- 61377+ 61378+ 61379 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 61380- 61381+ 61382 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 61383 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61384 eval "EXTRA_LDFLAGS$unique=set" 61385@@ -53032,20 +40194,20 @@ 61386 ;; 61387 -l*) 61388 ac_ii=`echo $ac_i|cut -c 3-` 61389- 61390- 61391+ 61392+ 61393 case $ac_ii in 61394 c|c_r|pthread*) ;; 61395- *) 61396+ *) 61397 if test "$ext_shared" = "yes"; then 61398- LDFLAGS="$LDFLAGS -l$ac_ii" 61399+ LDFLAGS="$LDFLAGS -l$ac_ii" 61400 else 61401- 61402- 61403+ 61404+ 61405 case $ac_ii in 61406 c|c_r|pthread*) ;; 61407- *) 61408- LIBS="$LIBS -l$ac_ii" 61409+ *) 61410+ LIBS="$LIBS -l$ac_ii" 61411 ;; 61412 esac 61413 61414@@ -53058,148 +40220,118 @@ 61415 ;; 61416 -L*) 61417 ac_ii=`echo $ac_i|cut -c 3-` 61418- 61419+ 61420 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 61421- 61422+ 61423 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 61424 ai_p=$ac_ii 61425 else 61426- 61427+ 61428 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 61429- 61430+ 61431 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61432 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 61433 fi 61434 61435- 61436+ 61437 if test "$ext_shared" = "yes"; then 61438 LDFLAGS="-L$ai_p $LDFLAGS" 61439 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 61440 else 61441- 61442- 61443- 61444+ 61445+ 61446+ 61447 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61448- 61449+ 61450 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61451 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61452 eval "LIBPATH$unique=set" 61453- 61454+ 61455 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61456 LDFLAGS="$LDFLAGS -L$ai_p" 61457 PHP_RPATHS="$PHP_RPATHS $ai_p" 61458- 61459+ 61460 fi 61461 61462 61463 fi 61464- 61465+ 61466 fi 61467 61468 ;; 61469 esac 61470 done 61471 61472- echo "$as_me:$LINENO: checking for gdImagePaletteCopy in -lgd" >&5 61473-echo $ECHO_N "checking for gdImagePaletteCopy in -lgd... $ECHO_C" >&6 61474-if test "${ac_cv_lib_gd_gdImagePaletteCopy+set}" = set; then 61475- echo $ECHO_N "(cached) $ECHO_C" >&6 61476+ echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 61477+echo "configure:40267: checking for gdImagePaletteCopy in -lgd" >&5 61478+ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` 61479+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 61480+ echo $ac_n "(cached) $ac_c" 1>&6 61481 else 61482- ac_check_lib_save_LIBS=$LIBS 61483+ ac_save_LIBS="$LIBS" 61484 LIBS="-lgd $LIBS" 61485-cat >conftest.$ac_ext <<_ACEOF 61486-/* confdefs.h. */ 61487-_ACEOF 61488-cat confdefs.h >>conftest.$ac_ext 61489-cat >>conftest.$ac_ext <<_ACEOF 61490-/* end confdefs.h. */ 61491- 61492+cat > conftest.$ac_ext <<EOF 61493+#line 40275 "configure" 61494+#include "confdefs.h" 61495 /* Override any gcc2 internal prototype to avoid an error. */ 61496-#ifdef __cplusplus 61497-extern "C" 61498-#endif 61499 /* We use char because int might match the return type of a gcc2 61500- builtin and then its argument prototype would still apply. */ 61501-char gdImagePaletteCopy (); 61502-int 61503-main () 61504-{ 61505-gdImagePaletteCopy (); 61506- ; 61507- return 0; 61508-} 61509-_ACEOF 61510-rm -f conftest.$ac_objext conftest$ac_exeext 61511-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 61512- (eval $ac_link) 2>conftest.er1 61513- ac_status=$? 61514- grep -v '^ *+' conftest.er1 >conftest.err 61515- rm -f conftest.er1 61516- cat conftest.err >&5 61517- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61518- (exit $ac_status); } && 61519- { ac_try='test -z "$ac_c_werror_flag" 61520- || test ! -s conftest.err' 61521- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61522- (eval $ac_try) 2>&5 61523- ac_status=$? 61524- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61525- (exit $ac_status); }; } && 61526- { ac_try='test -s conftest$ac_exeext' 61527- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61528- (eval $ac_try) 2>&5 61529- ac_status=$? 61530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61531- (exit $ac_status); }; }; then 61532- ac_cv_lib_gd_gdImagePaletteCopy=yes 61533-else 61534- echo "$as_me: failed program was:" >&5 61535-sed 's/^/| /' conftest.$ac_ext >&5 61536- 61537-ac_cv_lib_gd_gdImagePaletteCopy=no 61538-fi 61539-rm -f conftest.err conftest.$ac_objext \ 61540- conftest$ac_exeext conftest.$ac_ext 61541-LIBS=$ac_check_lib_save_LIBS 61542-fi 61543-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImagePaletteCopy" >&5 61544-echo "${ECHO_T}$ac_cv_lib_gd_gdImagePaletteCopy" >&6 61545-if test $ac_cv_lib_gd_gdImagePaletteCopy = yes; then 61546+ builtin and then its argument prototype would still apply. */ 61547+char gdImagePaletteCopy(); 61548+ 61549+int main() { 61550+gdImagePaletteCopy() 61551+; return 0; } 61552+EOF 61553+if { (eval echo configure:40286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 61554+ rm -rf conftest* 61555+ eval "ac_cv_lib_$ac_lib_var=yes" 61556+else 61557+ echo "configure: failed program was:" >&5 61558+ cat conftest.$ac_ext >&5 61559+ rm -rf conftest* 61560+ eval "ac_cv_lib_$ac_lib_var=no" 61561+fi 61562+rm -f conftest* 61563+LIBS="$ac_save_LIBS" 61564 61565+fi 61566+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 61567+ echo "$ac_t""yes" 1>&6 61568+ 61569 LDFLAGS=$save_old_LDFLAGS 61570 ext_shared=$save_ext_shared 61571- 61572-cat >>confdefs.h <<\_ACEOF 61573+ cat >> confdefs.h <<\EOF 61574 #define HAVE_LIBGD15 1 61575-_ACEOF 61576- 61577+EOF 61578 61579+ 61580 else 61581+ echo "$ac_t""no" 1>&6 61582 61583 LDFLAGS=$save_old_LDFLAGS 61584 ext_shared=$save_ext_shared 61585 unset ac_cv_lib_gd_gdImagePaletteCopy 61586- 61587- 61588+ 61589+ 61590 fi 61591 61592- 61593+ 61594 save_old_LDFLAGS=$LDFLAGS 61595 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 61596- 61597+ 61598 save_ext_shared=$ext_shared 61599 ext_shared=yes 61600- 61601+ 61602 for ac_i in $ac_stuff; do 61603 case $ac_i in 61604 -pthread) 61605 if test "$ext_shared" = "yes"; then 61606 LDFLAGS="$LDFLAGS -pthread" 61607 else 61608- 61609- 61610+ 61611+ 61612 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 61613- 61614+ 61615 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 61616 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61617 eval "EXTRA_LDFLAGS$unique=set" 61618@@ -53210,20 +40342,20 @@ 61619 ;; 61620 -l*) 61621 ac_ii=`echo $ac_i|cut -c 3-` 61622- 61623- 61624+ 61625+ 61626 case $ac_ii in 61627 c|c_r|pthread*) ;; 61628- *) 61629+ *) 61630 if test "$ext_shared" = "yes"; then 61631- LDFLAGS="$LDFLAGS -l$ac_ii" 61632+ LDFLAGS="$LDFLAGS -l$ac_ii" 61633 else 61634- 61635- 61636+ 61637+ 61638 case $ac_ii in 61639 c|c_r|pthread*) ;; 61640- *) 61641- LIBS="$LIBS -l$ac_ii" 61642+ *) 61643+ LIBS="$LIBS -l$ac_ii" 61644 ;; 61645 esac 61646 61647@@ -53236,148 +40368,118 @@ 61648 ;; 61649 -L*) 61650 ac_ii=`echo $ac_i|cut -c 3-` 61651- 61652+ 61653 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 61654- 61655+ 61656 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 61657 ai_p=$ac_ii 61658 else 61659- 61660+ 61661 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 61662- 61663+ 61664 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61665 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 61666 fi 61667 61668- 61669+ 61670 if test "$ext_shared" = "yes"; then 61671 LDFLAGS="-L$ai_p $LDFLAGS" 61672 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 61673 else 61674- 61675- 61676- 61677+ 61678+ 61679+ 61680 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61681- 61682+ 61683 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61684 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61685 eval "LIBPATH$unique=set" 61686- 61687+ 61688 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61689 LDFLAGS="$LDFLAGS -L$ai_p" 61690 PHP_RPATHS="$PHP_RPATHS $ai_p" 61691- 61692+ 61693 fi 61694 61695 61696 fi 61697- 61698+ 61699 fi 61700 61701 ;; 61702 esac 61703 done 61704 61705- echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5 61706-echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6 61707-if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then 61708- echo $ECHO_N "(cached) $ECHO_C" >&6 61709+ echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 61710+echo "configure:40415: checking for gdImageCreateFromPng in -lgd" >&5 61711+ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` 61712+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 61713+ echo $ac_n "(cached) $ac_c" 1>&6 61714 else 61715- ac_check_lib_save_LIBS=$LIBS 61716+ ac_save_LIBS="$LIBS" 61717 LIBS="-lgd $LIBS" 61718-cat >conftest.$ac_ext <<_ACEOF 61719-/* confdefs.h. */ 61720-_ACEOF 61721-cat confdefs.h >>conftest.$ac_ext 61722-cat >>conftest.$ac_ext <<_ACEOF 61723-/* end confdefs.h. */ 61724- 61725+cat > conftest.$ac_ext <<EOF 61726+#line 40423 "configure" 61727+#include "confdefs.h" 61728 /* Override any gcc2 internal prototype to avoid an error. */ 61729-#ifdef __cplusplus 61730-extern "C" 61731-#endif 61732 /* We use char because int might match the return type of a gcc2 61733- builtin and then its argument prototype would still apply. */ 61734-char gdImageCreateFromPng (); 61735-int 61736-main () 61737-{ 61738-gdImageCreateFromPng (); 61739- ; 61740- return 0; 61741-} 61742-_ACEOF 61743-rm -f conftest.$ac_objext conftest$ac_exeext 61744-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 61745- (eval $ac_link) 2>conftest.er1 61746- ac_status=$? 61747- grep -v '^ *+' conftest.er1 >conftest.err 61748- rm -f conftest.er1 61749- cat conftest.err >&5 61750- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61751- (exit $ac_status); } && 61752- { ac_try='test -z "$ac_c_werror_flag" 61753- || test ! -s conftest.err' 61754- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61755- (eval $ac_try) 2>&5 61756- ac_status=$? 61757- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61758- (exit $ac_status); }; } && 61759- { ac_try='test -s conftest$ac_exeext' 61760- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61761- (eval $ac_try) 2>&5 61762- ac_status=$? 61763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61764- (exit $ac_status); }; }; then 61765- ac_cv_lib_gd_gdImageCreateFromPng=yes 61766-else 61767- echo "$as_me: failed program was:" >&5 61768-sed 's/^/| /' conftest.$ac_ext >&5 61769- 61770-ac_cv_lib_gd_gdImageCreateFromPng=no 61771-fi 61772-rm -f conftest.err conftest.$ac_objext \ 61773- conftest$ac_exeext conftest.$ac_ext 61774-LIBS=$ac_check_lib_save_LIBS 61775-fi 61776-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5 61777-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6 61778-if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then 61779+ builtin and then its argument prototype would still apply. */ 61780+char gdImageCreateFromPng(); 61781 61782+int main() { 61783+gdImageCreateFromPng() 61784+; return 0; } 61785+EOF 61786+if { (eval echo configure:40434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 61787+ rm -rf conftest* 61788+ eval "ac_cv_lib_$ac_lib_var=yes" 61789+else 61790+ echo "configure: failed program was:" >&5 61791+ cat conftest.$ac_ext >&5 61792+ rm -rf conftest* 61793+ eval "ac_cv_lib_$ac_lib_var=no" 61794+fi 61795+rm -f conftest* 61796+LIBS="$ac_save_LIBS" 61797+ 61798+fi 61799+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 61800+ echo "$ac_t""yes" 1>&6 61801+ 61802 LDFLAGS=$save_old_LDFLAGS 61803 ext_shared=$save_ext_shared 61804- 61805-cat >>confdefs.h <<\_ACEOF 61806+ cat >> confdefs.h <<\EOF 61807 #define HAVE_GD_PNG 1 61808-_ACEOF 61809- 61810+EOF 61811 61812+ 61813 else 61814+ echo "$ac_t""no" 1>&6 61815 61816 LDFLAGS=$save_old_LDFLAGS 61817 ext_shared=$save_ext_shared 61818 unset ac_cv_lib_gd_gdImageCreateFromPng 61819- 61820- 61821+ 61822+ 61823 fi 61824 61825- 61826+ 61827 save_old_LDFLAGS=$LDFLAGS 61828 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 61829- 61830+ 61831 save_ext_shared=$ext_shared 61832 ext_shared=yes 61833- 61834+ 61835 for ac_i in $ac_stuff; do 61836 case $ac_i in 61837 -pthread) 61838 if test "$ext_shared" = "yes"; then 61839 LDFLAGS="$LDFLAGS -pthread" 61840 else 61841- 61842- 61843+ 61844+ 61845 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 61846- 61847+ 61848 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 61849 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61850 eval "EXTRA_LDFLAGS$unique=set" 61851@@ -53388,20 +40490,20 @@ 61852 ;; 61853 -l*) 61854 ac_ii=`echo $ac_i|cut -c 3-` 61855- 61856- 61857+ 61858+ 61859 case $ac_ii in 61860 c|c_r|pthread*) ;; 61861- *) 61862+ *) 61863 if test "$ext_shared" = "yes"; then 61864- LDFLAGS="$LDFLAGS -l$ac_ii" 61865+ LDFLAGS="$LDFLAGS -l$ac_ii" 61866 else 61867- 61868- 61869+ 61870+ 61871 case $ac_ii in 61872 c|c_r|pthread*) ;; 61873- *) 61874- LIBS="$LIBS -l$ac_ii" 61875+ *) 61876+ LIBS="$LIBS -l$ac_ii" 61877 ;; 61878 esac 61879 61880@@ -53414,148 +40516,118 @@ 61881 ;; 61882 -L*) 61883 ac_ii=`echo $ac_i|cut -c 3-` 61884- 61885+ 61886 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 61887- 61888+ 61889 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 61890 ai_p=$ac_ii 61891 else 61892- 61893+ 61894 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 61895- 61896+ 61897 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 61898 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 61899 fi 61900 61901- 61902+ 61903 if test "$ext_shared" = "yes"; then 61904 LDFLAGS="-L$ai_p $LDFLAGS" 61905 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 61906 else 61907- 61908- 61909- 61910+ 61911+ 61912+ 61913 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 61914- 61915+ 61916 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 61917 if test -n "$unique" && test "`eval $cmd`" = "" ; then 61918 eval "LIBPATH$unique=set" 61919- 61920+ 61921 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 61922 LDFLAGS="$LDFLAGS -L$ai_p" 61923 PHP_RPATHS="$PHP_RPATHS $ai_p" 61924- 61925+ 61926 fi 61927 61928 61929 fi 61930- 61931+ 61932 fi 61933 61934 ;; 61935 esac 61936 done 61937 61938- echo "$as_me:$LINENO: checking for gdImageCreateFromGif in -lgd" >&5 61939-echo $ECHO_N "checking for gdImageCreateFromGif in -lgd... $ECHO_C" >&6 61940-if test "${ac_cv_lib_gd_gdImageCreateFromGif+set}" = set; then 61941- echo $ECHO_N "(cached) $ECHO_C" >&6 61942+ echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 61943+echo "configure:40563: checking for gdImageCreateFromGif in -lgd" >&5 61944+ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` 61945+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 61946+ echo $ac_n "(cached) $ac_c" 1>&6 61947 else 61948- ac_check_lib_save_LIBS=$LIBS 61949+ ac_save_LIBS="$LIBS" 61950 LIBS="-lgd $LIBS" 61951-cat >conftest.$ac_ext <<_ACEOF 61952-/* confdefs.h. */ 61953-_ACEOF 61954-cat confdefs.h >>conftest.$ac_ext 61955-cat >>conftest.$ac_ext <<_ACEOF 61956-/* end confdefs.h. */ 61957- 61958+cat > conftest.$ac_ext <<EOF 61959+#line 40571 "configure" 61960+#include "confdefs.h" 61961 /* Override any gcc2 internal prototype to avoid an error. */ 61962-#ifdef __cplusplus 61963-extern "C" 61964-#endif 61965 /* We use char because int might match the return type of a gcc2 61966- builtin and then its argument prototype would still apply. */ 61967-char gdImageCreateFromGif (); 61968-int 61969-main () 61970-{ 61971-gdImageCreateFromGif (); 61972- ; 61973- return 0; 61974-} 61975-_ACEOF 61976-rm -f conftest.$ac_objext conftest$ac_exeext 61977-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 61978- (eval $ac_link) 2>conftest.er1 61979- ac_status=$? 61980- grep -v '^ *+' conftest.er1 >conftest.err 61981- rm -f conftest.er1 61982- cat conftest.err >&5 61983- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61984- (exit $ac_status); } && 61985- { ac_try='test -z "$ac_c_werror_flag" 61986- || test ! -s conftest.err' 61987- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61988- (eval $ac_try) 2>&5 61989- ac_status=$? 61990- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61991- (exit $ac_status); }; } && 61992- { ac_try='test -s conftest$ac_exeext' 61993- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 61994- (eval $ac_try) 2>&5 61995- ac_status=$? 61996- echo "$as_me:$LINENO: \$? = $ac_status" >&5 61997- (exit $ac_status); }; }; then 61998- ac_cv_lib_gd_gdImageCreateFromGif=yes 61999-else 62000- echo "$as_me: failed program was:" >&5 62001-sed 's/^/| /' conftest.$ac_ext >&5 62002- 62003-ac_cv_lib_gd_gdImageCreateFromGif=no 62004-fi 62005-rm -f conftest.err conftest.$ac_objext \ 62006- conftest$ac_exeext conftest.$ac_ext 62007-LIBS=$ac_check_lib_save_LIBS 62008-fi 62009-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGif" >&5 62010-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGif" >&6 62011-if test $ac_cv_lib_gd_gdImageCreateFromGif = yes; then 62012+ builtin and then its argument prototype would still apply. */ 62013+char gdImageCreateFromGif(); 62014+ 62015+int main() { 62016+gdImageCreateFromGif() 62017+; return 0; } 62018+EOF 62019+if { (eval echo configure:40582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 62020+ rm -rf conftest* 62021+ eval "ac_cv_lib_$ac_lib_var=yes" 62022+else 62023+ echo "configure: failed program was:" >&5 62024+ cat conftest.$ac_ext >&5 62025+ rm -rf conftest* 62026+ eval "ac_cv_lib_$ac_lib_var=no" 62027+fi 62028+rm -f conftest* 62029+LIBS="$ac_save_LIBS" 62030 62031+fi 62032+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 62033+ echo "$ac_t""yes" 1>&6 62034+ 62035 LDFLAGS=$save_old_LDFLAGS 62036 ext_shared=$save_ext_shared 62037- 62038-cat >>confdefs.h <<\_ACEOF 62039+ cat >> confdefs.h <<\EOF 62040 #define HAVE_GD_GIF_READ 1 62041-_ACEOF 62042- 62043+EOF 62044 62045+ 62046 else 62047+ echo "$ac_t""no" 1>&6 62048 62049 LDFLAGS=$save_old_LDFLAGS 62050 ext_shared=$save_ext_shared 62051 unset ac_cv_lib_gd_gdImageCreateFromGif 62052- 62053- 62054+ 62055+ 62056 fi 62057 62058- 62059+ 62060 save_old_LDFLAGS=$LDFLAGS 62061 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 62062- 62063+ 62064 save_ext_shared=$ext_shared 62065 ext_shared=yes 62066- 62067+ 62068 for ac_i in $ac_stuff; do 62069 case $ac_i in 62070 -pthread) 62071 if test "$ext_shared" = "yes"; then 62072 LDFLAGS="$LDFLAGS -pthread" 62073 else 62074- 62075- 62076+ 62077+ 62078 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 62079- 62080+ 62081 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 62082 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62083 eval "EXTRA_LDFLAGS$unique=set" 62084@@ -53566,20 +40638,20 @@ 62085 ;; 62086 -l*) 62087 ac_ii=`echo $ac_i|cut -c 3-` 62088- 62089- 62090+ 62091+ 62092 case $ac_ii in 62093 c|c_r|pthread*) ;; 62094- *) 62095+ *) 62096 if test "$ext_shared" = "yes"; then 62097- LDFLAGS="$LDFLAGS -l$ac_ii" 62098+ LDFLAGS="$LDFLAGS -l$ac_ii" 62099 else 62100- 62101- 62102+ 62103+ 62104 case $ac_ii in 62105 c|c_r|pthread*) ;; 62106- *) 62107- LIBS="$LIBS -l$ac_ii" 62108+ *) 62109+ LIBS="$LIBS -l$ac_ii" 62110 ;; 62111 esac 62112 62113@@ -53592,148 +40664,118 @@ 62114 ;; 62115 -L*) 62116 ac_ii=`echo $ac_i|cut -c 3-` 62117- 62118+ 62119 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 62120- 62121+ 62122 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 62123 ai_p=$ac_ii 62124 else 62125- 62126+ 62127 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 62128- 62129+ 62130 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 62131 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 62132 fi 62133 62134- 62135+ 62136 if test "$ext_shared" = "yes"; then 62137 LDFLAGS="-L$ai_p $LDFLAGS" 62138 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 62139 else 62140- 62141- 62142- 62143+ 62144+ 62145+ 62146 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 62147- 62148+ 62149 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 62150 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62151 eval "LIBPATH$unique=set" 62152- 62153+ 62154 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 62155 LDFLAGS="$LDFLAGS -L$ai_p" 62156 PHP_RPATHS="$PHP_RPATHS $ai_p" 62157- 62158+ 62159 fi 62160 62161 62162 fi 62163- 62164+ 62165 fi 62166 62167 ;; 62168 esac 62169 done 62170 62171- echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5 62172-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6 62173-if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then 62174- echo $ECHO_N "(cached) $ECHO_C" >&6 62175+ echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 62176+echo "configure:40711: checking for gdImageGif in -lgd" >&5 62177+ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` 62178+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 62179+ echo $ac_n "(cached) $ac_c" 1>&6 62180 else 62181- ac_check_lib_save_LIBS=$LIBS 62182+ ac_save_LIBS="$LIBS" 62183 LIBS="-lgd $LIBS" 62184-cat >conftest.$ac_ext <<_ACEOF 62185-/* confdefs.h. */ 62186-_ACEOF 62187-cat confdefs.h >>conftest.$ac_ext 62188-cat >>conftest.$ac_ext <<_ACEOF 62189-/* end confdefs.h. */ 62190- 62191+cat > conftest.$ac_ext <<EOF 62192+#line 40719 "configure" 62193+#include "confdefs.h" 62194 /* Override any gcc2 internal prototype to avoid an error. */ 62195-#ifdef __cplusplus 62196-extern "C" 62197-#endif 62198 /* We use char because int might match the return type of a gcc2 62199- builtin and then its argument prototype would still apply. */ 62200-char gdImageGif (); 62201-int 62202-main () 62203-{ 62204-gdImageGif (); 62205- ; 62206- return 0; 62207-} 62208-_ACEOF 62209-rm -f conftest.$ac_objext conftest$ac_exeext 62210-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 62211- (eval $ac_link) 2>conftest.er1 62212- ac_status=$? 62213- grep -v '^ *+' conftest.er1 >conftest.err 62214- rm -f conftest.er1 62215- cat conftest.err >&5 62216- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62217- (exit $ac_status); } && 62218- { ac_try='test -z "$ac_c_werror_flag" 62219- || test ! -s conftest.err' 62220- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62221- (eval $ac_try) 2>&5 62222- ac_status=$? 62223- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62224- (exit $ac_status); }; } && 62225- { ac_try='test -s conftest$ac_exeext' 62226- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62227- (eval $ac_try) 2>&5 62228- ac_status=$? 62229- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62230- (exit $ac_status); }; }; then 62231- ac_cv_lib_gd_gdImageGif=yes 62232-else 62233- echo "$as_me: failed program was:" >&5 62234-sed 's/^/| /' conftest.$ac_ext >&5 62235- 62236-ac_cv_lib_gd_gdImageGif=no 62237-fi 62238-rm -f conftest.err conftest.$ac_objext \ 62239- conftest$ac_exeext conftest.$ac_ext 62240-LIBS=$ac_check_lib_save_LIBS 62241-fi 62242-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5 62243-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6 62244-if test $ac_cv_lib_gd_gdImageGif = yes; then 62245+ builtin and then its argument prototype would still apply. */ 62246+char gdImageGif(); 62247+ 62248+int main() { 62249+gdImageGif() 62250+; return 0; } 62251+EOF 62252+if { (eval echo configure:40730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 62253+ rm -rf conftest* 62254+ eval "ac_cv_lib_$ac_lib_var=yes" 62255+else 62256+ echo "configure: failed program was:" >&5 62257+ cat conftest.$ac_ext >&5 62258+ rm -rf conftest* 62259+ eval "ac_cv_lib_$ac_lib_var=no" 62260+fi 62261+rm -f conftest* 62262+LIBS="$ac_save_LIBS" 62263 62264+fi 62265+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 62266+ echo "$ac_t""yes" 1>&6 62267+ 62268 LDFLAGS=$save_old_LDFLAGS 62269 ext_shared=$save_ext_shared 62270- 62271-cat >>confdefs.h <<\_ACEOF 62272+ cat >> confdefs.h <<\EOF 62273 #define HAVE_GD_GIF_CREATE 1 62274-_ACEOF 62275- 62276+EOF 62277 62278+ 62279 else 62280+ echo "$ac_t""no" 1>&6 62281 62282 LDFLAGS=$save_old_LDFLAGS 62283 ext_shared=$save_ext_shared 62284 unset ac_cv_lib_gd_gdImageGif 62285- 62286- 62287+ 62288+ 62289 fi 62290 62291- 62292+ 62293 save_old_LDFLAGS=$LDFLAGS 62294 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 62295- 62296+ 62297 save_ext_shared=$ext_shared 62298 ext_shared=yes 62299- 62300+ 62301 for ac_i in $ac_stuff; do 62302 case $ac_i in 62303 -pthread) 62304 if test "$ext_shared" = "yes"; then 62305 LDFLAGS="$LDFLAGS -pthread" 62306 else 62307- 62308- 62309+ 62310+ 62311 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 62312- 62313+ 62314 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 62315 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62316 eval "EXTRA_LDFLAGS$unique=set" 62317@@ -53744,20 +40786,20 @@ 62318 ;; 62319 -l*) 62320 ac_ii=`echo $ac_i|cut -c 3-` 62321- 62322- 62323+ 62324+ 62325 case $ac_ii in 62326 c|c_r|pthread*) ;; 62327- *) 62328+ *) 62329 if test "$ext_shared" = "yes"; then 62330- LDFLAGS="$LDFLAGS -l$ac_ii" 62331+ LDFLAGS="$LDFLAGS -l$ac_ii" 62332 else 62333- 62334- 62335+ 62336+ 62337 case $ac_ii in 62338 c|c_r|pthread*) ;; 62339- *) 62340- LIBS="$LIBS -l$ac_ii" 62341+ *) 62342+ LIBS="$LIBS -l$ac_ii" 62343 ;; 62344 esac 62345 62346@@ -53770,148 +40812,118 @@ 62347 ;; 62348 -L*) 62349 ac_ii=`echo $ac_i|cut -c 3-` 62350- 62351+ 62352 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 62353- 62354+ 62355 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 62356 ai_p=$ac_ii 62357 else 62358- 62359+ 62360 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 62361- 62362+ 62363 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 62364 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 62365 fi 62366 62367- 62368+ 62369 if test "$ext_shared" = "yes"; then 62370 LDFLAGS="-L$ai_p $LDFLAGS" 62371 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 62372 else 62373- 62374- 62375- 62376+ 62377+ 62378+ 62379 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 62380- 62381+ 62382 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 62383 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62384 eval "LIBPATH$unique=set" 62385- 62386+ 62387 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 62388 LDFLAGS="$LDFLAGS -L$ai_p" 62389 PHP_RPATHS="$PHP_RPATHS $ai_p" 62390- 62391+ 62392 fi 62393 62394 62395 fi 62396- 62397+ 62398 fi 62399 62400 ;; 62401 esac 62402 done 62403 62404- echo "$as_me:$LINENO: checking for gdImageWBMP in -lgd" >&5 62405-echo $ECHO_N "checking for gdImageWBMP in -lgd... $ECHO_C" >&6 62406-if test "${ac_cv_lib_gd_gdImageWBMP+set}" = set; then 62407- echo $ECHO_N "(cached) $ECHO_C" >&6 62408+ echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 62409+echo "configure:40859: checking for gdImageWBMP in -lgd" >&5 62410+ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` 62411+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 62412+ echo $ac_n "(cached) $ac_c" 1>&6 62413 else 62414- ac_check_lib_save_LIBS=$LIBS 62415+ ac_save_LIBS="$LIBS" 62416 LIBS="-lgd $LIBS" 62417-cat >conftest.$ac_ext <<_ACEOF 62418-/* confdefs.h. */ 62419-_ACEOF 62420-cat confdefs.h >>conftest.$ac_ext 62421-cat >>conftest.$ac_ext <<_ACEOF 62422-/* end confdefs.h. */ 62423- 62424+cat > conftest.$ac_ext <<EOF 62425+#line 40867 "configure" 62426+#include "confdefs.h" 62427 /* Override any gcc2 internal prototype to avoid an error. */ 62428-#ifdef __cplusplus 62429-extern "C" 62430-#endif 62431 /* We use char because int might match the return type of a gcc2 62432- builtin and then its argument prototype would still apply. */ 62433-char gdImageWBMP (); 62434-int 62435-main () 62436-{ 62437-gdImageWBMP (); 62438- ; 62439- return 0; 62440-} 62441-_ACEOF 62442-rm -f conftest.$ac_objext conftest$ac_exeext 62443-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 62444- (eval $ac_link) 2>conftest.er1 62445- ac_status=$? 62446- grep -v '^ *+' conftest.er1 >conftest.err 62447- rm -f conftest.er1 62448- cat conftest.err >&5 62449- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62450- (exit $ac_status); } && 62451- { ac_try='test -z "$ac_c_werror_flag" 62452- || test ! -s conftest.err' 62453- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62454- (eval $ac_try) 2>&5 62455- ac_status=$? 62456- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62457- (exit $ac_status); }; } && 62458- { ac_try='test -s conftest$ac_exeext' 62459- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62460- (eval $ac_try) 2>&5 62461- ac_status=$? 62462- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62463- (exit $ac_status); }; }; then 62464- ac_cv_lib_gd_gdImageWBMP=yes 62465-else 62466- echo "$as_me: failed program was:" >&5 62467-sed 's/^/| /' conftest.$ac_ext >&5 62468- 62469-ac_cv_lib_gd_gdImageWBMP=no 62470-fi 62471-rm -f conftest.err conftest.$ac_objext \ 62472- conftest$ac_exeext conftest.$ac_ext 62473-LIBS=$ac_check_lib_save_LIBS 62474-fi 62475-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageWBMP" >&5 62476-echo "${ECHO_T}$ac_cv_lib_gd_gdImageWBMP" >&6 62477-if test $ac_cv_lib_gd_gdImageWBMP = yes; then 62478+ builtin and then its argument prototype would still apply. */ 62479+char gdImageWBMP(); 62480+ 62481+int main() { 62482+gdImageWBMP() 62483+; return 0; } 62484+EOF 62485+if { (eval echo configure:40878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 62486+ rm -rf conftest* 62487+ eval "ac_cv_lib_$ac_lib_var=yes" 62488+else 62489+ echo "configure: failed program was:" >&5 62490+ cat conftest.$ac_ext >&5 62491+ rm -rf conftest* 62492+ eval "ac_cv_lib_$ac_lib_var=no" 62493+fi 62494+rm -f conftest* 62495+LIBS="$ac_save_LIBS" 62496 62497+fi 62498+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 62499+ echo "$ac_t""yes" 1>&6 62500+ 62501 LDFLAGS=$save_old_LDFLAGS 62502 ext_shared=$save_ext_shared 62503- 62504-cat >>confdefs.h <<\_ACEOF 62505+ cat >> confdefs.h <<\EOF 62506 #define HAVE_GD_WBMP 1 62507-_ACEOF 62508- 62509+EOF 62510 62511+ 62512 else 62513+ echo "$ac_t""no" 1>&6 62514 62515 LDFLAGS=$save_old_LDFLAGS 62516 ext_shared=$save_ext_shared 62517 unset ac_cv_lib_gd_gdImageWBMP 62518- 62519- 62520+ 62521+ 62522 fi 62523 62524- 62525+ 62526 save_old_LDFLAGS=$LDFLAGS 62527 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 62528- 62529+ 62530 save_ext_shared=$ext_shared 62531 ext_shared=yes 62532- 62533+ 62534 for ac_i in $ac_stuff; do 62535 case $ac_i in 62536 -pthread) 62537 if test "$ext_shared" = "yes"; then 62538 LDFLAGS="$LDFLAGS -pthread" 62539 else 62540- 62541- 62542+ 62543+ 62544 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 62545- 62546+ 62547 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 62548 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62549 eval "EXTRA_LDFLAGS$unique=set" 62550@@ -53922,20 +40934,20 @@ 62551 ;; 62552 -l*) 62553 ac_ii=`echo $ac_i|cut -c 3-` 62554- 62555- 62556+ 62557+ 62558 case $ac_ii in 62559 c|c_r|pthread*) ;; 62560- *) 62561+ *) 62562 if test "$ext_shared" = "yes"; then 62563- LDFLAGS="$LDFLAGS -l$ac_ii" 62564+ LDFLAGS="$LDFLAGS -l$ac_ii" 62565 else 62566- 62567- 62568+ 62569+ 62570 case $ac_ii in 62571 c|c_r|pthread*) ;; 62572- *) 62573- LIBS="$LIBS -l$ac_ii" 62574+ *) 62575+ LIBS="$LIBS -l$ac_ii" 62576 ;; 62577 esac 62578 62579@@ -53948,148 +40960,118 @@ 62580 ;; 62581 -L*) 62582 ac_ii=`echo $ac_i|cut -c 3-` 62583- 62584+ 62585 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 62586- 62587+ 62588 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 62589 ai_p=$ac_ii 62590 else 62591- 62592+ 62593 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 62594- 62595+ 62596 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 62597 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 62598 fi 62599 62600- 62601+ 62602 if test "$ext_shared" = "yes"; then 62603 LDFLAGS="-L$ai_p $LDFLAGS" 62604 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 62605 else 62606- 62607- 62608- 62609+ 62610+ 62611+ 62612 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 62613- 62614+ 62615 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 62616 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62617 eval "LIBPATH$unique=set" 62618- 62619+ 62620 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 62621 LDFLAGS="$LDFLAGS -L$ai_p" 62622 PHP_RPATHS="$PHP_RPATHS $ai_p" 62623- 62624+ 62625 fi 62626 62627 62628 fi 62629- 62630+ 62631 fi 62632 62633 ;; 62634 esac 62635 done 62636 62637- echo "$as_me:$LINENO: checking for gdImageCreateFromJpeg in -lgd" >&5 62638-echo $ECHO_N "checking for gdImageCreateFromJpeg in -lgd... $ECHO_C" >&6 62639-if test "${ac_cv_lib_gd_gdImageCreateFromJpeg+set}" = set; then 62640- echo $ECHO_N "(cached) $ECHO_C" >&6 62641+ echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 62642+echo "configure:41007: checking for gdImageCreateFromJpeg in -lgd" >&5 62643+ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` 62644+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 62645+ echo $ac_n "(cached) $ac_c" 1>&6 62646 else 62647- ac_check_lib_save_LIBS=$LIBS 62648+ ac_save_LIBS="$LIBS" 62649 LIBS="-lgd $LIBS" 62650-cat >conftest.$ac_ext <<_ACEOF 62651-/* confdefs.h. */ 62652-_ACEOF 62653-cat confdefs.h >>conftest.$ac_ext 62654-cat >>conftest.$ac_ext <<_ACEOF 62655-/* end confdefs.h. */ 62656- 62657+cat > conftest.$ac_ext <<EOF 62658+#line 41015 "configure" 62659+#include "confdefs.h" 62660 /* Override any gcc2 internal prototype to avoid an error. */ 62661-#ifdef __cplusplus 62662-extern "C" 62663-#endif 62664 /* We use char because int might match the return type of a gcc2 62665- builtin and then its argument prototype would still apply. */ 62666-char gdImageCreateFromJpeg (); 62667-int 62668-main () 62669-{ 62670-gdImageCreateFromJpeg (); 62671- ; 62672- return 0; 62673-} 62674-_ACEOF 62675-rm -f conftest.$ac_objext conftest$ac_exeext 62676-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 62677- (eval $ac_link) 2>conftest.er1 62678- ac_status=$? 62679- grep -v '^ *+' conftest.er1 >conftest.err 62680- rm -f conftest.er1 62681- cat conftest.err >&5 62682- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62683- (exit $ac_status); } && 62684- { ac_try='test -z "$ac_c_werror_flag" 62685- || test ! -s conftest.err' 62686- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62687- (eval $ac_try) 2>&5 62688- ac_status=$? 62689- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62690- (exit $ac_status); }; } && 62691- { ac_try='test -s conftest$ac_exeext' 62692- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62693- (eval $ac_try) 2>&5 62694- ac_status=$? 62695- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62696- (exit $ac_status); }; }; then 62697- ac_cv_lib_gd_gdImageCreateFromJpeg=yes 62698-else 62699- echo "$as_me: failed program was:" >&5 62700-sed 's/^/| /' conftest.$ac_ext >&5 62701- 62702-ac_cv_lib_gd_gdImageCreateFromJpeg=no 62703-fi 62704-rm -f conftest.err conftest.$ac_objext \ 62705- conftest$ac_exeext conftest.$ac_ext 62706-LIBS=$ac_check_lib_save_LIBS 62707-fi 62708-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromJpeg" >&5 62709-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromJpeg" >&6 62710-if test $ac_cv_lib_gd_gdImageCreateFromJpeg = yes; then 62711+ builtin and then its argument prototype would still apply. */ 62712+char gdImageCreateFromJpeg(); 62713+ 62714+int main() { 62715+gdImageCreateFromJpeg() 62716+; return 0; } 62717+EOF 62718+if { (eval echo configure:41026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 62719+ rm -rf conftest* 62720+ eval "ac_cv_lib_$ac_lib_var=yes" 62721+else 62722+ echo "configure: failed program was:" >&5 62723+ cat conftest.$ac_ext >&5 62724+ rm -rf conftest* 62725+ eval "ac_cv_lib_$ac_lib_var=no" 62726+fi 62727+rm -f conftest* 62728+LIBS="$ac_save_LIBS" 62729 62730+fi 62731+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 62732+ echo "$ac_t""yes" 1>&6 62733+ 62734 LDFLAGS=$save_old_LDFLAGS 62735 ext_shared=$save_ext_shared 62736- 62737-cat >>confdefs.h <<\_ACEOF 62738+ cat >> confdefs.h <<\EOF 62739 #define HAVE_GD_JPG 1 62740-_ACEOF 62741- 62742+EOF 62743 62744+ 62745 else 62746+ echo "$ac_t""no" 1>&6 62747 62748 LDFLAGS=$save_old_LDFLAGS 62749 ext_shared=$save_ext_shared 62750 unset ac_cv_lib_gd_gdImageCreateFromJpeg 62751- 62752- 62753+ 62754+ 62755 fi 62756 62757- 62758+ 62759 save_old_LDFLAGS=$LDFLAGS 62760 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 62761- 62762+ 62763 save_ext_shared=$ext_shared 62764 ext_shared=yes 62765- 62766+ 62767 for ac_i in $ac_stuff; do 62768 case $ac_i in 62769 -pthread) 62770 if test "$ext_shared" = "yes"; then 62771 LDFLAGS="$LDFLAGS -pthread" 62772 else 62773- 62774- 62775+ 62776+ 62777 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 62778- 62779+ 62780 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 62781 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62782 eval "EXTRA_LDFLAGS$unique=set" 62783@@ -54100,20 +41082,20 @@ 62784 ;; 62785 -l*) 62786 ac_ii=`echo $ac_i|cut -c 3-` 62787- 62788- 62789+ 62790+ 62791 case $ac_ii in 62792 c|c_r|pthread*) ;; 62793- *) 62794+ *) 62795 if test "$ext_shared" = "yes"; then 62796- LDFLAGS="$LDFLAGS -l$ac_ii" 62797+ LDFLAGS="$LDFLAGS -l$ac_ii" 62798 else 62799- 62800- 62801+ 62802+ 62803 case $ac_ii in 62804 c|c_r|pthread*) ;; 62805- *) 62806- LIBS="$LIBS -l$ac_ii" 62807+ *) 62808+ LIBS="$LIBS -l$ac_ii" 62809 ;; 62810 esac 62811 62812@@ -54126,148 +41108,118 @@ 62813 ;; 62814 -L*) 62815 ac_ii=`echo $ac_i|cut -c 3-` 62816- 62817+ 62818 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 62819- 62820+ 62821 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 62822 ai_p=$ac_ii 62823 else 62824- 62825+ 62826 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 62827- 62828+ 62829 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 62830 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 62831 fi 62832 62833- 62834+ 62835 if test "$ext_shared" = "yes"; then 62836 LDFLAGS="-L$ai_p $LDFLAGS" 62837 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 62838 else 62839- 62840- 62841- 62842+ 62843+ 62844+ 62845 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 62846- 62847+ 62848 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 62849 if test -n "$unique" && test "`eval $cmd`" = "" ; then 62850 eval "LIBPATH$unique=set" 62851- 62852+ 62853 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 62854 LDFLAGS="$LDFLAGS -L$ai_p" 62855 PHP_RPATHS="$PHP_RPATHS $ai_p" 62856- 62857+ 62858 fi 62859 62860 62861 fi 62862- 62863+ 62864 fi 62865 62866 ;; 62867 esac 62868 done 62869 62870- echo "$as_me:$LINENO: checking for gdImageCreateFromXpm in -lgd" >&5 62871-echo $ECHO_N "checking for gdImageCreateFromXpm in -lgd... $ECHO_C" >&6 62872-if test "${ac_cv_lib_gd_gdImageCreateFromXpm+set}" = set; then 62873- echo $ECHO_N "(cached) $ECHO_C" >&6 62874+ echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 62875+echo "configure:41155: checking for gdImageCreateFromXpm in -lgd" >&5 62876+ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` 62877+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 62878+ echo $ac_n "(cached) $ac_c" 1>&6 62879 else 62880- ac_check_lib_save_LIBS=$LIBS 62881+ ac_save_LIBS="$LIBS" 62882 LIBS="-lgd $LIBS" 62883-cat >conftest.$ac_ext <<_ACEOF 62884-/* confdefs.h. */ 62885-_ACEOF 62886-cat confdefs.h >>conftest.$ac_ext 62887-cat >>conftest.$ac_ext <<_ACEOF 62888-/* end confdefs.h. */ 62889- 62890+cat > conftest.$ac_ext <<EOF 62891+#line 41163 "configure" 62892+#include "confdefs.h" 62893 /* Override any gcc2 internal prototype to avoid an error. */ 62894-#ifdef __cplusplus 62895-extern "C" 62896-#endif 62897 /* We use char because int might match the return type of a gcc2 62898- builtin and then its argument prototype would still apply. */ 62899-char gdImageCreateFromXpm (); 62900-int 62901-main () 62902-{ 62903-gdImageCreateFromXpm (); 62904- ; 62905- return 0; 62906-} 62907-_ACEOF 62908-rm -f conftest.$ac_objext conftest$ac_exeext 62909-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 62910- (eval $ac_link) 2>conftest.er1 62911- ac_status=$? 62912- grep -v '^ *+' conftest.er1 >conftest.err 62913- rm -f conftest.er1 62914- cat conftest.err >&5 62915- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62916- (exit $ac_status); } && 62917- { ac_try='test -z "$ac_c_werror_flag" 62918- || test ! -s conftest.err' 62919- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62920- (eval $ac_try) 2>&5 62921- ac_status=$? 62922- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62923- (exit $ac_status); }; } && 62924- { ac_try='test -s conftest$ac_exeext' 62925- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 62926- (eval $ac_try) 2>&5 62927- ac_status=$? 62928- echo "$as_me:$LINENO: \$? = $ac_status" >&5 62929- (exit $ac_status); }; }; then 62930- ac_cv_lib_gd_gdImageCreateFromXpm=yes 62931-else 62932- echo "$as_me: failed program was:" >&5 62933-sed 's/^/| /' conftest.$ac_ext >&5 62934- 62935-ac_cv_lib_gd_gdImageCreateFromXpm=no 62936-fi 62937-rm -f conftest.err conftest.$ac_objext \ 62938- conftest$ac_exeext conftest.$ac_ext 62939-LIBS=$ac_check_lib_save_LIBS 62940-fi 62941-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5 62942-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromXpm" >&6 62943-if test $ac_cv_lib_gd_gdImageCreateFromXpm = yes; then 62944+ builtin and then its argument prototype would still apply. */ 62945+char gdImageCreateFromXpm(); 62946+ 62947+int main() { 62948+gdImageCreateFromXpm() 62949+; return 0; } 62950+EOF 62951+if { (eval echo configure:41174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 62952+ rm -rf conftest* 62953+ eval "ac_cv_lib_$ac_lib_var=yes" 62954+else 62955+ echo "configure: failed program was:" >&5 62956+ cat conftest.$ac_ext >&5 62957+ rm -rf conftest* 62958+ eval "ac_cv_lib_$ac_lib_var=no" 62959+fi 62960+rm -f conftest* 62961+LIBS="$ac_save_LIBS" 62962 62963+fi 62964+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 62965+ echo "$ac_t""yes" 1>&6 62966+ 62967 LDFLAGS=$save_old_LDFLAGS 62968 ext_shared=$save_ext_shared 62969- 62970-cat >>confdefs.h <<\_ACEOF 62971+ cat >> confdefs.h <<\EOF 62972 #define HAVE_GD_XPM 1 62973-_ACEOF 62974- 62975+EOF 62976 62977+ 62978 else 62979+ echo "$ac_t""no" 1>&6 62980 62981 LDFLAGS=$save_old_LDFLAGS 62982 ext_shared=$save_ext_shared 62983 unset ac_cv_lib_gd_gdImageCreateFromXpm 62984- 62985- 62986+ 62987+ 62988 fi 62989 62990- 62991+ 62992 save_old_LDFLAGS=$LDFLAGS 62993 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 62994- 62995+ 62996 save_ext_shared=$ext_shared 62997 ext_shared=yes 62998- 62999+ 63000 for ac_i in $ac_stuff; do 63001 case $ac_i in 63002 -pthread) 63003 if test "$ext_shared" = "yes"; then 63004 LDFLAGS="$LDFLAGS -pthread" 63005 else 63006- 63007- 63008+ 63009+ 63010 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 63011- 63012+ 63013 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 63014 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63015 eval "EXTRA_LDFLAGS$unique=set" 63016@@ -54278,20 +41230,20 @@ 63017 ;; 63018 -l*) 63019 ac_ii=`echo $ac_i|cut -c 3-` 63020- 63021- 63022+ 63023+ 63024 case $ac_ii in 63025 c|c_r|pthread*) ;; 63026- *) 63027+ *) 63028 if test "$ext_shared" = "yes"; then 63029- LDFLAGS="$LDFLAGS -l$ac_ii" 63030+ LDFLAGS="$LDFLAGS -l$ac_ii" 63031 else 63032- 63033- 63034+ 63035+ 63036 case $ac_ii in 63037 c|c_r|pthread*) ;; 63038- *) 63039- LIBS="$LIBS -l$ac_ii" 63040+ *) 63041+ LIBS="$LIBS -l$ac_ii" 63042 ;; 63043 esac 63044 63045@@ -54304,148 +41256,118 @@ 63046 ;; 63047 -L*) 63048 ac_ii=`echo $ac_i|cut -c 3-` 63049- 63050+ 63051 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 63052- 63053+ 63054 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 63055 ai_p=$ac_ii 63056 else 63057- 63058+ 63059 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 63060- 63061+ 63062 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 63063 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 63064 fi 63065 63066- 63067+ 63068 if test "$ext_shared" = "yes"; then 63069 LDFLAGS="-L$ai_p $LDFLAGS" 63070 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 63071 else 63072- 63073- 63074- 63075+ 63076+ 63077+ 63078 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 63079- 63080+ 63081 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 63082 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63083 eval "LIBPATH$unique=set" 63084- 63085+ 63086 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 63087 LDFLAGS="$LDFLAGS -L$ai_p" 63088 PHP_RPATHS="$PHP_RPATHS $ai_p" 63089- 63090+ 63091 fi 63092 63093 63094 fi 63095- 63096+ 63097 fi 63098 63099 ;; 63100 esac 63101 done 63102 63103- echo "$as_me:$LINENO: checking for gdImageCreateFromGd2 in -lgd" >&5 63104-echo $ECHO_N "checking for gdImageCreateFromGd2 in -lgd... $ECHO_C" >&6 63105-if test "${ac_cv_lib_gd_gdImageCreateFromGd2+set}" = set; then 63106- echo $ECHO_N "(cached) $ECHO_C" >&6 63107+ echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 63108+echo "configure:41303: checking for gdImageCreateFromGd2 in -lgd" >&5 63109+ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` 63110+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 63111+ echo $ac_n "(cached) $ac_c" 1>&6 63112 else 63113- ac_check_lib_save_LIBS=$LIBS 63114+ ac_save_LIBS="$LIBS" 63115 LIBS="-lgd $LIBS" 63116-cat >conftest.$ac_ext <<_ACEOF 63117-/* confdefs.h. */ 63118-_ACEOF 63119-cat confdefs.h >>conftest.$ac_ext 63120-cat >>conftest.$ac_ext <<_ACEOF 63121-/* end confdefs.h. */ 63122- 63123+cat > conftest.$ac_ext <<EOF 63124+#line 41311 "configure" 63125+#include "confdefs.h" 63126 /* Override any gcc2 internal prototype to avoid an error. */ 63127-#ifdef __cplusplus 63128-extern "C" 63129-#endif 63130 /* We use char because int might match the return type of a gcc2 63131- builtin and then its argument prototype would still apply. */ 63132-char gdImageCreateFromGd2 (); 63133-int 63134-main () 63135-{ 63136-gdImageCreateFromGd2 (); 63137- ; 63138- return 0; 63139-} 63140-_ACEOF 63141-rm -f conftest.$ac_objext conftest$ac_exeext 63142-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 63143- (eval $ac_link) 2>conftest.er1 63144- ac_status=$? 63145- grep -v '^ *+' conftest.er1 >conftest.err 63146- rm -f conftest.er1 63147- cat conftest.err >&5 63148- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63149- (exit $ac_status); } && 63150- { ac_try='test -z "$ac_c_werror_flag" 63151- || test ! -s conftest.err' 63152- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63153- (eval $ac_try) 2>&5 63154- ac_status=$? 63155- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63156- (exit $ac_status); }; } && 63157- { ac_try='test -s conftest$ac_exeext' 63158- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63159- (eval $ac_try) 2>&5 63160- ac_status=$? 63161- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63162- (exit $ac_status); }; }; then 63163- ac_cv_lib_gd_gdImageCreateFromGd2=yes 63164-else 63165- echo "$as_me: failed program was:" >&5 63166-sed 's/^/| /' conftest.$ac_ext >&5 63167- 63168-ac_cv_lib_gd_gdImageCreateFromGd2=no 63169-fi 63170-rm -f conftest.err conftest.$ac_objext \ 63171- conftest$ac_exeext conftest.$ac_ext 63172-LIBS=$ac_check_lib_save_LIBS 63173-fi 63174-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGd2" >&5 63175-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGd2" >&6 63176-if test $ac_cv_lib_gd_gdImageCreateFromGd2 = yes; then 63177+ builtin and then its argument prototype would still apply. */ 63178+char gdImageCreateFromGd2(); 63179+ 63180+int main() { 63181+gdImageCreateFromGd2() 63182+; return 0; } 63183+EOF 63184+if { (eval echo configure:41322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 63185+ rm -rf conftest* 63186+ eval "ac_cv_lib_$ac_lib_var=yes" 63187+else 63188+ echo "configure: failed program was:" >&5 63189+ cat conftest.$ac_ext >&5 63190+ rm -rf conftest* 63191+ eval "ac_cv_lib_$ac_lib_var=no" 63192+fi 63193+rm -f conftest* 63194+LIBS="$ac_save_LIBS" 63195 63196+fi 63197+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 63198+ echo "$ac_t""yes" 1>&6 63199+ 63200 LDFLAGS=$save_old_LDFLAGS 63201 ext_shared=$save_ext_shared 63202- 63203-cat >>confdefs.h <<\_ACEOF 63204+ cat >> confdefs.h <<\EOF 63205 #define HAVE_GD_GD2 1 63206-_ACEOF 63207- 63208+EOF 63209 63210+ 63211 else 63212+ echo "$ac_t""no" 1>&6 63213 63214 LDFLAGS=$save_old_LDFLAGS 63215 ext_shared=$save_ext_shared 63216 unset ac_cv_lib_gd_gdImageCreateFromGd2 63217- 63218- 63219+ 63220+ 63221 fi 63222 63223- 63224+ 63225 save_old_LDFLAGS=$LDFLAGS 63226 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 63227- 63228+ 63229 save_ext_shared=$ext_shared 63230 ext_shared=yes 63231- 63232+ 63233 for ac_i in $ac_stuff; do 63234 case $ac_i in 63235 -pthread) 63236 if test "$ext_shared" = "yes"; then 63237 LDFLAGS="$LDFLAGS -pthread" 63238 else 63239- 63240- 63241+ 63242+ 63243 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 63244- 63245+ 63246 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 63247 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63248 eval "EXTRA_LDFLAGS$unique=set" 63249@@ -54456,20 +41378,20 @@ 63250 ;; 63251 -l*) 63252 ac_ii=`echo $ac_i|cut -c 3-` 63253- 63254- 63255+ 63256+ 63257 case $ac_ii in 63258 c|c_r|pthread*) ;; 63259- *) 63260+ *) 63261 if test "$ext_shared" = "yes"; then 63262- LDFLAGS="$LDFLAGS -l$ac_ii" 63263+ LDFLAGS="$LDFLAGS -l$ac_ii" 63264 else 63265- 63266- 63267+ 63268+ 63269 case $ac_ii in 63270 c|c_r|pthread*) ;; 63271- *) 63272- LIBS="$LIBS -l$ac_ii" 63273+ *) 63274+ LIBS="$LIBS -l$ac_ii" 63275 ;; 63276 esac 63277 63278@@ -54482,148 +41404,118 @@ 63279 ;; 63280 -L*) 63281 ac_ii=`echo $ac_i|cut -c 3-` 63282- 63283+ 63284 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 63285- 63286+ 63287 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 63288 ai_p=$ac_ii 63289 else 63290- 63291+ 63292 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 63293- 63294+ 63295 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 63296 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 63297 fi 63298 63299- 63300+ 63301 if test "$ext_shared" = "yes"; then 63302 LDFLAGS="-L$ai_p $LDFLAGS" 63303 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 63304 else 63305- 63306- 63307- 63308+ 63309+ 63310+ 63311 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 63312- 63313+ 63314 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 63315 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63316 eval "LIBPATH$unique=set" 63317- 63318+ 63319 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 63320 LDFLAGS="$LDFLAGS -L$ai_p" 63321 PHP_RPATHS="$PHP_RPATHS $ai_p" 63322- 63323+ 63324 fi 63325 63326 63327 fi 63328- 63329+ 63330 fi 63331 63332 ;; 63333 esac 63334 done 63335 63336- echo "$as_me:$LINENO: checking for gdImageCreateTrueColor in -lgd" >&5 63337-echo $ECHO_N "checking for gdImageCreateTrueColor in -lgd... $ECHO_C" >&6 63338-if test "${ac_cv_lib_gd_gdImageCreateTrueColor+set}" = set; then 63339- echo $ECHO_N "(cached) $ECHO_C" >&6 63340+ echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 63341+echo "configure:41451: checking for gdImageCreateTrueColor in -lgd" >&5 63342+ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` 63343+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 63344+ echo $ac_n "(cached) $ac_c" 1>&6 63345 else 63346- ac_check_lib_save_LIBS=$LIBS 63347+ ac_save_LIBS="$LIBS" 63348 LIBS="-lgd $LIBS" 63349-cat >conftest.$ac_ext <<_ACEOF 63350-/* confdefs.h. */ 63351-_ACEOF 63352-cat confdefs.h >>conftest.$ac_ext 63353-cat >>conftest.$ac_ext <<_ACEOF 63354-/* end confdefs.h. */ 63355- 63356+cat > conftest.$ac_ext <<EOF 63357+#line 41459 "configure" 63358+#include "confdefs.h" 63359 /* Override any gcc2 internal prototype to avoid an error. */ 63360-#ifdef __cplusplus 63361-extern "C" 63362-#endif 63363 /* We use char because int might match the return type of a gcc2 63364- builtin and then its argument prototype would still apply. */ 63365-char gdImageCreateTrueColor (); 63366-int 63367-main () 63368-{ 63369-gdImageCreateTrueColor (); 63370- ; 63371- return 0; 63372-} 63373-_ACEOF 63374-rm -f conftest.$ac_objext conftest$ac_exeext 63375-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 63376- (eval $ac_link) 2>conftest.er1 63377- ac_status=$? 63378- grep -v '^ *+' conftest.er1 >conftest.err 63379- rm -f conftest.er1 63380- cat conftest.err >&5 63381- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63382- (exit $ac_status); } && 63383- { ac_try='test -z "$ac_c_werror_flag" 63384- || test ! -s conftest.err' 63385- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63386- (eval $ac_try) 2>&5 63387- ac_status=$? 63388- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63389- (exit $ac_status); }; } && 63390- { ac_try='test -s conftest$ac_exeext' 63391- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63392- (eval $ac_try) 2>&5 63393- ac_status=$? 63394- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63395- (exit $ac_status); }; }; then 63396- ac_cv_lib_gd_gdImageCreateTrueColor=yes 63397-else 63398- echo "$as_me: failed program was:" >&5 63399-sed 's/^/| /' conftest.$ac_ext >&5 63400- 63401-ac_cv_lib_gd_gdImageCreateTrueColor=no 63402-fi 63403-rm -f conftest.err conftest.$ac_objext \ 63404- conftest$ac_exeext conftest.$ac_ext 63405-LIBS=$ac_check_lib_save_LIBS 63406-fi 63407-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateTrueColor" >&5 63408-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateTrueColor" >&6 63409-if test $ac_cv_lib_gd_gdImageCreateTrueColor = yes; then 63410+ builtin and then its argument prototype would still apply. */ 63411+char gdImageCreateTrueColor(); 63412+ 63413+int main() { 63414+gdImageCreateTrueColor() 63415+; return 0; } 63416+EOF 63417+if { (eval echo configure:41470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 63418+ rm -rf conftest* 63419+ eval "ac_cv_lib_$ac_lib_var=yes" 63420+else 63421+ echo "configure: failed program was:" >&5 63422+ cat conftest.$ac_ext >&5 63423+ rm -rf conftest* 63424+ eval "ac_cv_lib_$ac_lib_var=no" 63425+fi 63426+rm -f conftest* 63427+LIBS="$ac_save_LIBS" 63428 63429+fi 63430+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 63431+ echo "$ac_t""yes" 1>&6 63432+ 63433 LDFLAGS=$save_old_LDFLAGS 63434 ext_shared=$save_ext_shared 63435- 63436-cat >>confdefs.h <<\_ACEOF 63437+ cat >> confdefs.h <<\EOF 63438 #define HAVE_LIBGD20 1 63439-_ACEOF 63440- 63441+EOF 63442 63443+ 63444 else 63445+ echo "$ac_t""no" 1>&6 63446 63447 LDFLAGS=$save_old_LDFLAGS 63448 ext_shared=$save_ext_shared 63449 unset ac_cv_lib_gd_gdImageCreateTrueColor 63450- 63451- 63452+ 63453+ 63454 fi 63455 63456- 63457+ 63458 save_old_LDFLAGS=$LDFLAGS 63459 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 63460- 63461+ 63462 save_ext_shared=$ext_shared 63463 ext_shared=yes 63464- 63465+ 63466 for ac_i in $ac_stuff; do 63467 case $ac_i in 63468 -pthread) 63469 if test "$ext_shared" = "yes"; then 63470 LDFLAGS="$LDFLAGS -pthread" 63471 else 63472- 63473- 63474+ 63475+ 63476 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 63477- 63478+ 63479 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 63480 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63481 eval "EXTRA_LDFLAGS$unique=set" 63482@@ -54634,20 +41526,20 @@ 63483 ;; 63484 -l*) 63485 ac_ii=`echo $ac_i|cut -c 3-` 63486- 63487- 63488+ 63489+ 63490 case $ac_ii in 63491 c|c_r|pthread*) ;; 63492- *) 63493+ *) 63494 if test "$ext_shared" = "yes"; then 63495- LDFLAGS="$LDFLAGS -l$ac_ii" 63496+ LDFLAGS="$LDFLAGS -l$ac_ii" 63497 else 63498- 63499- 63500+ 63501+ 63502 case $ac_ii in 63503 c|c_r|pthread*) ;; 63504- *) 63505- LIBS="$LIBS -l$ac_ii" 63506+ *) 63507+ LIBS="$LIBS -l$ac_ii" 63508 ;; 63509 esac 63510 63511@@ -54660,148 +41552,118 @@ 63512 ;; 63513 -L*) 63514 ac_ii=`echo $ac_i|cut -c 3-` 63515- 63516+ 63517 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 63518- 63519+ 63520 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 63521 ai_p=$ac_ii 63522 else 63523- 63524+ 63525 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 63526- 63527+ 63528 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 63529 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 63530 fi 63531 63532- 63533+ 63534 if test "$ext_shared" = "yes"; then 63535 LDFLAGS="-L$ai_p $LDFLAGS" 63536 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 63537 else 63538- 63539- 63540- 63541+ 63542+ 63543+ 63544 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 63545- 63546+ 63547 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 63548 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63549 eval "LIBPATH$unique=set" 63550- 63551+ 63552 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 63553 LDFLAGS="$LDFLAGS -L$ai_p" 63554 PHP_RPATHS="$PHP_RPATHS $ai_p" 63555- 63556+ 63557 fi 63558 63559 63560 fi 63561- 63562+ 63563 fi 63564 63565 ;; 63566 esac 63567 done 63568 63569- echo "$as_me:$LINENO: checking for gdImageSetTile in -lgd" >&5 63570-echo $ECHO_N "checking for gdImageSetTile in -lgd... $ECHO_C" >&6 63571-if test "${ac_cv_lib_gd_gdImageSetTile+set}" = set; then 63572- echo $ECHO_N "(cached) $ECHO_C" >&6 63573+ echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 63574+echo "configure:41599: checking for gdImageSetTile in -lgd" >&5 63575+ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` 63576+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 63577+ echo $ac_n "(cached) $ac_c" 1>&6 63578 else 63579- ac_check_lib_save_LIBS=$LIBS 63580+ ac_save_LIBS="$LIBS" 63581 LIBS="-lgd $LIBS" 63582-cat >conftest.$ac_ext <<_ACEOF 63583-/* confdefs.h. */ 63584-_ACEOF 63585-cat confdefs.h >>conftest.$ac_ext 63586-cat >>conftest.$ac_ext <<_ACEOF 63587-/* end confdefs.h. */ 63588- 63589+cat > conftest.$ac_ext <<EOF 63590+#line 41607 "configure" 63591+#include "confdefs.h" 63592 /* Override any gcc2 internal prototype to avoid an error. */ 63593-#ifdef __cplusplus 63594-extern "C" 63595-#endif 63596 /* We use char because int might match the return type of a gcc2 63597- builtin and then its argument prototype would still apply. */ 63598-char gdImageSetTile (); 63599-int 63600-main () 63601-{ 63602-gdImageSetTile (); 63603- ; 63604- return 0; 63605-} 63606-_ACEOF 63607-rm -f conftest.$ac_objext conftest$ac_exeext 63608-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 63609- (eval $ac_link) 2>conftest.er1 63610- ac_status=$? 63611- grep -v '^ *+' conftest.er1 >conftest.err 63612- rm -f conftest.er1 63613- cat conftest.err >&5 63614- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63615- (exit $ac_status); } && 63616- { ac_try='test -z "$ac_c_werror_flag" 63617- || test ! -s conftest.err' 63618- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63619- (eval $ac_try) 2>&5 63620- ac_status=$? 63621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63622- (exit $ac_status); }; } && 63623- { ac_try='test -s conftest$ac_exeext' 63624- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63625- (eval $ac_try) 2>&5 63626- ac_status=$? 63627- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63628- (exit $ac_status); }; }; then 63629- ac_cv_lib_gd_gdImageSetTile=yes 63630-else 63631- echo "$as_me: failed program was:" >&5 63632-sed 's/^/| /' conftest.$ac_ext >&5 63633- 63634-ac_cv_lib_gd_gdImageSetTile=no 63635-fi 63636-rm -f conftest.err conftest.$ac_objext \ 63637- conftest$ac_exeext conftest.$ac_ext 63638-LIBS=$ac_check_lib_save_LIBS 63639-fi 63640-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetTile" >&5 63641-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetTile" >&6 63642-if test $ac_cv_lib_gd_gdImageSetTile = yes; then 63643+ builtin and then its argument prototype would still apply. */ 63644+char gdImageSetTile(); 63645+ 63646+int main() { 63647+gdImageSetTile() 63648+; return 0; } 63649+EOF 63650+if { (eval echo configure:41618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 63651+ rm -rf conftest* 63652+ eval "ac_cv_lib_$ac_lib_var=yes" 63653+else 63654+ echo "configure: failed program was:" >&5 63655+ cat conftest.$ac_ext >&5 63656+ rm -rf conftest* 63657+ eval "ac_cv_lib_$ac_lib_var=no" 63658+fi 63659+rm -f conftest* 63660+LIBS="$ac_save_LIBS" 63661 63662+fi 63663+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 63664+ echo "$ac_t""yes" 1>&6 63665+ 63666 LDFLAGS=$save_old_LDFLAGS 63667 ext_shared=$save_ext_shared 63668- 63669-cat >>confdefs.h <<\_ACEOF 63670+ cat >> confdefs.h <<\EOF 63671 #define HAVE_GD_IMAGESETTILE 1 63672-_ACEOF 63673- 63674+EOF 63675 63676+ 63677 else 63678+ echo "$ac_t""no" 1>&6 63679 63680 LDFLAGS=$save_old_LDFLAGS 63681 ext_shared=$save_ext_shared 63682 unset ac_cv_lib_gd_gdImageSetTile 63683- 63684- 63685+ 63686+ 63687 fi 63688 63689- 63690+ 63691 save_old_LDFLAGS=$LDFLAGS 63692 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 63693- 63694+ 63695 save_ext_shared=$ext_shared 63696 ext_shared=yes 63697- 63698+ 63699 for ac_i in $ac_stuff; do 63700 case $ac_i in 63701 -pthread) 63702 if test "$ext_shared" = "yes"; then 63703 LDFLAGS="$LDFLAGS -pthread" 63704 else 63705- 63706- 63707+ 63708+ 63709 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 63710- 63711+ 63712 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 63713 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63714 eval "EXTRA_LDFLAGS$unique=set" 63715@@ -54812,20 +41674,20 @@ 63716 ;; 63717 -l*) 63718 ac_ii=`echo $ac_i|cut -c 3-` 63719- 63720- 63721+ 63722+ 63723 case $ac_ii in 63724 c|c_r|pthread*) ;; 63725- *) 63726+ *) 63727 if test "$ext_shared" = "yes"; then 63728- LDFLAGS="$LDFLAGS -l$ac_ii" 63729+ LDFLAGS="$LDFLAGS -l$ac_ii" 63730 else 63731- 63732- 63733+ 63734+ 63735 case $ac_ii in 63736 c|c_r|pthread*) ;; 63737- *) 63738- LIBS="$LIBS -l$ac_ii" 63739+ *) 63740+ LIBS="$LIBS -l$ac_ii" 63741 ;; 63742 esac 63743 63744@@ -54838,148 +41700,118 @@ 63745 ;; 63746 -L*) 63747 ac_ii=`echo $ac_i|cut -c 3-` 63748- 63749+ 63750 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 63751- 63752+ 63753 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 63754 ai_p=$ac_ii 63755 else 63756- 63757+ 63758 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 63759- 63760+ 63761 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 63762 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 63763 fi 63764 63765- 63766+ 63767 if test "$ext_shared" = "yes"; then 63768 LDFLAGS="-L$ai_p $LDFLAGS" 63769 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 63770 else 63771- 63772- 63773- 63774+ 63775+ 63776+ 63777 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 63778- 63779+ 63780 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 63781 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63782 eval "LIBPATH$unique=set" 63783- 63784+ 63785 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 63786 LDFLAGS="$LDFLAGS -L$ai_p" 63787 PHP_RPATHS="$PHP_RPATHS $ai_p" 63788- 63789+ 63790 fi 63791 63792 63793 fi 63794- 63795+ 63796 fi 63797 63798 ;; 63799 esac 63800 done 63801 63802- echo "$as_me:$LINENO: checking for gdImageEllipse in -lgd" >&5 63803-echo $ECHO_N "checking for gdImageEllipse in -lgd... $ECHO_C" >&6 63804-if test "${ac_cv_lib_gd_gdImageEllipse+set}" = set; then 63805- echo $ECHO_N "(cached) $ECHO_C" >&6 63806+ echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 63807+echo "configure:41747: checking for gdImageEllipse in -lgd" >&5 63808+ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` 63809+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 63810+ echo $ac_n "(cached) $ac_c" 1>&6 63811 else 63812- ac_check_lib_save_LIBS=$LIBS 63813+ ac_save_LIBS="$LIBS" 63814 LIBS="-lgd $LIBS" 63815-cat >conftest.$ac_ext <<_ACEOF 63816-/* confdefs.h. */ 63817-_ACEOF 63818-cat confdefs.h >>conftest.$ac_ext 63819-cat >>conftest.$ac_ext <<_ACEOF 63820-/* end confdefs.h. */ 63821- 63822+cat > conftest.$ac_ext <<EOF 63823+#line 41755 "configure" 63824+#include "confdefs.h" 63825 /* Override any gcc2 internal prototype to avoid an error. */ 63826-#ifdef __cplusplus 63827-extern "C" 63828-#endif 63829 /* We use char because int might match the return type of a gcc2 63830- builtin and then its argument prototype would still apply. */ 63831-char gdImageEllipse (); 63832-int 63833-main () 63834-{ 63835-gdImageEllipse (); 63836- ; 63837- return 0; 63838-} 63839-_ACEOF 63840-rm -f conftest.$ac_objext conftest$ac_exeext 63841-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 63842- (eval $ac_link) 2>conftest.er1 63843- ac_status=$? 63844- grep -v '^ *+' conftest.er1 >conftest.err 63845- rm -f conftest.er1 63846- cat conftest.err >&5 63847- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63848- (exit $ac_status); } && 63849- { ac_try='test -z "$ac_c_werror_flag" 63850- || test ! -s conftest.err' 63851- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63852- (eval $ac_try) 2>&5 63853- ac_status=$? 63854- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63855- (exit $ac_status); }; } && 63856- { ac_try='test -s conftest$ac_exeext' 63857- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 63858- (eval $ac_try) 2>&5 63859- ac_status=$? 63860- echo "$as_me:$LINENO: \$? = $ac_status" >&5 63861- (exit $ac_status); }; }; then 63862- ac_cv_lib_gd_gdImageEllipse=yes 63863-else 63864- echo "$as_me: failed program was:" >&5 63865-sed 's/^/| /' conftest.$ac_ext >&5 63866- 63867-ac_cv_lib_gd_gdImageEllipse=no 63868-fi 63869-rm -f conftest.err conftest.$ac_objext \ 63870- conftest$ac_exeext conftest.$ac_ext 63871-LIBS=$ac_check_lib_save_LIBS 63872-fi 63873-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageEllipse" >&5 63874-echo "${ECHO_T}$ac_cv_lib_gd_gdImageEllipse" >&6 63875-if test $ac_cv_lib_gd_gdImageEllipse = yes; then 63876+ builtin and then its argument prototype would still apply. */ 63877+char gdImageEllipse(); 63878+ 63879+int main() { 63880+gdImageEllipse() 63881+; return 0; } 63882+EOF 63883+if { (eval echo configure:41766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 63884+ rm -rf conftest* 63885+ eval "ac_cv_lib_$ac_lib_var=yes" 63886+else 63887+ echo "configure: failed program was:" >&5 63888+ cat conftest.$ac_ext >&5 63889+ rm -rf conftest* 63890+ eval "ac_cv_lib_$ac_lib_var=no" 63891+fi 63892+rm -f conftest* 63893+LIBS="$ac_save_LIBS" 63894 63895+fi 63896+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 63897+ echo "$ac_t""yes" 1>&6 63898+ 63899 LDFLAGS=$save_old_LDFLAGS 63900 ext_shared=$save_ext_shared 63901- 63902-cat >>confdefs.h <<\_ACEOF 63903+ cat >> confdefs.h <<\EOF 63904 #define HAVE_GD_IMAGEELLIPSE 1 63905-_ACEOF 63906- 63907+EOF 63908 63909+ 63910 else 63911+ echo "$ac_t""no" 1>&6 63912 63913 LDFLAGS=$save_old_LDFLAGS 63914 ext_shared=$save_ext_shared 63915 unset ac_cv_lib_gd_gdImageEllipse 63916- 63917- 63918+ 63919+ 63920 fi 63921 63922- 63923+ 63924 save_old_LDFLAGS=$LDFLAGS 63925 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 63926- 63927+ 63928 save_ext_shared=$ext_shared 63929 ext_shared=yes 63930- 63931+ 63932 for ac_i in $ac_stuff; do 63933 case $ac_i in 63934 -pthread) 63935 if test "$ext_shared" = "yes"; then 63936 LDFLAGS="$LDFLAGS -pthread" 63937 else 63938- 63939- 63940+ 63941+ 63942 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 63943- 63944+ 63945 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 63946 if test -n "$unique" && test "`eval $cmd`" = "" ; then 63947 eval "EXTRA_LDFLAGS$unique=set" 63948@@ -54990,20 +41822,20 @@ 63949 ;; 63950 -l*) 63951 ac_ii=`echo $ac_i|cut -c 3-` 63952- 63953- 63954+ 63955+ 63956 case $ac_ii in 63957 c|c_r|pthread*) ;; 63958- *) 63959+ *) 63960 if test "$ext_shared" = "yes"; then 63961- LDFLAGS="$LDFLAGS -l$ac_ii" 63962+ LDFLAGS="$LDFLAGS -l$ac_ii" 63963 else 63964- 63965- 63966+ 63967+ 63968 case $ac_ii in 63969 c|c_r|pthread*) ;; 63970- *) 63971- LIBS="$LIBS -l$ac_ii" 63972+ *) 63973+ LIBS="$LIBS -l$ac_ii" 63974 ;; 63975 esac 63976 63977@@ -55016,148 +41848,118 @@ 63978 ;; 63979 -L*) 63980 ac_ii=`echo $ac_i|cut -c 3-` 63981- 63982+ 63983 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 63984- 63985+ 63986 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 63987 ai_p=$ac_ii 63988 else 63989- 63990+ 63991 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 63992- 63993+ 63994 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 63995 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 63996 fi 63997 63998- 63999+ 64000 if test "$ext_shared" = "yes"; then 64001 LDFLAGS="-L$ai_p $LDFLAGS" 64002 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 64003 else 64004- 64005- 64006- 64007+ 64008+ 64009+ 64010 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 64011- 64012+ 64013 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 64014 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64015 eval "LIBPATH$unique=set" 64016- 64017+ 64018 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 64019 LDFLAGS="$LDFLAGS -L$ai_p" 64020 PHP_RPATHS="$PHP_RPATHS $ai_p" 64021- 64022+ 64023 fi 64024 64025 64026 fi 64027- 64028+ 64029 fi 64030 64031 ;; 64032 esac 64033 done 64034 64035- echo "$as_me:$LINENO: checking for gdImageSetBrush in -lgd" >&5 64036-echo $ECHO_N "checking for gdImageSetBrush in -lgd... $ECHO_C" >&6 64037-if test "${ac_cv_lib_gd_gdImageSetBrush+set}" = set; then 64038- echo $ECHO_N "(cached) $ECHO_C" >&6 64039+ echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 64040+echo "configure:41895: checking for gdImageSetBrush in -lgd" >&5 64041+ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` 64042+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 64043+ echo $ac_n "(cached) $ac_c" 1>&6 64044 else 64045- ac_check_lib_save_LIBS=$LIBS 64046+ ac_save_LIBS="$LIBS" 64047 LIBS="-lgd $LIBS" 64048-cat >conftest.$ac_ext <<_ACEOF 64049-/* confdefs.h. */ 64050-_ACEOF 64051-cat confdefs.h >>conftest.$ac_ext 64052-cat >>conftest.$ac_ext <<_ACEOF 64053-/* end confdefs.h. */ 64054- 64055+cat > conftest.$ac_ext <<EOF 64056+#line 41903 "configure" 64057+#include "confdefs.h" 64058 /* Override any gcc2 internal prototype to avoid an error. */ 64059-#ifdef __cplusplus 64060-extern "C" 64061-#endif 64062 /* We use char because int might match the return type of a gcc2 64063- builtin and then its argument prototype would still apply. */ 64064-char gdImageSetBrush (); 64065-int 64066-main () 64067-{ 64068-gdImageSetBrush (); 64069- ; 64070- return 0; 64071-} 64072-_ACEOF 64073-rm -f conftest.$ac_objext conftest$ac_exeext 64074-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 64075- (eval $ac_link) 2>conftest.er1 64076- ac_status=$? 64077- grep -v '^ *+' conftest.er1 >conftest.err 64078- rm -f conftest.er1 64079- cat conftest.err >&5 64080- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64081- (exit $ac_status); } && 64082- { ac_try='test -z "$ac_c_werror_flag" 64083- || test ! -s conftest.err' 64084- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64085- (eval $ac_try) 2>&5 64086- ac_status=$? 64087- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64088- (exit $ac_status); }; } && 64089- { ac_try='test -s conftest$ac_exeext' 64090- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64091- (eval $ac_try) 2>&5 64092- ac_status=$? 64093- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64094- (exit $ac_status); }; }; then 64095- ac_cv_lib_gd_gdImageSetBrush=yes 64096-else 64097- echo "$as_me: failed program was:" >&5 64098-sed 's/^/| /' conftest.$ac_ext >&5 64099- 64100-ac_cv_lib_gd_gdImageSetBrush=no 64101-fi 64102-rm -f conftest.err conftest.$ac_objext \ 64103- conftest$ac_exeext conftest.$ac_ext 64104-LIBS=$ac_check_lib_save_LIBS 64105-fi 64106-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetBrush" >&5 64107-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetBrush" >&6 64108-if test $ac_cv_lib_gd_gdImageSetBrush = yes; then 64109+ builtin and then its argument prototype would still apply. */ 64110+char gdImageSetBrush(); 64111+ 64112+int main() { 64113+gdImageSetBrush() 64114+; return 0; } 64115+EOF 64116+if { (eval echo configure:41914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 64117+ rm -rf conftest* 64118+ eval "ac_cv_lib_$ac_lib_var=yes" 64119+else 64120+ echo "configure: failed program was:" >&5 64121+ cat conftest.$ac_ext >&5 64122+ rm -rf conftest* 64123+ eval "ac_cv_lib_$ac_lib_var=no" 64124+fi 64125+rm -f conftest* 64126+LIBS="$ac_save_LIBS" 64127 64128+fi 64129+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 64130+ echo "$ac_t""yes" 1>&6 64131+ 64132 LDFLAGS=$save_old_LDFLAGS 64133 ext_shared=$save_ext_shared 64134- 64135-cat >>confdefs.h <<\_ACEOF 64136+ cat >> confdefs.h <<\EOF 64137 #define HAVE_GD_IMAGESETBRUSH 1 64138-_ACEOF 64139- 64140+EOF 64141 64142+ 64143 else 64144+ echo "$ac_t""no" 1>&6 64145 64146 LDFLAGS=$save_old_LDFLAGS 64147 ext_shared=$save_ext_shared 64148 unset ac_cv_lib_gd_gdImageSetBrush 64149- 64150- 64151+ 64152+ 64153 fi 64154 64155- 64156+ 64157 save_old_LDFLAGS=$LDFLAGS 64158 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 64159- 64160+ 64161 save_ext_shared=$ext_shared 64162 ext_shared=yes 64163- 64164+ 64165 for ac_i in $ac_stuff; do 64166 case $ac_i in 64167 -pthread) 64168 if test "$ext_shared" = "yes"; then 64169 LDFLAGS="$LDFLAGS -pthread" 64170 else 64171- 64172- 64173+ 64174+ 64175 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 64176- 64177+ 64178 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 64179 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64180 eval "EXTRA_LDFLAGS$unique=set" 64181@@ -55168,20 +41970,20 @@ 64182 ;; 64183 -l*) 64184 ac_ii=`echo $ac_i|cut -c 3-` 64185- 64186- 64187+ 64188+ 64189 case $ac_ii in 64190 c|c_r|pthread*) ;; 64191- *) 64192+ *) 64193 if test "$ext_shared" = "yes"; then 64194- LDFLAGS="$LDFLAGS -l$ac_ii" 64195+ LDFLAGS="$LDFLAGS -l$ac_ii" 64196 else 64197- 64198- 64199+ 64200+ 64201 case $ac_ii in 64202 c|c_r|pthread*) ;; 64203- *) 64204- LIBS="$LIBS -l$ac_ii" 64205+ *) 64206+ LIBS="$LIBS -l$ac_ii" 64207 ;; 64208 esac 64209 64210@@ -55194,148 +41996,118 @@ 64211 ;; 64212 -L*) 64213 ac_ii=`echo $ac_i|cut -c 3-` 64214- 64215+ 64216 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 64217- 64218+ 64219 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 64220 ai_p=$ac_ii 64221 else 64222- 64223+ 64224 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 64225- 64226+ 64227 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 64228 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 64229 fi 64230 64231- 64232+ 64233 if test "$ext_shared" = "yes"; then 64234 LDFLAGS="-L$ai_p $LDFLAGS" 64235 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 64236 else 64237- 64238- 64239- 64240+ 64241+ 64242+ 64243 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 64244- 64245+ 64246 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 64247 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64248 eval "LIBPATH$unique=set" 64249- 64250+ 64251 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 64252 LDFLAGS="$LDFLAGS -L$ai_p" 64253 PHP_RPATHS="$PHP_RPATHS $ai_p" 64254- 64255+ 64256 fi 64257 64258 64259 fi 64260- 64261+ 64262 fi 64263 64264 ;; 64265 esac 64266 done 64267 64268- echo "$as_me:$LINENO: checking for gdImageStringTTF in -lgd" >&5 64269-echo $ECHO_N "checking for gdImageStringTTF in -lgd... $ECHO_C" >&6 64270-if test "${ac_cv_lib_gd_gdImageStringTTF+set}" = set; then 64271- echo $ECHO_N "(cached) $ECHO_C" >&6 64272+ echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 64273+echo "configure:42043: checking for gdImageStringTTF in -lgd" >&5 64274+ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` 64275+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 64276+ echo $ac_n "(cached) $ac_c" 1>&6 64277 else 64278- ac_check_lib_save_LIBS=$LIBS 64279+ ac_save_LIBS="$LIBS" 64280 LIBS="-lgd $LIBS" 64281-cat >conftest.$ac_ext <<_ACEOF 64282-/* confdefs.h. */ 64283-_ACEOF 64284-cat confdefs.h >>conftest.$ac_ext 64285-cat >>conftest.$ac_ext <<_ACEOF 64286-/* end confdefs.h. */ 64287- 64288+cat > conftest.$ac_ext <<EOF 64289+#line 42051 "configure" 64290+#include "confdefs.h" 64291 /* Override any gcc2 internal prototype to avoid an error. */ 64292-#ifdef __cplusplus 64293-extern "C" 64294-#endif 64295 /* We use char because int might match the return type of a gcc2 64296- builtin and then its argument prototype would still apply. */ 64297-char gdImageStringTTF (); 64298-int 64299-main () 64300-{ 64301-gdImageStringTTF (); 64302- ; 64303- return 0; 64304-} 64305-_ACEOF 64306-rm -f conftest.$ac_objext conftest$ac_exeext 64307-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 64308- (eval $ac_link) 2>conftest.er1 64309- ac_status=$? 64310- grep -v '^ *+' conftest.er1 >conftest.err 64311- rm -f conftest.er1 64312- cat conftest.err >&5 64313- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64314- (exit $ac_status); } && 64315- { ac_try='test -z "$ac_c_werror_flag" 64316- || test ! -s conftest.err' 64317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64318- (eval $ac_try) 2>&5 64319- ac_status=$? 64320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64321- (exit $ac_status); }; } && 64322- { ac_try='test -s conftest$ac_exeext' 64323- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64324- (eval $ac_try) 2>&5 64325- ac_status=$? 64326- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64327- (exit $ac_status); }; }; then 64328- ac_cv_lib_gd_gdImageStringTTF=yes 64329-else 64330- echo "$as_me: failed program was:" >&5 64331-sed 's/^/| /' conftest.$ac_ext >&5 64332- 64333-ac_cv_lib_gd_gdImageStringTTF=no 64334-fi 64335-rm -f conftest.err conftest.$ac_objext \ 64336- conftest$ac_exeext conftest.$ac_ext 64337-LIBS=$ac_check_lib_save_LIBS 64338-fi 64339-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringTTF" >&5 64340-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringTTF" >&6 64341-if test $ac_cv_lib_gd_gdImageStringTTF = yes; then 64342+ builtin and then its argument prototype would still apply. */ 64343+char gdImageStringTTF(); 64344+ 64345+int main() { 64346+gdImageStringTTF() 64347+; return 0; } 64348+EOF 64349+if { (eval echo configure:42062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 64350+ rm -rf conftest* 64351+ eval "ac_cv_lib_$ac_lib_var=yes" 64352+else 64353+ echo "configure: failed program was:" >&5 64354+ cat conftest.$ac_ext >&5 64355+ rm -rf conftest* 64356+ eval "ac_cv_lib_$ac_lib_var=no" 64357+fi 64358+rm -f conftest* 64359+LIBS="$ac_save_LIBS" 64360 64361+fi 64362+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 64363+ echo "$ac_t""yes" 1>&6 64364+ 64365 LDFLAGS=$save_old_LDFLAGS 64366 ext_shared=$save_ext_shared 64367- 64368-cat >>confdefs.h <<\_ACEOF 64369+ cat >> confdefs.h <<\EOF 64370 #define HAVE_GD_STRINGTTF 1 64371-_ACEOF 64372- 64373+EOF 64374 64375+ 64376 else 64377+ echo "$ac_t""no" 1>&6 64378 64379 LDFLAGS=$save_old_LDFLAGS 64380 ext_shared=$save_ext_shared 64381 unset ac_cv_lib_gd_gdImageStringTTF 64382- 64383- 64384+ 64385+ 64386 fi 64387 64388- 64389+ 64390 save_old_LDFLAGS=$LDFLAGS 64391 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 64392- 64393+ 64394 save_ext_shared=$ext_shared 64395 ext_shared=yes 64396- 64397+ 64398 for ac_i in $ac_stuff; do 64399 case $ac_i in 64400 -pthread) 64401 if test "$ext_shared" = "yes"; then 64402 LDFLAGS="$LDFLAGS -pthread" 64403 else 64404- 64405- 64406+ 64407+ 64408 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 64409- 64410+ 64411 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 64412 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64413 eval "EXTRA_LDFLAGS$unique=set" 64414@@ -55346,20 +42118,20 @@ 64415 ;; 64416 -l*) 64417 ac_ii=`echo $ac_i|cut -c 3-` 64418- 64419- 64420+ 64421+ 64422 case $ac_ii in 64423 c|c_r|pthread*) ;; 64424- *) 64425+ *) 64426 if test "$ext_shared" = "yes"; then 64427- LDFLAGS="$LDFLAGS -l$ac_ii" 64428+ LDFLAGS="$LDFLAGS -l$ac_ii" 64429 else 64430- 64431- 64432+ 64433+ 64434 case $ac_ii in 64435 c|c_r|pthread*) ;; 64436- *) 64437- LIBS="$LIBS -l$ac_ii" 64438+ *) 64439+ LIBS="$LIBS -l$ac_ii" 64440 ;; 64441 esac 64442 64443@@ -55372,148 +42144,118 @@ 64444 ;; 64445 -L*) 64446 ac_ii=`echo $ac_i|cut -c 3-` 64447- 64448+ 64449 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 64450- 64451+ 64452 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 64453 ai_p=$ac_ii 64454 else 64455- 64456+ 64457 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 64458- 64459+ 64460 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 64461 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 64462 fi 64463 64464- 64465+ 64466 if test "$ext_shared" = "yes"; then 64467 LDFLAGS="-L$ai_p $LDFLAGS" 64468 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 64469 else 64470- 64471- 64472- 64473+ 64474+ 64475+ 64476 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 64477- 64478+ 64479 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 64480 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64481 eval "LIBPATH$unique=set" 64482- 64483+ 64484 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 64485 LDFLAGS="$LDFLAGS -L$ai_p" 64486 PHP_RPATHS="$PHP_RPATHS $ai_p" 64487- 64488+ 64489 fi 64490 64491 64492 fi 64493- 64494+ 64495 fi 64496 64497 ;; 64498 esac 64499 done 64500 64501- echo "$as_me:$LINENO: checking for gdImageStringFT in -lgd" >&5 64502-echo $ECHO_N "checking for gdImageStringFT in -lgd... $ECHO_C" >&6 64503-if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then 64504- echo $ECHO_N "(cached) $ECHO_C" >&6 64505+ echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 64506+echo "configure:42191: checking for gdImageStringFT in -lgd" >&5 64507+ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` 64508+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 64509+ echo $ac_n "(cached) $ac_c" 1>&6 64510 else 64511- ac_check_lib_save_LIBS=$LIBS 64512+ ac_save_LIBS="$LIBS" 64513 LIBS="-lgd $LIBS" 64514-cat >conftest.$ac_ext <<_ACEOF 64515-/* confdefs.h. */ 64516-_ACEOF 64517-cat confdefs.h >>conftest.$ac_ext 64518-cat >>conftest.$ac_ext <<_ACEOF 64519-/* end confdefs.h. */ 64520- 64521+cat > conftest.$ac_ext <<EOF 64522+#line 42199 "configure" 64523+#include "confdefs.h" 64524 /* Override any gcc2 internal prototype to avoid an error. */ 64525-#ifdef __cplusplus 64526-extern "C" 64527-#endif 64528 /* We use char because int might match the return type of a gcc2 64529- builtin and then its argument prototype would still apply. */ 64530-char gdImageStringFT (); 64531-int 64532-main () 64533-{ 64534-gdImageStringFT (); 64535- ; 64536- return 0; 64537-} 64538-_ACEOF 64539-rm -f conftest.$ac_objext conftest$ac_exeext 64540-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 64541- (eval $ac_link) 2>conftest.er1 64542- ac_status=$? 64543- grep -v '^ *+' conftest.er1 >conftest.err 64544- rm -f conftest.er1 64545- cat conftest.err >&5 64546- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64547- (exit $ac_status); } && 64548- { ac_try='test -z "$ac_c_werror_flag" 64549- || test ! -s conftest.err' 64550- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64551- (eval $ac_try) 2>&5 64552- ac_status=$? 64553- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64554- (exit $ac_status); }; } && 64555- { ac_try='test -s conftest$ac_exeext' 64556- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64557- (eval $ac_try) 2>&5 64558- ac_status=$? 64559- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64560- (exit $ac_status); }; }; then 64561- ac_cv_lib_gd_gdImageStringFT=yes 64562-else 64563- echo "$as_me: failed program was:" >&5 64564-sed 's/^/| /' conftest.$ac_ext >&5 64565- 64566-ac_cv_lib_gd_gdImageStringFT=no 64567-fi 64568-rm -f conftest.err conftest.$ac_objext \ 64569- conftest$ac_exeext conftest.$ac_ext 64570-LIBS=$ac_check_lib_save_LIBS 64571-fi 64572-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFT" >&5 64573-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFT" >&6 64574-if test $ac_cv_lib_gd_gdImageStringFT = yes; then 64575+ builtin and then its argument prototype would still apply. */ 64576+char gdImageStringFT(); 64577+ 64578+int main() { 64579+gdImageStringFT() 64580+; return 0; } 64581+EOF 64582+if { (eval echo configure:42210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 64583+ rm -rf conftest* 64584+ eval "ac_cv_lib_$ac_lib_var=yes" 64585+else 64586+ echo "configure: failed program was:" >&5 64587+ cat conftest.$ac_ext >&5 64588+ rm -rf conftest* 64589+ eval "ac_cv_lib_$ac_lib_var=no" 64590+fi 64591+rm -f conftest* 64592+LIBS="$ac_save_LIBS" 64593 64594+fi 64595+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 64596+ echo "$ac_t""yes" 1>&6 64597+ 64598 LDFLAGS=$save_old_LDFLAGS 64599 ext_shared=$save_ext_shared 64600- 64601-cat >>confdefs.h <<\_ACEOF 64602+ cat >> confdefs.h <<\EOF 64603 #define HAVE_GD_STRINGFT 1 64604-_ACEOF 64605- 64606+EOF 64607 64608+ 64609 else 64610+ echo "$ac_t""no" 1>&6 64611 64612 LDFLAGS=$save_old_LDFLAGS 64613 ext_shared=$save_ext_shared 64614 unset ac_cv_lib_gd_gdImageStringFT 64615- 64616- 64617+ 64618+ 64619 fi 64620 64621- 64622+ 64623 save_old_LDFLAGS=$LDFLAGS 64624 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 64625- 64626+ 64627 save_ext_shared=$ext_shared 64628 ext_shared=yes 64629- 64630+ 64631 for ac_i in $ac_stuff; do 64632 case $ac_i in 64633 -pthread) 64634 if test "$ext_shared" = "yes"; then 64635 LDFLAGS="$LDFLAGS -pthread" 64636 else 64637- 64638- 64639+ 64640+ 64641 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 64642- 64643+ 64644 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 64645 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64646 eval "EXTRA_LDFLAGS$unique=set" 64647@@ -55524,20 +42266,20 @@ 64648 ;; 64649 -l*) 64650 ac_ii=`echo $ac_i|cut -c 3-` 64651- 64652- 64653+ 64654+ 64655 case $ac_ii in 64656 c|c_r|pthread*) ;; 64657- *) 64658+ *) 64659 if test "$ext_shared" = "yes"; then 64660- LDFLAGS="$LDFLAGS -l$ac_ii" 64661+ LDFLAGS="$LDFLAGS -l$ac_ii" 64662 else 64663- 64664- 64665+ 64666+ 64667 case $ac_ii in 64668 c|c_r|pthread*) ;; 64669- *) 64670- LIBS="$LIBS -l$ac_ii" 64671+ *) 64672+ LIBS="$LIBS -l$ac_ii" 64673 ;; 64674 esac 64675 64676@@ -55550,148 +42292,118 @@ 64677 ;; 64678 -L*) 64679 ac_ii=`echo $ac_i|cut -c 3-` 64680- 64681+ 64682 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 64683- 64684+ 64685 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 64686 ai_p=$ac_ii 64687 else 64688- 64689+ 64690 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 64691- 64692+ 64693 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 64694 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 64695 fi 64696 64697- 64698+ 64699 if test "$ext_shared" = "yes"; then 64700 LDFLAGS="-L$ai_p $LDFLAGS" 64701 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 64702 else 64703- 64704- 64705- 64706+ 64707+ 64708+ 64709 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 64710- 64711+ 64712 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 64713 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64714 eval "LIBPATH$unique=set" 64715- 64716+ 64717 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 64718 LDFLAGS="$LDFLAGS -L$ai_p" 64719 PHP_RPATHS="$PHP_RPATHS $ai_p" 64720- 64721+ 64722 fi 64723 64724 64725 fi 64726- 64727+ 64728 fi 64729 64730 ;; 64731 esac 64732 done 64733 64734- echo "$as_me:$LINENO: checking for gdImageStringFTEx in -lgd" >&5 64735-echo $ECHO_N "checking for gdImageStringFTEx in -lgd... $ECHO_C" >&6 64736-if test "${ac_cv_lib_gd_gdImageStringFTEx+set}" = set; then 64737- echo $ECHO_N "(cached) $ECHO_C" >&6 64738+ echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 64739+echo "configure:42339: checking for gdImageStringFTEx in -lgd" >&5 64740+ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` 64741+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 64742+ echo $ac_n "(cached) $ac_c" 1>&6 64743 else 64744- ac_check_lib_save_LIBS=$LIBS 64745+ ac_save_LIBS="$LIBS" 64746 LIBS="-lgd $LIBS" 64747-cat >conftest.$ac_ext <<_ACEOF 64748-/* confdefs.h. */ 64749-_ACEOF 64750-cat confdefs.h >>conftest.$ac_ext 64751-cat >>conftest.$ac_ext <<_ACEOF 64752-/* end confdefs.h. */ 64753- 64754+cat > conftest.$ac_ext <<EOF 64755+#line 42347 "configure" 64756+#include "confdefs.h" 64757 /* Override any gcc2 internal prototype to avoid an error. */ 64758-#ifdef __cplusplus 64759-extern "C" 64760-#endif 64761 /* We use char because int might match the return type of a gcc2 64762- builtin and then its argument prototype would still apply. */ 64763-char gdImageStringFTEx (); 64764-int 64765-main () 64766-{ 64767-gdImageStringFTEx (); 64768- ; 64769- return 0; 64770-} 64771-_ACEOF 64772-rm -f conftest.$ac_objext conftest$ac_exeext 64773-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 64774- (eval $ac_link) 2>conftest.er1 64775- ac_status=$? 64776- grep -v '^ *+' conftest.er1 >conftest.err 64777- rm -f conftest.er1 64778- cat conftest.err >&5 64779- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64780- (exit $ac_status); } && 64781- { ac_try='test -z "$ac_c_werror_flag" 64782- || test ! -s conftest.err' 64783- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64784- (eval $ac_try) 2>&5 64785- ac_status=$? 64786- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64787- (exit $ac_status); }; } && 64788- { ac_try='test -s conftest$ac_exeext' 64789- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 64790- (eval $ac_try) 2>&5 64791- ac_status=$? 64792- echo "$as_me:$LINENO: \$? = $ac_status" >&5 64793- (exit $ac_status); }; }; then 64794- ac_cv_lib_gd_gdImageStringFTEx=yes 64795-else 64796- echo "$as_me: failed program was:" >&5 64797-sed 's/^/| /' conftest.$ac_ext >&5 64798- 64799-ac_cv_lib_gd_gdImageStringFTEx=no 64800-fi 64801-rm -f conftest.err conftest.$ac_objext \ 64802- conftest$ac_exeext conftest.$ac_ext 64803-LIBS=$ac_check_lib_save_LIBS 64804-fi 64805-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFTEx" >&5 64806-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFTEx" >&6 64807-if test $ac_cv_lib_gd_gdImageStringFTEx = yes; then 64808+ builtin and then its argument prototype would still apply. */ 64809+char gdImageStringFTEx(); 64810+ 64811+int main() { 64812+gdImageStringFTEx() 64813+; return 0; } 64814+EOF 64815+if { (eval echo configure:42358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 64816+ rm -rf conftest* 64817+ eval "ac_cv_lib_$ac_lib_var=yes" 64818+else 64819+ echo "configure: failed program was:" >&5 64820+ cat conftest.$ac_ext >&5 64821+ rm -rf conftest* 64822+ eval "ac_cv_lib_$ac_lib_var=no" 64823+fi 64824+rm -f conftest* 64825+LIBS="$ac_save_LIBS" 64826 64827+fi 64828+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 64829+ echo "$ac_t""yes" 1>&6 64830+ 64831 LDFLAGS=$save_old_LDFLAGS 64832 ext_shared=$save_ext_shared 64833- 64834-cat >>confdefs.h <<\_ACEOF 64835+ cat >> confdefs.h <<\EOF 64836 #define HAVE_GD_STRINGFTEX 1 64837-_ACEOF 64838- 64839+EOF 64840 64841+ 64842 else 64843+ echo "$ac_t""no" 1>&6 64844 64845 LDFLAGS=$save_old_LDFLAGS 64846 ext_shared=$save_ext_shared 64847 unset ac_cv_lib_gd_gdImageStringFTEx 64848- 64849- 64850+ 64851+ 64852 fi 64853 64854- 64855+ 64856 save_old_LDFLAGS=$LDFLAGS 64857 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 64858- 64859+ 64860 save_ext_shared=$ext_shared 64861 ext_shared=yes 64862- 64863+ 64864 for ac_i in $ac_stuff; do 64865 case $ac_i in 64866 -pthread) 64867 if test "$ext_shared" = "yes"; then 64868 LDFLAGS="$LDFLAGS -pthread" 64869 else 64870- 64871- 64872+ 64873+ 64874 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 64875- 64876+ 64877 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 64878 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64879 eval "EXTRA_LDFLAGS$unique=set" 64880@@ -55702,20 +42414,20 @@ 64881 ;; 64882 -l*) 64883 ac_ii=`echo $ac_i|cut -c 3-` 64884- 64885- 64886+ 64887+ 64888 case $ac_ii in 64889 c|c_r|pthread*) ;; 64890- *) 64891+ *) 64892 if test "$ext_shared" = "yes"; then 64893- LDFLAGS="$LDFLAGS -l$ac_ii" 64894+ LDFLAGS="$LDFLAGS -l$ac_ii" 64895 else 64896- 64897- 64898+ 64899+ 64900 case $ac_ii in 64901 c|c_r|pthread*) ;; 64902- *) 64903- LIBS="$LIBS -l$ac_ii" 64904+ *) 64905+ LIBS="$LIBS -l$ac_ii" 64906 ;; 64907 esac 64908 64909@@ -55728,148 +42440,118 @@ 64910 ;; 64911 -L*) 64912 ac_ii=`echo $ac_i|cut -c 3-` 64913- 64914+ 64915 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 64916- 64917+ 64918 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 64919 ai_p=$ac_ii 64920 else 64921- 64922+ 64923 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 64924- 64925+ 64926 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 64927 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 64928 fi 64929 64930- 64931+ 64932 if test "$ext_shared" = "yes"; then 64933 LDFLAGS="-L$ai_p $LDFLAGS" 64934 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 64935 else 64936- 64937- 64938- 64939+ 64940+ 64941+ 64942 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 64943- 64944+ 64945 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 64946 if test -n "$unique" && test "`eval $cmd`" = "" ; then 64947 eval "LIBPATH$unique=set" 64948- 64949+ 64950 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 64951 LDFLAGS="$LDFLAGS -L$ai_p" 64952 PHP_RPATHS="$PHP_RPATHS $ai_p" 64953- 64954+ 64955 fi 64956 64957 64958 fi 64959- 64960+ 64961 fi 64962 64963 ;; 64964 esac 64965 done 64966 64967- echo "$as_me:$LINENO: checking for gdImageColorClosestHWB in -lgd" >&5 64968-echo $ECHO_N "checking for gdImageColorClosestHWB in -lgd... $ECHO_C" >&6 64969-if test "${ac_cv_lib_gd_gdImageColorClosestHWB+set}" = set; then 64970- echo $ECHO_N "(cached) $ECHO_C" >&6 64971+ echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 64972+echo "configure:42487: checking for gdImageColorClosestHWB in -lgd" >&5 64973+ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` 64974+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 64975+ echo $ac_n "(cached) $ac_c" 1>&6 64976 else 64977- ac_check_lib_save_LIBS=$LIBS 64978+ ac_save_LIBS="$LIBS" 64979 LIBS="-lgd $LIBS" 64980-cat >conftest.$ac_ext <<_ACEOF 64981-/* confdefs.h. */ 64982-_ACEOF 64983-cat confdefs.h >>conftest.$ac_ext 64984-cat >>conftest.$ac_ext <<_ACEOF 64985-/* end confdefs.h. */ 64986- 64987+cat > conftest.$ac_ext <<EOF 64988+#line 42495 "configure" 64989+#include "confdefs.h" 64990 /* Override any gcc2 internal prototype to avoid an error. */ 64991-#ifdef __cplusplus 64992-extern "C" 64993-#endif 64994 /* We use char because int might match the return type of a gcc2 64995- builtin and then its argument prototype would still apply. */ 64996-char gdImageColorClosestHWB (); 64997-int 64998-main () 64999-{ 65000-gdImageColorClosestHWB (); 65001- ; 65002- return 0; 65003-} 65004-_ACEOF 65005-rm -f conftest.$ac_objext conftest$ac_exeext 65006-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 65007- (eval $ac_link) 2>conftest.er1 65008- ac_status=$? 65009- grep -v '^ *+' conftest.er1 >conftest.err 65010- rm -f conftest.er1 65011- cat conftest.err >&5 65012- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65013- (exit $ac_status); } && 65014- { ac_try='test -z "$ac_c_werror_flag" 65015- || test ! -s conftest.err' 65016- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65017- (eval $ac_try) 2>&5 65018- ac_status=$? 65019- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65020- (exit $ac_status); }; } && 65021- { ac_try='test -s conftest$ac_exeext' 65022- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65023- (eval $ac_try) 2>&5 65024- ac_status=$? 65025- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65026- (exit $ac_status); }; }; then 65027- ac_cv_lib_gd_gdImageColorClosestHWB=yes 65028-else 65029- echo "$as_me: failed program was:" >&5 65030-sed 's/^/| /' conftest.$ac_ext >&5 65031- 65032-ac_cv_lib_gd_gdImageColorClosestHWB=no 65033-fi 65034-rm -f conftest.err conftest.$ac_objext \ 65035- conftest$ac_exeext conftest.$ac_ext 65036-LIBS=$ac_check_lib_save_LIBS 65037-fi 65038-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorClosestHWB" >&5 65039-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorClosestHWB" >&6 65040-if test $ac_cv_lib_gd_gdImageColorClosestHWB = yes; then 65041+ builtin and then its argument prototype would still apply. */ 65042+char gdImageColorClosestHWB(); 65043+ 65044+int main() { 65045+gdImageColorClosestHWB() 65046+; return 0; } 65047+EOF 65048+if { (eval echo configure:42506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 65049+ rm -rf conftest* 65050+ eval "ac_cv_lib_$ac_lib_var=yes" 65051+else 65052+ echo "configure: failed program was:" >&5 65053+ cat conftest.$ac_ext >&5 65054+ rm -rf conftest* 65055+ eval "ac_cv_lib_$ac_lib_var=no" 65056+fi 65057+rm -f conftest* 65058+LIBS="$ac_save_LIBS" 65059 65060+fi 65061+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 65062+ echo "$ac_t""yes" 1>&6 65063+ 65064 LDFLAGS=$save_old_LDFLAGS 65065 ext_shared=$save_ext_shared 65066- 65067-cat >>confdefs.h <<\_ACEOF 65068+ cat >> confdefs.h <<\EOF 65069 #define HAVE_COLORCLOSESTHWB 1 65070-_ACEOF 65071- 65072+EOF 65073 65074+ 65075 else 65076+ echo "$ac_t""no" 1>&6 65077 65078 LDFLAGS=$save_old_LDFLAGS 65079 ext_shared=$save_ext_shared 65080 unset ac_cv_lib_gd_gdImageColorClosestHWB 65081- 65082- 65083+ 65084+ 65085 fi 65086 65087- 65088+ 65089 save_old_LDFLAGS=$LDFLAGS 65090 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 65091- 65092+ 65093 save_ext_shared=$ext_shared 65094 ext_shared=yes 65095- 65096+ 65097 for ac_i in $ac_stuff; do 65098 case $ac_i in 65099 -pthread) 65100 if test "$ext_shared" = "yes"; then 65101 LDFLAGS="$LDFLAGS -pthread" 65102 else 65103- 65104- 65105+ 65106+ 65107 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 65108- 65109+ 65110 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 65111 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65112 eval "EXTRA_LDFLAGS$unique=set" 65113@@ -55880,20 +42562,20 @@ 65114 ;; 65115 -l*) 65116 ac_ii=`echo $ac_i|cut -c 3-` 65117- 65118- 65119+ 65120+ 65121 case $ac_ii in 65122 c|c_r|pthread*) ;; 65123- *) 65124+ *) 65125 if test "$ext_shared" = "yes"; then 65126- LDFLAGS="$LDFLAGS -l$ac_ii" 65127+ LDFLAGS="$LDFLAGS -l$ac_ii" 65128 else 65129- 65130- 65131+ 65132+ 65133 case $ac_ii in 65134 c|c_r|pthread*) ;; 65135- *) 65136- LIBS="$LIBS -l$ac_ii" 65137+ *) 65138+ LIBS="$LIBS -l$ac_ii" 65139 ;; 65140 esac 65141 65142@@ -55906,148 +42588,118 @@ 65143 ;; 65144 -L*) 65145 ac_ii=`echo $ac_i|cut -c 3-` 65146- 65147+ 65148 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 65149- 65150+ 65151 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 65152 ai_p=$ac_ii 65153 else 65154- 65155+ 65156 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 65157- 65158+ 65159 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 65160 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 65161 fi 65162 65163- 65164+ 65165 if test "$ext_shared" = "yes"; then 65166 LDFLAGS="-L$ai_p $LDFLAGS" 65167 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 65168 else 65169- 65170- 65171- 65172+ 65173+ 65174+ 65175 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 65176- 65177+ 65178 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 65179 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65180 eval "LIBPATH$unique=set" 65181- 65182+ 65183 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 65184 LDFLAGS="$LDFLAGS -L$ai_p" 65185 PHP_RPATHS="$PHP_RPATHS $ai_p" 65186- 65187+ 65188 fi 65189 65190 65191 fi 65192- 65193+ 65194 fi 65195 65196 ;; 65197 esac 65198 done 65199 65200- echo "$as_me:$LINENO: checking for gdImageColorResolve in -lgd" >&5 65201-echo $ECHO_N "checking for gdImageColorResolve in -lgd... $ECHO_C" >&6 65202-if test "${ac_cv_lib_gd_gdImageColorResolve+set}" = set; then 65203- echo $ECHO_N "(cached) $ECHO_C" >&6 65204+ echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 65205+echo "configure:42635: checking for gdImageColorResolve in -lgd" >&5 65206+ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` 65207+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 65208+ echo $ac_n "(cached) $ac_c" 1>&6 65209 else 65210- ac_check_lib_save_LIBS=$LIBS 65211+ ac_save_LIBS="$LIBS" 65212 LIBS="-lgd $LIBS" 65213-cat >conftest.$ac_ext <<_ACEOF 65214-/* confdefs.h. */ 65215-_ACEOF 65216-cat confdefs.h >>conftest.$ac_ext 65217-cat >>conftest.$ac_ext <<_ACEOF 65218-/* end confdefs.h. */ 65219- 65220+cat > conftest.$ac_ext <<EOF 65221+#line 42643 "configure" 65222+#include "confdefs.h" 65223 /* Override any gcc2 internal prototype to avoid an error. */ 65224-#ifdef __cplusplus 65225-extern "C" 65226-#endif 65227 /* We use char because int might match the return type of a gcc2 65228- builtin and then its argument prototype would still apply. */ 65229-char gdImageColorResolve (); 65230-int 65231-main () 65232-{ 65233-gdImageColorResolve (); 65234- ; 65235- return 0; 65236-} 65237-_ACEOF 65238-rm -f conftest.$ac_objext conftest$ac_exeext 65239-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 65240- (eval $ac_link) 2>conftest.er1 65241- ac_status=$? 65242- grep -v '^ *+' conftest.er1 >conftest.err 65243- rm -f conftest.er1 65244- cat conftest.err >&5 65245- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65246- (exit $ac_status); } && 65247- { ac_try='test -z "$ac_c_werror_flag" 65248- || test ! -s conftest.err' 65249- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65250- (eval $ac_try) 2>&5 65251- ac_status=$? 65252- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65253- (exit $ac_status); }; } && 65254- { ac_try='test -s conftest$ac_exeext' 65255- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65256- (eval $ac_try) 2>&5 65257- ac_status=$? 65258- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65259- (exit $ac_status); }; }; then 65260- ac_cv_lib_gd_gdImageColorResolve=yes 65261-else 65262- echo "$as_me: failed program was:" >&5 65263-sed 's/^/| /' conftest.$ac_ext >&5 65264- 65265-ac_cv_lib_gd_gdImageColorResolve=no 65266-fi 65267-rm -f conftest.err conftest.$ac_objext \ 65268- conftest$ac_exeext conftest.$ac_ext 65269-LIBS=$ac_check_lib_save_LIBS 65270-fi 65271-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorResolve" >&5 65272-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorResolve" >&6 65273-if test $ac_cv_lib_gd_gdImageColorResolve = yes; then 65274+ builtin and then its argument prototype would still apply. */ 65275+char gdImageColorResolve(); 65276+ 65277+int main() { 65278+gdImageColorResolve() 65279+; return 0; } 65280+EOF 65281+if { (eval echo configure:42654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 65282+ rm -rf conftest* 65283+ eval "ac_cv_lib_$ac_lib_var=yes" 65284+else 65285+ echo "configure: failed program was:" >&5 65286+ cat conftest.$ac_ext >&5 65287+ rm -rf conftest* 65288+ eval "ac_cv_lib_$ac_lib_var=no" 65289+fi 65290+rm -f conftest* 65291+LIBS="$ac_save_LIBS" 65292 65293+fi 65294+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 65295+ echo "$ac_t""yes" 1>&6 65296+ 65297 LDFLAGS=$save_old_LDFLAGS 65298 ext_shared=$save_ext_shared 65299- 65300-cat >>confdefs.h <<\_ACEOF 65301+ cat >> confdefs.h <<\EOF 65302 #define HAVE_GDIMAGECOLORRESOLVE 1 65303-_ACEOF 65304- 65305+EOF 65306 65307+ 65308 else 65309+ echo "$ac_t""no" 1>&6 65310 65311 LDFLAGS=$save_old_LDFLAGS 65312 ext_shared=$save_ext_shared 65313 unset ac_cv_lib_gd_gdImageColorResolve 65314- 65315- 65316+ 65317+ 65318 fi 65319 65320- 65321+ 65322 save_old_LDFLAGS=$LDFLAGS 65323 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 65324- 65325+ 65326 save_ext_shared=$ext_shared 65327 ext_shared=yes 65328- 65329+ 65330 for ac_i in $ac_stuff; do 65331 case $ac_i in 65332 -pthread) 65333 if test "$ext_shared" = "yes"; then 65334 LDFLAGS="$LDFLAGS -pthread" 65335 else 65336- 65337- 65338+ 65339+ 65340 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 65341- 65342+ 65343 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 65344 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65345 eval "EXTRA_LDFLAGS$unique=set" 65346@@ -56058,20 +42710,20 @@ 65347 ;; 65348 -l*) 65349 ac_ii=`echo $ac_i|cut -c 3-` 65350- 65351- 65352+ 65353+ 65354 case $ac_ii in 65355 c|c_r|pthread*) ;; 65356- *) 65357+ *) 65358 if test "$ext_shared" = "yes"; then 65359- LDFLAGS="$LDFLAGS -l$ac_ii" 65360+ LDFLAGS="$LDFLAGS -l$ac_ii" 65361 else 65362- 65363- 65364+ 65365+ 65366 case $ac_ii in 65367 c|c_r|pthread*) ;; 65368- *) 65369- LIBS="$LIBS -l$ac_ii" 65370+ *) 65371+ LIBS="$LIBS -l$ac_ii" 65372 ;; 65373 esac 65374 65375@@ -56084,148 +42736,118 @@ 65376 ;; 65377 -L*) 65378 ac_ii=`echo $ac_i|cut -c 3-` 65379- 65380+ 65381 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 65382- 65383+ 65384 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 65385 ai_p=$ac_ii 65386 else 65387- 65388+ 65389 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 65390- 65391+ 65392 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 65393 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 65394 fi 65395 65396- 65397+ 65398 if test "$ext_shared" = "yes"; then 65399 LDFLAGS="-L$ai_p $LDFLAGS" 65400 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 65401 else 65402- 65403- 65404- 65405+ 65406+ 65407+ 65408 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 65409- 65410+ 65411 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 65412 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65413 eval "LIBPATH$unique=set" 65414- 65415+ 65416 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 65417 LDFLAGS="$LDFLAGS -L$ai_p" 65418 PHP_RPATHS="$PHP_RPATHS $ai_p" 65419- 65420+ 65421 fi 65422 65423 65424 fi 65425- 65426+ 65427 fi 65428 65429 ;; 65430 esac 65431 done 65432 65433- echo "$as_me:$LINENO: checking for gdImageGifCtx in -lgd" >&5 65434-echo $ECHO_N "checking for gdImageGifCtx in -lgd... $ECHO_C" >&6 65435-if test "${ac_cv_lib_gd_gdImageGifCtx+set}" = set; then 65436- echo $ECHO_N "(cached) $ECHO_C" >&6 65437+ echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 65438+echo "configure:42783: checking for gdImageGifCtx in -lgd" >&5 65439+ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` 65440+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 65441+ echo $ac_n "(cached) $ac_c" 1>&6 65442 else 65443- ac_check_lib_save_LIBS=$LIBS 65444+ ac_save_LIBS="$LIBS" 65445 LIBS="-lgd $LIBS" 65446-cat >conftest.$ac_ext <<_ACEOF 65447-/* confdefs.h. */ 65448-_ACEOF 65449-cat confdefs.h >>conftest.$ac_ext 65450-cat >>conftest.$ac_ext <<_ACEOF 65451-/* end confdefs.h. */ 65452- 65453+cat > conftest.$ac_ext <<EOF 65454+#line 42791 "configure" 65455+#include "confdefs.h" 65456 /* Override any gcc2 internal prototype to avoid an error. */ 65457-#ifdef __cplusplus 65458-extern "C" 65459-#endif 65460 /* We use char because int might match the return type of a gcc2 65461- builtin and then its argument prototype would still apply. */ 65462-char gdImageGifCtx (); 65463-int 65464-main () 65465-{ 65466-gdImageGifCtx (); 65467- ; 65468- return 0; 65469-} 65470-_ACEOF 65471-rm -f conftest.$ac_objext conftest$ac_exeext 65472-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 65473- (eval $ac_link) 2>conftest.er1 65474- ac_status=$? 65475- grep -v '^ *+' conftest.er1 >conftest.err 65476- rm -f conftest.er1 65477- cat conftest.err >&5 65478- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65479- (exit $ac_status); } && 65480- { ac_try='test -z "$ac_c_werror_flag" 65481- || test ! -s conftest.err' 65482- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65483- (eval $ac_try) 2>&5 65484- ac_status=$? 65485- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65486- (exit $ac_status); }; } && 65487- { ac_try='test -s conftest$ac_exeext' 65488- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65489- (eval $ac_try) 2>&5 65490- ac_status=$? 65491- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65492- (exit $ac_status); }; }; then 65493- ac_cv_lib_gd_gdImageGifCtx=yes 65494-else 65495- echo "$as_me: failed program was:" >&5 65496-sed 's/^/| /' conftest.$ac_ext >&5 65497- 65498-ac_cv_lib_gd_gdImageGifCtx=no 65499-fi 65500-rm -f conftest.err conftest.$ac_objext \ 65501- conftest$ac_exeext conftest.$ac_ext 65502-LIBS=$ac_check_lib_save_LIBS 65503-fi 65504-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGifCtx" >&5 65505-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGifCtx" >&6 65506-if test $ac_cv_lib_gd_gdImageGifCtx = yes; then 65507+ builtin and then its argument prototype would still apply. */ 65508+char gdImageGifCtx(); 65509 65510+int main() { 65511+gdImageGifCtx() 65512+; return 0; } 65513+EOF 65514+if { (eval echo configure:42802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 65515+ rm -rf conftest* 65516+ eval "ac_cv_lib_$ac_lib_var=yes" 65517+else 65518+ echo "configure: failed program was:" >&5 65519+ cat conftest.$ac_ext >&5 65520+ rm -rf conftest* 65521+ eval "ac_cv_lib_$ac_lib_var=no" 65522+fi 65523+rm -f conftest* 65524+LIBS="$ac_save_LIBS" 65525+ 65526+fi 65527+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 65528+ echo "$ac_t""yes" 1>&6 65529+ 65530 LDFLAGS=$save_old_LDFLAGS 65531 ext_shared=$save_ext_shared 65532- 65533-cat >>confdefs.h <<\_ACEOF 65534+ cat >> confdefs.h <<\EOF 65535 #define HAVE_GD_GIF_CTX 1 65536-_ACEOF 65537- 65538+EOF 65539 65540+ 65541 else 65542+ echo "$ac_t""no" 1>&6 65543 65544 LDFLAGS=$save_old_LDFLAGS 65545 ext_shared=$save_ext_shared 65546 unset ac_cv_lib_gd_gdImageGifCtx 65547- 65548- 65549+ 65550+ 65551 fi 65552 65553- 65554+ 65555 save_old_LDFLAGS=$LDFLAGS 65556 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 65557- 65558+ 65559 save_ext_shared=$ext_shared 65560 ext_shared=yes 65561- 65562+ 65563 for ac_i in $ac_stuff; do 65564 case $ac_i in 65565 -pthread) 65566 if test "$ext_shared" = "yes"; then 65567 LDFLAGS="$LDFLAGS -pthread" 65568 else 65569- 65570- 65571+ 65572+ 65573 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 65574- 65575+ 65576 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 65577 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65578 eval "EXTRA_LDFLAGS$unique=set" 65579@@ -56236,20 +42858,20 @@ 65580 ;; 65581 -l*) 65582 ac_ii=`echo $ac_i|cut -c 3-` 65583- 65584- 65585+ 65586+ 65587 case $ac_ii in 65588 c|c_r|pthread*) ;; 65589- *) 65590+ *) 65591 if test "$ext_shared" = "yes"; then 65592- LDFLAGS="$LDFLAGS -l$ac_ii" 65593+ LDFLAGS="$LDFLAGS -l$ac_ii" 65594 else 65595- 65596- 65597+ 65598+ 65599 case $ac_ii in 65600 c|c_r|pthread*) ;; 65601- *) 65602- LIBS="$LIBS -l$ac_ii" 65603+ *) 65604+ LIBS="$LIBS -l$ac_ii" 65605 ;; 65606 esac 65607 65608@@ -56262,148 +42884,118 @@ 65609 ;; 65610 -L*) 65611 ac_ii=`echo $ac_i|cut -c 3-` 65612- 65613+ 65614 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 65615- 65616+ 65617 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 65618 ai_p=$ac_ii 65619 else 65620- 65621+ 65622 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 65623- 65624+ 65625 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 65626 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 65627 fi 65628 65629- 65630+ 65631 if test "$ext_shared" = "yes"; then 65632 LDFLAGS="-L$ai_p $LDFLAGS" 65633 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 65634 else 65635- 65636- 65637- 65638+ 65639+ 65640+ 65641 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 65642- 65643+ 65644 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 65645 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65646 eval "LIBPATH$unique=set" 65647- 65648+ 65649 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 65650 LDFLAGS="$LDFLAGS -L$ai_p" 65651 PHP_RPATHS="$PHP_RPATHS $ai_p" 65652- 65653+ 65654 fi 65655 65656 65657 fi 65658- 65659+ 65660 fi 65661 65662 ;; 65663 esac 65664 done 65665 65666- echo "$as_me:$LINENO: checking for gdCacheCreate in -lgd" >&5 65667-echo $ECHO_N "checking for gdCacheCreate in -lgd... $ECHO_C" >&6 65668-if test "${ac_cv_lib_gd_gdCacheCreate+set}" = set; then 65669- echo $ECHO_N "(cached) $ECHO_C" >&6 65670+ echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 65671+echo "configure:42931: checking for gdCacheCreate in -lgd" >&5 65672+ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` 65673+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 65674+ echo $ac_n "(cached) $ac_c" 1>&6 65675 else 65676- ac_check_lib_save_LIBS=$LIBS 65677+ ac_save_LIBS="$LIBS" 65678 LIBS="-lgd $LIBS" 65679-cat >conftest.$ac_ext <<_ACEOF 65680-/* confdefs.h. */ 65681-_ACEOF 65682-cat confdefs.h >>conftest.$ac_ext 65683-cat >>conftest.$ac_ext <<_ACEOF 65684-/* end confdefs.h. */ 65685- 65686+cat > conftest.$ac_ext <<EOF 65687+#line 42939 "configure" 65688+#include "confdefs.h" 65689 /* Override any gcc2 internal prototype to avoid an error. */ 65690-#ifdef __cplusplus 65691-extern "C" 65692-#endif 65693 /* We use char because int might match the return type of a gcc2 65694- builtin and then its argument prototype would still apply. */ 65695-char gdCacheCreate (); 65696-int 65697-main () 65698-{ 65699-gdCacheCreate (); 65700- ; 65701- return 0; 65702-} 65703-_ACEOF 65704-rm -f conftest.$ac_objext conftest$ac_exeext 65705-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 65706- (eval $ac_link) 2>conftest.er1 65707- ac_status=$? 65708- grep -v '^ *+' conftest.er1 >conftest.err 65709- rm -f conftest.er1 65710- cat conftest.err >&5 65711- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65712- (exit $ac_status); } && 65713- { ac_try='test -z "$ac_c_werror_flag" 65714- || test ! -s conftest.err' 65715- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65716- (eval $ac_try) 2>&5 65717- ac_status=$? 65718- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65719- (exit $ac_status); }; } && 65720- { ac_try='test -s conftest$ac_exeext' 65721- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65722- (eval $ac_try) 2>&5 65723- ac_status=$? 65724- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65725- (exit $ac_status); }; }; then 65726- ac_cv_lib_gd_gdCacheCreate=yes 65727-else 65728- echo "$as_me: failed program was:" >&5 65729-sed 's/^/| /' conftest.$ac_ext >&5 65730- 65731-ac_cv_lib_gd_gdCacheCreate=no 65732-fi 65733-rm -f conftest.err conftest.$ac_objext \ 65734- conftest$ac_exeext conftest.$ac_ext 65735-LIBS=$ac_check_lib_save_LIBS 65736-fi 65737-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdCacheCreate" >&5 65738-echo "${ECHO_T}$ac_cv_lib_gd_gdCacheCreate" >&6 65739-if test $ac_cv_lib_gd_gdCacheCreate = yes; then 65740+ builtin and then its argument prototype would still apply. */ 65741+char gdCacheCreate(); 65742+ 65743+int main() { 65744+gdCacheCreate() 65745+; return 0; } 65746+EOF 65747+if { (eval echo configure:42950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 65748+ rm -rf conftest* 65749+ eval "ac_cv_lib_$ac_lib_var=yes" 65750+else 65751+ echo "configure: failed program was:" >&5 65752+ cat conftest.$ac_ext >&5 65753+ rm -rf conftest* 65754+ eval "ac_cv_lib_$ac_lib_var=no" 65755+fi 65756+rm -f conftest* 65757+LIBS="$ac_save_LIBS" 65758 65759+fi 65760+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 65761+ echo "$ac_t""yes" 1>&6 65762+ 65763 LDFLAGS=$save_old_LDFLAGS 65764 ext_shared=$save_ext_shared 65765- 65766-cat >>confdefs.h <<\_ACEOF 65767+ cat >> confdefs.h <<\EOF 65768 #define HAVE_GD_CACHE_CREATE 1 65769-_ACEOF 65770- 65771+EOF 65772 65773+ 65774 else 65775+ echo "$ac_t""no" 1>&6 65776 65777 LDFLAGS=$save_old_LDFLAGS 65778 ext_shared=$save_ext_shared 65779 unset ac_cv_lib_gd_gdCacheCreate 65780- 65781- 65782+ 65783+ 65784 fi 65785 65786- 65787+ 65788 save_old_LDFLAGS=$LDFLAGS 65789 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 65790- 65791+ 65792 save_ext_shared=$ext_shared 65793 ext_shared=yes 65794- 65795+ 65796 for ac_i in $ac_stuff; do 65797 case $ac_i in 65798 -pthread) 65799 if test "$ext_shared" = "yes"; then 65800 LDFLAGS="$LDFLAGS -pthread" 65801 else 65802- 65803- 65804+ 65805+ 65806 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 65807- 65808+ 65809 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 65810 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65811 eval "EXTRA_LDFLAGS$unique=set" 65812@@ -56414,20 +43006,20 @@ 65813 ;; 65814 -l*) 65815 ac_ii=`echo $ac_i|cut -c 3-` 65816- 65817- 65818+ 65819+ 65820 case $ac_ii in 65821 c|c_r|pthread*) ;; 65822- *) 65823+ *) 65824 if test "$ext_shared" = "yes"; then 65825- LDFLAGS="$LDFLAGS -l$ac_ii" 65826+ LDFLAGS="$LDFLAGS -l$ac_ii" 65827 else 65828- 65829- 65830+ 65831+ 65832 case $ac_ii in 65833 c|c_r|pthread*) ;; 65834- *) 65835- LIBS="$LIBS -l$ac_ii" 65836+ *) 65837+ LIBS="$LIBS -l$ac_ii" 65838 ;; 65839 esac 65840 65841@@ -56440,148 +43032,118 @@ 65842 ;; 65843 -L*) 65844 ac_ii=`echo $ac_i|cut -c 3-` 65845- 65846+ 65847 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 65848- 65849+ 65850 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 65851 ai_p=$ac_ii 65852 else 65853- 65854+ 65855 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 65856- 65857+ 65858 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 65859 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 65860 fi 65861 65862- 65863+ 65864 if test "$ext_shared" = "yes"; then 65865 LDFLAGS="-L$ai_p $LDFLAGS" 65866 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 65867 else 65868- 65869- 65870- 65871+ 65872+ 65873+ 65874 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 65875- 65876+ 65877 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 65878 if test -n "$unique" && test "`eval $cmd`" = "" ; then 65879 eval "LIBPATH$unique=set" 65880- 65881+ 65882 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 65883 LDFLAGS="$LDFLAGS -L$ai_p" 65884 PHP_RPATHS="$PHP_RPATHS $ai_p" 65885- 65886+ 65887 fi 65888 65889 65890 fi 65891- 65892+ 65893 fi 65894 65895 ;; 65896 esac 65897 done 65898 65899- echo "$as_me:$LINENO: checking for gdFontCacheShutdown in -lgd" >&5 65900-echo $ECHO_N "checking for gdFontCacheShutdown in -lgd... $ECHO_C" >&6 65901-if test "${ac_cv_lib_gd_gdFontCacheShutdown+set}" = set; then 65902- echo $ECHO_N "(cached) $ECHO_C" >&6 65903+ echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 65904+echo "configure:43079: checking for gdFontCacheShutdown in -lgd" >&5 65905+ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` 65906+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 65907+ echo $ac_n "(cached) $ac_c" 1>&6 65908 else 65909- ac_check_lib_save_LIBS=$LIBS 65910+ ac_save_LIBS="$LIBS" 65911 LIBS="-lgd $LIBS" 65912-cat >conftest.$ac_ext <<_ACEOF 65913-/* confdefs.h. */ 65914-_ACEOF 65915-cat confdefs.h >>conftest.$ac_ext 65916-cat >>conftest.$ac_ext <<_ACEOF 65917-/* end confdefs.h. */ 65918- 65919+cat > conftest.$ac_ext <<EOF 65920+#line 43087 "configure" 65921+#include "confdefs.h" 65922 /* Override any gcc2 internal prototype to avoid an error. */ 65923-#ifdef __cplusplus 65924-extern "C" 65925-#endif 65926 /* We use char because int might match the return type of a gcc2 65927- builtin and then its argument prototype would still apply. */ 65928-char gdFontCacheShutdown (); 65929-int 65930-main () 65931-{ 65932-gdFontCacheShutdown (); 65933- ; 65934- return 0; 65935-} 65936-_ACEOF 65937-rm -f conftest.$ac_objext conftest$ac_exeext 65938-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 65939- (eval $ac_link) 2>conftest.er1 65940- ac_status=$? 65941- grep -v '^ *+' conftest.er1 >conftest.err 65942- rm -f conftest.er1 65943- cat conftest.err >&5 65944- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65945- (exit $ac_status); } && 65946- { ac_try='test -z "$ac_c_werror_flag" 65947- || test ! -s conftest.err' 65948- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65949- (eval $ac_try) 2>&5 65950- ac_status=$? 65951- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65952- (exit $ac_status); }; } && 65953- { ac_try='test -s conftest$ac_exeext' 65954- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 65955- (eval $ac_try) 2>&5 65956- ac_status=$? 65957- echo "$as_me:$LINENO: \$? = $ac_status" >&5 65958- (exit $ac_status); }; }; then 65959- ac_cv_lib_gd_gdFontCacheShutdown=yes 65960-else 65961- echo "$as_me: failed program was:" >&5 65962-sed 's/^/| /' conftest.$ac_ext >&5 65963- 65964-ac_cv_lib_gd_gdFontCacheShutdown=no 65965-fi 65966-rm -f conftest.err conftest.$ac_objext \ 65967- conftest$ac_exeext conftest.$ac_ext 65968-LIBS=$ac_check_lib_save_LIBS 65969-fi 65970-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5 65971-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheShutdown" >&6 65972-if test $ac_cv_lib_gd_gdFontCacheShutdown = yes; then 65973+ builtin and then its argument prototype would still apply. */ 65974+char gdFontCacheShutdown(); 65975+ 65976+int main() { 65977+gdFontCacheShutdown() 65978+; return 0; } 65979+EOF 65980+if { (eval echo configure:43098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 65981+ rm -rf conftest* 65982+ eval "ac_cv_lib_$ac_lib_var=yes" 65983+else 65984+ echo "configure: failed program was:" >&5 65985+ cat conftest.$ac_ext >&5 65986+ rm -rf conftest* 65987+ eval "ac_cv_lib_$ac_lib_var=no" 65988+fi 65989+rm -f conftest* 65990+LIBS="$ac_save_LIBS" 65991 65992+fi 65993+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 65994+ echo "$ac_t""yes" 1>&6 65995+ 65996 LDFLAGS=$save_old_LDFLAGS 65997 ext_shared=$save_ext_shared 65998- 65999-cat >>confdefs.h <<\_ACEOF 66000+ cat >> confdefs.h <<\EOF 66001 #define HAVE_GD_FONTCACHESHUTDOWN 1 66002-_ACEOF 66003- 66004+EOF 66005 66006+ 66007 else 66008+ echo "$ac_t""no" 1>&6 66009 66010 LDFLAGS=$save_old_LDFLAGS 66011 ext_shared=$save_ext_shared 66012 unset ac_cv_lib_gd_gdFontCacheShutdown 66013- 66014- 66015+ 66016+ 66017 fi 66018 66019- 66020+ 66021 save_old_LDFLAGS=$LDFLAGS 66022 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 66023- 66024+ 66025 save_ext_shared=$ext_shared 66026 ext_shared=yes 66027- 66028+ 66029 for ac_i in $ac_stuff; do 66030 case $ac_i in 66031 -pthread) 66032 if test "$ext_shared" = "yes"; then 66033 LDFLAGS="$LDFLAGS -pthread" 66034 else 66035- 66036- 66037+ 66038+ 66039 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 66040- 66041+ 66042 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 66043 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66044 eval "EXTRA_LDFLAGS$unique=set" 66045@@ -56592,20 +43154,20 @@ 66046 ;; 66047 -l*) 66048 ac_ii=`echo $ac_i|cut -c 3-` 66049- 66050- 66051+ 66052+ 66053 case $ac_ii in 66054 c|c_r|pthread*) ;; 66055- *) 66056+ *) 66057 if test "$ext_shared" = "yes"; then 66058- LDFLAGS="$LDFLAGS -l$ac_ii" 66059+ LDFLAGS="$LDFLAGS -l$ac_ii" 66060 else 66061- 66062- 66063+ 66064+ 66065 case $ac_ii in 66066 c|c_r|pthread*) ;; 66067- *) 66068- LIBS="$LIBS -l$ac_ii" 66069+ *) 66070+ LIBS="$LIBS -l$ac_ii" 66071 ;; 66072 esac 66073 66074@@ -56618,148 +43180,118 @@ 66075 ;; 66076 -L*) 66077 ac_ii=`echo $ac_i|cut -c 3-` 66078- 66079+ 66080 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 66081- 66082+ 66083 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 66084 ai_p=$ac_ii 66085 else 66086- 66087+ 66088 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 66089- 66090+ 66091 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 66092 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 66093 fi 66094 66095- 66096+ 66097 if test "$ext_shared" = "yes"; then 66098 LDFLAGS="-L$ai_p $LDFLAGS" 66099 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 66100 else 66101- 66102- 66103- 66104+ 66105+ 66106+ 66107 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 66108- 66109+ 66110 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 66111 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66112 eval "LIBPATH$unique=set" 66113- 66114+ 66115 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 66116 LDFLAGS="$LDFLAGS -L$ai_p" 66117 PHP_RPATHS="$PHP_RPATHS $ai_p" 66118- 66119+ 66120 fi 66121 66122 66123 fi 66124- 66125+ 66126 fi 66127 66128 ;; 66129 esac 66130 done 66131 66132- echo "$as_me:$LINENO: checking for gdFreeFontCache in -lgd" >&5 66133-echo $ECHO_N "checking for gdFreeFontCache in -lgd... $ECHO_C" >&6 66134-if test "${ac_cv_lib_gd_gdFreeFontCache+set}" = set; then 66135- echo $ECHO_N "(cached) $ECHO_C" >&6 66136+ echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 66137+echo "configure:43227: checking for gdFreeFontCache in -lgd" >&5 66138+ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` 66139+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 66140+ echo $ac_n "(cached) $ac_c" 1>&6 66141 else 66142- ac_check_lib_save_LIBS=$LIBS 66143+ ac_save_LIBS="$LIBS" 66144 LIBS="-lgd $LIBS" 66145-cat >conftest.$ac_ext <<_ACEOF 66146-/* confdefs.h. */ 66147-_ACEOF 66148-cat confdefs.h >>conftest.$ac_ext 66149-cat >>conftest.$ac_ext <<_ACEOF 66150-/* end confdefs.h. */ 66151- 66152+cat > conftest.$ac_ext <<EOF 66153+#line 43235 "configure" 66154+#include "confdefs.h" 66155 /* Override any gcc2 internal prototype to avoid an error. */ 66156-#ifdef __cplusplus 66157-extern "C" 66158-#endif 66159 /* We use char because int might match the return type of a gcc2 66160- builtin and then its argument prototype would still apply. */ 66161-char gdFreeFontCache (); 66162-int 66163-main () 66164-{ 66165-gdFreeFontCache (); 66166- ; 66167- return 0; 66168-} 66169-_ACEOF 66170-rm -f conftest.$ac_objext conftest$ac_exeext 66171-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 66172- (eval $ac_link) 2>conftest.er1 66173- ac_status=$? 66174- grep -v '^ *+' conftest.er1 >conftest.err 66175- rm -f conftest.er1 66176- cat conftest.err >&5 66177- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66178- (exit $ac_status); } && 66179- { ac_try='test -z "$ac_c_werror_flag" 66180- || test ! -s conftest.err' 66181- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66182- (eval $ac_try) 2>&5 66183- ac_status=$? 66184- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66185- (exit $ac_status); }; } && 66186- { ac_try='test -s conftest$ac_exeext' 66187- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66188- (eval $ac_try) 2>&5 66189- ac_status=$? 66190- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66191- (exit $ac_status); }; }; then 66192- ac_cv_lib_gd_gdFreeFontCache=yes 66193-else 66194- echo "$as_me: failed program was:" >&5 66195-sed 's/^/| /' conftest.$ac_ext >&5 66196- 66197-ac_cv_lib_gd_gdFreeFontCache=no 66198-fi 66199-rm -f conftest.err conftest.$ac_objext \ 66200- conftest$ac_exeext conftest.$ac_ext 66201-LIBS=$ac_check_lib_save_LIBS 66202-fi 66203-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFreeFontCache" >&5 66204-echo "${ECHO_T}$ac_cv_lib_gd_gdFreeFontCache" >&6 66205-if test $ac_cv_lib_gd_gdFreeFontCache = yes; then 66206+ builtin and then its argument prototype would still apply. */ 66207+char gdFreeFontCache(); 66208+ 66209+int main() { 66210+gdFreeFontCache() 66211+; return 0; } 66212+EOF 66213+if { (eval echo configure:43246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 66214+ rm -rf conftest* 66215+ eval "ac_cv_lib_$ac_lib_var=yes" 66216+else 66217+ echo "configure: failed program was:" >&5 66218+ cat conftest.$ac_ext >&5 66219+ rm -rf conftest* 66220+ eval "ac_cv_lib_$ac_lib_var=no" 66221+fi 66222+rm -f conftest* 66223+LIBS="$ac_save_LIBS" 66224 66225+fi 66226+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 66227+ echo "$ac_t""yes" 1>&6 66228+ 66229 LDFLAGS=$save_old_LDFLAGS 66230 ext_shared=$save_ext_shared 66231- 66232-cat >>confdefs.h <<\_ACEOF 66233+ cat >> confdefs.h <<\EOF 66234 #define HAVE_GD_FREEFONTCACHE 1 66235-_ACEOF 66236- 66237+EOF 66238 66239+ 66240 else 66241+ echo "$ac_t""no" 1>&6 66242 66243 LDFLAGS=$save_old_LDFLAGS 66244 ext_shared=$save_ext_shared 66245 unset ac_cv_lib_gd_gdFreeFontCache 66246- 66247- 66248+ 66249+ 66250 fi 66251 66252- 66253+ 66254 save_old_LDFLAGS=$LDFLAGS 66255 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 66256- 66257+ 66258 save_ext_shared=$ext_shared 66259 ext_shared=yes 66260- 66261+ 66262 for ac_i in $ac_stuff; do 66263 case $ac_i in 66264 -pthread) 66265 if test "$ext_shared" = "yes"; then 66266 LDFLAGS="$LDFLAGS -pthread" 66267 else 66268- 66269- 66270+ 66271+ 66272 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 66273- 66274+ 66275 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 66276 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66277 eval "EXTRA_LDFLAGS$unique=set" 66278@@ -56770,20 +43302,20 @@ 66279 ;; 66280 -l*) 66281 ac_ii=`echo $ac_i|cut -c 3-` 66282- 66283- 66284+ 66285+ 66286 case $ac_ii in 66287 c|c_r|pthread*) ;; 66288- *) 66289+ *) 66290 if test "$ext_shared" = "yes"; then 66291- LDFLAGS="$LDFLAGS -l$ac_ii" 66292+ LDFLAGS="$LDFLAGS -l$ac_ii" 66293 else 66294- 66295- 66296+ 66297+ 66298 case $ac_ii in 66299 c|c_r|pthread*) ;; 66300- *) 66301- LIBS="$LIBS -l$ac_ii" 66302+ *) 66303+ LIBS="$LIBS -l$ac_ii" 66304 ;; 66305 esac 66306 66307@@ -56796,148 +43328,118 @@ 66308 ;; 66309 -L*) 66310 ac_ii=`echo $ac_i|cut -c 3-` 66311- 66312+ 66313 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 66314- 66315+ 66316 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 66317 ai_p=$ac_ii 66318 else 66319- 66320+ 66321 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 66322- 66323+ 66324 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 66325 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 66326 fi 66327 66328- 66329+ 66330 if test "$ext_shared" = "yes"; then 66331 LDFLAGS="-L$ai_p $LDFLAGS" 66332 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 66333 else 66334- 66335- 66336- 66337+ 66338+ 66339+ 66340 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 66341- 66342+ 66343 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 66344 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66345 eval "LIBPATH$unique=set" 66346- 66347+ 66348 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 66349 LDFLAGS="$LDFLAGS -L$ai_p" 66350 PHP_RPATHS="$PHP_RPATHS $ai_p" 66351- 66352+ 66353 fi 66354 66355 66356 fi 66357- 66358+ 66359 fi 66360 66361 ;; 66362 esac 66363 done 66364 66365- echo "$as_me:$LINENO: checking for gdFontCacheMutexSetup in -lgd" >&5 66366-echo $ECHO_N "checking for gdFontCacheMutexSetup in -lgd... $ECHO_C" >&6 66367-if test "${ac_cv_lib_gd_gdFontCacheMutexSetup+set}" = set; then 66368- echo $ECHO_N "(cached) $ECHO_C" >&6 66369+ echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 66370+echo "configure:43375: checking for gdFontCacheMutexSetup in -lgd" >&5 66371+ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` 66372+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 66373+ echo $ac_n "(cached) $ac_c" 1>&6 66374 else 66375- ac_check_lib_save_LIBS=$LIBS 66376+ ac_save_LIBS="$LIBS" 66377 LIBS="-lgd $LIBS" 66378-cat >conftest.$ac_ext <<_ACEOF 66379-/* confdefs.h. */ 66380-_ACEOF 66381-cat confdefs.h >>conftest.$ac_ext 66382-cat >>conftest.$ac_ext <<_ACEOF 66383-/* end confdefs.h. */ 66384- 66385+cat > conftest.$ac_ext <<EOF 66386+#line 43383 "configure" 66387+#include "confdefs.h" 66388 /* Override any gcc2 internal prototype to avoid an error. */ 66389-#ifdef __cplusplus 66390-extern "C" 66391-#endif 66392 /* We use char because int might match the return type of a gcc2 66393- builtin and then its argument prototype would still apply. */ 66394-char gdFontCacheMutexSetup (); 66395-int 66396-main () 66397-{ 66398-gdFontCacheMutexSetup (); 66399- ; 66400- return 0; 66401-} 66402-_ACEOF 66403-rm -f conftest.$ac_objext conftest$ac_exeext 66404-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 66405- (eval $ac_link) 2>conftest.er1 66406- ac_status=$? 66407- grep -v '^ *+' conftest.er1 >conftest.err 66408- rm -f conftest.er1 66409- cat conftest.err >&5 66410- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66411- (exit $ac_status); } && 66412- { ac_try='test -z "$ac_c_werror_flag" 66413- || test ! -s conftest.err' 66414- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66415- (eval $ac_try) 2>&5 66416- ac_status=$? 66417- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66418- (exit $ac_status); }; } && 66419- { ac_try='test -s conftest$ac_exeext' 66420- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66421- (eval $ac_try) 2>&5 66422- ac_status=$? 66423- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66424- (exit $ac_status); }; }; then 66425- ac_cv_lib_gd_gdFontCacheMutexSetup=yes 66426-else 66427- echo "$as_me: failed program was:" >&5 66428-sed 's/^/| /' conftest.$ac_ext >&5 66429- 66430-ac_cv_lib_gd_gdFontCacheMutexSetup=no 66431-fi 66432-rm -f conftest.err conftest.$ac_objext \ 66433- conftest$ac_exeext conftest.$ac_ext 66434-LIBS=$ac_check_lib_save_LIBS 66435-fi 66436-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheMutexSetup" >&5 66437-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheMutexSetup" >&6 66438-if test $ac_cv_lib_gd_gdFontCacheMutexSetup = yes; then 66439+ builtin and then its argument prototype would still apply. */ 66440+char gdFontCacheMutexSetup(); 66441+ 66442+int main() { 66443+gdFontCacheMutexSetup() 66444+; return 0; } 66445+EOF 66446+if { (eval echo configure:43394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 66447+ rm -rf conftest* 66448+ eval "ac_cv_lib_$ac_lib_var=yes" 66449+else 66450+ echo "configure: failed program was:" >&5 66451+ cat conftest.$ac_ext >&5 66452+ rm -rf conftest* 66453+ eval "ac_cv_lib_$ac_lib_var=no" 66454+fi 66455+rm -f conftest* 66456+LIBS="$ac_save_LIBS" 66457 66458+fi 66459+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 66460+ echo "$ac_t""yes" 1>&6 66461+ 66462 LDFLAGS=$save_old_LDFLAGS 66463 ext_shared=$save_ext_shared 66464- 66465-cat >>confdefs.h <<\_ACEOF 66466+ cat >> confdefs.h <<\EOF 66467 #define HAVE_GD_FONTMUTEX 1 66468-_ACEOF 66469- 66470+EOF 66471 66472+ 66473 else 66474+ echo "$ac_t""no" 1>&6 66475 66476 LDFLAGS=$save_old_LDFLAGS 66477 ext_shared=$save_ext_shared 66478 unset ac_cv_lib_gd_gdFontCacheMutexSetup 66479- 66480- 66481+ 66482+ 66483 fi 66484 66485- 66486+ 66487 save_old_LDFLAGS=$LDFLAGS 66488 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 66489- 66490+ 66491 save_ext_shared=$ext_shared 66492 ext_shared=yes 66493- 66494+ 66495 for ac_i in $ac_stuff; do 66496 case $ac_i in 66497 -pthread) 66498 if test "$ext_shared" = "yes"; then 66499 LDFLAGS="$LDFLAGS -pthread" 66500 else 66501- 66502- 66503+ 66504+ 66505 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 66506- 66507+ 66508 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 66509 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66510 eval "EXTRA_LDFLAGS$unique=set" 66511@@ -56948,20 +43450,20 @@ 66512 ;; 66513 -l*) 66514 ac_ii=`echo $ac_i|cut -c 3-` 66515- 66516- 66517+ 66518+ 66519 case $ac_ii in 66520 c|c_r|pthread*) ;; 66521- *) 66522+ *) 66523 if test "$ext_shared" = "yes"; then 66524- LDFLAGS="$LDFLAGS -l$ac_ii" 66525+ LDFLAGS="$LDFLAGS -l$ac_ii" 66526 else 66527- 66528- 66529+ 66530+ 66531 case $ac_ii in 66532 c|c_r|pthread*) ;; 66533- *) 66534- LIBS="$LIBS -l$ac_ii" 66535+ *) 66536+ LIBS="$LIBS -l$ac_ii" 66537 ;; 66538 esac 66539 66540@@ -56974,149 +43476,115 @@ 66541 ;; 66542 -L*) 66543 ac_ii=`echo $ac_i|cut -c 3-` 66544- 66545+ 66546 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 66547- 66548+ 66549 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 66550 ai_p=$ac_ii 66551 else 66552- 66553+ 66554 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 66555- 66556+ 66557 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 66558 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 66559 fi 66560 66561- 66562+ 66563 if test "$ext_shared" = "yes"; then 66564 LDFLAGS="-L$ai_p $LDFLAGS" 66565 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 66566 else 66567- 66568- 66569- 66570+ 66571+ 66572+ 66573 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 66574- 66575+ 66576 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 66577 if test -n "$unique" && test "`eval $cmd`" = "" ; then 66578 eval "LIBPATH$unique=set" 66579- 66580+ 66581 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 66582 LDFLAGS="$LDFLAGS -L$ai_p" 66583 PHP_RPATHS="$PHP_RPATHS $ai_p" 66584- 66585+ 66586 fi 66587 66588 66589 fi 66590- 66591+ 66592 fi 66593 66594 ;; 66595 esac 66596 done 66597 66598- echo "$as_me:$LINENO: checking for gdNewDynamicCtxEx in -lgd" >&5 66599-echo $ECHO_N "checking for gdNewDynamicCtxEx in -lgd... $ECHO_C" >&6 66600-if test "${ac_cv_lib_gd_gdNewDynamicCtxEx+set}" = set; then 66601- echo $ECHO_N "(cached) $ECHO_C" >&6 66602+ echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 66603+echo "configure:43523: checking for gdNewDynamicCtxEx in -lgd" >&5 66604+ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` 66605+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 66606+ echo $ac_n "(cached) $ac_c" 1>&6 66607 else 66608- ac_check_lib_save_LIBS=$LIBS 66609+ ac_save_LIBS="$LIBS" 66610 LIBS="-lgd $LIBS" 66611-cat >conftest.$ac_ext <<_ACEOF 66612-/* confdefs.h. */ 66613-_ACEOF 66614-cat confdefs.h >>conftest.$ac_ext 66615-cat >>conftest.$ac_ext <<_ACEOF 66616-/* end confdefs.h. */ 66617- 66618+cat > conftest.$ac_ext <<EOF 66619+#line 43531 "configure" 66620+#include "confdefs.h" 66621 /* Override any gcc2 internal prototype to avoid an error. */ 66622-#ifdef __cplusplus 66623-extern "C" 66624-#endif 66625 /* We use char because int might match the return type of a gcc2 66626- builtin and then its argument prototype would still apply. */ 66627-char gdNewDynamicCtxEx (); 66628-int 66629-main () 66630-{ 66631-gdNewDynamicCtxEx (); 66632- ; 66633- return 0; 66634-} 66635-_ACEOF 66636-rm -f conftest.$ac_objext conftest$ac_exeext 66637-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 66638- (eval $ac_link) 2>conftest.er1 66639- ac_status=$? 66640- grep -v '^ *+' conftest.er1 >conftest.err 66641- rm -f conftest.er1 66642- cat conftest.err >&5 66643- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66644- (exit $ac_status); } && 66645- { ac_try='test -z "$ac_c_werror_flag" 66646- || test ! -s conftest.err' 66647- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66648- (eval $ac_try) 2>&5 66649- ac_status=$? 66650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66651- (exit $ac_status); }; } && 66652- { ac_try='test -s conftest$ac_exeext' 66653- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66654- (eval $ac_try) 2>&5 66655- ac_status=$? 66656- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66657- (exit $ac_status); }; }; then 66658- ac_cv_lib_gd_gdNewDynamicCtxEx=yes 66659-else 66660- echo "$as_me: failed program was:" >&5 66661-sed 's/^/| /' conftest.$ac_ext >&5 66662- 66663-ac_cv_lib_gd_gdNewDynamicCtxEx=no 66664-fi 66665-rm -f conftest.err conftest.$ac_objext \ 66666- conftest$ac_exeext conftest.$ac_ext 66667-LIBS=$ac_check_lib_save_LIBS 66668-fi 66669-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdNewDynamicCtxEx" >&5 66670-echo "${ECHO_T}$ac_cv_lib_gd_gdNewDynamicCtxEx" >&6 66671-if test $ac_cv_lib_gd_gdNewDynamicCtxEx = yes; then 66672+ builtin and then its argument prototype would still apply. */ 66673+char gdNewDynamicCtxEx(); 66674+ 66675+int main() { 66676+gdNewDynamicCtxEx() 66677+; return 0; } 66678+EOF 66679+if { (eval echo configure:43542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 66680+ rm -rf conftest* 66681+ eval "ac_cv_lib_$ac_lib_var=yes" 66682+else 66683+ echo "configure: failed program was:" >&5 66684+ cat conftest.$ac_ext >&5 66685+ rm -rf conftest* 66686+ eval "ac_cv_lib_$ac_lib_var=no" 66687+fi 66688+rm -f conftest* 66689+LIBS="$ac_save_LIBS" 66690 66691+fi 66692+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 66693+ echo "$ac_t""yes" 1>&6 66694+ 66695 LDFLAGS=$save_old_LDFLAGS 66696 ext_shared=$save_ext_shared 66697- 66698-cat >>confdefs.h <<\_ACEOF 66699+ cat >> confdefs.h <<\EOF 66700 #define HAVE_GD_DYNAMIC_CTX_EX 1 66701-_ACEOF 66702- 66703+EOF 66704 66705+ 66706 else 66707+ echo "$ac_t""no" 1>&6 66708 66709 LDFLAGS=$save_old_LDFLAGS 66710 ext_shared=$save_ext_shared 66711 unset ac_cv_lib_gd_gdNewDynamicCtxEx 66712- 66713- 66714+ 66715+ 66716 fi 66717 66718 66719 elif test -z "$GD_INCLUDE"; then 66720- { { echo "$as_me:$LINENO: error: Unable to find gd.h anywhere under $PHP_GD" >&5 66721-echo "$as_me: error: Unable to find gd.h anywhere under $PHP_GD" >&2;} 66722- { (exit 1); exit 1; }; } 66723- else 66724- { { echo "$as_me:$LINENO: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&5 66725-echo "$as_me: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&2;} 66726- { (exit 1); exit 1; }; } 66727+ { echo "configure: error: Unable to find gd.h anywhere under $PHP_GD" 1>&2; exit 1; } 66728+ else 66729+ { echo "configure: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" 1>&2; exit 1; } 66730 fi 66731 66732- 66733+ 66734 if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then 66735 GD_INCLUDE=$GD_INCLUDE 66736 else 66737- 66738+ 66739 ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 66740- 66741+ 66742 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 66743 GD_INCLUDE="$ep_realdir/`basename \"$GD_INCLUDE\"`" 66744 fi 66745@@ -57124,70 +43592,41 @@ 66746 66747 old_CPPFLAGS=$CPPFLAGS 66748 CPPFLAGS=-I$GD_INCLUDE 66749- cat >conftest.$ac_ext <<_ACEOF 66750-/* confdefs.h. */ 66751-_ACEOF 66752-cat confdefs.h >>conftest.$ac_ext 66753-cat >>conftest.$ac_ext <<_ACEOF 66754-/* end confdefs.h. */ 66755+ cat > conftest.$ac_ext <<EOF 66756+#line 43597 "configure" 66757+#include "confdefs.h" 66758 66759 #include <gd.h> 66760 #include <stdlib.h> 66761- 66762-int 66763-main () 66764-{ 66765+ 66766+int main() { 66767 66768 gdIOCtx *ctx; 66769 ctx = malloc(sizeof(gdIOCtx)); 66770 ctx->gd_free = 1; 66771- 66772- ; 66773- return 0; 66774-} 66775-_ACEOF 66776-rm -f conftest.$ac_objext 66777-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 66778- (eval $ac_compile) 2>conftest.er1 66779- ac_status=$? 66780- grep -v '^ *+' conftest.er1 >conftest.err 66781- rm -f conftest.er1 66782- cat conftest.err >&5 66783- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66784- (exit $ac_status); } && 66785- { ac_try='test -z "$ac_c_werror_flag" 66786- || test ! -s conftest.err' 66787- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66788- (eval $ac_try) 2>&5 66789- ac_status=$? 66790- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66791- (exit $ac_status); }; } && 66792- { ac_try='test -s conftest.$ac_objext' 66793- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 66794- (eval $ac_try) 2>&5 66795- ac_status=$? 66796- echo "$as_me:$LINENO: \$? = $ac_status" >&5 66797- (exit $ac_status); }; }; then 66798- 66799- 66800-cat >>confdefs.h <<\_ACEOF 66801+ 66802+; return 0; } 66803+EOF 66804+if { (eval echo configure:43611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 66805+ rm -rf conftest* 66806+ 66807+ cat >> confdefs.h <<\EOF 66808 #define HAVE_LIBGD204 1 66809-_ACEOF 66810- 66811+EOF 66812 66813+ 66814 else 66815- echo "$as_me: failed program was:" >&5 66816-sed 's/^/| /' conftest.$ac_ext >&5 66817- 66818+ echo "configure: failed program was:" >&5 66819+ cat conftest.$ac_ext >&5 66820 fi 66821-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 66822+rm -f conftest* 66823 CPPFLAGS=$old_CPPFLAGS 66824 66825 fi 66826 fi 66827 66828 if test "$PHP_GD" != "no"; then 66829- 66830+ 66831 ext_builddir=ext/gd 66832 ext_srcdir=$abs_srcdir/ext/gd 66833 66834@@ -57195,15 +43634,15 @@ 66835 66836 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 66837 PHP_GD_SHARED=no 66838- 66839- 66840+ 66841+ 66842 case ext/gd in 66843 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 66844 /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 66845 *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 66846 esac 66847- 66848- 66849+ 66850+ 66851 66852 b_c_pre=$php_c_pre 66853 b_cxx_pre=$php_cxx_pre 66854@@ -57216,12 +43655,12 @@ 66855 66856 old_IFS=$IFS 66857 for ac_src in gd.c $extra_sources; do 66858- 66859+ 66860 IFS=. 66861 set $ac_src 66862 ac_obj=$1 66863 IFS=$old_IFS 66864- 66865+ 66866 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 66867 66868 case $ac_src in 66869@@ -57245,14 +43684,14 @@ 66870 else 66871 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 66872 PHP_GD_SHARED=yes 66873- 66874+ 66875 case ext/gd in 66876 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 66877 /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 66878 *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 66879 esac 66880- 66881- 66882+ 66883+ 66884 66885 b_c_pre=$shared_c_pre 66886 b_cxx_pre=$shared_cxx_pre 66887@@ -57265,12 +43704,12 @@ 66888 66889 old_IFS=$IFS 66890 for ac_src in gd.c $extra_sources; do 66891- 66892+ 66893 IFS=. 66894 set $ac_src 66895 ac_obj=$1 66896 IFS=$old_IFS 66897- 66898+ 66899 shared_objects_gd="$shared_objects_gd $ac_bdir$ac_obj.lo" 66900 66901 case $ac_src in 66902@@ -57288,7 +43727,7 @@ 66903 66904 case $host_alias in 66905 *netware*) 66906- 66907+ 66908 install_modules="install-modules" 66909 66910 case $host_alias in 66911@@ -57298,7 +43737,7 @@ 66912 ;; 66913 *netware*) 66914 suffix=nlm 66915- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(GD_SHARED_LIBADD)' 66916+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGD, 3)_SHARED_LIBADD)' 66917 ;; 66918 *) 66919 suffix=la 66920@@ -57311,7 +43750,7 @@ 66921 else 66922 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgd.$suffix" 66923 fi 66924- 66925+ 66926 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gd" 66927 66928 cat >>Makefile.objects<<EOF 66929@@ -57325,7 +43764,7 @@ 66930 66931 ;; 66932 *) 66933- 66934+ 66935 install_modules="install-modules" 66936 66937 case $host_alias in 66938@@ -57335,7 +43774,7 @@ 66939 ;; 66940 *netware*) 66941 suffix=nlm 66942- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 66943+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GD, 3)_SHARED_LIBADD)' 66944 ;; 66945 *) 66946 suffix=la 66947@@ -57348,7 +43787,7 @@ 66948 else 66949 PHP_MODULES="$PHP_MODULES \$(phplibdir)/gd.$suffix" 66950 fi 66951- 66952+ 66953 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gd" 66954 66955 cat >>Makefile.objects<<EOF 66956@@ -57362,10 +43801,9 @@ 66957 66958 ;; 66959 esac 66960- 66961-cat >>confdefs.h <<_ACEOF 66962+ cat >> confdefs.h <<EOF 66963 #define COMPILE_DL_GD 1 66964-_ACEOF 66965+EOF 66966 66967 fi 66968 fi 66969@@ -57374,15 +43812,15 @@ 66970 PHP_GD_SHARED=no 66971 case "$PHP_SAPI" in 66972 cgi|embed) 66973- 66974- 66975+ 66976+ 66977 case ext/gd in 66978 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 66979 /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 66980 *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 66981 esac 66982- 66983- 66984+ 66985+ 66986 66987 b_c_pre=$php_c_pre 66988 b_cxx_pre=$php_cxx_pre 66989@@ -57395,12 +43833,12 @@ 66990 66991 old_IFS=$IFS 66992 for ac_src in gd.c $extra_sources; do 66993- 66994+ 66995 IFS=. 66996 set $ac_src 66997 ac_obj=$1 66998 IFS=$old_IFS 66999- 67000+ 67001 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 67002 67003 case $ac_src in 67004@@ -57420,15 +43858,15 @@ 67005 EXT_STATIC="$EXT_STATIC gd" 67006 ;; 67007 *) 67008- 67009- 67010+ 67011+ 67012 case ext/gd in 67013 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 67014 /*) ac_srcdir=`echo "ext/gd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 67015 *) ac_srcdir="$abs_srcdir/ext/gd/"; ac_bdir="ext/gd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 67016 esac 67017- 67018- 67019+ 67020+ 67021 67022 b_c_pre=$php_c_pre 67023 b_cxx_pre=$php_cxx_pre 67024@@ -57441,13 +43879,13 @@ 67025 67026 old_IFS=$IFS 67027 for ac_src in gd.c $extra_sources; do 67028- 67029+ 67030 IFS=. 67031 set $ac_src 67032 ac_obj=$1 67033 IFS=$old_IFS 67034- 67035- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 67036+ 67037+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 67038 67039 case $ac_src in 67040 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 67041@@ -57467,44 +43905,41 @@ 67042 esac 67043 EXT_CLI_STATIC="$EXT_CLI_STATIC gd" 67044 fi 67045- 67046- 67047+ 67048+ 67049 BUILD_DIR="$BUILD_DIR $ext_builddir" 67050- 67051+ 67052 67053 67054 if test "$ext_builddir" = "."; then 67055 PHP_PECL_EXTENSION=gd 67056- 67057+ 67058 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 67059 67060 fi 67061 67062 67063- 67064- 67065+ 67066+ 67067 BUILD_DIR="$BUILD_DIR $ext_builddir/libgd" 67068- 67069+ 67070 67071 67072 if test "$GD_MODULE_TYPE" = "builtin"; then 67073 GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" 67074 GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" 67075 67076- 67077+ 67078 old_LIBS=$LIBS 67079 LIBS=" $GD_SHARED_LIBADD $LIBS" 67080 if test "$cross_compiling" = yes; then 67081- 67082+ 67083 LIBS=$old_LIBS 67084- 67085+ 67086 else 67087- cat >conftest.$ac_ext <<_ACEOF 67088-/* confdefs.h. */ 67089-_ACEOF 67090-cat confdefs.h >>conftest.$ac_ext 67091-cat >>conftest.$ac_ext <<_ACEOF 67092-/* end confdefs.h. */ 67093+ cat > conftest.$ac_ext <<EOF 67094+#line 43942 "configure" 67095+#include "confdefs.h" 67096 67097 char foobar () {} 67098 char foobar(); 67099@@ -57512,92 +43947,80 @@ 67100 foobar(); 67101 return 0; 67102 } 67103- 67104-_ACEOF 67105-rm -f conftest$ac_exeext 67106-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 67107- (eval $ac_link) 2>&5 67108- ac_status=$? 67109- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67110- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 67111- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67112- (eval $ac_try) 2>&5 67113- ac_status=$? 67114- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67115- (exit $ac_status); }; }; then 67116- 67117+ 67118+EOF 67119+if { (eval echo configure:43953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 67120+then 67121+ 67122 LIBS=$old_LIBS 67123- 67124- 67125+ 67126+ 67127 else 67128- echo "$as_me: program exited with status $ac_status" >&5 67129-echo "$as_me: failed program was:" >&5 67130-sed 's/^/| /' conftest.$ac_ext >&5 67131- 67132-( exit $ac_status ) 67133- 67134+ echo "configure: failed program was:" >&5 67135+ cat conftest.$ac_ext >&5 67136+ rm -fr conftest* 67137+ 67138 LIBS=$old_LIBS 67139- 67140- { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5 67141-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;} 67142- { (exit 1); exit 1; }; } 67143- 67144- 67145+ 67146+ { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; } 67147+ 67148+ 67149 fi 67150-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 67151+rm -fr conftest* 67152 fi 67153 67154+ 67155 else 67156 GD_HEADER_DIRS="ext/gd/" 67157 GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" 67158- 67159+ 67160 if test "$GD_INCLUDE" != "/usr/include"; then 67161- 67162+ 67163 if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then 67164 ai_p=$GD_INCLUDE 67165 else 67166- 67167+ 67168 ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 67169- 67170+ 67171 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 67172 ai_p="$ep_realdir/`basename \"$GD_INCLUDE\"`" 67173 fi 67174 67175- 67176- 67177+ 67178+ 67179 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 67180- 67181+ 67182 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 67183 if test -n "$unique" && test "`eval $cmd`" = "" ; then 67184 eval "INCLUDEPATH$unique=set" 67185- 67186+ 67187 if test ""; then 67188 INCLUDES="-I$ai_p $INCLUDES" 67189 else 67190 INCLUDES="$INCLUDES -I$ai_p" 67191 fi 67192- 67193+ 67194 fi 67195 67196 fi 67197 67198- 67199+ 67200 save_old_LDFLAGS=$LDFLAGS 67201 ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " 67202- 67203+ 67204 save_ext_shared=$ext_shared 67205 ext_shared=yes 67206- 67207+ 67208 for ac_i in $ac_stuff; do 67209 case $ac_i in 67210 -pthread) 67211 if test "$ext_shared" = "yes"; then 67212 LDFLAGS="$LDFLAGS -pthread" 67213 else 67214- 67215- 67216+ 67217+ 67218 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 67219- 67220+ 67221 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 67222 if test -n "$unique" && test "`eval $cmd`" = "" ; then 67223 eval "EXTRA_LDFLAGS$unique=set" 67224@@ -57608,20 +44031,20 @@ 67225 ;; 67226 -l*) 67227 ac_ii=`echo $ac_i|cut -c 3-` 67228- 67229- 67230+ 67231+ 67232 case $ac_ii in 67233 c|c_r|pthread*) ;; 67234- *) 67235+ *) 67236 if test "$ext_shared" = "yes"; then 67237- LDFLAGS="$LDFLAGS -l$ac_ii" 67238+ LDFLAGS="$LDFLAGS -l$ac_ii" 67239 else 67240- 67241- 67242+ 67243+ 67244 case $ac_ii in 67245 c|c_r|pthread*) ;; 67246- *) 67247- LIBS="$LIBS -l$ac_ii" 67248+ *) 67249+ LIBS="$LIBS -l$ac_ii" 67250 ;; 67251 esac 67252 67253@@ -57634,155 +44057,124 @@ 67254 ;; 67255 -L*) 67256 ac_ii=`echo $ac_i|cut -c 3-` 67257- 67258+ 67259 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 67260- 67261+ 67262 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 67263 ai_p=$ac_ii 67264 else 67265- 67266+ 67267 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 67268- 67269+ 67270 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 67271 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 67272 fi 67273 67274- 67275+ 67276 if test "$ext_shared" = "yes"; then 67277 LDFLAGS="-L$ai_p $LDFLAGS" 67278 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 67279 else 67280- 67281- 67282- 67283+ 67284+ 67285+ 67286 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 67287- 67288+ 67289 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 67290 if test -n "$unique" && test "`eval $cmd`" = "" ; then 67291 eval "LIBPATH$unique=set" 67292- 67293+ 67294 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 67295 LDFLAGS="$LDFLAGS -L$ai_p" 67296 PHP_RPATHS="$PHP_RPATHS $ai_p" 67297- 67298+ 67299 fi 67300 67301 67302 fi 67303- 67304+ 67305 fi 67306 67307 ;; 67308 esac 67309 done 67310 67311- echo "$as_me:$LINENO: checking for gdImageCreate in -lgd" >&5 67312-echo $ECHO_N "checking for gdImageCreate in -lgd... $ECHO_C" >&6 67313-if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then 67314- echo $ECHO_N "(cached) $ECHO_C" >&6 67315+ echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 67316+echo "configure:44104: checking for gdImageCreate in -lgd" >&5 67317+ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` 67318+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 67319+ echo $ac_n "(cached) $ac_c" 1>&6 67320 else 67321- ac_check_lib_save_LIBS=$LIBS 67322+ ac_save_LIBS="$LIBS" 67323 LIBS="-lgd $LIBS" 67324-cat >conftest.$ac_ext <<_ACEOF 67325-/* confdefs.h. */ 67326-_ACEOF 67327-cat confdefs.h >>conftest.$ac_ext 67328-cat >>conftest.$ac_ext <<_ACEOF 67329-/* end confdefs.h. */ 67330- 67331+cat > conftest.$ac_ext <<EOF 67332+#line 44112 "configure" 67333+#include "confdefs.h" 67334 /* Override any gcc2 internal prototype to avoid an error. */ 67335-#ifdef __cplusplus 67336-extern "C" 67337-#endif 67338 /* We use char because int might match the return type of a gcc2 67339- builtin and then its argument prototype would still apply. */ 67340-char gdImageCreate (); 67341-int 67342-main () 67343-{ 67344-gdImageCreate (); 67345- ; 67346- return 0; 67347-} 67348-_ACEOF 67349-rm -f conftest.$ac_objext conftest$ac_exeext 67350-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 67351- (eval $ac_link) 2>conftest.er1 67352- ac_status=$? 67353- grep -v '^ *+' conftest.er1 >conftest.err 67354- rm -f conftest.er1 67355- cat conftest.err >&5 67356- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67357- (exit $ac_status); } && 67358- { ac_try='test -z "$ac_c_werror_flag" 67359- || test ! -s conftest.err' 67360- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67361- (eval $ac_try) 2>&5 67362- ac_status=$? 67363- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67364- (exit $ac_status); }; } && 67365- { ac_try='test -s conftest$ac_exeext' 67366- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67367- (eval $ac_try) 2>&5 67368- ac_status=$? 67369- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67370- (exit $ac_status); }; }; then 67371- ac_cv_lib_gd_gdImageCreate=yes 67372-else 67373- echo "$as_me: failed program was:" >&5 67374-sed 's/^/| /' conftest.$ac_ext >&5 67375- 67376-ac_cv_lib_gd_gdImageCreate=no 67377-fi 67378-rm -f conftest.err conftest.$ac_objext \ 67379- conftest$ac_exeext conftest.$ac_ext 67380-LIBS=$ac_check_lib_save_LIBS 67381-fi 67382-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreate" >&5 67383-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreate" >&6 67384-if test $ac_cv_lib_gd_gdImageCreate = yes; then 67385+ builtin and then its argument prototype would still apply. */ 67386+char gdImageCreate(); 67387 67388+int main() { 67389+gdImageCreate() 67390+; return 0; } 67391+EOF 67392+if { (eval echo configure:44123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 67393+ rm -rf conftest* 67394+ eval "ac_cv_lib_$ac_lib_var=yes" 67395+else 67396+ echo "configure: failed program was:" >&5 67397+ cat conftest.$ac_ext >&5 67398+ rm -rf conftest* 67399+ eval "ac_cv_lib_$ac_lib_var=no" 67400+fi 67401+rm -f conftest* 67402+LIBS="$ac_save_LIBS" 67403+ 67404+fi 67405+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 67406+ echo "$ac_t""yes" 1>&6 67407+ 67408 LDFLAGS=$save_old_LDFLAGS 67409 ext_shared=$save_ext_shared 67410- 67411- 67412+ 67413+ 67414 else 67415+ echo "$ac_t""no" 1>&6 67416 67417 LDFLAGS=$save_old_LDFLAGS 67418 ext_shared=$save_ext_shared 67419 unset ac_cv_lib_gd_gdImageCreate 67420- 67421- { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5 67422-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;} 67423- { (exit 1); exit 1; }; } 67424- 67425- 67426+ 67427+ { echo "configure: error: GD build test failed. Please check the config.log for details." 1>&2; exit 1; } 67428+ 67429+ 67430 fi 67431 67432 fi 67433 67434- 67435- 67436+ 67437+ 67438 for header_file in $GD_HEADER_DIRS; do 67439- 67440- 67441+ 67442+ 67443 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 67444- 67445+ 67446 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 67447 if test -n "$unique" && test "`eval $cmd`" = "" ; then 67448 eval "INSTALLHEADERS$unique=set" 67449- 67450+ 67451 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 67452- 67453+ 67454 fi 67455 67456- done 67457- 67458- 67459+ done 67460+ 67461 67462+ 67463 PHP_VAR_SUBST="$PHP_VAR_SUBST GDLIB_CFLAGS" 67464 67465- 67466+ 67467 PHP_VAR_SUBST="$PHP_VAR_SUBST GD_SHARED_LIBADD" 67468 67469 fi 67470@@ -57791,19 +44183,19 @@ 67471 67472 php_with_gettext=no 67473 67474-echo "$as_me:$LINENO: checking for GNU gettext support" >&5 67475-echo $ECHO_N "checking for GNU gettext support... $ECHO_C" >&6 67476- 67477+echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 67478+echo "configure:44188: checking for GNU gettext support" >&5 67479 # Check whether --with-gettext or --without-gettext was given. 67480 if test "${with_gettext+set}" = set; then 67481 withval="$with_gettext" 67482 PHP_GETTEXT=$withval 67483 else 67484- 67485+ 67486 PHP_GETTEXT=no 67487 test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL 67488 67489-fi; 67490+fi 67491+ 67492 67493 67494 ext_output="yes, shared" 67495@@ -57827,8 +44219,7 @@ 67496 67497 67498 67499-echo "$as_me:$LINENO: result: $ext_output" >&5 67500-echo "${ECHO_T}$ext_output" >&6 67501+echo "$ac_t""$ext_output" 1>&6 67502 67503 67504 67505@@ -57839,174 +44230,111 @@ 67506 done 67507 67508 if test -z "$GETTEXT_DIR"; then 67509- { { echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5 67510-echo "$as_me: error: Cannot locate header file libintl.h" >&2;} 67511- { (exit 1); exit 1; }; } 67512+ { echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; } 67513 fi 67514 67515 GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR 67516 GETTEXT_INCDIR=$GETTEXT_DIR/include 67517- 67518+ 67519 O_LDFLAGS=$LDFLAGS 67520 LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" 67521- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 67522-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 67523-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then 67524- echo $ECHO_N "(cached) $ECHO_C" >&6 67525+ echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 67526+echo "configure:44243: checking for bindtextdomain in -lintl" >&5 67527+ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` 67528+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 67529+ echo $ac_n "(cached) $ac_c" 1>&6 67530 else 67531- ac_check_lib_save_LIBS=$LIBS 67532+ ac_save_LIBS="$LIBS" 67533 LIBS="-lintl $LIBS" 67534-cat >conftest.$ac_ext <<_ACEOF 67535-/* confdefs.h. */ 67536-_ACEOF 67537-cat confdefs.h >>conftest.$ac_ext 67538-cat >>conftest.$ac_ext <<_ACEOF 67539-/* end confdefs.h. */ 67540- 67541+cat > conftest.$ac_ext <<EOF 67542+#line 44251 "configure" 67543+#include "confdefs.h" 67544 /* Override any gcc2 internal prototype to avoid an error. */ 67545-#ifdef __cplusplus 67546-extern "C" 67547-#endif 67548 /* We use char because int might match the return type of a gcc2 67549- builtin and then its argument prototype would still apply. */ 67550-char bindtextdomain (); 67551-int 67552-main () 67553-{ 67554-bindtextdomain (); 67555- ; 67556- return 0; 67557-} 67558-_ACEOF 67559-rm -f conftest.$ac_objext conftest$ac_exeext 67560-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 67561- (eval $ac_link) 2>conftest.er1 67562- ac_status=$? 67563- grep -v '^ *+' conftest.er1 >conftest.err 67564- rm -f conftest.er1 67565- cat conftest.err >&5 67566- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67567- (exit $ac_status); } && 67568- { ac_try='test -z "$ac_c_werror_flag" 67569- || test ! -s conftest.err' 67570- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67571- (eval $ac_try) 2>&5 67572- ac_status=$? 67573- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67574- (exit $ac_status); }; } && 67575- { ac_try='test -s conftest$ac_exeext' 67576- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67577- (eval $ac_try) 2>&5 67578- ac_status=$? 67579- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67580- (exit $ac_status); }; }; then 67581- ac_cv_lib_intl_bindtextdomain=yes 67582-else 67583- echo "$as_me: failed program was:" >&5 67584-sed 's/^/| /' conftest.$ac_ext >&5 67585- 67586-ac_cv_lib_intl_bindtextdomain=no 67587-fi 67588-rm -f conftest.err conftest.$ac_objext \ 67589- conftest$ac_exeext conftest.$ac_ext 67590-LIBS=$ac_check_lib_save_LIBS 67591-fi 67592-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 67593-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 67594-if test $ac_cv_lib_intl_bindtextdomain = yes; then 67595+ builtin and then its argument prototype would still apply. */ 67596+char bindtextdomain(); 67597+ 67598+int main() { 67599+bindtextdomain() 67600+; return 0; } 67601+EOF 67602+if { (eval echo configure:44262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 67603+ rm -rf conftest* 67604+ eval "ac_cv_lib_$ac_lib_var=yes" 67605+else 67606+ echo "configure: failed program was:" >&5 67607+ cat conftest.$ac_ext >&5 67608+ rm -rf conftest* 67609+ eval "ac_cv_lib_$ac_lib_var=no" 67610+fi 67611+rm -f conftest* 67612+LIBS="$ac_save_LIBS" 67613 67614+fi 67615+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 67616+ echo "$ac_t""yes" 1>&6 67617+ 67618 GETTEXT_LIBS=intl 67619 GETTEXT_CHECK_IN_LIB=intl 67620- 67621+ 67622 else 67623- echo "$as_me:$LINENO: checking for bindtextdomain in -lc" >&5 67624-echo $ECHO_N "checking for bindtextdomain in -lc... $ECHO_C" >&6 67625-if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then 67626- echo $ECHO_N "(cached) $ECHO_C" >&6 67627+ echo "$ac_t""no" 1>&6 67628+echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 67629+echo "configure:44284: checking for bindtextdomain in -lc" >&5 67630+ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'` 67631+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 67632+ echo $ac_n "(cached) $ac_c" 1>&6 67633 else 67634- ac_check_lib_save_LIBS=$LIBS 67635+ ac_save_LIBS="$LIBS" 67636 LIBS="-lc $LIBS" 67637-cat >conftest.$ac_ext <<_ACEOF 67638-/* confdefs.h. */ 67639-_ACEOF 67640-cat confdefs.h >>conftest.$ac_ext 67641-cat >>conftest.$ac_ext <<_ACEOF 67642-/* end confdefs.h. */ 67643- 67644+cat > conftest.$ac_ext <<EOF 67645+#line 44292 "configure" 67646+#include "confdefs.h" 67647 /* Override any gcc2 internal prototype to avoid an error. */ 67648-#ifdef __cplusplus 67649-extern "C" 67650-#endif 67651 /* We use char because int might match the return type of a gcc2 67652- builtin and then its argument prototype would still apply. */ 67653-char bindtextdomain (); 67654-int 67655-main () 67656-{ 67657-bindtextdomain (); 67658- ; 67659- return 0; 67660-} 67661-_ACEOF 67662-rm -f conftest.$ac_objext conftest$ac_exeext 67663-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 67664- (eval $ac_link) 2>conftest.er1 67665- ac_status=$? 67666- grep -v '^ *+' conftest.er1 >conftest.err 67667- rm -f conftest.er1 67668- cat conftest.err >&5 67669- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67670- (exit $ac_status); } && 67671- { ac_try='test -z "$ac_c_werror_flag" 67672- || test ! -s conftest.err' 67673- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67674- (eval $ac_try) 2>&5 67675- ac_status=$? 67676- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67677- (exit $ac_status); }; } && 67678- { ac_try='test -s conftest$ac_exeext' 67679- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 67680- (eval $ac_try) 2>&5 67681- ac_status=$? 67682- echo "$as_me:$LINENO: \$? = $ac_status" >&5 67683- (exit $ac_status); }; }; then 67684- ac_cv_lib_c_bindtextdomain=yes 67685-else 67686- echo "$as_me: failed program was:" >&5 67687-sed 's/^/| /' conftest.$ac_ext >&5 67688- 67689-ac_cv_lib_c_bindtextdomain=no 67690-fi 67691-rm -f conftest.err conftest.$ac_objext \ 67692- conftest$ac_exeext conftest.$ac_ext 67693-LIBS=$ac_check_lib_save_LIBS 67694-fi 67695-echo "$as_me:$LINENO: result: $ac_cv_lib_c_bindtextdomain" >&5 67696-echo "${ECHO_T}$ac_cv_lib_c_bindtextdomain" >&6 67697-if test $ac_cv_lib_c_bindtextdomain = yes; then 67698+ builtin and then its argument prototype would still apply. */ 67699+char bindtextdomain(); 67700+ 67701+int main() { 67702+bindtextdomain() 67703+; return 0; } 67704+EOF 67705+if { (eval echo configure:44303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 67706+ rm -rf conftest* 67707+ eval "ac_cv_lib_$ac_lib_var=yes" 67708+else 67709+ echo "configure: failed program was:" >&5 67710+ cat conftest.$ac_ext >&5 67711+ rm -rf conftest* 67712+ eval "ac_cv_lib_$ac_lib_var=no" 67713+fi 67714+rm -f conftest* 67715+LIBS="$ac_save_LIBS" 67716 67717+fi 67718+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 67719+ echo "$ac_t""yes" 1>&6 67720+ 67721 GETTEXT_LIBS= 67722 GETTEXT_CHECK_IN_LIB=c 67723- 67724+ 67725 else 67726+ echo "$ac_t""no" 1>&6 67727 67728- { { echo "$as_me:$LINENO: error: Unable to find required gettext library" >&5 67729-echo "$as_me: error: Unable to find required gettext library" >&2;} 67730- { (exit 1); exit 1; }; } 67731- 67732+ { echo "configure: error: Unable to find required gettext library" 1>&2; exit 1; } 67733+ 67734 fi 67735 67736- 67737+ 67738 fi 67739 67740 LDFLAGS=$O_LDFLAGS 67741 67742- 67743-cat >>confdefs.h <<\_ACEOF 67744+ cat >> confdefs.h <<\EOF 67745 #define HAVE_LIBINTL 1 67746-_ACEOF 67747- 67748+EOF 67749 67750+ 67751 ext_builddir=ext/gettext 67752 ext_srcdir=$abs_srcdir/ext/gettext 67753 67754@@ -58014,15 +44342,15 @@ 67755 67756 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 67757 PHP_GETTEXT_SHARED=no 67758- 67759- 67760+ 67761+ 67762 case ext/gettext in 67763 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 67764 /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 67765 *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 67766 esac 67767- 67768- 67769+ 67770+ 67771 67772 b_c_pre=$php_c_pre 67773 b_cxx_pre=$php_cxx_pre 67774@@ -58035,12 +44363,12 @@ 67775 67776 old_IFS=$IFS 67777 for ac_src in gettext.c; do 67778- 67779+ 67780 IFS=. 67781 set $ac_src 67782 ac_obj=$1 67783 IFS=$old_IFS 67784- 67785+ 67786 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 67787 67788 case $ac_src in 67789@@ -58064,14 +44392,14 @@ 67790 else 67791 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 67792 PHP_GETTEXT_SHARED=yes 67793- 67794+ 67795 case ext/gettext in 67796 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 67797 /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 67798 *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 67799 esac 67800- 67801- 67802+ 67803+ 67804 67805 b_c_pre=$shared_c_pre 67806 b_cxx_pre=$shared_cxx_pre 67807@@ -58084,12 +44412,12 @@ 67808 67809 old_IFS=$IFS 67810 for ac_src in gettext.c; do 67811- 67812+ 67813 IFS=. 67814 set $ac_src 67815 ac_obj=$1 67816 IFS=$old_IFS 67817- 67818+ 67819 shared_objects_gettext="$shared_objects_gettext $ac_bdir$ac_obj.lo" 67820 67821 case $ac_src in 67822@@ -58107,7 +44435,7 @@ 67823 67824 case $host_alias in 67825 *netware*) 67826- 67827+ 67828 install_modules="install-modules" 67829 67830 case $host_alias in 67831@@ -58117,7 +44445,7 @@ 67832 ;; 67833 *netware*) 67834 suffix=nlm 67835- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(GETTEXT_SHARED_LIBADD)' 67836+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGETTEXT, 3)_SHARED_LIBADD)' 67837 ;; 67838 *) 67839 suffix=la 67840@@ -58130,7 +44458,7 @@ 67841 else 67842 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgettext.$suffix" 67843 fi 67844- 67845+ 67846 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gettext" 67847 67848 cat >>Makefile.objects<<EOF 67849@@ -58144,7 +44472,7 @@ 67850 67851 ;; 67852 *) 67853- 67854+ 67855 install_modules="install-modules" 67856 67857 case $host_alias in 67858@@ -58154,7 +44482,7 @@ 67859 ;; 67860 *netware*) 67861 suffix=nlm 67862- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(TEXT_SHARED_LIBADD)' 67863+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gettext) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GETTEXT, 3)_SHARED_LIBADD)' 67864 ;; 67865 *) 67866 suffix=la 67867@@ -58167,7 +44495,7 @@ 67868 else 67869 PHP_MODULES="$PHP_MODULES \$(phplibdir)/gettext.$suffix" 67870 fi 67871- 67872+ 67873 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gettext" 67874 67875 cat >>Makefile.objects<<EOF 67876@@ -58181,10 +44509,9 @@ 67877 67878 ;; 67879 esac 67880- 67881-cat >>confdefs.h <<_ACEOF 67882+ cat >> confdefs.h <<EOF 67883 #define COMPILE_DL_GETTEXT 1 67884-_ACEOF 67885+EOF 67886 67887 fi 67888 fi 67889@@ -58193,15 +44520,15 @@ 67890 PHP_GETTEXT_SHARED=no 67891 case "$PHP_SAPI" in 67892 cgi|embed) 67893- 67894- 67895+ 67896+ 67897 case ext/gettext in 67898 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 67899 /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 67900 *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 67901 esac 67902- 67903- 67904+ 67905+ 67906 67907 b_c_pre=$php_c_pre 67908 b_cxx_pre=$php_cxx_pre 67909@@ -58214,12 +44541,12 @@ 67910 67911 old_IFS=$IFS 67912 for ac_src in gettext.c; do 67913- 67914+ 67915 IFS=. 67916 set $ac_src 67917 ac_obj=$1 67918 IFS=$old_IFS 67919- 67920+ 67921 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 67922 67923 case $ac_src in 67924@@ -58239,15 +44566,15 @@ 67925 EXT_STATIC="$EXT_STATIC gettext" 67926 ;; 67927 *) 67928- 67929- 67930+ 67931+ 67932 case ext/gettext in 67933 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 67934 /*) ac_srcdir=`echo "ext/gettext"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 67935 *) ac_srcdir="$abs_srcdir/ext/gettext/"; ac_bdir="ext/gettext/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 67936 esac 67937- 67938- 67939+ 67940+ 67941 67942 b_c_pre=$php_c_pre 67943 b_cxx_pre=$php_cxx_pre 67944@@ -58260,13 +44587,13 @@ 67945 67946 old_IFS=$IFS 67947 for ac_src in gettext.c; do 67948- 67949+ 67950 IFS=. 67951 set $ac_src 67952 ac_obj=$1 67953 IFS=$old_IFS 67954- 67955- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 67956+ 67957+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 67958 67959 case $ac_src in 67960 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 67961@@ -58286,112 +44613,112 @@ 67962 esac 67963 EXT_CLI_STATIC="$EXT_CLI_STATIC gettext" 67964 fi 67965- 67966- 67967+ 67968+ 67969 BUILD_DIR="$BUILD_DIR $ext_builddir" 67970- 67971+ 67972 67973 67974 if test "$ext_builddir" = "."; then 67975 PHP_PECL_EXTENSION=gettext 67976- 67977+ 67978 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 67979 67980 fi 67981 67982- 67983+ 67984 PHP_VAR_SUBST="$PHP_VAR_SUBST GETTEXT_SHARED_LIBADD" 67985 67986 67987 if test -n "$GETTEXT_LIBS"; then 67988- 67989+ 67990 67991 if test "$ext_shared" = "yes"; then 67992 GETTEXT_SHARED_LIBADD="-l$GETTEXT_LIBS $GETTEXT_SHARED_LIBADD" 67993 if test -n "$GETTEXT_LIBDIR"; then 67994- 67995+ 67996 if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then 67997- 67998+ 67999 if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then 68000 ai_p=$GETTEXT_LIBDIR 68001 else 68002- 68003+ 68004 ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 68005- 68006+ 68007 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 68008 ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`" 68009 fi 68010 68011- 68012+ 68013 if test "$ext_shared" = "yes"; then 68014 GETTEXT_SHARED_LIBADD="-L$ai_p $GETTEXT_SHARED_LIBADD" 68015 test -n "$ld_runpath_switch" && GETTEXT_SHARED_LIBADD="$ld_runpath_switch$ai_p $GETTEXT_SHARED_LIBADD" 68016 else 68017- 68018- 68019- 68020+ 68021+ 68022+ 68023 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 68024- 68025+ 68026 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 68027 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68028 eval "LIBPATH$unique=set" 68029- 68030+ 68031 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 68032 LDFLAGS="$LDFLAGS -L$ai_p" 68033 PHP_RPATHS="$PHP_RPATHS $ai_p" 68034- 68035+ 68036 fi 68037 68038 68039 fi 68040- 68041+ 68042 fi 68043 68044 fi 68045 else 68046- 68047+ 68048 68049 if test -n "$GETTEXT_LIBDIR"; then 68050- 68051+ 68052 if test "$GETTEXT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GETTEXT_LIBDIR" != "/usr/lib"; then 68053- 68054+ 68055 if test -z "$GETTEXT_LIBDIR" || echo "$GETTEXT_LIBDIR" | grep '^/' >/dev/null ; then 68056 ai_p=$GETTEXT_LIBDIR 68057 else 68058- 68059+ 68060 ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 68061- 68062+ 68063 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 68064 ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`" 68065 fi 68066 68067- 68068- 68069- 68070- 68071+ 68072+ 68073+ 68074+ 68075 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 68076- 68077+ 68078 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 68079 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68080 eval "LIBPATH$unique=set" 68081- 68082+ 68083 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 68084 LDFLAGS="$LDFLAGS -L$ai_p" 68085 PHP_RPATHS="$PHP_RPATHS $ai_p" 68086- 68087+ 68088 fi 68089 68090 68091- 68092+ 68093 fi 68094 68095 fi 68096- 68097- 68098+ 68099+ 68100 case $GETTEXT_LIBS in 68101 c|c_r|pthread*) ;; 68102- *) 68103- LIBS="-l$GETTEXT_LIBS $LIBS" 68104+ *) 68105+ LIBS="-l$GETTEXT_LIBS $LIBS" 68106 ;; 68107 esac 68108 68109@@ -58403,350 +44730,230 @@ 68110 68111 fi 68112 68113- 68114+ 68115 if test "$GETTEXT_INCDIR" != "/usr/include"; then 68116- 68117+ 68118 if test -z "$GETTEXT_INCDIR" || echo "$GETTEXT_INCDIR" | grep '^/' >/dev/null ; then 68119 ai_p=$GETTEXT_INCDIR 68120 else 68121- 68122+ 68123 ep_dir="`echo $GETTEXT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 68124- 68125+ 68126 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 68127 ai_p="$ep_realdir/`basename \"$GETTEXT_INCDIR\"`" 68128 fi 68129 68130- 68131- 68132+ 68133+ 68134 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 68135- 68136+ 68137 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 68138 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68139 eval "INCLUDEPATH$unique=set" 68140- 68141+ 68142 if test ""; then 68143 INCLUDES="-I$ai_p $INCLUDES" 68144 else 68145 INCLUDES="$INCLUDES -I$ai_p" 68146 fi 68147- 68148+ 68149 fi 68150 68151 fi 68152 68153 68154- as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh` 68155-echo "$as_me:$LINENO: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68156-echo $ECHO_N "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6 68157-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 68158- echo $ECHO_N "(cached) $ECHO_C" >&6 68159+ echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 68160+echo "configure:44767: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68161+ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` 68162+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68163+ echo $ac_n "(cached) $ac_c" 1>&6 68164 else 68165- ac_check_lib_save_LIBS=$LIBS 68166+ ac_save_LIBS="$LIBS" 68167 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" 68168-cat >conftest.$ac_ext <<_ACEOF 68169-/* confdefs.h. */ 68170-_ACEOF 68171-cat confdefs.h >>conftest.$ac_ext 68172-cat >>conftest.$ac_ext <<_ACEOF 68173-/* end confdefs.h. */ 68174- 68175+cat > conftest.$ac_ext <<EOF 68176+#line 44775 "configure" 68177+#include "confdefs.h" 68178 /* Override any gcc2 internal prototype to avoid an error. */ 68179-#ifdef __cplusplus 68180-extern "C" 68181-#endif 68182 /* We use char because int might match the return type of a gcc2 68183- builtin and then its argument prototype would still apply. */ 68184-char ngettext (); 68185-int 68186-main () 68187-{ 68188-ngettext (); 68189- ; 68190- return 0; 68191-} 68192-_ACEOF 68193-rm -f conftest.$ac_objext conftest$ac_exeext 68194-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 68195- (eval $ac_link) 2>conftest.er1 68196- ac_status=$? 68197- grep -v '^ *+' conftest.er1 >conftest.err 68198- rm -f conftest.er1 68199- cat conftest.err >&5 68200- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68201- (exit $ac_status); } && 68202- { ac_try='test -z "$ac_c_werror_flag" 68203- || test ! -s conftest.err' 68204- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68205- (eval $ac_try) 2>&5 68206- ac_status=$? 68207- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68208- (exit $ac_status); }; } && 68209- { ac_try='test -s conftest$ac_exeext' 68210- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68211- (eval $ac_try) 2>&5 68212- ac_status=$? 68213- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68214- (exit $ac_status); }; }; then 68215- eval "$as_ac_Lib=yes" 68216-else 68217- echo "$as_me: failed program was:" >&5 68218-sed 's/^/| /' conftest.$ac_ext >&5 68219- 68220-eval "$as_ac_Lib=no" 68221-fi 68222-rm -f conftest.err conftest.$ac_objext \ 68223- conftest$ac_exeext conftest.$ac_ext 68224-LIBS=$ac_check_lib_save_LIBS 68225-fi 68226-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 68227-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 68228-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 68229+ builtin and then its argument prototype would still apply. */ 68230+char ngettext(); 68231+ 68232+int main() { 68233+ngettext() 68234+; return 0; } 68235+EOF 68236+if { (eval echo configure:44786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 68237+ rm -rf conftest* 68238+ eval "ac_cv_lib_$ac_lib_var=yes" 68239+else 68240+ echo "configure: failed program was:" >&5 68241+ cat conftest.$ac_ext >&5 68242+ rm -rf conftest* 68243+ eval "ac_cv_lib_$ac_lib_var=no" 68244+fi 68245+rm -f conftest* 68246+LIBS="$ac_save_LIBS" 68247 68248-cat >>confdefs.h <<\_ACEOF 68249+fi 68250+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 68251+ echo "$ac_t""yes" 1>&6 68252+ cat >> confdefs.h <<\EOF 68253 #define HAVE_NGETTEXT 1 68254-_ACEOF 68255+EOF 68256 68257+else 68258+ echo "$ac_t""no" 1>&6 68259 fi 68260 68261- as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh` 68262-echo "$as_me:$LINENO: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68263-echo $ECHO_N "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6 68264-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 68265- echo $ECHO_N "(cached) $ECHO_C" >&6 68266+ echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 68267+echo "configure:44810: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68268+ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` 68269+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68270+ echo $ac_n "(cached) $ac_c" 1>&6 68271 else 68272- ac_check_lib_save_LIBS=$LIBS 68273+ ac_save_LIBS="$LIBS" 68274 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" 68275-cat >conftest.$ac_ext <<_ACEOF 68276-/* confdefs.h. */ 68277-_ACEOF 68278-cat confdefs.h >>conftest.$ac_ext 68279-cat >>conftest.$ac_ext <<_ACEOF 68280-/* end confdefs.h. */ 68281- 68282+cat > conftest.$ac_ext <<EOF 68283+#line 44818 "configure" 68284+#include "confdefs.h" 68285 /* Override any gcc2 internal prototype to avoid an error. */ 68286-#ifdef __cplusplus 68287-extern "C" 68288-#endif 68289 /* We use char because int might match the return type of a gcc2 68290- builtin and then its argument prototype would still apply. */ 68291-char dngettext (); 68292-int 68293-main () 68294-{ 68295-dngettext (); 68296- ; 68297- return 0; 68298-} 68299-_ACEOF 68300-rm -f conftest.$ac_objext conftest$ac_exeext 68301-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 68302- (eval $ac_link) 2>conftest.er1 68303- ac_status=$? 68304- grep -v '^ *+' conftest.er1 >conftest.err 68305- rm -f conftest.er1 68306- cat conftest.err >&5 68307- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68308- (exit $ac_status); } && 68309- { ac_try='test -z "$ac_c_werror_flag" 68310- || test ! -s conftest.err' 68311- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68312- (eval $ac_try) 2>&5 68313- ac_status=$? 68314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68315- (exit $ac_status); }; } && 68316- { ac_try='test -s conftest$ac_exeext' 68317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68318- (eval $ac_try) 2>&5 68319- ac_status=$? 68320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68321- (exit $ac_status); }; }; then 68322- eval "$as_ac_Lib=yes" 68323-else 68324- echo "$as_me: failed program was:" >&5 68325-sed 's/^/| /' conftest.$ac_ext >&5 68326- 68327-eval "$as_ac_Lib=no" 68328-fi 68329-rm -f conftest.err conftest.$ac_objext \ 68330- conftest$ac_exeext conftest.$ac_ext 68331-LIBS=$ac_check_lib_save_LIBS 68332-fi 68333-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 68334-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 68335-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 68336+ builtin and then its argument prototype would still apply. */ 68337+char dngettext(); 68338+ 68339+int main() { 68340+dngettext() 68341+; return 0; } 68342+EOF 68343+if { (eval echo configure:44829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 68344+ rm -rf conftest* 68345+ eval "ac_cv_lib_$ac_lib_var=yes" 68346+else 68347+ echo "configure: failed program was:" >&5 68348+ cat conftest.$ac_ext >&5 68349+ rm -rf conftest* 68350+ eval "ac_cv_lib_$ac_lib_var=no" 68351+fi 68352+rm -f conftest* 68353+LIBS="$ac_save_LIBS" 68354 68355-cat >>confdefs.h <<\_ACEOF 68356+fi 68357+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 68358+ echo "$ac_t""yes" 1>&6 68359+ cat >> confdefs.h <<\EOF 68360 #define HAVE_DNGETTEXT 1 68361-_ACEOF 68362+EOF 68363 68364+else 68365+ echo "$ac_t""no" 1>&6 68366 fi 68367 68368- as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh` 68369-echo "$as_me:$LINENO: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68370-echo $ECHO_N "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6 68371-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 68372- echo $ECHO_N "(cached) $ECHO_C" >&6 68373+ echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 68374+echo "configure:44853: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 68375+ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` 68376+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68377+ echo $ac_n "(cached) $ac_c" 1>&6 68378 else 68379- ac_check_lib_save_LIBS=$LIBS 68380+ ac_save_LIBS="$LIBS" 68381 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" 68382-cat >conftest.$ac_ext <<_ACEOF 68383-/* confdefs.h. */ 68384-_ACEOF 68385-cat confdefs.h >>conftest.$ac_ext 68386-cat >>conftest.$ac_ext <<_ACEOF 68387-/* end confdefs.h. */ 68388- 68389+cat > conftest.$ac_ext <<EOF 68390+#line 44861 "configure" 68391+#include "confdefs.h" 68392 /* Override any gcc2 internal prototype to avoid an error. */ 68393-#ifdef __cplusplus 68394-extern "C" 68395-#endif 68396 /* We use char because int might match the return type of a gcc2 68397- builtin and then its argument prototype would still apply. */ 68398-char dcngettext (); 68399-int 68400-main () 68401-{ 68402-dcngettext (); 68403- ; 68404- return 0; 68405-} 68406-_ACEOF 68407-rm -f conftest.$ac_objext conftest$ac_exeext 68408-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 68409- (eval $ac_link) 2>conftest.er1 68410- ac_status=$? 68411- grep -v '^ *+' conftest.er1 >conftest.err 68412- rm -f conftest.er1 68413- cat conftest.err >&5 68414- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68415- (exit $ac_status); } && 68416- { ac_try='test -z "$ac_c_werror_flag" 68417- || test ! -s conftest.err' 68418- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68419- (eval $ac_try) 2>&5 68420- ac_status=$? 68421- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68422- (exit $ac_status); }; } && 68423- { ac_try='test -s conftest$ac_exeext' 68424- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68425- (eval $ac_try) 2>&5 68426- ac_status=$? 68427- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68428- (exit $ac_status); }; }; then 68429- eval "$as_ac_Lib=yes" 68430-else 68431- echo "$as_me: failed program was:" >&5 68432-sed 's/^/| /' conftest.$ac_ext >&5 68433- 68434-eval "$as_ac_Lib=no" 68435-fi 68436-rm -f conftest.err conftest.$ac_objext \ 68437- conftest$ac_exeext conftest.$ac_ext 68438-LIBS=$ac_check_lib_save_LIBS 68439-fi 68440-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 68441-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 68442-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 68443+ builtin and then its argument prototype would still apply. */ 68444+char dcngettext(); 68445+ 68446+int main() { 68447+dcngettext() 68448+; return 0; } 68449+EOF 68450+if { (eval echo configure:44872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 68451+ rm -rf conftest* 68452+ eval "ac_cv_lib_$ac_lib_var=yes" 68453+else 68454+ echo "configure: failed program was:" >&5 68455+ cat conftest.$ac_ext >&5 68456+ rm -rf conftest* 68457+ eval "ac_cv_lib_$ac_lib_var=no" 68458+fi 68459+rm -f conftest* 68460+LIBS="$ac_save_LIBS" 68461 68462-cat >>confdefs.h <<\_ACEOF 68463+fi 68464+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 68465+ echo "$ac_t""yes" 1>&6 68466+ cat >> confdefs.h <<\EOF 68467 #define HAVE_DCNGETTEXT 1 68468-_ACEOF 68469+EOF 68470 68471+else 68472+ echo "$ac_t""no" 1>&6 68473 fi 68474 68475- as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh` 68476-echo "$as_me:$LINENO: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 68477-echo $ECHO_N "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6 68478-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 68479- echo $ECHO_N "(cached) $ECHO_C" >&6 68480+ echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 68481+echo "configure:44896: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 68482+ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` 68483+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68484+ echo $ac_n "(cached) $ac_c" 1>&6 68485 else 68486- ac_check_lib_save_LIBS=$LIBS 68487+ ac_save_LIBS="$LIBS" 68488 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" 68489-cat >conftest.$ac_ext <<_ACEOF 68490-/* confdefs.h. */ 68491-_ACEOF 68492-cat confdefs.h >>conftest.$ac_ext 68493-cat >>conftest.$ac_ext <<_ACEOF 68494-/* end confdefs.h. */ 68495- 68496+cat > conftest.$ac_ext <<EOF 68497+#line 44904 "configure" 68498+#include "confdefs.h" 68499 /* Override any gcc2 internal prototype to avoid an error. */ 68500-#ifdef __cplusplus 68501-extern "C" 68502-#endif 68503 /* We use char because int might match the return type of a gcc2 68504- builtin and then its argument prototype would still apply. */ 68505-char bind_textdomain_codeset (); 68506-int 68507-main () 68508-{ 68509-bind_textdomain_codeset (); 68510- ; 68511- return 0; 68512-} 68513-_ACEOF 68514-rm -f conftest.$ac_objext conftest$ac_exeext 68515-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 68516- (eval $ac_link) 2>conftest.er1 68517- ac_status=$? 68518- grep -v '^ *+' conftest.er1 >conftest.err 68519- rm -f conftest.er1 68520- cat conftest.err >&5 68521- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68522- (exit $ac_status); } && 68523- { ac_try='test -z "$ac_c_werror_flag" 68524- || test ! -s conftest.err' 68525- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68526- (eval $ac_try) 2>&5 68527- ac_status=$? 68528- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68529- (exit $ac_status); }; } && 68530- { ac_try='test -s conftest$ac_exeext' 68531- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68532- (eval $ac_try) 2>&5 68533- ac_status=$? 68534- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68535- (exit $ac_status); }; }; then 68536- eval "$as_ac_Lib=yes" 68537-else 68538- echo "$as_me: failed program was:" >&5 68539-sed 's/^/| /' conftest.$ac_ext >&5 68540- 68541-eval "$as_ac_Lib=no" 68542-fi 68543-rm -f conftest.err conftest.$ac_objext \ 68544- conftest$ac_exeext conftest.$ac_ext 68545-LIBS=$ac_check_lib_save_LIBS 68546-fi 68547-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 68548-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 68549-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 68550+ builtin and then its argument prototype would still apply. */ 68551+char bind_textdomain_codeset(); 68552 68553-cat >>confdefs.h <<\_ACEOF 68554-#define HAVE_BIND_TEXTDOMAIN_CODESET 1 68555-_ACEOF 68556+int main() { 68557+bind_textdomain_codeset() 68558+; return 0; } 68559+EOF 68560+if { (eval echo configure:44915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 68561+ rm -rf conftest* 68562+ eval "ac_cv_lib_$ac_lib_var=yes" 68563+else 68564+ echo "configure: failed program was:" >&5 68565+ cat conftest.$ac_ext >&5 68566+ rm -rf conftest* 68567+ eval "ac_cv_lib_$ac_lib_var=no" 68568+fi 68569+rm -f conftest* 68570+LIBS="$ac_save_LIBS" 68571 68572 fi 68573+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 68574+ echo "$ac_t""yes" 1>&6 68575+ cat >> confdefs.h <<\EOF 68576+#define HAVE_BIND_TEXTDOMAIN_CODESET 1 68577+EOF 68578 68579+else 68580+ echo "$ac_t""no" 1>&6 68581+fi 68582 68583+ 68584 fi 68585 68586 68587 68588 php_with_gmp=no 68589 68590-echo "$as_me:$LINENO: checking for GNU MP support" >&5 68591-echo $ECHO_N "checking for GNU MP support... $ECHO_C" >&6 68592- 68593+echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 68594+echo "configure:44946: checking for GNU MP support" >&5 68595 # Check whether --with-gmp or --without-gmp was given. 68596 if test "${with_gmp+set}" = set; then 68597 withval="$with_gmp" 68598 PHP_GMP=$withval 68599 else 68600- 68601+ 68602 PHP_GMP=no 68603 test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL 68604 68605-fi; 68606+fi 68607+ 68608 68609 68610 ext_output="yes, shared" 68611@@ -58770,8 +44977,7 @@ 68612 68613 68614 68615-echo "$as_me:$LINENO: result: $ext_output" >&5 68616-echo "${ECHO_T}$ext_output" >&6 68617+echo "$ac_t""$ext_output" 1>&6 68618 68619 68620 68621@@ -58783,30 +44989,28 @@ 68622 done 68623 68624 if test -z "$GMP_DIR"; then 68625- { { echo "$as_me:$LINENO: error: Unable to locate gmp.h" >&5 68626-echo "$as_me: error: Unable to locate gmp.h" >&2;} 68627- { (exit 1); exit 1; }; } 68628+ { echo "configure: error: Unable to locate gmp.h" 1>&2; exit 1; } 68629 fi 68630- 68631- 68632+ 68633+ 68634 save_old_LDFLAGS=$LDFLAGS 68635 ac_stuff=" 68636 -L$GMP_DIR/$PHP_LIBDIR 68637 " 68638- 68639+ 68640 save_ext_shared=$ext_shared 68641 ext_shared=yes 68642- 68643+ 68644 for ac_i in $ac_stuff; do 68645 case $ac_i in 68646 -pthread) 68647 if test "$ext_shared" = "yes"; then 68648 LDFLAGS="$LDFLAGS -pthread" 68649 else 68650- 68651- 68652+ 68653+ 68654 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 68655- 68656+ 68657 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 68658 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68659 eval "EXTRA_LDFLAGS$unique=set" 68660@@ -58817,20 +45021,20 @@ 68661 ;; 68662 -l*) 68663 ac_ii=`echo $ac_i|cut -c 3-` 68664- 68665- 68666+ 68667+ 68668 case $ac_ii in 68669 c|c_r|pthread*) ;; 68670- *) 68671+ *) 68672 if test "$ext_shared" = "yes"; then 68673- LDFLAGS="$LDFLAGS -l$ac_ii" 68674+ LDFLAGS="$LDFLAGS -l$ac_ii" 68675 else 68676- 68677- 68678+ 68679+ 68680 case $ac_ii in 68681 c|c_r|pthread*) ;; 68682- *) 68683- LIBS="$LIBS -l$ac_ii" 68684+ *) 68685+ LIBS="$LIBS -l$ac_ii" 68686 ;; 68687 esac 68688 68689@@ -58843,143 +45047,114 @@ 68690 ;; 68691 -L*) 68692 ac_ii=`echo $ac_i|cut -c 3-` 68693- 68694+ 68695 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 68696- 68697+ 68698 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 68699 ai_p=$ac_ii 68700 else 68701- 68702+ 68703 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 68704- 68705+ 68706 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 68707 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 68708 fi 68709 68710- 68711+ 68712 if test "$ext_shared" = "yes"; then 68713 LDFLAGS="-L$ai_p $LDFLAGS" 68714 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 68715 else 68716- 68717- 68718- 68719+ 68720+ 68721+ 68722 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 68723- 68724+ 68725 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 68726 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68727 eval "LIBPATH$unique=set" 68728- 68729+ 68730 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 68731 LDFLAGS="$LDFLAGS -L$ai_p" 68732 PHP_RPATHS="$PHP_RPATHS $ai_p" 68733- 68734+ 68735 fi 68736 68737 68738 fi 68739- 68740+ 68741 fi 68742 68743 ;; 68744 esac 68745 done 68746 68747- echo "$as_me:$LINENO: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 68748-echo $ECHO_N "checking for __gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6 68749-if test "${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+set}" = set; then 68750- echo $ECHO_N "(cached) $ECHO_C" >&6 68751+ echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 68752+echo "configure:45094: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 68753+ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` 68754+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68755+ echo $ac_n "(cached) $ac_c" 1>&6 68756 else 68757- ac_check_lib_save_LIBS=$LIBS 68758+ ac_save_LIBS="$LIBS" 68759 LIBS="-lgmp $LIBS" 68760-cat >conftest.$ac_ext <<_ACEOF 68761-/* confdefs.h. */ 68762-_ACEOF 68763-cat confdefs.h >>conftest.$ac_ext 68764-cat >>conftest.$ac_ext <<_ACEOF 68765-/* end confdefs.h. */ 68766- 68767+cat > conftest.$ac_ext <<EOF 68768+#line 45102 "configure" 68769+#include "confdefs.h" 68770 /* Override any gcc2 internal prototype to avoid an error. */ 68771-#ifdef __cplusplus 68772-extern "C" 68773-#endif 68774 /* We use char because int might match the return type of a gcc2 68775- builtin and then its argument prototype would still apply. */ 68776-char __gmp_randinit_lc_2exp_size (); 68777-int 68778-main () 68779-{ 68780-__gmp_randinit_lc_2exp_size (); 68781- ; 68782- return 0; 68783-} 68784-_ACEOF 68785-rm -f conftest.$ac_objext conftest$ac_exeext 68786-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 68787- (eval $ac_link) 2>conftest.er1 68788- ac_status=$? 68789- grep -v '^ *+' conftest.er1 >conftest.err 68790- rm -f conftest.er1 68791- cat conftest.err >&5 68792- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68793- (exit $ac_status); } && 68794- { ac_try='test -z "$ac_c_werror_flag" 68795- || test ! -s conftest.err' 68796- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68797- (eval $ac_try) 2>&5 68798- ac_status=$? 68799- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68800- (exit $ac_status); }; } && 68801- { ac_try='test -s conftest$ac_exeext' 68802- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 68803- (eval $ac_try) 2>&5 68804- ac_status=$? 68805- echo "$as_me:$LINENO: \$? = $ac_status" >&5 68806- (exit $ac_status); }; }; then 68807- ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=yes 68808-else 68809- echo "$as_me: failed program was:" >&5 68810-sed 's/^/| /' conftest.$ac_ext >&5 68811- 68812-ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=no 68813-fi 68814-rm -f conftest.err conftest.$ac_objext \ 68815- conftest$ac_exeext conftest.$ac_ext 68816-LIBS=$ac_check_lib_save_LIBS 68817-fi 68818-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&5 68819-echo "${ECHO_T}$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&6 68820-if test $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size = yes; then 68821+ builtin and then its argument prototype would still apply. */ 68822+char __gmp_randinit_lc_2exp_size(); 68823+ 68824+int main() { 68825+__gmp_randinit_lc_2exp_size() 68826+; return 0; } 68827+EOF 68828+if { (eval echo configure:45113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 68829+ rm -rf conftest* 68830+ eval "ac_cv_lib_$ac_lib_var=yes" 68831+else 68832+ echo "configure: failed program was:" >&5 68833+ cat conftest.$ac_ext >&5 68834+ rm -rf conftest* 68835+ eval "ac_cv_lib_$ac_lib_var=no" 68836+fi 68837+rm -f conftest* 68838+LIBS="$ac_save_LIBS" 68839 68840+fi 68841+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 68842+ echo "$ac_t""yes" 1>&6 68843+ 68844 LDFLAGS=$save_old_LDFLAGS 68845 ext_shared=$save_ext_shared 68846- 68847- 68848+ 68849+ 68850 else 68851+ echo "$ac_t""no" 1>&6 68852 68853 LDFLAGS=$save_old_LDFLAGS 68854 ext_shared=$save_ext_shared 68855 unset ac_cv_lib_gmp___gmp_randinit_lc_2exp_size 68856- 68857- 68858+ 68859+ 68860 save_old_LDFLAGS=$LDFLAGS 68861 ac_stuff=" 68862 -L$GMP_DIR/$PHP_LIBDIR 68863 " 68864- 68865+ 68866 save_ext_shared=$ext_shared 68867 ext_shared=yes 68868- 68869+ 68870 for ac_i in $ac_stuff; do 68871 case $ac_i in 68872 -pthread) 68873 if test "$ext_shared" = "yes"; then 68874 LDFLAGS="$LDFLAGS -pthread" 68875 else 68876- 68877- 68878+ 68879+ 68880 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 68881- 68882+ 68883 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 68884 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68885 eval "EXTRA_LDFLAGS$unique=set" 68886@@ -58990,20 +45165,20 @@ 68887 ;; 68888 -l*) 68889 ac_ii=`echo $ac_i|cut -c 3-` 68890- 68891- 68892+ 68893+ 68894 case $ac_ii in 68895 c|c_r|pthread*) ;; 68896- *) 68897+ *) 68898 if test "$ext_shared" = "yes"; then 68899- LDFLAGS="$LDFLAGS -l$ac_ii" 68900+ LDFLAGS="$LDFLAGS -l$ac_ii" 68901 else 68902- 68903- 68904+ 68905+ 68906 case $ac_ii in 68907 c|c_r|pthread*) ;; 68908- *) 68909- LIBS="$LIBS -l$ac_ii" 68910+ *) 68911+ LIBS="$LIBS -l$ac_ii" 68912 ;; 68913 esac 68914 68915@@ -59016,224 +45191,193 @@ 68916 ;; 68917 -L*) 68918 ac_ii=`echo $ac_i|cut -c 3-` 68919- 68920+ 68921 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 68922- 68923+ 68924 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 68925 ai_p=$ac_ii 68926 else 68927- 68928+ 68929 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 68930- 68931+ 68932 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 68933 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 68934 fi 68935 68936- 68937+ 68938 if test "$ext_shared" = "yes"; then 68939 LDFLAGS="-L$ai_p $LDFLAGS" 68940 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 68941 else 68942- 68943- 68944- 68945+ 68946+ 68947+ 68948 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 68949- 68950+ 68951 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 68952 if test -n "$unique" && test "`eval $cmd`" = "" ; then 68953 eval "LIBPATH$unique=set" 68954- 68955+ 68956 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 68957 LDFLAGS="$LDFLAGS -L$ai_p" 68958 PHP_RPATHS="$PHP_RPATHS $ai_p" 68959- 68960+ 68961 fi 68962 68963 68964 fi 68965- 68966+ 68967 fi 68968 68969 ;; 68970 esac 68971 done 68972 68973- echo "$as_me:$LINENO: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 68974-echo $ECHO_N "checking for gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6 68975-if test "${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+set}" = set; then 68976- echo $ECHO_N "(cached) $ECHO_C" >&6 68977+ echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 68978+echo "configure:45238: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 68979+ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` 68980+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 68981+ echo $ac_n "(cached) $ac_c" 1>&6 68982 else 68983- ac_check_lib_save_LIBS=$LIBS 68984+ ac_save_LIBS="$LIBS" 68985 LIBS="-lgmp $LIBS" 68986-cat >conftest.$ac_ext <<_ACEOF 68987-/* confdefs.h. */ 68988-_ACEOF 68989-cat confdefs.h >>conftest.$ac_ext 68990-cat >>conftest.$ac_ext <<_ACEOF 68991-/* end confdefs.h. */ 68992- 68993+cat > conftest.$ac_ext <<EOF 68994+#line 45246 "configure" 68995+#include "confdefs.h" 68996 /* Override any gcc2 internal prototype to avoid an error. */ 68997-#ifdef __cplusplus 68998-extern "C" 68999-#endif 69000 /* We use char because int might match the return type of a gcc2 69001- builtin and then its argument prototype would still apply. */ 69002-char gmp_randinit_lc_2exp_size (); 69003-int 69004-main () 69005-{ 69006-gmp_randinit_lc_2exp_size (); 69007- ; 69008- return 0; 69009-} 69010-_ACEOF 69011-rm -f conftest.$ac_objext conftest$ac_exeext 69012-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 69013- (eval $ac_link) 2>conftest.er1 69014- ac_status=$? 69015- grep -v '^ *+' conftest.er1 >conftest.err 69016- rm -f conftest.er1 69017- cat conftest.err >&5 69018- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69019- (exit $ac_status); } && 69020- { ac_try='test -z "$ac_c_werror_flag" 69021- || test ! -s conftest.err' 69022- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69023- (eval $ac_try) 2>&5 69024- ac_status=$? 69025- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69026- (exit $ac_status); }; } && 69027- { ac_try='test -s conftest$ac_exeext' 69028- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69029- (eval $ac_try) 2>&5 69030- ac_status=$? 69031- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69032- (exit $ac_status); }; }; then 69033- ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=yes 69034-else 69035- echo "$as_me: failed program was:" >&5 69036-sed 's/^/| /' conftest.$ac_ext >&5 69037- 69038-ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=no 69039-fi 69040-rm -f conftest.err conftest.$ac_objext \ 69041- conftest$ac_exeext conftest.$ac_ext 69042-LIBS=$ac_check_lib_save_LIBS 69043-fi 69044-echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&5 69045-echo "${ECHO_T}$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&6 69046-if test $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size = yes; then 69047+ builtin and then its argument prototype would still apply. */ 69048+char gmp_randinit_lc_2exp_size(); 69049+ 69050+int main() { 69051+gmp_randinit_lc_2exp_size() 69052+; return 0; } 69053+EOF 69054+if { (eval echo configure:45257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 69055+ rm -rf conftest* 69056+ eval "ac_cv_lib_$ac_lib_var=yes" 69057+else 69058+ echo "configure: failed program was:" >&5 69059+ cat conftest.$ac_ext >&5 69060+ rm -rf conftest* 69061+ eval "ac_cv_lib_$ac_lib_var=no" 69062+fi 69063+rm -f conftest* 69064+LIBS="$ac_save_LIBS" 69065 69066+fi 69067+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 69068+ echo "$ac_t""yes" 1>&6 69069+ 69070 LDFLAGS=$save_old_LDFLAGS 69071 ext_shared=$save_ext_shared 69072- 69073- 69074+ 69075+ 69076 else 69077+ echo "$ac_t""no" 1>&6 69078 69079 LDFLAGS=$save_old_LDFLAGS 69080 ext_shared=$save_ext_shared 69081 unset ac_cv_lib_gmp_gmp_randinit_lc_2exp_size 69082- 69083- { { echo "$as_me:$LINENO: error: GNU MP Library version 4.1.2 or greater required." >&5 69084-echo "$as_me: error: GNU MP Library version 4.1.2 or greater required." >&2;} 69085- { (exit 1); exit 1; }; } 69086- 69087- 69088+ 69089+ { echo "configure: error: GNU MP Library version 4.1.2 or greater required." 1>&2; exit 1; } 69090+ 69091+ 69092 fi 69093 69094- 69095- 69096+ 69097+ 69098 fi 69099 69100 69101- 69102+ 69103 69104 if test "$ext_shared" = "yes"; then 69105 GMP_SHARED_LIBADD="-lgmp $GMP_SHARED_LIBADD" 69106 if test -n "$GMP_DIR/$PHP_LIBDIR"; then 69107- 69108+ 69109 if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then 69110- 69111+ 69112 if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 69113 ai_p=$GMP_DIR/$PHP_LIBDIR 69114 else 69115- 69116+ 69117 ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 69118- 69119+ 69120 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 69121 ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`" 69122 fi 69123 69124- 69125+ 69126 if test "$ext_shared" = "yes"; then 69127 GMP_SHARED_LIBADD="-L$ai_p $GMP_SHARED_LIBADD" 69128 test -n "$ld_runpath_switch" && GMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $GMP_SHARED_LIBADD" 69129 else 69130- 69131- 69132- 69133+ 69134+ 69135+ 69136 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 69137- 69138+ 69139 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 69140 if test -n "$unique" && test "`eval $cmd`" = "" ; then 69141 eval "LIBPATH$unique=set" 69142- 69143+ 69144 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 69145 LDFLAGS="$LDFLAGS -L$ai_p" 69146 PHP_RPATHS="$PHP_RPATHS $ai_p" 69147- 69148+ 69149 fi 69150 69151 69152 fi 69153- 69154+ 69155 fi 69156 69157 fi 69158 else 69159- 69160+ 69161 69162 if test -n "$GMP_DIR/$PHP_LIBDIR"; then 69163- 69164+ 69165 if test "$GMP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$GMP_DIR/$PHP_LIBDIR" != "/usr/lib"; then 69166- 69167+ 69168 if test -z "$GMP_DIR/$PHP_LIBDIR" || echo "$GMP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 69169 ai_p=$GMP_DIR/$PHP_LIBDIR 69170 else 69171- 69172+ 69173 ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 69174- 69175+ 69176 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 69177 ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`" 69178 fi 69179 69180- 69181- 69182- 69183- 69184+ 69185+ 69186+ 69187+ 69188 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 69189- 69190+ 69191 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 69192 if test -n "$unique" && test "`eval $cmd`" = "" ; then 69193 eval "LIBPATH$unique=set" 69194- 69195+ 69196 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 69197 LDFLAGS="$LDFLAGS -L$ai_p" 69198 PHP_RPATHS="$PHP_RPATHS $ai_p" 69199- 69200+ 69201 fi 69202 69203 69204- 69205+ 69206 fi 69207 69208 fi 69209- 69210- 69211+ 69212+ 69213 case gmp in 69214 c|c_r|pthread*) ;; 69215- *) 69216- LIBS="-lgmp $LIBS" 69217+ *) 69218+ LIBS="-lgmp $LIBS" 69219 ;; 69220 esac 69221 69222@@ -59243,39 +45387,39 @@ 69223 fi 69224 69225 69226- 69227+ 69228 if test "$GMP_DIR/include" != "/usr/include"; then 69229- 69230+ 69231 if test -z "$GMP_DIR/include" || echo "$GMP_DIR/include" | grep '^/' >/dev/null ; then 69232 ai_p=$GMP_DIR/include 69233 else 69234- 69235+ 69236 ep_dir="`echo $GMP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 69237- 69238+ 69239 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 69240 ai_p="$ep_realdir/`basename \"$GMP_DIR/include\"`" 69241 fi 69242 69243- 69244- 69245+ 69246+ 69247 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 69248- 69249+ 69250 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 69251 if test -n "$unique" && test "`eval $cmd`" = "" ; then 69252 eval "INCLUDEPATH$unique=set" 69253- 69254+ 69255 if test ""; then 69256 INCLUDES="-I$ai_p $INCLUDES" 69257 else 69258 INCLUDES="$INCLUDES -I$ai_p" 69259 fi 69260- 69261+ 69262 fi 69263 69264 fi 69265 69266 69267- 69268+ 69269 ext_builddir=ext/gmp 69270 ext_srcdir=$abs_srcdir/ext/gmp 69271 69272@@ -59283,15 +45427,15 @@ 69273 69274 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 69275 PHP_GMP_SHARED=no 69276- 69277- 69278+ 69279+ 69280 case ext/gmp in 69281 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 69282 /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 69283 *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 69284 esac 69285- 69286- 69287+ 69288+ 69289 69290 b_c_pre=$php_c_pre 69291 b_cxx_pre=$php_cxx_pre 69292@@ -59304,12 +45448,12 @@ 69293 69294 old_IFS=$IFS 69295 for ac_src in gmp.c; do 69296- 69297+ 69298 IFS=. 69299 set $ac_src 69300 ac_obj=$1 69301 IFS=$old_IFS 69302- 69303+ 69304 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 69305 69306 case $ac_src in 69307@@ -59333,14 +45477,14 @@ 69308 else 69309 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 69310 PHP_GMP_SHARED=yes 69311- 69312+ 69313 case ext/gmp in 69314 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 69315 /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 69316 *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 69317 esac 69318- 69319- 69320+ 69321+ 69322 69323 b_c_pre=$shared_c_pre 69324 b_cxx_pre=$shared_cxx_pre 69325@@ -59353,12 +45497,12 @@ 69326 69327 old_IFS=$IFS 69328 for ac_src in gmp.c; do 69329- 69330+ 69331 IFS=. 69332 set $ac_src 69333 ac_obj=$1 69334 IFS=$old_IFS 69335- 69336+ 69337 shared_objects_gmp="$shared_objects_gmp $ac_bdir$ac_obj.lo" 69338 69339 case $ac_src in 69340@@ -59376,7 +45520,7 @@ 69341 69342 case $host_alias in 69343 *netware*) 69344- 69345+ 69346 install_modules="install-modules" 69347 69348 case $host_alias in 69349@@ -59386,7 +45530,7 @@ 69350 ;; 69351 *netware*) 69352 suffix=nlm 69353- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(GMP_SHARED_LIBADD)' 69354+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPGMP, 3)_SHARED_LIBADD)' 69355 ;; 69356 *) 69357 suffix=la 69358@@ -59399,7 +45543,7 @@ 69359 else 69360 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpgmp.$suffix" 69361 fi 69362- 69363+ 69364 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gmp" 69365 69366 cat >>Makefile.objects<<EOF 69367@@ -59413,7 +45557,7 @@ 69368 69369 ;; 69370 *) 69371- 69372+ 69373 install_modules="install-modules" 69374 69375 case $host_alias in 69376@@ -59423,7 +45567,7 @@ 69377 ;; 69378 *netware*) 69379 suffix=nlm 69380- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 69381+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_gmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(GMP, 3)_SHARED_LIBADD)' 69382 ;; 69383 *) 69384 suffix=la 69385@@ -59436,7 +45580,7 @@ 69386 else 69387 PHP_MODULES="$PHP_MODULES \$(phplibdir)/gmp.$suffix" 69388 fi 69389- 69390+ 69391 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_gmp" 69392 69393 cat >>Makefile.objects<<EOF 69394@@ -59450,10 +45594,9 @@ 69395 69396 ;; 69397 esac 69398- 69399-cat >>confdefs.h <<_ACEOF 69400+ cat >> confdefs.h <<EOF 69401 #define COMPILE_DL_GMP 1 69402-_ACEOF 69403+EOF 69404 69405 fi 69406 fi 69407@@ -59462,15 +45605,15 @@ 69408 PHP_GMP_SHARED=no 69409 case "$PHP_SAPI" in 69410 cgi|embed) 69411- 69412- 69413+ 69414+ 69415 case ext/gmp in 69416 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 69417 /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 69418 *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 69419 esac 69420- 69421- 69422+ 69423+ 69424 69425 b_c_pre=$php_c_pre 69426 b_cxx_pre=$php_cxx_pre 69427@@ -59483,12 +45626,12 @@ 69428 69429 old_IFS=$IFS 69430 for ac_src in gmp.c; do 69431- 69432+ 69433 IFS=. 69434 set $ac_src 69435 ac_obj=$1 69436 IFS=$old_IFS 69437- 69438+ 69439 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 69440 69441 case $ac_src in 69442@@ -59508,15 +45651,15 @@ 69443 EXT_STATIC="$EXT_STATIC gmp" 69444 ;; 69445 *) 69446- 69447- 69448+ 69449+ 69450 case ext/gmp in 69451 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 69452 /*) ac_srcdir=`echo "ext/gmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 69453 *) ac_srcdir="$abs_srcdir/ext/gmp/"; ac_bdir="ext/gmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 69454 esac 69455- 69456- 69457+ 69458+ 69459 69460 b_c_pre=$php_c_pre 69461 b_cxx_pre=$php_cxx_pre 69462@@ -59529,13 +45672,13 @@ 69463 69464 old_IFS=$IFS 69465 for ac_src in gmp.c; do 69466- 69467+ 69468 IFS=. 69469 set $ac_src 69470 ac_obj=$1 69471 IFS=$old_IFS 69472- 69473- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 69474+ 69475+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 69476 69477 case $ac_src in 69478 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 69479@@ -59555,26 +45698,25 @@ 69480 esac 69481 EXT_CLI_STATIC="$EXT_CLI_STATIC gmp" 69482 fi 69483- 69484- 69485+ 69486+ 69487 BUILD_DIR="$BUILD_DIR $ext_builddir" 69488- 69489+ 69490 69491 69492 if test "$ext_builddir" = "."; then 69493 PHP_PECL_EXTENSION=gmp 69494- 69495+ 69496 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 69497 69498 fi 69499 69500- 69501+ 69502 PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD" 69503 69504- 69505-cat >>confdefs.h <<\_ACEOF 69506+ cat >> confdefs.h <<\EOF 69507 #define HAVE_GMP 1 69508-_ACEOF 69509+EOF 69510 69511 fi 69512 69513@@ -59582,19 +45724,19 @@ 69514 69515 php_with_mhash=no 69516 69517-echo "$as_me:$LINENO: checking for mhash support" >&5 69518-echo $ECHO_N "checking for mhash support... $ECHO_C" >&6 69519- 69520+echo $ac_n "checking for mhash support""... $ac_c" 1>&6 69521+echo "configure:45729: checking for mhash support" >&5 69522 # Check whether --with-mhash or --without-mhash was given. 69523 if test "${with_mhash+set}" = set; then 69524 withval="$with_mhash" 69525 PHP_MHASH=$withval 69526 else 69527- 69528+ 69529 PHP_MHASH=no 69530 test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL 69531 69532-fi; 69533+fi 69534+ 69535 69536 69537 ext_output="yes, shared" 69538@@ -59618,8 +45760,7 @@ 69539 69540 69541 69542-echo "$as_me:$LINENO: result: $ext_output" >&5 69543-echo "${ECHO_T}$ext_output" >&6 69544+echo "$ac_t""$ext_output" 1>&6 69545 69546 69547 69548@@ -59627,18 +45768,19 @@ 69549 69550 php_enable_hash=yes 69551 69552-echo "$as_me:$LINENO: checking whether to enable hash support" >&5 69553-echo $ECHO_N "checking whether to enable hash support... $ECHO_C" >&6 69554+echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 69555+echo "configure:45773: checking whether to enable hash support" >&5 69556 # Check whether --enable-hash or --disable-hash was given. 69557 if test "${enable_hash+set}" = set; then 69558 enableval="$enable_hash" 69559 PHP_HASH=$enableval 69560 else 69561- 69562+ 69563 PHP_HASH=yes 69564 test "$PHP_ENABLE_ALL" && PHP_HASH=$PHP_ENABLE_ALL 69565 69566-fi; 69567+fi 69568+ 69569 69570 69571 ext_output="yes, shared" 69572@@ -59662,8 +45804,7 @@ 69573 69574 69575 69576-echo "$as_me:$LINENO: result: $ext_output" >&5 69577-echo "${ECHO_T}$ext_output" >&6 69578+echo "$ac_t""$ext_output" 1>&6 69579 69580 69581 69582@@ -59673,36 +45814,31 @@ 69583 PHP_HASH="yes" 69584 fi 69585 69586- 69587-cat >>confdefs.h <<\_ACEOF 69588+ cat >> confdefs.h <<\EOF 69589 #define PHP_MHASH_BC 1 69590-_ACEOF 69591+EOF 69592 69593 fi 69594 69595 if test "$PHP_HASH" != "no"; then 69596- 69597-cat >>confdefs.h <<\_ACEOF 69598+ cat >> confdefs.h <<\EOF 69599 #define HAVE_HASH_EXT 1 69600-_ACEOF 69601+EOF 69602 69603 69604- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 69605-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 69606-if test "${ac_cv_c_bigendian_php+set}" = set; then 69607- echo $ECHO_N "(cached) $ECHO_C" >&6 69608+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 69609+echo "configure:45831: checking whether byte ordering is bigendian" >&5 69610+if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then 69611+ echo $ac_n "(cached) $ac_c" 1>&6 69612 else 69613- 69614+ 69615 ac_cv_c_bigendian_php=unknown 69616 if test "$cross_compiling" = yes; then 69617 ac_cv_c_bigendian_php=unknown 69618 else 69619- cat >conftest.$ac_ext <<_ACEOF 69620-/* confdefs.h. */ 69621-_ACEOF 69622-cat confdefs.h >>conftest.$ac_ext 69623-cat >>conftest.$ac_ext <<_ACEOF 69624-/* end confdefs.h. */ 69625+ cat > conftest.$ac_ext <<EOF 69626+#line 45841 "configure" 69627+#include "confdefs.h" 69628 69629 int main(void) 69630 { 69631@@ -59715,1700 +45851,189 @@ 69632 return(1); 69633 } 69634 } 69635- 69636-_ACEOF 69637-rm -f conftest$ac_exeext 69638-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 69639- (eval $ac_link) 2>&5 69640- ac_status=$? 69641- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69642- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 69643- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69644- (eval $ac_try) 2>&5 69645- ac_status=$? 69646- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69647- (exit $ac_status); }; }; then 69648+ 69649+EOF 69650+if { (eval echo configure:45857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 69651+then 69652 ac_cv_c_bigendian_php=yes 69653 else 69654- echo "$as_me: program exited with status $ac_status" >&5 69655-echo "$as_me: failed program was:" >&5 69656-sed 's/^/| /' conftest.$ac_ext >&5 69657- 69658-( exit $ac_status ) 69659-ac_cv_c_bigendian_php=no 69660+ echo "configure: failed program was:" >&5 69661+ cat conftest.$ac_ext >&5 69662+ rm -fr conftest* 69663+ ac_cv_c_bigendian_php=no 69664 fi 69665-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 69666+rm -fr conftest* 69667 fi 69668 69669+ 69670 fi 69671-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5 69672-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6 69673- if test $ac_cv_c_bigendian_php = yes; then 69674 69675-cat >>confdefs.h <<\_ACEOF 69676-#define WORDS_BIGENDIAN 69677-_ACEOF 69678+echo "$ac_t""$ac_cv_c_bigendian_php" 1>&6 69679+ if test $ac_cv_c_bigendian_php = yes; then 69680+ cat >> confdefs.h <<\EOF 69681+#define WORDS_BIGENDIAN 69682+EOF 69683 69684 fi 69685 69686 69687- echo "$as_me:$LINENO: checking for short" >&5 69688-echo $ECHO_N "checking for short... $ECHO_C" >&6 69689-if test "${ac_cv_type_short+set}" = set; then 69690- echo $ECHO_N "(cached) $ECHO_C" >&6 69691-else 69692- cat >conftest.$ac_ext <<_ACEOF 69693-/* confdefs.h. */ 69694-_ACEOF 69695-cat confdefs.h >>conftest.$ac_ext 69696-cat >>conftest.$ac_ext <<_ACEOF 69697-/* end confdefs.h. */ 69698-$ac_includes_default 69699-int 69700-main () 69701-{ 69702-if ((short *) 0) 69703- return 0; 69704-if (sizeof (short)) 69705- return 0; 69706- ; 69707- return 0; 69708-} 69709-_ACEOF 69710-rm -f conftest.$ac_objext 69711-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69712- (eval $ac_compile) 2>conftest.er1 69713- ac_status=$? 69714- grep -v '^ *+' conftest.er1 >conftest.err 69715- rm -f conftest.er1 69716- cat conftest.err >&5 69717- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69718- (exit $ac_status); } && 69719- { ac_try='test -z "$ac_c_werror_flag" 69720- || test ! -s conftest.err' 69721- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69722- (eval $ac_try) 2>&5 69723- ac_status=$? 69724- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69725- (exit $ac_status); }; } && 69726- { ac_try='test -s conftest.$ac_objext' 69727- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69728- (eval $ac_try) 2>&5 69729- ac_status=$? 69730- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69731- (exit $ac_status); }; }; then 69732- ac_cv_type_short=yes 69733-else 69734- echo "$as_me: failed program was:" >&5 69735-sed 's/^/| /' conftest.$ac_ext >&5 69736- 69737-ac_cv_type_short=no 69738-fi 69739-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 69740-fi 69741-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 69742-echo "${ECHO_T}$ac_cv_type_short" >&6 69743- 69744-echo "$as_me:$LINENO: checking size of short" >&5 69745-echo $ECHO_N "checking size of short... $ECHO_C" >&6 69746-if test "${ac_cv_sizeof_short+set}" = set; then 69747- echo $ECHO_N "(cached) $ECHO_C" >&6 69748-else 69749- if test "$ac_cv_type_short" = yes; then 69750- # The cast to unsigned long works around a bug in the HP C Compiler 69751- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 69752- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 69753- # This bug is HP SR number 8606223364. 69754- if test "$cross_compiling" = yes; then 69755- # Depending upon the size, compute the lo and hi bounds. 69756-cat >conftest.$ac_ext <<_ACEOF 69757-/* confdefs.h. */ 69758-_ACEOF 69759-cat confdefs.h >>conftest.$ac_ext 69760-cat >>conftest.$ac_ext <<_ACEOF 69761-/* end confdefs.h. */ 69762-$ac_includes_default 69763-int 69764-main () 69765-{ 69766-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; 69767-test_array [0] = 0 69768- 69769- ; 69770- return 0; 69771-} 69772-_ACEOF 69773-rm -f conftest.$ac_objext 69774-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69775- (eval $ac_compile) 2>conftest.er1 69776- ac_status=$? 69777- grep -v '^ *+' conftest.er1 >conftest.err 69778- rm -f conftest.er1 69779- cat conftest.err >&5 69780- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69781- (exit $ac_status); } && 69782- { ac_try='test -z "$ac_c_werror_flag" 69783- || test ! -s conftest.err' 69784- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69785- (eval $ac_try) 2>&5 69786- ac_status=$? 69787- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69788- (exit $ac_status); }; } && 69789- { ac_try='test -s conftest.$ac_objext' 69790- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69791- (eval $ac_try) 2>&5 69792- ac_status=$? 69793- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69794- (exit $ac_status); }; }; then 69795- ac_lo=0 ac_mid=0 69796- while :; do 69797- cat >conftest.$ac_ext <<_ACEOF 69798-/* confdefs.h. */ 69799-_ACEOF 69800-cat confdefs.h >>conftest.$ac_ext 69801-cat >>conftest.$ac_ext <<_ACEOF 69802-/* end confdefs.h. */ 69803-$ac_includes_default 69804-int 69805-main () 69806-{ 69807-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; 69808-test_array [0] = 0 69809- 69810- ; 69811- return 0; 69812-} 69813-_ACEOF 69814-rm -f conftest.$ac_objext 69815-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69816- (eval $ac_compile) 2>conftest.er1 69817- ac_status=$? 69818- grep -v '^ *+' conftest.er1 >conftest.err 69819- rm -f conftest.er1 69820- cat conftest.err >&5 69821- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69822- (exit $ac_status); } && 69823- { ac_try='test -z "$ac_c_werror_flag" 69824- || test ! -s conftest.err' 69825- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69826- (eval $ac_try) 2>&5 69827- ac_status=$? 69828- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69829- (exit $ac_status); }; } && 69830- { ac_try='test -s conftest.$ac_objext' 69831- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69832- (eval $ac_try) 2>&5 69833- ac_status=$? 69834- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69835- (exit $ac_status); }; }; then 69836- ac_hi=$ac_mid; break 69837-else 69838- echo "$as_me: failed program was:" >&5 69839-sed 's/^/| /' conftest.$ac_ext >&5 69840- 69841-ac_lo=`expr $ac_mid + 1` 69842- if test $ac_lo -le $ac_mid; then 69843- ac_lo= ac_hi= 69844- break 69845- fi 69846- ac_mid=`expr 2 '*' $ac_mid + 1` 69847-fi 69848-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 69849- done 69850-else 69851- echo "$as_me: failed program was:" >&5 69852-sed 's/^/| /' conftest.$ac_ext >&5 69853- 69854-cat >conftest.$ac_ext <<_ACEOF 69855-/* confdefs.h. */ 69856-_ACEOF 69857-cat confdefs.h >>conftest.$ac_ext 69858-cat >>conftest.$ac_ext <<_ACEOF 69859-/* end confdefs.h. */ 69860-$ac_includes_default 69861-int 69862-main () 69863-{ 69864-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; 69865-test_array [0] = 0 69866- 69867- ; 69868- return 0; 69869-} 69870-_ACEOF 69871-rm -f conftest.$ac_objext 69872-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69873- (eval $ac_compile) 2>conftest.er1 69874- ac_status=$? 69875- grep -v '^ *+' conftest.er1 >conftest.err 69876- rm -f conftest.er1 69877- cat conftest.err >&5 69878- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69879- (exit $ac_status); } && 69880- { ac_try='test -z "$ac_c_werror_flag" 69881- || test ! -s conftest.err' 69882- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69883- (eval $ac_try) 2>&5 69884- ac_status=$? 69885- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69886- (exit $ac_status); }; } && 69887- { ac_try='test -s conftest.$ac_objext' 69888- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69889- (eval $ac_try) 2>&5 69890- ac_status=$? 69891- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69892- (exit $ac_status); }; }; then 69893- ac_hi=-1 ac_mid=-1 69894- while :; do 69895- cat >conftest.$ac_ext <<_ACEOF 69896-/* confdefs.h. */ 69897-_ACEOF 69898-cat confdefs.h >>conftest.$ac_ext 69899-cat >>conftest.$ac_ext <<_ACEOF 69900-/* end confdefs.h. */ 69901-$ac_includes_default 69902-int 69903-main () 69904-{ 69905-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; 69906-test_array [0] = 0 69907- 69908- ; 69909- return 0; 69910-} 69911-_ACEOF 69912-rm -f conftest.$ac_objext 69913-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69914- (eval $ac_compile) 2>conftest.er1 69915- ac_status=$? 69916- grep -v '^ *+' conftest.er1 >conftest.err 69917- rm -f conftest.er1 69918- cat conftest.err >&5 69919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69920- (exit $ac_status); } && 69921- { ac_try='test -z "$ac_c_werror_flag" 69922- || test ! -s conftest.err' 69923- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69924- (eval $ac_try) 2>&5 69925- ac_status=$? 69926- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69927- (exit $ac_status); }; } && 69928- { ac_try='test -s conftest.$ac_objext' 69929- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69930- (eval $ac_try) 2>&5 69931- ac_status=$? 69932- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69933- (exit $ac_status); }; }; then 69934- ac_lo=$ac_mid; break 69935-else 69936- echo "$as_me: failed program was:" >&5 69937-sed 's/^/| /' conftest.$ac_ext >&5 69938- 69939-ac_hi=`expr '(' $ac_mid ')' - 1` 69940- if test $ac_mid -le $ac_hi; then 69941- ac_lo= ac_hi= 69942- break 69943- fi 69944- ac_mid=`expr 2 '*' $ac_mid` 69945-fi 69946-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 69947- done 69948-else 69949- echo "$as_me: failed program was:" >&5 69950-sed 's/^/| /' conftest.$ac_ext >&5 69951- 69952-ac_lo= ac_hi= 69953-fi 69954-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 69955-fi 69956-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 69957-# Binary search between lo and hi bounds. 69958-while test "x$ac_lo" != "x$ac_hi"; do 69959- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 69960- cat >conftest.$ac_ext <<_ACEOF 69961-/* confdefs.h. */ 69962-_ACEOF 69963-cat confdefs.h >>conftest.$ac_ext 69964-cat >>conftest.$ac_ext <<_ACEOF 69965-/* end confdefs.h. */ 69966-$ac_includes_default 69967-int 69968-main () 69969-{ 69970-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; 69971-test_array [0] = 0 69972- 69973- ; 69974- return 0; 69975-} 69976-_ACEOF 69977-rm -f conftest.$ac_objext 69978-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 69979- (eval $ac_compile) 2>conftest.er1 69980- ac_status=$? 69981- grep -v '^ *+' conftest.er1 >conftest.err 69982- rm -f conftest.er1 69983- cat conftest.err >&5 69984- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69985- (exit $ac_status); } && 69986- { ac_try='test -z "$ac_c_werror_flag" 69987- || test ! -s conftest.err' 69988- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69989- (eval $ac_try) 2>&5 69990- ac_status=$? 69991- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69992- (exit $ac_status); }; } && 69993- { ac_try='test -s conftest.$ac_objext' 69994- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 69995- (eval $ac_try) 2>&5 69996- ac_status=$? 69997- echo "$as_me:$LINENO: \$? = $ac_status" >&5 69998- (exit $ac_status); }; }; then 69999- ac_hi=$ac_mid 70000-else 70001- echo "$as_me: failed program was:" >&5 70002-sed 's/^/| /' conftest.$ac_ext >&5 70003- 70004-ac_lo=`expr '(' $ac_mid ')' + 1` 70005-fi 70006-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70007-done 70008-case $ac_lo in 70009-?*) ac_cv_sizeof_short=$ac_lo;; 70010-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 70011-See \`config.log' for more details." >&5 70012-echo "$as_me: error: cannot compute sizeof (short), 77 70013-See \`config.log' for more details." >&2;} 70014- { (exit 1); exit 1; }; } ;; 70015-esac 70016+ echo $ac_n "checking size of short""... $ac_c" 1>&6 70017+echo "configure:45882: checking size of short" >&5 70018+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then 70019+ echo $ac_n "(cached) $ac_c" 1>&6 70020 else 70021 if test "$cross_compiling" = yes; then 70022- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 70023-See \`config.log' for more details." >&5 70024-echo "$as_me: error: cannot run test program while cross compiling 70025-See \`config.log' for more details." >&2;} 70026- { (exit 1); exit 1; }; } 70027-else 70028- cat >conftest.$ac_ext <<_ACEOF 70029-/* confdefs.h. */ 70030-_ACEOF 70031-cat confdefs.h >>conftest.$ac_ext 70032-cat >>conftest.$ac_ext <<_ACEOF 70033-/* end confdefs.h. */ 70034-$ac_includes_default 70035-long longval () { return (long) (sizeof (short)); } 70036-unsigned long ulongval () { return (long) (sizeof (short)); } 70037+ ac_cv_sizeof_short=2 70038+else 70039+ cat > conftest.$ac_ext <<EOF 70040+#line 45890 "configure" 70041+#include "confdefs.h" 70042 #include <stdio.h> 70043-#include <stdlib.h> 70044-int 70045-main () 70046+main() 70047 { 70048- 70049- FILE *f = fopen ("conftest.val", "w"); 70050- if (! f) 70051- exit (1); 70052- if (((long) (sizeof (short))) < 0) 70053- { 70054- long i = longval (); 70055- if (i != ((long) (sizeof (short)))) 70056- exit (1); 70057- fprintf (f, "%ld\n", i); 70058- } 70059- else 70060- { 70061- unsigned long i = ulongval (); 70062- if (i != ((long) (sizeof (short)))) 70063- exit (1); 70064- fprintf (f, "%lu\n", i); 70065- } 70066- exit (ferror (f) || fclose (f) != 0); 70067- 70068- ; 70069- return 0; 70070+ FILE *f=fopen("conftestval", "w"); 70071+ if (!f) exit(1); 70072+ fprintf(f, "%d\n", sizeof(short)); 70073+ exit(0); 70074 } 70075-_ACEOF 70076-rm -f conftest$ac_exeext 70077-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 70078- (eval $ac_link) 2>&5 70079- ac_status=$? 70080- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70081- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 70082- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70083- (eval $ac_try) 2>&5 70084- ac_status=$? 70085- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70086- (exit $ac_status); }; }; then 70087- ac_cv_sizeof_short=`cat conftest.val` 70088-else 70089- echo "$as_me: program exited with status $ac_status" >&5 70090-echo "$as_me: failed program was:" >&5 70091-sed 's/^/| /' conftest.$ac_ext >&5 70092- 70093-( exit $ac_status ) 70094-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 70095-See \`config.log' for more details." >&5 70096-echo "$as_me: error: cannot compute sizeof (short), 77 70097-See \`config.log' for more details." >&2;} 70098- { (exit 1); exit 1; }; } 70099-fi 70100-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 70101-fi 70102-fi 70103-rm -f conftest.val 70104+EOF 70105+if { (eval echo configure:45901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 70106+then 70107+ ac_cv_sizeof_short=`cat conftestval` 70108 else 70109+ echo "configure: failed program was:" >&5 70110+ cat conftest.$ac_ext >&5 70111+ rm -fr conftest* 70112 ac_cv_sizeof_short=0 70113 fi 70114+rm -fr conftest* 70115 fi 70116-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 70117-echo "${ECHO_T}$ac_cv_sizeof_short" >&6 70118-cat >>confdefs.h <<_ACEOF 70119-#define SIZEOF_SHORT $ac_cv_sizeof_short 70120-_ACEOF 70121- 70122- 70123- echo "$as_me:$LINENO: checking for int" >&5 70124-echo $ECHO_N "checking for int... $ECHO_C" >&6 70125-if test "${ac_cv_type_int+set}" = set; then 70126- echo $ECHO_N "(cached) $ECHO_C" >&6 70127-else 70128- cat >conftest.$ac_ext <<_ACEOF 70129-/* confdefs.h. */ 70130-_ACEOF 70131-cat confdefs.h >>conftest.$ac_ext 70132-cat >>conftest.$ac_ext <<_ACEOF 70133-/* end confdefs.h. */ 70134-$ac_includes_default 70135-int 70136-main () 70137-{ 70138-if ((int *) 0) 70139- return 0; 70140-if (sizeof (int)) 70141- return 0; 70142- ; 70143- return 0; 70144-} 70145-_ACEOF 70146-rm -f conftest.$ac_objext 70147-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70148- (eval $ac_compile) 2>conftest.er1 70149- ac_status=$? 70150- grep -v '^ *+' conftest.er1 >conftest.err 70151- rm -f conftest.er1 70152- cat conftest.err >&5 70153- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70154- (exit $ac_status); } && 70155- { ac_try='test -z "$ac_c_werror_flag" 70156- || test ! -s conftest.err' 70157- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70158- (eval $ac_try) 2>&5 70159- ac_status=$? 70160- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70161- (exit $ac_status); }; } && 70162- { ac_try='test -s conftest.$ac_objext' 70163- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70164- (eval $ac_try) 2>&5 70165- ac_status=$? 70166- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70167- (exit $ac_status); }; }; then 70168- ac_cv_type_int=yes 70169-else 70170- echo "$as_me: failed program was:" >&5 70171-sed 's/^/| /' conftest.$ac_ext >&5 70172- 70173-ac_cv_type_int=no 70174-fi 70175-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70176-fi 70177-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 70178-echo "${ECHO_T}$ac_cv_type_int" >&6 70179- 70180-echo "$as_me:$LINENO: checking size of int" >&5 70181-echo $ECHO_N "checking size of int... $ECHO_C" >&6 70182-if test "${ac_cv_sizeof_int+set}" = set; then 70183- echo $ECHO_N "(cached) $ECHO_C" >&6 70184-else 70185- if test "$ac_cv_type_int" = yes; then 70186- # The cast to unsigned long works around a bug in the HP C Compiler 70187- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 70188- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 70189- # This bug is HP SR number 8606223364. 70190- if test "$cross_compiling" = yes; then 70191- # Depending upon the size, compute the lo and hi bounds. 70192-cat >conftest.$ac_ext <<_ACEOF 70193-/* confdefs.h. */ 70194-_ACEOF 70195-cat confdefs.h >>conftest.$ac_ext 70196-cat >>conftest.$ac_ext <<_ACEOF 70197-/* end confdefs.h. */ 70198-$ac_includes_default 70199-int 70200-main () 70201-{ 70202-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; 70203-test_array [0] = 0 70204- 70205- ; 70206- return 0; 70207-} 70208-_ACEOF 70209-rm -f conftest.$ac_objext 70210-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70211- (eval $ac_compile) 2>conftest.er1 70212- ac_status=$? 70213- grep -v '^ *+' conftest.er1 >conftest.err 70214- rm -f conftest.er1 70215- cat conftest.err >&5 70216- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70217- (exit $ac_status); } && 70218- { ac_try='test -z "$ac_c_werror_flag" 70219- || test ! -s conftest.err' 70220- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70221- (eval $ac_try) 2>&5 70222- ac_status=$? 70223- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70224- (exit $ac_status); }; } && 70225- { ac_try='test -s conftest.$ac_objext' 70226- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70227- (eval $ac_try) 2>&5 70228- ac_status=$? 70229- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70230- (exit $ac_status); }; }; then 70231- ac_lo=0 ac_mid=0 70232- while :; do 70233- cat >conftest.$ac_ext <<_ACEOF 70234-/* confdefs.h. */ 70235-_ACEOF 70236-cat confdefs.h >>conftest.$ac_ext 70237-cat >>conftest.$ac_ext <<_ACEOF 70238-/* end confdefs.h. */ 70239-$ac_includes_default 70240-int 70241-main () 70242-{ 70243-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 70244-test_array [0] = 0 70245- 70246- ; 70247- return 0; 70248-} 70249-_ACEOF 70250-rm -f conftest.$ac_objext 70251-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70252- (eval $ac_compile) 2>conftest.er1 70253- ac_status=$? 70254- grep -v '^ *+' conftest.er1 >conftest.err 70255- rm -f conftest.er1 70256- cat conftest.err >&5 70257- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70258- (exit $ac_status); } && 70259- { ac_try='test -z "$ac_c_werror_flag" 70260- || test ! -s conftest.err' 70261- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70262- (eval $ac_try) 2>&5 70263- ac_status=$? 70264- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70265- (exit $ac_status); }; } && 70266- { ac_try='test -s conftest.$ac_objext' 70267- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70268- (eval $ac_try) 2>&5 70269- ac_status=$? 70270- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70271- (exit $ac_status); }; }; then 70272- ac_hi=$ac_mid; break 70273-else 70274- echo "$as_me: failed program was:" >&5 70275-sed 's/^/| /' conftest.$ac_ext >&5 70276- 70277-ac_lo=`expr $ac_mid + 1` 70278- if test $ac_lo -le $ac_mid; then 70279- ac_lo= ac_hi= 70280- break 70281- fi 70282- ac_mid=`expr 2 '*' $ac_mid + 1` 70283-fi 70284-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70285- done 70286-else 70287- echo "$as_me: failed program was:" >&5 70288-sed 's/^/| /' conftest.$ac_ext >&5 70289- 70290-cat >conftest.$ac_ext <<_ACEOF 70291-/* confdefs.h. */ 70292-_ACEOF 70293-cat confdefs.h >>conftest.$ac_ext 70294-cat >>conftest.$ac_ext <<_ACEOF 70295-/* end confdefs.h. */ 70296-$ac_includes_default 70297-int 70298-main () 70299-{ 70300-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; 70301-test_array [0] = 0 70302- 70303- ; 70304- return 0; 70305-} 70306-_ACEOF 70307-rm -f conftest.$ac_objext 70308-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70309- (eval $ac_compile) 2>conftest.er1 70310- ac_status=$? 70311- grep -v '^ *+' conftest.er1 >conftest.err 70312- rm -f conftest.er1 70313- cat conftest.err >&5 70314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70315- (exit $ac_status); } && 70316- { ac_try='test -z "$ac_c_werror_flag" 70317- || test ! -s conftest.err' 70318- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70319- (eval $ac_try) 2>&5 70320- ac_status=$? 70321- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70322- (exit $ac_status); }; } && 70323- { ac_try='test -s conftest.$ac_objext' 70324- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70325- (eval $ac_try) 2>&5 70326- ac_status=$? 70327- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70328- (exit $ac_status); }; }; then 70329- ac_hi=-1 ac_mid=-1 70330- while :; do 70331- cat >conftest.$ac_ext <<_ACEOF 70332-/* confdefs.h. */ 70333-_ACEOF 70334-cat confdefs.h >>conftest.$ac_ext 70335-cat >>conftest.$ac_ext <<_ACEOF 70336-/* end confdefs.h. */ 70337-$ac_includes_default 70338-int 70339-main () 70340-{ 70341-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; 70342-test_array [0] = 0 70343 70344- ; 70345- return 0; 70346-} 70347-_ACEOF 70348-rm -f conftest.$ac_objext 70349-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70350- (eval $ac_compile) 2>conftest.er1 70351- ac_status=$? 70352- grep -v '^ *+' conftest.er1 >conftest.err 70353- rm -f conftest.er1 70354- cat conftest.err >&5 70355- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70356- (exit $ac_status); } && 70357- { ac_try='test -z "$ac_c_werror_flag" 70358- || test ! -s conftest.err' 70359- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70360- (eval $ac_try) 2>&5 70361- ac_status=$? 70362- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70363- (exit $ac_status); }; } && 70364- { ac_try='test -s conftest.$ac_objext' 70365- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70366- (eval $ac_try) 2>&5 70367- ac_status=$? 70368- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70369- (exit $ac_status); }; }; then 70370- ac_lo=$ac_mid; break 70371-else 70372- echo "$as_me: failed program was:" >&5 70373-sed 's/^/| /' conftest.$ac_ext >&5 70374- 70375-ac_hi=`expr '(' $ac_mid ')' - 1` 70376- if test $ac_mid -le $ac_hi; then 70377- ac_lo= ac_hi= 70378- break 70379- fi 70380- ac_mid=`expr 2 '*' $ac_mid` 70381-fi 70382-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70383- done 70384-else 70385- echo "$as_me: failed program was:" >&5 70386-sed 's/^/| /' conftest.$ac_ext >&5 70387- 70388-ac_lo= ac_hi= 70389-fi 70390-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70391-fi 70392-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70393-# Binary search between lo and hi bounds. 70394-while test "x$ac_lo" != "x$ac_hi"; do 70395- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 70396- cat >conftest.$ac_ext <<_ACEOF 70397-/* confdefs.h. */ 70398-_ACEOF 70399-cat confdefs.h >>conftest.$ac_ext 70400-cat >>conftest.$ac_ext <<_ACEOF 70401-/* end confdefs.h. */ 70402-$ac_includes_default 70403-int 70404-main () 70405-{ 70406-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 70407-test_array [0] = 0 70408+fi 70409+echo "$ac_t""$ac_cv_sizeof_short" 1>&6 70410+cat >> confdefs.h <<EOF 70411+#define SIZEOF_SHORT $ac_cv_sizeof_short 70412+EOF 70413 70414- ; 70415- return 0; 70416-} 70417-_ACEOF 70418-rm -f conftest.$ac_objext 70419-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70420- (eval $ac_compile) 2>conftest.er1 70421- ac_status=$? 70422- grep -v '^ *+' conftest.er1 >conftest.err 70423- rm -f conftest.er1 70424- cat conftest.err >&5 70425- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70426- (exit $ac_status); } && 70427- { ac_try='test -z "$ac_c_werror_flag" 70428- || test ! -s conftest.err' 70429- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70430- (eval $ac_try) 2>&5 70431- ac_status=$? 70432- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70433- (exit $ac_status); }; } && 70434- { ac_try='test -s conftest.$ac_objext' 70435- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70436- (eval $ac_try) 2>&5 70437- ac_status=$? 70438- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70439- (exit $ac_status); }; }; then 70440- ac_hi=$ac_mid 70441-else 70442- echo "$as_me: failed program was:" >&5 70443-sed 's/^/| /' conftest.$ac_ext >&5 70444 70445-ac_lo=`expr '(' $ac_mid ')' + 1` 70446-fi 70447-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70448-done 70449-case $ac_lo in 70450-?*) ac_cv_sizeof_int=$ac_lo;; 70451-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 70452-See \`config.log' for more details." >&5 70453-echo "$as_me: error: cannot compute sizeof (int), 77 70454-See \`config.log' for more details." >&2;} 70455- { (exit 1); exit 1; }; } ;; 70456-esac 70457+ echo $ac_n "checking size of int""... $ac_c" 1>&6 70458+echo "configure:45921: checking size of int" >&5 70459+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 70460+ echo $ac_n "(cached) $ac_c" 1>&6 70461 else 70462 if test "$cross_compiling" = yes; then 70463- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 70464-See \`config.log' for more details." >&5 70465-echo "$as_me: error: cannot run test program while cross compiling 70466-See \`config.log' for more details." >&2;} 70467- { (exit 1); exit 1; }; } 70468-else 70469- cat >conftest.$ac_ext <<_ACEOF 70470-/* confdefs.h. */ 70471-_ACEOF 70472-cat confdefs.h >>conftest.$ac_ext 70473-cat >>conftest.$ac_ext <<_ACEOF 70474-/* end confdefs.h. */ 70475-$ac_includes_default 70476-long longval () { return (long) (sizeof (int)); } 70477-unsigned long ulongval () { return (long) (sizeof (int)); } 70478+ ac_cv_sizeof_int=4 70479+else 70480+ cat > conftest.$ac_ext <<EOF 70481+#line 45929 "configure" 70482+#include "confdefs.h" 70483 #include <stdio.h> 70484-#include <stdlib.h> 70485-int 70486-main () 70487+main() 70488 { 70489- 70490- FILE *f = fopen ("conftest.val", "w"); 70491- if (! f) 70492- exit (1); 70493- if (((long) (sizeof (int))) < 0) 70494- { 70495- long i = longval (); 70496- if (i != ((long) (sizeof (int)))) 70497- exit (1); 70498- fprintf (f, "%ld\n", i); 70499- } 70500- else 70501- { 70502- unsigned long i = ulongval (); 70503- if (i != ((long) (sizeof (int)))) 70504- exit (1); 70505- fprintf (f, "%lu\n", i); 70506- } 70507- exit (ferror (f) || fclose (f) != 0); 70508- 70509- ; 70510- return 0; 70511+ FILE *f=fopen("conftestval", "w"); 70512+ if (!f) exit(1); 70513+ fprintf(f, "%d\n", sizeof(int)); 70514+ exit(0); 70515 } 70516-_ACEOF 70517-rm -f conftest$ac_exeext 70518-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 70519- (eval $ac_link) 2>&5 70520- ac_status=$? 70521- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70522- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 70523- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70524- (eval $ac_try) 2>&5 70525- ac_status=$? 70526- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70527- (exit $ac_status); }; }; then 70528- ac_cv_sizeof_int=`cat conftest.val` 70529-else 70530- echo "$as_me: program exited with status $ac_status" >&5 70531-echo "$as_me: failed program was:" >&5 70532-sed 's/^/| /' conftest.$ac_ext >&5 70533- 70534-( exit $ac_status ) 70535-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 70536-See \`config.log' for more details." >&5 70537-echo "$as_me: error: cannot compute sizeof (int), 77 70538-See \`config.log' for more details." >&2;} 70539- { (exit 1); exit 1; }; } 70540-fi 70541-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 70542-fi 70543-fi 70544-rm -f conftest.val 70545+EOF 70546+if { (eval echo configure:45940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 70547+then 70548+ ac_cv_sizeof_int=`cat conftestval` 70549 else 70550+ echo "configure: failed program was:" >&5 70551+ cat conftest.$ac_ext >&5 70552+ rm -fr conftest* 70553 ac_cv_sizeof_int=0 70554 fi 70555+rm -fr conftest* 70556 fi 70557-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 70558-echo "${ECHO_T}$ac_cv_sizeof_int" >&6 70559-cat >>confdefs.h <<_ACEOF 70560-#define SIZEOF_INT $ac_cv_sizeof_int 70561-_ACEOF 70562- 70563- 70564- echo "$as_me:$LINENO: checking for long" >&5 70565-echo $ECHO_N "checking for long... $ECHO_C" >&6 70566-if test "${ac_cv_type_long+set}" = set; then 70567- echo $ECHO_N "(cached) $ECHO_C" >&6 70568-else 70569- cat >conftest.$ac_ext <<_ACEOF 70570-/* confdefs.h. */ 70571-_ACEOF 70572-cat confdefs.h >>conftest.$ac_ext 70573-cat >>conftest.$ac_ext <<_ACEOF 70574-/* end confdefs.h. */ 70575-$ac_includes_default 70576-int 70577-main () 70578-{ 70579-if ((long *) 0) 70580- return 0; 70581-if (sizeof (long)) 70582- return 0; 70583- ; 70584- return 0; 70585-} 70586-_ACEOF 70587-rm -f conftest.$ac_objext 70588-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70589- (eval $ac_compile) 2>conftest.er1 70590- ac_status=$? 70591- grep -v '^ *+' conftest.er1 >conftest.err 70592- rm -f conftest.er1 70593- cat conftest.err >&5 70594- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70595- (exit $ac_status); } && 70596- { ac_try='test -z "$ac_c_werror_flag" 70597- || test ! -s conftest.err' 70598- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70599- (eval $ac_try) 2>&5 70600- ac_status=$? 70601- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70602- (exit $ac_status); }; } && 70603- { ac_try='test -s conftest.$ac_objext' 70604- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70605- (eval $ac_try) 2>&5 70606- ac_status=$? 70607- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70608- (exit $ac_status); }; }; then 70609- ac_cv_type_long=yes 70610-else 70611- echo "$as_me: failed program was:" >&5 70612-sed 's/^/| /' conftest.$ac_ext >&5 70613- 70614-ac_cv_type_long=no 70615-fi 70616-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70617-fi 70618-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 70619-echo "${ECHO_T}$ac_cv_type_long" >&6 70620- 70621-echo "$as_me:$LINENO: checking size of long" >&5 70622-echo $ECHO_N "checking size of long... $ECHO_C" >&6 70623-if test "${ac_cv_sizeof_long+set}" = set; then 70624- echo $ECHO_N "(cached) $ECHO_C" >&6 70625-else 70626- if test "$ac_cv_type_long" = yes; then 70627- # The cast to unsigned long works around a bug in the HP C Compiler 70628- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 70629- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 70630- # This bug is HP SR number 8606223364. 70631- if test "$cross_compiling" = yes; then 70632- # Depending upon the size, compute the lo and hi bounds. 70633-cat >conftest.$ac_ext <<_ACEOF 70634-/* confdefs.h. */ 70635-_ACEOF 70636-cat confdefs.h >>conftest.$ac_ext 70637-cat >>conftest.$ac_ext <<_ACEOF 70638-/* end confdefs.h. */ 70639-$ac_includes_default 70640-int 70641-main () 70642-{ 70643-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; 70644-test_array [0] = 0 70645- 70646- ; 70647- return 0; 70648-} 70649-_ACEOF 70650-rm -f conftest.$ac_objext 70651-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70652- (eval $ac_compile) 2>conftest.er1 70653- ac_status=$? 70654- grep -v '^ *+' conftest.er1 >conftest.err 70655- rm -f conftest.er1 70656- cat conftest.err >&5 70657- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70658- (exit $ac_status); } && 70659- { ac_try='test -z "$ac_c_werror_flag" 70660- || test ! -s conftest.err' 70661- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70662- (eval $ac_try) 2>&5 70663- ac_status=$? 70664- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70665- (exit $ac_status); }; } && 70666- { ac_try='test -s conftest.$ac_objext' 70667- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70668- (eval $ac_try) 2>&5 70669- ac_status=$? 70670- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70671- (exit $ac_status); }; }; then 70672- ac_lo=0 ac_mid=0 70673- while :; do 70674- cat >conftest.$ac_ext <<_ACEOF 70675-/* confdefs.h. */ 70676-_ACEOF 70677-cat confdefs.h >>conftest.$ac_ext 70678-cat >>conftest.$ac_ext <<_ACEOF 70679-/* end confdefs.h. */ 70680-$ac_includes_default 70681-int 70682-main () 70683-{ 70684-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 70685-test_array [0] = 0 70686- 70687- ; 70688- return 0; 70689-} 70690-_ACEOF 70691-rm -f conftest.$ac_objext 70692-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70693- (eval $ac_compile) 2>conftest.er1 70694- ac_status=$? 70695- grep -v '^ *+' conftest.er1 >conftest.err 70696- rm -f conftest.er1 70697- cat conftest.err >&5 70698- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70699- (exit $ac_status); } && 70700- { ac_try='test -z "$ac_c_werror_flag" 70701- || test ! -s conftest.err' 70702- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70703- (eval $ac_try) 2>&5 70704- ac_status=$? 70705- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70706- (exit $ac_status); }; } && 70707- { ac_try='test -s conftest.$ac_objext' 70708- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70709- (eval $ac_try) 2>&5 70710- ac_status=$? 70711- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70712- (exit $ac_status); }; }; then 70713- ac_hi=$ac_mid; break 70714-else 70715- echo "$as_me: failed program was:" >&5 70716-sed 's/^/| /' conftest.$ac_ext >&5 70717- 70718-ac_lo=`expr $ac_mid + 1` 70719- if test $ac_lo -le $ac_mid; then 70720- ac_lo= ac_hi= 70721- break 70722- fi 70723- ac_mid=`expr 2 '*' $ac_mid + 1` 70724-fi 70725-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70726- done 70727-else 70728- echo "$as_me: failed program was:" >&5 70729-sed 's/^/| /' conftest.$ac_ext >&5 70730- 70731-cat >conftest.$ac_ext <<_ACEOF 70732-/* confdefs.h. */ 70733-_ACEOF 70734-cat confdefs.h >>conftest.$ac_ext 70735-cat >>conftest.$ac_ext <<_ACEOF 70736-/* end confdefs.h. */ 70737-$ac_includes_default 70738-int 70739-main () 70740-{ 70741-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; 70742-test_array [0] = 0 70743 70744- ; 70745- return 0; 70746-} 70747-_ACEOF 70748-rm -f conftest.$ac_objext 70749-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70750- (eval $ac_compile) 2>conftest.er1 70751- ac_status=$? 70752- grep -v '^ *+' conftest.er1 >conftest.err 70753- rm -f conftest.er1 70754- cat conftest.err >&5 70755- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70756- (exit $ac_status); } && 70757- { ac_try='test -z "$ac_c_werror_flag" 70758- || test ! -s conftest.err' 70759- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70760- (eval $ac_try) 2>&5 70761- ac_status=$? 70762- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70763- (exit $ac_status); }; } && 70764- { ac_try='test -s conftest.$ac_objext' 70765- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70766- (eval $ac_try) 2>&5 70767- ac_status=$? 70768- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70769- (exit $ac_status); }; }; then 70770- ac_hi=-1 ac_mid=-1 70771- while :; do 70772- cat >conftest.$ac_ext <<_ACEOF 70773-/* confdefs.h. */ 70774-_ACEOF 70775-cat confdefs.h >>conftest.$ac_ext 70776-cat >>conftest.$ac_ext <<_ACEOF 70777-/* end confdefs.h. */ 70778-$ac_includes_default 70779-int 70780-main () 70781-{ 70782-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; 70783-test_array [0] = 0 70784- 70785- ; 70786- return 0; 70787-} 70788-_ACEOF 70789-rm -f conftest.$ac_objext 70790-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70791- (eval $ac_compile) 2>conftest.er1 70792- ac_status=$? 70793- grep -v '^ *+' conftest.er1 >conftest.err 70794- rm -f conftest.er1 70795- cat conftest.err >&5 70796- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70797- (exit $ac_status); } && 70798- { ac_try='test -z "$ac_c_werror_flag" 70799- || test ! -s conftest.err' 70800- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70801- (eval $ac_try) 2>&5 70802- ac_status=$? 70803- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70804- (exit $ac_status); }; } && 70805- { ac_try='test -s conftest.$ac_objext' 70806- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70807- (eval $ac_try) 2>&5 70808- ac_status=$? 70809- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70810- (exit $ac_status); }; }; then 70811- ac_lo=$ac_mid; break 70812-else 70813- echo "$as_me: failed program was:" >&5 70814-sed 's/^/| /' conftest.$ac_ext >&5 70815- 70816-ac_hi=`expr '(' $ac_mid ')' - 1` 70817- if test $ac_mid -le $ac_hi; then 70818- ac_lo= ac_hi= 70819- break 70820- fi 70821- ac_mid=`expr 2 '*' $ac_mid` 70822-fi 70823-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70824- done 70825-else 70826- echo "$as_me: failed program was:" >&5 70827-sed 's/^/| /' conftest.$ac_ext >&5 70828- 70829-ac_lo= ac_hi= 70830-fi 70831-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70832-fi 70833-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70834-# Binary search between lo and hi bounds. 70835-while test "x$ac_lo" != "x$ac_hi"; do 70836- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 70837- cat >conftest.$ac_ext <<_ACEOF 70838-/* confdefs.h. */ 70839-_ACEOF 70840-cat confdefs.h >>conftest.$ac_ext 70841-cat >>conftest.$ac_ext <<_ACEOF 70842-/* end confdefs.h. */ 70843-$ac_includes_default 70844-int 70845-main () 70846-{ 70847-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 70848-test_array [0] = 0 70849+fi 70850+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 70851+cat >> confdefs.h <<EOF 70852+#define SIZEOF_INT $ac_cv_sizeof_int 70853+EOF 70854 70855- ; 70856- return 0; 70857-} 70858-_ACEOF 70859-rm -f conftest.$ac_objext 70860-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 70861- (eval $ac_compile) 2>conftest.er1 70862- ac_status=$? 70863- grep -v '^ *+' conftest.er1 >conftest.err 70864- rm -f conftest.er1 70865- cat conftest.err >&5 70866- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70867- (exit $ac_status); } && 70868- { ac_try='test -z "$ac_c_werror_flag" 70869- || test ! -s conftest.err' 70870- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70871- (eval $ac_try) 2>&5 70872- ac_status=$? 70873- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70874- (exit $ac_status); }; } && 70875- { ac_try='test -s conftest.$ac_objext' 70876- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70877- (eval $ac_try) 2>&5 70878- ac_status=$? 70879- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70880- (exit $ac_status); }; }; then 70881- ac_hi=$ac_mid 70882-else 70883- echo "$as_me: failed program was:" >&5 70884-sed 's/^/| /' conftest.$ac_ext >&5 70885 70886-ac_lo=`expr '(' $ac_mid ')' + 1` 70887-fi 70888-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 70889-done 70890-case $ac_lo in 70891-?*) ac_cv_sizeof_long=$ac_lo;; 70892-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 70893-See \`config.log' for more details." >&5 70894-echo "$as_me: error: cannot compute sizeof (long), 77 70895-See \`config.log' for more details." >&2;} 70896- { (exit 1); exit 1; }; } ;; 70897-esac 70898+ echo $ac_n "checking size of long""... $ac_c" 1>&6 70899+echo "configure:45960: checking size of long" >&5 70900+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 70901+ echo $ac_n "(cached) $ac_c" 1>&6 70902 else 70903 if test "$cross_compiling" = yes; then 70904- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 70905-See \`config.log' for more details." >&5 70906-echo "$as_me: error: cannot run test program while cross compiling 70907-See \`config.log' for more details." >&2;} 70908- { (exit 1); exit 1; }; } 70909-else 70910- cat >conftest.$ac_ext <<_ACEOF 70911-/* confdefs.h. */ 70912-_ACEOF 70913-cat confdefs.h >>conftest.$ac_ext 70914-cat >>conftest.$ac_ext <<_ACEOF 70915-/* end confdefs.h. */ 70916-$ac_includes_default 70917-long longval () { return (long) (sizeof (long)); } 70918-unsigned long ulongval () { return (long) (sizeof (long)); } 70919+ ac_cv_sizeof_long=4 70920+else 70921+ cat > conftest.$ac_ext <<EOF 70922+#line 45968 "configure" 70923+#include "confdefs.h" 70924 #include <stdio.h> 70925-#include <stdlib.h> 70926-int 70927-main () 70928+main() 70929 { 70930- 70931- FILE *f = fopen ("conftest.val", "w"); 70932- if (! f) 70933- exit (1); 70934- if (((long) (sizeof (long))) < 0) 70935- { 70936- long i = longval (); 70937- if (i != ((long) (sizeof (long)))) 70938- exit (1); 70939- fprintf (f, "%ld\n", i); 70940- } 70941- else 70942- { 70943- unsigned long i = ulongval (); 70944- if (i != ((long) (sizeof (long)))) 70945- exit (1); 70946- fprintf (f, "%lu\n", i); 70947- } 70948- exit (ferror (f) || fclose (f) != 0); 70949- 70950- ; 70951- return 0; 70952+ FILE *f=fopen("conftestval", "w"); 70953+ if (!f) exit(1); 70954+ fprintf(f, "%d\n", sizeof(long)); 70955+ exit(0); 70956 } 70957-_ACEOF 70958-rm -f conftest$ac_exeext 70959-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 70960- (eval $ac_link) 2>&5 70961- ac_status=$? 70962- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70963- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 70964- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 70965- (eval $ac_try) 2>&5 70966- ac_status=$? 70967- echo "$as_me:$LINENO: \$? = $ac_status" >&5 70968- (exit $ac_status); }; }; then 70969- ac_cv_sizeof_long=`cat conftest.val` 70970-else 70971- echo "$as_me: program exited with status $ac_status" >&5 70972-echo "$as_me: failed program was:" >&5 70973-sed 's/^/| /' conftest.$ac_ext >&5 70974- 70975-( exit $ac_status ) 70976-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 70977-See \`config.log' for more details." >&5 70978-echo "$as_me: error: cannot compute sizeof (long), 77 70979-See \`config.log' for more details." >&2;} 70980- { (exit 1); exit 1; }; } 70981-fi 70982-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 70983-fi 70984-fi 70985-rm -f conftest.val 70986+EOF 70987+if { (eval echo configure:45979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 70988+then 70989+ ac_cv_sizeof_long=`cat conftestval` 70990 else 70991+ echo "configure: failed program was:" >&5 70992+ cat conftest.$ac_ext >&5 70993+ rm -fr conftest* 70994 ac_cv_sizeof_long=0 70995 fi 70996+rm -fr conftest* 70997 fi 70998-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 70999-echo "${ECHO_T}$ac_cv_sizeof_long" >&6 71000-cat >>confdefs.h <<_ACEOF 71001-#define SIZEOF_LONG $ac_cv_sizeof_long 71002-_ACEOF 71003- 71004- 71005- echo "$as_me:$LINENO: checking for long long" >&5 71006-echo $ECHO_N "checking for long long... $ECHO_C" >&6 71007-if test "${ac_cv_type_long_long+set}" = set; then 71008- echo $ECHO_N "(cached) $ECHO_C" >&6 71009-else 71010- cat >conftest.$ac_ext <<_ACEOF 71011-/* confdefs.h. */ 71012-_ACEOF 71013-cat confdefs.h >>conftest.$ac_ext 71014-cat >>conftest.$ac_ext <<_ACEOF 71015-/* end confdefs.h. */ 71016-$ac_includes_default 71017-int 71018-main () 71019-{ 71020-if ((long long *) 0) 71021- return 0; 71022-if (sizeof (long long)) 71023- return 0; 71024- ; 71025- return 0; 71026-} 71027-_ACEOF 71028-rm -f conftest.$ac_objext 71029-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71030- (eval $ac_compile) 2>conftest.er1 71031- ac_status=$? 71032- grep -v '^ *+' conftest.er1 >conftest.err 71033- rm -f conftest.er1 71034- cat conftest.err >&5 71035- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71036- (exit $ac_status); } && 71037- { ac_try='test -z "$ac_c_werror_flag" 71038- || test ! -s conftest.err' 71039- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71040- (eval $ac_try) 2>&5 71041- ac_status=$? 71042- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71043- (exit $ac_status); }; } && 71044- { ac_try='test -s conftest.$ac_objext' 71045- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71046- (eval $ac_try) 2>&5 71047- ac_status=$? 71048- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71049- (exit $ac_status); }; }; then 71050- ac_cv_type_long_long=yes 71051-else 71052- echo "$as_me: failed program was:" >&5 71053-sed 's/^/| /' conftest.$ac_ext >&5 71054- 71055-ac_cv_type_long_long=no 71056-fi 71057-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71058-fi 71059-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 71060-echo "${ECHO_T}$ac_cv_type_long_long" >&6 71061- 71062-echo "$as_me:$LINENO: checking size of long long" >&5 71063-echo $ECHO_N "checking size of long long... $ECHO_C" >&6 71064-if test "${ac_cv_sizeof_long_long+set}" = set; then 71065- echo $ECHO_N "(cached) $ECHO_C" >&6 71066-else 71067- if test "$ac_cv_type_long_long" = yes; then 71068- # The cast to unsigned long works around a bug in the HP C Compiler 71069- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 71070- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 71071- # This bug is HP SR number 8606223364. 71072- if test "$cross_compiling" = yes; then 71073- # Depending upon the size, compute the lo and hi bounds. 71074-cat >conftest.$ac_ext <<_ACEOF 71075-/* confdefs.h. */ 71076-_ACEOF 71077-cat confdefs.h >>conftest.$ac_ext 71078-cat >>conftest.$ac_ext <<_ACEOF 71079-/* end confdefs.h. */ 71080-$ac_includes_default 71081-int 71082-main () 71083-{ 71084-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; 71085-test_array [0] = 0 71086- 71087- ; 71088- return 0; 71089-} 71090-_ACEOF 71091-rm -f conftest.$ac_objext 71092-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71093- (eval $ac_compile) 2>conftest.er1 71094- ac_status=$? 71095- grep -v '^ *+' conftest.er1 >conftest.err 71096- rm -f conftest.er1 71097- cat conftest.err >&5 71098- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71099- (exit $ac_status); } && 71100- { ac_try='test -z "$ac_c_werror_flag" 71101- || test ! -s conftest.err' 71102- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71103- (eval $ac_try) 2>&5 71104- ac_status=$? 71105- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71106- (exit $ac_status); }; } && 71107- { ac_try='test -s conftest.$ac_objext' 71108- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71109- (eval $ac_try) 2>&5 71110- ac_status=$? 71111- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71112- (exit $ac_status); }; }; then 71113- ac_lo=0 ac_mid=0 71114- while :; do 71115- cat >conftest.$ac_ext <<_ACEOF 71116-/* confdefs.h. */ 71117-_ACEOF 71118-cat confdefs.h >>conftest.$ac_ext 71119-cat >>conftest.$ac_ext <<_ACEOF 71120-/* end confdefs.h. */ 71121-$ac_includes_default 71122-int 71123-main () 71124-{ 71125-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 71126-test_array [0] = 0 71127- 71128- ; 71129- return 0; 71130-} 71131-_ACEOF 71132-rm -f conftest.$ac_objext 71133-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71134- (eval $ac_compile) 2>conftest.er1 71135- ac_status=$? 71136- grep -v '^ *+' conftest.er1 >conftest.err 71137- rm -f conftest.er1 71138- cat conftest.err >&5 71139- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71140- (exit $ac_status); } && 71141- { ac_try='test -z "$ac_c_werror_flag" 71142- || test ! -s conftest.err' 71143- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71144- (eval $ac_try) 2>&5 71145- ac_status=$? 71146- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71147- (exit $ac_status); }; } && 71148- { ac_try='test -s conftest.$ac_objext' 71149- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71150- (eval $ac_try) 2>&5 71151- ac_status=$? 71152- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71153- (exit $ac_status); }; }; then 71154- ac_hi=$ac_mid; break 71155-else 71156- echo "$as_me: failed program was:" >&5 71157-sed 's/^/| /' conftest.$ac_ext >&5 71158- 71159-ac_lo=`expr $ac_mid + 1` 71160- if test $ac_lo -le $ac_mid; then 71161- ac_lo= ac_hi= 71162- break 71163- fi 71164- ac_mid=`expr 2 '*' $ac_mid + 1` 71165-fi 71166-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71167- done 71168-else 71169- echo "$as_me: failed program was:" >&5 71170-sed 's/^/| /' conftest.$ac_ext >&5 71171- 71172-cat >conftest.$ac_ext <<_ACEOF 71173-/* confdefs.h. */ 71174-_ACEOF 71175-cat confdefs.h >>conftest.$ac_ext 71176-cat >>conftest.$ac_ext <<_ACEOF 71177-/* end confdefs.h. */ 71178-$ac_includes_default 71179-int 71180-main () 71181-{ 71182-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; 71183-test_array [0] = 0 71184- 71185- ; 71186- return 0; 71187-} 71188-_ACEOF 71189-rm -f conftest.$ac_objext 71190-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71191- (eval $ac_compile) 2>conftest.er1 71192- ac_status=$? 71193- grep -v '^ *+' conftest.er1 >conftest.err 71194- rm -f conftest.er1 71195- cat conftest.err >&5 71196- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71197- (exit $ac_status); } && 71198- { ac_try='test -z "$ac_c_werror_flag" 71199- || test ! -s conftest.err' 71200- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71201- (eval $ac_try) 2>&5 71202- ac_status=$? 71203- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71204- (exit $ac_status); }; } && 71205- { ac_try='test -s conftest.$ac_objext' 71206- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71207- (eval $ac_try) 2>&5 71208- ac_status=$? 71209- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71210- (exit $ac_status); }; }; then 71211- ac_hi=-1 ac_mid=-1 71212- while :; do 71213- cat >conftest.$ac_ext <<_ACEOF 71214-/* confdefs.h. */ 71215-_ACEOF 71216-cat confdefs.h >>conftest.$ac_ext 71217-cat >>conftest.$ac_ext <<_ACEOF 71218-/* end confdefs.h. */ 71219-$ac_includes_default 71220-int 71221-main () 71222-{ 71223-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; 71224-test_array [0] = 0 71225 71226- ; 71227- return 0; 71228-} 71229-_ACEOF 71230-rm -f conftest.$ac_objext 71231-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71232- (eval $ac_compile) 2>conftest.er1 71233- ac_status=$? 71234- grep -v '^ *+' conftest.er1 >conftest.err 71235- rm -f conftest.er1 71236- cat conftest.err >&5 71237- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71238- (exit $ac_status); } && 71239- { ac_try='test -z "$ac_c_werror_flag" 71240- || test ! -s conftest.err' 71241- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71242- (eval $ac_try) 2>&5 71243- ac_status=$? 71244- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71245- (exit $ac_status); }; } && 71246- { ac_try='test -s conftest.$ac_objext' 71247- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71248- (eval $ac_try) 2>&5 71249- ac_status=$? 71250- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71251- (exit $ac_status); }; }; then 71252- ac_lo=$ac_mid; break 71253-else 71254- echo "$as_me: failed program was:" >&5 71255-sed 's/^/| /' conftest.$ac_ext >&5 71256- 71257-ac_hi=`expr '(' $ac_mid ')' - 1` 71258- if test $ac_mid -le $ac_hi; then 71259- ac_lo= ac_hi= 71260- break 71261- fi 71262- ac_mid=`expr 2 '*' $ac_mid` 71263-fi 71264-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71265- done 71266-else 71267- echo "$as_me: failed program was:" >&5 71268-sed 's/^/| /' conftest.$ac_ext >&5 71269- 71270-ac_lo= ac_hi= 71271-fi 71272-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71273-fi 71274-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71275-# Binary search between lo and hi bounds. 71276-while test "x$ac_lo" != "x$ac_hi"; do 71277- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 71278- cat >conftest.$ac_ext <<_ACEOF 71279-/* confdefs.h. */ 71280-_ACEOF 71281-cat confdefs.h >>conftest.$ac_ext 71282-cat >>conftest.$ac_ext <<_ACEOF 71283-/* end confdefs.h. */ 71284-$ac_includes_default 71285-int 71286-main () 71287-{ 71288-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 71289-test_array [0] = 0 71290+fi 71291+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 71292+cat >> confdefs.h <<EOF 71293+#define SIZEOF_LONG $ac_cv_sizeof_long 71294+EOF 71295 71296- ; 71297- return 0; 71298-} 71299-_ACEOF 71300-rm -f conftest.$ac_objext 71301-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 71302- (eval $ac_compile) 2>conftest.er1 71303- ac_status=$? 71304- grep -v '^ *+' conftest.er1 >conftest.err 71305- rm -f conftest.er1 71306- cat conftest.err >&5 71307- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71308- (exit $ac_status); } && 71309- { ac_try='test -z "$ac_c_werror_flag" 71310- || test ! -s conftest.err' 71311- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71312- (eval $ac_try) 2>&5 71313- ac_status=$? 71314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71315- (exit $ac_status); }; } && 71316- { ac_try='test -s conftest.$ac_objext' 71317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71318- (eval $ac_try) 2>&5 71319- ac_status=$? 71320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71321- (exit $ac_status); }; }; then 71322- ac_hi=$ac_mid 71323-else 71324- echo "$as_me: failed program was:" >&5 71325-sed 's/^/| /' conftest.$ac_ext >&5 71326 71327-ac_lo=`expr '(' $ac_mid ')' + 1` 71328-fi 71329-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 71330-done 71331-case $ac_lo in 71332-?*) ac_cv_sizeof_long_long=$ac_lo;; 71333-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 71334-See \`config.log' for more details." >&5 71335-echo "$as_me: error: cannot compute sizeof (long long), 77 71336-See \`config.log' for more details." >&2;} 71337- { (exit 1); exit 1; }; } ;; 71338-esac 71339+ echo $ac_n "checking size of long long""... $ac_c" 1>&6 71340+echo "configure:45999: checking size of long long" >&5 71341+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then 71342+ echo $ac_n "(cached) $ac_c" 1>&6 71343 else 71344 if test "$cross_compiling" = yes; then 71345- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 71346-See \`config.log' for more details." >&5 71347-echo "$as_me: error: cannot run test program while cross compiling 71348-See \`config.log' for more details." >&2;} 71349- { (exit 1); exit 1; }; } 71350-else 71351- cat >conftest.$ac_ext <<_ACEOF 71352-/* confdefs.h. */ 71353-_ACEOF 71354-cat confdefs.h >>conftest.$ac_ext 71355-cat >>conftest.$ac_ext <<_ACEOF 71356-/* end confdefs.h. */ 71357-$ac_includes_default 71358-long longval () { return (long) (sizeof (long long)); } 71359-unsigned long ulongval () { return (long) (sizeof (long long)); } 71360+ ac_cv_sizeof_long_long=8 71361+else 71362+ cat > conftest.$ac_ext <<EOF 71363+#line 46007 "configure" 71364+#include "confdefs.h" 71365 #include <stdio.h> 71366-#include <stdlib.h> 71367-int 71368-main () 71369+main() 71370 { 71371- 71372- FILE *f = fopen ("conftest.val", "w"); 71373- if (! f) 71374- exit (1); 71375- if (((long) (sizeof (long long))) < 0) 71376- { 71377- long i = longval (); 71378- if (i != ((long) (sizeof (long long)))) 71379- exit (1); 71380- fprintf (f, "%ld\n", i); 71381- } 71382- else 71383- { 71384- unsigned long i = ulongval (); 71385- if (i != ((long) (sizeof (long long)))) 71386- exit (1); 71387- fprintf (f, "%lu\n", i); 71388- } 71389- exit (ferror (f) || fclose (f) != 0); 71390- 71391- ; 71392- return 0; 71393+ FILE *f=fopen("conftestval", "w"); 71394+ if (!f) exit(1); 71395+ fprintf(f, "%d\n", sizeof(long long)); 71396+ exit(0); 71397 } 71398-_ACEOF 71399-rm -f conftest$ac_exeext 71400-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 71401- (eval $ac_link) 2>&5 71402- ac_status=$? 71403- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71404- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 71405- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71406- (eval $ac_try) 2>&5 71407- ac_status=$? 71408- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71409- (exit $ac_status); }; }; then 71410- ac_cv_sizeof_long_long=`cat conftest.val` 71411-else 71412- echo "$as_me: program exited with status $ac_status" >&5 71413-echo "$as_me: failed program was:" >&5 71414-sed 's/^/| /' conftest.$ac_ext >&5 71415- 71416-( exit $ac_status ) 71417-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 71418-See \`config.log' for more details." >&5 71419-echo "$as_me: error: cannot compute sizeof (long long), 77 71420-See \`config.log' for more details." >&2;} 71421- { (exit 1); exit 1; }; } 71422-fi 71423-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 71424-fi 71425-fi 71426-rm -f conftest.val 71427+EOF 71428+if { (eval echo configure:46018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 71429+then 71430+ ac_cv_sizeof_long_long=`cat conftestval` 71431 else 71432+ echo "configure: failed program was:" >&5 71433+ cat conftest.$ac_ext >&5 71434+ rm -fr conftest* 71435 ac_cv_sizeof_long_long=0 71436 fi 71437+rm -fr conftest* 71438 fi 71439-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 71440-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 71441-cat >>confdefs.h <<_ACEOF 71442-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 71443-_ACEOF 71444 71445+fi 71446+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 71447+cat >> confdefs.h <<EOF 71448+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 71449+EOF 71450 71451 71452+ 71453 EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ 71454 hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ 71455 hash_crc32.c hash_salsa.c" 71456@@ -61416,8 +46041,8 @@ 71457 php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ 71458 php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h php_hash_salsa.h \ 71459 php_hash_types.h" 71460- 71461- 71462+ 71463+ 71464 ext_builddir=ext/hash 71465 ext_srcdir=$abs_srcdir/ext/hash 71466 71467@@ -61425,15 +46050,15 @@ 71468 71469 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 71470 PHP_HASH_SHARED=no 71471- 71472- 71473+ 71474+ 71475 case ext/hash in 71476 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 71477 /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 71478 *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 71479 esac 71480- 71481- 71482+ 71483+ 71484 71485 b_c_pre=$php_c_pre 71486 b_cxx_pre=$php_cxx_pre 71487@@ -61446,12 +46071,12 @@ 71488 71489 old_IFS=$IFS 71490 for ac_src in $EXT_HASH_SOURCES; do 71491- 71492+ 71493 IFS=. 71494 set $ac_src 71495 ac_obj=$1 71496 IFS=$old_IFS 71497- 71498+ 71499 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 71500 71501 case $ac_src in 71502@@ -61475,14 +46100,14 @@ 71503 else 71504 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 71505 PHP_HASH_SHARED=yes 71506- 71507+ 71508 case ext/hash in 71509 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 71510 /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 71511 *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 71512 esac 71513- 71514- 71515+ 71516+ 71517 71518 b_c_pre=$shared_c_pre 71519 b_cxx_pre=$shared_cxx_pre 71520@@ -61495,12 +46120,12 @@ 71521 71522 old_IFS=$IFS 71523 for ac_src in $EXT_HASH_SOURCES; do 71524- 71525+ 71526 IFS=. 71527 set $ac_src 71528 ac_obj=$1 71529 IFS=$old_IFS 71530- 71531+ 71532 shared_objects_hash="$shared_objects_hash $ac_bdir$ac_obj.lo" 71533 71534 case $ac_src in 71535@@ -61518,7 +46143,7 @@ 71536 71537 case $host_alias in 71538 *netware*) 71539- 71540+ 71541 install_modules="install-modules" 71542 71543 case $host_alias in 71544@@ -61528,7 +46153,7 @@ 71545 ;; 71546 *netware*) 71547 suffix=nlm 71548- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(HASH_SHARED_LIBADD)' 71549+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPHASH, 3)_SHARED_LIBADD)' 71550 ;; 71551 *) 71552 suffix=la 71553@@ -61541,7 +46166,7 @@ 71554 else 71555 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphash.$suffix" 71556 fi 71557- 71558+ 71559 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_hash" 71560 71561 cat >>Makefile.objects<<EOF 71562@@ -61555,7 +46180,7 @@ 71563 71564 ;; 71565 *) 71566- 71567+ 71568 install_modules="install-modules" 71569 71570 case $host_alias in 71571@@ -61565,7 +46190,7 @@ 71572 ;; 71573 *netware*) 71574 suffix=nlm 71575- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(H_SHARED_LIBADD)' 71576+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_hash) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(HASH, 3)_SHARED_LIBADD)' 71577 ;; 71578 *) 71579 suffix=la 71580@@ -61578,7 +46203,7 @@ 71581 else 71582 PHP_MODULES="$PHP_MODULES \$(phplibdir)/hash.$suffix" 71583 fi 71584- 71585+ 71586 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_hash" 71587 71588 cat >>Makefile.objects<<EOF 71589@@ -61592,10 +46217,9 @@ 71590 71591 ;; 71592 esac 71593- 71594-cat >>confdefs.h <<_ACEOF 71595+ cat >> confdefs.h <<EOF 71596 #define COMPILE_DL_HASH 1 71597-_ACEOF 71598+EOF 71599 71600 fi 71601 fi 71602@@ -61604,15 +46228,15 @@ 71603 PHP_HASH_SHARED=no 71604 case "$PHP_SAPI" in 71605 cgi|embed) 71606- 71607- 71608+ 71609+ 71610 case ext/hash in 71611 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 71612 /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 71613 *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 71614 esac 71615- 71616- 71617+ 71618+ 71619 71620 b_c_pre=$php_c_pre 71621 b_cxx_pre=$php_cxx_pre 71622@@ -61625,12 +46249,12 @@ 71623 71624 old_IFS=$IFS 71625 for ac_src in $EXT_HASH_SOURCES; do 71626- 71627+ 71628 IFS=. 71629 set $ac_src 71630 ac_obj=$1 71631 IFS=$old_IFS 71632- 71633+ 71634 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 71635 71636 case $ac_src in 71637@@ -61650,15 +46274,15 @@ 71638 EXT_STATIC="$EXT_STATIC hash" 71639 ;; 71640 *) 71641- 71642- 71643+ 71644+ 71645 case ext/hash in 71646 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 71647 /*) ac_srcdir=`echo "ext/hash"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 71648 *) ac_srcdir="$abs_srcdir/ext/hash/"; ac_bdir="ext/hash/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 71649 esac 71650- 71651- 71652+ 71653+ 71654 71655 b_c_pre=$php_c_pre 71656 b_cxx_pre=$php_cxx_pre 71657@@ -61671,13 +46295,13 @@ 71658 71659 old_IFS=$IFS 71660 for ac_src in $EXT_HASH_SOURCES; do 71661- 71662+ 71663 IFS=. 71664 set $ac_src 71665 ac_obj=$1 71666 IFS=$old_IFS 71667- 71668- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 71669+ 71670+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 71671 71672 case $ac_src in 71673 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 71674@@ -61697,60 +46321,60 @@ 71675 esac 71676 EXT_CLI_STATIC="$EXT_CLI_STATIC hash" 71677 fi 71678- 71679- 71680+ 71681+ 71682 BUILD_DIR="$BUILD_DIR $ext_builddir" 71683- 71684+ 71685 71686 71687 if test "$ext_builddir" = "."; then 71688 PHP_PECL_EXTENSION=hash 71689- 71690+ 71691 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 71692 71693 fi 71694 71695- 71696- 71697- 71698+ 71699+ 71700+ 71701 header_path=ext/hash 71702 for header_file in $EXT_HASH_HEADERS; do 71703 hp_hf="$header_path/$header_file" 71704- 71705- 71706+ 71707+ 71708 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 71709- 71710+ 71711 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 71712 if test -n "$unique" && test "`eval $cmd`" = "" ; then 71713 eval "INSTALLHEADERS$unique=set" 71714- 71715+ 71716 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 71717- 71718+ 71719 fi 71720 71721- done 71722- 71723- 71724+ done 71725+ 71726 71727+ 71728 fi 71729 71730 71731 71732 php_with_iconv=yes 71733 71734-echo "$as_me:$LINENO: checking for iconv support" >&5 71735-echo $ECHO_N "checking for iconv support... $ECHO_C" >&6 71736- 71737+echo $ac_n "checking for iconv support""... $ac_c" 1>&6 71738+echo "configure:46367: checking for iconv support" >&5 71739 # Check whether --with-iconv or --without-iconv was given. 71740 if test "${with_iconv+set}" = set; then 71741 withval="$with_iconv" 71742 PHP_ICONV=$withval 71743 else 71744- 71745+ 71746 PHP_ICONV=yes 71747 test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL 71748 71749-fi; 71750+fi 71751+ 71752 71753 71754 ext_output="yes, shared" 71755@@ -61774,15 +46398,14 @@ 71756 71757 71758 71759-echo "$as_me:$LINENO: result: $ext_output" >&5 71760-echo "${ECHO_T}$ext_output" >&6 71761+echo "$ac_t""$ext_output" 1>&6 71762 71763 71764 71765 71766 if test "$PHP_ICONV" != "no"; then 71767 71768- 71769+ 71770 found_iconv=no 71771 unset ICONV_DIR 71772 71773@@ -61799,211 +46422,117 @@ 71774 echo > ext/iconv/php_php_iconv_h_path.h 71775 echo > ext/iconv/php_iconv_supports_errno.h 71776 71777- 71778+ 71779 if test "$PHP_ICONV" = "yes"; then 71780 LIBS_save="$LIBS" 71781 LIBS= 71782- echo "$as_me:$LINENO: checking for iconv" >&5 71783-echo $ECHO_N "checking for iconv... $ECHO_C" >&6 71784-if test "${ac_cv_func_iconv+set}" = set; then 71785- echo $ECHO_N "(cached) $ECHO_C" >&6 71786-else 71787- cat >conftest.$ac_ext <<_ACEOF 71788-/* confdefs.h. */ 71789-_ACEOF 71790-cat confdefs.h >>conftest.$ac_ext 71791-cat >>conftest.$ac_ext <<_ACEOF 71792-/* end confdefs.h. */ 71793-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv. 71794- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 71795-#define iconv innocuous_iconv 71796- 71797+ echo $ac_n "checking for iconv""... $ac_c" 1>&6 71798+echo "configure:46431: checking for iconv" >&5 71799+if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then 71800+ echo $ac_n "(cached) $ac_c" 1>&6 71801+else 71802+ cat > conftest.$ac_ext <<EOF 71803+#line 46436 "configure" 71804+#include "confdefs.h" 71805 /* System header to define __stub macros and hopefully few prototypes, 71806- which can conflict with char iconv (); below. 71807- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 71808- <limits.h> exists even on freestanding compilers. */ 71809- 71810-#ifdef __STDC__ 71811-# include <limits.h> 71812-#else 71813-# include <assert.h> 71814-#endif 71815- 71816-#undef iconv 71817- 71818+ which can conflict with char iconv(); below. */ 71819+#include <assert.h> 71820 /* Override any gcc2 internal prototype to avoid an error. */ 71821-#ifdef __cplusplus 71822-extern "C" 71823-{ 71824-#endif 71825 /* We use char because int might match the return type of a gcc2 71826- builtin and then its argument prototype would still apply. */ 71827-char iconv (); 71828+ builtin and then its argument prototype would still apply. */ 71829+char iconv(); 71830+ 71831+int main() { 71832+ 71833 /* The GNU C library defines this for functions which it implements 71834 to always fail with ENOSYS. Some functions are actually named 71835 something starting with __ and the normal name is an alias. */ 71836 #if defined (__stub_iconv) || defined (__stub___iconv) 71837 choke me 71838 #else 71839-char (*f) () = iconv; 71840-#endif 71841-#ifdef __cplusplus 71842-} 71843+iconv(); 71844 #endif 71845 71846-int 71847-main () 71848-{ 71849-return f != iconv; 71850- ; 71851- return 0; 71852-} 71853-_ACEOF 71854-rm -f conftest.$ac_objext conftest$ac_exeext 71855-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 71856- (eval $ac_link) 2>conftest.er1 71857- ac_status=$? 71858- grep -v '^ *+' conftest.er1 >conftest.err 71859- rm -f conftest.er1 71860- cat conftest.err >&5 71861- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71862- (exit $ac_status); } && 71863- { ac_try='test -z "$ac_c_werror_flag" 71864- || test ! -s conftest.err' 71865- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71866- (eval $ac_try) 2>&5 71867- ac_status=$? 71868- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71869- (exit $ac_status); }; } && 71870- { ac_try='test -s conftest$ac_exeext' 71871- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71872- (eval $ac_try) 2>&5 71873- ac_status=$? 71874- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71875- (exit $ac_status); }; }; then 71876- ac_cv_func_iconv=yes 71877-else 71878- echo "$as_me: failed program was:" >&5 71879-sed 's/^/| /' conftest.$ac_ext >&5 71880- 71881-ac_cv_func_iconv=no 71882-fi 71883-rm -f conftest.err conftest.$ac_objext \ 71884- conftest$ac_exeext conftest.$ac_ext 71885-fi 71886-echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5 71887-echo "${ECHO_T}$ac_cv_func_iconv" >&6 71888-if test $ac_cv_func_iconv = yes; then 71889+; return 0; } 71890+EOF 71891+if { (eval echo configure:46459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 71892+ rm -rf conftest* 71893+ eval "ac_cv_func_iconv=yes" 71894+else 71895+ echo "configure: failed program was:" >&5 71896+ cat conftest.$ac_ext >&5 71897+ rm -rf conftest* 71898+ eval "ac_cv_func_iconv=no" 71899+fi 71900+rm -f conftest* 71901+fi 71902 71903+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then 71904+ echo "$ac_t""yes" 1>&6 71905+ 71906 found_iconv=yes 71907- 71908+ 71909 else 71910+ echo "$ac_t""no" 1>&6 71911 71912- echo "$as_me:$LINENO: checking for libiconv" >&5 71913-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6 71914-if test "${ac_cv_func_libiconv+set}" = set; then 71915- echo $ECHO_N "(cached) $ECHO_C" >&6 71916-else 71917- cat >conftest.$ac_ext <<_ACEOF 71918-/* confdefs.h. */ 71919-_ACEOF 71920-cat confdefs.h >>conftest.$ac_ext 71921-cat >>conftest.$ac_ext <<_ACEOF 71922-/* end confdefs.h. */ 71923-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv. 71924- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 71925-#define libiconv innocuous_libiconv 71926- 71927+ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 71928+echo "configure:46480: checking for libiconv" >&5 71929+if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then 71930+ echo $ac_n "(cached) $ac_c" 1>&6 71931+else 71932+ cat > conftest.$ac_ext <<EOF 71933+#line 46485 "configure" 71934+#include "confdefs.h" 71935 /* System header to define __stub macros and hopefully few prototypes, 71936- which can conflict with char libiconv (); below. 71937- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 71938- <limits.h> exists even on freestanding compilers. */ 71939- 71940-#ifdef __STDC__ 71941-# include <limits.h> 71942-#else 71943-# include <assert.h> 71944-#endif 71945- 71946-#undef libiconv 71947- 71948+ which can conflict with char libiconv(); below. */ 71949+#include <assert.h> 71950 /* Override any gcc2 internal prototype to avoid an error. */ 71951-#ifdef __cplusplus 71952-extern "C" 71953-{ 71954-#endif 71955 /* We use char because int might match the return type of a gcc2 71956- builtin and then its argument prototype would still apply. */ 71957-char libiconv (); 71958+ builtin and then its argument prototype would still apply. */ 71959+char libiconv(); 71960+ 71961+int main() { 71962+ 71963 /* The GNU C library defines this for functions which it implements 71964 to always fail with ENOSYS. Some functions are actually named 71965 something starting with __ and the normal name is an alias. */ 71966 #if defined (__stub_libiconv) || defined (__stub___libiconv) 71967 choke me 71968 #else 71969-char (*f) () = libiconv; 71970+libiconv(); 71971 #endif 71972-#ifdef __cplusplus 71973-} 71974-#endif 71975- 71976-int 71977-main () 71978-{ 71979-return f != libiconv; 71980- ; 71981- return 0; 71982-} 71983-_ACEOF 71984-rm -f conftest.$ac_objext conftest$ac_exeext 71985-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 71986- (eval $ac_link) 2>conftest.er1 71987- ac_status=$? 71988- grep -v '^ *+' conftest.er1 >conftest.err 71989- rm -f conftest.er1 71990- cat conftest.err >&5 71991- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71992- (exit $ac_status); } && 71993- { ac_try='test -z "$ac_c_werror_flag" 71994- || test ! -s conftest.err' 71995- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 71996- (eval $ac_try) 2>&5 71997- ac_status=$? 71998- echo "$as_me:$LINENO: \$? = $ac_status" >&5 71999- (exit $ac_status); }; } && 72000- { ac_try='test -s conftest$ac_exeext' 72001- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72002- (eval $ac_try) 2>&5 72003- ac_status=$? 72004- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72005- (exit $ac_status); }; }; then 72006- ac_cv_func_libiconv=yes 72007-else 72008- echo "$as_me: failed program was:" >&5 72009-sed 's/^/| /' conftest.$ac_ext >&5 72010- 72011-ac_cv_func_libiconv=no 72012-fi 72013-rm -f conftest.err conftest.$ac_objext \ 72014- conftest$ac_exeext conftest.$ac_ext 72015-fi 72016-echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5 72017-echo "${ECHO_T}$ac_cv_func_libiconv" >&6 72018-if test $ac_cv_func_libiconv = yes; then 72019 72020+; return 0; } 72021+EOF 72022+if { (eval echo configure:46508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 72023+ rm -rf conftest* 72024+ eval "ac_cv_func_libiconv=yes" 72025+else 72026+ echo "configure: failed program was:" >&5 72027+ cat conftest.$ac_ext >&5 72028+ rm -rf conftest* 72029+ eval "ac_cv_func_libiconv=no" 72030+fi 72031+rm -f conftest* 72032+fi 72033 72034+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then 72035+ echo "$ac_t""yes" 1>&6 72036+ 72037+ 72038 echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h 72039 72040- 72041-cat >>confdefs.h <<\_ACEOF 72042+ cat >> confdefs.h <<\EOF 72043 #define HAVE_LIBICONV 1 72044-_ACEOF 72045+EOF 72046 72047 found_iconv=yes 72048- 72049+ 72050+else 72051+ echo "$ac_t""no" 1>&6 72052 fi 72053 72054- 72055+ 72056 fi 72057 72058 LIBS="$LIBS_save" 72059@@ -62013,10 +46542,9 @@ 72060 72061 for i in $PHP_ICONV /usr/local /usr; do 72062 if test -r $i/include/giconv.h; then 72063- 72064-cat >>confdefs.h <<\_ACEOF 72065+ cat >> confdefs.h <<\EOF 72066 #define HAVE_GICONV_H 1 72067-_ACEOF 72068+EOF 72069 72070 ICONV_DIR=$i 72071 iconv_lib_name=giconv 72072@@ -62029,33 +46557,31 @@ 72073 done 72074 72075 if test -z "$ICONV_DIR"; then 72076- { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5 72077-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;} 72078- { (exit 1); exit 1; }; } 72079+ { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; } 72080 fi 72081- 72082+ 72083 if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || 72084 test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME 72085 then 72086- 72087+ 72088 save_old_LDFLAGS=$LDFLAGS 72089 ac_stuff=" 72090 -L$ICONV_DIR/$PHP_LIBDIR 72091 " 72092- 72093+ 72094 save_ext_shared=$ext_shared 72095 ext_shared=yes 72096- 72097+ 72098 for ac_i in $ac_stuff; do 72099 case $ac_i in 72100 -pthread) 72101 if test "$ext_shared" = "yes"; then 72102 LDFLAGS="$LDFLAGS -pthread" 72103 else 72104- 72105- 72106+ 72107+ 72108 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 72109- 72110+ 72111 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 72112 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72113 eval "EXTRA_LDFLAGS$unique=set" 72114@@ -62066,20 +46592,20 @@ 72115 ;; 72116 -l*) 72117 ac_ii=`echo $ac_i|cut -c 3-` 72118- 72119- 72120+ 72121+ 72122 case $ac_ii in 72123 c|c_r|pthread*) ;; 72124- *) 72125+ *) 72126 if test "$ext_shared" = "yes"; then 72127- LDFLAGS="$LDFLAGS -l$ac_ii" 72128+ LDFLAGS="$LDFLAGS -l$ac_ii" 72129 else 72130- 72131- 72132+ 72133+ 72134 case $ac_ii in 72135 c|c_r|pthread*) ;; 72136- *) 72137- LIBS="$LIBS -l$ac_ii" 72138+ *) 72139+ LIBS="$LIBS -l$ac_ii" 72140 ;; 72141 esac 72142 72143@@ -62092,162 +46618,130 @@ 72144 ;; 72145 -L*) 72146 ac_ii=`echo $ac_i|cut -c 3-` 72147- 72148+ 72149 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 72150- 72151+ 72152 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 72153 ai_p=$ac_ii 72154 else 72155- 72156+ 72157 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 72158- 72159+ 72160 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 72161 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 72162 fi 72163 72164- 72165+ 72166 if test "$ext_shared" = "yes"; then 72167 LDFLAGS="-L$ai_p $LDFLAGS" 72168 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 72169 else 72170- 72171- 72172- 72173+ 72174+ 72175+ 72176 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 72177- 72178+ 72179 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 72180 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72181 eval "LIBPATH$unique=set" 72182- 72183+ 72184 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 72185 LDFLAGS="$LDFLAGS -L$ai_p" 72186 PHP_RPATHS="$PHP_RPATHS $ai_p" 72187- 72188+ 72189 fi 72190 72191 72192 fi 72193- 72194+ 72195 fi 72196 72197 ;; 72198 esac 72199 done 72200 72201- as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh` 72202-echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5 72203-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6 72204-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 72205- echo $ECHO_N "(cached) $ECHO_C" >&6 72206+ echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 72207+echo "configure:46665: checking for libiconv in -l$iconv_lib_name" >&5 72208+ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` 72209+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 72210+ echo $ac_n "(cached) $ac_c" 1>&6 72211 else 72212- ac_check_lib_save_LIBS=$LIBS 72213+ ac_save_LIBS="$LIBS" 72214 LIBS="-l$iconv_lib_name $LIBS" 72215-cat >conftest.$ac_ext <<_ACEOF 72216-/* confdefs.h. */ 72217-_ACEOF 72218-cat confdefs.h >>conftest.$ac_ext 72219-cat >>conftest.$ac_ext <<_ACEOF 72220-/* end confdefs.h. */ 72221- 72222+cat > conftest.$ac_ext <<EOF 72223+#line 46673 "configure" 72224+#include "confdefs.h" 72225 /* Override any gcc2 internal prototype to avoid an error. */ 72226-#ifdef __cplusplus 72227-extern "C" 72228-#endif 72229 /* We use char because int might match the return type of a gcc2 72230- builtin and then its argument prototype would still apply. */ 72231-char libiconv (); 72232-int 72233-main () 72234-{ 72235-libiconv (); 72236- ; 72237- return 0; 72238-} 72239-_ACEOF 72240-rm -f conftest.$ac_objext conftest$ac_exeext 72241-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 72242- (eval $ac_link) 2>conftest.er1 72243- ac_status=$? 72244- grep -v '^ *+' conftest.er1 >conftest.err 72245- rm -f conftest.er1 72246- cat conftest.err >&5 72247- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72248- (exit $ac_status); } && 72249- { ac_try='test -z "$ac_c_werror_flag" 72250- || test ! -s conftest.err' 72251- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72252- (eval $ac_try) 2>&5 72253- ac_status=$? 72254- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72255- (exit $ac_status); }; } && 72256- { ac_try='test -s conftest$ac_exeext' 72257- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72258- (eval $ac_try) 2>&5 72259- ac_status=$? 72260- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72261- (exit $ac_status); }; }; then 72262- eval "$as_ac_Lib=yes" 72263-else 72264- echo "$as_me: failed program was:" >&5 72265-sed 's/^/| /' conftest.$ac_ext >&5 72266- 72267-eval "$as_ac_Lib=no" 72268-fi 72269-rm -f conftest.err conftest.$ac_objext \ 72270- conftest$ac_exeext conftest.$ac_ext 72271-LIBS=$ac_check_lib_save_LIBS 72272-fi 72273-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 72274-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 72275-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 72276+ builtin and then its argument prototype would still apply. */ 72277+char libiconv(); 72278+ 72279+int main() { 72280+libiconv() 72281+; return 0; } 72282+EOF 72283+if { (eval echo configure:46684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 72284+ rm -rf conftest* 72285+ eval "ac_cv_lib_$ac_lib_var=yes" 72286+else 72287+ echo "configure: failed program was:" >&5 72288+ cat conftest.$ac_ext >&5 72289+ rm -rf conftest* 72290+ eval "ac_cv_lib_$ac_lib_var=no" 72291+fi 72292+rm -f conftest* 72293+LIBS="$ac_save_LIBS" 72294 72295+fi 72296+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 72297+ echo "$ac_t""yes" 1>&6 72298+ 72299 LDFLAGS=$save_old_LDFLAGS 72300 ext_shared=$save_ext_shared 72301- 72302+ 72303 found_iconv=yes 72304- 72305+ 72306 echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h 72307 72308- 72309-cat >>confdefs.h <<\_ACEOF 72310+ cat >> confdefs.h <<\EOF 72311 #define HAVE_LIBICONV 1 72312-_ACEOF 72313- 72314+EOF 72315 72316+ 72317 echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h 72318 72319- 72320-cat >>confdefs.h <<\_ACEOF 72321+ cat >> confdefs.h <<\EOF 72322 #define ICONV_ALIASED_LIBICONV 1 72323-_ACEOF 72324- 72325- 72326+EOF 72327 72328+ 72329+ 72330 else 72331+ echo "$ac_t""no" 1>&6 72332 72333 LDFLAGS=$save_old_LDFLAGS 72334 ext_shared=$save_ext_shared 72335 unset ac_cv_lib_$iconv_lib_name_libiconv 72336- 72337- 72338+ 72339+ 72340 save_old_LDFLAGS=$LDFLAGS 72341 ac_stuff=" 72342 -L$ICONV_DIR/$PHP_LIBDIR 72343 " 72344- 72345+ 72346 save_ext_shared=$ext_shared 72347 ext_shared=yes 72348- 72349+ 72350 for ac_i in $ac_stuff; do 72351 case $ac_i in 72352 -pthread) 72353 if test "$ext_shared" = "yes"; then 72354 LDFLAGS="$LDFLAGS -pthread" 72355 else 72356- 72357- 72358+ 72359+ 72360 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 72361- 72362+ 72363 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 72364 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72365 eval "EXTRA_LDFLAGS$unique=set" 72366@@ -62258,20 +46752,20 @@ 72367 ;; 72368 -l*) 72369 ac_ii=`echo $ac_i|cut -c 3-` 72370- 72371- 72372+ 72373+ 72374 case $ac_ii in 72375 c|c_r|pthread*) ;; 72376- *) 72377+ *) 72378 if test "$ext_shared" = "yes"; then 72379- LDFLAGS="$LDFLAGS -l$ac_ii" 72380+ LDFLAGS="$LDFLAGS -l$ac_ii" 72381 else 72382- 72383- 72384+ 72385+ 72386 case $ac_ii in 72387 c|c_r|pthread*) ;; 72388- *) 72389- LIBS="$LIBS -l$ac_ii" 72390+ *) 72391+ LIBS="$LIBS -l$ac_ii" 72392 ;; 72393 esac 72394 72395@@ -62284,235 +46778,204 @@ 72396 ;; 72397 -L*) 72398 ac_ii=`echo $ac_i|cut -c 3-` 72399- 72400+ 72401 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 72402- 72403+ 72404 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 72405 ai_p=$ac_ii 72406 else 72407- 72408+ 72409 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 72410- 72411+ 72412 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 72413 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 72414 fi 72415 72416- 72417+ 72418 if test "$ext_shared" = "yes"; then 72419 LDFLAGS="-L$ai_p $LDFLAGS" 72420 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 72421 else 72422- 72423- 72424- 72425+ 72426+ 72427+ 72428 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 72429- 72430+ 72431 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 72432 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72433 eval "LIBPATH$unique=set" 72434- 72435+ 72436 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 72437 LDFLAGS="$LDFLAGS -L$ai_p" 72438 PHP_RPATHS="$PHP_RPATHS $ai_p" 72439- 72440+ 72441 fi 72442 72443 72444 fi 72445- 72446+ 72447 fi 72448 72449 ;; 72450 esac 72451 done 72452 72453- as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh` 72454-echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5 72455-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6 72456-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 72457- echo $ECHO_N "(cached) $ECHO_C" >&6 72458+ echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 72459+echo "configure:46825: checking for iconv in -l$iconv_lib_name" >&5 72460+ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` 72461+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 72462+ echo $ac_n "(cached) $ac_c" 1>&6 72463 else 72464- ac_check_lib_save_LIBS=$LIBS 72465+ ac_save_LIBS="$LIBS" 72466 LIBS="-l$iconv_lib_name $LIBS" 72467-cat >conftest.$ac_ext <<_ACEOF 72468-/* confdefs.h. */ 72469-_ACEOF 72470-cat confdefs.h >>conftest.$ac_ext 72471-cat >>conftest.$ac_ext <<_ACEOF 72472-/* end confdefs.h. */ 72473- 72474+cat > conftest.$ac_ext <<EOF 72475+#line 46833 "configure" 72476+#include "confdefs.h" 72477 /* Override any gcc2 internal prototype to avoid an error. */ 72478-#ifdef __cplusplus 72479-extern "C" 72480-#endif 72481 /* We use char because int might match the return type of a gcc2 72482- builtin and then its argument prototype would still apply. */ 72483-char iconv (); 72484-int 72485-main () 72486-{ 72487-iconv (); 72488- ; 72489- return 0; 72490-} 72491-_ACEOF 72492-rm -f conftest.$ac_objext conftest$ac_exeext 72493-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 72494- (eval $ac_link) 2>conftest.er1 72495- ac_status=$? 72496- grep -v '^ *+' conftest.er1 >conftest.err 72497- rm -f conftest.er1 72498- cat conftest.err >&5 72499- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72500- (exit $ac_status); } && 72501- { ac_try='test -z "$ac_c_werror_flag" 72502- || test ! -s conftest.err' 72503- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72504- (eval $ac_try) 2>&5 72505- ac_status=$? 72506- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72507- (exit $ac_status); }; } && 72508- { ac_try='test -s conftest$ac_exeext' 72509- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72510- (eval $ac_try) 2>&5 72511- ac_status=$? 72512- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72513- (exit $ac_status); }; }; then 72514- eval "$as_ac_Lib=yes" 72515-else 72516- echo "$as_me: failed program was:" >&5 72517-sed 's/^/| /' conftest.$ac_ext >&5 72518- 72519-eval "$as_ac_Lib=no" 72520-fi 72521-rm -f conftest.err conftest.$ac_objext \ 72522- conftest$ac_exeext conftest.$ac_ext 72523-LIBS=$ac_check_lib_save_LIBS 72524-fi 72525-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 72526-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 72527-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 72528+ builtin and then its argument prototype would still apply. */ 72529+char iconv(); 72530 72531+int main() { 72532+iconv() 72533+; return 0; } 72534+EOF 72535+if { (eval echo configure:46844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 72536+ rm -rf conftest* 72537+ eval "ac_cv_lib_$ac_lib_var=yes" 72538+else 72539+ echo "configure: failed program was:" >&5 72540+ cat conftest.$ac_ext >&5 72541+ rm -rf conftest* 72542+ eval "ac_cv_lib_$ac_lib_var=no" 72543+fi 72544+rm -f conftest* 72545+LIBS="$ac_save_LIBS" 72546+ 72547+fi 72548+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 72549+ echo "$ac_t""yes" 1>&6 72550+ 72551 LDFLAGS=$save_old_LDFLAGS 72552 ext_shared=$save_ext_shared 72553- 72554+ 72555 found_iconv=yes 72556- 72557- 72558+ 72559+ 72560 else 72561+ echo "$ac_t""no" 1>&6 72562 72563 LDFLAGS=$save_old_LDFLAGS 72564 ext_shared=$save_ext_shared 72565 unset ac_cv_lib_$iconv_lib_name_iconv 72566- 72567- 72568+ 72569+ 72570 fi 72571 72572- 72573- 72574+ 72575+ 72576 fi 72577 72578 fi 72579 fi 72580 72581 if test "$found_iconv" = "yes"; then 72582- 72583+ 72584 echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h 72585 72586- 72587-cat >>confdefs.h <<\_ACEOF 72588+ cat >> confdefs.h <<\EOF 72589 #define HAVE_ICONV 1 72590-_ACEOF 72591+EOF 72592 72593 if test -n "$ICONV_DIR"; then 72594- 72595+ 72596 72597 if test "$ext_shared" = "yes"; then 72598 ICONV_SHARED_LIBADD="-l$iconv_lib_name $ICONV_SHARED_LIBADD" 72599 if test -n "$ICONV_DIR/$PHP_LIBDIR"; then 72600- 72601+ 72602 if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then 72603- 72604+ 72605 if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 72606 ai_p=$ICONV_DIR/$PHP_LIBDIR 72607 else 72608- 72609+ 72610 ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 72611- 72612+ 72613 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 72614 ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" 72615 fi 72616 72617- 72618+ 72619 if test "$ext_shared" = "yes"; then 72620 ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD" 72621 test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_SHARED_LIBADD" 72622 else 72623- 72624- 72625- 72626+ 72627+ 72628+ 72629 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 72630- 72631+ 72632 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 72633 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72634 eval "LIBPATH$unique=set" 72635- 72636+ 72637 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 72638 LDFLAGS="$LDFLAGS -L$ai_p" 72639 PHP_RPATHS="$PHP_RPATHS $ai_p" 72640- 72641+ 72642 fi 72643 72644 72645 fi 72646- 72647+ 72648 fi 72649 72650 fi 72651 else 72652- 72653+ 72654 72655 if test -n "$ICONV_DIR/$PHP_LIBDIR"; then 72656- 72657+ 72658 if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then 72659- 72660+ 72661 if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 72662 ai_p=$ICONV_DIR/$PHP_LIBDIR 72663 else 72664- 72665+ 72666 ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 72667- 72668+ 72669 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 72670 ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" 72671 fi 72672 72673- 72674- 72675- 72676- 72677+ 72678+ 72679+ 72680+ 72681 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 72682- 72683+ 72684 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 72685 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72686 eval "LIBPATH$unique=set" 72687- 72688+ 72689 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 72690 LDFLAGS="$LDFLAGS -L$ai_p" 72691 PHP_RPATHS="$PHP_RPATHS $ai_p" 72692- 72693+ 72694 fi 72695 72696 72697- 72698+ 72699 fi 72700 72701 fi 72702- 72703- 72704+ 72705+ 72706 case $iconv_lib_name in 72707 c|c_r|pthread*) ;; 72708- *) 72709- LIBS="-l$iconv_lib_name $LIBS" 72710+ *) 72711+ LIBS="-l$iconv_lib_name $LIBS" 72712 ;; 72713 esac 72714 72715@@ -62522,44 +46985,44 @@ 72716 fi 72717 72718 72719- 72720+ 72721 if test "$ICONV_DIR/include" != "/usr/include"; then 72722- 72723+ 72724 if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then 72725 ai_p=$ICONV_DIR/include 72726 else 72727- 72728+ 72729 ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 72730- 72731+ 72732 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 72733 ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" 72734 fi 72735 72736- 72737- 72738+ 72739+ 72740 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 72741- 72742+ 72743 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 72744 if test -n "$unique" && test "`eval $cmd`" = "" ; then 72745 eval "INCLUDEPATH$unique=set" 72746- 72747+ 72748 if test ""; then 72749 INCLUDES="-I$ai_p $INCLUDES" 72750 else 72751 INCLUDES="$INCLUDES -I$ai_p" 72752 fi 72753- 72754+ 72755 fi 72756 72757 fi 72758 72759 fi 72760- 72761+ 72762 iconv_avail="yes"; 72763- 72764-else 72765+ 72766+else 72767 iconv_avail="no"; 72768- 72769+ 72770 fi 72771 72772 72773@@ -62585,239 +47048,133 @@ 72774 PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" 72775 else 72776 PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" 72777- fi 72778+ fi 72779 72780- echo "$as_me:$LINENO: checking if iconv is glibc's" >&5 72781-echo $ECHO_N "checking if iconv is glibc's... $ECHO_C" >&6 72782- cat >conftest.$ac_ext <<_ACEOF 72783-/* confdefs.h. */ 72784-_ACEOF 72785-cat confdefs.h >>conftest.$ac_ext 72786-cat >>conftest.$ac_ext <<_ACEOF 72787-/* end confdefs.h. */ 72788+ echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 72789+echo "configure:47055: checking if iconv is glibc's" >&5 72790+ cat > conftest.$ac_ext <<EOF 72791+#line 47057 "configure" 72792+#include "confdefs.h" 72793 #include <gnu/libc-version.h> 72794-int 72795-main () 72796-{ 72797+int main() { 72798 gnu_get_libc_version(); 72799- ; 72800- return 0; 72801-} 72802-_ACEOF 72803-rm -f conftest.$ac_objext conftest$ac_exeext 72804-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 72805- (eval $ac_link) 2>conftest.er1 72806- ac_status=$? 72807- grep -v '^ *+' conftest.er1 >conftest.err 72808- rm -f conftest.er1 72809- cat conftest.err >&5 72810- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72811- (exit $ac_status); } && 72812- { ac_try='test -z "$ac_c_werror_flag" 72813- || test ! -s conftest.err' 72814- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72815- (eval $ac_try) 2>&5 72816- ac_status=$? 72817- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72818- (exit $ac_status); }; } && 72819- { ac_try='test -s conftest$ac_exeext' 72820- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72821- (eval $ac_try) 2>&5 72822- ac_status=$? 72823- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72824- (exit $ac_status); }; }; then 72825- 72826- echo "$as_me:$LINENO: result: yes" >&5 72827-echo "${ECHO_T}yes" >&6 72828+; return 0; } 72829+EOF 72830+if { (eval echo configure:47064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 72831+ rm -rf conftest* 72832+ 72833+ echo "$ac_t""yes" 1>&6 72834 iconv_impl_name="glibc" 72835- 72836+ 72837 else 72838- echo "$as_me: failed program was:" >&5 72839-sed 's/^/| /' conftest.$ac_ext >&5 72840- 72841- 72842- echo "$as_me:$LINENO: result: no" >&5 72843-echo "${ECHO_T}no" >&6 72844- 72845+ echo "configure: failed program was:" >&5 72846+ cat conftest.$ac_ext >&5 72847+ rm -rf conftest* 72848+ 72849+ echo "$ac_t""no" 1>&6 72850+ 72851 fi 72852-rm -f conftest.err conftest.$ac_objext \ 72853- conftest$ac_exeext conftest.$ac_ext 72854+rm -f conftest* 72855 72856 if test -z "$iconv_impl_name"; then 72857- echo "$as_me:$LINENO: checking if using GNU libiconv" >&5 72858-echo $ECHO_N "checking if using GNU libiconv... $ECHO_C" >&6 72859+ echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 72860+echo "configure:47082: checking if using GNU libiconv" >&5 72861 php_iconv_old_ld="$LDFLAGS" 72862 LDFLAGS="-liconv $LDFLAGS" 72863 if test "$cross_compiling" = yes; then 72864- 72865- echo "$as_me:$LINENO: result: no" >&5 72866-echo "${ECHO_T}no" >&6 72867+ 72868+ echo "$ac_t""no" 1>&6 72869 LDFLAGS="$php_iconv_old_ld" 72870- 72871+ 72872 else 72873- cat >conftest.$ac_ext <<_ACEOF 72874-/* confdefs.h. */ 72875-_ACEOF 72876-cat confdefs.h >>conftest.$ac_ext 72877-cat >>conftest.$ac_ext <<_ACEOF 72878-/* end confdefs.h. */ 72879+ cat > conftest.$ac_ext <<EOF 72880+#line 47092 "configure" 72881+#include "confdefs.h" 72882 72883 #include <$PHP_ICONV_H_PATH> 72884 int main() { 72885 printf("%d", _libiconv_version); 72886 return 0; 72887 } 72888- 72889-_ACEOF 72890-rm -f conftest$ac_exeext 72891-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 72892- (eval $ac_link) 2>&5 72893- ac_status=$? 72894- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72895- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 72896- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72897- (eval $ac_try) 2>&5 72898- ac_status=$? 72899- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72900- (exit $ac_status); }; }; then 72901- 72902- echo "$as_me:$LINENO: result: yes" >&5 72903-echo "${ECHO_T}yes" >&6 72904+ 72905+EOF 72906+if { (eval echo configure:47102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 72907+then 72908+ 72909+ echo "$ac_t""yes" 1>&6 72910 iconv_impl_name="gnu_libiconv" 72911- 72912+ 72913 else 72914- echo "$as_me: program exited with status $ac_status" >&5 72915-echo "$as_me: failed program was:" >&5 72916-sed 's/^/| /' conftest.$ac_ext >&5 72917- 72918-( exit $ac_status ) 72919- 72920- echo "$as_me:$LINENO: result: no" >&5 72921-echo "${ECHO_T}no" >&6 72922+ echo "configure: failed program was:" >&5 72923+ cat conftest.$ac_ext >&5 72924+ rm -fr conftest* 72925+ 72926+ echo "$ac_t""no" 1>&6 72927 LDFLAGS="$php_iconv_old_ld" 72928- 72929+ 72930 fi 72931-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 72932+rm -fr conftest* 72933 fi 72934+ 72935 fi 72936 72937 if test -z "$iconv_impl_name"; then 72938- echo "$as_me:$LINENO: checking if iconv is Konstantin Chuguev's" >&5 72939-echo $ECHO_N "checking if iconv is Konstantin Chuguev's... $ECHO_C" >&6 72940- cat >conftest.$ac_ext <<_ACEOF 72941-/* confdefs.h. */ 72942-_ACEOF 72943-cat confdefs.h >>conftest.$ac_ext 72944-cat >>conftest.$ac_ext <<_ACEOF 72945-/* end confdefs.h. */ 72946+ echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 72947+echo "configure:47124: checking if iconv is Konstantin Chuguev's" >&5 72948+ cat > conftest.$ac_ext <<EOF 72949+#line 47126 "configure" 72950+#include "confdefs.h" 72951 #include <iconv.h> 72952-int 72953-main () 72954-{ 72955+int main() { 72956 iconv_ccs_init(NULL, NULL); 72957- ; 72958- return 0; 72959-} 72960-_ACEOF 72961-rm -f conftest.$ac_objext conftest$ac_exeext 72962-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 72963- (eval $ac_link) 2>conftest.er1 72964- ac_status=$? 72965- grep -v '^ *+' conftest.er1 >conftest.err 72966- rm -f conftest.er1 72967- cat conftest.err >&5 72968- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72969- (exit $ac_status); } && 72970- { ac_try='test -z "$ac_c_werror_flag" 72971- || test ! -s conftest.err' 72972- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72973- (eval $ac_try) 2>&5 72974- ac_status=$? 72975- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72976- (exit $ac_status); }; } && 72977- { ac_try='test -s conftest$ac_exeext' 72978- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 72979- (eval $ac_try) 2>&5 72980- ac_status=$? 72981- echo "$as_me:$LINENO: \$? = $ac_status" >&5 72982- (exit $ac_status); }; }; then 72983- 72984- echo "$as_me:$LINENO: result: yes" >&5 72985-echo "${ECHO_T}yes" >&6 72986+; return 0; } 72987+EOF 72988+if { (eval echo configure:47133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 72989+ rm -rf conftest* 72990+ 72991+ echo "$ac_t""yes" 1>&6 72992 iconv_impl_name="bsd" 72993- 72994+ 72995 else 72996- echo "$as_me: failed program was:" >&5 72997-sed 's/^/| /' conftest.$ac_ext >&5 72998- 72999- 73000- echo "$as_me:$LINENO: result: no" >&5 73001-echo "${ECHO_T}no" >&6 73002- 73003+ echo "configure: failed program was:" >&5 73004+ cat conftest.$ac_ext >&5 73005+ rm -rf conftest* 73006+ 73007+ echo "$ac_t""no" 1>&6 73008+ 73009 fi 73010-rm -f conftest.err conftest.$ac_objext \ 73011- conftest$ac_exeext conftest.$ac_ext 73012+rm -f conftest* 73013 fi 73014 73015 if test -z "$iconv_impl_name"; then 73016- echo "$as_me:$LINENO: checking if using IBM iconv" >&5 73017-echo $ECHO_N "checking if using IBM iconv... $ECHO_C" >&6 73018+ echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 73019+echo "configure:47152: checking if using IBM iconv" >&5 73020 php_iconv_old_ld="$LDFLAGS" 73021 LDFLAGS="-liconv $LDFLAGS" 73022- cat >conftest.$ac_ext <<_ACEOF 73023-/* confdefs.h. */ 73024-_ACEOF 73025-cat confdefs.h >>conftest.$ac_ext 73026-cat >>conftest.$ac_ext <<_ACEOF 73027-/* end confdefs.h. */ 73028+ cat > conftest.$ac_ext <<EOF 73029+#line 47156 "configure" 73030+#include "confdefs.h" 73031 #include <iconv.h> 73032-int 73033-main () 73034-{ 73035+int main() { 73036 cstoccsid(""); 73037- ; 73038- return 0; 73039-} 73040-_ACEOF 73041-rm -f conftest.$ac_objext conftest$ac_exeext 73042-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 73043- (eval $ac_link) 2>conftest.er1 73044- ac_status=$? 73045- grep -v '^ *+' conftest.er1 >conftest.err 73046- rm -f conftest.er1 73047- cat conftest.err >&5 73048- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73049- (exit $ac_status); } && 73050- { ac_try='test -z "$ac_c_werror_flag" 73051- || test ! -s conftest.err' 73052- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 73053- (eval $ac_try) 2>&5 73054- ac_status=$? 73055- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73056- (exit $ac_status); }; } && 73057- { ac_try='test -s conftest$ac_exeext' 73058- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 73059- (eval $ac_try) 2>&5 73060- ac_status=$? 73061- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73062- (exit $ac_status); }; }; then 73063- 73064- echo "$as_me:$LINENO: result: yes" >&5 73065-echo "${ECHO_T}yes" >&6 73066+; return 0; } 73067+EOF 73068+if { (eval echo configure:47163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 73069+ rm -rf conftest* 73070+ 73071+ echo "$ac_t""yes" 1>&6 73072 iconv_impl_name="ibm" 73073- 73074+ 73075 else 73076- echo "$as_me: failed program was:" >&5 73077-sed 's/^/| /' conftest.$ac_ext >&5 73078- 73079- 73080- echo "$as_me:$LINENO: result: no" >&5 73081-echo "${ECHO_T}no" >&6 73082+ echo "configure: failed program was:" >&5 73083+ cat conftest.$ac_ext >&5 73084+ rm -rf conftest* 73085+ 73086+ echo "$ac_t""no" 1>&6 73087 LDFLAGS="$php_iconv_old_ld" 73088- 73089+ 73090 fi 73091-rm -f conftest.err conftest.$ac_objext \ 73092- conftest$ac_exeext conftest.$ac_ext 73093+rm -f conftest* 73094 fi 73095 73096 echo > ext/iconv/php_have_bsd_iconv.h 73097@@ -62827,105 +47184,104 @@ 73098 73099 case "$iconv_impl_name" in 73100 gnu_libiconv ) 73101- 73102+ 73103 echo "#define PHP_ICONV_IMPL \"libiconv\"" > ext/iconv/php_php_iconv_impl.h 73104 73105- 73106-cat >>confdefs.h <<\_ACEOF 73107+ cat >> confdefs.h <<\EOF 73108 #define PHP_ICONV_IMPL "libiconv" 73109-_ACEOF 73110- 73111+EOF 73112 73113+ 73114 echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h 73115 73116- 73117+ 73118 73119 if test "$ext_shared" = "yes"; then 73120 ICONV_SHARED_LIBADD="-liconv $ICONV_SHARED_LIBADD" 73121 if test -n ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then 73122- 73123+ 73124 if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then 73125- 73126+ 73127 if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then 73128 ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR" 73129 else 73130- 73131+ 73132 ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`" 73133- 73134+ 73135 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 73136 ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`" 73137 fi 73138 73139- 73140+ 73141 if test "$ext_shared" = "yes"; then 73142 ICONV_SHARED_LIBADD="-L$ai_p $ICONV_SHARED_LIBADD" 73143 test -n "$ld_runpath_switch" && ICONV_SHARED_LIBADD="$ld_runpath_switch$ai_p $ICONV_SHARED_LIBADD" 73144 else 73145- 73146- 73147- 73148+ 73149+ 73150+ 73151 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 73152- 73153+ 73154 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 73155 if test -n "$unique" && test "`eval $cmd`" = "" ; then 73156 eval "LIBPATH$unique=set" 73157- 73158+ 73159 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 73160 LDFLAGS="$LDFLAGS -L$ai_p" 73161 PHP_RPATHS="$PHP_RPATHS $ai_p" 73162- 73163+ 73164 fi 73165 73166 73167 fi 73168- 73169+ 73170 fi 73171 73172 fi 73173 else 73174- 73175+ 73176 73177 if test -n ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""; then 73178- 73179+ 73180 if test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/$PHP_LIBDIR" && test ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" != "/usr/lib"; then 73181- 73182+ 73183 if test -z ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" || echo ""$PHP_ICONV_PREFIX/$PHP_LIBDIR"" | grep '^/' >/dev/null ; then 73184 ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR" 73185 else 73186- 73187+ 73188 ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`" 73189- 73190+ 73191 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 73192 ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`" 73193 fi 73194 73195- 73196- 73197- 73198- 73199+ 73200+ 73201+ 73202+ 73203 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 73204- 73205+ 73206 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 73207 if test -n "$unique" && test "`eval $cmd`" = "" ; then 73208 eval "LIBPATH$unique=set" 73209- 73210+ 73211 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 73212 LDFLAGS="$LDFLAGS -L$ai_p" 73213 PHP_RPATHS="$PHP_RPATHS $ai_p" 73214- 73215+ 73216 fi 73217 73218 73219- 73220+ 73221 fi 73222 73223 fi 73224- 73225- 73226+ 73227+ 73228 case iconv in 73229 c|c_r|pthread*) ;; 73230- *) 73231- LIBS="-liconv $LIBS" 73232+ *) 73233+ LIBS="-liconv $LIBS" 73234 ;; 73235 esac 73236 73237@@ -62938,84 +47294,73 @@ 73238 ;; 73239 73240 bsd ) 73241- 73242+ 73243 echo "#define HAVE_BSD_ICONV 1" > ext/iconv/php_have_bsd_iconv.h 73244 73245- 73246-cat >>confdefs.h <<\_ACEOF 73247+ cat >> confdefs.h <<\EOF 73248 #define HAVE_BSD_ICONV 1 73249-_ACEOF 73250- 73251+EOF 73252 73253+ 73254 echo "#define PHP_ICONV_IMPL \"BSD iconv\"" > ext/iconv/php_php_iconv_impl.h 73255 73256- 73257-cat >>confdefs.h <<\_ACEOF 73258+ cat >> confdefs.h <<\EOF 73259 #define PHP_ICONV_IMPL "BSD iconv" 73260-_ACEOF 73261+EOF 73262 73263 ;; 73264 73265 glibc ) 73266- 73267+ 73268 echo "#define HAVE_GLIBC_ICONV 1" > ext/iconv/php_have_glibc_iconv.h 73269 73270- 73271-cat >>confdefs.h <<\_ACEOF 73272+ cat >> confdefs.h <<\EOF 73273 #define HAVE_GLIBC_ICONV 1 73274-_ACEOF 73275- 73276+EOF 73277 73278+ 73279 echo "#define PHP_ICONV_IMPL \"glibc\"" > ext/iconv/php_php_iconv_impl.h 73280 73281- 73282-cat >>confdefs.h <<\_ACEOF 73283+ cat >> confdefs.h <<\EOF 73284 #define PHP_ICONV_IMPL "glibc" 73285-_ACEOF 73286+EOF 73287 73288 ;; 73289 ibm ) 73290- 73291+ 73292 echo "#define HAVE_IBM_ICONV 1" > ext/iconv/php_have_ibm_iconv.h 73293 73294- 73295-cat >>confdefs.h <<\_ACEOF 73296+ cat >> confdefs.h <<\EOF 73297 #define HAVE_IBM_ICONV 1 73298-_ACEOF 73299- 73300+EOF 73301 73302+ 73303 echo "#define PHP_ICONV_IMPL \"IBM iconv\"" > ext/iconv/php_php_iconv_impl.h 73304 73305- 73306-cat >>confdefs.h <<\_ACEOF 73307+ cat >> confdefs.h <<\EOF 73308 #define PHP_ICONV_IMPL "IBM iconv" 73309-_ACEOF 73310+EOF 73311 73312 ;; 73313 esac 73314 73315- echo "$as_me:$LINENO: checking if iconv supports errno" >&5 73316-echo $ECHO_N "checking if iconv supports errno... $ECHO_C" >&6 73317+ echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 73318+echo "configure:47349: checking if iconv supports errno" >&5 73319 if test "$cross_compiling" = yes; then 73320- 73321- echo "$as_me:$LINENO: result: no" >&5 73322-echo "${ECHO_T}no" >&6 73323- 73324+ 73325+ echo "$ac_t""no" 1>&6 73326+ 73327 echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h 73328 73329- 73330-cat >>confdefs.h <<\_ACEOF 73331+ cat >> confdefs.h <<\EOF 73332 #define ICONV_SUPPORTS_ERRNO 0 73333-_ACEOF 73334- 73335+EOF 73336 73337+ 73338 else 73339- cat >conftest.$ac_ext <<_ACEOF 73340-/* confdefs.h. */ 73341-_ACEOF 73342-cat confdefs.h >>conftest.$ac_ext 73343-cat >>conftest.$ac_ext <<_ACEOF 73344-/* end confdefs.h. */ 73345+ cat > conftest.$ac_ext <<EOF 73346+#line 47363 "configure" 73347+#include "confdefs.h" 73348 73349 #include <$PHP_ICONV_H_PATH> 73350 #include <errno.h> 73351@@ -63033,119 +47378,75 @@ 73352 iconv_close( cd ); 73353 return 2; 73354 } 73355- 73356-_ACEOF 73357-rm -f conftest$ac_exeext 73358-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 73359- (eval $ac_link) 2>&5 73360- ac_status=$? 73361- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73362- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 73363- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 73364- (eval $ac_try) 2>&5 73365- ac_status=$? 73366- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73367- (exit $ac_status); }; }; then 73368- 73369- echo "$as_me:$LINENO: result: yes" >&5 73370-echo "${ECHO_T}yes" >&6 73371- 73372+ 73373+EOF 73374+if { (eval echo configure:47384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 73375+then 73376+ 73377+ echo "$ac_t""yes" 1>&6 73378+ 73379 echo "#define ICONV_SUPPORTS_ERRNO 1" > ext/iconv/php_iconv_supports_errno.h 73380 73381- 73382-cat >>confdefs.h <<\_ACEOF 73383+ cat >> confdefs.h <<\EOF 73384 #define ICONV_SUPPORTS_ERRNO 1 73385-_ACEOF 73386- 73387+EOF 73388 73389+ 73390 else 73391- echo "$as_me: program exited with status $ac_status" >&5 73392-echo "$as_me: failed program was:" >&5 73393-sed 's/^/| /' conftest.$ac_ext >&5 73394- 73395-( exit $ac_status ) 73396- 73397- echo "$as_me:$LINENO: result: no" >&5 73398-echo "${ECHO_T}no" >&6 73399- 73400+ echo "configure: failed program was:" >&5 73401+ cat conftest.$ac_ext >&5 73402+ rm -fr conftest* 73403+ 73404+ echo "$ac_t""no" 1>&6 73405+ 73406 echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h 73407 73408- 73409-cat >>confdefs.h <<\_ACEOF 73410+ cat >> confdefs.h <<\EOF 73411 #define ICONV_SUPPORTS_ERRNO 0 73412-_ACEOF 73413- 73414+EOF 73415 73416+ 73417 fi 73418-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 73419+rm -fr conftest* 73420 fi 73421 73422- echo "$as_me:$LINENO: checking if your cpp allows macro usage in include lines" >&5 73423-echo $ECHO_N "checking if your cpp allows macro usage in include lines... $ECHO_C" >&6 73424- cat >conftest.$ac_ext <<_ACEOF 73425-/* confdefs.h. */ 73426-_ACEOF 73427-cat confdefs.h >>conftest.$ac_ext 73428-cat >>conftest.$ac_ext <<_ACEOF 73429-/* end confdefs.h. */ 73430+ 73431+ echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 73432+echo "configure:47416: checking if your cpp allows macro usage in include lines" >&5 73433+ cat > conftest.$ac_ext <<EOF 73434+#line 47418 "configure" 73435+#include "confdefs.h" 73436 73437 #define FOO <$PHP_ICONV_H_PATH> 73438 #include FOO 73439+ 73440+int main() { 73441 73442-int 73443-main () 73444-{ 73445- 73446- ; 73447- return 0; 73448-} 73449-_ACEOF 73450-rm -f conftest.$ac_objext 73451-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 73452- (eval $ac_compile) 2>conftest.er1 73453- ac_status=$? 73454- grep -v '^ *+' conftest.er1 >conftest.err 73455- rm -f conftest.er1 73456- cat conftest.err >&5 73457- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73458- (exit $ac_status); } && 73459- { ac_try='test -z "$ac_c_werror_flag" 73460- || test ! -s conftest.err' 73461- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 73462- (eval $ac_try) 2>&5 73463- ac_status=$? 73464- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73465- (exit $ac_status); }; } && 73466- { ac_try='test -s conftest.$ac_objext' 73467- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 73468- (eval $ac_try) 2>&5 73469- ac_status=$? 73470- echo "$as_me:$LINENO: \$? = $ac_status" >&5 73471- (exit $ac_status); }; }; then 73472- 73473- echo "$as_me:$LINENO: result: yes" >&5 73474-echo "${ECHO_T}yes" >&6 73475- 73476+; return 0; } 73477+EOF 73478+if { (eval echo configure:47428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 73479+ rm -rf conftest* 73480+ 73481+ echo "$ac_t""yes" 1>&6 73482+ 73483 echo "#define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH>" > ext/iconv/php_php_iconv_h_path.h 73484 73485- 73486-cat >>confdefs.h <<_ACEOF 73487+ cat >> confdefs.h <<EOF 73488 #define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH> 73489-_ACEOF 73490- 73491+EOF 73492 73493+ 73494 else 73495- echo "$as_me: failed program was:" >&5 73496-sed 's/^/| /' conftest.$ac_ext >&5 73497- 73498- 73499- echo "$as_me:$LINENO: result: no" >&5 73500-echo "${ECHO_T}no" >&6 73501- 73502+ echo "configure: failed program was:" >&5 73503+ cat conftest.$ac_ext >&5 73504+ rm -rf conftest* 73505+ 73506+ echo "$ac_t""no" 1>&6 73507+ 73508 fi 73509-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 73510- 73511+rm -f conftest* 73512 73513+ 73514 ext_builddir=ext/iconv 73515 ext_srcdir=$abs_srcdir/ext/iconv 73516 73517@@ -63153,15 +47454,15 @@ 73518 73519 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 73520 PHP_ICONV_SHARED=no 73521- 73522- 73523+ 73524+ 73525 case ext/iconv in 73526 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73527 /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73528 *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73529 esac 73530- 73531- 73532+ 73533+ 73534 73535 b_c_pre=$php_c_pre 73536 b_cxx_pre=$php_cxx_pre 73537@@ -63174,12 +47475,12 @@ 73538 73539 old_IFS=$IFS 73540 for ac_src in iconv.c; do 73541- 73542+ 73543 IFS=. 73544 set $ac_src 73545 ac_obj=$1 73546 IFS=$old_IFS 73547- 73548+ 73549 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 73550 73551 case $ac_src in 73552@@ -63203,14 +47504,14 @@ 73553 else 73554 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 73555 PHP_ICONV_SHARED=yes 73556- 73557+ 73558 case ext/iconv in 73559 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73560 /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73561 *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73562 esac 73563- 73564- 73565+ 73566+ 73567 73568 b_c_pre=$shared_c_pre 73569 b_cxx_pre=$shared_cxx_pre 73570@@ -63223,12 +47524,12 @@ 73571 73572 old_IFS=$IFS 73573 for ac_src in iconv.c; do 73574- 73575+ 73576 IFS=. 73577 set $ac_src 73578 ac_obj=$1 73579 IFS=$old_IFS 73580- 73581+ 73582 shared_objects_iconv="$shared_objects_iconv $ac_bdir$ac_obj.lo" 73583 73584 case $ac_src in 73585@@ -63246,7 +47547,7 @@ 73586 73587 case $host_alias in 73588 *netware*) 73589- 73590+ 73591 install_modules="install-modules" 73592 73593 case $host_alias in 73594@@ -63256,7 +47557,7 @@ 73595 ;; 73596 *netware*) 73597 suffix=nlm 73598- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(ICONV_SHARED_LIBADD)' 73599+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPICONV, 3)_SHARED_LIBADD)' 73600 ;; 73601 *) 73602 suffix=la 73603@@ -63269,7 +47570,7 @@ 73604 else 73605 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpiconv.$suffix" 73606 fi 73607- 73608+ 73609 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_iconv" 73610 73611 cat >>Makefile.objects<<EOF 73612@@ -63283,7 +47584,7 @@ 73613 73614 ;; 73615 *) 73616- 73617+ 73618 install_modules="install-modules" 73619 73620 case $host_alias in 73621@@ -63293,7 +47594,7 @@ 73622 ;; 73623 *netware*) 73624 suffix=nlm 73625- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(NV_SHARED_LIBADD)' 73626+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_iconv) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ICONV, 3)_SHARED_LIBADD)' 73627 ;; 73628 *) 73629 suffix=la 73630@@ -63306,7 +47607,7 @@ 73631 else 73632 PHP_MODULES="$PHP_MODULES \$(phplibdir)/iconv.$suffix" 73633 fi 73634- 73635+ 73636 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_iconv" 73637 73638 cat >>Makefile.objects<<EOF 73639@@ -63320,10 +47621,9 @@ 73640 73641 ;; 73642 esac 73643- 73644-cat >>confdefs.h <<_ACEOF 73645+ cat >> confdefs.h <<EOF 73646 #define COMPILE_DL_ICONV 1 73647-_ACEOF 73648+EOF 73649 73650 fi 73651 fi 73652@@ -63332,15 +47632,15 @@ 73653 PHP_ICONV_SHARED=no 73654 case "$PHP_SAPI" in 73655 cgi|embed) 73656- 73657- 73658+ 73659+ 73660 case ext/iconv in 73661 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73662 /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73663 *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73664 esac 73665- 73666- 73667+ 73668+ 73669 73670 b_c_pre=$php_c_pre 73671 b_cxx_pre=$php_cxx_pre 73672@@ -63353,12 +47653,12 @@ 73673 73674 old_IFS=$IFS 73675 for ac_src in iconv.c; do 73676- 73677+ 73678 IFS=. 73679 set $ac_src 73680 ac_obj=$1 73681 IFS=$old_IFS 73682- 73683+ 73684 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 73685 73686 case $ac_src in 73687@@ -63378,15 +47678,15 @@ 73688 EXT_STATIC="$EXT_STATIC iconv" 73689 ;; 73690 *) 73691- 73692- 73693+ 73694+ 73695 case ext/iconv in 73696 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73697 /*) ac_srcdir=`echo "ext/iconv"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73698 *) ac_srcdir="$abs_srcdir/ext/iconv/"; ac_bdir="ext/iconv/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73699 esac 73700- 73701- 73702+ 73703+ 73704 73705 b_c_pre=$php_c_pre 73706 b_cxx_pre=$php_cxx_pre 73707@@ -63399,13 +47699,13 @@ 73708 73709 old_IFS=$IFS 73710 for ac_src in iconv.c; do 73711- 73712+ 73713 IFS=. 73714 set $ac_src 73715 ac_obj=$1 73716 IFS=$old_IFS 73717- 73718- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 73719+ 73720+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 73721 73722 case $ac_src in 73723 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 73724@@ -63425,44 +47725,42 @@ 73725 esac 73726 EXT_CLI_STATIC="$EXT_CLI_STATIC iconv" 73727 fi 73728- 73729- 73730+ 73731+ 73732 BUILD_DIR="$BUILD_DIR $ext_builddir" 73733- 73734+ 73735 73736 73737 if test "$ext_builddir" = "."; then 73738 PHP_PECL_EXTENSION=iconv 73739- 73740+ 73741 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 73742 73743 fi 73744 73745- 73746+ 73747 PHP_VAR_SUBST="$PHP_VAR_SUBST ICONV_SHARED_LIBADD" 73748 73749- 73750- 73751+ 73752+ 73753 for header_file in ext/iconv/; do 73754- 73755- 73756+ 73757+ 73758 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 73759- 73760+ 73761 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 73762 if test -n "$unique" && test "`eval $cmd`" = "" ; then 73763 eval "INSTALLHEADERS$unique=set" 73764- 73765+ 73766 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 73767- 73768+ 73769 fi 73770 73771- done 73772- 73773+ done 73774+ 73775 73776 else 73777- { { echo "$as_me:$LINENO: error: Please reinstall the iconv library." >&5 73778-echo "$as_me: error: Please reinstall the iconv library." >&2;} 73779- { (exit 1); exit 1; }; } 73780+ { echo "configure: error: Please reinstall the iconv library." 1>&2; exit 1; } 73781 fi 73782 fi 73783 73784@@ -63481,19 +47779,19 @@ 73785 73786 php_with_imap=no 73787 73788-echo "$as_me:$LINENO: checking for IMAP support" >&5 73789-echo $ECHO_N "checking for IMAP support... $ECHO_C" >&6 73790- 73791+echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 73792+echo "configure:47784: checking for IMAP support" >&5 73793 # Check whether --with-imap or --without-imap was given. 73794 if test "${with_imap+set}" = set; then 73795 withval="$with_imap" 73796 PHP_IMAP=$withval 73797 else 73798- 73799+ 73800 PHP_IMAP=no 73801 test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL 73802 73803-fi; 73804+fi 73805+ 73806 73807 73808 ext_output="yes, shared" 73809@@ -63517,8 +47815,7 @@ 73810 73811 73812 73813-echo "$as_me:$LINENO: result: $ext_output" >&5 73814-echo "${ECHO_T}$ext_output" >&6 73815+echo "$ac_t""$ext_output" 1>&6 73816 73817 73818 73819@@ -63526,23 +47823,22 @@ 73820 73821 php_with_kerberos=no 73822 73823-echo "$as_me:$LINENO: checking for IMAP Kerberos support" >&5 73824-echo $ECHO_N "checking for IMAP Kerberos support... $ECHO_C" >&6 73825- 73826+echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 73827+echo "configure:47828: checking for IMAP Kerberos support" >&5 73828 # Check whether --with-kerberos or --without-kerberos was given. 73829 if test "${with_kerberos+set}" = set; then 73830 withval="$with_kerberos" 73831 PHP_KERBEROS=$withval 73832 else 73833- 73834+ 73835 PHP_KERBEROS=no 73836+ 73837 73838+fi 73839 73840-fi; 73841 73842 ext_output=$PHP_KERBEROS 73843-echo "$as_me:$LINENO: result: $ext_output" >&5 73844-echo "${ECHO_T}$ext_output" >&6 73845+echo "$ac_t""$ext_output" 1>&6 73846 73847 73848 73849@@ -63550,33 +47846,32 @@ 73850 73851 php_with_imap_ssl=no 73852 73853-echo "$as_me:$LINENO: checking for IMAP SSL support" >&5 73854-echo $ECHO_N "checking for IMAP SSL support... $ECHO_C" >&6 73855- 73856+echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 73857+echo "configure:47851: checking for IMAP SSL support" >&5 73858 # Check whether --with-imap-ssl or --without-imap-ssl was given. 73859 if test "${with_imap_ssl+set}" = set; then 73860 withval="$with_imap_ssl" 73861 PHP_IMAP_SSL=$withval 73862 else 73863- 73864+ 73865 PHP_IMAP_SSL=no 73866+ 73867 73868+fi 73869 73870-fi; 73871 73872 ext_output=$PHP_IMAP_SSL 73873-echo "$as_me:$LINENO: result: $ext_output" >&5 73874-echo "${ECHO_T}$ext_output" >&6 73875- 73876+echo "$ac_t""$ext_output" 1>&6 73877 73878 73879 73880 73881-if test "$PHP_IMAP" != "no"; then 73882 73883+if test "$PHP_IMAP" != "no"; then 73884+ 73885 PHP_VAR_SUBST="$PHP_VAR_SUBST IMAP_SHARED_LIBADD" 73886 73887- 73888+ 73889 ext_builddir=ext/imap 73890 ext_srcdir=$abs_srcdir/ext/imap 73891 73892@@ -63584,15 +47879,15 @@ 73893 73894 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 73895 PHP_IMAP_SHARED=no 73896- 73897- 73898+ 73899+ 73900 case ext/imap in 73901 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73902 /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73903 *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73904 esac 73905- 73906- 73907+ 73908+ 73909 73910 b_c_pre=$php_c_pre 73911 b_cxx_pre=$php_cxx_pre 73912@@ -63605,12 +47900,12 @@ 73913 73914 old_IFS=$IFS 73915 for ac_src in php_imap.c; do 73916- 73917+ 73918 IFS=. 73919 set $ac_src 73920 ac_obj=$1 73921 IFS=$old_IFS 73922- 73923+ 73924 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 73925 73926 case $ac_src in 73927@@ -63634,14 +47929,14 @@ 73928 else 73929 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 73930 PHP_IMAP_SHARED=yes 73931- 73932+ 73933 case ext/imap in 73934 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 73935 /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 73936 *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 73937 esac 73938- 73939- 73940+ 73941+ 73942 73943 b_c_pre=$shared_c_pre 73944 b_cxx_pre=$shared_cxx_pre 73945@@ -63654,12 +47949,12 @@ 73946 73947 old_IFS=$IFS 73948 for ac_src in php_imap.c; do 73949- 73950+ 73951 IFS=. 73952 set $ac_src 73953 ac_obj=$1 73954 IFS=$old_IFS 73955- 73956+ 73957 shared_objects_imap="$shared_objects_imap $ac_bdir$ac_obj.lo" 73958 73959 case $ac_src in 73960@@ -63677,7 +47972,7 @@ 73961 73962 case $host_alias in 73963 *netware*) 73964- 73965+ 73966 install_modules="install-modules" 73967 73968 case $host_alias in 73969@@ -63687,7 +47982,7 @@ 73970 ;; 73971 *netware*) 73972 suffix=nlm 73973- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(IMAP_SHARED_LIBADD)' 73974+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPIMAP, 3)_SHARED_LIBADD)' 73975 ;; 73976 *) 73977 suffix=la 73978@@ -63700,7 +47995,7 @@ 73979 else 73980 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpimap.$suffix" 73981 fi 73982- 73983+ 73984 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_imap" 73985 73986 cat >>Makefile.objects<<EOF 73987@@ -63714,7 +48009,7 @@ 73988 73989 ;; 73990 *) 73991- 73992+ 73993 install_modules="install-modules" 73994 73995 case $host_alias in 73996@@ -63724,7 +48019,7 @@ 73997 ;; 73998 *netware*) 73999 suffix=nlm 74000- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(P_SHARED_LIBADD)' 74001+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_imap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(IMAP, 3)_SHARED_LIBADD)' 74002 ;; 74003 *) 74004 suffix=la 74005@@ -63737,7 +48032,7 @@ 74006 else 74007 PHP_MODULES="$PHP_MODULES \$(phplibdir)/imap.$suffix" 74008 fi 74009- 74010+ 74011 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_imap" 74012 74013 cat >>Makefile.objects<<EOF 74014@@ -63751,10 +48046,9 @@ 74015 74016 ;; 74017 esac 74018- 74019-cat >>confdefs.h <<_ACEOF 74020+ cat >> confdefs.h <<EOF 74021 #define COMPILE_DL_IMAP 1 74022-_ACEOF 74023+EOF 74024 74025 fi 74026 fi 74027@@ -63763,15 +48057,15 @@ 74028 PHP_IMAP_SHARED=no 74029 case "$PHP_SAPI" in 74030 cgi|embed) 74031- 74032- 74033+ 74034+ 74035 case ext/imap in 74036 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 74037 /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 74038 *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 74039 esac 74040- 74041- 74042+ 74043+ 74044 74045 b_c_pre=$php_c_pre 74046 b_cxx_pre=$php_cxx_pre 74047@@ -63784,12 +48078,12 @@ 74048 74049 old_IFS=$IFS 74050 for ac_src in php_imap.c; do 74051- 74052+ 74053 IFS=. 74054 set $ac_src 74055 ac_obj=$1 74056 IFS=$old_IFS 74057- 74058+ 74059 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 74060 74061 case $ac_src in 74062@@ -63809,15 +48103,15 @@ 74063 EXT_STATIC="$EXT_STATIC imap" 74064 ;; 74065 *) 74066- 74067- 74068+ 74069+ 74070 case ext/imap in 74071 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 74072 /*) ac_srcdir=`echo "ext/imap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 74073 *) ac_srcdir="$abs_srcdir/ext/imap/"; ac_bdir="ext/imap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 74074 esac 74075- 74076- 74077+ 74078+ 74079 74080 b_c_pre=$php_c_pre 74081 b_cxx_pre=$php_cxx_pre 74082@@ -63830,13 +48124,13 @@ 74083 74084 old_IFS=$IFS 74085 for ac_src in php_imap.c; do 74086- 74087+ 74088 IFS=. 74089 set $ac_src 74090 ac_obj=$1 74091 IFS=$old_IFS 74092- 74093- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 74094+ 74095+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 74096 74097 case $ac_src in 74098 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 74099@@ -63856,333 +48150,260 @@ 74100 esac 74101 EXT_CLI_STATIC="$EXT_CLI_STATIC imap" 74102 fi 74103- 74104- 74105+ 74106+ 74107 BUILD_DIR="$BUILD_DIR $ext_builddir" 74108- 74109+ 74110 74111 74112 if test "$ext_builddir" = "."; then 74113 PHP_PECL_EXTENSION=imap 74114- 74115+ 74116 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 74117 74118 fi 74119 74120- 74121-cat >>confdefs.h <<\_ACEOF 74122+ cat >> confdefs.h <<\EOF 74123 #define HAVE_IMAP 1 74124-_ACEOF 74125+EOF 74126 74127 74128 for i in $PHP_IMAP /usr/local /usr; do 74129 if test -r "$i/c-client.h"; then 74130- 74131-cat >>confdefs.h <<\_ACEOF 74132+ cat >> confdefs.h <<\EOF 74133 #define HAVE_IMAP2000 1 74134-_ACEOF 74135+EOF 74136 74137 IMAP_DIR=$i 74138 IMAP_INC_DIR=$i 74139 break 74140- elif test -r "$i/rfc822.h"; then 74141- IMAP_DIR=$i; 74142+ elif test -r "$i/rfc822.h"; then 74143+ IMAP_DIR=$i; 74144 IMAP_INC_DIR=$i 74145 break 74146 74147 elif test -r "$i/include/c-client/c-client.h"; then 74148- 74149-cat >>confdefs.h <<\_ACEOF 74150+ cat >> confdefs.h <<\EOF 74151 #define HAVE_IMAP2000 1 74152-_ACEOF 74153+EOF 74154 74155 IMAP_DIR=$i 74156 IMAP_INC_DIR=$i/include/c-client 74157 break 74158- elif test -r "$i/include/c-client/rfc822.h"; then 74159- IMAP_DIR=$i; 74160+ elif test -r "$i/include/c-client/rfc822.h"; then 74161+ IMAP_DIR=$i; 74162 IMAP_INC_DIR=$i/include/c-client 74163 break 74164 74165 elif test -r "$i/include/imap/c-client.h"; then 74166- 74167-cat >>confdefs.h <<\_ACEOF 74168+ cat >> confdefs.h <<\EOF 74169 #define HAVE_IMAP2000 1 74170-_ACEOF 74171+EOF 74172 74173 IMAP_DIR=$i 74174 IMAP_INC_DIR=$i/include/imap 74175 break 74176- elif test -r "$i/include/imap/rfc822.h"; then 74177- IMAP_DIR=$i; 74178+ elif test -r "$i/include/imap/rfc822.h"; then 74179+ IMAP_DIR=$i; 74180 IMAP_INC_DIR=$i/include/imap 74181 break 74182 74183 elif test -r "$i/include/c-client.h"; then 74184- 74185-cat >>confdefs.h <<\_ACEOF 74186+ cat >> confdefs.h <<\EOF 74187 #define HAVE_IMAP2000 1 74188-_ACEOF 74189+EOF 74190 74191 IMAP_DIR=$i 74192 IMAP_INC_DIR=$i/include 74193 break 74194- elif test -r "$i/include/rfc822.h"; then 74195- IMAP_DIR=$i; 74196+ elif test -r "$i/include/rfc822.h"; then 74197+ IMAP_DIR=$i; 74198 IMAP_INC_DIR=$i/include 74199 break 74200 74201 elif test -r "$i/imap/c-client.h"; then 74202- 74203-cat >>confdefs.h <<\_ACEOF 74204+ cat >> confdefs.h <<\EOF 74205 #define HAVE_IMAP2000 1 74206-_ACEOF 74207+EOF 74208 74209 IMAP_DIR=$i 74210 IMAP_INC_DIR=$i/imap 74211 break 74212- elif test -r "$i/imap/rfc822.h"; then 74213- IMAP_DIR=$i; 74214+ elif test -r "$i/imap/rfc822.h"; then 74215+ IMAP_DIR=$i; 74216 IMAP_INC_DIR=$i/imap 74217 break 74218 74219 elif test -r "$i/c-client/c-client.h"; then 74220- 74221-cat >>confdefs.h <<\_ACEOF 74222+ cat >> confdefs.h <<\EOF 74223 #define HAVE_IMAP2000 1 74224-_ACEOF 74225+EOF 74226 74227 IMAP_DIR=$i 74228 IMAP_INC_DIR=$i/c-client 74229 break 74230- elif test -r "$i/c-client/rfc822.h"; then 74231- IMAP_DIR=$i; 74232+ elif test -r "$i/c-client/rfc822.h"; then 74233+ IMAP_DIR=$i; 74234 IMAP_INC_DIR=$i/c-client 74235 break 74236 74237 fi 74238 done 74239 74240- cat >conftest.$ac_ext <<_ACEOF 74241-/* confdefs.h. */ 74242-_ACEOF 74243-cat confdefs.h >>conftest.$ac_ext 74244-cat >>conftest.$ac_ext <<_ACEOF 74245-/* end confdefs.h. */ 74246+ cat > conftest.$ac_ext <<EOF 74247+#line 48255 "configure" 74248+#include "confdefs.h" 74249 #include <$IMAP_INC_DIR/mail.h> 74250- 74251-_ACEOF 74252+EOF 74253 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 74254- $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then 74255- 74256- 74257-cat >>confdefs.h <<\_ACEOF 74258+ egrep "mail_fetch_overview_sequence" >/dev/null 2>&1; then 74259+ rm -rf conftest* 74260+ 74261+ cat >> confdefs.h <<\EOF 74262 #define HAVE_IMAP2004 1 74263-_ACEOF 74264- 74265+EOF 74266 74267+ 74268 fi 74269 rm -f conftest* 74270 74271 74272 old_CFLAGS=$CFLAGS 74273 CFLAGS="-I$IMAP_INC_DIR" 74274- echo "$as_me:$LINENO: checking for utf8_mime2text signature" >&5 74275-echo $ECHO_N "checking for utf8_mime2text signature... $ECHO_C" >&6 74276-if test "${ac_cv_utf8_mime2text+set}" = set; then 74277- echo $ECHO_N "(cached) $ECHO_C" >&6 74278-else 74279- cat >conftest.$ac_ext <<_ACEOF 74280-/* confdefs.h. */ 74281-_ACEOF 74282-cat confdefs.h >>conftest.$ac_ext 74283-cat >>conftest.$ac_ext <<_ACEOF 74284-/* end confdefs.h. */ 74285+ echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 74286+echo "configure:48275: checking for utf8_mime2text signature" >&5 74287+if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then 74288+ echo $ac_n "(cached) $ac_c" 1>&6 74289+else 74290+ cat > conftest.$ac_ext <<EOF 74291+#line 48280 "configure" 74292+#include "confdefs.h" 74293 74294 #include <stdio.h> 74295 #include <c-client.h> 74296- 74297-int 74298-main () 74299-{ 74300+ 74301+int main() { 74302 74303 SIZEDTEXT *src, *dst; 74304 utf8_mime2text(src, dst); 74305- 74306- ; 74307- return 0; 74308-} 74309-_ACEOF 74310-rm -f conftest.$ac_objext 74311-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 74312- (eval $ac_compile) 2>conftest.er1 74313- ac_status=$? 74314- grep -v '^ *+' conftest.er1 >conftest.err 74315- rm -f conftest.er1 74316- cat conftest.err >&5 74317- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74318- (exit $ac_status); } && 74319- { ac_try='test -z "$ac_c_werror_flag" 74320- || test ! -s conftest.err' 74321- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74322- (eval $ac_try) 2>&5 74323- ac_status=$? 74324- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74325- (exit $ac_status); }; } && 74326- { ac_try='test -s conftest.$ac_objext' 74327- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74328- (eval $ac_try) 2>&5 74329- ac_status=$? 74330- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74331- (exit $ac_status); }; }; then 74332- 74333+ 74334+; return 0; } 74335+EOF 74336+if { (eval echo configure:48293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 74337+ rm -rf conftest* 74338+ 74339 ac_cv_utf8_mime2text=old 74340- 74341+ 74342 else 74343- echo "$as_me: failed program was:" >&5 74344-sed 's/^/| /' conftest.$ac_ext >&5 74345- 74346- 74347+ echo "configure: failed program was:" >&5 74348+ cat conftest.$ac_ext >&5 74349+ rm -rf conftest* 74350+ 74351 ac_cv_utf8_mime2text=new 74352- 74353+ 74354 fi 74355-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 74356- 74357+rm -f conftest* 74358+ 74359 fi 74360-echo "$as_me:$LINENO: result: $ac_cv_utf8_mime2text" >&5 74361-echo "${ECHO_T}$ac_cv_utf8_mime2text" >&6 74362- if test "$ac_cv_utf8_mime2text" = "new"; then 74363 74364-cat >>confdefs.h <<\_ACEOF 74365+echo "$ac_t""$ac_cv_utf8_mime2text" 1>&6 74366+ if test "$ac_cv_utf8_mime2text" = "new"; then 74367+ cat >> confdefs.h <<\EOF 74368 #define HAVE_NEW_MIME2TEXT 1 74369-_ACEOF 74370+EOF 74371 74372 fi 74373 CFLAGS=$old_CFLAGS 74374 74375 old_CFLAGS=$CFLAGS 74376 CFLAGS="-I$IMAP_INC_DIR" 74377- echo "$as_me:$LINENO: checking for U8T_DECOMPOSE" >&5 74378-echo $ECHO_N "checking for U8T_DECOMPOSE... $ECHO_C" >&6 74379-if test "${ac_cv_u8t_canonical+set}" = set; then 74380- echo $ECHO_N "(cached) $ECHO_C" >&6 74381-else 74382- cat >conftest.$ac_ext <<_ACEOF 74383-/* confdefs.h. */ 74384-_ACEOF 74385-cat confdefs.h >>conftest.$ac_ext 74386-cat >>conftest.$ac_ext <<_ACEOF 74387-/* end confdefs.h. */ 74388+ echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 74389+echo "configure:48322: checking for U8T_DECOMPOSE" >&5 74390+if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then 74391+ echo $ac_n "(cached) $ac_c" 1>&6 74392+else 74393+ cat > conftest.$ac_ext <<EOF 74394+#line 48327 "configure" 74395+#include "confdefs.h" 74396 74397 #include <c-client.h> 74398- 74399-int 74400-main () 74401-{ 74402+ 74403+int main() { 74404 74405 int i = U8T_CANONICAL; 74406- 74407- ; 74408- return 0; 74409-} 74410-_ACEOF 74411-rm -f conftest.$ac_objext 74412-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 74413- (eval $ac_compile) 2>conftest.er1 74414- ac_status=$? 74415- grep -v '^ *+' conftest.er1 >conftest.err 74416- rm -f conftest.er1 74417- cat conftest.err >&5 74418- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74419- (exit $ac_status); } && 74420- { ac_try='test -z "$ac_c_werror_flag" 74421- || test ! -s conftest.err' 74422- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74423- (eval $ac_try) 2>&5 74424- ac_status=$? 74425- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74426- (exit $ac_status); }; } && 74427- { ac_try='test -s conftest.$ac_objext' 74428- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74429- (eval $ac_try) 2>&5 74430- ac_status=$? 74431- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74432- (exit $ac_status); }; }; then 74433- 74434+ 74435+; return 0; } 74436+EOF 74437+if { (eval echo configure:48338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 74438+ rm -rf conftest* 74439+ 74440 ac_cv_u8t_decompose=yes 74441- 74442+ 74443 else 74444- echo "$as_me: failed program was:" >&5 74445-sed 's/^/| /' conftest.$ac_ext >&5 74446- 74447- 74448+ echo "configure: failed program was:" >&5 74449+ cat conftest.$ac_ext >&5 74450+ rm -rf conftest* 74451+ 74452 ac_cv_u8t_decompose=no 74453- 74454+ 74455 fi 74456-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 74457- 74458+rm -f conftest* 74459+ 74460 fi 74461-echo "$as_me:$LINENO: result: $ac_cv_u8t_canonical" >&5 74462-echo "${ECHO_T}$ac_cv_u8t_canonical" >&6 74463+ 74464+echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 74465 CFLAGS=$old_CFLAGS 74466 74467 if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then 74468- { { echo "$as_me:$LINENO: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&5 74469-echo "$as_me: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&2;} 74470- { (exit 1); exit 1; }; } 74471+ { echo "configure: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." 1>&2; exit 1; } 74472 fi 74473 if test "$ac_cv_u8t_decompose" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then 74474- { { echo "$as_me:$LINENO: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&5 74475-echo "$as_me: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&2;} 74476- { (exit 1); exit 1; }; } 74477+ { echo "configure: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." 1>&2; exit 1; } 74478 fi 74479 74480 old_CPPFLAGS=$CPPFLAGS 74481 CPPFLAGS=-I$IMAP_INC_DIR 74482- cat >conftest.$ac_ext <<_ACEOF 74483-/* confdefs.h. */ 74484-_ACEOF 74485-cat confdefs.h >>conftest.$ac_ext 74486-cat >>conftest.$ac_ext <<_ACEOF 74487-/* end confdefs.h. */ 74488+ cat > conftest.$ac_ext <<EOF 74489+#line 48368 "configure" 74490+#include "confdefs.h" 74491 74492 #include "imap4r1.h" 74493 #if defined(IMAPSSLPORT) 74494 this_is_true 74495 #endif 74496- 74497-_ACEOF 74498+ 74499+EOF 74500 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 74501- $EGREP "this_is_true" >/dev/null 2>&1; then 74502- 74503- 74504-cat >>confdefs.h <<\_ACEOF 74505+ egrep "this_is_true" >/dev/null 2>&1; then 74506+ rm -rf conftest* 74507+ 74508+ cat >> confdefs.h <<\EOF 74509 #define HAVE_IMAP2001 1 74510-_ACEOF 74511- 74512+EOF 74513 74514+ 74515 fi 74516 rm -f conftest* 74517 74518 CPPFLAGS=$old_CPPFLAGS 74519 74520- 74521+ 74522 save_old_LDFLAGS=$LDFLAGS 74523 ac_stuff="" 74524- 74525+ 74526 save_ext_shared=$ext_shared 74527 ext_shared=yes 74528- 74529+ 74530 for ac_i in $ac_stuff; do 74531 case $ac_i in 74532 -pthread) 74533 if test "$ext_shared" = "yes"; then 74534 LDFLAGS="$LDFLAGS -pthread" 74535 else 74536- 74537- 74538+ 74539+ 74540 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 74541- 74542+ 74543 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 74544 if test -n "$unique" && test "`eval $cmd`" = "" ; then 74545 eval "EXTRA_LDFLAGS$unique=set" 74546@@ -64193,20 +48414,20 @@ 74547 ;; 74548 -l*) 74549 ac_ii=`echo $ac_i|cut -c 3-` 74550- 74551- 74552+ 74553+ 74554 case $ac_ii in 74555 c|c_r|pthread*) ;; 74556- *) 74557+ *) 74558 if test "$ext_shared" = "yes"; then 74559- LDFLAGS="$LDFLAGS -l$ac_ii" 74560+ LDFLAGS="$LDFLAGS -l$ac_ii" 74561 else 74562- 74563- 74564+ 74565+ 74566 case $ac_ii in 74567 c|c_r|pthread*) ;; 74568- *) 74569- LIBS="$LIBS -l$ac_ii" 74570+ *) 74571+ LIBS="$LIBS -l$ac_ii" 74572 ;; 74573 esac 74574 74575@@ -64219,131 +48440,101 @@ 74576 ;; 74577 -L*) 74578 ac_ii=`echo $ac_i|cut -c 3-` 74579- 74580+ 74581 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 74582- 74583+ 74584 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 74585 ai_p=$ac_ii 74586 else 74587- 74588+ 74589 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 74590- 74591+ 74592 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 74593 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 74594 fi 74595 74596- 74597+ 74598 if test "$ext_shared" = "yes"; then 74599 LDFLAGS="-L$ai_p $LDFLAGS" 74600 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 74601 else 74602- 74603- 74604- 74605+ 74606+ 74607+ 74608 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 74609- 74610+ 74611 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 74612 if test -n "$unique" && test "`eval $cmd`" = "" ; then 74613 eval "LIBPATH$unique=set" 74614- 74615+ 74616 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 74617 LDFLAGS="$LDFLAGS -L$ai_p" 74618 PHP_RPATHS="$PHP_RPATHS $ai_p" 74619- 74620+ 74621 fi 74622 74623 74624 fi 74625- 74626+ 74627 fi 74628 74629 ;; 74630 esac 74631 done 74632 74633- echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 74634-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 74635-if test "${ac_cv_lib_pam_pam_start+set}" = set; then 74636- echo $ECHO_N "(cached) $ECHO_C" >&6 74637+ echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 74638+echo "configure:48487: checking for pam_start in -lpam" >&5 74639+ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` 74640+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 74641+ echo $ac_n "(cached) $ac_c" 1>&6 74642 else 74643- ac_check_lib_save_LIBS=$LIBS 74644+ ac_save_LIBS="$LIBS" 74645 LIBS="-lpam $LIBS" 74646-cat >conftest.$ac_ext <<_ACEOF 74647-/* confdefs.h. */ 74648-_ACEOF 74649-cat confdefs.h >>conftest.$ac_ext 74650-cat >>conftest.$ac_ext <<_ACEOF 74651-/* end confdefs.h. */ 74652- 74653+cat > conftest.$ac_ext <<EOF 74654+#line 48495 "configure" 74655+#include "confdefs.h" 74656 /* Override any gcc2 internal prototype to avoid an error. */ 74657-#ifdef __cplusplus 74658-extern "C" 74659-#endif 74660 /* We use char because int might match the return type of a gcc2 74661- builtin and then its argument prototype would still apply. */ 74662-char pam_start (); 74663-int 74664-main () 74665-{ 74666-pam_start (); 74667- ; 74668- return 0; 74669-} 74670-_ACEOF 74671-rm -f conftest.$ac_objext conftest$ac_exeext 74672-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 74673- (eval $ac_link) 2>conftest.er1 74674- ac_status=$? 74675- grep -v '^ *+' conftest.er1 >conftest.err 74676- rm -f conftest.er1 74677- cat conftest.err >&5 74678- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74679- (exit $ac_status); } && 74680- { ac_try='test -z "$ac_c_werror_flag" 74681- || test ! -s conftest.err' 74682- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74683- (eval $ac_try) 2>&5 74684- ac_status=$? 74685- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74686- (exit $ac_status); }; } && 74687- { ac_try='test -s conftest$ac_exeext' 74688- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74689- (eval $ac_try) 2>&5 74690- ac_status=$? 74691- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74692- (exit $ac_status); }; }; then 74693- ac_cv_lib_pam_pam_start=yes 74694-else 74695- echo "$as_me: failed program was:" >&5 74696-sed 's/^/| /' conftest.$ac_ext >&5 74697- 74698-ac_cv_lib_pam_pam_start=no 74699-fi 74700-rm -f conftest.err conftest.$ac_objext \ 74701- conftest$ac_exeext conftest.$ac_ext 74702-LIBS=$ac_check_lib_save_LIBS 74703-fi 74704-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 74705-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 74706-if test $ac_cv_lib_pam_pam_start = yes; then 74707- 74708- LDFLAGS=$save_old_LDFLAGS 74709- ext_shared=$save_ext_shared 74710- 74711+ builtin and then its argument prototype would still apply. */ 74712+char pam_start(); 74713 74714+int main() { 74715+pam_start() 74716+; return 0; } 74717+EOF 74718+if { (eval echo configure:48506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 74719+ rm -rf conftest* 74720+ eval "ac_cv_lib_$ac_lib_var=yes" 74721+else 74722+ echo "configure: failed program was:" >&5 74723+ cat conftest.$ac_ext >&5 74724+ rm -rf conftest* 74725+ eval "ac_cv_lib_$ac_lib_var=no" 74726+fi 74727+rm -f conftest* 74728+LIBS="$ac_save_LIBS" 74729 74730+fi 74731+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 74732+ echo "$ac_t""yes" 1>&6 74733+ 74734+ LDFLAGS=$save_old_LDFLAGS 74735+ ext_shared=$save_ext_shared 74736+ 74737+ 74738+ 74739 case pam in 74740 c|c_r|pthread*) ;; 74741- *) 74742+ *) 74743 if test "$ext_shared" = "yes"; then 74744- IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD" 74745+ IMAP_SHARED_LIBADD="-lpam $IMAP_SHARED_LIBADD" 74746 else 74747- 74748- 74749+ 74750+ 74751 case pam in 74752 c|c_r|pthread*) ;; 74753- *) 74754- LIBS="-lpam $LIBS" 74755+ *) 74756+ LIBS="-lpam $LIBS" 74757 ;; 74758 esac 74759 74760@@ -64353,40 +48544,40 @@ 74761 esac 74762 74763 74764- 74765-cat >>confdefs.h <<\_ACEOF 74766+ cat >> confdefs.h <<\EOF 74767 #define HAVE_LIBPAM 1 74768-_ACEOF 74769- 74770- 74771+EOF 74772 74773+ 74774+ 74775 else 74776+ echo "$ac_t""no" 1>&6 74777 74778 LDFLAGS=$save_old_LDFLAGS 74779 ext_shared=$save_ext_shared 74780 unset ac_cv_lib_pam_pam_start 74781- 74782- 74783+ 74784+ 74785 fi 74786 74787 74788- 74789+ 74790 save_old_LDFLAGS=$LDFLAGS 74791 ac_stuff="" 74792- 74793+ 74794 save_ext_shared=$ext_shared 74795 ext_shared=yes 74796- 74797+ 74798 for ac_i in $ac_stuff; do 74799 case $ac_i in 74800 -pthread) 74801 if test "$ext_shared" = "yes"; then 74802 LDFLAGS="$LDFLAGS -pthread" 74803 else 74804- 74805- 74806+ 74807+ 74808 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 74809- 74810+ 74811 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 74812 if test -n "$unique" && test "`eval $cmd`" = "" ; then 74813 eval "EXTRA_LDFLAGS$unique=set" 74814@@ -64397,20 +48588,20 @@ 74815 ;; 74816 -l*) 74817 ac_ii=`echo $ac_i|cut -c 3-` 74818- 74819- 74820+ 74821+ 74822 case $ac_ii in 74823 c|c_r|pthread*) ;; 74824- *) 74825+ *) 74826 if test "$ext_shared" = "yes"; then 74827- LDFLAGS="$LDFLAGS -l$ac_ii" 74828+ LDFLAGS="$LDFLAGS -l$ac_ii" 74829 else 74830- 74831- 74832+ 74833+ 74834 case $ac_ii in 74835 c|c_r|pthread*) ;; 74836- *) 74837- LIBS="$LIBS -l$ac_ii" 74838+ *) 74839+ LIBS="$LIBS -l$ac_ii" 74840 ;; 74841 esac 74842 74843@@ -64423,131 +48614,101 @@ 74844 ;; 74845 -L*) 74846 ac_ii=`echo $ac_i|cut -c 3-` 74847- 74848+ 74849 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 74850- 74851+ 74852 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 74853 ai_p=$ac_ii 74854 else 74855- 74856+ 74857 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 74858- 74859+ 74860 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 74861 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 74862 fi 74863 74864- 74865+ 74866 if test "$ext_shared" = "yes"; then 74867 LDFLAGS="-L$ai_p $LDFLAGS" 74868 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 74869 else 74870- 74871- 74872- 74873+ 74874+ 74875+ 74876 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 74877- 74878+ 74879 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 74880 if test -n "$unique" && test "`eval $cmd`" = "" ; then 74881 eval "LIBPATH$unique=set" 74882- 74883+ 74884 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 74885 LDFLAGS="$LDFLAGS -L$ai_p" 74886 PHP_RPATHS="$PHP_RPATHS $ai_p" 74887- 74888+ 74889 fi 74890 74891 74892 fi 74893- 74894+ 74895 fi 74896 74897 ;; 74898 esac 74899 done 74900 74901- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 74902-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 74903-if test "${ac_cv_lib_crypt_crypt+set}" = set; then 74904- echo $ECHO_N "(cached) $ECHO_C" >&6 74905+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 74906+echo "configure:48661: checking for crypt in -lcrypt" >&5 74907+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` 74908+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 74909+ echo $ac_n "(cached) $ac_c" 1>&6 74910 else 74911- ac_check_lib_save_LIBS=$LIBS 74912+ ac_save_LIBS="$LIBS" 74913 LIBS="-lcrypt $LIBS" 74914-cat >conftest.$ac_ext <<_ACEOF 74915-/* confdefs.h. */ 74916-_ACEOF 74917-cat confdefs.h >>conftest.$ac_ext 74918-cat >>conftest.$ac_ext <<_ACEOF 74919-/* end confdefs.h. */ 74920- 74921+cat > conftest.$ac_ext <<EOF 74922+#line 48669 "configure" 74923+#include "confdefs.h" 74924 /* Override any gcc2 internal prototype to avoid an error. */ 74925-#ifdef __cplusplus 74926-extern "C" 74927-#endif 74928 /* We use char because int might match the return type of a gcc2 74929- builtin and then its argument prototype would still apply. */ 74930-char crypt (); 74931-int 74932-main () 74933-{ 74934-crypt (); 74935- ; 74936- return 0; 74937-} 74938-_ACEOF 74939-rm -f conftest.$ac_objext conftest$ac_exeext 74940-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 74941- (eval $ac_link) 2>conftest.er1 74942- ac_status=$? 74943- grep -v '^ *+' conftest.er1 >conftest.err 74944- rm -f conftest.er1 74945- cat conftest.err >&5 74946- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74947- (exit $ac_status); } && 74948- { ac_try='test -z "$ac_c_werror_flag" 74949- || test ! -s conftest.err' 74950- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74951- (eval $ac_try) 2>&5 74952- ac_status=$? 74953- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74954- (exit $ac_status); }; } && 74955- { ac_try='test -s conftest$ac_exeext' 74956- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 74957- (eval $ac_try) 2>&5 74958- ac_status=$? 74959- echo "$as_me:$LINENO: \$? = $ac_status" >&5 74960- (exit $ac_status); }; }; then 74961- ac_cv_lib_crypt_crypt=yes 74962-else 74963- echo "$as_me: failed program was:" >&5 74964-sed 's/^/| /' conftest.$ac_ext >&5 74965- 74966-ac_cv_lib_crypt_crypt=no 74967-fi 74968-rm -f conftest.err conftest.$ac_objext \ 74969- conftest$ac_exeext conftest.$ac_ext 74970-LIBS=$ac_check_lib_save_LIBS 74971-fi 74972-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 74973-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 74974-if test $ac_cv_lib_crypt_crypt = yes; then 74975+ builtin and then its argument prototype would still apply. */ 74976+char crypt(); 74977+ 74978+int main() { 74979+crypt() 74980+; return 0; } 74981+EOF 74982+if { (eval echo configure:48680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 74983+ rm -rf conftest* 74984+ eval "ac_cv_lib_$ac_lib_var=yes" 74985+else 74986+ echo "configure: failed program was:" >&5 74987+ cat conftest.$ac_ext >&5 74988+ rm -rf conftest* 74989+ eval "ac_cv_lib_$ac_lib_var=no" 74990+fi 74991+rm -f conftest* 74992+LIBS="$ac_save_LIBS" 74993 74994+fi 74995+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 74996+ echo "$ac_t""yes" 1>&6 74997+ 74998 LDFLAGS=$save_old_LDFLAGS 74999 ext_shared=$save_ext_shared 75000- 75001- 75002- 75003+ 75004+ 75005+ 75006 case crypt in 75007 c|c_r|pthread*) ;; 75008- *) 75009+ *) 75010 if test "$ext_shared" = "yes"; then 75011- IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD" 75012+ IMAP_SHARED_LIBADD="-lcrypt $IMAP_SHARED_LIBADD" 75013 else 75014- 75015- 75016+ 75017+ 75018 case crypt in 75019 c|c_r|pthread*) ;; 75020- *) 75021- LIBS="-lcrypt $LIBS" 75022+ *) 75023+ LIBS="-lcrypt $LIBS" 75024 ;; 75025 esac 75026 75027@@ -64557,39 +48718,37 @@ 75028 esac 75029 75030 75031- 75032-cat >>confdefs.h <<\_ACEOF 75033+ cat >> confdefs.h <<\EOF 75034 #define HAVE_LIBCRYPT 1 75035-_ACEOF 75036- 75037- 75038+EOF 75039 75040+ 75041+ 75042 else 75043+ echo "$ac_t""no" 1>&6 75044 75045 LDFLAGS=$save_old_LDFLAGS 75046 ext_shared=$save_ext_shared 75047 unset ac_cv_lib_crypt_crypt 75048- 75049- 75050+ 75051+ 75052 fi 75053 75054- 75055- 75056+ 75057+ 75058 if test -z "$IMAP_DIR" || echo "$IMAP_DIR" | grep '^/' >/dev/null ; then 75059 IMAP_DIR=$IMAP_DIR 75060 else 75061- 75062+ 75063 ep_dir="`echo $IMAP_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 75064- 75065+ 75066 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75067 IMAP_DIR="$ep_realdir/`basename \"$IMAP_DIR\"`" 75068 fi 75069 75070 75071 if test -z "$IMAP_DIR"; then 75072- { { echo "$as_me:$LINENO: error: Cannot find rfc822.h. Please check your c-client installation." >&5 75073-echo "$as_me: error: Cannot find rfc822.h. Please check your c-client installation." >&2;} 75074- { (exit 1); exit 1; }; } 75075+ { echo "configure: error: Cannot find rfc822.h. Please check your c-client installation." 1>&2; exit 1; } 75076 fi 75077 75078 if test -r "$IMAP_DIR/c-client/c-client.a"; then 75079@@ -64600,13 +48759,13 @@ 75080 75081 for lib in c-client4 c-client imap; do 75082 IMAP_LIB=$lib 75083- 75084+ 75085 str="$IMAP_DIR/$PHP_LIBDIR/lib$lib.*" 75086 for i in `echo $str`; do 75087 test -r $i && IMAP_LIBDIR=$IMAP_DIR/$PHP_LIBDIR && break 2 75088 done 75089 75090- 75091+ 75092 str="$IMAP_DIR/c-client/lib$lib.*" 75093 for i in `echo $str`; do 75094 test -r $i && IMAP_LIBDIR=$IMAP_DIR/c-client && break 2 75095@@ -64615,56 +48774,54 @@ 75096 done 75097 75098 if test -z "$IMAP_LIBDIR"; then 75099- { { echo "$as_me:$LINENO: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&5 75100-echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&2;} 75101- { (exit 1); exit 1; }; } 75102+ { echo "configure: error: Cannot find imap library (libc-client.a). Please check your c-client installation." 1>&2; exit 1; } 75103 fi 75104 75105- 75106+ 75107 if test "$IMAP_INC_DIR" != "/usr/include"; then 75108- 75109+ 75110 if test -z "$IMAP_INC_DIR" || echo "$IMAP_INC_DIR" | grep '^/' >/dev/null ; then 75111 ai_p=$IMAP_INC_DIR 75112 else 75113- 75114+ 75115 ep_dir="`echo $IMAP_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 75116- 75117+ 75118 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75119 ai_p="$ep_realdir/`basename \"$IMAP_INC_DIR\"`" 75120 fi 75121 75122- 75123- 75124+ 75125+ 75126 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75127- 75128+ 75129 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 75130 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75131 eval "INCLUDEPATH$unique=set" 75132- 75133+ 75134 if test ""; then 75135 INCLUDES="-I$ai_p $INCLUDES" 75136 else 75137 INCLUDES="$INCLUDES -I$ai_p" 75138 fi 75139- 75140+ 75141 fi 75142 75143 fi 75144 75145- 75146- 75147+ 75148+ 75149 case $IMAP_LIB in 75150 c|c_r|pthread*) ;; 75151- *) 75152+ *) 75153 if test "$ext_shared" = "yes"; then 75154- IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD" 75155+ IMAP_SHARED_LIBADD="-l$IMAP_LIB $IMAP_SHARED_LIBADD" 75156 else 75157- 75158- 75159+ 75160+ 75161 case $IMAP_LIB in 75162 c|c_r|pthread*) ;; 75163- *) 75164- DLIBS="-l$IMAP_LIB $DLIBS" 75165+ *) 75166+ DLIBS="-l$IMAP_LIB $DLIBS" 75167 ;; 75168 esac 75169 75170@@ -64674,47 +48831,47 @@ 75171 esac 75172 75173 75174- 75175+ 75176 if test "$IMAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IMAP_LIBDIR" != "/usr/lib"; then 75177- 75178+ 75179 if test -z "$IMAP_LIBDIR" || echo "$IMAP_LIBDIR" | grep '^/' >/dev/null ; then 75180 ai_p=$IMAP_LIBDIR 75181 else 75182- 75183+ 75184 ep_dir="`echo $IMAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 75185- 75186+ 75187 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75188 ai_p="$ep_realdir/`basename \"$IMAP_LIBDIR\"`" 75189 fi 75190 75191- 75192+ 75193 if test "$ext_shared" = "yes"; then 75194 IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" 75195 test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" 75196 else 75197- 75198- 75199- 75200+ 75201+ 75202+ 75203 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75204- 75205+ 75206 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 75207 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75208 eval "LIBPATH$unique=set" 75209- 75210+ 75211 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 75212 LDFLAGS="$LDFLAGS -L$ai_p" 75213 PHP_RPATHS="$PHP_RPATHS $ai_p" 75214- 75215+ 75216 fi 75217 75218 75219 fi 75220- 75221+ 75222 fi 75223 75224- 75225+ 75226 if test "$PHP_KERBEROS" != "no"; then 75227- 75228+ 75229 found_kerberos=no 75230 unset KERBEROS_CFLAGS 75231 unset KERBEROS_LIBS 75232@@ -64722,43 +48879,38 @@ 75233 if test -z "$KRB5_CONFIG"; then 75234 # Extract the first word of "krb5-config", so it can be a program name with args. 75235 set dummy krb5-config; ac_word=$2 75236-echo "$as_me:$LINENO: checking for $ac_word" >&5 75237-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 75238-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then 75239- echo $ECHO_N "(cached) $ECHO_C" >&6 75240+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 75241+echo "configure:48884: checking for $ac_word" >&5 75242+if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then 75243+ echo $ac_n "(cached) $ac_c" 1>&6 75244 else 75245- case $KRB5_CONFIG in 75246- [\\/]* | ?:[\\/]*) 75247+ case "$KRB5_CONFIG" in 75248+ /*) 75249 ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. 75250 ;; 75251+ ?:/*) 75252+ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a dos path. 75253+ ;; 75254 *) 75255- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 75256-as_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" 75257-for as_dir in $as_dummy 75258-do 75259- IFS=$as_save_IFS 75260- test -z "$as_dir" && as_dir=. 75261- for ac_exec_ext in '' $ac_executable_extensions; do 75262- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 75263- ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" 75264- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 75265- break 2 75266- fi 75267-done 75268-done 75269- 75270+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 75271+ ac_dummy="$PATH:/usr/kerberos/bin:/usr/local/bin" 75272+ for ac_dir in $ac_dummy; do 75273+ test -z "$ac_dir" && ac_dir=. 75274+ if test -f $ac_dir/$ac_word; then 75275+ ac_cv_path_KRB5_CONFIG="$ac_dir/$ac_word" 75276+ break 75277+ fi 75278+ done 75279+ IFS="$ac_save_ifs" 75280 test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no" 75281 ;; 75282 esac 75283 fi 75284-KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG 75285- 75286+KRB5_CONFIG="$ac_cv_path_KRB5_CONFIG" 75287 if test -n "$KRB5_CONFIG"; then 75288- echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5 75289-echo "${ECHO_T}$KRB5_CONFIG" >&6 75290+ echo "$ac_t""$KRB5_CONFIG" 1>&6 75291 else 75292- echo "$as_me:$LINENO: result: no" >&5 75293-echo "${ECHO_T}no" >&6 75294+ echo "$ac_t""no" 1>&6 75295 fi 75296 75297 fi 75298@@ -64769,17 +48921,17 @@ 75299 75300 if test -n "$KERBEROS_LIBS"; then 75301 found_kerberos=yes 75302- 75303+ 75304 for ac_i in $KERBEROS_LIBS; do 75305 case $ac_i in 75306 -pthread) 75307 if test "$ext_shared" = "yes"; then 75308 IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -pthread" 75309 else 75310- 75311- 75312+ 75313+ 75314 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 75315- 75316+ 75317 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 75318 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75319 eval "EXTRA_LDFLAGS$unique=set" 75320@@ -64790,20 +48942,20 @@ 75321 ;; 75322 -l*) 75323 ac_ii=`echo $ac_i|cut -c 3-` 75324- 75325- 75326+ 75327+ 75328 case $ac_ii in 75329 c|c_r|pthread*) ;; 75330- *) 75331+ *) 75332 if test "$ext_shared" = "yes"; then 75333- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 75334+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 75335 else 75336- 75337- 75338+ 75339+ 75340 case $ac_ii in 75341 c|c_r|pthread*) ;; 75342- *) 75343- LIBS="$LIBS -l$ac_ii" 75344+ *) 75345+ LIBS="$LIBS -l$ac_ii" 75346 ;; 75347 esac 75348 75349@@ -64816,80 +48968,80 @@ 75350 ;; 75351 -L*) 75352 ac_ii=`echo $ac_i|cut -c 3-` 75353- 75354+ 75355 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 75356- 75357+ 75358 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 75359 ai_p=$ac_ii 75360 else 75361- 75362+ 75363 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 75364- 75365+ 75366 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75367 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 75368 fi 75369 75370- 75371+ 75372 if test "$ext_shared" = "yes"; then 75373 IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" 75374 test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" 75375 else 75376- 75377- 75378- 75379+ 75380+ 75381+ 75382 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75383- 75384+ 75385 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 75386 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75387 eval "LIBPATH$unique=set" 75388- 75389+ 75390 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 75391 LDFLAGS="$LDFLAGS -L$ai_p" 75392 PHP_RPATHS="$PHP_RPATHS $ai_p" 75393- 75394+ 75395 fi 75396 75397 75398 fi 75399- 75400+ 75401 fi 75402 75403 ;; 75404 esac 75405 done 75406 75407- 75408+ 75409 for ac_i in $KERBEROS_CFLAGS; do 75410 case $ac_i in 75411 -I*) 75412 ac_ii=`echo $ac_i|cut -c 3-` 75413- 75414+ 75415 if test "$ac_ii" != "/usr/include"; then 75416- 75417+ 75418 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 75419 ai_p=$ac_ii 75420 else 75421- 75422+ 75423 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 75424- 75425+ 75426 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75427 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 75428 fi 75429 75430- 75431- 75432+ 75433+ 75434 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75435- 75436+ 75437 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 75438 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75439 eval "INCLUDEPATH$unique=set" 75440- 75441+ 75442 if test ""; then 75443 INCLUDES="-I$ai_p $INCLUDES" 75444 else 75445 INCLUDES="$INCLUDES -I$ai_p" 75446 fi 75447- 75448+ 75449 fi 75450 75451 fi 75452@@ -64916,58 +49068,58 @@ 75453 75454 if test "$PHP_KERBEROS_DIR"; then 75455 found_kerberos=yes 75456- 75457+ 75458 if test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_KERBEROS_DIR/$PHP_LIBDIR" != "/usr/lib"; then 75459- 75460+ 75461 if test -z "$PHP_KERBEROS_DIR/$PHP_LIBDIR" || echo "$PHP_KERBEROS_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 75462 ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR 75463 else 75464- 75465+ 75466 ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 75467- 75468+ 75469 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75470 ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`" 75471 fi 75472 75473- 75474+ 75475 if test "$ext_shared" = "yes"; then 75476 IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" 75477 test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" 75478 else 75479- 75480- 75481- 75482+ 75483+ 75484+ 75485 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75486- 75487+ 75488 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 75489 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75490 eval "LIBPATH$unique=set" 75491- 75492+ 75493 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 75494 LDFLAGS="$LDFLAGS -L$ai_p" 75495 PHP_RPATHS="$PHP_RPATHS $ai_p" 75496- 75497+ 75498 fi 75499 75500 75501 fi 75502- 75503+ 75504 fi 75505 75506- 75507- 75508+ 75509+ 75510 case gssapi_krb5 in 75511 c|c_r|pthread*) ;; 75512- *) 75513+ *) 75514 if test "$ext_shared" = "yes"; then 75515- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5" 75516+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lgssapi_krb5" 75517 else 75518- 75519- 75520+ 75521+ 75522 case gssapi_krb5 in 75523 c|c_r|pthread*) ;; 75524- *) 75525- LIBS="$LIBS -lgssapi_krb5" 75526+ *) 75527+ LIBS="$LIBS -lgssapi_krb5" 75528 ;; 75529 esac 75530 75531@@ -64977,20 +49129,20 @@ 75532 esac 75533 75534 75535- 75536- 75537+ 75538+ 75539 case krb5 in 75540 c|c_r|pthread*) ;; 75541- *) 75542+ *) 75543 if test "$ext_shared" = "yes"; then 75544- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5" 75545+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lkrb5" 75546 else 75547- 75548- 75549+ 75550+ 75551 case krb5 in 75552 c|c_r|pthread*) ;; 75553- *) 75554- LIBS="$LIBS -lkrb5" 75555+ *) 75556+ LIBS="$LIBS -lkrb5" 75557 ;; 75558 esac 75559 75560@@ -65000,20 +49152,20 @@ 75561 esac 75562 75563 75564- 75565- 75566+ 75567+ 75568 case k5crypto in 75569 c|c_r|pthread*) ;; 75570- *) 75571+ *) 75572 if test "$ext_shared" = "yes"; then 75573- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto" 75574+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lk5crypto" 75575 else 75576- 75577- 75578+ 75579+ 75580 case k5crypto in 75581 c|c_r|pthread*) ;; 75582- *) 75583- LIBS="$LIBS -lk5crypto" 75584+ *) 75585+ LIBS="$LIBS -lk5crypto" 75586 ;; 75587 esac 75588 75589@@ -65023,20 +49175,20 @@ 75590 esac 75591 75592 75593- 75594- 75595+ 75596+ 75597 case com_err in 75598 c|c_r|pthread*) ;; 75599- *) 75600+ *) 75601 if test "$ext_shared" = "yes"; then 75602- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err" 75603+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -lcom_err" 75604 else 75605- 75606- 75607+ 75608+ 75609 case com_err in 75610 c|c_r|pthread*) ;; 75611- *) 75612- LIBS="$LIBS -lcom_err" 75613+ *) 75614+ LIBS="$LIBS -lcom_err" 75615 ;; 75616 esac 75617 75618@@ -65046,33 +49198,33 @@ 75619 esac 75620 75621 75622- 75623+ 75624 if test "$PHP_KERBEROS_DIR/include" != "/usr/include"; then 75625- 75626+ 75627 if test -z "$PHP_KERBEROS_DIR/include" || echo "$PHP_KERBEROS_DIR/include" | grep '^/' >/dev/null ; then 75628 ai_p=$PHP_KERBEROS_DIR/include 75629 else 75630- 75631+ 75632 ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 75633- 75634+ 75635 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75636 ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`" 75637 fi 75638 75639- 75640- 75641+ 75642+ 75643 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75644- 75645+ 75646 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 75647 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75648 eval "INCLUDEPATH$unique=set" 75649- 75650+ 75651 if test ""; then 75652 INCLUDES="-I$ai_p $INCLUDES" 75653 else 75654 INCLUDES="$INCLUDES -I$ai_p" 75655 fi 75656- 75657+ 75658 fi 75659 75660 fi 75661@@ -65082,59 +49234,45 @@ 75662 75663 if test "$found_kerberos" = "yes"; then 75664 75665- 75666-cat >>confdefs.h <<\_ACEOF 75667+ cat >> confdefs.h <<\EOF 75668 #define HAVE_IMAP_KRB 1 75669-_ACEOF 75670- 75671- 75672-else 75673- { { echo "$as_me:$LINENO: error: Kerberos libraries not found. 75674- 75675- Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) 75676- " >&5 75677-echo "$as_me: error: Kerberos libraries not found. 75678+EOF 75679 75680+ 75681+else 75682+ { echo "configure: error: Kerberos libraries not found. 75683+ 75684 Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr ) 75685- " >&2;} 75686- { (exit 1); exit 1; }; } 75687- 75688+ " 1>&2; exit 1; } 75689+ 75690 fi 75691 75692 else 75693- cat >conftest.$ac_ext <<_ACEOF 75694-/* confdefs.h. */ 75695-_ACEOF 75696-cat confdefs.h >>conftest.$ac_ext 75697-cat >>conftest.$ac_ext <<_ACEOF 75698-/* end confdefs.h. */ 75699+ cat > conftest.$ac_ext <<EOF 75700+#line 49253 "configure" 75701+#include "confdefs.h" 75702 #include <$IMAP_INC_DIR/linkage.h> 75703- 75704-_ACEOF 75705+EOF 75706 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 75707- $EGREP "auth_gss" >/dev/null 2>&1; then 75708- 75709- { { echo "$as_me:$LINENO: error: This c-client library is built with Kerberos support. 75710- 75711- Add --with-kerberos to your configure line. Check config.log for details. 75712- " >&5 75713-echo "$as_me: error: This c-client library is built with Kerberos support. 75714+ egrep "auth_gss" >/dev/null 2>&1; then 75715+ rm -rf conftest* 75716+ 75717+ { echo "configure: error: This c-client library is built with Kerberos support. 75718 75719 Add --with-kerberos to your configure line. Check config.log for details. 75720- " >&2;} 75721- { (exit 1); exit 1; }; } 75722- 75723+ " 1>&2; exit 1; } 75724+ 75725 fi 75726 rm -f conftest* 75727 75728 fi 75729 75730- 75731+ 75732 if test "$PHP_IMAP_SSL" != "no"; then 75733 if test "$PHP_OPENSSL" = ""; then 75734 PHP_OPENSSL='no' 75735 fi 75736- 75737+ 75738 found_openssl=no 75739 unset OPENSSL_INCDIR 75740 unset OPENSSL_LIBDIR 75741@@ -65151,42 +49289,38 @@ 75742 if test -z "$PKG_CONFIG"; then 75743 # Extract the first word of "pkg-config", so it can be a program name with args. 75744 set dummy pkg-config; ac_word=$2 75745-echo "$as_me:$LINENO: checking for $ac_word" >&5 75746-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 75747-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then 75748- echo $ECHO_N "(cached) $ECHO_C" >&6 75749+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 75750+echo "configure:49294: checking for $ac_word" >&5 75751+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 75752+ echo $ac_n "(cached) $ac_c" 1>&6 75753 else 75754- case $PKG_CONFIG in 75755- [\\/]* | ?:[\\/]*) 75756+ case "$PKG_CONFIG" in 75757+ /*) 75758 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 75759 ;; 75760+ ?:/*) 75761+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 75762+ ;; 75763 *) 75764- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 75765-for as_dir in $PATH 75766-do 75767- IFS=$as_save_IFS 75768- test -z "$as_dir" && as_dir=. 75769- for ac_exec_ext in '' $ac_executable_extensions; do 75770- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 75771- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 75772- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 75773- break 2 75774- fi 75775-done 75776-done 75777- 75778+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 75779+ ac_dummy="$PATH" 75780+ for ac_dir in $ac_dummy; do 75781+ test -z "$ac_dir" && ac_dir=. 75782+ if test -f $ac_dir/$ac_word; then 75783+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 75784+ break 75785+ fi 75786+ done 75787+ IFS="$ac_save_ifs" 75788 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 75789 ;; 75790 esac 75791 fi 75792-PKG_CONFIG=$ac_cv_path_PKG_CONFIG 75793- 75794+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 75795 if test -n "$PKG_CONFIG"; then 75796- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 75797-echo "${ECHO_T}$PKG_CONFIG" >&6 75798+ echo "$ac_t""$PKG_CONFIG" 1>&6 75799 else 75800- echo "$as_me:$LINENO: result: no" >&5 75801-echo "${ECHO_T}no" >&6 75802+ echo "$ac_t""no" 1>&6 75803 fi 75804 75805 fi 75806@@ -65198,23 +49332,21 @@ 75807 OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` 75808 OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` 75809 else 75810- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 75811-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 75812- { (exit 1); exit 1; }; } 75813+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 75814 fi 75815 75816 if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then 75817- 75818+ 75819 for ac_i in $OPENSSL_LIBS; do 75820 case $ac_i in 75821 -pthread) 75822 if test "$ext_shared" = "yes"; then 75823 IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -pthread" 75824 else 75825- 75826- 75827+ 75828+ 75829 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 75830- 75831+ 75832 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 75833 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75834 eval "EXTRA_LDFLAGS$unique=set" 75835@@ -65225,20 +49357,20 @@ 75836 ;; 75837 -l*) 75838 ac_ii=`echo $ac_i|cut -c 3-` 75839- 75840- 75841+ 75842+ 75843 case $ac_ii in 75844 c|c_r|pthread*) ;; 75845- *) 75846+ *) 75847 if test "$ext_shared" = "yes"; then 75848- IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 75849+ IMAP_SHARED_LIBADD="$IMAP_SHARED_LIBADD -l$ac_ii" 75850 else 75851- 75852- 75853+ 75854+ 75855 case $ac_ii in 75856 c|c_r|pthread*) ;; 75857- *) 75858- LIBS="$LIBS -l$ac_ii" 75859+ *) 75860+ LIBS="$LIBS -l$ac_ii" 75861 ;; 75862 esac 75863 75864@@ -65251,80 +49383,80 @@ 75865 ;; 75866 -L*) 75867 ac_ii=`echo $ac_i|cut -c 3-` 75868- 75869+ 75870 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 75871- 75872+ 75873 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 75874 ai_p=$ac_ii 75875 else 75876- 75877+ 75878 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 75879- 75880+ 75881 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75882 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 75883 fi 75884 75885- 75886+ 75887 if test "$ext_shared" = "yes"; then 75888 IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" 75889 test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" 75890 else 75891- 75892- 75893- 75894+ 75895+ 75896+ 75897 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75898- 75899+ 75900 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 75901 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75902 eval "LIBPATH$unique=set" 75903- 75904+ 75905 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 75906 LDFLAGS="$LDFLAGS -L$ai_p" 75907 PHP_RPATHS="$PHP_RPATHS $ai_p" 75908- 75909+ 75910 fi 75911 75912 75913 fi 75914- 75915+ 75916 fi 75917 75918 ;; 75919 esac 75920 done 75921 75922- 75923+ 75924 for ac_i in $OPENSSL_INCS; do 75925 case $ac_i in 75926 -I*) 75927 ac_ii=`echo $ac_i|cut -c 3-` 75928- 75929+ 75930 if test "$ac_ii" != "/usr/include"; then 75931- 75932+ 75933 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 75934 ai_p=$ac_ii 75935 else 75936- 75937+ 75938 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 75939- 75940+ 75941 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 75942 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 75943 fi 75944 75945- 75946- 75947+ 75948+ 75949 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 75950- 75951+ 75952 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 75953 if test -n "$unique" && test "`eval $cmd`" = "" ; then 75954 eval "INCLUDEPATH$unique=set" 75955- 75956+ 75957 if test ""; then 75958 INCLUDES="-I$ai_p $INCLUDES" 75959 else 75960 INCLUDES="$INCLUDES -I$ai_p" 75961 fi 75962- 75963+ 75964 fi 75965 75966 fi 75967@@ -65337,7 +49469,7 @@ 75968 fi 75969 75970 if test "$found_openssl" = "no"; then 75971- 75972+ 75973 if test "$PHP_OPENSSL_DIR" = "yes"; then 75974 PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 75975 fi 75976@@ -65353,102 +49485,94 @@ 75977 done 75978 75979 if test -z "$OPENSSL_INCDIR"; then 75980- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5 75981-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;} 75982- { (exit 1); exit 1; }; } 75983+ { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; } 75984 fi 75985 75986 if test -z "$OPENSSL_LIBDIR"; then 75987- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5 75988-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;} 75989- { (exit 1); exit 1; }; } 75990+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } 75991 fi 75992 75993 old_CPPFLAGS=$CPPFLAGS 75994 CPPFLAGS=-I$OPENSSL_INCDIR 75995- echo "$as_me:$LINENO: checking for OpenSSL version" >&5 75996-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 75997- cat >conftest.$ac_ext <<_ACEOF 75998-/* confdefs.h. */ 75999-_ACEOF 76000-cat confdefs.h >>conftest.$ac_ext 76001-cat >>conftest.$ac_ext <<_ACEOF 76002-/* end confdefs.h. */ 76003+ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 76004+echo "configure:49499: checking for OpenSSL version" >&5 76005+ cat > conftest.$ac_ext <<EOF 76006+#line 49501 "configure" 76007+#include "confdefs.h" 76008 76009 #include <openssl/opensslv.h> 76010 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL 76011 yes 76012 #endif 76013- 76014-_ACEOF 76015+ 76016+EOF 76017 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 76018- $EGREP "yes" >/dev/null 2>&1; then 76019- 76020- echo "$as_me:$LINENO: result: >= 0.9.6" >&5 76021-echo "${ECHO_T}>= 0.9.6" >&6 76022- 76023+ egrep "yes" >/dev/null 2>&1; then 76024+ rm -rf conftest* 76025+ 76026+ echo "$ac_t"">= 0.9.6" 1>&6 76027+ 76028 else 76029- 76030- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 76031-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 76032- { (exit 1); exit 1; }; } 76033- 76034+ rm -rf conftest* 76035+ 76036+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 76037+ 76038 fi 76039 rm -f conftest* 76040 76041 CPPFLAGS=$old_CPPFLAGS 76042 76043- 76044+ 76045 if test "$OPENSSL_INCDIR" != "/usr/include"; then 76046- 76047+ 76048 if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then 76049 ai_p=$OPENSSL_INCDIR 76050 else 76051- 76052+ 76053 ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 76054- 76055+ 76056 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 76057 ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 76058 fi 76059 76060- 76061- 76062+ 76063+ 76064 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 76065- 76066+ 76067 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 76068 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76069 eval "INCLUDEPATH$unique=set" 76070- 76071+ 76072 if test ""; then 76073 INCLUDES="-I$ai_p $INCLUDES" 76074 else 76075 INCLUDES="$INCLUDES -I$ai_p" 76076 fi 76077- 76078+ 76079 fi 76080 76081 fi 76082 76083- 76084- 76085+ 76086+ 76087 save_old_LDFLAGS=$LDFLAGS 76088 ac_stuff=" 76089 -L$OPENSSL_LIBDIR 76090 " 76091- 76092+ 76093 save_ext_shared=$ext_shared 76094 ext_shared=yes 76095- 76096+ 76097 for ac_i in $ac_stuff; do 76098 case $ac_i in 76099 -pthread) 76100 if test "$ext_shared" = "yes"; then 76101 LDFLAGS="$LDFLAGS -pthread" 76102 else 76103- 76104- 76105+ 76106+ 76107 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 76108- 76109+ 76110 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 76111 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76112 eval "EXTRA_LDFLAGS$unique=set" 76113@@ -65459,20 +49583,20 @@ 76114 ;; 76115 -l*) 76116 ac_ii=`echo $ac_i|cut -c 3-` 76117- 76118- 76119+ 76120+ 76121 case $ac_ii in 76122 c|c_r|pthread*) ;; 76123- *) 76124+ *) 76125 if test "$ext_shared" = "yes"; then 76126- LDFLAGS="$LDFLAGS -l$ac_ii" 76127+ LDFLAGS="$LDFLAGS -l$ac_ii" 76128 else 76129- 76130- 76131+ 76132+ 76133 case $ac_ii in 76134 c|c_r|pthread*) ;; 76135- *) 76136- LIBS="$LIBS -l$ac_ii" 76137+ *) 76138+ LIBS="$LIBS -l$ac_ii" 76139 ;; 76140 esac 76141 76142@@ -65485,131 +49609,101 @@ 76143 ;; 76144 -L*) 76145 ac_ii=`echo $ac_i|cut -c 3-` 76146- 76147+ 76148 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 76149- 76150+ 76151 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 76152 ai_p=$ac_ii 76153 else 76154- 76155+ 76156 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 76157- 76158+ 76159 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 76160 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 76161 fi 76162 76163- 76164+ 76165 if test "$ext_shared" = "yes"; then 76166 LDFLAGS="-L$ai_p $LDFLAGS" 76167 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 76168 else 76169- 76170- 76171- 76172+ 76173+ 76174+ 76175 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 76176- 76177+ 76178 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 76179 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76180 eval "LIBPATH$unique=set" 76181- 76182+ 76183 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 76184 LDFLAGS="$LDFLAGS -L$ai_p" 76185 PHP_RPATHS="$PHP_RPATHS $ai_p" 76186- 76187+ 76188 fi 76189 76190 76191 fi 76192- 76193+ 76194 fi 76195 76196 ;; 76197 esac 76198 done 76199 76200- echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5 76201-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6 76202-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then 76203- echo $ECHO_N "(cached) $ECHO_C" >&6 76204+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 76205+echo "configure:49656: checking for CRYPTO_free in -lcrypto" >&5 76206+ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` 76207+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 76208+ echo $ac_n "(cached) $ac_c" 1>&6 76209 else 76210- ac_check_lib_save_LIBS=$LIBS 76211+ ac_save_LIBS="$LIBS" 76212 LIBS="-lcrypto $LIBS" 76213-cat >conftest.$ac_ext <<_ACEOF 76214-/* confdefs.h. */ 76215-_ACEOF 76216-cat confdefs.h >>conftest.$ac_ext 76217-cat >>conftest.$ac_ext <<_ACEOF 76218-/* end confdefs.h. */ 76219- 76220+cat > conftest.$ac_ext <<EOF 76221+#line 49664 "configure" 76222+#include "confdefs.h" 76223 /* Override any gcc2 internal prototype to avoid an error. */ 76224-#ifdef __cplusplus 76225-extern "C" 76226-#endif 76227 /* We use char because int might match the return type of a gcc2 76228- builtin and then its argument prototype would still apply. */ 76229-char CRYPTO_free (); 76230-int 76231-main () 76232-{ 76233-CRYPTO_free (); 76234- ; 76235- return 0; 76236-} 76237-_ACEOF 76238-rm -f conftest.$ac_objext conftest$ac_exeext 76239-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 76240- (eval $ac_link) 2>conftest.er1 76241- ac_status=$? 76242- grep -v '^ *+' conftest.er1 >conftest.err 76243- rm -f conftest.er1 76244- cat conftest.err >&5 76245- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76246- (exit $ac_status); } && 76247- { ac_try='test -z "$ac_c_werror_flag" 76248- || test ! -s conftest.err' 76249- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76250- (eval $ac_try) 2>&5 76251- ac_status=$? 76252- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76253- (exit $ac_status); }; } && 76254- { ac_try='test -s conftest$ac_exeext' 76255- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76256- (eval $ac_try) 2>&5 76257- ac_status=$? 76258- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76259- (exit $ac_status); }; }; then 76260- ac_cv_lib_crypto_CRYPTO_free=yes 76261-else 76262- echo "$as_me: failed program was:" >&5 76263-sed 's/^/| /' conftest.$ac_ext >&5 76264- 76265-ac_cv_lib_crypto_CRYPTO_free=no 76266-fi 76267-rm -f conftest.err conftest.$ac_objext \ 76268- conftest$ac_exeext conftest.$ac_ext 76269-LIBS=$ac_check_lib_save_LIBS 76270-fi 76271-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 76272-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6 76273-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then 76274+ builtin and then its argument prototype would still apply. */ 76275+char CRYPTO_free(); 76276+ 76277+int main() { 76278+CRYPTO_free() 76279+; return 0; } 76280+EOF 76281+if { (eval echo configure:49675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 76282+ rm -rf conftest* 76283+ eval "ac_cv_lib_$ac_lib_var=yes" 76284+else 76285+ echo "configure: failed program was:" >&5 76286+ cat conftest.$ac_ext >&5 76287+ rm -rf conftest* 76288+ eval "ac_cv_lib_$ac_lib_var=no" 76289+fi 76290+rm -f conftest* 76291+LIBS="$ac_save_LIBS" 76292 76293+fi 76294+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 76295+ echo "$ac_t""yes" 1>&6 76296+ 76297 LDFLAGS=$save_old_LDFLAGS 76298 ext_shared=$save_ext_shared 76299- 76300- 76301- 76302+ 76303+ 76304+ 76305 case crypto in 76306 c|c_r|pthread*) ;; 76307- *) 76308+ *) 76309 if test "$ext_shared" = "yes"; then 76310- IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 76311+ IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 76312 else 76313- 76314- 76315+ 76316+ 76317 case crypto in 76318 c|c_r|pthread*) ;; 76319- *) 76320- LIBS="-lcrypto $LIBS" 76321+ *) 76322+ LIBS="-lcrypto $LIBS" 76323 ;; 76324 esac 76325 76326@@ -65619,43 +49713,42 @@ 76327 esac 76328 76329 76330- 76331- 76332+ 76333+ 76334 else 76335+ echo "$ac_t""no" 1>&6 76336 76337 LDFLAGS=$save_old_LDFLAGS 76338 ext_shared=$save_ext_shared 76339 unset ac_cv_lib_crypto_CRYPTO_free 76340- 76341- { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5 76342-echo "$as_me: error: libcrypto not found!" >&2;} 76343- { (exit 1); exit 1; }; } 76344- 76345- 76346+ 76347+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } 76348+ 76349+ 76350 fi 76351 76352 76353 old_LIBS=$LIBS 76354 LIBS="$LIBS -lcrypto" 76355- 76356+ 76357 save_old_LDFLAGS=$LDFLAGS 76358 ac_stuff=" 76359 -L$OPENSSL_LIBDIR 76360 " 76361- 76362+ 76363 save_ext_shared=$ext_shared 76364 ext_shared=yes 76365- 76366+ 76367 for ac_i in $ac_stuff; do 76368 case $ac_i in 76369 -pthread) 76370 if test "$ext_shared" = "yes"; then 76371 LDFLAGS="$LDFLAGS -pthread" 76372 else 76373- 76374- 76375+ 76376+ 76377 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 76378- 76379+ 76380 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 76381 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76382 eval "EXTRA_LDFLAGS$unique=set" 76383@@ -65666,20 +49759,20 @@ 76384 ;; 76385 -l*) 76386 ac_ii=`echo $ac_i|cut -c 3-` 76387- 76388- 76389+ 76390+ 76391 case $ac_ii in 76392 c|c_r|pthread*) ;; 76393- *) 76394+ *) 76395 if test "$ext_shared" = "yes"; then 76396- LDFLAGS="$LDFLAGS -l$ac_ii" 76397+ LDFLAGS="$LDFLAGS -l$ac_ii" 76398 else 76399- 76400- 76401+ 76402+ 76403 case $ac_ii in 76404 c|c_r|pthread*) ;; 76405- *) 76406- LIBS="$LIBS -l$ac_ii" 76407+ *) 76408+ LIBS="$LIBS -l$ac_ii" 76409 ;; 76410 esac 76411 76412@@ -65692,148 +49785,117 @@ 76413 ;; 76414 -L*) 76415 ac_ii=`echo $ac_i|cut -c 3-` 76416- 76417+ 76418 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 76419- 76420+ 76421 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 76422 ai_p=$ac_ii 76423 else 76424- 76425+ 76426 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 76427- 76428+ 76429 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 76430 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 76431 fi 76432 76433- 76434+ 76435 if test "$ext_shared" = "yes"; then 76436 LDFLAGS="-L$ai_p $LDFLAGS" 76437 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 76438 else 76439- 76440- 76441- 76442+ 76443+ 76444+ 76445 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 76446- 76447+ 76448 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 76449 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76450 eval "LIBPATH$unique=set" 76451- 76452+ 76453 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 76454 LDFLAGS="$LDFLAGS -L$ai_p" 76455 PHP_RPATHS="$PHP_RPATHS $ai_p" 76456- 76457+ 76458 fi 76459 76460 76461 fi 76462- 76463+ 76464 fi 76465 76466 ;; 76467 esac 76468 done 76469 76470- echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5 76471-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6 76472-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then 76473- echo $ECHO_N "(cached) $ECHO_C" >&6 76474+ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 76475+echo "configure:49832: checking for SSL_CTX_set_ssl_version in -lssl" >&5 76476+ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` 76477+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 76478+ echo $ac_n "(cached) $ac_c" 1>&6 76479 else 76480- ac_check_lib_save_LIBS=$LIBS 76481+ ac_save_LIBS="$LIBS" 76482 LIBS="-lssl $LIBS" 76483-cat >conftest.$ac_ext <<_ACEOF 76484-/* confdefs.h. */ 76485-_ACEOF 76486-cat confdefs.h >>conftest.$ac_ext 76487-cat >>conftest.$ac_ext <<_ACEOF 76488-/* end confdefs.h. */ 76489- 76490+cat > conftest.$ac_ext <<EOF 76491+#line 49840 "configure" 76492+#include "confdefs.h" 76493 /* Override any gcc2 internal prototype to avoid an error. */ 76494-#ifdef __cplusplus 76495-extern "C" 76496-#endif 76497 /* We use char because int might match the return type of a gcc2 76498- builtin and then its argument prototype would still apply. */ 76499-char SSL_CTX_set_ssl_version (); 76500-int 76501-main () 76502-{ 76503-SSL_CTX_set_ssl_version (); 76504- ; 76505- return 0; 76506-} 76507-_ACEOF 76508-rm -f conftest.$ac_objext conftest$ac_exeext 76509-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 76510- (eval $ac_link) 2>conftest.er1 76511- ac_status=$? 76512- grep -v '^ *+' conftest.er1 >conftest.err 76513- rm -f conftest.er1 76514- cat conftest.err >&5 76515- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76516- (exit $ac_status); } && 76517- { ac_try='test -z "$ac_c_werror_flag" 76518- || test ! -s conftest.err' 76519- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76520- (eval $ac_try) 2>&5 76521- ac_status=$? 76522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76523- (exit $ac_status); }; } && 76524- { ac_try='test -s conftest$ac_exeext' 76525- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76526- (eval $ac_try) 2>&5 76527- ac_status=$? 76528- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76529- (exit $ac_status); }; }; then 76530- ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes 76531-else 76532- echo "$as_me: failed program was:" >&5 76533-sed 's/^/| /' conftest.$ac_ext >&5 76534- 76535-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no 76536-fi 76537-rm -f conftest.err conftest.$ac_objext \ 76538- conftest$ac_exeext conftest.$ac_ext 76539-LIBS=$ac_check_lib_save_LIBS 76540-fi 76541-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 76542-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6 76543-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then 76544+ builtin and then its argument prototype would still apply. */ 76545+char SSL_CTX_set_ssl_version(); 76546+ 76547+int main() { 76548+SSL_CTX_set_ssl_version() 76549+; return 0; } 76550+EOF 76551+if { (eval echo configure:49851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 76552+ rm -rf conftest* 76553+ eval "ac_cv_lib_$ac_lib_var=yes" 76554+else 76555+ echo "configure: failed program was:" >&5 76556+ cat conftest.$ac_ext >&5 76557+ rm -rf conftest* 76558+ eval "ac_cv_lib_$ac_lib_var=no" 76559+fi 76560+rm -f conftest* 76561+LIBS="$ac_save_LIBS" 76562 76563+fi 76564+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 76565+ echo "$ac_t""yes" 1>&6 76566+ 76567 LDFLAGS=$save_old_LDFLAGS 76568 ext_shared=$save_ext_shared 76569- 76570+ 76571 found_openssl=yes 76572- 76573- 76574+ 76575+ 76576 else 76577+ echo "$ac_t""no" 1>&6 76578 76579 LDFLAGS=$save_old_LDFLAGS 76580 ext_shared=$save_ext_shared 76581 unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version 76582- 76583- { { echo "$as_me:$LINENO: error: libssl not found!" >&5 76584-echo "$as_me: error: libssl not found!" >&2;} 76585- { (exit 1); exit 1; }; } 76586- 76587- 76588+ 76589+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } 76590+ 76591+ 76592 fi 76593 76594 LIBS=$old_LIBS 76595- 76596- 76597+ 76598+ 76599 case ssl in 76600 c|c_r|pthread*) ;; 76601- *) 76602+ *) 76603 if test "$ext_shared" = "yes"; then 76604- IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD" 76605+ IMAP_SHARED_LIBADD="-lssl $IMAP_SHARED_LIBADD" 76606 else 76607- 76608- 76609+ 76610+ 76611 case ssl in 76612 c|c_r|pthread*) ;; 76613- *) 76614- LIBS="-lssl $LIBS" 76615+ *) 76616+ LIBS="-lssl $LIBS" 76617 ;; 76618 esac 76619 76620@@ -65843,20 +49905,20 @@ 76621 esac 76622 76623 76624- 76625- 76626+ 76627+ 76628 case crypto in 76629 c|c_r|pthread*) ;; 76630- *) 76631+ *) 76632 if test "$ext_shared" = "yes"; then 76633- IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 76634+ IMAP_SHARED_LIBADD="-lcrypto $IMAP_SHARED_LIBADD" 76635 else 76636- 76637- 76638+ 76639+ 76640 case crypto in 76641 c|c_r|pthread*) ;; 76642- *) 76643- LIBS="-lcrypto $LIBS" 76644+ *) 76645+ LIBS="-lcrypto $LIBS" 76646 ;; 76647 esac 76648 76649@@ -65867,93 +49929,79 @@ 76650 76651 76652 76653- 76654+ 76655 if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then 76656- 76657+ 76658 if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then 76659 ai_p=$OPENSSL_LIBDIR 76660 else 76661- 76662+ 76663 ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 76664- 76665+ 76666 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 76667 ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" 76668 fi 76669 76670- 76671+ 76672 if test "$ext_shared" = "yes"; then 76673 IMAP_SHARED_LIBADD="-L$ai_p $IMAP_SHARED_LIBADD" 76674 test -n "$ld_runpath_switch" && IMAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $IMAP_SHARED_LIBADD" 76675 else 76676- 76677- 76678- 76679+ 76680+ 76681+ 76682 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 76683- 76684+ 76685 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 76686 if test -n "$unique" && test "`eval $cmd`" = "" ; then 76687 eval "LIBPATH$unique=set" 76688- 76689+ 76690 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 76691 LDFLAGS="$LDFLAGS -L$ai_p" 76692 PHP_RPATHS="$PHP_RPATHS $ai_p" 76693- 76694+ 76695 fi 76696 76697 76698 fi 76699- 76700+ 76701 fi 76702 76703 fi 76704 76705 if test "$found_openssl" = "yes"; then 76706 OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR 76707+ 76708 76709 76710- 76711- 76712-cat >>confdefs.h <<\_ACEOF 76713+ cat >> confdefs.h <<\EOF 76714 #define HAVE_IMAP_SSL 1 76715-_ACEOF 76716- 76717- 76718-else 76719- { { echo "$as_me:$LINENO: error: OpenSSL libraries not found. 76720- 76721- Check the path given to --with-openssl-dir and output in config.log) 76722- " >&5 76723-echo "$as_me: error: OpenSSL libraries not found. 76724+EOF 76725 76726+ 76727+else 76728+ { echo "configure: error: OpenSSL libraries not found. 76729+ 76730 Check the path given to --with-openssl-dir and output in config.log) 76731- " >&2;} 76732- { (exit 1); exit 1; }; } 76733- 76734+ " 1>&2; exit 1; } 76735+ 76736 fi 76737 76738 elif test -f "$IMAP_INC_DIR/linkage.c"; then 76739- cat >conftest.$ac_ext <<_ACEOF 76740-/* confdefs.h. */ 76741-_ACEOF 76742-cat confdefs.h >>conftest.$ac_ext 76743-cat >>conftest.$ac_ext <<_ACEOF 76744-/* end confdefs.h. */ 76745+ cat > conftest.$ac_ext <<EOF 76746+#line 49993 "configure" 76747+#include "confdefs.h" 76748 #include <$IMAP_INC_DIR/linkage.c> 76749- 76750-_ACEOF 76751+EOF 76752 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 76753- $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then 76754- 76755- { { echo "$as_me:$LINENO: error: This c-client library is built with SSL support. 76756- 76757- Add --with-imap-ssl to your configure line. Check config.log for details. 76758- " >&5 76759-echo "$as_me: error: This c-client library is built with SSL support. 76760+ egrep "ssl_onceonlyinit" >/dev/null 2>&1; then 76761+ rm -rf conftest* 76762+ 76763+ { echo "configure: error: This c-client library is built with SSL support. 76764 76765 Add --with-imap-ssl to your configure line. Check config.log for details. 76766- " >&2;} 76767- { (exit 1); exit 1; }; } 76768- 76769+ " 1>&2; exit 1; } 76770+ 76771 fi 76772 rm -f conftest* 76773 76774@@ -65962,23 +50010,20 @@ 76775 76776 TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD" 76777 76778- 76779- 76780+ 76781+ 76782 old_LIBS=$LIBS 76783 LIBS="$TST_LIBS $LIBS" 76784 if test "$cross_compiling" = yes; then 76785- 76786+ 76787 LIBS=$old_LIBS 76788- 76789+ 76790 else 76791- cat >conftest.$ac_ext <<_ACEOF 76792-/* confdefs.h. */ 76793-_ACEOF 76794-cat confdefs.h >>conftest.$ac_ext 76795-cat >>conftest.$ac_ext <<_ACEOF 76796-/* end confdefs.h. */ 76797- 76798+ cat > conftest.$ac_ext <<EOF 76799+#line 50024 "configure" 76800+#include "confdefs.h" 76801 76802+ 76803 #if defined(__GNUC__) && __GNUC__ >= 4 76804 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) 76805 #else 76806@@ -66000,68 +50045,54 @@ 76807 PHP_IMAP_EXPORT void mm_exists(void){} 76808 PHP_IMAP_EXPORT void mm_searched(void){} 76809 PHP_IMAP_EXPORT void mm_expunged(void){} 76810- 76811+ 76812 char auth_gssapi_valid(); 76813 int main() { 76814 auth_gssapi_valid(); 76815 return 0; 76816 } 76817- 76818-_ACEOF 76819-rm -f conftest$ac_exeext 76820-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 76821- (eval $ac_link) 2>&5 76822- ac_status=$? 76823- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76824- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 76825- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76826- (eval $ac_try) 2>&5 76827- ac_status=$? 76828- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76829- (exit $ac_status); }; }; then 76830- 76831+ 76832+EOF 76833+if { (eval echo configure:50057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 76834+then 76835+ 76836 LIBS=$old_LIBS 76837- 76838- 76839-cat >>confdefs.h <<\_ACEOF 76840+ 76841+ cat >> confdefs.h <<\EOF 76842 #define HAVE_IMAP_AUTH_GSS 1 76843-_ACEOF 76844- 76845- 76846+EOF 76847 76848+ 76849+ 76850 else 76851- echo "$as_me: program exited with status $ac_status" >&5 76852-echo "$as_me: failed program was:" >&5 76853-sed 's/^/| /' conftest.$ac_ext >&5 76854- 76855-( exit $ac_status ) 76856- 76857+ echo "configure: failed program was:" >&5 76858+ cat conftest.$ac_ext >&5 76859+ rm -fr conftest* 76860+ 76861 LIBS=$old_LIBS 76862- 76863- 76864+ 76865+ 76866 fi 76867-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 76868+rm -fr conftest* 76869 fi 76870 76871 76872 76873 76874- 76875+ 76876+ 76877 old_LIBS=$LIBS 76878 LIBS="$TST_LIBS $LIBS" 76879 if test "$cross_compiling" = yes; then 76880- 76881+ 76882 LIBS=$old_LIBS 76883- 76884+ 76885 else 76886- cat >conftest.$ac_ext <<_ACEOF 76887-/* confdefs.h. */ 76888-_ACEOF 76889-cat confdefs.h >>conftest.$ac_ext 76890-cat >>conftest.$ac_ext <<_ACEOF 76891-/* end confdefs.h. */ 76892- 76893+ cat > conftest.$ac_ext <<EOF 76894+#line 50093 "configure" 76895+#include "confdefs.h" 76896 76897+ 76898 #if defined(__GNUC__) && __GNUC__ >= 4 76899 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) 76900 #else 76901@@ -66083,71 +50114,57 @@ 76902 PHP_IMAP_EXPORT void mm_exists(void){} 76903 PHP_IMAP_EXPORT void mm_searched(void){} 76904 PHP_IMAP_EXPORT void mm_expunged(void){} 76905- 76906+ 76907 char utf8_to_mutf7(); 76908 int main() { 76909 utf8_to_mutf7(); 76910 return 0; 76911 } 76912- 76913-_ACEOF 76914-rm -f conftest$ac_exeext 76915-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 76916- (eval $ac_link) 2>&5 76917- ac_status=$? 76918- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76919- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 76920- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 76921- (eval $ac_try) 2>&5 76922- ac_status=$? 76923- echo "$as_me:$LINENO: \$? = $ac_status" >&5 76924- (exit $ac_status); }; }; then 76925- 76926+ 76927+EOF 76928+if { (eval echo configure:50126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 76929+then 76930+ 76931 LIBS=$old_LIBS 76932- 76933- 76934-cat >>confdefs.h <<\_ACEOF 76935+ 76936+ cat >> confdefs.h <<\EOF 76937 #define HAVE_IMAP_MUTF7 1 76938-_ACEOF 76939- 76940- 76941+EOF 76942 76943+ 76944+ 76945 else 76946- echo "$as_me: program exited with status $ac_status" >&5 76947-echo "$as_me: failed program was:" >&5 76948-sed 's/^/| /' conftest.$ac_ext >&5 76949- 76950-( exit $ac_status ) 76951- 76952+ echo "configure: failed program was:" >&5 76953+ cat conftest.$ac_ext >&5 76954+ rm -fr conftest* 76955+ 76956 LIBS=$old_LIBS 76957- 76958- 76959+ 76960+ 76961 fi 76962-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 76963+rm -fr conftest* 76964 fi 76965 76966 76967 76968- echo "$as_me:$LINENO: checking whether rfc822_output_address_list function present" >&5 76969-echo $ECHO_N "checking whether rfc822_output_address_list function present... $ECHO_C" >&6 76970 76971+ echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6 76972+echo "configure:50153: checking whether rfc822_output_address_list function present" >&5 76973+ 76974 old_LIBS=$LIBS 76975 LIBS=" 76976 $TST_LIBS 76977 $LIBS" 76978 if test "$cross_compiling" = yes; then 76979- 76980+ 76981 LIBS=$old_LIBS 76982- 76983+ 76984 else 76985- cat >conftest.$ac_ext <<_ACEOF 76986-/* confdefs.h. */ 76987-_ACEOF 76988-cat confdefs.h >>conftest.$ac_ext 76989-cat >>conftest.$ac_ext <<_ACEOF 76990-/* end confdefs.h. */ 76991- 76992+ cat > conftest.$ac_ext <<EOF 76993+#line 50165 "configure" 76994+#include "confdefs.h" 76995 76996+ 76997 #if defined(__GNUC__) && __GNUC__ >= 4 76998 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) 76999 #else 77000@@ -66172,74 +50189,58 @@ 77001 void rfc822_output_address_list(void); 77002 void (*f)(void); 77003 char foobar () {f = rfc822_output_address_list;} 77004- 77005+ 77006 char foobar(); 77007 int main() { 77008 foobar(); 77009 return 0; 77010 } 77011- 77012-_ACEOF 77013-rm -f conftest$ac_exeext 77014-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 77015- (eval $ac_link) 2>&5 77016- ac_status=$? 77017- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77018- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 77019- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77020- (eval $ac_try) 2>&5 77021- ac_status=$? 77022- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77023- (exit $ac_status); }; }; then 77024- 77025+ 77026+EOF 77027+if { (eval echo configure:50201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 77028+then 77029+ 77030 LIBS=$old_LIBS 77031- 77032- echo "$as_me:$LINENO: result: yes" >&5 77033-echo "${ECHO_T}yes" >&6 77034- 77035-cat >>confdefs.h <<\_ACEOF 77036+ 77037+ echo "$ac_t""yes" 1>&6 77038+ cat >> confdefs.h <<\EOF 77039 #define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1 77040-_ACEOF 77041- 77042- 77043+EOF 77044 77045+ 77046+ 77047 else 77048- echo "$as_me: program exited with status $ac_status" >&5 77049-echo "$as_me: failed program was:" >&5 77050-sed 's/^/| /' conftest.$ac_ext >&5 77051- 77052-( exit $ac_status ) 77053- 77054+ echo "configure: failed program was:" >&5 77055+ cat conftest.$ac_ext >&5 77056+ rm -fr conftest* 77057+ 77058 LIBS=$old_LIBS 77059- 77060- echo "$as_me:$LINENO: result: no" >&5 77061-echo "${ECHO_T}no" >&6 77062- 77063- 77064+ 77065+ echo "$ac_t""no" 1>&6 77066+ 77067+ 77068 fi 77069-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 77070+rm -fr conftest* 77071 fi 77072 77073 77074- echo "$as_me:$LINENO: checking whether build with IMAP works" >&5 77075-echo $ECHO_N "checking whether build with IMAP works... $ECHO_C" >&6 77076- 77077 77078+ echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 77079+echo "configure:50230: checking whether build with IMAP works" >&5 77080+ 77081+ 77082 old_LIBS=$LIBS 77083 LIBS="$TST_LIBS $LIBS" 77084 if test "$cross_compiling" = yes; then 77085- 77086+ 77087 LIBS=$old_LIBS 77088- 77089+ 77090 else 77091- cat >conftest.$ac_ext <<_ACEOF 77092-/* confdefs.h. */ 77093-_ACEOF 77094-cat confdefs.h >>conftest.$ac_ext 77095-cat >>conftest.$ac_ext <<_ACEOF 77096-/* end confdefs.h. */ 77097- 77098+ cat > conftest.$ac_ext <<EOF 77099+#line 50241 "configure" 77100+#include "confdefs.h" 77101 77102+ 77103 #if defined(__GNUC__) && __GNUC__ >= 4 77104 # define PHP_IMAP_EXPORT __attribute__ ((visibility("default"))) 77105 #else 77106@@ -66261,72 +50262,58 @@ 77107 PHP_IMAP_EXPORT void mm_exists(void){} 77108 PHP_IMAP_EXPORT void mm_searched(void){} 77109 PHP_IMAP_EXPORT void mm_expunged(void){} 77110- 77111+ 77112 char mail_newbody(); 77113 int main() { 77114 mail_newbody(); 77115 return 0; 77116 } 77117- 77118-_ACEOF 77119-rm -f conftest$ac_exeext 77120-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 77121- (eval $ac_link) 2>&5 77122- ac_status=$? 77123- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77124- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 77125- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77126- (eval $ac_try) 2>&5 77127- ac_status=$? 77128- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77129- (exit $ac_status); }; }; then 77130- 77131+ 77132+EOF 77133+if { (eval echo configure:50274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 77134+then 77135+ 77136 LIBS=$old_LIBS 77137- 77138- echo "$as_me:$LINENO: result: yes" >&5 77139-echo "${ECHO_T}yes" >&6 77140- 77141- 77142+ 77143+ echo "$ac_t""yes" 1>&6 77144+ 77145+ 77146 else 77147- echo "$as_me: program exited with status $ac_status" >&5 77148-echo "$as_me: failed program was:" >&5 77149-sed 's/^/| /' conftest.$ac_ext >&5 77150- 77151-( exit $ac_status ) 77152- 77153- LIBS=$old_LIBS 77154- 77155- echo "$as_me:$LINENO: result: no" >&5 77156-echo "${ECHO_T}no" >&6 77157- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 77158-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 77159- { (exit 1); exit 1; }; } 77160- 77161- 77162+ echo "configure: failed program was:" >&5 77163+ cat conftest.$ac_ext >&5 77164+ rm -fr conftest* 77165+ 77166+ LIBS=$old_LIBS 77167+ 77168+ echo "$ac_t""no" 1>&6 77169+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 77170+ 77171+ 77172 fi 77173-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 77174+rm -fr conftest* 77175 fi 77176 77177 77178+ 77179 fi 77180 77181 77182 77183 php_with_interbase=no 77184 77185-echo "$as_me:$LINENO: checking for InterBase support" >&5 77186-echo $ECHO_N "checking for InterBase support... $ECHO_C" >&6 77187- 77188+echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 77189+echo "configure:50306: checking for InterBase support" >&5 77190 # Check whether --with-interbase or --without-interbase was given. 77191 if test "${with_interbase+set}" = set; then 77192 withval="$with_interbase" 77193 PHP_INTERBASE=$withval 77194 else 77195- 77196+ 77197 PHP_INTERBASE=no 77198 test "$PHP_ENABLE_ALL" && PHP_INTERBASE=$PHP_ENABLE_ALL 77199 77200-fi; 77201+fi 77202+ 77203 77204 77205 ext_output="yes, shared" 77206@@ -66350,8 +50337,7 @@ 77207 77208 77209 77210-echo "$as_me:$LINENO: result: $ext_output" >&5 77211-echo "${ECHO_T}$ext_output" >&6 77212+echo "$ac_t""$ext_output" 1>&6 77213 77214 77215 77216@@ -66365,25 +50351,25 @@ 77217 IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR 77218 fi 77219 77220- 77221+ 77222 save_old_LDFLAGS=$LDFLAGS 77223 ac_stuff=" 77224 -L$IBASE_LIBDIR 77225 " 77226- 77227+ 77228 save_ext_shared=$ext_shared 77229 ext_shared=yes 77230- 77231+ 77232 for ac_i in $ac_stuff; do 77233 case $ac_i in 77234 -pthread) 77235 if test "$ext_shared" = "yes"; then 77236 LDFLAGS="$LDFLAGS -pthread" 77237 else 77238- 77239- 77240+ 77241+ 77242 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 77243- 77244+ 77245 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 77246 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77247 eval "EXTRA_LDFLAGS$unique=set" 77248@@ -66394,20 +50380,20 @@ 77249 ;; 77250 -l*) 77251 ac_ii=`echo $ac_i|cut -c 3-` 77252- 77253- 77254+ 77255+ 77256 case $ac_ii in 77257 c|c_r|pthread*) ;; 77258- *) 77259+ *) 77260 if test "$ext_shared" = "yes"; then 77261- LDFLAGS="$LDFLAGS -l$ac_ii" 77262+ LDFLAGS="$LDFLAGS -l$ac_ii" 77263 else 77264- 77265- 77266+ 77267+ 77268 case $ac_ii in 77269 c|c_r|pthread*) ;; 77270- *) 77271- LIBS="$LIBS -l$ac_ii" 77272+ *) 77273+ LIBS="$LIBS -l$ac_ii" 77274 ;; 77275 esac 77276 77277@@ -66420,145 +50406,116 @@ 77278 ;; 77279 -L*) 77280 ac_ii=`echo $ac_i|cut -c 3-` 77281- 77282+ 77283 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 77284- 77285+ 77286 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 77287 ai_p=$ac_ii 77288 else 77289- 77290+ 77291 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 77292- 77293+ 77294 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 77295 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 77296 fi 77297 77298- 77299+ 77300 if test "$ext_shared" = "yes"; then 77301 LDFLAGS="-L$ai_p $LDFLAGS" 77302 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 77303 else 77304- 77305- 77306- 77307+ 77308+ 77309+ 77310 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 77311- 77312+ 77313 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 77314 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77315 eval "LIBPATH$unique=set" 77316- 77317+ 77318 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 77319 LDFLAGS="$LDFLAGS -L$ai_p" 77320 PHP_RPATHS="$PHP_RPATHS $ai_p" 77321- 77322+ 77323 fi 77324 77325 77326 fi 77327- 77328+ 77329 fi 77330 77331 ;; 77332 esac 77333 done 77334 77335- echo "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5 77336-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6 77337-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then 77338- echo $ECHO_N "(cached) $ECHO_C" >&6 77339+ echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 77340+echo "configure:50453: checking for isc_detach_database in -lfbclient" >&5 77341+ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` 77342+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 77343+ echo $ac_n "(cached) $ac_c" 1>&6 77344 else 77345- ac_check_lib_save_LIBS=$LIBS 77346+ ac_save_LIBS="$LIBS" 77347 LIBS="-lfbclient $LIBS" 77348-cat >conftest.$ac_ext <<_ACEOF 77349-/* confdefs.h. */ 77350-_ACEOF 77351-cat confdefs.h >>conftest.$ac_ext 77352-cat >>conftest.$ac_ext <<_ACEOF 77353-/* end confdefs.h. */ 77354- 77355+cat > conftest.$ac_ext <<EOF 77356+#line 50461 "configure" 77357+#include "confdefs.h" 77358 /* Override any gcc2 internal prototype to avoid an error. */ 77359-#ifdef __cplusplus 77360-extern "C" 77361-#endif 77362 /* We use char because int might match the return type of a gcc2 77363- builtin and then its argument prototype would still apply. */ 77364-char isc_detach_database (); 77365-int 77366-main () 77367-{ 77368-isc_detach_database (); 77369- ; 77370- return 0; 77371-} 77372-_ACEOF 77373-rm -f conftest.$ac_objext conftest$ac_exeext 77374-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 77375- (eval $ac_link) 2>conftest.er1 77376- ac_status=$? 77377- grep -v '^ *+' conftest.er1 >conftest.err 77378- rm -f conftest.er1 77379- cat conftest.err >&5 77380- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77381- (exit $ac_status); } && 77382- { ac_try='test -z "$ac_c_werror_flag" 77383- || test ! -s conftest.err' 77384- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77385- (eval $ac_try) 2>&5 77386- ac_status=$? 77387- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77388- (exit $ac_status); }; } && 77389- { ac_try='test -s conftest$ac_exeext' 77390- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77391- (eval $ac_try) 2>&5 77392- ac_status=$? 77393- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77394- (exit $ac_status); }; }; then 77395- ac_cv_lib_fbclient_isc_detach_database=yes 77396-else 77397- echo "$as_me: failed program was:" >&5 77398-sed 's/^/| /' conftest.$ac_ext >&5 77399- 77400-ac_cv_lib_fbclient_isc_detach_database=no 77401-fi 77402-rm -f conftest.err conftest.$ac_objext \ 77403- conftest$ac_exeext conftest.$ac_ext 77404-LIBS=$ac_check_lib_save_LIBS 77405-fi 77406-echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5 77407-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6 77408-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then 77409+ builtin and then its argument prototype would still apply. */ 77410+char isc_detach_database(); 77411+ 77412+int main() { 77413+isc_detach_database() 77414+; return 0; } 77415+EOF 77416+if { (eval echo configure:50472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 77417+ rm -rf conftest* 77418+ eval "ac_cv_lib_$ac_lib_var=yes" 77419+else 77420+ echo "configure: failed program was:" >&5 77421+ cat conftest.$ac_ext >&5 77422+ rm -rf conftest* 77423+ eval "ac_cv_lib_$ac_lib_var=no" 77424+fi 77425+rm -f conftest* 77426+LIBS="$ac_save_LIBS" 77427 77428+fi 77429+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 77430+ echo "$ac_t""yes" 1>&6 77431+ 77432 LDFLAGS=$save_old_LDFLAGS 77433 ext_shared=$save_ext_shared 77434- 77435+ 77436 IBASE_LIBNAME=fbclient 77437- 77438- 77439+ 77440+ 77441 else 77442+ echo "$ac_t""no" 1>&6 77443 77444 LDFLAGS=$save_old_LDFLAGS 77445 ext_shared=$save_ext_shared 77446 unset ac_cv_lib_fbclient_isc_detach_database 77447- 77448- 77449+ 77450+ 77451 save_old_LDFLAGS=$LDFLAGS 77452 ac_stuff=" 77453 -L$IBASE_LIBDIR 77454 " 77455- 77456+ 77457 save_ext_shared=$ext_shared 77458 ext_shared=yes 77459- 77460+ 77461 for ac_i in $ac_stuff; do 77462 case $ac_i in 77463 -pthread) 77464 if test "$ext_shared" = "yes"; then 77465 LDFLAGS="$LDFLAGS -pthread" 77466 else 77467- 77468- 77469+ 77470+ 77471 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 77472- 77473+ 77474 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 77475 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77476 eval "EXTRA_LDFLAGS$unique=set" 77477@@ -66569,20 +50526,20 @@ 77478 ;; 77479 -l*) 77480 ac_ii=`echo $ac_i|cut -c 3-` 77481- 77482- 77483+ 77484+ 77485 case $ac_ii in 77486 c|c_r|pthread*) ;; 77487- *) 77488+ *) 77489 if test "$ext_shared" = "yes"; then 77490- LDFLAGS="$LDFLAGS -l$ac_ii" 77491+ LDFLAGS="$LDFLAGS -l$ac_ii" 77492 else 77493- 77494- 77495+ 77496+ 77497 case $ac_ii in 77498 c|c_r|pthread*) ;; 77499- *) 77500- LIBS="$LIBS -l$ac_ii" 77501+ *) 77502+ LIBS="$LIBS -l$ac_ii" 77503 ;; 77504 esac 77505 77506@@ -66595,145 +50552,116 @@ 77507 ;; 77508 -L*) 77509 ac_ii=`echo $ac_i|cut -c 3-` 77510- 77511+ 77512 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 77513- 77514+ 77515 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 77516 ai_p=$ac_ii 77517 else 77518- 77519+ 77520 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 77521- 77522+ 77523 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 77524 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 77525 fi 77526 77527- 77528+ 77529 if test "$ext_shared" = "yes"; then 77530 LDFLAGS="-L$ai_p $LDFLAGS" 77531 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 77532 else 77533- 77534- 77535- 77536+ 77537+ 77538+ 77539 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 77540- 77541+ 77542 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 77543 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77544 eval "LIBPATH$unique=set" 77545- 77546+ 77547 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 77548 LDFLAGS="$LDFLAGS -L$ai_p" 77549 PHP_RPATHS="$PHP_RPATHS $ai_p" 77550- 77551+ 77552 fi 77553 77554 77555 fi 77556- 77557+ 77558 fi 77559 77560 ;; 77561 esac 77562 done 77563 77564- echo "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5 77565-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6 77566-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then 77567- echo $ECHO_N "(cached) $ECHO_C" >&6 77568+ echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 77569+echo "configure:50599: checking for isc_detach_database in -lgds" >&5 77570+ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` 77571+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 77572+ echo $ac_n "(cached) $ac_c" 1>&6 77573 else 77574- ac_check_lib_save_LIBS=$LIBS 77575+ ac_save_LIBS="$LIBS" 77576 LIBS="-lgds $LIBS" 77577-cat >conftest.$ac_ext <<_ACEOF 77578-/* confdefs.h. */ 77579-_ACEOF 77580-cat confdefs.h >>conftest.$ac_ext 77581-cat >>conftest.$ac_ext <<_ACEOF 77582-/* end confdefs.h. */ 77583- 77584+cat > conftest.$ac_ext <<EOF 77585+#line 50607 "configure" 77586+#include "confdefs.h" 77587 /* Override any gcc2 internal prototype to avoid an error. */ 77588-#ifdef __cplusplus 77589-extern "C" 77590-#endif 77591 /* We use char because int might match the return type of a gcc2 77592- builtin and then its argument prototype would still apply. */ 77593-char isc_detach_database (); 77594-int 77595-main () 77596-{ 77597-isc_detach_database (); 77598- ; 77599- return 0; 77600-} 77601-_ACEOF 77602-rm -f conftest.$ac_objext conftest$ac_exeext 77603-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 77604- (eval $ac_link) 2>conftest.er1 77605- ac_status=$? 77606- grep -v '^ *+' conftest.er1 >conftest.err 77607- rm -f conftest.er1 77608- cat conftest.err >&5 77609- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77610- (exit $ac_status); } && 77611- { ac_try='test -z "$ac_c_werror_flag" 77612- || test ! -s conftest.err' 77613- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77614- (eval $ac_try) 2>&5 77615- ac_status=$? 77616- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77617- (exit $ac_status); }; } && 77618- { ac_try='test -s conftest$ac_exeext' 77619- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77620- (eval $ac_try) 2>&5 77621- ac_status=$? 77622- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77623- (exit $ac_status); }; }; then 77624- ac_cv_lib_gds_isc_detach_database=yes 77625-else 77626- echo "$as_me: failed program was:" >&5 77627-sed 's/^/| /' conftest.$ac_ext >&5 77628- 77629-ac_cv_lib_gds_isc_detach_database=no 77630-fi 77631-rm -f conftest.err conftest.$ac_objext \ 77632- conftest$ac_exeext conftest.$ac_ext 77633-LIBS=$ac_check_lib_save_LIBS 77634-fi 77635-echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5 77636-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6 77637-if test $ac_cv_lib_gds_isc_detach_database = yes; then 77638+ builtin and then its argument prototype would still apply. */ 77639+char isc_detach_database(); 77640+ 77641+int main() { 77642+isc_detach_database() 77643+; return 0; } 77644+EOF 77645+if { (eval echo configure:50618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 77646+ rm -rf conftest* 77647+ eval "ac_cv_lib_$ac_lib_var=yes" 77648+else 77649+ echo "configure: failed program was:" >&5 77650+ cat conftest.$ac_ext >&5 77651+ rm -rf conftest* 77652+ eval "ac_cv_lib_$ac_lib_var=no" 77653+fi 77654+rm -f conftest* 77655+LIBS="$ac_save_LIBS" 77656 77657+fi 77658+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 77659+ echo "$ac_t""yes" 1>&6 77660+ 77661 LDFLAGS=$save_old_LDFLAGS 77662 ext_shared=$save_ext_shared 77663- 77664+ 77665 IBASE_LIBNAME=gds 77666- 77667- 77668+ 77669+ 77670 else 77671+ echo "$ac_t""no" 1>&6 77672 77673 LDFLAGS=$save_old_LDFLAGS 77674 ext_shared=$save_ext_shared 77675 unset ac_cv_lib_gds_isc_detach_database 77676- 77677- 77678+ 77679+ 77680 save_old_LDFLAGS=$LDFLAGS 77681 ac_stuff=" 77682 -L$IBASE_LIBDIR 77683 " 77684- 77685+ 77686 save_ext_shared=$ext_shared 77687 ext_shared=yes 77688- 77689+ 77690 for ac_i in $ac_stuff; do 77691 case $ac_i in 77692 -pthread) 77693 if test "$ext_shared" = "yes"; then 77694 LDFLAGS="$LDFLAGS -pthread" 77695 else 77696- 77697- 77698+ 77699+ 77700 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 77701- 77702+ 77703 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 77704 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77705 eval "EXTRA_LDFLAGS$unique=set" 77706@@ -66744,20 +50672,20 @@ 77707 ;; 77708 -l*) 77709 ac_ii=`echo $ac_i|cut -c 3-` 77710- 77711- 77712+ 77713+ 77714 case $ac_ii in 77715 c|c_r|pthread*) ;; 77716- *) 77717+ *) 77718 if test "$ext_shared" = "yes"; then 77719- LDFLAGS="$LDFLAGS -l$ac_ii" 77720+ LDFLAGS="$LDFLAGS -l$ac_ii" 77721 else 77722- 77723- 77724+ 77725+ 77726 case $ac_ii in 77727 c|c_r|pthread*) ;; 77728- *) 77729- LIBS="$LIBS -l$ac_ii" 77730+ *) 77731+ LIBS="$LIBS -l$ac_ii" 77732 ;; 77733 esac 77734 77735@@ -66770,230 +50698,199 @@ 77736 ;; 77737 -L*) 77738 ac_ii=`echo $ac_i|cut -c 3-` 77739- 77740+ 77741 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 77742- 77743+ 77744 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 77745 ai_p=$ac_ii 77746 else 77747- 77748+ 77749 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 77750- 77751+ 77752 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 77753 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 77754 fi 77755 77756- 77757+ 77758 if test "$ext_shared" = "yes"; then 77759 LDFLAGS="-L$ai_p $LDFLAGS" 77760 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 77761 else 77762- 77763- 77764- 77765+ 77766+ 77767+ 77768 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 77769- 77770+ 77771 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 77772 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77773 eval "LIBPATH$unique=set" 77774- 77775+ 77776 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 77777 LDFLAGS="$LDFLAGS -L$ai_p" 77778 PHP_RPATHS="$PHP_RPATHS $ai_p" 77779- 77780+ 77781 fi 77782 77783 77784 fi 77785- 77786+ 77787 fi 77788 77789 ;; 77790 esac 77791 done 77792 77793- echo "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5 77794-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6 77795-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then 77796- echo $ECHO_N "(cached) $ECHO_C" >&6 77797+ echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 77798+echo "configure:50745: checking for isc_detach_database in -lib_util" >&5 77799+ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` 77800+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 77801+ echo $ac_n "(cached) $ac_c" 1>&6 77802 else 77803- ac_check_lib_save_LIBS=$LIBS 77804+ ac_save_LIBS="$LIBS" 77805 LIBS="-lib_util $LIBS" 77806-cat >conftest.$ac_ext <<_ACEOF 77807-/* confdefs.h. */ 77808-_ACEOF 77809-cat confdefs.h >>conftest.$ac_ext 77810-cat >>conftest.$ac_ext <<_ACEOF 77811-/* end confdefs.h. */ 77812- 77813+cat > conftest.$ac_ext <<EOF 77814+#line 50753 "configure" 77815+#include "confdefs.h" 77816 /* Override any gcc2 internal prototype to avoid an error. */ 77817-#ifdef __cplusplus 77818-extern "C" 77819-#endif 77820 /* We use char because int might match the return type of a gcc2 77821- builtin and then its argument prototype would still apply. */ 77822-char isc_detach_database (); 77823-int 77824-main () 77825-{ 77826-isc_detach_database (); 77827- ; 77828- return 0; 77829-} 77830-_ACEOF 77831-rm -f conftest.$ac_objext conftest$ac_exeext 77832-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 77833- (eval $ac_link) 2>conftest.er1 77834- ac_status=$? 77835- grep -v '^ *+' conftest.er1 >conftest.err 77836- rm -f conftest.er1 77837- cat conftest.err >&5 77838- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77839- (exit $ac_status); } && 77840- { ac_try='test -z "$ac_c_werror_flag" 77841- || test ! -s conftest.err' 77842- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77843- (eval $ac_try) 2>&5 77844- ac_status=$? 77845- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77846- (exit $ac_status); }; } && 77847- { ac_try='test -s conftest$ac_exeext' 77848- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 77849- (eval $ac_try) 2>&5 77850- ac_status=$? 77851- echo "$as_me:$LINENO: \$? = $ac_status" >&5 77852- (exit $ac_status); }; }; then 77853- ac_cv_lib_ib_util_isc_detach_database=yes 77854-else 77855- echo "$as_me: failed program was:" >&5 77856-sed 's/^/| /' conftest.$ac_ext >&5 77857- 77858-ac_cv_lib_ib_util_isc_detach_database=no 77859-fi 77860-rm -f conftest.err conftest.$ac_objext \ 77861- conftest$ac_exeext conftest.$ac_ext 77862-LIBS=$ac_check_lib_save_LIBS 77863-fi 77864-echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5 77865-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6 77866-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then 77867+ builtin and then its argument prototype would still apply. */ 77868+char isc_detach_database(); 77869+ 77870+int main() { 77871+isc_detach_database() 77872+; return 0; } 77873+EOF 77874+if { (eval echo configure:50764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 77875+ rm -rf conftest* 77876+ eval "ac_cv_lib_$ac_lib_var=yes" 77877+else 77878+ echo "configure: failed program was:" >&5 77879+ cat conftest.$ac_ext >&5 77880+ rm -rf conftest* 77881+ eval "ac_cv_lib_$ac_lib_var=no" 77882+fi 77883+rm -f conftest* 77884+LIBS="$ac_save_LIBS" 77885 77886+fi 77887+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 77888+ echo "$ac_t""yes" 1>&6 77889+ 77890 LDFLAGS=$save_old_LDFLAGS 77891 ext_shared=$save_ext_shared 77892- 77893+ 77894 IBASE_LIBNAME=ib_util 77895- 77896- 77897+ 77898+ 77899 else 77900+ echo "$ac_t""no" 1>&6 77901 77902 LDFLAGS=$save_old_LDFLAGS 77903 ext_shared=$save_ext_shared 77904 unset ac_cv_lib_ib_util_isc_detach_database 77905- 77906- { { echo "$as_me:$LINENO: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&5 77907-echo "$as_me: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&2;} 77908- { (exit 1); exit 1; }; } 77909- 77910- 77911+ 77912+ { echo "configure: error: libgds, libib_util or libfbclient not found! Check config.log for more information." 1>&2; exit 1; } 77913+ 77914+ 77915 fi 77916 77917- 77918- 77919+ 77920+ 77921 fi 77922 77923- 77924- 77925+ 77926+ 77927 fi 77928 77929- 77930- 77931+ 77932+ 77933 77934 if test "$ext_shared" = "yes"; then 77935 INTERBASE_SHARED_LIBADD="-l$IBASE_LIBNAME $INTERBASE_SHARED_LIBADD" 77936 if test -n "$IBASE_LIBDIR"; then 77937- 77938+ 77939 if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then 77940- 77941+ 77942 if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then 77943 ai_p=$IBASE_LIBDIR 77944 else 77945- 77946+ 77947 ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 77948- 77949+ 77950 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 77951 ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`" 77952 fi 77953 77954- 77955+ 77956 if test "$ext_shared" = "yes"; then 77957 INTERBASE_SHARED_LIBADD="-L$ai_p $INTERBASE_SHARED_LIBADD" 77958 test -n "$ld_runpath_switch" && INTERBASE_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTERBASE_SHARED_LIBADD" 77959 else 77960- 77961- 77962- 77963+ 77964+ 77965+ 77966 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 77967- 77968+ 77969 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 77970 if test -n "$unique" && test "`eval $cmd`" = "" ; then 77971 eval "LIBPATH$unique=set" 77972- 77973+ 77974 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 77975 LDFLAGS="$LDFLAGS -L$ai_p" 77976 PHP_RPATHS="$PHP_RPATHS $ai_p" 77977- 77978+ 77979 fi 77980 77981 77982 fi 77983- 77984+ 77985 fi 77986 77987 fi 77988 else 77989- 77990+ 77991 77992 if test -n "$IBASE_LIBDIR"; then 77993- 77994+ 77995 if test "$IBASE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$IBASE_LIBDIR" != "/usr/lib"; then 77996- 77997+ 77998 if test -z "$IBASE_LIBDIR" || echo "$IBASE_LIBDIR" | grep '^/' >/dev/null ; then 77999 ai_p=$IBASE_LIBDIR 78000 else 78001- 78002+ 78003 ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 78004- 78005+ 78006 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 78007 ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`" 78008 fi 78009 78010- 78011- 78012- 78013- 78014+ 78015+ 78016+ 78017+ 78018 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 78019- 78020+ 78021 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 78022 if test -n "$unique" && test "`eval $cmd`" = "" ; then 78023 eval "LIBPATH$unique=set" 78024- 78025+ 78026 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 78027 LDFLAGS="$LDFLAGS -L$ai_p" 78028 PHP_RPATHS="$PHP_RPATHS $ai_p" 78029- 78030+ 78031 fi 78032 78033 78034- 78035+ 78036 fi 78037 78038 fi 78039- 78040- 78041+ 78042+ 78043 case $IBASE_LIBNAME in 78044 c|c_r|pthread*) ;; 78045- *) 78046- LIBS="-l$IBASE_LIBNAME $LIBS" 78047+ *) 78048+ LIBS="-l$IBASE_LIBNAME $LIBS" 78049 ;; 78050 esac 78051 78052@@ -67003,43 +50900,42 @@ 78053 fi 78054 78055 78056- 78057+ 78058 if test "$IBASE_INCDIR" != "/usr/include"; then 78059- 78060+ 78061 if test -z "$IBASE_INCDIR" || echo "$IBASE_INCDIR" | grep '^/' >/dev/null ; then 78062 ai_p=$IBASE_INCDIR 78063 else 78064- 78065+ 78066 ep_dir="`echo $IBASE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 78067- 78068+ 78069 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 78070 ai_p="$ep_realdir/`basename \"$IBASE_INCDIR\"`" 78071 fi 78072 78073- 78074- 78075+ 78076+ 78077 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 78078- 78079+ 78080 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 78081 if test -n "$unique" && test "`eval $cmd`" = "" ; then 78082 eval "INCLUDEPATH$unique=set" 78083- 78084+ 78085 if test ""; then 78086 INCLUDES="-I$ai_p $INCLUDES" 78087 else 78088 INCLUDES="$INCLUDES -I$ai_p" 78089 fi 78090- 78091+ 78092 fi 78093 78094 fi 78095 78096- 78097-cat >>confdefs.h <<\_ACEOF 78098+ cat >> confdefs.h <<\EOF 78099 #define HAVE_IBASE 1 78100-_ACEOF 78101- 78102+EOF 78103 78104+ 78105 ext_builddir=ext/interbase 78106 ext_srcdir=$abs_srcdir/ext/interbase 78107 78108@@ -67047,15 +50943,15 @@ 78109 78110 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 78111 PHP_INTERBASE_SHARED=no 78112- 78113- 78114+ 78115+ 78116 case ext/interbase in 78117 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 78118 /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 78119 *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 78120 esac 78121- 78122- 78123+ 78124+ 78125 78126 b_c_pre=$php_c_pre 78127 b_cxx_pre=$php_cxx_pre 78128@@ -67068,12 +50964,12 @@ 78129 78130 old_IFS=$IFS 78131 for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do 78132- 78133+ 78134 IFS=. 78135 set $ac_src 78136 ac_obj=$1 78137 IFS=$old_IFS 78138- 78139+ 78140 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 78141 78142 case $ac_src in 78143@@ -67097,14 +50993,14 @@ 78144 else 78145 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 78146 PHP_INTERBASE_SHARED=yes 78147- 78148+ 78149 case ext/interbase in 78150 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 78151 /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 78152 *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 78153 esac 78154- 78155- 78156+ 78157+ 78158 78159 b_c_pre=$shared_c_pre 78160 b_cxx_pre=$shared_cxx_pre 78161@@ -67117,12 +51013,12 @@ 78162 78163 old_IFS=$IFS 78164 for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do 78165- 78166+ 78167 IFS=. 78168 set $ac_src 78169 ac_obj=$1 78170 IFS=$old_IFS 78171- 78172+ 78173 shared_objects_interbase="$shared_objects_interbase $ac_bdir$ac_obj.lo" 78174 78175 case $ac_src in 78176@@ -67140,7 +51036,7 @@ 78177 78178 case $host_alias in 78179 *netware*) 78180- 78181+ 78182 install_modules="install-modules" 78183 78184 case $host_alias in 78185@@ -67150,7 +51046,7 @@ 78186 ;; 78187 *netware*) 78188 suffix=nlm 78189- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(INTERBASE_SHARED_LIBADD)' 78190+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTERBASE, 3)_SHARED_LIBADD)' 78191 ;; 78192 *) 78193 suffix=la 78194@@ -67163,7 +51059,7 @@ 78195 else 78196 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpinterbase.$suffix" 78197 fi 78198- 78199+ 78200 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_interbase" 78201 78202 cat >>Makefile.objects<<EOF 78203@@ -67177,7 +51073,7 @@ 78204 78205 ;; 78206 *) 78207- 78208+ 78209 install_modules="install-modules" 78210 78211 case $host_alias in 78212@@ -67187,7 +51083,7 @@ 78213 ;; 78214 *netware*) 78215 suffix=nlm 78216- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(ERBASE_SHARED_LIBADD)' 78217+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_interbase) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(INTERBASE, 3)_SHARED_LIBADD)' 78218 ;; 78219 *) 78220 suffix=la 78221@@ -67200,7 +51096,7 @@ 78222 else 78223 PHP_MODULES="$PHP_MODULES \$(phplibdir)/interbase.$suffix" 78224 fi 78225- 78226+ 78227 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_interbase" 78228 78229 cat >>Makefile.objects<<EOF 78230@@ -67214,10 +51110,9 @@ 78231 78232 ;; 78233 esac 78234- 78235-cat >>confdefs.h <<_ACEOF 78236+ cat >> confdefs.h <<EOF 78237 #define COMPILE_DL_INTERBASE 1 78238-_ACEOF 78239+EOF 78240 78241 fi 78242 fi 78243@@ -67226,15 +51121,15 @@ 78244 PHP_INTERBASE_SHARED=no 78245 case "$PHP_SAPI" in 78246 cgi|embed) 78247- 78248- 78249+ 78250+ 78251 case ext/interbase in 78252 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 78253 /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 78254 *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 78255 esac 78256- 78257- 78258+ 78259+ 78260 78261 b_c_pre=$php_c_pre 78262 b_cxx_pre=$php_cxx_pre 78263@@ -67247,12 +51142,12 @@ 78264 78265 old_IFS=$IFS 78266 for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do 78267- 78268+ 78269 IFS=. 78270 set $ac_src 78271 ac_obj=$1 78272 IFS=$old_IFS 78273- 78274+ 78275 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 78276 78277 case $ac_src in 78278@@ -67272,15 +51167,15 @@ 78279 EXT_STATIC="$EXT_STATIC interbase" 78280 ;; 78281 *) 78282- 78283- 78284+ 78285+ 78286 case ext/interbase in 78287 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 78288 /*) ac_srcdir=`echo "ext/interbase"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 78289 *) ac_srcdir="$abs_srcdir/ext/interbase/"; ac_bdir="ext/interbase/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 78290 esac 78291- 78292- 78293+ 78294+ 78295 78296 b_c_pre=$php_c_pre 78297 b_cxx_pre=$php_cxx_pre 78298@@ -67293,13 +51188,13 @@ 78299 78300 old_IFS=$IFS 78301 for ac_src in interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c; do 78302- 78303+ 78304 IFS=. 78305 set $ac_src 78306 ac_obj=$1 78307 IFS=$old_IFS 78308- 78309- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 78310+ 78311+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 78312 78313 case $ac_src in 78314 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 78315@@ -67319,20 +51214,20 @@ 78316 esac 78317 EXT_CLI_STATIC="$EXT_CLI_STATIC interbase" 78318 fi 78319- 78320- 78321+ 78322+ 78323 BUILD_DIR="$BUILD_DIR $ext_builddir" 78324- 78325+ 78326 78327 78328 if test "$ext_builddir" = "."; then 78329 PHP_PECL_EXTENSION=interbase 78330- 78331+ 78332 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 78333 78334 fi 78335 78336- 78337+ 78338 PHP_VAR_SUBST="$PHP_VAR_SUBST INTERBASE_SHARED_LIBADD" 78339 78340 fi 78341@@ -67341,18 +51236,19 @@ 78342 78343 php_enable_intl=no 78344 78345-echo "$as_me:$LINENO: checking whether to enable internationalization support" >&5 78346-echo $ECHO_N "checking whether to enable internationalization support... $ECHO_C" >&6 78347+echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 78348+echo "configure:51241: checking whether to enable internationalization support" >&5 78349 # Check whether --enable-intl or --disable-intl was given. 78350 if test "${enable_intl+set}" = set; then 78351 enableval="$enable_intl" 78352 PHP_INTL=$enableval 78353 else 78354- 78355+ 78356 PHP_INTL=no 78357 test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL 78358 78359-fi; 78360+fi 78361+ 78362 78363 78364 ext_output="yes, shared" 78365@@ -67376,29 +51272,28 @@ 78366 78367 78368 78369-echo "$as_me:$LINENO: result: $ext_output" >&5 78370-echo "${ECHO_T}$ext_output" >&6 78371+echo "$ac_t""$ext_output" 1>&6 78372 78373 78374 78375 78376 if test "$PHP_INTL" != "no"; then 78377- 78378- 78379+ 78380+ 78381 php_with_icu_dir=DEFAULT 78382 78383 78384- 78385 # Check whether --with-icu-dir or --without-icu-dir was given. 78386 if test "${with_icu_dir+set}" = set; then 78387 withval="$with_icu_dir" 78388 PHP_ICU_DIR=$withval 78389 else 78390- 78391+ 78392 PHP_ICU_DIR=DEFAULT 78393+ 78394 78395+fi 78396 78397-fi; 78398 78399 ext_output=$PHP_ICU_DIR 78400 78401@@ -67413,115 +51308,103 @@ 78402 if test "$PHP_ICU_DIR" = "DEFAULT"; then 78403 # Extract the first word of "icu-config", so it can be a program name with args. 78404 set dummy icu-config; ac_word=$2 78405-echo "$as_me:$LINENO: checking for $ac_word" >&5 78406-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 78407-if test "${ac_cv_path_ICU_CONFIG+set}" = set; then 78408- echo $ECHO_N "(cached) $ECHO_C" >&6 78409+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 78410+echo "configure:51313: checking for $ac_word" >&5 78411+if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then 78412+ echo $ac_n "(cached) $ac_c" 1>&6 78413 else 78414- case $ICU_CONFIG in 78415- [\\/]* | ?:[\\/]*) 78416+ case "$ICU_CONFIG" in 78417+ /*) 78418 ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a path. 78419 ;; 78420+ ?:/*) 78421+ ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a dos path. 78422+ ;; 78423 *) 78424- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 78425-as_dummy="$PATH:/usr/local/bin" 78426-for as_dir in $as_dummy 78427-do 78428- IFS=$as_save_IFS 78429- test -z "$as_dir" && as_dir=. 78430- for ac_exec_ext in '' $ac_executable_extensions; do 78431- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 78432- ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext" 78433- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 78434- break 2 78435- fi 78436-done 78437-done 78438- 78439+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 78440+ ac_dummy="$PATH:/usr/local/bin" 78441+ for ac_dir in $ac_dummy; do 78442+ test -z "$ac_dir" && ac_dir=. 78443+ if test -f $ac_dir/$ac_word; then 78444+ ac_cv_path_ICU_CONFIG="$ac_dir/$ac_word" 78445+ break 78446+ fi 78447+ done 78448+ IFS="$ac_save_ifs" 78449 test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no" 78450 ;; 78451 esac 78452 fi 78453-ICU_CONFIG=$ac_cv_path_ICU_CONFIG 78454- 78455+ICU_CONFIG="$ac_cv_path_ICU_CONFIG" 78456 if test -n "$ICU_CONFIG"; then 78457- echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5 78458-echo "${ECHO_T}$ICU_CONFIG" >&6 78459+ echo "$ac_t""$ICU_CONFIG" 1>&6 78460 else 78461- echo "$as_me:$LINENO: result: no" >&5 78462-echo "${ECHO_T}no" >&6 78463+ echo "$ac_t""no" 1>&6 78464 fi 78465 78466 else 78467 ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" 78468 fi 78469 78470- echo "$as_me:$LINENO: checking for location of ICU headers and libraries" >&5 78471-echo $ECHO_N "checking for location of ICU headers and libraries... $ECHO_C" >&6 78472+ echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 78473+echo "configure:51351: checking for location of ICU headers and libraries" >&5 78474 78475 icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` 78476 if test "$?" != "0" || test -z "$icu_install_prefix"; then 78477- echo "$as_me:$LINENO: result: not found" >&5 78478-echo "${ECHO_T}not found" >&6 78479- { { echo "$as_me:$LINENO: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&5 78480-echo "$as_me: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&2;} 78481- { (exit 1); exit 1; }; } 78482+ echo "$ac_t""not found" 1>&6 78483+ { echo "configure: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." 1>&2; exit 1; } 78484 else 78485- echo "$as_me:$LINENO: result: $icu_install_prefix" >&5 78486-echo "${ECHO_T}$icu_install_prefix" >&6 78487+ echo "$ac_t""$icu_install_prefix" 1>&6 78488 78489- echo "$as_me:$LINENO: checking for ICU 3.4 or greater" >&5 78490-echo $ECHO_N "checking for ICU 3.4 or greater... $ECHO_C" >&6 78491+ echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 78492+echo "configure:51361: checking for ICU 3.4 or greater" >&5 78493 icu_version_full=`$ICU_CONFIG --version` 78494 ac_IFS=$IFS 78495 IFS="." 78496 set $icu_version_full 78497 IFS=$ac_IFS 78498 icu_version=`expr $1 \* 1000 + $2` 78499- echo "$as_me:$LINENO: result: found $icu_version_full" >&5 78500-echo "${ECHO_T}found $icu_version_full" >&6 78501+ echo "$ac_t""found $icu_version_full" 1>&6 78502 78503 if test "$icu_version" -lt "3004"; then 78504- { { echo "$as_me:$LINENO: error: ICU version 3.4 or later is required" >&5 78505-echo "$as_me: error: ICU version 3.4 or later is required" >&2;} 78506- { (exit 1); exit 1; }; } 78507+ { echo "configure: error: ICU version 3.4 or later is required" 1>&2; exit 1; } 78508 fi 78509 78510 ICU_VERSION=$icu_version 78511 ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` 78512 ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` 78513- 78514+ 78515 for ac_i in $ICU_INCS; do 78516 case $ac_i in 78517 -I*) 78518 ac_ii=`echo $ac_i|cut -c 3-` 78519- 78520+ 78521 if test "$ac_ii" != "/usr/include"; then 78522- 78523+ 78524 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 78525 ai_p=$ac_ii 78526 else 78527- 78528+ 78529 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 78530- 78531+ 78532 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 78533 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 78534 fi 78535 78536- 78537- 78538+ 78539+ 78540 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 78541- 78542+ 78543 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 78544 if test -n "$unique" && test "`eval $cmd`" = "" ; then 78545 eval "INCLUDEPATH$unique=set" 78546- 78547+ 78548 if test ""; then 78549 INCLUDES="-I$ai_p $INCLUDES" 78550 else 78551 INCLUDES="$INCLUDES -I$ai_p" 78552 fi 78553- 78554+ 78555 fi 78556 78557 fi 78558@@ -67530,17 +51413,17 @@ 78559 esac 78560 done 78561 78562- 78563+ 78564 for ac_i in $ICU_LIBS; do 78565 case $ac_i in 78566 -pthread) 78567 if test "$ext_shared" = "yes"; then 78568 INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -pthread" 78569 else 78570- 78571- 78572+ 78573+ 78574 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 78575- 78576+ 78577 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 78578 if test -n "$unique" && test "`eval $cmd`" = "" ; then 78579 eval "EXTRA_LDFLAGS$unique=set" 78580@@ -67551,20 +51434,20 @@ 78581 ;; 78582 -l*) 78583 ac_ii=`echo $ac_i|cut -c 3-` 78584- 78585- 78586+ 78587+ 78588 case $ac_ii in 78589 c|c_r|pthread*) ;; 78590- *) 78591+ *) 78592 if test "$ext_shared" = "yes"; then 78593- INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii" 78594+ INTL_SHARED_LIBADD="$INTL_SHARED_LIBADD -l$ac_ii" 78595 else 78596- 78597- 78598+ 78599+ 78600 case $ac_ii in 78601 c|c_r|pthread*) ;; 78602- *) 78603- LIBS="$LIBS -l$ac_ii" 78604+ *) 78605+ LIBS="$LIBS -l$ac_ii" 78606 ;; 78607 esac 78608 78609@@ -67577,42 +51460,42 @@ 78610 ;; 78611 -L*) 78612 ac_ii=`echo $ac_i|cut -c 3-` 78613- 78614+ 78615 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 78616- 78617+ 78618 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 78619 ai_p=$ac_ii 78620 else 78621- 78622+ 78623 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 78624- 78625+ 78626 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 78627 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 78628 fi 78629 78630- 78631+ 78632 if test "$ext_shared" = "yes"; then 78633 INTL_SHARED_LIBADD="-L$ai_p $INTL_SHARED_LIBADD" 78634 test -n "$ld_runpath_switch" && INTL_SHARED_LIBADD="$ld_runpath_switch$ai_p $INTL_SHARED_LIBADD" 78635 else 78636- 78637- 78638- 78639+ 78640+ 78641+ 78642 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 78643- 78644+ 78645 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 78646 if test -n "$unique" && test "`eval $cmd`" = "" ; then 78647 eval "LIBPATH$unique=set" 78648- 78649+ 78650 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 78651 LDFLAGS="$LDFLAGS -L$ai_p" 78652 PHP_RPATHS="$PHP_RPATHS $ai_p" 78653- 78654+ 78655 fi 78656 78657 78658 fi 78659- 78660+ 78661 fi 78662 78663 ;; 78664@@ -67621,241 +51504,140 @@ 78665 78666 fi 78667 78668- 78669+ 78670 PHP_VAR_SUBST="$PHP_VAR_SUBST INTL_SHARED_LIBADD" 78671 78672- 78673+ 78674 if test -z "$php_cxx_done"; then 78675- ac_ext=cc 78676-ac_cpp='$CXXCPP $CPPFLAGS' 78677-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 78678-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 78679-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 78680-if test -n "$ac_tool_prefix"; then 78681- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC 78682- do 78683- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. 78684-set dummy $ac_tool_prefix$ac_prog; ac_word=$2 78685-echo "$as_me:$LINENO: checking for $ac_word" >&5 78686-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 78687-if test "${ac_cv_prog_CXX+set}" = set; then 78688- echo $ECHO_N "(cached) $ECHO_C" >&6 78689+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl 78690+do 78691+# Extract the first word of "$ac_prog", so it can be a program name with args. 78692+set dummy $ac_prog; ac_word=$2 78693+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 78694+echo "configure:51518: checking for $ac_word" >&5 78695+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then 78696+ echo $ac_n "(cached) $ac_c" 1>&6 78697 else 78698 if test -n "$CXX"; then 78699 ac_cv_prog_CXX="$CXX" # Let the user override the test. 78700 else 78701-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 78702-for as_dir in $PATH 78703-do 78704- IFS=$as_save_IFS 78705- test -z "$as_dir" && as_dir=. 78706- for ac_exec_ext in '' $ac_executable_extensions; do 78707- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 78708- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 78709- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 78710- break 2 78711- fi 78712-done 78713-done 78714- 78715+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 78716+ ac_dummy="$PATH" 78717+ for ac_dir in $ac_dummy; do 78718+ test -z "$ac_dir" && ac_dir=. 78719+ if test -f $ac_dir/$ac_word; then 78720+ ac_cv_prog_CXX="$ac_prog" 78721+ break 78722+ fi 78723+ done 78724+ IFS="$ac_save_ifs" 78725 fi 78726 fi 78727-CXX=$ac_cv_prog_CXX 78728+CXX="$ac_cv_prog_CXX" 78729 if test -n "$CXX"; then 78730- echo "$as_me:$LINENO: result: $CXX" >&5 78731-echo "${ECHO_T}$CXX" >&6 78732+ echo "$ac_t""$CXX" 1>&6 78733 else 78734- echo "$as_me:$LINENO: result: no" >&5 78735-echo "${ECHO_T}no" >&6 78736+ echo "$ac_t""no" 1>&6 78737 fi 78738 78739- test -n "$CXX" && break 78740- done 78741-fi 78742-if test -z "$CXX"; then 78743- ac_ct_CXX=$CXX 78744- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC 78745-do 78746- # Extract the first word of "$ac_prog", so it can be a program name with args. 78747-set dummy $ac_prog; ac_word=$2 78748-echo "$as_me:$LINENO: checking for $ac_word" >&5 78749-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 78750-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then 78751- echo $ECHO_N "(cached) $ECHO_C" >&6 78752-else 78753- if test -n "$ac_ct_CXX"; then 78754- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. 78755-else 78756-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 78757-for as_dir in $PATH 78758-do 78759- IFS=$as_save_IFS 78760- test -z "$as_dir" && as_dir=. 78761- for ac_exec_ext in '' $ac_executable_extensions; do 78762- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 78763- ac_cv_prog_ac_ct_CXX="$ac_prog" 78764- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 78765- break 2 78766- fi 78767-done 78768+test -n "$CXX" && break 78769 done 78770+test -n "$CXX" || CXX="gcc" 78771 78772-fi 78773-fi 78774-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX 78775-if test -n "$ac_ct_CXX"; then 78776- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 78777-echo "${ECHO_T}$ac_ct_CXX" >&6 78778-else 78779- echo "$as_me:$LINENO: result: no" >&5 78780-echo "${ECHO_T}no" >&6 78781-fi 78782 78783- test -n "$ac_ct_CXX" && break 78784-done 78785-test -n "$ac_ct_CXX" || ac_ct_CXX="g++" 78786+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 78787+echo "configure:51550: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 78788 78789- CXX=$ac_ct_CXX 78790-fi 78791+ac_ext=C 78792+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 78793+ac_cpp='$CXXCPP $CPPFLAGS' 78794+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 78795+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 78796+cross_compiling=$ac_cv_prog_cxx_cross 78797 78798+cat > conftest.$ac_ext << EOF 78799 78800-# Provide some information about the compiler. 78801-echo "$as_me:$LINENO:" \ 78802- "checking for C++ compiler version" >&5 78803-ac_compiler=`set X $ac_compile; echo $2` 78804-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 78805- (eval $ac_compiler --version </dev/null >&5) 2>&5 78806- ac_status=$? 78807- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78808- (exit $ac_status); } 78809-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 78810- (eval $ac_compiler -v </dev/null >&5) 2>&5 78811- ac_status=$? 78812- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78813- (exit $ac_status); } 78814-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 78815- (eval $ac_compiler -V </dev/null >&5) 2>&5 78816- ac_status=$? 78817- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78818- (exit $ac_status); } 78819- 78820-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 78821-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 78822-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then 78823- echo $ECHO_N "(cached) $ECHO_C" >&6 78824-else 78825- cat >conftest.$ac_ext <<_ACEOF 78826-/* confdefs.h. */ 78827-_ACEOF 78828-cat confdefs.h >>conftest.$ac_ext 78829-cat >>conftest.$ac_ext <<_ACEOF 78830-/* end confdefs.h. */ 78831+#line 51561 "configure" 78832+#include "confdefs.h" 78833 78834-int 78835-main () 78836-{ 78837-#ifndef __GNUC__ 78838- choke me 78839+int main(){return(0);} 78840+EOF 78841+if { (eval echo configure:51566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 78842+ ac_cv_prog_cxx_works=yes 78843+ # If we can't run a trivial program, we are probably using a cross compiler. 78844+ if (./conftest; exit) 2>/dev/null; then 78845+ ac_cv_prog_cxx_cross=no 78846+ else 78847+ ac_cv_prog_cxx_cross=yes 78848+ fi 78849+else 78850+ echo "configure: failed program was:" >&5 78851+ cat conftest.$ac_ext >&5 78852+ ac_cv_prog_cxx_works=no 78853+fi 78854+rm -fr conftest* 78855+ac_ext=c 78856+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 78857+ac_cpp='$CPP $CPPFLAGS' 78858+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 78859+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 78860+cross_compiling=$ac_cv_prog_cc_cross 78861+ 78862+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 78863+if test $ac_cv_prog_cxx_works = no; then 78864+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } 78865+fi 78866+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 78867+echo "configure:51592: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 78868+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 78869+cross_compiling=$ac_cv_prog_cxx_cross 78870+ 78871+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 78872+echo "configure:51597: checking whether we are using GNU C++" >&5 78873+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then 78874+ echo $ac_n "(cached) $ac_c" 1>&6 78875+else 78876+ cat > conftest.C <<EOF 78877+#ifdef __GNUC__ 78878+ yes; 78879 #endif 78880+EOF 78881+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then 78882+ ac_cv_prog_gxx=yes 78883+else 78884+ ac_cv_prog_gxx=no 78885+fi 78886+fi 78887 78888- ; 78889- return 0; 78890-} 78891-_ACEOF 78892-rm -f conftest.$ac_objext 78893-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 78894- (eval $ac_compile) 2>conftest.er1 78895- ac_status=$? 78896- grep -v '^ *+' conftest.er1 >conftest.err 78897- rm -f conftest.er1 78898- cat conftest.err >&5 78899- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78900- (exit $ac_status); } && 78901- { ac_try='test -z "$ac_cxx_werror_flag" 78902- || test ! -s conftest.err' 78903- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 78904- (eval $ac_try) 2>&5 78905- ac_status=$? 78906- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78907- (exit $ac_status); }; } && 78908- { ac_try='test -s conftest.$ac_objext' 78909- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 78910- (eval $ac_try) 2>&5 78911- ac_status=$? 78912- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78913- (exit $ac_status); }; }; then 78914- ac_compiler_gnu=yes 78915-else 78916- echo "$as_me: failed program was:" >&5 78917-sed 's/^/| /' conftest.$ac_ext >&5 78918- 78919-ac_compiler_gnu=no 78920-fi 78921-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 78922-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu 78923- 78924-fi 78925-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 78926-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 78927-GXX=`test $ac_compiler_gnu = yes && echo yes` 78928-ac_test_CXXFLAGS=${CXXFLAGS+set} 78929-ac_save_CXXFLAGS=$CXXFLAGS 78930-CXXFLAGS="-g" 78931-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 78932-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 78933-if test "${ac_cv_prog_cxx_g+set}" = set; then 78934- echo $ECHO_N "(cached) $ECHO_C" >&6 78935-else 78936- cat >conftest.$ac_ext <<_ACEOF 78937-/* confdefs.h. */ 78938-_ACEOF 78939-cat confdefs.h >>conftest.$ac_ext 78940-cat >>conftest.$ac_ext <<_ACEOF 78941-/* end confdefs.h. */ 78942+echo "$ac_t""$ac_cv_prog_gxx" 1>&6 78943 78944-int 78945-main () 78946-{ 78947+if test $ac_cv_prog_gxx = yes; then 78948+ GXX=yes 78949+else 78950+ GXX= 78951+fi 78952 78953- ; 78954- return 0; 78955-} 78956-_ACEOF 78957-rm -f conftest.$ac_objext 78958-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 78959- (eval $ac_compile) 2>conftest.er1 78960- ac_status=$? 78961- grep -v '^ *+' conftest.er1 >conftest.err 78962- rm -f conftest.er1 78963- cat conftest.err >&5 78964- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78965- (exit $ac_status); } && 78966- { ac_try='test -z "$ac_cxx_werror_flag" 78967- || test ! -s conftest.err' 78968- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 78969- (eval $ac_try) 2>&5 78970- ac_status=$? 78971- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78972- (exit $ac_status); }; } && 78973- { ac_try='test -s conftest.$ac_objext' 78974- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 78975- (eval $ac_try) 2>&5 78976- ac_status=$? 78977- echo "$as_me:$LINENO: \$? = $ac_status" >&5 78978- (exit $ac_status); }; }; then 78979+ac_test_CXXFLAGS="${CXXFLAGS+set}" 78980+ac_save_CXXFLAGS="$CXXFLAGS" 78981+CXXFLAGS= 78982+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 78983+echo "configure:51625: checking whether ${CXX-g++} accepts -g" >&5 78984+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then 78985+ echo $ac_n "(cached) $ac_c" 1>&6 78986+else 78987+ echo 'void f(){}' > conftest.cc 78988+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then 78989 ac_cv_prog_cxx_g=yes 78990 else 78991- echo "$as_me: failed program was:" >&5 78992-sed 's/^/| /' conftest.$ac_ext >&5 78993- 78994-ac_cv_prog_cxx_g=no 78995+ ac_cv_prog_cxx_g=no 78996 fi 78997-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 78998+rm -f conftest* 78999+ 79000 fi 79001-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 79002-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 79003+ 79004+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 79005 if test "$ac_test_CXXFLAGS" = set; then 79006- CXXFLAGS=$ac_save_CXXFLAGS 79007+ CXXFLAGS="$ac_save_CXXFLAGS" 79008 elif test $ac_cv_prog_cxx_g = yes; then 79009 if test "$GXX" = yes; then 79010 CXXFLAGS="-g -O2" 79011@@ -67869,353 +51651,55 @@ 79012 CXXFLAGS= 79013 fi 79014 fi 79015-for ac_declaration in \ 79016- '' \ 79017- 'extern "C" void std::exit (int) throw (); using std::exit;' \ 79018- 'extern "C" void std::exit (int); using std::exit;' \ 79019- 'extern "C" void exit (int) throw ();' \ 79020- 'extern "C" void exit (int);' \ 79021- 'void exit (int);' 79022-do 79023- cat >conftest.$ac_ext <<_ACEOF 79024-/* confdefs.h. */ 79025-_ACEOF 79026-cat confdefs.h >>conftest.$ac_ext 79027-cat >>conftest.$ac_ext <<_ACEOF 79028-/* end confdefs.h. */ 79029-$ac_declaration 79030+ 79031+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 79032+echo "configure:51657: checking how to run the C++ preprocessor" >&5 79033+if test -z "$CXXCPP"; then 79034+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then 79035+ echo $ac_n "(cached) $ac_c" 1>&6 79036+else 79037+ ac_ext=C 79038+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 79039+ac_cpp='$CXXCPP $CPPFLAGS' 79040+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 79041+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 79042+cross_compiling=$ac_cv_prog_cxx_cross 79043+ CXXCPP="${CXX-g++} -E" 79044+ cat > conftest.$ac_ext <<EOF 79045+#line 51670 "configure" 79046+#include "confdefs.h" 79047 #include <stdlib.h> 79048-int 79049-main () 79050-{ 79051-exit (42); 79052- ; 79053- return 0; 79054-} 79055-_ACEOF 79056-rm -f conftest.$ac_objext 79057-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 79058- (eval $ac_compile) 2>conftest.er1 79059- ac_status=$? 79060- grep -v '^ *+' conftest.er1 >conftest.err 79061- rm -f conftest.er1 79062- cat conftest.err >&5 79063- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79064- (exit $ac_status); } && 79065- { ac_try='test -z "$ac_cxx_werror_flag" 79066- || test ! -s conftest.err' 79067- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79068- (eval $ac_try) 2>&5 79069- ac_status=$? 79070- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79071- (exit $ac_status); }; } && 79072- { ac_try='test -s conftest.$ac_objext' 79073- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79074- (eval $ac_try) 2>&5 79075- ac_status=$? 79076- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79077- (exit $ac_status); }; }; then 79078+EOF 79079+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 79080+{ (eval echo configure:51675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 79081+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 79082+if test -z "$ac_err"; then 79083 : 79084 else 79085- echo "$as_me: failed program was:" >&5 79086-sed 's/^/| /' conftest.$ac_ext >&5 79087- 79088-continue 79089-fi 79090-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 79091- cat >conftest.$ac_ext <<_ACEOF 79092-/* confdefs.h. */ 79093-_ACEOF 79094-cat confdefs.h >>conftest.$ac_ext 79095-cat >>conftest.$ac_ext <<_ACEOF 79096-/* end confdefs.h. */ 79097-$ac_declaration 79098-int 79099-main () 79100-{ 79101-exit (42); 79102- ; 79103- return 0; 79104-} 79105-_ACEOF 79106-rm -f conftest.$ac_objext 79107-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 79108- (eval $ac_compile) 2>conftest.er1 79109- ac_status=$? 79110- grep -v '^ *+' conftest.er1 >conftest.err 79111- rm -f conftest.er1 79112- cat conftest.err >&5 79113- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79114- (exit $ac_status); } && 79115- { ac_try='test -z "$ac_cxx_werror_flag" 79116- || test ! -s conftest.err' 79117- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79118- (eval $ac_try) 2>&5 79119- ac_status=$? 79120- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79121- (exit $ac_status); }; } && 79122- { ac_try='test -s conftest.$ac_objext' 79123- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79124- (eval $ac_try) 2>&5 79125- ac_status=$? 79126- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79127- (exit $ac_status); }; }; then 79128- break 79129-else 79130- echo "$as_me: failed program was:" >&5 79131-sed 's/^/| /' conftest.$ac_ext >&5 79132- 79133+ echo "$ac_err" >&5 79134+ echo "configure: failed program was:" >&5 79135+ cat conftest.$ac_ext >&5 79136+ rm -rf conftest* 79137+ CXXCPP=/lib/cpp 79138 fi 79139-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 79140-done 79141 rm -f conftest* 79142-if test -n "$ac_declaration"; then 79143- echo '#ifdef __cplusplus' >>confdefs.h 79144- echo $ac_declaration >>confdefs.h 79145- echo '#endif' >>confdefs.h 79146-fi 79147- 79148+ ac_cv_prog_CXXCPP="$CXXCPP" 79149 ac_ext=c 79150+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 79151 ac_cpp='$CPP $CPPFLAGS' 79152-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 79153-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 79154-ac_compiler_gnu=$ac_cv_c_compiler_gnu 79155- 79156- ac_ext=cc 79157-ac_cpp='$CXXCPP $CPPFLAGS' 79158-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 79159-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 79160-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 79161-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 79162-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 79163-if test -z "$CXXCPP"; then 79164- if test "${ac_cv_prog_CXXCPP+set}" = set; then 79165- echo $ECHO_N "(cached) $ECHO_C" >&6 79166-else 79167- # Double quotes because CXXCPP needs to be expanded 79168- for CXXCPP in "$CXX -E" "/lib/cpp" 79169- do 79170- ac_preproc_ok=false 79171-for ac_cxx_preproc_warn_flag in '' yes 79172-do 79173- # Use a header file that comes with gcc, so configuring glibc 79174- # with a fresh cross-compiler works. 79175- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 79176- # <limits.h> exists even on freestanding compilers. 79177- # On the NeXT, cc -E runs the code through the compiler's parser, 79178- # not just through cpp. "Syntax error" is here to catch this case. 79179- cat >conftest.$ac_ext <<_ACEOF 79180-/* confdefs.h. */ 79181-_ACEOF 79182-cat confdefs.h >>conftest.$ac_ext 79183-cat >>conftest.$ac_ext <<_ACEOF 79184-/* end confdefs.h. */ 79185-#ifdef __STDC__ 79186-# include <limits.h> 79187-#else 79188-# include <assert.h> 79189-#endif 79190- Syntax error 79191-_ACEOF 79192-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 79193- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 79194- ac_status=$? 79195- grep -v '^ *+' conftest.er1 >conftest.err 79196- rm -f conftest.er1 79197- cat conftest.err >&5 79198- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79199- (exit $ac_status); } >/dev/null; then 79200- if test -s conftest.err; then 79201- ac_cpp_err=$ac_cxx_preproc_warn_flag 79202- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 79203- else 79204- ac_cpp_err= 79205- fi 79206-else 79207- ac_cpp_err=yes 79208-fi 79209-if test -z "$ac_cpp_err"; then 79210- : 79211-else 79212- echo "$as_me: failed program was:" >&5 79213-sed 's/^/| /' conftest.$ac_ext >&5 79214- 79215- # Broken: fails on valid input. 79216-continue 79217-fi 79218-rm -f conftest.err conftest.$ac_ext 79219- 79220- # OK, works on sane cases. Now check whether non-existent headers 79221- # can be detected and how. 79222- cat >conftest.$ac_ext <<_ACEOF 79223-/* confdefs.h. */ 79224-_ACEOF 79225-cat confdefs.h >>conftest.$ac_ext 79226-cat >>conftest.$ac_ext <<_ACEOF 79227-/* end confdefs.h. */ 79228-#include <ac_nonexistent.h> 79229-_ACEOF 79230-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 79231- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 79232- ac_status=$? 79233- grep -v '^ *+' conftest.er1 >conftest.err 79234- rm -f conftest.er1 79235- cat conftest.err >&5 79236- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79237- (exit $ac_status); } >/dev/null; then 79238- if test -s conftest.err; then 79239- ac_cpp_err=$ac_cxx_preproc_warn_flag 79240- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 79241- else 79242- ac_cpp_err= 79243- fi 79244-else 79245- ac_cpp_err=yes 79246-fi 79247-if test -z "$ac_cpp_err"; then 79248- # Broken: success on invalid input. 79249-continue 79250-else 79251- echo "$as_me: failed program was:" >&5 79252-sed 's/^/| /' conftest.$ac_ext >&5 79253- 79254- # Passes both tests. 79255-ac_preproc_ok=: 79256-break 79257-fi 79258-rm -f conftest.err conftest.$ac_ext 79259- 79260-done 79261-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 79262-rm -f conftest.err conftest.$ac_ext 79263-if $ac_preproc_ok; then 79264- break 79265-fi 79266- 79267- done 79268- ac_cv_prog_CXXCPP=$CXXCPP 79269- 79270-fi 79271- CXXCPP=$ac_cv_prog_CXXCPP 79272-else 79273- ac_cv_prog_CXXCPP=$CXXCPP 79274-fi 79275-echo "$as_me:$LINENO: result: $CXXCPP" >&5 79276-echo "${ECHO_T}$CXXCPP" >&6 79277-ac_preproc_ok=false 79278-for ac_cxx_preproc_warn_flag in '' yes 79279-do 79280- # Use a header file that comes with gcc, so configuring glibc 79281- # with a fresh cross-compiler works. 79282- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 79283- # <limits.h> exists even on freestanding compilers. 79284- # On the NeXT, cc -E runs the code through the compiler's parser, 79285- # not just through cpp. "Syntax error" is here to catch this case. 79286- cat >conftest.$ac_ext <<_ACEOF 79287-/* confdefs.h. */ 79288-_ACEOF 79289-cat confdefs.h >>conftest.$ac_ext 79290-cat >>conftest.$ac_ext <<_ACEOF 79291-/* end confdefs.h. */ 79292-#ifdef __STDC__ 79293-# include <limits.h> 79294-#else 79295-# include <assert.h> 79296-#endif 79297- Syntax error 79298-_ACEOF 79299-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 79300- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 79301- ac_status=$? 79302- grep -v '^ *+' conftest.er1 >conftest.err 79303- rm -f conftest.er1 79304- cat conftest.err >&5 79305- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79306- (exit $ac_status); } >/dev/null; then 79307- if test -s conftest.err; then 79308- ac_cpp_err=$ac_cxx_preproc_warn_flag 79309- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 79310- else 79311- ac_cpp_err= 79312- fi 79313-else 79314- ac_cpp_err=yes 79315-fi 79316-if test -z "$ac_cpp_err"; then 79317- : 79318-else 79319- echo "$as_me: failed program was:" >&5 79320-sed 's/^/| /' conftest.$ac_ext >&5 79321- 79322- # Broken: fails on valid input. 79323-continue 79324-fi 79325-rm -f conftest.err conftest.$ac_ext 79326- 79327- # OK, works on sane cases. Now check whether non-existent headers 79328- # can be detected and how. 79329- cat >conftest.$ac_ext <<_ACEOF 79330-/* confdefs.h. */ 79331-_ACEOF 79332-cat confdefs.h >>conftest.$ac_ext 79333-cat >>conftest.$ac_ext <<_ACEOF 79334-/* end confdefs.h. */ 79335-#include <ac_nonexistent.h> 79336-_ACEOF 79337-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 79338- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 79339- ac_status=$? 79340- grep -v '^ *+' conftest.er1 >conftest.err 79341- rm -f conftest.er1 79342- cat conftest.err >&5 79343- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79344- (exit $ac_status); } >/dev/null; then 79345- if test -s conftest.err; then 79346- ac_cpp_err=$ac_cxx_preproc_warn_flag 79347- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 79348- else 79349- ac_cpp_err= 79350- fi 79351-else 79352- ac_cpp_err=yes 79353-fi 79354-if test -z "$ac_cpp_err"; then 79355- # Broken: success on invalid input. 79356-continue 79357-else 79358- echo "$as_me: failed program was:" >&5 79359-sed 's/^/| /' conftest.$ac_ext >&5 79360- 79361- # Passes both tests. 79362-ac_preproc_ok=: 79363-break 79364+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 79365+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 79366+cross_compiling=$ac_cv_prog_cc_cross 79367 fi 79368-rm -f conftest.err conftest.$ac_ext 79369- 79370-done 79371-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 79372-rm -f conftest.err conftest.$ac_ext 79373-if $ac_preproc_ok; then 79374- : 79375-else 79376- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check 79377-See \`config.log' for more details." >&5 79378-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check 79379-See \`config.log' for more details." >&2;} 79380- { (exit 1); exit 1; }; } 79381 fi 79382- 79383-ac_ext=c 79384-ac_cpp='$CPP $CPPFLAGS' 79385-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 79386-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 79387-ac_compiler_gnu=$ac_cv_c_compiler_gnu 79388+CXXCPP="$ac_cv_prog_CXXCPP" 79389+echo "$ac_t""$CXXCPP" 1>&6 79390 79391 php_cxx_done=yes 79392 fi 79393 79394 79395- 79396+ 79397 ext_builddir=ext/intl 79398 ext_srcdir=$abs_srcdir/ext/intl 79399 79400@@ -68223,15 +51707,15 @@ 79401 79402 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 79403 PHP_INTL_SHARED=no 79404- 79405- 79406+ 79407+ 79408 case ext/intl in 79409 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 79410 /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 79411 *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 79412 esac 79413- 79414- 79415+ 79416+ 79417 79418 b_c_pre=$php_c_pre 79419 b_cxx_pre=$php_cxx_pre 79420@@ -68289,12 +51773,12 @@ 79421 resourcebundle/resourcebundle_class.c \ 79422 resourcebundle/resourcebundle_iterator.c \ 79423 idn/idn.c; do 79424- 79425+ 79426 IFS=. 79427 set $ac_src 79428 ac_obj=$1 79429 IFS=$old_IFS 79430- 79431+ 79432 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 79433 79434 case $ac_src in 79435@@ -68318,14 +51802,14 @@ 79436 else 79437 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 79438 PHP_INTL_SHARED=yes 79439- 79440+ 79441 case ext/intl in 79442 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 79443 /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 79444 *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 79445 esac 79446- 79447- 79448+ 79449+ 79450 79451 b_c_pre=$shared_c_pre 79452 b_cxx_pre=$shared_cxx_pre 79453@@ -68383,12 +51867,12 @@ 79454 resourcebundle/resourcebundle_class.c \ 79455 resourcebundle/resourcebundle_iterator.c \ 79456 idn/idn.c; do 79457- 79458+ 79459 IFS=. 79460 set $ac_src 79461 ac_obj=$1 79462 IFS=$old_IFS 79463- 79464+ 79465 shared_objects_intl="$shared_objects_intl $ac_bdir$ac_obj.lo" 79466 79467 case $ac_src in 79468@@ -68406,7 +51890,7 @@ 79469 79470 case $host_alias in 79471 *netware*) 79472- 79473+ 79474 install_modules="install-modules" 79475 79476 case $host_alias in 79477@@ -68416,7 +51900,7 @@ 79478 ;; 79479 *netware*) 79480 suffix=nlm 79481- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(INTL_SHARED_LIBADD)' 79482+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINTL, 3)_SHARED_LIBADD)' 79483 ;; 79484 *) 79485 suffix=la 79486@@ -68429,7 +51913,7 @@ 79487 else 79488 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpintl.$suffix" 79489 fi 79490- 79491+ 79492 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_intl" 79493 79494 cat >>Makefile.objects<<EOF 79495@@ -68443,7 +51927,7 @@ 79496 79497 ;; 79498 *) 79499- 79500+ 79501 install_modules="install-modules" 79502 79503 case $host_alias in 79504@@ -68453,7 +51937,7 @@ 79505 ;; 79506 *netware*) 79507 suffix=nlm 79508- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(L_SHARED_LIBADD)' 79509+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_intl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(INTL, 3)_SHARED_LIBADD)' 79510 ;; 79511 *) 79512 suffix=la 79513@@ -68466,7 +51950,7 @@ 79514 else 79515 PHP_MODULES="$PHP_MODULES \$(phplibdir)/intl.$suffix" 79516 fi 79517- 79518+ 79519 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_intl" 79520 79521 cat >>Makefile.objects<<EOF 79522@@ -68480,10 +51964,9 @@ 79523 79524 ;; 79525 esac 79526- 79527-cat >>confdefs.h <<_ACEOF 79528+ cat >> confdefs.h <<EOF 79529 #define COMPILE_DL_INTL 1 79530-_ACEOF 79531+EOF 79532 79533 fi 79534 fi 79535@@ -68492,15 +51975,15 @@ 79536 PHP_INTL_SHARED=no 79537 case "$PHP_SAPI" in 79538 cgi|embed) 79539- 79540- 79541+ 79542+ 79543 case ext/intl in 79544 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 79545 /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 79546 *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 79547 esac 79548- 79549- 79550+ 79551+ 79552 79553 b_c_pre=$php_c_pre 79554 b_cxx_pre=$php_cxx_pre 79555@@ -68558,12 +52041,12 @@ 79556 resourcebundle/resourcebundle_class.c \ 79557 resourcebundle/resourcebundle_iterator.c \ 79558 idn/idn.c; do 79559- 79560+ 79561 IFS=. 79562 set $ac_src 79563 ac_obj=$1 79564 IFS=$old_IFS 79565- 79566+ 79567 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 79568 79569 case $ac_src in 79570@@ -68583,15 +52066,15 @@ 79571 EXT_STATIC="$EXT_STATIC intl" 79572 ;; 79573 *) 79574- 79575- 79576+ 79577+ 79578 case ext/intl in 79579 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 79580 /*) ac_srcdir=`echo "ext/intl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 79581 *) ac_srcdir="$abs_srcdir/ext/intl/"; ac_bdir="ext/intl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 79582 esac 79583- 79584- 79585+ 79586+ 79587 79588 b_c_pre=$php_c_pre 79589 b_cxx_pre=$php_cxx_pre 79590@@ -68649,13 +52132,13 @@ 79591 resourcebundle/resourcebundle_class.c \ 79592 resourcebundle/resourcebundle_iterator.c \ 79593 idn/idn.c; do 79594- 79595+ 79596 IFS=. 79597 set $ac_src 79598 ac_obj=$1 79599 IFS=$old_IFS 79600- 79601- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 79602+ 79603+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 79604 79605 case $ac_src in 79606 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 79607@@ -68675,69 +52158,69 @@ 79608 esac 79609 EXT_CLI_STATIC="$EXT_CLI_STATIC intl" 79610 fi 79611+ 79612+ 79613+ BUILD_DIR="$BUILD_DIR $ext_builddir" 79614+ 79615 79616 79617- BUILD_DIR="$BUILD_DIR $ext_builddir" 79618- 79619- 79620- 79621- if test "$ext_builddir" = "."; then 79622- PHP_PECL_EXTENSION=intl 79623- 79624- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 79625- 79626- fi 79627- 79628- 79629- 79630- 79631- BUILD_DIR="$BUILD_DIR $ext_builddir/collator" 79632- 79633- 79634- 79635- 79636- BUILD_DIR="$BUILD_DIR $ext_builddir/common" 79637- 79638- 79639- 79640- 79641- BUILD_DIR="$BUILD_DIR $ext_builddir/formatter" 79642- 79643- 79644- 79645- 79646- BUILD_DIR="$BUILD_DIR $ext_builddir/normalizer" 79647- 79648- 79649- 79650- 79651- BUILD_DIR="$BUILD_DIR $ext_builddir/dateformat" 79652- 79653- 79654+ if test "$ext_builddir" = "."; then 79655+ PHP_PECL_EXTENSION=intl 79656+ 79657+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 79658 79659+ fi 79660 79661- BUILD_DIR="$BUILD_DIR $ext_builddir/locale" 79662 79663+ 79664+ 79665+ BUILD_DIR="$BUILD_DIR $ext_builddir/collator" 79666+ 79667 79668+ 79669+ 79670+ BUILD_DIR="$BUILD_DIR $ext_builddir/common" 79671+ 79672 79673+ 79674+ 79675+ BUILD_DIR="$BUILD_DIR $ext_builddir/formatter" 79676+ 79677 79678- BUILD_DIR="$BUILD_DIR $ext_builddir/msgformat" 79679+ 79680+ 79681+ BUILD_DIR="$BUILD_DIR $ext_builddir/normalizer" 79682+ 79683 79684+ 79685+ 79686+ BUILD_DIR="$BUILD_DIR $ext_builddir/dateformat" 79687+ 79688 79689+ 79690+ 79691+ BUILD_DIR="$BUILD_DIR $ext_builddir/locale" 79692+ 79693 79694+ 79695+ 79696+ BUILD_DIR="$BUILD_DIR $ext_builddir/msgformat" 79697+ 79698 79699+ 79700+ 79701 BUILD_DIR="$BUILD_DIR $ext_builddir/grapheme" 79702+ 79703 79704- 79705- 79706- 79707+ 79708+ 79709 BUILD_DIR="$BUILD_DIR $ext_builddir/resourcebundle" 79710+ 79711 79712- 79713- 79714- 79715+ 79716+ 79717 BUILD_DIR="$BUILD_DIR $ext_builddir/idn" 79718- 79719+ 79720 79721 fi 79722 79723@@ -68745,18 +52228,19 @@ 79724 79725 php_enable_json=yes 79726 79727-echo "$as_me:$LINENO: checking whether to enable JavaScript Object Serialization support" >&5 79728-echo $ECHO_N "checking whether to enable JavaScript Object Serialization support... $ECHO_C" >&6 79729+echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 79730+echo "configure:52233: checking whether to enable JavaScript Object Serialization support" >&5 79731 # Check whether --enable-json or --disable-json was given. 79732 if test "${enable_json+set}" = set; then 79733 enableval="$enable_json" 79734 PHP_JSON=$enableval 79735 else 79736- 79737+ 79738 PHP_JSON=yes 79739 test "$PHP_ENABLE_ALL" && PHP_JSON=$PHP_ENABLE_ALL 79740 79741-fi; 79742+fi 79743+ 79744 79745 79746 ext_output="yes, shared" 79747@@ -68780,88 +52264,56 @@ 79748 79749 79750 79751-echo "$as_me:$LINENO: result: $ext_output" >&5 79752-echo "${ECHO_T}$ext_output" >&6 79753+echo "$ac_t""$ext_output" 1>&6 79754 79755 79756 79757 79758 if test "$PHP_JSON" != "no"; then 79759+ cat >> confdefs.h <<\EOF 79760+#define HAVE_JSON 1 79761+EOF 79762 79763-cat >>confdefs.h <<\_ACEOF 79764-#define HAVE_JSON 1 79765-_ACEOF 79766- 79767- echo "$as_me:$LINENO: checking for ANSI C header files" >&5 79768-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 79769-if test "${ac_cv_header_stdc+set}" = set; then 79770- echo $ECHO_N "(cached) $ECHO_C" >&6 79771-else 79772- cat >conftest.$ac_ext <<_ACEOF 79773-/* confdefs.h. */ 79774-_ACEOF 79775-cat confdefs.h >>conftest.$ac_ext 79776-cat >>conftest.$ac_ext <<_ACEOF 79777-/* end confdefs.h. */ 79778+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 79779+echo "configure:52279: checking for ANSI C header files" >&5 79780+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 79781+ echo $ac_n "(cached) $ac_c" 1>&6 79782+else 79783+ cat > conftest.$ac_ext <<EOF 79784+#line 52284 "configure" 79785+#include "confdefs.h" 79786 #include <stdlib.h> 79787 #include <stdarg.h> 79788 #include <string.h> 79789 #include <float.h> 79790- 79791-int 79792-main () 79793-{ 79794- 79795- ; 79796- return 0; 79797-} 79798-_ACEOF 79799-rm -f conftest.$ac_objext 79800-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 79801- (eval $ac_compile) 2>conftest.er1 79802- ac_status=$? 79803- grep -v '^ *+' conftest.er1 >conftest.err 79804- rm -f conftest.er1 79805- cat conftest.err >&5 79806- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79807- (exit $ac_status); } && 79808- { ac_try='test -z "$ac_c_werror_flag" 79809- || test ! -s conftest.err' 79810- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79811- (eval $ac_try) 2>&5 79812- ac_status=$? 79813- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79814- (exit $ac_status); }; } && 79815- { ac_try='test -s conftest.$ac_objext' 79816- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79817- (eval $ac_try) 2>&5 79818- ac_status=$? 79819- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79820- (exit $ac_status); }; }; then 79821+EOF 79822+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 79823+{ (eval echo configure:52292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 79824+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 79825+if test -z "$ac_err"; then 79826+ rm -rf conftest* 79827 ac_cv_header_stdc=yes 79828 else 79829- echo "$as_me: failed program was:" >&5 79830-sed 's/^/| /' conftest.$ac_ext >&5 79831- 79832-ac_cv_header_stdc=no 79833+ echo "$ac_err" >&5 79834+ echo "configure: failed program was:" >&5 79835+ cat conftest.$ac_ext >&5 79836+ rm -rf conftest* 79837+ ac_cv_header_stdc=no 79838 fi 79839-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 79840+rm -f conftest* 79841 79842 if test $ac_cv_header_stdc = yes; then 79843 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 79844- cat >conftest.$ac_ext <<_ACEOF 79845-/* confdefs.h. */ 79846-_ACEOF 79847-cat confdefs.h >>conftest.$ac_ext 79848-cat >>conftest.$ac_ext <<_ACEOF 79849-/* end confdefs.h. */ 79850+cat > conftest.$ac_ext <<EOF 79851+#line 52309 "configure" 79852+#include "confdefs.h" 79853 #include <string.h> 79854- 79855-_ACEOF 79856+EOF 79857 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 79858- $EGREP "memchr" >/dev/null 2>&1; then 79859+ egrep "memchr" >/dev/null 2>&1; then 79860 : 79861 else 79862+ rm -rf conftest* 79863 ac_cv_header_stdc=no 79864 fi 79865 rm -f conftest* 79866@@ -68870,19 +52322,16 @@ 79867 79868 if test $ac_cv_header_stdc = yes; then 79869 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 79870- cat >conftest.$ac_ext <<_ACEOF 79871-/* confdefs.h. */ 79872-_ACEOF 79873-cat confdefs.h >>conftest.$ac_ext 79874-cat >>conftest.$ac_ext <<_ACEOF 79875-/* end confdefs.h. */ 79876+cat > conftest.$ac_ext <<EOF 79877+#line 52327 "configure" 79878+#include "confdefs.h" 79879 #include <stdlib.h> 79880- 79881-_ACEOF 79882+EOF 79883 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 79884- $EGREP "free" >/dev/null 2>&1; then 79885+ egrep "free" >/dev/null 2>&1; then 79886 : 79887 else 79888+ rm -rf conftest* 79889 ac_cv_header_stdc=no 79890 fi 79891 rm -f conftest* 79892@@ -68891,75 +52340,46 @@ 79893 79894 if test $ac_cv_header_stdc = yes; then 79895 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 79896- if test "$cross_compiling" = yes; then 79897+if test "$cross_compiling" = yes; then 79898 : 79899 else 79900- cat >conftest.$ac_ext <<_ACEOF 79901-/* confdefs.h. */ 79902-_ACEOF 79903-cat confdefs.h >>conftest.$ac_ext 79904-cat >>conftest.$ac_ext <<_ACEOF 79905-/* end confdefs.h. */ 79906+ cat > conftest.$ac_ext <<EOF 79907+#line 52348 "configure" 79908+#include "confdefs.h" 79909 #include <ctype.h> 79910-#if ((' ' & 0x0FF) == 0x020) 79911-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 79912-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 79913-#else 79914-# define ISLOWER(c) \ 79915- (('a' <= (c) && (c) <= 'i') \ 79916- || ('j' <= (c) && (c) <= 'r') \ 79917- || ('s' <= (c) && (c) <= 'z')) 79918-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 79919-#endif 79920- 79921+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 79922+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 79923 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 79924-int 79925-main () 79926-{ 79927- int i; 79928- for (i = 0; i < 256; i++) 79929- if (XOR (islower (i), ISLOWER (i)) 79930- || toupper (i) != TOUPPER (i)) 79931- exit(2); 79932- exit (0); 79933-} 79934-_ACEOF 79935-rm -f conftest$ac_exeext 79936-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 79937- (eval $ac_link) 2>&5 79938- ac_status=$? 79939- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79940- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 79941- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 79942- (eval $ac_try) 2>&5 79943- ac_status=$? 79944- echo "$as_me:$LINENO: \$? = $ac_status" >&5 79945- (exit $ac_status); }; }; then 79946+int main () { int i; for (i = 0; i < 256; i++) 79947+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 79948+exit (0); } 79949+ 79950+EOF 79951+if { (eval echo configure:52359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 79952+then 79953 : 79954 else 79955- echo "$as_me: program exited with status $ac_status" >&5 79956-echo "$as_me: failed program was:" >&5 79957-sed 's/^/| /' conftest.$ac_ext >&5 79958- 79959-( exit $ac_status ) 79960-ac_cv_header_stdc=no 79961+ echo "configure: failed program was:" >&5 79962+ cat conftest.$ac_ext >&5 79963+ rm -fr conftest* 79964+ ac_cv_header_stdc=no 79965 fi 79966-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 79967+rm -fr conftest* 79968 fi 79969+ 79970 fi 79971 fi 79972-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 79973-echo "${ECHO_T}$ac_cv_header_stdc" >&6 79974-if test $ac_cv_header_stdc = yes; then 79975 79976-cat >>confdefs.h <<\_ACEOF 79977+echo "$ac_t""$ac_cv_header_stdc" 1>&6 79978+if test $ac_cv_header_stdc = yes; then 79979+ cat >> confdefs.h <<\EOF 79980 #define STDC_HEADERS 1 79981-_ACEOF 79982+EOF 79983 79984 fi 79985 79986 79987- 79988+ 79989 ext_builddir=ext/json 79990 ext_srcdir=$abs_srcdir/ext/json 79991 79992@@ -68967,15 +52387,15 @@ 79993 79994 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 79995 PHP_JSON_SHARED=no 79996- 79997- 79998+ 79999+ 80000 case ext/json in 80001 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80002 /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80003 *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80004 esac 80005- 80006- 80007+ 80008+ 80009 80010 b_c_pre=$php_c_pre 80011 b_cxx_pre=$php_cxx_pre 80012@@ -68988,12 +52408,12 @@ 80013 80014 old_IFS=$IFS 80015 for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do 80016- 80017+ 80018 IFS=. 80019 set $ac_src 80020 ac_obj=$1 80021 IFS=$old_IFS 80022- 80023+ 80024 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80025 80026 case $ac_src in 80027@@ -69017,14 +52437,14 @@ 80028 else 80029 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 80030 PHP_JSON_SHARED=yes 80031- 80032+ 80033 case ext/json in 80034 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80035 /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80036 *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80037 esac 80038- 80039- 80040+ 80041+ 80042 80043 b_c_pre=$shared_c_pre 80044 b_cxx_pre=$shared_cxx_pre 80045@@ -69037,12 +52457,12 @@ 80046 80047 old_IFS=$IFS 80048 for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do 80049- 80050+ 80051 IFS=. 80052 set $ac_src 80053 ac_obj=$1 80054 IFS=$old_IFS 80055- 80056+ 80057 shared_objects_json="$shared_objects_json $ac_bdir$ac_obj.lo" 80058 80059 case $ac_src in 80060@@ -69060,7 +52480,7 @@ 80061 80062 case $host_alias in 80063 *netware*) 80064- 80065+ 80066 install_modules="install-modules" 80067 80068 case $host_alias in 80069@@ -69070,7 +52490,7 @@ 80070 ;; 80071 *netware*) 80072 suffix=nlm 80073- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(JSON_SHARED_LIBADD)' 80074+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPJSON, 3)_SHARED_LIBADD)' 80075 ;; 80076 *) 80077 suffix=la 80078@@ -69083,7 +52503,7 @@ 80079 else 80080 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpjson.$suffix" 80081 fi 80082- 80083+ 80084 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_json" 80085 80086 cat >>Makefile.objects<<EOF 80087@@ -69097,7 +52517,7 @@ 80088 80089 ;; 80090 *) 80091- 80092+ 80093 install_modules="install-modules" 80094 80095 case $host_alias in 80096@@ -69107,7 +52527,7 @@ 80097 ;; 80098 *netware*) 80099 suffix=nlm 80100- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(N_SHARED_LIBADD)' 80101+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_json) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(JSON, 3)_SHARED_LIBADD)' 80102 ;; 80103 *) 80104 suffix=la 80105@@ -69120,7 +52540,7 @@ 80106 else 80107 PHP_MODULES="$PHP_MODULES \$(phplibdir)/json.$suffix" 80108 fi 80109- 80110+ 80111 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_json" 80112 80113 cat >>Makefile.objects<<EOF 80114@@ -69134,10 +52554,9 @@ 80115 80116 ;; 80117 esac 80118- 80119-cat >>confdefs.h <<_ACEOF 80120+ cat >> confdefs.h <<EOF 80121 #define COMPILE_DL_JSON 1 80122-_ACEOF 80123+EOF 80124 80125 fi 80126 fi 80127@@ -69146,15 +52565,15 @@ 80128 PHP_JSON_SHARED=no 80129 case "$PHP_SAPI" in 80130 cgi|embed) 80131- 80132- 80133+ 80134+ 80135 case ext/json in 80136 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80137 /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80138 *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80139 esac 80140- 80141- 80142+ 80143+ 80144 80145 b_c_pre=$php_c_pre 80146 b_cxx_pre=$php_cxx_pre 80147@@ -69167,12 +52586,12 @@ 80148 80149 old_IFS=$IFS 80150 for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do 80151- 80152+ 80153 IFS=. 80154 set $ac_src 80155 ac_obj=$1 80156 IFS=$old_IFS 80157- 80158+ 80159 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80160 80161 case $ac_src in 80162@@ -69192,15 +52611,15 @@ 80163 EXT_STATIC="$EXT_STATIC json" 80164 ;; 80165 *) 80166- 80167- 80168+ 80169+ 80170 case ext/json in 80171 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80172 /*) ac_srcdir=`echo "ext/json"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80173 *) ac_srcdir="$abs_srcdir/ext/json/"; ac_bdir="ext/json/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80174 esac 80175- 80176- 80177+ 80178+ 80179 80180 b_c_pre=$php_c_pre 80181 b_cxx_pre=$php_cxx_pre 80182@@ -69213,13 +52632,13 @@ 80183 80184 old_IFS=$IFS 80185 for ac_src in json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c; do 80186- 80187+ 80188 IFS=. 80189 set $ac_src 80190 ac_obj=$1 80191 IFS=$old_IFS 80192- 80193- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 80194+ 80195+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80196 80197 case $ac_src in 80198 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 80199@@ -69239,40 +52658,40 @@ 80200 esac 80201 EXT_CLI_STATIC="$EXT_CLI_STATIC json" 80202 fi 80203- 80204- 80205+ 80206+ 80207 BUILD_DIR="$BUILD_DIR $ext_builddir" 80208- 80209+ 80210 80211 80212 if test "$ext_builddir" = "."; then 80213 PHP_PECL_EXTENSION=json 80214- 80215+ 80216 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 80217 80218 fi 80219 80220- 80221- 80222+ 80223+ 80224 header_path=ext/json 80225 for header_file in php_json.h; do 80226 hp_hf="$header_path/$header_file" 80227- 80228- 80229+ 80230+ 80231 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 80232- 80233+ 80234 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 80235 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80236 eval "INSTALLHEADERS$unique=set" 80237- 80238+ 80239 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 80240- 80241+ 80242 fi 80243 80244- done 80245- 80246- 80247+ done 80248+ 80249 80250+ 80251 PHP_VAR_SUBST="$PHP_VAR_SUBST JSON_SHARED_LIBADD" 80252 80253 fi 80254@@ -69285,19 +52704,19 @@ 80255 80256 php_with_ldap=no 80257 80258-echo "$as_me:$LINENO: checking for LDAP support" >&5 80259-echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6 80260- 80261+echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 80262+echo "configure:52709: checking for LDAP support" >&5 80263 # Check whether --with-ldap or --without-ldap was given. 80264 if test "${with_ldap+set}" = set; then 80265 withval="$with_ldap" 80266 PHP_LDAP=$withval 80267 else 80268- 80269+ 80270 PHP_LDAP=no 80271 test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL 80272 80273-fi; 80274+fi 80275+ 80276 80277 80278 ext_output="yes, shared" 80279@@ -69321,8 +52740,7 @@ 80280 80281 80282 80283-echo "$as_me:$LINENO: result: $ext_output" >&5 80284-echo "${ECHO_T}$ext_output" >&6 80285+echo "$ac_t""$ext_output" 1>&6 80286 80287 80288 80289@@ -69330,30 +52748,29 @@ 80290 80291 php_with_ldap_sasl=no 80292 80293-echo "$as_me:$LINENO: checking for LDAP Cyrus SASL support" >&5 80294-echo $ECHO_N "checking for LDAP Cyrus SASL support... $ECHO_C" >&6 80295- 80296+echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 80297+echo "configure:52753: checking for LDAP Cyrus SASL support" >&5 80298 # Check whether --with-ldap-sasl or --without-ldap-sasl was given. 80299 if test "${with_ldap_sasl+set}" = set; then 80300 withval="$with_ldap_sasl" 80301 PHP_LDAP_SASL=$withval 80302 else 80303- 80304+ 80305 PHP_LDAP_SASL=no 80306+ 80307 80308+fi 80309 80310-fi; 80311 80312 ext_output=$PHP_LDAP_SASL 80313-echo "$as_me:$LINENO: result: $ext_output" >&5 80314-echo "${ECHO_T}$ext_output" >&6 80315+echo "$ac_t""$ext_output" 1>&6 80316 80317 80318 80319 80320 if test "$PHP_LDAP" != "no"; then 80321 80322- 80323+ 80324 ext_builddir=ext/ldap 80325 ext_srcdir=$abs_srcdir/ext/ldap 80326 80327@@ -69361,15 +52778,15 @@ 80328 80329 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 80330 PHP_LDAP_SHARED=no 80331- 80332- 80333+ 80334+ 80335 case ext/ldap in 80336 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80337 /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80338 *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80339 esac 80340- 80341- 80342+ 80343+ 80344 80345 b_c_pre=$php_c_pre 80346 b_cxx_pre=$php_cxx_pre 80347@@ -69382,12 +52799,12 @@ 80348 80349 old_IFS=$IFS 80350 for ac_src in ldap.c; do 80351- 80352+ 80353 IFS=. 80354 set $ac_src 80355 ac_obj=$1 80356 IFS=$old_IFS 80357- 80358+ 80359 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80360 80361 case $ac_src in 80362@@ -69411,14 +52828,14 @@ 80363 else 80364 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 80365 PHP_LDAP_SHARED=yes 80366- 80367+ 80368 case ext/ldap in 80369 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80370 /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80371 *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80372 esac 80373- 80374- 80375+ 80376+ 80377 80378 b_c_pre=$shared_c_pre 80379 b_cxx_pre=$shared_cxx_pre 80380@@ -69431,12 +52848,12 @@ 80381 80382 old_IFS=$IFS 80383 for ac_src in ldap.c; do 80384- 80385+ 80386 IFS=. 80387 set $ac_src 80388 ac_obj=$1 80389 IFS=$old_IFS 80390- 80391+ 80392 shared_objects_ldap="$shared_objects_ldap $ac_bdir$ac_obj.lo" 80393 80394 case $ac_src in 80395@@ -69454,7 +52871,7 @@ 80396 80397 case $host_alias in 80398 *netware*) 80399- 80400+ 80401 install_modules="install-modules" 80402 80403 case $host_alias in 80404@@ -69464,7 +52881,7 @@ 80405 ;; 80406 *netware*) 80407 suffix=nlm 80408- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(LDAP_SHARED_LIBADD)' 80409+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLDAP, 3)_SHARED_LIBADD)' 80410 ;; 80411 *) 80412 suffix=la 80413@@ -69477,7 +52894,7 @@ 80414 else 80415 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpldap.$suffix" 80416 fi 80417- 80418+ 80419 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ldap" 80420 80421 cat >>Makefile.objects<<EOF 80422@@ -69491,7 +52908,7 @@ 80423 80424 ;; 80425 *) 80426- 80427+ 80428 install_modules="install-modules" 80429 80430 case $host_alias in 80431@@ -69501,7 +52918,7 @@ 80432 ;; 80433 *netware*) 80434 suffix=nlm 80435- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(P_SHARED_LIBADD)' 80436+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ldap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LDAP, 3)_SHARED_LIBADD)' 80437 ;; 80438 *) 80439 suffix=la 80440@@ -69514,7 +52931,7 @@ 80441 else 80442 PHP_MODULES="$PHP_MODULES \$(phplibdir)/ldap.$suffix" 80443 fi 80444- 80445+ 80446 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ldap" 80447 80448 cat >>Makefile.objects<<EOF 80449@@ -69528,10 +52945,9 @@ 80450 80451 ;; 80452 esac 80453- 80454-cat >>confdefs.h <<_ACEOF 80455+ cat >> confdefs.h <<EOF 80456 #define COMPILE_DL_LDAP 1 80457-_ACEOF 80458+EOF 80459 80460 fi 80461 fi 80462@@ -69540,15 +52956,15 @@ 80463 PHP_LDAP_SHARED=no 80464 case "$PHP_SAPI" in 80465 cgi|embed) 80466- 80467- 80468+ 80469+ 80470 case ext/ldap in 80471 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80472 /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80473 *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80474 esac 80475- 80476- 80477+ 80478+ 80479 80480 b_c_pre=$php_c_pre 80481 b_cxx_pre=$php_cxx_pre 80482@@ -69561,12 +52977,12 @@ 80483 80484 old_IFS=$IFS 80485 for ac_src in ldap.c; do 80486- 80487+ 80488 IFS=. 80489 set $ac_src 80490 ac_obj=$1 80491 IFS=$old_IFS 80492- 80493+ 80494 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80495 80496 case $ac_src in 80497@@ -69586,15 +53002,15 @@ 80498 EXT_STATIC="$EXT_STATIC ldap" 80499 ;; 80500 *) 80501- 80502- 80503+ 80504+ 80505 case ext/ldap in 80506 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 80507 /*) ac_srcdir=`echo "ext/ldap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 80508 *) ac_srcdir="$abs_srcdir/ext/ldap/"; ac_bdir="ext/ldap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 80509 esac 80510- 80511- 80512+ 80513+ 80514 80515 b_c_pre=$php_c_pre 80516 b_cxx_pre=$php_cxx_pre 80517@@ -69607,13 +53023,13 @@ 80518 80519 old_IFS=$IFS 80520 for ac_src in ldap.c; do 80521- 80522+ 80523 IFS=. 80524 set $ac_src 80525 ac_obj=$1 80526 IFS=$old_IFS 80527- 80528- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 80529+ 80530+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 80531 80532 case $ac_src in 80533 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 80534@@ -69633,15 +53049,15 @@ 80535 esac 80536 EXT_CLI_STATIC="$EXT_CLI_STATIC ldap" 80537 fi 80538- 80539- 80540+ 80541+ 80542 BUILD_DIR="$BUILD_DIR $ext_builddir" 80543- 80544+ 80545 80546 80547 if test "$ext_builddir" = "."; then 80548 PHP_PECL_EXTENSION=ldap 80549- 80550+ 80551 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 80552 80553 fi 80554@@ -69649,7 +53065,7 @@ 80555 80556 if test "$PHP_LDAP" = "yes"; then 80557 for i in /usr/local /usr; do 80558- 80559+ 80560 if test -f $i/include/ldap.h; then 80561 LDAP_DIR=$i 80562 LDAP_INCDIR=$i/include 80563@@ -69666,7 +53082,7 @@ 80564 80565 done 80566 else 80567- 80568+ 80569 if test -f $PHP_LDAP/include/ldap.h; then 80570 LDAP_DIR=$PHP_LDAP 80571 LDAP_INCDIR=$PHP_LDAP/include 80572@@ -69684,12 +53100,10 @@ 80573 fi 80574 80575 if test -z "$LDAP_DIR"; then 80576- { { echo "$as_me:$LINENO: error: Cannot find ldap.h" >&5 80577-echo "$as_me: error: Cannot find ldap.h" >&2;} 80578- { (exit 1); exit 1; }; } 80579+ { echo "configure: error: Cannot find ldap.h" 1>&2; exit 1; } 80580 fi 80581 80582- 80583+ 80584 if test `uname` = "Linux"; then 80585 LDAP_PTHREAD=pthread 80586 else 80587@@ -69697,94 +53111,94 @@ 80588 fi 80589 80590 if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then 80591- 80592+ 80593 80594 if test "$ext_shared" = "yes"; then 80595 LDAP_SHARED_LIBADD="-llber $LDAP_SHARED_LIBADD" 80596 if test -n "$LDAP_LIBDIR"; then 80597- 80598+ 80599 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80600- 80601+ 80602 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80603 ai_p=$LDAP_LIBDIR 80604 else 80605- 80606+ 80607 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80608- 80609+ 80610 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80611 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80612 fi 80613 80614- 80615+ 80616 if test "$ext_shared" = "yes"; then 80617 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 80618 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 80619 else 80620- 80621- 80622- 80623+ 80624+ 80625+ 80626 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80627- 80628+ 80629 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80630 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80631 eval "LIBPATH$unique=set" 80632- 80633+ 80634 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80635 LDFLAGS="$LDFLAGS -L$ai_p" 80636 PHP_RPATHS="$PHP_RPATHS $ai_p" 80637- 80638+ 80639 fi 80640 80641 80642 fi 80643- 80644+ 80645 fi 80646 80647 fi 80648 else 80649- 80650+ 80651 80652 if test -n "$LDAP_LIBDIR"; then 80653- 80654+ 80655 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80656- 80657+ 80658 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80659 ai_p=$LDAP_LIBDIR 80660 else 80661- 80662+ 80663 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80664- 80665+ 80666 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80667 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80668 fi 80669 80670- 80671- 80672- 80673- 80674+ 80675+ 80676+ 80677+ 80678 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80679- 80680+ 80681 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80682 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80683 eval "LIBPATH$unique=set" 80684- 80685+ 80686 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80687 LDFLAGS="$LDFLAGS -L$ai_p" 80688 PHP_RPATHS="$PHP_RPATHS $ai_p" 80689- 80690+ 80691 fi 80692 80693 80694- 80695+ 80696 fi 80697 80698 fi 80699- 80700- 80701+ 80702+ 80703 case lber in 80704 c|c_r|pthread*) ;; 80705- *) 80706- LIBS="-llber $LIBS" 80707+ *) 80708+ LIBS="-llber $LIBS" 80709 ;; 80710 esac 80711 80712@@ -69794,94 +53208,94 @@ 80713 fi 80714 80715 80716- 80717+ 80718 80719 if test "$ext_shared" = "yes"; then 80720 LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD" 80721 if test -n "$LDAP_LIBDIR"; then 80722- 80723+ 80724 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80725- 80726+ 80727 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80728 ai_p=$LDAP_LIBDIR 80729 else 80730- 80731+ 80732 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80733- 80734+ 80735 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80736 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80737 fi 80738 80739- 80740+ 80741 if test "$ext_shared" = "yes"; then 80742 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 80743 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 80744 else 80745- 80746- 80747- 80748+ 80749+ 80750+ 80751 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80752- 80753+ 80754 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80755 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80756 eval "LIBPATH$unique=set" 80757- 80758+ 80759 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80760 LDFLAGS="$LDFLAGS -L$ai_p" 80761 PHP_RPATHS="$PHP_RPATHS $ai_p" 80762- 80763+ 80764 fi 80765 80766 80767 fi 80768- 80769+ 80770 fi 80771 80772 fi 80773 else 80774- 80775+ 80776 80777 if test -n "$LDAP_LIBDIR"; then 80778- 80779+ 80780 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80781- 80782+ 80783 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80784 ai_p=$LDAP_LIBDIR 80785 else 80786- 80787+ 80788 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80789- 80790+ 80791 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80792 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80793 fi 80794 80795- 80796- 80797- 80798- 80799+ 80800+ 80801+ 80802+ 80803 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80804- 80805+ 80806 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80807 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80808 eval "LIBPATH$unique=set" 80809- 80810+ 80811 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80812 LDFLAGS="$LDFLAGS -L$ai_p" 80813 PHP_RPATHS="$PHP_RPATHS $ai_p" 80814- 80815+ 80816 fi 80817 80818 80819- 80820+ 80821 fi 80822 80823 fi 80824- 80825- 80826+ 80827+ 80828 case ldap in 80829 c|c_r|pthread*) ;; 80830- *) 80831- LIBS="-lldap $LIBS" 80832+ *) 80833+ LIBS="-lldap $LIBS" 80834 ;; 80835 esac 80836 80837@@ -69893,94 +53307,94 @@ 80838 80839 80840 elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then 80841- 80842+ 80843 80844 if test "$ext_shared" = "yes"; then 80845 LDAP_SHARED_LIBADD="-lldap $LDAP_SHARED_LIBADD" 80846 if test -n "$LDAP_LIBDIR"; then 80847- 80848+ 80849 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80850- 80851+ 80852 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80853 ai_p=$LDAP_LIBDIR 80854 else 80855- 80856+ 80857 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80858- 80859+ 80860 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80861 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80862 fi 80863 80864- 80865+ 80866 if test "$ext_shared" = "yes"; then 80867 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 80868 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 80869 else 80870- 80871- 80872- 80873+ 80874+ 80875+ 80876 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80877- 80878+ 80879 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80880 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80881 eval "LIBPATH$unique=set" 80882- 80883+ 80884 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80885 LDFLAGS="$LDFLAGS -L$ai_p" 80886 PHP_RPATHS="$PHP_RPATHS $ai_p" 80887- 80888+ 80889 fi 80890 80891 80892 fi 80893- 80894+ 80895 fi 80896 80897 fi 80898 else 80899- 80900+ 80901 80902 if test -n "$LDAP_LIBDIR"; then 80903- 80904+ 80905 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80906- 80907+ 80908 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80909 ai_p=$LDAP_LIBDIR 80910 else 80911- 80912+ 80913 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 80914- 80915+ 80916 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 80917 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 80918 fi 80919 80920- 80921- 80922- 80923- 80924+ 80925+ 80926+ 80927+ 80928 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 80929- 80930+ 80931 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 80932 if test -n "$unique" && test "`eval $cmd`" = "" ; then 80933 eval "LIBPATH$unique=set" 80934- 80935+ 80936 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 80937 LDFLAGS="$LDFLAGS -L$ai_p" 80938 PHP_RPATHS="$PHP_RPATHS $ai_p" 80939- 80940+ 80941 fi 80942 80943 80944- 80945+ 80946 fi 80947 80948 fi 80949- 80950- 80951+ 80952+ 80953 case ldap in 80954 c|c_r|pthread*) ;; 80955- *) 80956- LIBS="-lldap $LIBS" 80957+ *) 80958+ LIBS="-lldap $LIBS" 80959 ;; 80960 esac 80961 80962@@ -69992,106 +53406,106 @@ 80963 80964 80965 elif test -f $LDAP_LIBDIR/libssldap50.$SHLIB_SUFFIX_NAME; then 80966- if test -n "$LDAP_PTHREAD"; then 80967- 80968- 80969+ if test -n "$LDAP_PTHREAD"; then 80970+ 80971+ 80972 case $LDAP_PTHREAD in 80973 c|c_r|pthread*) ;; 80974- *) 80975- LIBS="-l$LDAP_PTHREAD $LIBS" 80976+ *) 80977+ LIBS="-l$LDAP_PTHREAD $LIBS" 80978 ;; 80979 esac 80980 80981 80982 fi 80983- 80984+ 80985 80986 if test "$ext_shared" = "yes"; then 80987 LDAP_SHARED_LIBADD="-lnspr4 $LDAP_SHARED_LIBADD" 80988 if test -n "$LDAP_LIBDIR"; then 80989- 80990+ 80991 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 80992- 80993+ 80994 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 80995 ai_p=$LDAP_LIBDIR 80996 else 80997- 80998+ 80999 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81000- 81001+ 81002 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81003 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81004 fi 81005 81006- 81007+ 81008 if test "$ext_shared" = "yes"; then 81009 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81010 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81011 else 81012- 81013- 81014- 81015+ 81016+ 81017+ 81018 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81019- 81020+ 81021 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81022 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81023 eval "LIBPATH$unique=set" 81024- 81025+ 81026 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81027 LDFLAGS="$LDFLAGS -L$ai_p" 81028 PHP_RPATHS="$PHP_RPATHS $ai_p" 81029- 81030+ 81031 fi 81032 81033 81034 fi 81035- 81036+ 81037 fi 81038 81039 fi 81040 else 81041- 81042+ 81043 81044 if test -n "$LDAP_LIBDIR"; then 81045- 81046+ 81047 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81048- 81049+ 81050 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81051 ai_p=$LDAP_LIBDIR 81052 else 81053- 81054+ 81055 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81056- 81057+ 81058 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81059 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81060 fi 81061 81062- 81063- 81064- 81065- 81066+ 81067+ 81068+ 81069+ 81070 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81071- 81072+ 81073 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81074 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81075 eval "LIBPATH$unique=set" 81076- 81077+ 81078 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81079 LDFLAGS="$LDFLAGS -L$ai_p" 81080 PHP_RPATHS="$PHP_RPATHS $ai_p" 81081- 81082+ 81083 fi 81084 81085 81086- 81087+ 81088 fi 81089 81090 fi 81091- 81092- 81093+ 81094+ 81095 case nspr4 in 81096 c|c_r|pthread*) ;; 81097- *) 81098- LIBS="-lnspr4 $LIBS" 81099+ *) 81100+ LIBS="-lnspr4 $LIBS" 81101 ;; 81102 esac 81103 81104@@ -70101,94 +53515,94 @@ 81105 fi 81106 81107 81108- 81109+ 81110 81111 if test "$ext_shared" = "yes"; then 81112 LDAP_SHARED_LIBADD="-lplc4 $LDAP_SHARED_LIBADD" 81113 if test -n "$LDAP_LIBDIR"; then 81114- 81115+ 81116 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81117- 81118+ 81119 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81120 ai_p=$LDAP_LIBDIR 81121 else 81122- 81123+ 81124 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81125- 81126+ 81127 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81128 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81129 fi 81130 81131- 81132+ 81133 if test "$ext_shared" = "yes"; then 81134 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81135 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81136 else 81137- 81138- 81139- 81140+ 81141+ 81142+ 81143 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81144- 81145+ 81146 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81147 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81148 eval "LIBPATH$unique=set" 81149- 81150+ 81151 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81152 LDFLAGS="$LDFLAGS -L$ai_p" 81153 PHP_RPATHS="$PHP_RPATHS $ai_p" 81154- 81155+ 81156 fi 81157 81158 81159 fi 81160- 81161+ 81162 fi 81163 81164 fi 81165 else 81166- 81167+ 81168 81169 if test -n "$LDAP_LIBDIR"; then 81170- 81171+ 81172 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81173- 81174+ 81175 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81176 ai_p=$LDAP_LIBDIR 81177 else 81178- 81179+ 81180 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81181- 81182+ 81183 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81184 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81185 fi 81186 81187- 81188- 81189- 81190- 81191+ 81192+ 81193+ 81194+ 81195 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81196- 81197+ 81198 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81199 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81200 eval "LIBPATH$unique=set" 81201- 81202+ 81203 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81204 LDFLAGS="$LDFLAGS -L$ai_p" 81205 PHP_RPATHS="$PHP_RPATHS $ai_p" 81206- 81207+ 81208 fi 81209 81210 81211- 81212+ 81213 fi 81214 81215 fi 81216- 81217- 81218+ 81219+ 81220 case plc4 in 81221 c|c_r|pthread*) ;; 81222- *) 81223- LIBS="-lplc4 $LIBS" 81224+ *) 81225+ LIBS="-lplc4 $LIBS" 81226 ;; 81227 esac 81228 81229@@ -70198,94 +53612,94 @@ 81230 fi 81231 81232 81233- 81234+ 81235 81236 if test "$ext_shared" = "yes"; then 81237 LDAP_SHARED_LIBADD="-lplds4 $LDAP_SHARED_LIBADD" 81238 if test -n "$LDAP_LIBDIR"; then 81239- 81240+ 81241 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81242- 81243+ 81244 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81245 ai_p=$LDAP_LIBDIR 81246 else 81247- 81248+ 81249 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81250- 81251+ 81252 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81253 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81254 fi 81255 81256- 81257+ 81258 if test "$ext_shared" = "yes"; then 81259 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81260 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81261 else 81262- 81263- 81264- 81265+ 81266+ 81267+ 81268 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81269- 81270+ 81271 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81272 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81273 eval "LIBPATH$unique=set" 81274- 81275+ 81276 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81277 LDFLAGS="$LDFLAGS -L$ai_p" 81278 PHP_RPATHS="$PHP_RPATHS $ai_p" 81279- 81280+ 81281 fi 81282 81283 81284 fi 81285- 81286+ 81287 fi 81288 81289 fi 81290 else 81291- 81292+ 81293 81294 if test -n "$LDAP_LIBDIR"; then 81295- 81296+ 81297 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81298- 81299+ 81300 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81301 ai_p=$LDAP_LIBDIR 81302 else 81303- 81304+ 81305 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81306- 81307+ 81308 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81309 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81310 fi 81311 81312- 81313- 81314- 81315- 81316+ 81317+ 81318+ 81319+ 81320 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81321- 81322+ 81323 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81324 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81325 eval "LIBPATH$unique=set" 81326- 81327+ 81328 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81329 LDFLAGS="$LDFLAGS -L$ai_p" 81330 PHP_RPATHS="$PHP_RPATHS $ai_p" 81331- 81332+ 81333 fi 81334 81335 81336- 81337+ 81338 fi 81339 81340 fi 81341- 81342- 81343+ 81344+ 81345 case plds4 in 81346 c|c_r|pthread*) ;; 81347- *) 81348- LIBS="-lplds4 $LIBS" 81349+ *) 81350+ LIBS="-lplds4 $LIBS" 81351 ;; 81352 esac 81353 81354@@ -70295,94 +53709,94 @@ 81355 fi 81356 81357 81358- 81359+ 81360 81361 if test "$ext_shared" = "yes"; then 81362 LDAP_SHARED_LIBADD="-lssldap50 $LDAP_SHARED_LIBADD" 81363 if test -n "$LDAP_LIBDIR"; then 81364- 81365+ 81366 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81367- 81368+ 81369 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81370 ai_p=$LDAP_LIBDIR 81371 else 81372- 81373+ 81374 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81375- 81376+ 81377 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81378 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81379 fi 81380 81381- 81382+ 81383 if test "$ext_shared" = "yes"; then 81384 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81385 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81386 else 81387- 81388- 81389- 81390+ 81391+ 81392+ 81393 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81394- 81395+ 81396 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81397 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81398 eval "LIBPATH$unique=set" 81399- 81400+ 81401 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81402 LDFLAGS="$LDFLAGS -L$ai_p" 81403 PHP_RPATHS="$PHP_RPATHS $ai_p" 81404- 81405+ 81406 fi 81407 81408 81409 fi 81410- 81411+ 81412 fi 81413 81414 fi 81415 else 81416- 81417+ 81418 81419 if test -n "$LDAP_LIBDIR"; then 81420- 81421+ 81422 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81423- 81424+ 81425 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81426 ai_p=$LDAP_LIBDIR 81427 else 81428- 81429+ 81430 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81431- 81432+ 81433 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81434 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81435 fi 81436 81437- 81438- 81439- 81440- 81441+ 81442+ 81443+ 81444+ 81445 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81446- 81447+ 81448 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81449 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81450 eval "LIBPATH$unique=set" 81451- 81452+ 81453 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81454 LDFLAGS="$LDFLAGS -L$ai_p" 81455 PHP_RPATHS="$PHP_RPATHS $ai_p" 81456- 81457+ 81458 fi 81459 81460 81461- 81462+ 81463 fi 81464 81465 fi 81466- 81467- 81468+ 81469+ 81470 case ssldap50 in 81471 c|c_r|pthread*) ;; 81472- *) 81473- LIBS="-lssldap50 $LIBS" 81474+ *) 81475+ LIBS="-lssldap50 $LIBS" 81476 ;; 81477 esac 81478 81479@@ -70392,94 +53806,94 @@ 81480 fi 81481 81482 81483- 81484+ 81485 81486 if test "$ext_shared" = "yes"; then 81487 LDAP_SHARED_LIBADD="-lldap50 $LDAP_SHARED_LIBADD" 81488 if test -n "$LDAP_LIBDIR"; then 81489- 81490+ 81491 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81492- 81493+ 81494 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81495 ai_p=$LDAP_LIBDIR 81496 else 81497- 81498+ 81499 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81500- 81501+ 81502 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81503 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81504 fi 81505 81506- 81507+ 81508 if test "$ext_shared" = "yes"; then 81509 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81510 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81511 else 81512- 81513- 81514- 81515+ 81516+ 81517+ 81518 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81519- 81520+ 81521 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81522 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81523 eval "LIBPATH$unique=set" 81524- 81525+ 81526 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81527 LDFLAGS="$LDFLAGS -L$ai_p" 81528 PHP_RPATHS="$PHP_RPATHS $ai_p" 81529- 81530+ 81531 fi 81532 81533 81534 fi 81535- 81536+ 81537 fi 81538 81539 fi 81540 else 81541- 81542+ 81543 81544 if test -n "$LDAP_LIBDIR"; then 81545- 81546+ 81547 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81548- 81549+ 81550 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81551 ai_p=$LDAP_LIBDIR 81552 else 81553- 81554+ 81555 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81556- 81557+ 81558 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81559 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81560 fi 81561 81562- 81563- 81564- 81565- 81566+ 81567+ 81568+ 81569+ 81570 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81571- 81572+ 81573 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81574 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81575 eval "LIBPATH$unique=set" 81576- 81577+ 81578 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81579 LDFLAGS="$LDFLAGS -L$ai_p" 81580 PHP_RPATHS="$PHP_RPATHS $ai_p" 81581- 81582+ 81583 fi 81584 81585 81586- 81587+ 81588 fi 81589 81590 fi 81591- 81592- 81593+ 81594+ 81595 case ldap50 in 81596 c|c_r|pthread*) ;; 81597- *) 81598- LIBS="-lldap50 $LIBS" 81599+ *) 81600+ LIBS="-lldap50 $LIBS" 81601 ;; 81602 esac 81603 81604@@ -70489,94 +53903,94 @@ 81605 fi 81606 81607 81608- 81609+ 81610 81611 if test "$ext_shared" = "yes"; then 81612 LDAP_SHARED_LIBADD="-lprldap50 $LDAP_SHARED_LIBADD" 81613 if test -n "$LDAP_LIBDIR"; then 81614- 81615+ 81616 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81617- 81618+ 81619 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81620 ai_p=$LDAP_LIBDIR 81621 else 81622- 81623+ 81624 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81625- 81626+ 81627 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81628 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81629 fi 81630 81631- 81632+ 81633 if test "$ext_shared" = "yes"; then 81634 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81635 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81636 else 81637- 81638- 81639- 81640+ 81641+ 81642+ 81643 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81644- 81645+ 81646 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81647 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81648 eval "LIBPATH$unique=set" 81649- 81650+ 81651 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81652 LDFLAGS="$LDFLAGS -L$ai_p" 81653 PHP_RPATHS="$PHP_RPATHS $ai_p" 81654- 81655+ 81656 fi 81657 81658 81659 fi 81660- 81661+ 81662 fi 81663 81664 fi 81665 else 81666- 81667+ 81668 81669 if test -n "$LDAP_LIBDIR"; then 81670- 81671+ 81672 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81673- 81674+ 81675 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81676 ai_p=$LDAP_LIBDIR 81677 else 81678- 81679+ 81680 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81681- 81682+ 81683 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81684 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81685 fi 81686 81687- 81688- 81689- 81690- 81691+ 81692+ 81693+ 81694+ 81695 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81696- 81697+ 81698 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81699 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81700 eval "LIBPATH$unique=set" 81701- 81702+ 81703 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81704 LDFLAGS="$LDFLAGS -L$ai_p" 81705 PHP_RPATHS="$PHP_RPATHS $ai_p" 81706- 81707+ 81708 fi 81709 81710 81711- 81712+ 81713 fi 81714 81715 fi 81716- 81717- 81718+ 81719+ 81720 case prldap50 in 81721 c|c_r|pthread*) ;; 81722- *) 81723- LIBS="-lprldap50 $LIBS" 81724+ *) 81725+ LIBS="-lprldap50 $LIBS" 81726 ;; 81727 esac 81728 81729@@ -70586,94 +54000,94 @@ 81730 fi 81731 81732 81733- 81734+ 81735 81736 if test "$ext_shared" = "yes"; then 81737 LDAP_SHARED_LIBADD="-lssl3 $LDAP_SHARED_LIBADD" 81738 if test -n "$LDAP_LIBDIR"; then 81739- 81740+ 81741 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81742- 81743+ 81744 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81745 ai_p=$LDAP_LIBDIR 81746 else 81747- 81748+ 81749 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81750- 81751+ 81752 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81753 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81754 fi 81755 81756- 81757+ 81758 if test "$ext_shared" = "yes"; then 81759 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81760 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81761 else 81762- 81763- 81764- 81765+ 81766+ 81767+ 81768 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81769- 81770+ 81771 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81772 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81773 eval "LIBPATH$unique=set" 81774- 81775+ 81776 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81777 LDFLAGS="$LDFLAGS -L$ai_p" 81778 PHP_RPATHS="$PHP_RPATHS $ai_p" 81779- 81780+ 81781 fi 81782 81783 81784 fi 81785- 81786+ 81787 fi 81788 81789 fi 81790 else 81791- 81792+ 81793 81794 if test -n "$LDAP_LIBDIR"; then 81795- 81796+ 81797 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81798- 81799+ 81800 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81801 ai_p=$LDAP_LIBDIR 81802 else 81803- 81804+ 81805 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81806- 81807+ 81808 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81809 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81810 fi 81811 81812- 81813- 81814- 81815- 81816+ 81817+ 81818+ 81819+ 81820 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81821- 81822+ 81823 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81824 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81825 eval "LIBPATH$unique=set" 81826- 81827+ 81828 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81829 LDFLAGS="$LDFLAGS -L$ai_p" 81830 PHP_RPATHS="$PHP_RPATHS $ai_p" 81831- 81832+ 81833 fi 81834 81835 81836- 81837+ 81838 fi 81839 81840 fi 81841- 81842- 81843+ 81844+ 81845 case ssl3 in 81846 c|c_r|pthread*) ;; 81847- *) 81848- LIBS="-lssl3 $LIBS" 81849+ *) 81850+ LIBS="-lssl3 $LIBS" 81851 ;; 81852 esac 81853 81854@@ -70683,113 +54097,112 @@ 81855 fi 81856 81857 81858- 81859-cat >>confdefs.h <<\_ACEOF 81860+ cat >> confdefs.h <<\EOF 81861 #define HAVE_NSLDAP 1 81862-_ACEOF 81863+EOF 81864 81865 81866 elif test -f $LDAP_LIBDIR/libldapssl41.$SHLIB_SUFFIX_NAME; then 81867- if test -n "$LDAP_PTHREAD"; then 81868- 81869- 81870+ if test -n "$LDAP_PTHREAD"; then 81871+ 81872+ 81873 case $LDAP_PTHREAD in 81874 c|c_r|pthread*) ;; 81875- *) 81876- LIBS="-l$LDAP_PTHREAD $LIBS" 81877+ *) 81878+ LIBS="-l$LDAP_PTHREAD $LIBS" 81879 ;; 81880 esac 81881 81882 81883 fi 81884- 81885+ 81886 81887 if test "$ext_shared" = "yes"; then 81888 LDAP_SHARED_LIBADD="-lnspr3 $LDAP_SHARED_LIBADD" 81889 if test -n "$LDAP_LIBDIR"; then 81890- 81891+ 81892 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81893- 81894+ 81895 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81896 ai_p=$LDAP_LIBDIR 81897 else 81898- 81899+ 81900 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81901- 81902+ 81903 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81904 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81905 fi 81906 81907- 81908+ 81909 if test "$ext_shared" = "yes"; then 81910 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 81911 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 81912 else 81913- 81914- 81915- 81916+ 81917+ 81918+ 81919 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81920- 81921+ 81922 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81923 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81924 eval "LIBPATH$unique=set" 81925- 81926+ 81927 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81928 LDFLAGS="$LDFLAGS -L$ai_p" 81929 PHP_RPATHS="$PHP_RPATHS $ai_p" 81930- 81931+ 81932 fi 81933 81934 81935 fi 81936- 81937+ 81938 fi 81939 81940 fi 81941 else 81942- 81943+ 81944 81945 if test -n "$LDAP_LIBDIR"; then 81946- 81947+ 81948 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 81949- 81950+ 81951 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 81952 ai_p=$LDAP_LIBDIR 81953 else 81954- 81955+ 81956 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 81957- 81958+ 81959 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 81960 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 81961 fi 81962 81963- 81964- 81965- 81966- 81967+ 81968+ 81969+ 81970+ 81971 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 81972- 81973+ 81974 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 81975 if test -n "$unique" && test "`eval $cmd`" = "" ; then 81976 eval "LIBPATH$unique=set" 81977- 81978+ 81979 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 81980 LDFLAGS="$LDFLAGS -L$ai_p" 81981 PHP_RPATHS="$PHP_RPATHS $ai_p" 81982- 81983+ 81984 fi 81985 81986 81987- 81988+ 81989 fi 81990 81991 fi 81992- 81993- 81994+ 81995+ 81996 case nspr3 in 81997 c|c_r|pthread*) ;; 81998- *) 81999- LIBS="-lnspr3 $LIBS" 82000+ *) 82001+ LIBS="-lnspr3 $LIBS" 82002 ;; 82003 esac 82004 82005@@ -70799,94 +54212,94 @@ 82006 fi 82007 82008 82009- 82010+ 82011 82012 if test "$ext_shared" = "yes"; then 82013 LDAP_SHARED_LIBADD="-lplc3 $LDAP_SHARED_LIBADD" 82014 if test -n "$LDAP_LIBDIR"; then 82015- 82016+ 82017 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82018- 82019+ 82020 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82021 ai_p=$LDAP_LIBDIR 82022 else 82023- 82024+ 82025 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82026- 82027+ 82028 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82029 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82030 fi 82031 82032- 82033+ 82034 if test "$ext_shared" = "yes"; then 82035 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82036 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82037 else 82038- 82039- 82040- 82041+ 82042+ 82043+ 82044 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82045- 82046+ 82047 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82048 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82049 eval "LIBPATH$unique=set" 82050- 82051+ 82052 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82053 LDFLAGS="$LDFLAGS -L$ai_p" 82054 PHP_RPATHS="$PHP_RPATHS $ai_p" 82055- 82056+ 82057 fi 82058 82059 82060 fi 82061- 82062+ 82063 fi 82064 82065 fi 82066 else 82067- 82068+ 82069 82070 if test -n "$LDAP_LIBDIR"; then 82071- 82072+ 82073 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82074- 82075+ 82076 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82077 ai_p=$LDAP_LIBDIR 82078 else 82079- 82080+ 82081 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82082- 82083+ 82084 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82085 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82086 fi 82087 82088- 82089- 82090- 82091- 82092+ 82093+ 82094+ 82095+ 82096 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82097- 82098+ 82099 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82100 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82101 eval "LIBPATH$unique=set" 82102- 82103+ 82104 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82105 LDFLAGS="$LDFLAGS -L$ai_p" 82106 PHP_RPATHS="$PHP_RPATHS $ai_p" 82107- 82108+ 82109 fi 82110 82111 82112- 82113+ 82114 fi 82115 82116 fi 82117- 82118- 82119+ 82120+ 82121 case plc3 in 82122 c|c_r|pthread*) ;; 82123- *) 82124- LIBS="-lplc3 $LIBS" 82125+ *) 82126+ LIBS="-lplc3 $LIBS" 82127 ;; 82128 esac 82129 82130@@ -70896,94 +54309,94 @@ 82131 fi 82132 82133 82134- 82135+ 82136 82137 if test "$ext_shared" = "yes"; then 82138 LDAP_SHARED_LIBADD="-lplds3 $LDAP_SHARED_LIBADD" 82139 if test -n "$LDAP_LIBDIR"; then 82140- 82141+ 82142 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82143- 82144+ 82145 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82146 ai_p=$LDAP_LIBDIR 82147 else 82148- 82149+ 82150 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82151- 82152+ 82153 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82154 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82155 fi 82156 82157- 82158+ 82159 if test "$ext_shared" = "yes"; then 82160 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82161 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82162 else 82163- 82164- 82165- 82166+ 82167+ 82168+ 82169 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82170- 82171+ 82172 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82173 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82174 eval "LIBPATH$unique=set" 82175- 82176+ 82177 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82178 LDFLAGS="$LDFLAGS -L$ai_p" 82179 PHP_RPATHS="$PHP_RPATHS $ai_p" 82180- 82181+ 82182 fi 82183 82184 82185 fi 82186- 82187+ 82188 fi 82189 82190 fi 82191 else 82192- 82193+ 82194 82195 if test -n "$LDAP_LIBDIR"; then 82196- 82197+ 82198 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82199- 82200+ 82201 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82202 ai_p=$LDAP_LIBDIR 82203 else 82204- 82205+ 82206 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82207- 82208+ 82209 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82210 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82211 fi 82212 82213- 82214- 82215- 82216- 82217+ 82218+ 82219+ 82220+ 82221 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82222- 82223+ 82224 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82225 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82226 eval "LIBPATH$unique=set" 82227- 82228+ 82229 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82230 LDFLAGS="$LDFLAGS -L$ai_p" 82231 PHP_RPATHS="$PHP_RPATHS $ai_p" 82232- 82233+ 82234 fi 82235 82236 82237- 82238+ 82239 fi 82240 82241 fi 82242- 82243- 82244+ 82245+ 82246 case plds3 in 82247 c|c_r|pthread*) ;; 82248- *) 82249- LIBS="-lplds3 $LIBS" 82250+ *) 82251+ LIBS="-lplds3 $LIBS" 82252 ;; 82253 esac 82254 82255@@ -70993,94 +54406,94 @@ 82256 fi 82257 82258 82259- 82260+ 82261 82262 if test "$ext_shared" = "yes"; then 82263 LDAP_SHARED_LIBADD="-lldapssl41 $LDAP_SHARED_LIBADD" 82264 if test -n "$LDAP_LIBDIR"; then 82265- 82266+ 82267 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82268- 82269+ 82270 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82271 ai_p=$LDAP_LIBDIR 82272 else 82273- 82274+ 82275 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82276- 82277+ 82278 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82279 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82280 fi 82281 82282- 82283+ 82284 if test "$ext_shared" = "yes"; then 82285 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82286 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82287 else 82288- 82289- 82290- 82291+ 82292+ 82293+ 82294 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82295- 82296+ 82297 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82298 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82299 eval "LIBPATH$unique=set" 82300- 82301+ 82302 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82303 LDFLAGS="$LDFLAGS -L$ai_p" 82304 PHP_RPATHS="$PHP_RPATHS $ai_p" 82305- 82306+ 82307 fi 82308 82309 82310 fi 82311- 82312+ 82313 fi 82314 82315 fi 82316 else 82317- 82318+ 82319 82320 if test -n "$LDAP_LIBDIR"; then 82321- 82322+ 82323 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82324- 82325+ 82326 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82327 ai_p=$LDAP_LIBDIR 82328 else 82329- 82330+ 82331 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82332- 82333+ 82334 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82335 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82336 fi 82337 82338- 82339- 82340- 82341- 82342+ 82343+ 82344+ 82345+ 82346 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82347- 82348+ 82349 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82350 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82351 eval "LIBPATH$unique=set" 82352- 82353+ 82354 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82355 LDFLAGS="$LDFLAGS -L$ai_p" 82356 PHP_RPATHS="$PHP_RPATHS $ai_p" 82357- 82358+ 82359 fi 82360 82361 82362- 82363+ 82364 fi 82365 82366 fi 82367- 82368- 82369+ 82370+ 82371 case ldapssl41 in 82372 c|c_r|pthread*) ;; 82373- *) 82374- LIBS="-lldapssl41 $LIBS" 82375+ *) 82376+ LIBS="-lldapssl41 $LIBS" 82377 ;; 82378 esac 82379 82380@@ -71090,113 +54503,112 @@ 82381 fi 82382 82383 82384- 82385-cat >>confdefs.h <<\_ACEOF 82386+ cat >> confdefs.h <<\EOF 82387 #define HAVE_NSLDAP 1 82388-_ACEOF 82389+EOF 82390 82391 82392 elif test -f $LDAP_LIBDIR/libldapssl30.$SHLIB_SUFFIX_NAME; then 82393- if test -n "$LDAP_PTHREAD"; then 82394- 82395- 82396+ if test -n "$LDAP_PTHREAD"; then 82397+ 82398+ 82399 case $LDAP_PTHREAD in 82400 c|c_r|pthread*) ;; 82401- *) 82402- LIBS="-l$LDAP_PTHREAD $LIBS" 82403+ *) 82404+ LIBS="-l$LDAP_PTHREAD $LIBS" 82405 ;; 82406 esac 82407 82408 82409 fi 82410- 82411+ 82412 82413 if test "$ext_shared" = "yes"; then 82414 LDAP_SHARED_LIBADD="-lldapssl30 $LDAP_SHARED_LIBADD" 82415 if test -n "$LDAP_LIBDIR"; then 82416- 82417+ 82418 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82419- 82420+ 82421 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82422 ai_p=$LDAP_LIBDIR 82423 else 82424- 82425+ 82426 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82427- 82428+ 82429 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82430 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82431 fi 82432 82433- 82434+ 82435 if test "$ext_shared" = "yes"; then 82436 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82437 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82438 else 82439- 82440- 82441- 82442+ 82443+ 82444+ 82445 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82446- 82447+ 82448 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82449 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82450 eval "LIBPATH$unique=set" 82451- 82452+ 82453 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82454 LDFLAGS="$LDFLAGS -L$ai_p" 82455 PHP_RPATHS="$PHP_RPATHS $ai_p" 82456- 82457+ 82458 fi 82459 82460 82461 fi 82462- 82463+ 82464 fi 82465 82466 fi 82467 else 82468- 82469+ 82470 82471 if test -n "$LDAP_LIBDIR"; then 82472- 82473+ 82474 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82475- 82476+ 82477 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82478 ai_p=$LDAP_LIBDIR 82479 else 82480- 82481+ 82482 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82483- 82484+ 82485 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82486 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82487 fi 82488 82489- 82490- 82491- 82492- 82493+ 82494+ 82495+ 82496+ 82497 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82498- 82499+ 82500 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82501 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82502 eval "LIBPATH$unique=set" 82503- 82504+ 82505 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82506 LDFLAGS="$LDFLAGS -L$ai_p" 82507 PHP_RPATHS="$PHP_RPATHS $ai_p" 82508- 82509+ 82510 fi 82511 82512 82513- 82514+ 82515 fi 82516 82517 fi 82518- 82519- 82520+ 82521+ 82522 case ldapssl30 in 82523 c|c_r|pthread*) ;; 82524- *) 82525- LIBS="-lldapssl30 $LIBS" 82526+ *) 82527+ LIBS="-lldapssl30 $LIBS" 82528 ;; 82529 esac 82530 82531@@ -71206,113 +54618,112 @@ 82532 fi 82533 82534 82535- 82536-cat >>confdefs.h <<\_ACEOF 82537+ cat >> confdefs.h <<\EOF 82538 #define HAVE_NSLDAP 1 82539-_ACEOF 82540+EOF 82541 82542 82543 elif test -f $LDAP_LIBDIR/libldap30.$SHLIB_SUFFIX_NAME; then 82544- if test -n "$LDAP_PTHREAD"; then 82545- 82546- 82547+ if test -n "$LDAP_PTHREAD"; then 82548+ 82549+ 82550 case $LDAP_PTHREAD in 82551 c|c_r|pthread*) ;; 82552- *) 82553- LIBS="-l$LDAP_PTHREAD $LIBS" 82554+ *) 82555+ LIBS="-l$LDAP_PTHREAD $LIBS" 82556 ;; 82557 esac 82558 82559 82560 fi 82561- 82562+ 82563 82564 if test "$ext_shared" = "yes"; then 82565 LDAP_SHARED_LIBADD="-lldap30 $LDAP_SHARED_LIBADD" 82566 if test -n "$LDAP_LIBDIR"; then 82567- 82568+ 82569 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82570- 82571+ 82572 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82573 ai_p=$LDAP_LIBDIR 82574 else 82575- 82576+ 82577 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82578- 82579+ 82580 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82581 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82582 fi 82583 82584- 82585+ 82586 if test "$ext_shared" = "yes"; then 82587 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82588 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82589 else 82590- 82591- 82592- 82593+ 82594+ 82595+ 82596 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82597- 82598+ 82599 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82600 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82601 eval "LIBPATH$unique=set" 82602- 82603+ 82604 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82605 LDFLAGS="$LDFLAGS -L$ai_p" 82606 PHP_RPATHS="$PHP_RPATHS $ai_p" 82607- 82608+ 82609 fi 82610 82611 82612 fi 82613- 82614+ 82615 fi 82616 82617 fi 82618 else 82619- 82620+ 82621 82622 if test -n "$LDAP_LIBDIR"; then 82623- 82624+ 82625 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82626- 82627+ 82628 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82629 ai_p=$LDAP_LIBDIR 82630 else 82631- 82632+ 82633 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82634- 82635+ 82636 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82637 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82638 fi 82639 82640- 82641- 82642- 82643- 82644+ 82645+ 82646+ 82647+ 82648 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82649- 82650+ 82651 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82652 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82653 eval "LIBPATH$unique=set" 82654- 82655+ 82656 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82657 LDFLAGS="$LDFLAGS -L$ai_p" 82658 PHP_RPATHS="$PHP_RPATHS $ai_p" 82659- 82660+ 82661 fi 82662 82663 82664- 82665+ 82666 fi 82667 82668 fi 82669- 82670- 82671+ 82672+ 82673 case ldap30 in 82674 c|c_r|pthread*) ;; 82675- *) 82676- LIBS="-lldap30 $LIBS" 82677+ *) 82678+ LIBS="-lldap30 $LIBS" 82679 ;; 82680 esac 82681 82682@@ -71322,101 +54733,100 @@ 82683 fi 82684 82685 82686- 82687-cat >>confdefs.h <<\_ACEOF 82688+ cat >> confdefs.h <<\EOF 82689 #define HAVE_NSLDAP 1 82690-_ACEOF 82691+EOF 82692 82693 82694 elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME; then 82695- 82696+ 82697 82698 if test "$ext_shared" = "yes"; then 82699 LDAP_SHARED_LIBADD="-lumich_lber $LDAP_SHARED_LIBADD" 82700 if test -n "$LDAP_LIBDIR"; then 82701- 82702+ 82703 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82704- 82705+ 82706 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82707 ai_p=$LDAP_LIBDIR 82708 else 82709- 82710+ 82711 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82712- 82713+ 82714 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82715 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82716 fi 82717 82718- 82719+ 82720 if test "$ext_shared" = "yes"; then 82721 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82722 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82723 else 82724- 82725- 82726- 82727+ 82728+ 82729+ 82730 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82731- 82732+ 82733 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82734 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82735 eval "LIBPATH$unique=set" 82736- 82737+ 82738 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82739 LDFLAGS="$LDFLAGS -L$ai_p" 82740 PHP_RPATHS="$PHP_RPATHS $ai_p" 82741- 82742+ 82743 fi 82744 82745 82746 fi 82747- 82748+ 82749 fi 82750 82751 fi 82752 else 82753- 82754+ 82755 82756 if test -n "$LDAP_LIBDIR"; then 82757- 82758+ 82759 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82760- 82761+ 82762 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82763 ai_p=$LDAP_LIBDIR 82764 else 82765- 82766+ 82767 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82768- 82769+ 82770 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82771 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82772 fi 82773 82774- 82775- 82776- 82777- 82778+ 82779+ 82780+ 82781+ 82782 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82783- 82784+ 82785 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82786 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82787 eval "LIBPATH$unique=set" 82788- 82789+ 82790 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82791 LDFLAGS="$LDFLAGS -L$ai_p" 82792 PHP_RPATHS="$PHP_RPATHS $ai_p" 82793- 82794+ 82795 fi 82796 82797 82798- 82799+ 82800 fi 82801 82802 fi 82803- 82804- 82805+ 82806+ 82807 case umich_lber in 82808 c|c_r|pthread*) ;; 82809- *) 82810- LIBS="-lumich_lber $LIBS" 82811+ *) 82812+ LIBS="-lumich_lber $LIBS" 82813 ;; 82814 esac 82815 82816@@ -71426,94 +54836,94 @@ 82817 fi 82818 82819 82820- 82821+ 82822 82823 if test "$ext_shared" = "yes"; then 82824 LDAP_SHARED_LIBADD="-lumich_ldap $LDAP_SHARED_LIBADD" 82825 if test -n "$LDAP_LIBDIR"; then 82826- 82827+ 82828 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82829- 82830+ 82831 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82832 ai_p=$LDAP_LIBDIR 82833 else 82834- 82835+ 82836 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82837- 82838+ 82839 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82840 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82841 fi 82842 82843- 82844+ 82845 if test "$ext_shared" = "yes"; then 82846 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82847 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82848 else 82849- 82850- 82851- 82852+ 82853+ 82854+ 82855 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82856- 82857+ 82858 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82859 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82860 eval "LIBPATH$unique=set" 82861- 82862+ 82863 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82864 LDFLAGS="$LDFLAGS -L$ai_p" 82865 PHP_RPATHS="$PHP_RPATHS $ai_p" 82866- 82867+ 82868 fi 82869 82870 82871 fi 82872- 82873+ 82874 fi 82875 82876 fi 82877 else 82878- 82879+ 82880 82881 if test -n "$LDAP_LIBDIR"; then 82882- 82883+ 82884 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82885- 82886+ 82887 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82888 ai_p=$LDAP_LIBDIR 82889 else 82890- 82891+ 82892 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82893- 82894+ 82895 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82896 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82897 fi 82898 82899- 82900- 82901- 82902- 82903+ 82904+ 82905+ 82906+ 82907 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82908- 82909+ 82910 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82911 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82912 eval "LIBPATH$unique=set" 82913- 82914+ 82915 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82916 LDFLAGS="$LDFLAGS -L$ai_p" 82917 PHP_RPATHS="$PHP_RPATHS $ai_p" 82918- 82919+ 82920 fi 82921 82922 82923- 82924+ 82925 fi 82926 82927 fi 82928- 82929- 82930+ 82931+ 82932 case umich_ldap in 82933 c|c_r|pthread*) ;; 82934- *) 82935- LIBS="-lumich_ldap $LIBS" 82936+ *) 82937+ LIBS="-lumich_ldap $LIBS" 82938 ;; 82939 esac 82940 82941@@ -71525,94 +54935,94 @@ 82942 82943 82944 elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME; then 82945- 82946+ 82947 82948 if test "$ext_shared" = "yes"; then 82949 LDAP_SHARED_LIBADD="-lclntsh $LDAP_SHARED_LIBADD" 82950 if test -n "$LDAP_LIBDIR"; then 82951- 82952+ 82953 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 82954- 82955+ 82956 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 82957 ai_p=$LDAP_LIBDIR 82958 else 82959- 82960+ 82961 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 82962- 82963+ 82964 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 82965 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 82966 fi 82967 82968- 82969+ 82970 if test "$ext_shared" = "yes"; then 82971 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 82972 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 82973 else 82974- 82975- 82976- 82977+ 82978+ 82979+ 82980 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 82981- 82982+ 82983 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 82984 if test -n "$unique" && test "`eval $cmd`" = "" ; then 82985 eval "LIBPATH$unique=set" 82986- 82987+ 82988 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 82989 LDFLAGS="$LDFLAGS -L$ai_p" 82990 PHP_RPATHS="$PHP_RPATHS $ai_p" 82991- 82992+ 82993 fi 82994 82995 82996 fi 82997- 82998+ 82999 fi 83000 83001 fi 83002 else 83003- 83004+ 83005 83006 if test -n "$LDAP_LIBDIR"; then 83007- 83008+ 83009 if test "$LDAP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_LIBDIR" != "/usr/lib"; then 83010- 83011+ 83012 if test -z "$LDAP_LIBDIR" || echo "$LDAP_LIBDIR" | grep '^/' >/dev/null ; then 83013 ai_p=$LDAP_LIBDIR 83014 else 83015- 83016+ 83017 ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 83018- 83019+ 83020 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83021 ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`" 83022 fi 83023 83024- 83025- 83026- 83027- 83028+ 83029+ 83030+ 83031+ 83032 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83033- 83034+ 83035 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 83036 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83037 eval "LIBPATH$unique=set" 83038- 83039+ 83040 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 83041 LDFLAGS="$LDFLAGS -L$ai_p" 83042 PHP_RPATHS="$PHP_RPATHS $ai_p" 83043- 83044+ 83045 fi 83046 83047 83048- 83049+ 83050 fi 83051 83052 fi 83053- 83054- 83055+ 83056+ 83057 case clntsh in 83058 c|c_r|pthread*) ;; 83059- *) 83060- LIBS="-lclntsh $LIBS" 83061+ *) 83062+ LIBS="-lclntsh $LIBS" 83063 ;; 83064 esac 83065 83066@@ -71622,237 +55032,155 @@ 83067 fi 83068 83069 83070- 83071-cat >>confdefs.h <<\_ACEOF 83072+ cat >> confdefs.h <<\EOF 83073 #define HAVE_ORALDAP 1 83074-_ACEOF 83075+EOF 83076 83077 if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then 83078- 83079-cat >>confdefs.h <<\_ACEOF 83080+ cat >> confdefs.h <<\EOF 83081 #define HAVE_ORALDAP_10 1 83082-_ACEOF 83083+EOF 83084 83085 fi 83086 else 83087- { { echo "$as_me:$LINENO: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&5 83088-echo "$as_me: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&2;} 83089- { (exit 1); exit 1; }; } 83090+ { echo "configure: error: Cannot find ldap libraries in $LDAP_LIBDIR." 1>&2; exit 1; } 83091 fi 83092 83093- 83094+ 83095 if test "$LDAP_INCDIR" != "/usr/include"; then 83096- 83097+ 83098 if test -z "$LDAP_INCDIR" || echo "$LDAP_INCDIR" | grep '^/' >/dev/null ; then 83099 ai_p=$LDAP_INCDIR 83100 else 83101- 83102+ 83103 ep_dir="`echo $LDAP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 83104- 83105+ 83106 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83107 ai_p="$ep_realdir/`basename \"$LDAP_INCDIR\"`" 83108 fi 83109 83110- 83111- 83112+ 83113+ 83114 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83115- 83116+ 83117 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 83118 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83119 eval "INCLUDEPATH$unique=set" 83120- 83121+ 83122 if test ""; then 83123 INCLUDES="-I$ai_p $INCLUDES" 83124 else 83125 INCLUDES="$INCLUDES -I$ai_p" 83126 fi 83127- 83128+ 83129 fi 83130 83131 fi 83132 83133- 83134+ 83135 PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD" 83136 83137- 83138-cat >>confdefs.h <<\_ACEOF 83139+ cat >> confdefs.h <<\EOF 83140 #define HAVE_LDAP 1 83141-_ACEOF 83142- 83143+EOF 83144 83145+ 83146 _SAVE_CPPFLAGS=$CPPFLAGS 83147 _SAVE_LIBS=$LIBS 83148 CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" 83149 LIBS="$LIBS $LDAP_SHARED_LIBADD" 83150 83151- echo "$as_me:$LINENO: checking for 3 arg ldap_set_rebind_proc" >&5 83152-echo $ECHO_N "checking for 3 arg ldap_set_rebind_proc... $ECHO_C" >&6 83153-if test "${ac_cv_3arg_setrebindproc+set}" = set; then 83154- echo $ECHO_N "(cached) $ECHO_C" >&6 83155-else 83156- cat >conftest.$ac_ext <<_ACEOF 83157-/* confdefs.h. */ 83158-_ACEOF 83159-cat confdefs.h >>conftest.$ac_ext 83160-cat >>conftest.$ac_ext <<_ACEOF 83161-/* end confdefs.h. */ 83162+ echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 83163+echo "configure:55095: checking for 3 arg ldap_set_rebind_proc" >&5 83164+if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then 83165+ echo $ac_n "(cached) $ac_c" 1>&6 83166+else 83167+ cat > conftest.$ac_ext <<EOF 83168+#line 55100 "configure" 83169+#include "confdefs.h" 83170 #include <ldap.h> 83171-int 83172-main () 83173-{ 83174+int main() { 83175 ldap_set_rebind_proc(0,0,0) 83176- ; 83177- return 0; 83178-} 83179-_ACEOF 83180-rm -f conftest.$ac_objext 83181-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 83182- (eval $ac_compile) 2>conftest.er1 83183- ac_status=$? 83184- grep -v '^ *+' conftest.er1 >conftest.err 83185- rm -f conftest.er1 83186- cat conftest.err >&5 83187- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83188- (exit $ac_status); } && 83189- { ac_try='test -z "$ac_c_werror_flag" 83190- || test ! -s conftest.err' 83191- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83192- (eval $ac_try) 2>&5 83193- ac_status=$? 83194- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83195- (exit $ac_status); }; } && 83196- { ac_try='test -s conftest.$ac_objext' 83197- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83198- (eval $ac_try) 2>&5 83199- ac_status=$? 83200- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83201- (exit $ac_status); }; }; then 83202+; return 0; } 83203+EOF 83204+if { (eval echo configure:55107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 83205+ rm -rf conftest* 83206 ac_cv_3arg_setrebindproc=yes 83207 else 83208- echo "$as_me: failed program was:" >&5 83209-sed 's/^/| /' conftest.$ac_ext >&5 83210- 83211-ac_cv_3arg_setrebindproc=no 83212+ echo "configure: failed program was:" >&5 83213+ cat conftest.$ac_ext >&5 83214+ rm -rf conftest* 83215+ ac_cv_3arg_setrebindproc=no 83216 fi 83217-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 83218+rm -f conftest* 83219 fi 83220-echo "$as_me:$LINENO: result: $ac_cv_3arg_setrebindproc" >&5 83221-echo "${ECHO_T}$ac_cv_3arg_setrebindproc" >&6 83222- if test "$ac_cv_3arg_setrebindproc" = yes; then 83223 83224-cat >>confdefs.h <<\_ACEOF 83225+echo "$ac_t""$ac_cv_3arg_setrebindproc" 1>&6 83226+ if test "$ac_cv_3arg_setrebindproc" = yes; then 83227+ cat >> confdefs.h <<\EOF 83228 #define HAVE_3ARG_SETREBINDPROC 1 83229-_ACEOF 83230+EOF 83231 83232 fi 83233 83234- 83235- 83236- 83237-for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s 83238+ for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s 83239 do 83240-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 83241-echo "$as_me:$LINENO: checking for $ac_func" >&5 83242-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 83243-if eval "test \"\${$as_ac_var+set}\" = set"; then 83244- echo $ECHO_N "(cached) $ECHO_C" >&6 83245-else 83246- cat >conftest.$ac_ext <<_ACEOF 83247-/* confdefs.h. */ 83248-_ACEOF 83249-cat confdefs.h >>conftest.$ac_ext 83250-cat >>conftest.$ac_ext <<_ACEOF 83251-/* end confdefs.h. */ 83252-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 83253- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 83254-#define $ac_func innocuous_$ac_func 83255- 83256+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 83257+echo "configure:55130: checking for $ac_func" >&5 83258+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 83259+ echo $ac_n "(cached) $ac_c" 1>&6 83260+else 83261+ cat > conftest.$ac_ext <<EOF 83262+#line 55135 "configure" 83263+#include "confdefs.h" 83264 /* System header to define __stub macros and hopefully few prototypes, 83265- which can conflict with char $ac_func (); below. 83266- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 83267- <limits.h> exists even on freestanding compilers. */ 83268- 83269-#ifdef __STDC__ 83270-# include <limits.h> 83271-#else 83272-# include <assert.h> 83273-#endif 83274- 83275-#undef $ac_func 83276- 83277+ which can conflict with char $ac_func(); below. */ 83278+#include <assert.h> 83279 /* Override any gcc2 internal prototype to avoid an error. */ 83280-#ifdef __cplusplus 83281-extern "C" 83282-{ 83283-#endif 83284 /* We use char because int might match the return type of a gcc2 83285- builtin and then its argument prototype would still apply. */ 83286-char $ac_func (); 83287+ builtin and then its argument prototype would still apply. */ 83288+char $ac_func(); 83289+ 83290+int main() { 83291+ 83292 /* The GNU C library defines this for functions which it implements 83293 to always fail with ENOSYS. Some functions are actually named 83294 something starting with __ and the normal name is an alias. */ 83295 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 83296 choke me 83297 #else 83298-char (*f) () = $ac_func; 83299-#endif 83300-#ifdef __cplusplus 83301-} 83302+$ac_func(); 83303 #endif 83304 83305-int 83306-main () 83307-{ 83308-return f != $ac_func; 83309- ; 83310- return 0; 83311-} 83312-_ACEOF 83313-rm -f conftest.$ac_objext conftest$ac_exeext 83314-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 83315- (eval $ac_link) 2>conftest.er1 83316- ac_status=$? 83317- grep -v '^ *+' conftest.er1 >conftest.err 83318- rm -f conftest.er1 83319- cat conftest.err >&5 83320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83321- (exit $ac_status); } && 83322- { ac_try='test -z "$ac_c_werror_flag" 83323- || test ! -s conftest.err' 83324- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83325- (eval $ac_try) 2>&5 83326- ac_status=$? 83327- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83328- (exit $ac_status); }; } && 83329- { ac_try='test -s conftest$ac_exeext' 83330- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83331- (eval $ac_try) 2>&5 83332- ac_status=$? 83333- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83334- (exit $ac_status); }; }; then 83335- eval "$as_ac_var=yes" 83336-else 83337- echo "$as_me: failed program was:" >&5 83338-sed 's/^/| /' conftest.$ac_ext >&5 83339- 83340-eval "$as_ac_var=no" 83341-fi 83342-rm -f conftest.err conftest.$ac_objext \ 83343- conftest$ac_exeext conftest.$ac_ext 83344-fi 83345-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 83346-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 83347-if test `eval echo '${'$as_ac_var'}'` = yes; then 83348- cat >>confdefs.h <<_ACEOF 83349-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 83350-_ACEOF 83351+; return 0; } 83352+EOF 83353+if { (eval echo configure:55158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 83354+ rm -rf conftest* 83355+ eval "ac_cv_func_$ac_func=yes" 83356+else 83357+ echo "configure: failed program was:" >&5 83358+ cat conftest.$ac_ext >&5 83359+ rm -rf conftest* 83360+ eval "ac_cv_func_$ac_func=no" 83361+fi 83362+rm -f conftest* 83363+fi 83364 83365+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 83366+ echo "$ac_t""yes" 1>&6 83367+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 83368+ cat >> confdefs.h <<EOF 83369+#define $ac_tr_func 1 83370+EOF 83371+ 83372+else 83373+ echo "$ac_t""no" 1>&6 83374 fi 83375 done 83376 83377- 83378+ 83379 if test "$PHP_LDAP_SASL" != "no"; then 83380- 83381+ 83382 if test "$PHP_LDAP_SASL" = "yes"; then 83383 SEARCH_DIRS="/usr/local /usr" 83384 else 83385@@ -71862,30 +55190,26 @@ 83386 for i in $SEARCH_DIRS; do 83387 if test -f $i/include/sasl/sasl.h; then 83388 LDAP_SASL_DIR=$i 83389- 83390-cat >>confdefs.h <<\_ACEOF 83391+ cat >> confdefs.h <<\EOF 83392 #define HAVE_LDAP_SASL_SASL_H 1 83393-_ACEOF 83394+EOF 83395 83396 break 83397 elif test -f $i/include/sasl.h; then 83398 LDAP_SASL_DIR=$i 83399- 83400-cat >>confdefs.h <<\_ACEOF 83401+ cat >> confdefs.h <<\EOF 83402 #define HAVE_LDAP_SASL_H 1 83403-_ACEOF 83404+EOF 83405 83406 break 83407 fi 83408 done 83409- 83410+ 83411 if test "$LDAP_SASL_DIR"; then 83412 LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include 83413 LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR 83414 else 83415- { { echo "$as_me:$LINENO: error: sasl.h not found!" >&5 83416-echo "$as_me: error: sasl.h not found!" >&2;} 83417- { (exit 1); exit 1; }; } 83418+ { echo "configure: error: sasl.h not found!" 1>&2; exit 1; } 83419 fi 83420 83421 if test "$PHP_LDAP_SASL" = "yes"; then 83422@@ -71893,26 +55217,26 @@ 83423 else 83424 SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2" 83425 fi 83426- 83427- 83428+ 83429+ 83430 save_old_LDFLAGS=$LDFLAGS 83431 ac_stuff=" 83432 $LDAP_SHARED_LIBADD $SASL_LIB 83433 " 83434- 83435+ 83436 save_ext_shared=$ext_shared 83437 ext_shared=yes 83438- 83439+ 83440 for ac_i in $ac_stuff; do 83441 case $ac_i in 83442 -pthread) 83443 if test "$ext_shared" = "yes"; then 83444 LDFLAGS="$LDFLAGS -pthread" 83445 else 83446- 83447- 83448+ 83449+ 83450 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 83451- 83452+ 83453 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 83454 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83455 eval "EXTRA_LDFLAGS$unique=set" 83456@@ -71923,20 +55247,20 @@ 83457 ;; 83458 -l*) 83459 ac_ii=`echo $ac_i|cut -c 3-` 83460- 83461- 83462+ 83463+ 83464 case $ac_ii in 83465 c|c_r|pthread*) ;; 83466- *) 83467+ *) 83468 if test "$ext_shared" = "yes"; then 83469- LDFLAGS="$LDFLAGS -l$ac_ii" 83470+ LDFLAGS="$LDFLAGS -l$ac_ii" 83471 else 83472- 83473- 83474+ 83475+ 83476 case $ac_ii in 83477 c|c_r|pthread*) ;; 83478- *) 83479- LIBS="$LIBS -l$ac_ii" 83480+ *) 83481+ LIBS="$LIBS -l$ac_ii" 83482 ;; 83483 esac 83484 83485@@ -71949,236 +55273,206 @@ 83486 ;; 83487 -L*) 83488 ac_ii=`echo $ac_i|cut -c 3-` 83489- 83490+ 83491 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 83492- 83493+ 83494 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 83495 ai_p=$ac_ii 83496 else 83497- 83498+ 83499 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 83500- 83501+ 83502 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83503 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 83504 fi 83505 83506- 83507+ 83508 if test "$ext_shared" = "yes"; then 83509 LDFLAGS="-L$ai_p $LDFLAGS" 83510 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 83511 else 83512- 83513- 83514- 83515+ 83516+ 83517+ 83518 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83519- 83520+ 83521 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 83522 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83523 eval "LIBPATH$unique=set" 83524- 83525+ 83526 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 83527 LDFLAGS="$LDFLAGS -L$ai_p" 83528 PHP_RPATHS="$PHP_RPATHS $ai_p" 83529- 83530+ 83531 fi 83532 83533 83534 fi 83535- 83536+ 83537 fi 83538 83539 ;; 83540 esac 83541 done 83542 83543- echo "$as_me:$LINENO: checking for sasl_version in -lsasl2" >&5 83544-echo $ECHO_N "checking for sasl_version in -lsasl2... $ECHO_C" >&6 83545-if test "${ac_cv_lib_sasl2_sasl_version+set}" = set; then 83546- echo $ECHO_N "(cached) $ECHO_C" >&6 83547+ echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6 83548+echo "configure:55320: checking for sasl_version in -lsasl2" >&5 83549+ac_lib_var=`echo sasl2'_'sasl_version | sed 'y%./+-%__p_%'` 83550+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 83551+ echo $ac_n "(cached) $ac_c" 1>&6 83552 else 83553- ac_check_lib_save_LIBS=$LIBS 83554+ ac_save_LIBS="$LIBS" 83555 LIBS="-lsasl2 $LIBS" 83556-cat >conftest.$ac_ext <<_ACEOF 83557-/* confdefs.h. */ 83558-_ACEOF 83559-cat confdefs.h >>conftest.$ac_ext 83560-cat >>conftest.$ac_ext <<_ACEOF 83561-/* end confdefs.h. */ 83562- 83563+cat > conftest.$ac_ext <<EOF 83564+#line 55328 "configure" 83565+#include "confdefs.h" 83566 /* Override any gcc2 internal prototype to avoid an error. */ 83567-#ifdef __cplusplus 83568-extern "C" 83569-#endif 83570 /* We use char because int might match the return type of a gcc2 83571- builtin and then its argument prototype would still apply. */ 83572-char sasl_version (); 83573-int 83574-main () 83575-{ 83576-sasl_version (); 83577- ; 83578- return 0; 83579-} 83580-_ACEOF 83581-rm -f conftest.$ac_objext conftest$ac_exeext 83582-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 83583- (eval $ac_link) 2>conftest.er1 83584- ac_status=$? 83585- grep -v '^ *+' conftest.er1 >conftest.err 83586- rm -f conftest.er1 83587- cat conftest.err >&5 83588- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83589- (exit $ac_status); } && 83590- { ac_try='test -z "$ac_c_werror_flag" 83591- || test ! -s conftest.err' 83592- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83593- (eval $ac_try) 2>&5 83594- ac_status=$? 83595- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83596- (exit $ac_status); }; } && 83597- { ac_try='test -s conftest$ac_exeext' 83598- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83599- (eval $ac_try) 2>&5 83600- ac_status=$? 83601- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83602- (exit $ac_status); }; }; then 83603- ac_cv_lib_sasl2_sasl_version=yes 83604-else 83605- echo "$as_me: failed program was:" >&5 83606-sed 's/^/| /' conftest.$ac_ext >&5 83607- 83608-ac_cv_lib_sasl2_sasl_version=no 83609-fi 83610-rm -f conftest.err conftest.$ac_objext \ 83611- conftest$ac_exeext conftest.$ac_ext 83612-LIBS=$ac_check_lib_save_LIBS 83613-fi 83614-echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_version" >&5 83615-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_version" >&6 83616-if test $ac_cv_lib_sasl2_sasl_version = yes; then 83617+ builtin and then its argument prototype would still apply. */ 83618+char sasl_version(); 83619+ 83620+int main() { 83621+sasl_version() 83622+; return 0; } 83623+EOF 83624+if { (eval echo configure:55339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 83625+ rm -rf conftest* 83626+ eval "ac_cv_lib_$ac_lib_var=yes" 83627+else 83628+ echo "configure: failed program was:" >&5 83629+ cat conftest.$ac_ext >&5 83630+ rm -rf conftest* 83631+ eval "ac_cv_lib_$ac_lib_var=no" 83632+fi 83633+rm -f conftest* 83634+LIBS="$ac_save_LIBS" 83635 83636+fi 83637+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 83638+ echo "$ac_t""yes" 1>&6 83639+ 83640 LDFLAGS=$save_old_LDFLAGS 83641 ext_shared=$save_ext_shared 83642- 83643- 83644+ 83645+ 83646 if test "$LDAP_SASL_INCDIR" != "/usr/include"; then 83647- 83648+ 83649 if test -z "$LDAP_SASL_INCDIR" || echo "$LDAP_SASL_INCDIR" | grep '^/' >/dev/null ; then 83650 ai_p=$LDAP_SASL_INCDIR 83651 else 83652- 83653+ 83654 ep_dir="`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 83655- 83656+ 83657 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83658 ai_p="$ep_realdir/`basename \"$LDAP_SASL_INCDIR\"`" 83659 fi 83660 83661- 83662- 83663+ 83664+ 83665 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83666- 83667+ 83668 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 83669 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83670 eval "INCLUDEPATH$unique=set" 83671- 83672+ 83673 if test ""; then 83674 INCLUDES="-I$ai_p $INCLUDES" 83675 else 83676 INCLUDES="$INCLUDES -I$ai_p" 83677 fi 83678- 83679+ 83680 fi 83681 83682 fi 83683 83684- 83685+ 83686 83687 if test "$ext_shared" = "yes"; then 83688 LDAP_SHARED_LIBADD="-lsasl2 $LDAP_SHARED_LIBADD" 83689 if test -n "$LDAP_SASL_LIBDIR"; then 83690- 83691+ 83692 if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then 83693- 83694+ 83695 if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then 83696 ai_p=$LDAP_SASL_LIBDIR 83697 else 83698- 83699+ 83700 ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 83701- 83702+ 83703 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83704 ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`" 83705 fi 83706 83707- 83708+ 83709 if test "$ext_shared" = "yes"; then 83710 LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD" 83711 test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD" 83712 else 83713- 83714- 83715- 83716+ 83717+ 83718+ 83719 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83720- 83721+ 83722 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 83723 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83724 eval "LIBPATH$unique=set" 83725- 83726+ 83727 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 83728 LDFLAGS="$LDFLAGS -L$ai_p" 83729 PHP_RPATHS="$PHP_RPATHS $ai_p" 83730- 83731+ 83732 fi 83733 83734 83735 fi 83736- 83737+ 83738 fi 83739 83740 fi 83741 else 83742- 83743+ 83744 83745 if test -n "$LDAP_SASL_LIBDIR"; then 83746- 83747+ 83748 if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then 83749- 83750+ 83751 if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then 83752 ai_p=$LDAP_SASL_LIBDIR 83753 else 83754- 83755+ 83756 ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 83757- 83758+ 83759 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 83760 ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`" 83761 fi 83762 83763- 83764- 83765- 83766- 83767+ 83768+ 83769+ 83770+ 83771 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 83772- 83773+ 83774 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 83775 if test -n "$unique" && test "`eval $cmd`" = "" ; then 83776 eval "LIBPATH$unique=set" 83777- 83778+ 83779 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 83780 LDFLAGS="$LDFLAGS -L$ai_p" 83781 PHP_RPATHS="$PHP_RPATHS $ai_p" 83782- 83783+ 83784 fi 83785 83786 83787- 83788+ 83789 fi 83790 83791 fi 83792- 83793- 83794+ 83795+ 83796 case sasl2 in 83797 c|c_r|pthread*) ;; 83798- *) 83799- LIBS="-lsasl2 $LIBS" 83800+ *) 83801+ LIBS="-lsasl2 $LIBS" 83802 ;; 83803 esac 83804 83805@@ -72188,133 +55482,82 @@ 83806 fi 83807 83808 83809- 83810-cat >>confdefs.h <<\_ACEOF 83811+ cat >> confdefs.h <<\EOF 83812 #define HAVE_LDAP_SASL 1 83813-_ACEOF 83814- 83815- 83816+EOF 83817 83818+ 83819+ 83820 else 83821+ echo "$ac_t""no" 1>&6 83822 83823 LDFLAGS=$save_old_LDFLAGS 83824 ext_shared=$save_ext_shared 83825 unset ac_cv_lib_sasl2_sasl_version 83826- 83827- { { echo "$as_me:$LINENO: error: LDAP SASL check failed. Please check config.log for more information." >&5 83828-echo "$as_me: error: LDAP SASL check failed. Please check config.log for more information." >&2;} 83829- { (exit 1); exit 1; }; } 83830- 83831- 83832+ 83833+ { echo "configure: error: LDAP SASL check failed. Please check config.log for more information." 1>&2; exit 1; } 83834+ 83835+ 83836 fi 83837 83838 83839 fi 83840 83841- echo "$as_me:$LINENO: checking for ldap_bind_s" >&5 83842-echo $ECHO_N "checking for ldap_bind_s... $ECHO_C" >&6 83843-if test "${ac_cv_func_ldap_bind_s+set}" = set; then 83844- echo $ECHO_N "(cached) $ECHO_C" >&6 83845+ echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 83846+echo "configure:55508: checking for ldap_bind_s" >&5 83847+if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then 83848+ echo $ac_n "(cached) $ac_c" 1>&6 83849 else 83850- cat >conftest.$ac_ext <<_ACEOF 83851-/* confdefs.h. */ 83852-_ACEOF 83853-cat confdefs.h >>conftest.$ac_ext 83854-cat >>conftest.$ac_ext <<_ACEOF 83855-/* end confdefs.h. */ 83856-/* Define ldap_bind_s to an innocuous variant, in case <limits.h> declares ldap_bind_s. 83857- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 83858-#define ldap_bind_s innocuous_ldap_bind_s 83859- 83860+ cat > conftest.$ac_ext <<EOF 83861+#line 55513 "configure" 83862+#include "confdefs.h" 83863 /* System header to define __stub macros and hopefully few prototypes, 83864- which can conflict with char ldap_bind_s (); below. 83865- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 83866- <limits.h> exists even on freestanding compilers. */ 83867- 83868-#ifdef __STDC__ 83869-# include <limits.h> 83870-#else 83871-# include <assert.h> 83872-#endif 83873- 83874-#undef ldap_bind_s 83875- 83876+ which can conflict with char ldap_bind_s(); below. */ 83877+#include <assert.h> 83878 /* Override any gcc2 internal prototype to avoid an error. */ 83879-#ifdef __cplusplus 83880-extern "C" 83881-{ 83882-#endif 83883 /* We use char because int might match the return type of a gcc2 83884- builtin and then its argument prototype would still apply. */ 83885-char ldap_bind_s (); 83886+ builtin and then its argument prototype would still apply. */ 83887+char ldap_bind_s(); 83888+ 83889+int main() { 83890+ 83891 /* The GNU C library defines this for functions which it implements 83892 to always fail with ENOSYS. Some functions are actually named 83893 something starting with __ and the normal name is an alias. */ 83894 #if defined (__stub_ldap_bind_s) || defined (__stub___ldap_bind_s) 83895 choke me 83896 #else 83897-char (*f) () = ldap_bind_s; 83898-#endif 83899-#ifdef __cplusplus 83900-} 83901+ldap_bind_s(); 83902 #endif 83903 83904-int 83905-main () 83906-{ 83907-return f != ldap_bind_s; 83908- ; 83909- return 0; 83910-} 83911-_ACEOF 83912-rm -f conftest.$ac_objext conftest$ac_exeext 83913-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 83914- (eval $ac_link) 2>conftest.er1 83915- ac_status=$? 83916- grep -v '^ *+' conftest.er1 >conftest.err 83917- rm -f conftest.er1 83918- cat conftest.err >&5 83919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83920- (exit $ac_status); } && 83921- { ac_try='test -z "$ac_c_werror_flag" 83922- || test ! -s conftest.err' 83923- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83924- (eval $ac_try) 2>&5 83925- ac_status=$? 83926- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83927- (exit $ac_status); }; } && 83928- { ac_try='test -s conftest$ac_exeext' 83929- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 83930- (eval $ac_try) 2>&5 83931- ac_status=$? 83932- echo "$as_me:$LINENO: \$? = $ac_status" >&5 83933- (exit $ac_status); }; }; then 83934- ac_cv_func_ldap_bind_s=yes 83935-else 83936- echo "$as_me: failed program was:" >&5 83937-sed 's/^/| /' conftest.$ac_ext >&5 83938- 83939-ac_cv_func_ldap_bind_s=no 83940-fi 83941-rm -f conftest.err conftest.$ac_objext \ 83942- conftest$ac_exeext conftest.$ac_ext 83943-fi 83944-echo "$as_me:$LINENO: result: $ac_cv_func_ldap_bind_s" >&5 83945-echo "${ECHO_T}$ac_cv_func_ldap_bind_s" >&6 83946-if test $ac_cv_func_ldap_bind_s = yes; then 83947- : 83948+; return 0; } 83949+EOF 83950+if { (eval echo configure:55536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 83951+ rm -rf conftest* 83952+ eval "ac_cv_func_ldap_bind_s=yes" 83953 else 83954+ echo "configure: failed program was:" >&5 83955+ cat conftest.$ac_ext >&5 83956+ rm -rf conftest* 83957+ eval "ac_cv_func_ldap_bind_s=no" 83958+fi 83959+rm -f conftest* 83960+fi 83961 83962- { { echo "$as_me:$LINENO: error: LDAP build check failed. Please check config.log for more information." >&5 83963-echo "$as_me: error: LDAP build check failed. Please check config.log for more information." >&2;} 83964- { (exit 1); exit 1; }; } 83965+if eval "test \"`echo '$ac_cv_func_'ldap_bind_s`\" = yes"; then 83966+ echo "$ac_t""yes" 1>&6 83967+ : 83968+else 83969+ echo "$ac_t""no" 1>&6 83970 83971+ { echo "configure: error: LDAP build check failed. Please check config.log for more information." 1>&2; exit 1; } 83972+ 83973 fi 83974 83975- 83976+ 83977 CPPFLAGS=$_SAVE_CPPFLAGS 83978 LIBS=$_SAVE_LIBS 83979-fi 83980+fi 83981 83982 83983 83984@@ -72341,18 +55584,19 @@ 83985 83986 php_enable_mbstring=no 83987 83988-echo "$as_me:$LINENO: checking whether to enable multibyte string support" >&5 83989-echo $ECHO_N "checking whether to enable multibyte string support... $ECHO_C" >&6 83990+echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 83991+echo "configure:55589: checking whether to enable multibyte string support" >&5 83992 # Check whether --enable-mbstring or --disable-mbstring was given. 83993 if test "${enable_mbstring+set}" = set; then 83994 enableval="$enable_mbstring" 83995 PHP_MBSTRING=$enableval 83996 else 83997- 83998+ 83999 PHP_MBSTRING=no 84000 test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL 84001 84002-fi; 84003+fi 84004+ 84005 84006 84007 ext_output="yes, shared" 84008@@ -72376,8 +55620,7 @@ 84009 84010 84011 84012-echo "$as_me:$LINENO: result: $ext_output" >&5 84013-echo "${ECHO_T}$ext_output" >&6 84014+echo "$ac_t""$ext_output" 1>&6 84015 84016 84017 84018@@ -72385,22 +55628,22 @@ 84019 84020 php_enable_mbregex=yes 84021 84022-echo "$as_me:$LINENO: checking whether to enable multibyte regex support" >&5 84023-echo $ECHO_N "checking whether to enable multibyte regex support... $ECHO_C" >&6 84024+echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 84025+echo "configure:55633: checking whether to enable multibyte regex support" >&5 84026 # Check whether --enable-mbregex or --disable-mbregex was given. 84027 if test "${enable_mbregex+set}" = set; then 84028 enableval="$enable_mbregex" 84029 PHP_MBREGEX=$enableval 84030 else 84031- 84032+ 84033 PHP_MBREGEX=yes 84034+ 84035 84036+fi 84037 84038-fi; 84039 84040 ext_output=$PHP_MBREGEX 84041-echo "$as_me:$LINENO: result: $ext_output" >&5 84042-echo "${ECHO_T}$ext_output" >&6 84043+echo "$ac_t""$ext_output" 1>&6 84044 84045 84046 84047@@ -72408,22 +55651,22 @@ 84048 84049 php_enable_mbregex_backtrack=yes 84050 84051-echo "$as_me:$LINENO: checking whether to check multibyte regex backtrack" >&5 84052-echo $ECHO_N "checking whether to check multibyte regex backtrack... $ECHO_C" >&6 84053+echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 84054+echo "configure:55656: checking whether to check multibyte regex backtrack" >&5 84055 # Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. 84056 if test "${enable_mbregex_backtrack+set}" = set; then 84057 enableval="$enable_mbregex_backtrack" 84058 PHP_MBREGEX_BACKTRACK=$enableval 84059 else 84060- 84061+ 84062 PHP_MBREGEX_BACKTRACK=yes 84063+ 84064 84065+fi 84066 84067-fi; 84068 84069 ext_output=$PHP_MBREGEX_BACKTRACK 84070-echo "$as_me:$LINENO: result: $ext_output" >&5 84071-echo "${ECHO_T}$ext_output" >&6 84072+echo "$ac_t""$ext_output" 1>&6 84073 84074 84075 84076@@ -72431,23 +55674,22 @@ 84077 84078 php_with_libmbfl=no 84079 84080-echo "$as_me:$LINENO: checking for external libmbfl" >&5 84081-echo $ECHO_N "checking for external libmbfl... $ECHO_C" >&6 84082- 84083+echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 84084+echo "configure:55679: checking for external libmbfl" >&5 84085 # Check whether --with-libmbfl or --without-libmbfl was given. 84086 if test "${with_libmbfl+set}" = set; then 84087 withval="$with_libmbfl" 84088 PHP_LIBMBFL=$withval 84089 else 84090- 84091+ 84092 PHP_LIBMBFL=no 84093+ 84094 84095+fi 84096 84097-fi; 84098 84099 ext_output=$PHP_LIBMBFL 84100-echo "$as_me:$LINENO: result: $ext_output" >&5 84101-echo "${ECHO_T}$ext_output" >&6 84102+echo "$ac_t""$ext_output" 1>&6 84103 84104 84105 84106@@ -72455,58 +55697,55 @@ 84107 84108 php_with_onig=no 84109 84110-echo "$as_me:$LINENO: checking for external oniguruma" >&5 84111-echo $ECHO_N "checking for external oniguruma... $ECHO_C" >&6 84112- 84113+echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 84114+echo "configure:55702: checking for external oniguruma" >&5 84115 # Check whether --with-onig or --without-onig was given. 84116 if test "${with_onig+set}" = set; then 84117 withval="$with_onig" 84118 PHP_ONIG=$withval 84119 else 84120- 84121+ 84122 PHP_ONIG=no 84123+ 84124 84125+fi 84126 84127-fi; 84128 84129 ext_output=$PHP_ONIG 84130-echo "$as_me:$LINENO: result: $ext_output" >&5 84131-echo "${ECHO_T}$ext_output" >&6 84132- 84133+echo "$ac_t""$ext_output" 1>&6 84134 84135 84136 84137-if test "$PHP_MBSTRING" != "no"; then 84138 84139-cat >>confdefs.h <<\_ACEOF 84140+if test "$PHP_MBSTRING" != "no"; then 84141+ cat >> confdefs.h <<\EOF 84142 #define HAVE_MBSTRING 1 84143-_ACEOF 84144- 84145+EOF 84146 84147 84148+ 84149 PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" 84150 84151 84152 if test "$PHP_MBREGEX" != "no"; then 84153- 84154+ 84155 if test "$PHP_MBREGEX" = "yes"; then 84156 if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then 84157 if test "$PHP_MBREGEX_BACKTRACK" != "no"; then 84158- 84159-cat >>confdefs.h <<\_ACEOF 84160+ cat >> confdefs.h <<\EOF 84161 #define USE_COMBINATION_EXPLOSION_CHECK 1 84162-_ACEOF 84163+EOF 84164 84165 fi 84166 84167- echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5 84168-echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6 84169-if test "${php_cv_mbstring_stdarg+set}" = set; then 84170- echo $ECHO_N "(cached) $ECHO_C" >&6 84171+ echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 84172+echo "configure:55743: checking for variable length prototypes and stdarg.h" >&5 84173+if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then 84174+ echo $ac_n "(cached) $ac_c" 1>&6 84175 else 84176- 84177+ 84178 if test "$cross_compiling" = yes; then 84179- 84180+ 84181 case $host_alias in 84182 *netware*) 84183 php_cv_mbstring_stdarg=yes 84184@@ -72515,14 +55754,11 @@ 84185 php_cv_mbstring_stdarg=no 84186 ;; 84187 esac 84188- 84189+ 84190 else 84191- cat >conftest.$ac_ext <<_ACEOF 84192-/* confdefs.h. */ 84193-_ACEOF 84194-cat confdefs.h >>conftest.$ac_ext 84195-cat >>conftest.$ac_ext <<_ACEOF 84196-/* end confdefs.h. */ 84197+ cat > conftest.$ac_ext <<EOF 84198+#line 55761 "configure" 84199+#include "confdefs.h" 84200 84201 #include <stdarg.h> 84202 int foo(int x, ...) { 84203@@ -72534,1680 +55770,336 @@ 84204 return 0; 84205 } 84206 int main() { return foo(10, "", 3.14); } 84207- 84208-_ACEOF 84209-rm -f conftest$ac_exeext 84210-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 84211- (eval $ac_link) 2>&5 84212- ac_status=$? 84213- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84214- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 84215- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84216- (eval $ac_try) 2>&5 84217- ac_status=$? 84218- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84219- (exit $ac_status); }; }; then 84220+ 84221+EOF 84222+if { (eval echo configure:55776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 84223+then 84224 php_cv_mbstring_stdarg=yes 84225 else 84226- echo "$as_me: program exited with status $ac_status" >&5 84227-echo "$as_me: failed program was:" >&5 84228-sed 's/^/| /' conftest.$ac_ext >&5 84229- 84230-( exit $ac_status ) 84231-php_cv_mbstring_stdarg=no 84232-fi 84233-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 84234-fi 84235- 84236-fi 84237-echo "$as_me:$LINENO: result: $php_cv_mbstring_stdarg" >&5 84238-echo "${ECHO_T}$php_cv_mbstring_stdarg" >&6 84239- 84240- 84241- 84242- 84243- 84244- 84245- 84246- 84247-for ac_header in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h 84248-do 84249-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 84250-if eval "test \"\${$as_ac_Header+set}\" = set"; then 84251- echo "$as_me:$LINENO: checking for $ac_header" >&5 84252-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 84253-if eval "test \"\${$as_ac_Header+set}\" = set"; then 84254- echo $ECHO_N "(cached) $ECHO_C" >&6 84255-fi 84256-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 84257-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 84258-else 84259- # Is the header compilable? 84260-echo "$as_me:$LINENO: checking $ac_header usability" >&5 84261-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 84262-cat >conftest.$ac_ext <<_ACEOF 84263-/* confdefs.h. */ 84264-_ACEOF 84265-cat confdefs.h >>conftest.$ac_ext 84266-cat >>conftest.$ac_ext <<_ACEOF 84267-/* end confdefs.h. */ 84268-$ac_includes_default 84269-#include <$ac_header> 84270-_ACEOF 84271-rm -f conftest.$ac_objext 84272-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84273- (eval $ac_compile) 2>conftest.er1 84274- ac_status=$? 84275- grep -v '^ *+' conftest.er1 >conftest.err 84276- rm -f conftest.er1 84277- cat conftest.err >&5 84278- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84279- (exit $ac_status); } && 84280- { ac_try='test -z "$ac_c_werror_flag" 84281- || test ! -s conftest.err' 84282- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84283- (eval $ac_try) 2>&5 84284- ac_status=$? 84285- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84286- (exit $ac_status); }; } && 84287- { ac_try='test -s conftest.$ac_objext' 84288- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84289- (eval $ac_try) 2>&5 84290- ac_status=$? 84291- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84292- (exit $ac_status); }; }; then 84293- ac_header_compiler=yes 84294-else 84295- echo "$as_me: failed program was:" >&5 84296-sed 's/^/| /' conftest.$ac_ext >&5 84297- 84298-ac_header_compiler=no 84299-fi 84300-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84301-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 84302-echo "${ECHO_T}$ac_header_compiler" >&6 84303- 84304-# Is the header present? 84305-echo "$as_me:$LINENO: checking $ac_header presence" >&5 84306-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 84307-cat >conftest.$ac_ext <<_ACEOF 84308-/* confdefs.h. */ 84309-_ACEOF 84310-cat confdefs.h >>conftest.$ac_ext 84311-cat >>conftest.$ac_ext <<_ACEOF 84312-/* end confdefs.h. */ 84313-#include <$ac_header> 84314-_ACEOF 84315-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 84316- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 84317- ac_status=$? 84318- grep -v '^ *+' conftest.er1 >conftest.err 84319- rm -f conftest.er1 84320- cat conftest.err >&5 84321- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84322- (exit $ac_status); } >/dev/null; then 84323- if test -s conftest.err; then 84324- ac_cpp_err=$ac_c_preproc_warn_flag 84325- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 84326- else 84327- ac_cpp_err= 84328- fi 84329-else 84330- ac_cpp_err=yes 84331-fi 84332-if test -z "$ac_cpp_err"; then 84333- ac_header_preproc=yes 84334-else 84335- echo "$as_me: failed program was:" >&5 84336-sed 's/^/| /' conftest.$ac_ext >&5 84337- 84338- ac_header_preproc=no 84339-fi 84340-rm -f conftest.err conftest.$ac_ext 84341-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 84342-echo "${ECHO_T}$ac_header_preproc" >&6 84343- 84344-# So? What about this header? 84345-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 84346- yes:no: ) 84347- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 84348-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 84349- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 84350-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 84351- ac_header_preproc=yes 84352- ;; 84353- no:yes:* ) 84354- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 84355-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 84356- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 84357-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 84358- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 84359-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 84360- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 84361-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 84362- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 84363-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 84364- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 84365-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 84366- ( 84367- cat <<\_ASBOX 84368-## ------------------------------------------ ## 84369-## Report this to the AC_PACKAGE_NAME lists. ## 84370-## ------------------------------------------ ## 84371-_ASBOX 84372- ) | 84373- sed "s/^/$as_me: WARNING: /" >&2 84374- ;; 84375-esac 84376-echo "$as_me:$LINENO: checking for $ac_header" >&5 84377-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 84378-if eval "test \"\${$as_ac_Header+set}\" = set"; then 84379- echo $ECHO_N "(cached) $ECHO_C" >&6 84380-else 84381- eval "$as_ac_Header=\$ac_header_preproc" 84382+ echo "configure: failed program was:" >&5 84383+ cat conftest.$ac_ext >&5 84384+ rm -fr conftest* 84385+ php_cv_mbstring_stdarg=no 84386 fi 84387-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 84388-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 84389- 84390+rm -fr conftest* 84391 fi 84392-if test `eval echo '${'$as_ac_Header'}'` = yes; then 84393- cat >>confdefs.h <<_ACEOF 84394-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 84395-_ACEOF 84396 84397+ 84398 fi 84399 84400-done 84401- 84402- echo "$as_me:$LINENO: checking for int" >&5 84403-echo $ECHO_N "checking for int... $ECHO_C" >&6 84404-if test "${ac_cv_type_int+set}" = set; then 84405- echo $ECHO_N "(cached) $ECHO_C" >&6 84406-else 84407- cat >conftest.$ac_ext <<_ACEOF 84408-/* confdefs.h. */ 84409-_ACEOF 84410-cat confdefs.h >>conftest.$ac_ext 84411-cat >>conftest.$ac_ext <<_ACEOF 84412-/* end confdefs.h. */ 84413-$ac_includes_default 84414-int 84415-main () 84416-{ 84417-if ((int *) 0) 84418- return 0; 84419-if (sizeof (int)) 84420- return 0; 84421- ; 84422- return 0; 84423-} 84424-_ACEOF 84425-rm -f conftest.$ac_objext 84426-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84427- (eval $ac_compile) 2>conftest.er1 84428- ac_status=$? 84429- grep -v '^ *+' conftest.er1 >conftest.err 84430- rm -f conftest.er1 84431- cat conftest.err >&5 84432- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84433- (exit $ac_status); } && 84434- { ac_try='test -z "$ac_c_werror_flag" 84435- || test ! -s conftest.err' 84436- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84437- (eval $ac_try) 2>&5 84438- ac_status=$? 84439- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84440- (exit $ac_status); }; } && 84441- { ac_try='test -s conftest.$ac_objext' 84442- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84443- (eval $ac_try) 2>&5 84444- ac_status=$? 84445- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84446- (exit $ac_status); }; }; then 84447- ac_cv_type_int=yes 84448-else 84449- echo "$as_me: failed program was:" >&5 84450-sed 's/^/| /' conftest.$ac_ext >&5 84451- 84452-ac_cv_type_int=no 84453-fi 84454-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84455-fi 84456-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 84457-echo "${ECHO_T}$ac_cv_type_int" >&6 84458- 84459-echo "$as_me:$LINENO: checking size of int" >&5 84460-echo $ECHO_N "checking size of int... $ECHO_C" >&6 84461-if test "${ac_cv_sizeof_int+set}" = set; then 84462- echo $ECHO_N "(cached) $ECHO_C" >&6 84463-else 84464- if test "$ac_cv_type_int" = yes; then 84465- # The cast to unsigned long works around a bug in the HP C Compiler 84466- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 84467- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 84468- # This bug is HP SR number 8606223364. 84469- if test "$cross_compiling" = yes; then 84470- # Depending upon the size, compute the lo and hi bounds. 84471-cat >conftest.$ac_ext <<_ACEOF 84472-/* confdefs.h. */ 84473-_ACEOF 84474-cat confdefs.h >>conftest.$ac_ext 84475-cat >>conftest.$ac_ext <<_ACEOF 84476-/* end confdefs.h. */ 84477-$ac_includes_default 84478-int 84479-main () 84480-{ 84481-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; 84482-test_array [0] = 0 84483- 84484- ; 84485- return 0; 84486-} 84487-_ACEOF 84488-rm -f conftest.$ac_objext 84489-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84490- (eval $ac_compile) 2>conftest.er1 84491- ac_status=$? 84492- grep -v '^ *+' conftest.er1 >conftest.err 84493- rm -f conftest.er1 84494- cat conftest.err >&5 84495- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84496- (exit $ac_status); } && 84497- { ac_try='test -z "$ac_c_werror_flag" 84498- || test ! -s conftest.err' 84499- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84500- (eval $ac_try) 2>&5 84501- ac_status=$? 84502- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84503- (exit $ac_status); }; } && 84504- { ac_try='test -s conftest.$ac_objext' 84505- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84506- (eval $ac_try) 2>&5 84507- ac_status=$? 84508- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84509- (exit $ac_status); }; }; then 84510- ac_lo=0 ac_mid=0 84511- while :; do 84512- cat >conftest.$ac_ext <<_ACEOF 84513-/* confdefs.h. */ 84514-_ACEOF 84515-cat confdefs.h >>conftest.$ac_ext 84516-cat >>conftest.$ac_ext <<_ACEOF 84517-/* end confdefs.h. */ 84518-$ac_includes_default 84519-int 84520-main () 84521-{ 84522-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 84523-test_array [0] = 0 84524- 84525- ; 84526- return 0; 84527-} 84528-_ACEOF 84529-rm -f conftest.$ac_objext 84530-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84531- (eval $ac_compile) 2>conftest.er1 84532- ac_status=$? 84533- grep -v '^ *+' conftest.er1 >conftest.err 84534- rm -f conftest.er1 84535- cat conftest.err >&5 84536- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84537- (exit $ac_status); } && 84538- { ac_try='test -z "$ac_c_werror_flag" 84539- || test ! -s conftest.err' 84540- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84541- (eval $ac_try) 2>&5 84542- ac_status=$? 84543- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84544- (exit $ac_status); }; } && 84545- { ac_try='test -s conftest.$ac_objext' 84546- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84547- (eval $ac_try) 2>&5 84548- ac_status=$? 84549- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84550- (exit $ac_status); }; }; then 84551- ac_hi=$ac_mid; break 84552-else 84553- echo "$as_me: failed program was:" >&5 84554-sed 's/^/| /' conftest.$ac_ext >&5 84555- 84556-ac_lo=`expr $ac_mid + 1` 84557- if test $ac_lo -le $ac_mid; then 84558- ac_lo= ac_hi= 84559- break 84560- fi 84561- ac_mid=`expr 2 '*' $ac_mid + 1` 84562-fi 84563-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84564- done 84565-else 84566- echo "$as_me: failed program was:" >&5 84567-sed 's/^/| /' conftest.$ac_ext >&5 84568- 84569-cat >conftest.$ac_ext <<_ACEOF 84570-/* confdefs.h. */ 84571-_ACEOF 84572-cat confdefs.h >>conftest.$ac_ext 84573-cat >>conftest.$ac_ext <<_ACEOF 84574-/* end confdefs.h. */ 84575-$ac_includes_default 84576-int 84577-main () 84578-{ 84579-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; 84580-test_array [0] = 0 84581- 84582- ; 84583- return 0; 84584-} 84585-_ACEOF 84586-rm -f conftest.$ac_objext 84587-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84588- (eval $ac_compile) 2>conftest.er1 84589- ac_status=$? 84590- grep -v '^ *+' conftest.er1 >conftest.err 84591- rm -f conftest.er1 84592- cat conftest.err >&5 84593- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84594- (exit $ac_status); } && 84595- { ac_try='test -z "$ac_c_werror_flag" 84596- || test ! -s conftest.err' 84597- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84598- (eval $ac_try) 2>&5 84599- ac_status=$? 84600- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84601- (exit $ac_status); }; } && 84602- { ac_try='test -s conftest.$ac_objext' 84603- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84604- (eval $ac_try) 2>&5 84605- ac_status=$? 84606- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84607- (exit $ac_status); }; }; then 84608- ac_hi=-1 ac_mid=-1 84609- while :; do 84610- cat >conftest.$ac_ext <<_ACEOF 84611-/* confdefs.h. */ 84612-_ACEOF 84613-cat confdefs.h >>conftest.$ac_ext 84614-cat >>conftest.$ac_ext <<_ACEOF 84615-/* end confdefs.h. */ 84616-$ac_includes_default 84617-int 84618-main () 84619-{ 84620-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; 84621-test_array [0] = 0 84622- 84623- ; 84624- return 0; 84625-} 84626-_ACEOF 84627-rm -f conftest.$ac_objext 84628-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84629- (eval $ac_compile) 2>conftest.er1 84630- ac_status=$? 84631- grep -v '^ *+' conftest.er1 >conftest.err 84632- rm -f conftest.er1 84633- cat conftest.err >&5 84634- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84635- (exit $ac_status); } && 84636- { ac_try='test -z "$ac_c_werror_flag" 84637- || test ! -s conftest.err' 84638- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84639- (eval $ac_try) 2>&5 84640- ac_status=$? 84641- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84642- (exit $ac_status); }; } && 84643- { ac_try='test -s conftest.$ac_objext' 84644- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84645- (eval $ac_try) 2>&5 84646- ac_status=$? 84647- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84648- (exit $ac_status); }; }; then 84649- ac_lo=$ac_mid; break 84650-else 84651- echo "$as_me: failed program was:" >&5 84652-sed 's/^/| /' conftest.$ac_ext >&5 84653- 84654-ac_hi=`expr '(' $ac_mid ')' - 1` 84655- if test $ac_mid -le $ac_hi; then 84656- ac_lo= ac_hi= 84657- break 84658- fi 84659- ac_mid=`expr 2 '*' $ac_mid` 84660-fi 84661-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84662- done 84663-else 84664- echo "$as_me: failed program was:" >&5 84665-sed 's/^/| /' conftest.$ac_ext >&5 84666- 84667-ac_lo= ac_hi= 84668-fi 84669-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84670-fi 84671-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84672-# Binary search between lo and hi bounds. 84673-while test "x$ac_lo" != "x$ac_hi"; do 84674- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 84675- cat >conftest.$ac_ext <<_ACEOF 84676-/* confdefs.h. */ 84677-_ACEOF 84678-cat confdefs.h >>conftest.$ac_ext 84679-cat >>conftest.$ac_ext <<_ACEOF 84680-/* end confdefs.h. */ 84681-$ac_includes_default 84682-int 84683-main () 84684-{ 84685-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 84686-test_array [0] = 0 84687+echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6 84688 84689- ; 84690- return 0; 84691-} 84692-_ACEOF 84693-rm -f conftest.$ac_objext 84694-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84695- (eval $ac_compile) 2>conftest.er1 84696- ac_status=$? 84697- grep -v '^ *+' conftest.er1 >conftest.err 84698- rm -f conftest.er1 84699- cat conftest.err >&5 84700- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84701- (exit $ac_status); } && 84702- { ac_try='test -z "$ac_c_werror_flag" 84703- || test ! -s conftest.err' 84704- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84705- (eval $ac_try) 2>&5 84706- ac_status=$? 84707- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84708- (exit $ac_status); }; } && 84709- { ac_try='test -s conftest.$ac_objext' 84710- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84711- (eval $ac_try) 2>&5 84712- ac_status=$? 84713- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84714- (exit $ac_status); }; }; then 84715- ac_hi=$ac_mid 84716+ for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h 84717+do 84718+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 84719+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 84720+echo "configure:55797: checking for $ac_hdr" >&5 84721+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 84722+ echo $ac_n "(cached) $ac_c" 1>&6 84723 else 84724- echo "$as_me: failed program was:" >&5 84725-sed 's/^/| /' conftest.$ac_ext >&5 84726- 84727-ac_lo=`expr '(' $ac_mid ')' + 1` 84728+ cat > conftest.$ac_ext <<EOF 84729+#line 55802 "configure" 84730+#include "confdefs.h" 84731+#include <$ac_hdr> 84732+EOF 84733+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 84734+{ (eval echo configure:55807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 84735+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 84736+if test -z "$ac_err"; then 84737+ rm -rf conftest* 84738+ eval "ac_cv_header_$ac_safe=yes" 84739+else 84740+ echo "$ac_err" >&5 84741+ echo "configure: failed program was:" >&5 84742+ cat conftest.$ac_ext >&5 84743+ rm -rf conftest* 84744+ eval "ac_cv_header_$ac_safe=no" 84745+fi 84746+rm -f conftest* 84747+fi 84748+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 84749+ echo "$ac_t""yes" 1>&6 84750+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 84751+ cat >> confdefs.h <<EOF 84752+#define $ac_tr_hdr 1 84753+EOF 84754+ 84755+else 84756+ echo "$ac_t""no" 1>&6 84757 fi 84758-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84759 done 84760-case $ac_lo in 84761-?*) ac_cv_sizeof_int=$ac_lo;; 84762-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 84763-See \`config.log' for more details." >&5 84764-echo "$as_me: error: cannot compute sizeof (int), 77 84765-See \`config.log' for more details." >&2;} 84766- { (exit 1); exit 1; }; } ;; 84767-esac 84768+ 84769+ echo $ac_n "checking size of int""... $ac_c" 1>&6 84770+echo "configure:55834: checking size of int" >&5 84771+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 84772+ echo $ac_n "(cached) $ac_c" 1>&6 84773 else 84774 if test "$cross_compiling" = yes; then 84775- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 84776-See \`config.log' for more details." >&5 84777-echo "$as_me: error: cannot run test program while cross compiling 84778-See \`config.log' for more details." >&2;} 84779- { (exit 1); exit 1; }; } 84780-else 84781- cat >conftest.$ac_ext <<_ACEOF 84782-/* confdefs.h. */ 84783-_ACEOF 84784-cat confdefs.h >>conftest.$ac_ext 84785-cat >>conftest.$ac_ext <<_ACEOF 84786-/* end confdefs.h. */ 84787-$ac_includes_default 84788-long longval () { return (long) (sizeof (int)); } 84789-unsigned long ulongval () { return (long) (sizeof (int)); } 84790+ ac_cv_sizeof_int=4 84791+else 84792+ cat > conftest.$ac_ext <<EOF 84793+#line 55842 "configure" 84794+#include "confdefs.h" 84795 #include <stdio.h> 84796-#include <stdlib.h> 84797-int 84798-main () 84799+main() 84800 { 84801- 84802- FILE *f = fopen ("conftest.val", "w"); 84803- if (! f) 84804- exit (1); 84805- if (((long) (sizeof (int))) < 0) 84806- { 84807- long i = longval (); 84808- if (i != ((long) (sizeof (int)))) 84809- exit (1); 84810- fprintf (f, "%ld\n", i); 84811- } 84812- else 84813- { 84814- unsigned long i = ulongval (); 84815- if (i != ((long) (sizeof (int)))) 84816- exit (1); 84817- fprintf (f, "%lu\n", i); 84818- } 84819- exit (ferror (f) || fclose (f) != 0); 84820- 84821- ; 84822- return 0; 84823+ FILE *f=fopen("conftestval", "w"); 84824+ if (!f) exit(1); 84825+ fprintf(f, "%d\n", sizeof(int)); 84826+ exit(0); 84827 } 84828-_ACEOF 84829-rm -f conftest$ac_exeext 84830-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 84831- (eval $ac_link) 2>&5 84832- ac_status=$? 84833- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84834- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 84835- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84836- (eval $ac_try) 2>&5 84837- ac_status=$? 84838- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84839- (exit $ac_status); }; }; then 84840- ac_cv_sizeof_int=`cat conftest.val` 84841-else 84842- echo "$as_me: program exited with status $ac_status" >&5 84843-echo "$as_me: failed program was:" >&5 84844-sed 's/^/| /' conftest.$ac_ext >&5 84845- 84846-( exit $ac_status ) 84847-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 84848-See \`config.log' for more details." >&5 84849-echo "$as_me: error: cannot compute sizeof (int), 77 84850-See \`config.log' for more details." >&2;} 84851- { (exit 1); exit 1; }; } 84852-fi 84853-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 84854-fi 84855-fi 84856-rm -f conftest.val 84857+EOF 84858+if { (eval echo configure:55853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 84859+then 84860+ ac_cv_sizeof_int=`cat conftestval` 84861 else 84862+ echo "configure: failed program was:" >&5 84863+ cat conftest.$ac_ext >&5 84864+ rm -fr conftest* 84865 ac_cv_sizeof_int=0 84866 fi 84867+rm -fr conftest* 84868 fi 84869-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 84870-echo "${ECHO_T}$ac_cv_sizeof_int" >&6 84871-cat >>confdefs.h <<_ACEOF 84872-#define SIZEOF_INT $ac_cv_sizeof_int 84873-_ACEOF 84874- 84875- 84876- echo "$as_me:$LINENO: checking for short" >&5 84877-echo $ECHO_N "checking for short... $ECHO_C" >&6 84878-if test "${ac_cv_type_short+set}" = set; then 84879- echo $ECHO_N "(cached) $ECHO_C" >&6 84880-else 84881- cat >conftest.$ac_ext <<_ACEOF 84882-/* confdefs.h. */ 84883-_ACEOF 84884-cat confdefs.h >>conftest.$ac_ext 84885-cat >>conftest.$ac_ext <<_ACEOF 84886-/* end confdefs.h. */ 84887-$ac_includes_default 84888-int 84889-main () 84890-{ 84891-if ((short *) 0) 84892- return 0; 84893-if (sizeof (short)) 84894- return 0; 84895- ; 84896- return 0; 84897-} 84898-_ACEOF 84899-rm -f conftest.$ac_objext 84900-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84901- (eval $ac_compile) 2>conftest.er1 84902- ac_status=$? 84903- grep -v '^ *+' conftest.er1 >conftest.err 84904- rm -f conftest.er1 84905- cat conftest.err >&5 84906- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84907- (exit $ac_status); } && 84908- { ac_try='test -z "$ac_c_werror_flag" 84909- || test ! -s conftest.err' 84910- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84911- (eval $ac_try) 2>&5 84912- ac_status=$? 84913- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84914- (exit $ac_status); }; } && 84915- { ac_try='test -s conftest.$ac_objext' 84916- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84917- (eval $ac_try) 2>&5 84918- ac_status=$? 84919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84920- (exit $ac_status); }; }; then 84921- ac_cv_type_short=yes 84922-else 84923- echo "$as_me: failed program was:" >&5 84924-sed 's/^/| /' conftest.$ac_ext >&5 84925- 84926-ac_cv_type_short=no 84927-fi 84928-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 84929-fi 84930-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 84931-echo "${ECHO_T}$ac_cv_type_short" >&6 84932- 84933-echo "$as_me:$LINENO: checking size of short" >&5 84934-echo $ECHO_N "checking size of short... $ECHO_C" >&6 84935-if test "${ac_cv_sizeof_short+set}" = set; then 84936- echo $ECHO_N "(cached) $ECHO_C" >&6 84937-else 84938- if test "$ac_cv_type_short" = yes; then 84939- # The cast to unsigned long works around a bug in the HP C Compiler 84940- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 84941- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 84942- # This bug is HP SR number 8606223364. 84943- if test "$cross_compiling" = yes; then 84944- # Depending upon the size, compute the lo and hi bounds. 84945-cat >conftest.$ac_ext <<_ACEOF 84946-/* confdefs.h. */ 84947-_ACEOF 84948-cat confdefs.h >>conftest.$ac_ext 84949-cat >>conftest.$ac_ext <<_ACEOF 84950-/* end confdefs.h. */ 84951-$ac_includes_default 84952-int 84953-main () 84954-{ 84955-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; 84956-test_array [0] = 0 84957- 84958- ; 84959- return 0; 84960-} 84961-_ACEOF 84962-rm -f conftest.$ac_objext 84963-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 84964- (eval $ac_compile) 2>conftest.er1 84965- ac_status=$? 84966- grep -v '^ *+' conftest.er1 >conftest.err 84967- rm -f conftest.er1 84968- cat conftest.err >&5 84969- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84970- (exit $ac_status); } && 84971- { ac_try='test -z "$ac_c_werror_flag" 84972- || test ! -s conftest.err' 84973- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84974- (eval $ac_try) 2>&5 84975- ac_status=$? 84976- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84977- (exit $ac_status); }; } && 84978- { ac_try='test -s conftest.$ac_objext' 84979- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 84980- (eval $ac_try) 2>&5 84981- ac_status=$? 84982- echo "$as_me:$LINENO: \$? = $ac_status" >&5 84983- (exit $ac_status); }; }; then 84984- ac_lo=0 ac_mid=0 84985- while :; do 84986- cat >conftest.$ac_ext <<_ACEOF 84987-/* confdefs.h. */ 84988-_ACEOF 84989-cat confdefs.h >>conftest.$ac_ext 84990-cat >>conftest.$ac_ext <<_ACEOF 84991-/* end confdefs.h. */ 84992-$ac_includes_default 84993-int 84994-main () 84995-{ 84996-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; 84997-test_array [0] = 0 84998- 84999- ; 85000- return 0; 85001-} 85002-_ACEOF 85003-rm -f conftest.$ac_objext 85004-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85005- (eval $ac_compile) 2>conftest.er1 85006- ac_status=$? 85007- grep -v '^ *+' conftest.er1 >conftest.err 85008- rm -f conftest.er1 85009- cat conftest.err >&5 85010- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85011- (exit $ac_status); } && 85012- { ac_try='test -z "$ac_c_werror_flag" 85013- || test ! -s conftest.err' 85014- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85015- (eval $ac_try) 2>&5 85016- ac_status=$? 85017- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85018- (exit $ac_status); }; } && 85019- { ac_try='test -s conftest.$ac_objext' 85020- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85021- (eval $ac_try) 2>&5 85022- ac_status=$? 85023- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85024- (exit $ac_status); }; }; then 85025- ac_hi=$ac_mid; break 85026-else 85027- echo "$as_me: failed program was:" >&5 85028-sed 's/^/| /' conftest.$ac_ext >&5 85029- 85030-ac_lo=`expr $ac_mid + 1` 85031- if test $ac_lo -le $ac_mid; then 85032- ac_lo= ac_hi= 85033- break 85034- fi 85035- ac_mid=`expr 2 '*' $ac_mid + 1` 85036-fi 85037-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85038- done 85039-else 85040- echo "$as_me: failed program was:" >&5 85041-sed 's/^/| /' conftest.$ac_ext >&5 85042- 85043-cat >conftest.$ac_ext <<_ACEOF 85044-/* confdefs.h. */ 85045-_ACEOF 85046-cat confdefs.h >>conftest.$ac_ext 85047-cat >>conftest.$ac_ext <<_ACEOF 85048-/* end confdefs.h. */ 85049-$ac_includes_default 85050-int 85051-main () 85052-{ 85053-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; 85054-test_array [0] = 0 85055- 85056- ; 85057- return 0; 85058-} 85059-_ACEOF 85060-rm -f conftest.$ac_objext 85061-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85062- (eval $ac_compile) 2>conftest.er1 85063- ac_status=$? 85064- grep -v '^ *+' conftest.er1 >conftest.err 85065- rm -f conftest.er1 85066- cat conftest.err >&5 85067- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85068- (exit $ac_status); } && 85069- { ac_try='test -z "$ac_c_werror_flag" 85070- || test ! -s conftest.err' 85071- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85072- (eval $ac_try) 2>&5 85073- ac_status=$? 85074- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85075- (exit $ac_status); }; } && 85076- { ac_try='test -s conftest.$ac_objext' 85077- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85078- (eval $ac_try) 2>&5 85079- ac_status=$? 85080- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85081- (exit $ac_status); }; }; then 85082- ac_hi=-1 ac_mid=-1 85083- while :; do 85084- cat >conftest.$ac_ext <<_ACEOF 85085-/* confdefs.h. */ 85086-_ACEOF 85087-cat confdefs.h >>conftest.$ac_ext 85088-cat >>conftest.$ac_ext <<_ACEOF 85089-/* end confdefs.h. */ 85090-$ac_includes_default 85091-int 85092-main () 85093-{ 85094-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; 85095-test_array [0] = 0 85096 85097- ; 85098- return 0; 85099-} 85100-_ACEOF 85101-rm -f conftest.$ac_objext 85102-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85103- (eval $ac_compile) 2>conftest.er1 85104- ac_status=$? 85105- grep -v '^ *+' conftest.er1 >conftest.err 85106- rm -f conftest.er1 85107- cat conftest.err >&5 85108- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85109- (exit $ac_status); } && 85110- { ac_try='test -z "$ac_c_werror_flag" 85111- || test ! -s conftest.err' 85112- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85113- (eval $ac_try) 2>&5 85114- ac_status=$? 85115- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85116- (exit $ac_status); }; } && 85117- { ac_try='test -s conftest.$ac_objext' 85118- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85119- (eval $ac_try) 2>&5 85120- ac_status=$? 85121- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85122- (exit $ac_status); }; }; then 85123- ac_lo=$ac_mid; break 85124-else 85125- echo "$as_me: failed program was:" >&5 85126-sed 's/^/| /' conftest.$ac_ext >&5 85127- 85128-ac_hi=`expr '(' $ac_mid ')' - 1` 85129- if test $ac_mid -le $ac_hi; then 85130- ac_lo= ac_hi= 85131- break 85132- fi 85133- ac_mid=`expr 2 '*' $ac_mid` 85134-fi 85135-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85136- done 85137-else 85138- echo "$as_me: failed program was:" >&5 85139-sed 's/^/| /' conftest.$ac_ext >&5 85140- 85141-ac_lo= ac_hi= 85142-fi 85143-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85144-fi 85145-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85146-# Binary search between lo and hi bounds. 85147-while test "x$ac_lo" != "x$ac_hi"; do 85148- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 85149- cat >conftest.$ac_ext <<_ACEOF 85150-/* confdefs.h. */ 85151-_ACEOF 85152-cat confdefs.h >>conftest.$ac_ext 85153-cat >>conftest.$ac_ext <<_ACEOF 85154-/* end confdefs.h. */ 85155-$ac_includes_default 85156-int 85157-main () 85158-{ 85159-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; 85160-test_array [0] = 0 85161+fi 85162+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 85163+cat >> confdefs.h <<EOF 85164+#define SIZEOF_INT $ac_cv_sizeof_int 85165+EOF 85166 85167- ; 85168- return 0; 85169-} 85170-_ACEOF 85171-rm -f conftest.$ac_objext 85172-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85173- (eval $ac_compile) 2>conftest.er1 85174- ac_status=$? 85175- grep -v '^ *+' conftest.er1 >conftest.err 85176- rm -f conftest.er1 85177- cat conftest.err >&5 85178- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85179- (exit $ac_status); } && 85180- { ac_try='test -z "$ac_c_werror_flag" 85181- || test ! -s conftest.err' 85182- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85183- (eval $ac_try) 2>&5 85184- ac_status=$? 85185- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85186- (exit $ac_status); }; } && 85187- { ac_try='test -s conftest.$ac_objext' 85188- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85189- (eval $ac_try) 2>&5 85190- ac_status=$? 85191- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85192- (exit $ac_status); }; }; then 85193- ac_hi=$ac_mid 85194-else 85195- echo "$as_me: failed program was:" >&5 85196-sed 's/^/| /' conftest.$ac_ext >&5 85197 85198-ac_lo=`expr '(' $ac_mid ')' + 1` 85199-fi 85200-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85201-done 85202-case $ac_lo in 85203-?*) ac_cv_sizeof_short=$ac_lo;; 85204-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 85205-See \`config.log' for more details." >&5 85206-echo "$as_me: error: cannot compute sizeof (short), 77 85207-See \`config.log' for more details." >&2;} 85208- { (exit 1); exit 1; }; } ;; 85209-esac 85210+ echo $ac_n "checking size of short""... $ac_c" 1>&6 85211+echo "configure:55873: checking size of short" >&5 85212+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then 85213+ echo $ac_n "(cached) $ac_c" 1>&6 85214 else 85215 if test "$cross_compiling" = yes; then 85216- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 85217-See \`config.log' for more details." >&5 85218-echo "$as_me: error: cannot run test program while cross compiling 85219-See \`config.log' for more details." >&2;} 85220- { (exit 1); exit 1; }; } 85221-else 85222- cat >conftest.$ac_ext <<_ACEOF 85223-/* confdefs.h. */ 85224-_ACEOF 85225-cat confdefs.h >>conftest.$ac_ext 85226-cat >>conftest.$ac_ext <<_ACEOF 85227-/* end confdefs.h. */ 85228-$ac_includes_default 85229-long longval () { return (long) (sizeof (short)); } 85230-unsigned long ulongval () { return (long) (sizeof (short)); } 85231+ ac_cv_sizeof_short=2 85232+else 85233+ cat > conftest.$ac_ext <<EOF 85234+#line 55881 "configure" 85235+#include "confdefs.h" 85236 #include <stdio.h> 85237-#include <stdlib.h> 85238-int 85239-main () 85240+main() 85241 { 85242- 85243- FILE *f = fopen ("conftest.val", "w"); 85244- if (! f) 85245- exit (1); 85246- if (((long) (sizeof (short))) < 0) 85247- { 85248- long i = longval (); 85249- if (i != ((long) (sizeof (short)))) 85250- exit (1); 85251- fprintf (f, "%ld\n", i); 85252- } 85253- else 85254- { 85255- unsigned long i = ulongval (); 85256- if (i != ((long) (sizeof (short)))) 85257- exit (1); 85258- fprintf (f, "%lu\n", i); 85259- } 85260- exit (ferror (f) || fclose (f) != 0); 85261- 85262- ; 85263- return 0; 85264+ FILE *f=fopen("conftestval", "w"); 85265+ if (!f) exit(1); 85266+ fprintf(f, "%d\n", sizeof(short)); 85267+ exit(0); 85268 } 85269-_ACEOF 85270-rm -f conftest$ac_exeext 85271-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 85272- (eval $ac_link) 2>&5 85273- ac_status=$? 85274- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85275- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 85276- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85277- (eval $ac_try) 2>&5 85278- ac_status=$? 85279- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85280- (exit $ac_status); }; }; then 85281- ac_cv_sizeof_short=`cat conftest.val` 85282-else 85283- echo "$as_me: program exited with status $ac_status" >&5 85284-echo "$as_me: failed program was:" >&5 85285-sed 's/^/| /' conftest.$ac_ext >&5 85286- 85287-( exit $ac_status ) 85288-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 85289-See \`config.log' for more details." >&5 85290-echo "$as_me: error: cannot compute sizeof (short), 77 85291-See \`config.log' for more details." >&2;} 85292- { (exit 1); exit 1; }; } 85293-fi 85294-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 85295-fi 85296-fi 85297-rm -f conftest.val 85298+EOF 85299+if { (eval echo configure:55892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 85300+then 85301+ ac_cv_sizeof_short=`cat conftestval` 85302 else 85303+ echo "configure: failed program was:" >&5 85304+ cat conftest.$ac_ext >&5 85305+ rm -fr conftest* 85306 ac_cv_sizeof_short=0 85307 fi 85308+rm -fr conftest* 85309 fi 85310-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 85311-echo "${ECHO_T}$ac_cv_sizeof_short" >&6 85312-cat >>confdefs.h <<_ACEOF 85313-#define SIZEOF_SHORT $ac_cv_sizeof_short 85314-_ACEOF 85315- 85316- 85317- echo "$as_me:$LINENO: checking for long" >&5 85318-echo $ECHO_N "checking for long... $ECHO_C" >&6 85319-if test "${ac_cv_type_long+set}" = set; then 85320- echo $ECHO_N "(cached) $ECHO_C" >&6 85321-else 85322- cat >conftest.$ac_ext <<_ACEOF 85323-/* confdefs.h. */ 85324-_ACEOF 85325-cat confdefs.h >>conftest.$ac_ext 85326-cat >>conftest.$ac_ext <<_ACEOF 85327-/* end confdefs.h. */ 85328-$ac_includes_default 85329-int 85330-main () 85331-{ 85332-if ((long *) 0) 85333- return 0; 85334-if (sizeof (long)) 85335- return 0; 85336- ; 85337- return 0; 85338-} 85339-_ACEOF 85340-rm -f conftest.$ac_objext 85341-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85342- (eval $ac_compile) 2>conftest.er1 85343- ac_status=$? 85344- grep -v '^ *+' conftest.er1 >conftest.err 85345- rm -f conftest.er1 85346- cat conftest.err >&5 85347- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85348- (exit $ac_status); } && 85349- { ac_try='test -z "$ac_c_werror_flag" 85350- || test ! -s conftest.err' 85351- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85352- (eval $ac_try) 2>&5 85353- ac_status=$? 85354- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85355- (exit $ac_status); }; } && 85356- { ac_try='test -s conftest.$ac_objext' 85357- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85358- (eval $ac_try) 2>&5 85359- ac_status=$? 85360- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85361- (exit $ac_status); }; }; then 85362- ac_cv_type_long=yes 85363-else 85364- echo "$as_me: failed program was:" >&5 85365-sed 's/^/| /' conftest.$ac_ext >&5 85366- 85367-ac_cv_type_long=no 85368-fi 85369-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85370-fi 85371-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 85372-echo "${ECHO_T}$ac_cv_type_long" >&6 85373- 85374-echo "$as_me:$LINENO: checking size of long" >&5 85375-echo $ECHO_N "checking size of long... $ECHO_C" >&6 85376-if test "${ac_cv_sizeof_long+set}" = set; then 85377- echo $ECHO_N "(cached) $ECHO_C" >&6 85378-else 85379- if test "$ac_cv_type_long" = yes; then 85380- # The cast to unsigned long works around a bug in the HP C Compiler 85381- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 85382- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 85383- # This bug is HP SR number 8606223364. 85384- if test "$cross_compiling" = yes; then 85385- # Depending upon the size, compute the lo and hi bounds. 85386-cat >conftest.$ac_ext <<_ACEOF 85387-/* confdefs.h. */ 85388-_ACEOF 85389-cat confdefs.h >>conftest.$ac_ext 85390-cat >>conftest.$ac_ext <<_ACEOF 85391-/* end confdefs.h. */ 85392-$ac_includes_default 85393-int 85394-main () 85395-{ 85396-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; 85397-test_array [0] = 0 85398- 85399- ; 85400- return 0; 85401-} 85402-_ACEOF 85403-rm -f conftest.$ac_objext 85404-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85405- (eval $ac_compile) 2>conftest.er1 85406- ac_status=$? 85407- grep -v '^ *+' conftest.er1 >conftest.err 85408- rm -f conftest.er1 85409- cat conftest.err >&5 85410- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85411- (exit $ac_status); } && 85412- { ac_try='test -z "$ac_c_werror_flag" 85413- || test ! -s conftest.err' 85414- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85415- (eval $ac_try) 2>&5 85416- ac_status=$? 85417- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85418- (exit $ac_status); }; } && 85419- { ac_try='test -s conftest.$ac_objext' 85420- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85421- (eval $ac_try) 2>&5 85422- ac_status=$? 85423- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85424- (exit $ac_status); }; }; then 85425- ac_lo=0 ac_mid=0 85426- while :; do 85427- cat >conftest.$ac_ext <<_ACEOF 85428-/* confdefs.h. */ 85429-_ACEOF 85430-cat confdefs.h >>conftest.$ac_ext 85431-cat >>conftest.$ac_ext <<_ACEOF 85432-/* end confdefs.h. */ 85433-$ac_includes_default 85434-int 85435-main () 85436-{ 85437-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 85438-test_array [0] = 0 85439- 85440- ; 85441- return 0; 85442-} 85443-_ACEOF 85444-rm -f conftest.$ac_objext 85445-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85446- (eval $ac_compile) 2>conftest.er1 85447- ac_status=$? 85448- grep -v '^ *+' conftest.er1 >conftest.err 85449- rm -f conftest.er1 85450- cat conftest.err >&5 85451- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85452- (exit $ac_status); } && 85453- { ac_try='test -z "$ac_c_werror_flag" 85454- || test ! -s conftest.err' 85455- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85456- (eval $ac_try) 2>&5 85457- ac_status=$? 85458- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85459- (exit $ac_status); }; } && 85460- { ac_try='test -s conftest.$ac_objext' 85461- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85462- (eval $ac_try) 2>&5 85463- ac_status=$? 85464- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85465- (exit $ac_status); }; }; then 85466- ac_hi=$ac_mid; break 85467-else 85468- echo "$as_me: failed program was:" >&5 85469-sed 's/^/| /' conftest.$ac_ext >&5 85470- 85471-ac_lo=`expr $ac_mid + 1` 85472- if test $ac_lo -le $ac_mid; then 85473- ac_lo= ac_hi= 85474- break 85475- fi 85476- ac_mid=`expr 2 '*' $ac_mid + 1` 85477-fi 85478-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85479- done 85480-else 85481- echo "$as_me: failed program was:" >&5 85482-sed 's/^/| /' conftest.$ac_ext >&5 85483- 85484-cat >conftest.$ac_ext <<_ACEOF 85485-/* confdefs.h. */ 85486-_ACEOF 85487-cat confdefs.h >>conftest.$ac_ext 85488-cat >>conftest.$ac_ext <<_ACEOF 85489-/* end confdefs.h. */ 85490-$ac_includes_default 85491-int 85492-main () 85493-{ 85494-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; 85495-test_array [0] = 0 85496- 85497- ; 85498- return 0; 85499-} 85500-_ACEOF 85501-rm -f conftest.$ac_objext 85502-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85503- (eval $ac_compile) 2>conftest.er1 85504- ac_status=$? 85505- grep -v '^ *+' conftest.er1 >conftest.err 85506- rm -f conftest.er1 85507- cat conftest.err >&5 85508- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85509- (exit $ac_status); } && 85510- { ac_try='test -z "$ac_c_werror_flag" 85511- || test ! -s conftest.err' 85512- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85513- (eval $ac_try) 2>&5 85514- ac_status=$? 85515- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85516- (exit $ac_status); }; } && 85517- { ac_try='test -s conftest.$ac_objext' 85518- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85519- (eval $ac_try) 2>&5 85520- ac_status=$? 85521- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85522- (exit $ac_status); }; }; then 85523- ac_hi=-1 ac_mid=-1 85524- while :; do 85525- cat >conftest.$ac_ext <<_ACEOF 85526-/* confdefs.h. */ 85527-_ACEOF 85528-cat confdefs.h >>conftest.$ac_ext 85529-cat >>conftest.$ac_ext <<_ACEOF 85530-/* end confdefs.h. */ 85531-$ac_includes_default 85532-int 85533-main () 85534-{ 85535-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; 85536-test_array [0] = 0 85537 85538- ; 85539- return 0; 85540-} 85541-_ACEOF 85542-rm -f conftest.$ac_objext 85543-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85544- (eval $ac_compile) 2>conftest.er1 85545- ac_status=$? 85546- grep -v '^ *+' conftest.er1 >conftest.err 85547- rm -f conftest.er1 85548- cat conftest.err >&5 85549- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85550- (exit $ac_status); } && 85551- { ac_try='test -z "$ac_c_werror_flag" 85552- || test ! -s conftest.err' 85553- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85554- (eval $ac_try) 2>&5 85555- ac_status=$? 85556- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85557- (exit $ac_status); }; } && 85558- { ac_try='test -s conftest.$ac_objext' 85559- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85560- (eval $ac_try) 2>&5 85561- ac_status=$? 85562- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85563- (exit $ac_status); }; }; then 85564- ac_lo=$ac_mid; break 85565-else 85566- echo "$as_me: failed program was:" >&5 85567-sed 's/^/| /' conftest.$ac_ext >&5 85568- 85569-ac_hi=`expr '(' $ac_mid ')' - 1` 85570- if test $ac_mid -le $ac_hi; then 85571- ac_lo= ac_hi= 85572- break 85573- fi 85574- ac_mid=`expr 2 '*' $ac_mid` 85575-fi 85576-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85577- done 85578-else 85579- echo "$as_me: failed program was:" >&5 85580-sed 's/^/| /' conftest.$ac_ext >&5 85581- 85582-ac_lo= ac_hi= 85583-fi 85584-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85585-fi 85586-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85587-# Binary search between lo and hi bounds. 85588-while test "x$ac_lo" != "x$ac_hi"; do 85589- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 85590- cat >conftest.$ac_ext <<_ACEOF 85591-/* confdefs.h. */ 85592-_ACEOF 85593-cat confdefs.h >>conftest.$ac_ext 85594-cat >>conftest.$ac_ext <<_ACEOF 85595-/* end confdefs.h. */ 85596-$ac_includes_default 85597-int 85598-main () 85599-{ 85600-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 85601-test_array [0] = 0 85602+fi 85603+echo "$ac_t""$ac_cv_sizeof_short" 1>&6 85604+cat >> confdefs.h <<EOF 85605+#define SIZEOF_SHORT $ac_cv_sizeof_short 85606+EOF 85607 85608- ; 85609- return 0; 85610-} 85611-_ACEOF 85612-rm -f conftest.$ac_objext 85613-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85614- (eval $ac_compile) 2>conftest.er1 85615- ac_status=$? 85616- grep -v '^ *+' conftest.er1 >conftest.err 85617- rm -f conftest.er1 85618- cat conftest.err >&5 85619- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85620- (exit $ac_status); } && 85621- { ac_try='test -z "$ac_c_werror_flag" 85622- || test ! -s conftest.err' 85623- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85624- (eval $ac_try) 2>&5 85625- ac_status=$? 85626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85627- (exit $ac_status); }; } && 85628- { ac_try='test -s conftest.$ac_objext' 85629- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85630- (eval $ac_try) 2>&5 85631- ac_status=$? 85632- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85633- (exit $ac_status); }; }; then 85634- ac_hi=$ac_mid 85635-else 85636- echo "$as_me: failed program was:" >&5 85637-sed 's/^/| /' conftest.$ac_ext >&5 85638 85639-ac_lo=`expr '(' $ac_mid ')' + 1` 85640-fi 85641-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85642-done 85643-case $ac_lo in 85644-?*) ac_cv_sizeof_long=$ac_lo;; 85645-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 85646-See \`config.log' for more details." >&5 85647-echo "$as_me: error: cannot compute sizeof (long), 77 85648-See \`config.log' for more details." >&2;} 85649- { (exit 1); exit 1; }; } ;; 85650-esac 85651+ echo $ac_n "checking size of long""... $ac_c" 1>&6 85652+echo "configure:55912: checking size of long" >&5 85653+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 85654+ echo $ac_n "(cached) $ac_c" 1>&6 85655 else 85656 if test "$cross_compiling" = yes; then 85657- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 85658-See \`config.log' for more details." >&5 85659-echo "$as_me: error: cannot run test program while cross compiling 85660-See \`config.log' for more details." >&2;} 85661- { (exit 1); exit 1; }; } 85662-else 85663- cat >conftest.$ac_ext <<_ACEOF 85664-/* confdefs.h. */ 85665-_ACEOF 85666-cat confdefs.h >>conftest.$ac_ext 85667-cat >>conftest.$ac_ext <<_ACEOF 85668-/* end confdefs.h. */ 85669-$ac_includes_default 85670-long longval () { return (long) (sizeof (long)); } 85671-unsigned long ulongval () { return (long) (sizeof (long)); } 85672+ ac_cv_sizeof_long=4 85673+else 85674+ cat > conftest.$ac_ext <<EOF 85675+#line 55920 "configure" 85676+#include "confdefs.h" 85677 #include <stdio.h> 85678-#include <stdlib.h> 85679-int 85680-main () 85681+main() 85682 { 85683- 85684- FILE *f = fopen ("conftest.val", "w"); 85685- if (! f) 85686- exit (1); 85687- if (((long) (sizeof (long))) < 0) 85688- { 85689- long i = longval (); 85690- if (i != ((long) (sizeof (long)))) 85691- exit (1); 85692- fprintf (f, "%ld\n", i); 85693- } 85694- else 85695- { 85696- unsigned long i = ulongval (); 85697- if (i != ((long) (sizeof (long)))) 85698- exit (1); 85699- fprintf (f, "%lu\n", i); 85700- } 85701- exit (ferror (f) || fclose (f) != 0); 85702- 85703- ; 85704- return 0; 85705+ FILE *f=fopen("conftestval", "w"); 85706+ if (!f) exit(1); 85707+ fprintf(f, "%d\n", sizeof(long)); 85708+ exit(0); 85709 } 85710-_ACEOF 85711-rm -f conftest$ac_exeext 85712-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 85713- (eval $ac_link) 2>&5 85714- ac_status=$? 85715- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85716- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 85717- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85718- (eval $ac_try) 2>&5 85719- ac_status=$? 85720- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85721- (exit $ac_status); }; }; then 85722- ac_cv_sizeof_long=`cat conftest.val` 85723-else 85724- echo "$as_me: program exited with status $ac_status" >&5 85725-echo "$as_me: failed program was:" >&5 85726-sed 's/^/| /' conftest.$ac_ext >&5 85727- 85728-( exit $ac_status ) 85729-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 85730-See \`config.log' for more details." >&5 85731-echo "$as_me: error: cannot compute sizeof (long), 77 85732-See \`config.log' for more details." >&2;} 85733- { (exit 1); exit 1; }; } 85734-fi 85735-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 85736-fi 85737-fi 85738-rm -f conftest.val 85739+EOF 85740+if { (eval echo configure:55931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 85741+then 85742+ ac_cv_sizeof_long=`cat conftestval` 85743 else 85744+ echo "configure: failed program was:" >&5 85745+ cat conftest.$ac_ext >&5 85746+ rm -fr conftest* 85747 ac_cv_sizeof_long=0 85748 fi 85749+rm -fr conftest* 85750 fi 85751-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 85752-echo "${ECHO_T}$ac_cv_sizeof_long" >&6 85753-cat >>confdefs.h <<_ACEOF 85754-#define SIZEOF_LONG $ac_cv_sizeof_long 85755-_ACEOF 85756 85757+fi 85758+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 85759+cat >> confdefs.h <<EOF 85760+#define SIZEOF_LONG $ac_cv_sizeof_long 85761+EOF 85762 85763- echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 85764-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 85765-if test "${ac_cv_c_const+set}" = set; then 85766- echo $ECHO_N "(cached) $ECHO_C" >&6 85767-else 85768- cat >conftest.$ac_ext <<_ACEOF 85769-/* confdefs.h. */ 85770-_ACEOF 85771-cat confdefs.h >>conftest.$ac_ext 85772-cat >>conftest.$ac_ext <<_ACEOF 85773-/* end confdefs.h. */ 85774 85775-int 85776-main () 85777-{ 85778-/* FIXME: Include the comments suggested by Paul. */ 85779-#ifndef __cplusplus 85780- /* Ultrix mips cc rejects this. */ 85781- typedef int charset[2]; 85782- const charset x; 85783- /* SunOS 4.1.1 cc rejects this. */ 85784- char const *const *ccp; 85785- char **p; 85786- /* NEC SVR4.0.2 mips cc rejects this. */ 85787- struct point {int x, y;}; 85788- static struct point const zero = {0,0}; 85789- /* AIX XL C 1.02.0.0 rejects this. 85790- It does not let you subtract one const X* pointer from another in 85791- an arm of an if-expression whose if-part is not a constant 85792- expression */ 85793- const char *g = "string"; 85794- ccp = &g + (g ? g-g : 0); 85795- /* HPUX 7.0 cc rejects these. */ 85796- ++ccp; 85797- p = (char**) ccp; 85798- ccp = (char const *const *) p; 85799- { /* SCO 3.2v4 cc rejects this. */ 85800- char *t; 85801- char const *s = 0 ? (char *) 0 : (char const *) 0; 85802+ echo $ac_n "checking for working const""... $ac_c" 1>&6 85803+echo "configure:55951: checking for working const" >&5 85804+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 85805+ echo $ac_n "(cached) $ac_c" 1>&6 85806+else 85807+ cat > conftest.$ac_ext <<EOF 85808+#line 55956 "configure" 85809+#include "confdefs.h" 85810 85811- *t++ = 0; 85812- } 85813- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ 85814- int x[] = {25, 17}; 85815- const int *foo = &x[0]; 85816- ++foo; 85817- } 85818- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ 85819- typedef const int *iptr; 85820- iptr p = 0; 85821- ++p; 85822- } 85823- { /* AIX XL C 1.02.0.0 rejects this saying 85824- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ 85825- struct s { int j; const int *ap[3]; }; 85826- struct s *b; b->j = 5; 85827- } 85828- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ 85829- const int foo = 10; 85830- } 85831-#endif 85832+int main() { 85833 85834- ; 85835- return 0; 85836+/* Ultrix mips cc rejects this. */ 85837+typedef int charset[2]; const charset x; 85838+/* SunOS 4.1.1 cc rejects this. */ 85839+char const *const *ccp; 85840+char **p; 85841+/* NEC SVR4.0.2 mips cc rejects this. */ 85842+struct point {int x, y;}; 85843+static struct point const zero = {0,0}; 85844+/* AIX XL C 1.02.0.0 rejects this. 85845+ It does not let you subtract one const X* pointer from another in an arm 85846+ of an if-expression whose if-part is not a constant expression */ 85847+const char *g = "string"; 85848+ccp = &g + (g ? g-g : 0); 85849+/* HPUX 7.0 cc rejects these. */ 85850+++ccp; 85851+p = (char**) ccp; 85852+ccp = (char const *const *) p; 85853+{ /* SCO 3.2v4 cc rejects this. */ 85854+ char *t; 85855+ char const *s = 0 ? (char *) 0 : (char const *) 0; 85856+ 85857+ *t++ = 0; 85858+} 85859+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ 85860+ int x[] = {25, 17}; 85861+ const int *foo = &x[0]; 85862+ ++foo; 85863+} 85864+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ 85865+ typedef const int *iptr; 85866+ iptr p = 0; 85867+ ++p; 85868+} 85869+{ /* AIX XL C 1.02.0.0 rejects this saying 85870+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ 85871+ struct s { int j; const int *ap[3]; }; 85872+ struct s *b; b->j = 5; 85873 } 85874-_ACEOF 85875-rm -f conftest.$ac_objext 85876-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85877- (eval $ac_compile) 2>conftest.er1 85878- ac_status=$? 85879- grep -v '^ *+' conftest.er1 >conftest.err 85880- rm -f conftest.er1 85881- cat conftest.err >&5 85882- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85883- (exit $ac_status); } && 85884- { ac_try='test -z "$ac_c_werror_flag" 85885- || test ! -s conftest.err' 85886- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85887- (eval $ac_try) 2>&5 85888- ac_status=$? 85889- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85890- (exit $ac_status); }; } && 85891- { ac_try='test -s conftest.$ac_objext' 85892- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85893- (eval $ac_try) 2>&5 85894- ac_status=$? 85895- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85896- (exit $ac_status); }; }; then 85897+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ 85898+ const int foo = 10; 85899+} 85900+ 85901+; return 0; } 85902+EOF 85903+if { (eval echo configure:56005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 85904+ rm -rf conftest* 85905 ac_cv_c_const=yes 85906 else 85907- echo "$as_me: failed program was:" >&5 85908-sed 's/^/| /' conftest.$ac_ext >&5 85909- 85910-ac_cv_c_const=no 85911+ echo "configure: failed program was:" >&5 85912+ cat conftest.$ac_ext >&5 85913+ rm -rf conftest* 85914+ ac_cv_c_const=no 85915 fi 85916-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 85917+rm -f conftest* 85918 fi 85919-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 85920-echo "${ECHO_T}$ac_cv_c_const" >&6 85921-if test $ac_cv_c_const = no; then 85922 85923-cat >>confdefs.h <<\_ACEOF 85924-#define const 85925-_ACEOF 85926+echo "$ac_t""$ac_cv_c_const" 1>&6 85927+if test $ac_cv_c_const = no; then 85928+ cat >> confdefs.h <<\EOF 85929+#define const 85930+EOF 85931 85932 fi 85933 85934- echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 85935-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 85936-if test "${ac_cv_header_time+set}" = set; then 85937- echo $ECHO_N "(cached) $ECHO_C" >&6 85938-else 85939- cat >conftest.$ac_ext <<_ACEOF 85940-/* confdefs.h. */ 85941-_ACEOF 85942-cat confdefs.h >>conftest.$ac_ext 85943-cat >>conftest.$ac_ext <<_ACEOF 85944-/* end confdefs.h. */ 85945+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 85946+echo "configure:56026: checking whether time.h and sys/time.h may both be included" >&5 85947+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 85948+ echo $ac_n "(cached) $ac_c" 1>&6 85949+else 85950+ cat > conftest.$ac_ext <<EOF 85951+#line 56031 "configure" 85952+#include "confdefs.h" 85953 #include <sys/types.h> 85954 #include <sys/time.h> 85955 #include <time.h> 85956- 85957-int 85958-main () 85959-{ 85960-if ((struct tm *) 0) 85961-return 0; 85962- ; 85963- return 0; 85964-} 85965-_ACEOF 85966-rm -f conftest.$ac_objext 85967-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 85968- (eval $ac_compile) 2>conftest.er1 85969- ac_status=$? 85970- grep -v '^ *+' conftest.er1 >conftest.err 85971- rm -f conftest.er1 85972- cat conftest.err >&5 85973- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85974- (exit $ac_status); } && 85975- { ac_try='test -z "$ac_c_werror_flag" 85976- || test ! -s conftest.err' 85977- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85978- (eval $ac_try) 2>&5 85979- ac_status=$? 85980- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85981- (exit $ac_status); }; } && 85982- { ac_try='test -s conftest.$ac_objext' 85983- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 85984- (eval $ac_try) 2>&5 85985- ac_status=$? 85986- echo "$as_me:$LINENO: \$? = $ac_status" >&5 85987- (exit $ac_status); }; }; then 85988+int main() { 85989+struct tm *tp; 85990+; return 0; } 85991+EOF 85992+if { (eval echo configure:56040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 85993+ rm -rf conftest* 85994 ac_cv_header_time=yes 85995 else 85996- echo "$as_me: failed program was:" >&5 85997-sed 's/^/| /' conftest.$ac_ext >&5 85998- 85999-ac_cv_header_time=no 86000+ echo "configure: failed program was:" >&5 86001+ cat conftest.$ac_ext >&5 86002+ rm -rf conftest* 86003+ ac_cv_header_time=no 86004 fi 86005-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 86006+rm -f conftest* 86007 fi 86008-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 86009-echo "${ECHO_T}$ac_cv_header_time" >&6 86010-if test $ac_cv_header_time = yes; then 86011 86012-cat >>confdefs.h <<\_ACEOF 86013+echo "$ac_t""$ac_cv_header_time" 1>&6 86014+if test $ac_cv_header_time = yes; then 86015+ cat >> confdefs.h <<\EOF 86016 #define TIME_WITH_SYS_TIME 1 86017-_ACEOF 86018+EOF 86019 86020 fi 86021- 86022+ 86023 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works 86024 # for constant arguments. Useless! 86025-echo "$as_me:$LINENO: checking for working alloca.h" >&5 86026-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 86027-if test "${ac_cv_working_alloca_h+set}" = set; then 86028- echo $ECHO_N "(cached) $ECHO_C" >&6 86029-else 86030- cat >conftest.$ac_ext <<_ACEOF 86031-/* confdefs.h. */ 86032-_ACEOF 86033-cat confdefs.h >>conftest.$ac_ext 86034-cat >>conftest.$ac_ext <<_ACEOF 86035-/* end confdefs.h. */ 86036+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 86037+echo "configure:56063: checking for working alloca.h" >&5 86038+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 86039+ echo $ac_n "(cached) $ac_c" 1>&6 86040+else 86041+ cat > conftest.$ac_ext <<EOF 86042+#line 56068 "configure" 86043+#include "confdefs.h" 86044 #include <alloca.h> 86045-int 86046-main () 86047-{ 86048-char *p = (char *) alloca (2 * sizeof (int)); 86049- ; 86050- return 0; 86051-} 86052-_ACEOF 86053-rm -f conftest.$ac_objext conftest$ac_exeext 86054-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 86055- (eval $ac_link) 2>conftest.er1 86056- ac_status=$? 86057- grep -v '^ *+' conftest.er1 >conftest.err 86058- rm -f conftest.er1 86059- cat conftest.err >&5 86060- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86061- (exit $ac_status); } && 86062- { ac_try='test -z "$ac_c_werror_flag" 86063- || test ! -s conftest.err' 86064- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86065- (eval $ac_try) 2>&5 86066- ac_status=$? 86067- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86068- (exit $ac_status); }; } && 86069- { ac_try='test -s conftest$ac_exeext' 86070- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86071- (eval $ac_try) 2>&5 86072- ac_status=$? 86073- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86074- (exit $ac_status); }; }; then 86075- ac_cv_working_alloca_h=yes 86076-else 86077- echo "$as_me: failed program was:" >&5 86078-sed 's/^/| /' conftest.$ac_ext >&5 86079- 86080-ac_cv_working_alloca_h=no 86081-fi 86082-rm -f conftest.err conftest.$ac_objext \ 86083- conftest$ac_exeext conftest.$ac_ext 86084-fi 86085-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 86086-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 86087-if test $ac_cv_working_alloca_h = yes; then 86088+int main() { 86089+char *p = alloca(2 * sizeof(int)); 86090+; return 0; } 86091+EOF 86092+if { (eval echo configure:56075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 86093+ rm -rf conftest* 86094+ ac_cv_header_alloca_h=yes 86095+else 86096+ echo "configure: failed program was:" >&5 86097+ cat conftest.$ac_ext >&5 86098+ rm -rf conftest* 86099+ ac_cv_header_alloca_h=no 86100+fi 86101+rm -f conftest* 86102+fi 86103 86104-cat >>confdefs.h <<\_ACEOF 86105+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 86106+if test $ac_cv_header_alloca_h = yes; then 86107+ cat >> confdefs.h <<\EOF 86108 #define HAVE_ALLOCA_H 1 86109-_ACEOF 86110+EOF 86111 86112 fi 86113 86114-echo "$as_me:$LINENO: checking for alloca" >&5 86115-echo $ECHO_N "checking for alloca... $ECHO_C" >&6 86116-if test "${ac_cv_func_alloca_works+set}" = set; then 86117- echo $ECHO_N "(cached) $ECHO_C" >&6 86118+echo $ac_n "checking for alloca""... $ac_c" 1>&6 86119+echo "configure:56096: checking for alloca" >&5 86120+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 86121+ echo $ac_n "(cached) $ac_c" 1>&6 86122 else 86123- cat >conftest.$ac_ext <<_ACEOF 86124-/* confdefs.h. */ 86125-_ACEOF 86126-cat confdefs.h >>conftest.$ac_ext 86127-cat >>conftest.$ac_ext <<_ACEOF 86128-/* end confdefs.h. */ 86129+ cat > conftest.$ac_ext <<EOF 86130+#line 56101 "configure" 86131+#include "confdefs.h" 86132+ 86133 #ifdef __GNUC__ 86134 # define alloca __builtin_alloca 86135 #else 86136@@ -74229,217 +56121,137 @@ 86137 # endif 86138 #endif 86139 86140-int 86141-main () 86142-{ 86143-char *p = (char *) alloca (1); 86144- ; 86145- return 0; 86146-} 86147-_ACEOF 86148-rm -f conftest.$ac_objext conftest$ac_exeext 86149-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 86150- (eval $ac_link) 2>conftest.er1 86151- ac_status=$? 86152- grep -v '^ *+' conftest.er1 >conftest.err 86153- rm -f conftest.er1 86154- cat conftest.err >&5 86155- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86156- (exit $ac_status); } && 86157- { ac_try='test -z "$ac_c_werror_flag" 86158- || test ! -s conftest.err' 86159- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86160- (eval $ac_try) 2>&5 86161- ac_status=$? 86162- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86163- (exit $ac_status); }; } && 86164- { ac_try='test -s conftest$ac_exeext' 86165- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86166- (eval $ac_try) 2>&5 86167- ac_status=$? 86168- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86169- (exit $ac_status); }; }; then 86170+int main() { 86171+char *p = (char *) alloca(1); 86172+; return 0; } 86173+EOF 86174+if { (eval echo configure:56129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 86175+ rm -rf conftest* 86176 ac_cv_func_alloca_works=yes 86177 else 86178- echo "$as_me: failed program was:" >&5 86179-sed 's/^/| /' conftest.$ac_ext >&5 86180- 86181-ac_cv_func_alloca_works=no 86182+ echo "configure: failed program was:" >&5 86183+ cat conftest.$ac_ext >&5 86184+ rm -rf conftest* 86185+ ac_cv_func_alloca_works=no 86186 fi 86187-rm -f conftest.err conftest.$ac_objext \ 86188- conftest$ac_exeext conftest.$ac_ext 86189+rm -f conftest* 86190 fi 86191-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 86192-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 86193 86194+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 86195 if test $ac_cv_func_alloca_works = yes; then 86196- 86197-cat >>confdefs.h <<\_ACEOF 86198+ cat >> confdefs.h <<\EOF 86199 #define HAVE_ALLOCA 1 86200-_ACEOF 86201- 86202-else 86203- # The SVR3 libPW and SVR4 libucb both contain incompatible functions 86204-# that cause trouble. Some versions do not even contain alloca or 86205-# contain a buggy version. If you still want to use their alloca, 86206-# use ar to extract alloca.o from them instead of compiling alloca.c. 86207+EOF 86208 86209-ALLOCA=alloca.$ac_objext 86210+fi 86211 86212-cat >>confdefs.h <<\_ACEOF 86213+if test $ac_cv_func_alloca_works = no; then 86214+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions 86215+ # that cause trouble. Some versions do not even contain alloca or 86216+ # contain a buggy version. If you still want to use their alloca, 86217+ # use ar to extract alloca.o from them instead of compiling alloca.c. 86218+ ALLOCA=alloca.${ac_objext} 86219+ cat >> confdefs.h <<\EOF 86220 #define C_ALLOCA 1 86221-_ACEOF 86222+EOF 86223 86224 86225-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 86226-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 86227-if test "${ac_cv_os_cray+set}" = set; then 86228- echo $ECHO_N "(cached) $ECHO_C" >&6 86229-else 86230- cat >conftest.$ac_ext <<_ACEOF 86231-/* confdefs.h. */ 86232-_ACEOF 86233-cat confdefs.h >>conftest.$ac_ext 86234-cat >>conftest.$ac_ext <<_ACEOF 86235-/* end confdefs.h. */ 86236+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 86237+echo "configure:56161: checking whether alloca needs Cray hooks" >&5 86238+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 86239+ echo $ac_n "(cached) $ac_c" 1>&6 86240+else 86241+ cat > conftest.$ac_ext <<EOF 86242+#line 56166 "configure" 86243+#include "confdefs.h" 86244 #if defined(CRAY) && ! defined(CRAY2) 86245 webecray 86246 #else 86247 wenotbecray 86248 #endif 86249 86250-_ACEOF 86251+EOF 86252 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 86253- $EGREP "webecray" >/dev/null 2>&1; then 86254+ egrep "webecray" >/dev/null 2>&1; then 86255+ rm -rf conftest* 86256 ac_cv_os_cray=yes 86257 else 86258+ rm -rf conftest* 86259 ac_cv_os_cray=no 86260 fi 86261 rm -f conftest* 86262 86263 fi 86264-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 86265-echo "${ECHO_T}$ac_cv_os_cray" >&6 86266-if test $ac_cv_os_cray = yes; then 86267- for ac_func in _getb67 GETB67 getb67; do 86268- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 86269-echo "$as_me:$LINENO: checking for $ac_func" >&5 86270-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 86271-if eval "test \"\${$as_ac_var+set}\" = set"; then 86272- echo $ECHO_N "(cached) $ECHO_C" >&6 86273-else 86274- cat >conftest.$ac_ext <<_ACEOF 86275-/* confdefs.h. */ 86276-_ACEOF 86277-cat confdefs.h >>conftest.$ac_ext 86278-cat >>conftest.$ac_ext <<_ACEOF 86279-/* end confdefs.h. */ 86280-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 86281- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 86282-#define $ac_func innocuous_$ac_func 86283 86284+echo "$ac_t""$ac_cv_os_cray" 1>&6 86285+if test $ac_cv_os_cray = yes; then 86286+for ac_func in _getb67 GETB67 getb67; do 86287+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 86288+echo "configure:56191: checking for $ac_func" >&5 86289+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 86290+ echo $ac_n "(cached) $ac_c" 1>&6 86291+else 86292+ cat > conftest.$ac_ext <<EOF 86293+#line 56196 "configure" 86294+#include "confdefs.h" 86295 /* System header to define __stub macros and hopefully few prototypes, 86296- which can conflict with char $ac_func (); below. 86297- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 86298- <limits.h> exists even on freestanding compilers. */ 86299- 86300-#ifdef __STDC__ 86301-# include <limits.h> 86302-#else 86303-# include <assert.h> 86304-#endif 86305- 86306-#undef $ac_func 86307- 86308+ which can conflict with char $ac_func(); below. */ 86309+#include <assert.h> 86310 /* Override any gcc2 internal prototype to avoid an error. */ 86311-#ifdef __cplusplus 86312-extern "C" 86313-{ 86314-#endif 86315 /* We use char because int might match the return type of a gcc2 86316- builtin and then its argument prototype would still apply. */ 86317-char $ac_func (); 86318+ builtin and then its argument prototype would still apply. */ 86319+char $ac_func(); 86320+ 86321+int main() { 86322+ 86323 /* The GNU C library defines this for functions which it implements 86324 to always fail with ENOSYS. Some functions are actually named 86325 something starting with __ and the normal name is an alias. */ 86326 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 86327 choke me 86328 #else 86329-char (*f) () = $ac_func; 86330-#endif 86331-#ifdef __cplusplus 86332-} 86333+$ac_func(); 86334 #endif 86335 86336-int 86337-main () 86338-{ 86339-return f != $ac_func; 86340- ; 86341- return 0; 86342-} 86343-_ACEOF 86344-rm -f conftest.$ac_objext conftest$ac_exeext 86345-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 86346- (eval $ac_link) 2>conftest.er1 86347- ac_status=$? 86348- grep -v '^ *+' conftest.er1 >conftest.err 86349- rm -f conftest.er1 86350- cat conftest.err >&5 86351- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86352- (exit $ac_status); } && 86353- { ac_try='test -z "$ac_c_werror_flag" 86354- || test ! -s conftest.err' 86355- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86356- (eval $ac_try) 2>&5 86357- ac_status=$? 86358- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86359- (exit $ac_status); }; } && 86360- { ac_try='test -s conftest$ac_exeext' 86361- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86362- (eval $ac_try) 2>&5 86363- ac_status=$? 86364- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86365- (exit $ac_status); }; }; then 86366- eval "$as_ac_var=yes" 86367-else 86368- echo "$as_me: failed program was:" >&5 86369-sed 's/^/| /' conftest.$ac_ext >&5 86370- 86371-eval "$as_ac_var=no" 86372-fi 86373-rm -f conftest.err conftest.$ac_objext \ 86374- conftest$ac_exeext conftest.$ac_ext 86375-fi 86376-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 86377-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 86378-if test `eval echo '${'$as_ac_var'}'` = yes; then 86379+; return 0; } 86380+EOF 86381+if { (eval echo configure:56219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 86382+ rm -rf conftest* 86383+ eval "ac_cv_func_$ac_func=yes" 86384+else 86385+ echo "configure: failed program was:" >&5 86386+ cat conftest.$ac_ext >&5 86387+ rm -rf conftest* 86388+ eval "ac_cv_func_$ac_func=no" 86389+fi 86390+rm -f conftest* 86391+fi 86392 86393-cat >>confdefs.h <<_ACEOF 86394+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 86395+ echo "$ac_t""yes" 1>&6 86396+ cat >> confdefs.h <<EOF 86397 #define CRAY_STACKSEG_END $ac_func 86398-_ACEOF 86399+EOF 86400 86401- break 86402+ break 86403+else 86404+ echo "$ac_t""no" 1>&6 86405 fi 86406 86407- done 86408+done 86409 fi 86410 86411-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 86412-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 86413-if test "${ac_cv_c_stack_direction+set}" = set; then 86414- echo $ECHO_N "(cached) $ECHO_C" >&6 86415+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 86416+echo "configure:56246: checking stack direction for C alloca" >&5 86417+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 86418+ echo $ac_n "(cached) $ac_c" 1>&6 86419 else 86420 if test "$cross_compiling" = yes; then 86421 ac_cv_c_stack_direction=0 86422 else 86423- cat >conftest.$ac_ext <<_ACEOF 86424-/* confdefs.h. */ 86425-_ACEOF 86426-cat confdefs.h >>conftest.$ac_ext 86427-cat >>conftest.$ac_ext <<_ACEOF 86428-/* end confdefs.h. */ 86429-int 86430+ cat > conftest.$ac_ext <<EOF 86431+#line 56254 "configure" 86432+#include "confdefs.h" 86433 find_stack_direction () 86434 { 86435 static char *addr = 0; 86436@@ -74452,302 +56264,131 @@ 86437 else 86438 return (&dummy > addr) ? 1 : -1; 86439 } 86440- 86441-int 86442 main () 86443 { 86444- exit (find_stack_direction () < 0); 86445+ exit (find_stack_direction() < 0); 86446 } 86447-_ACEOF 86448-rm -f conftest$ac_exeext 86449-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 86450- (eval $ac_link) 2>&5 86451- ac_status=$? 86452- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86453- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 86454- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86455- (eval $ac_try) 2>&5 86456- ac_status=$? 86457- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86458- (exit $ac_status); }; }; then 86459+EOF 86460+if { (eval echo configure:56273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 86461+then 86462 ac_cv_c_stack_direction=1 86463 else 86464- echo "$as_me: program exited with status $ac_status" >&5 86465-echo "$as_me: failed program was:" >&5 86466-sed 's/^/| /' conftest.$ac_ext >&5 86467- 86468-( exit $ac_status ) 86469-ac_cv_c_stack_direction=-1 86470+ echo "configure: failed program was:" >&5 86471+ cat conftest.$ac_ext >&5 86472+ rm -fr conftest* 86473+ ac_cv_c_stack_direction=-1 86474 fi 86475-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 86476+rm -fr conftest* 86477 fi 86478+ 86479 fi 86480-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 86481-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 86482 86483-cat >>confdefs.h <<_ACEOF 86484+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 86485+cat >> confdefs.h <<EOF 86486 #define STACK_DIRECTION $ac_cv_c_stack_direction 86487-_ACEOF 86488- 86489+EOF 86490 86491 fi 86492 86493- echo "$as_me:$LINENO: checking for working memcmp" >&5 86494-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 86495-if test "${ac_cv_func_memcmp_working+set}" = set; then 86496- echo $ECHO_N "(cached) $ECHO_C" >&6 86497+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 86498+echo "configure:56295: checking for 8-bit clean memcmp" >&5 86499+if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then 86500+ echo $ac_n "(cached) $ac_c" 1>&6 86501 else 86502 if test "$cross_compiling" = yes; then 86503- ac_cv_func_memcmp_working=no 86504+ ac_cv_func_memcmp_clean=no 86505 else 86506- cat >conftest.$ac_ext <<_ACEOF 86507-/* confdefs.h. */ 86508-_ACEOF 86509-cat confdefs.h >>conftest.$ac_ext 86510-cat >>conftest.$ac_ext <<_ACEOF 86511-/* end confdefs.h. */ 86512-$ac_includes_default 86513-int 86514-main () 86515-{ 86516+ cat > conftest.$ac_ext <<EOF 86517+#line 56303 "configure" 86518+#include "confdefs.h" 86519 86520- /* Some versions of memcmp are not 8-bit clean. */ 86521+main() 86522+{ 86523 char c0 = 0x40, c1 = 0x80, c2 = 0x81; 86524- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) 86525- exit (1); 86526- 86527- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes 86528- or more and with at least one buffer not starting on a 4-byte boundary. 86529- William Lewis provided this test program. */ 86530- { 86531- char foo[21]; 86532- char bar[21]; 86533- int i; 86534- for (i = 0; i < 4; i++) 86535- { 86536- char *a = foo + i; 86537- char *b = bar + i; 86538- strcpy (a, "--------01111111"); 86539- strcpy (b, "--------10000000"); 86540- if (memcmp (a, b, 16) >= 0) 86541- exit (1); 86542- } 86543- exit (0); 86544- } 86545- 86546- ; 86547- return 0; 86548+ exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); 86549 } 86550-_ACEOF 86551-rm -f conftest$ac_exeext 86552-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 86553- (eval $ac_link) 2>&5 86554- ac_status=$? 86555- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86556- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 86557- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86558- (eval $ac_try) 2>&5 86559- ac_status=$? 86560- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86561- (exit $ac_status); }; }; then 86562- ac_cv_func_memcmp_working=yes 86563-else 86564- echo "$as_me: program exited with status $ac_status" >&5 86565-echo "$as_me: failed program was:" >&5 86566-sed 's/^/| /' conftest.$ac_ext >&5 86567- 86568-( exit $ac_status ) 86569-ac_cv_func_memcmp_working=no 86570-fi 86571-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 86572-fi 86573-fi 86574-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 86575-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 86576-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in 86577- "memcmp.$ac_objext" | \ 86578- *" memcmp.$ac_objext" | \ 86579- "memcmp.$ac_objext "* | \ 86580- *" memcmp.$ac_objext "* ) ;; 86581- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; 86582-esac 86583- 86584 86585- if test "${ac_cv_header_stdarg_h+set}" = set; then 86586- echo "$as_me:$LINENO: checking for stdarg.h" >&5 86587-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6 86588-if test "${ac_cv_header_stdarg_h+set}" = set; then 86589- echo $ECHO_N "(cached) $ECHO_C" >&6 86590-fi 86591-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5 86592-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6 86593-else 86594- # Is the header compilable? 86595-echo "$as_me:$LINENO: checking stdarg.h usability" >&5 86596-echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6 86597-cat >conftest.$ac_ext <<_ACEOF 86598-/* confdefs.h. */ 86599-_ACEOF 86600-cat confdefs.h >>conftest.$ac_ext 86601-cat >>conftest.$ac_ext <<_ACEOF 86602-/* end confdefs.h. */ 86603-$ac_includes_default 86604-#include <stdarg.h> 86605-_ACEOF 86606-rm -f conftest.$ac_objext 86607-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 86608- (eval $ac_compile) 2>conftest.er1 86609- ac_status=$? 86610- grep -v '^ *+' conftest.er1 >conftest.err 86611- rm -f conftest.er1 86612- cat conftest.err >&5 86613- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86614- (exit $ac_status); } && 86615- { ac_try='test -z "$ac_c_werror_flag" 86616- || test ! -s conftest.err' 86617- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86618- (eval $ac_try) 2>&5 86619- ac_status=$? 86620- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86621- (exit $ac_status); }; } && 86622- { ac_try='test -s conftest.$ac_objext' 86623- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 86624- (eval $ac_try) 2>&5 86625- ac_status=$? 86626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86627- (exit $ac_status); }; }; then 86628- ac_header_compiler=yes 86629-else 86630- echo "$as_me: failed program was:" >&5 86631-sed 's/^/| /' conftest.$ac_ext >&5 86632- 86633-ac_header_compiler=no 86634-fi 86635-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 86636-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 86637-echo "${ECHO_T}$ac_header_compiler" >&6 86638- 86639-# Is the header present? 86640-echo "$as_me:$LINENO: checking stdarg.h presence" >&5 86641-echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6 86642-cat >conftest.$ac_ext <<_ACEOF 86643-/* confdefs.h. */ 86644-_ACEOF 86645-cat confdefs.h >>conftest.$ac_ext 86646-cat >>conftest.$ac_ext <<_ACEOF 86647-/* end confdefs.h. */ 86648-#include <stdarg.h> 86649-_ACEOF 86650-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 86651- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 86652- ac_status=$? 86653- grep -v '^ *+' conftest.er1 >conftest.err 86654- rm -f conftest.er1 86655- cat conftest.err >&5 86656- echo "$as_me:$LINENO: \$? = $ac_status" >&5 86657- (exit $ac_status); } >/dev/null; then 86658- if test -s conftest.err; then 86659- ac_cpp_err=$ac_c_preproc_warn_flag 86660- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 86661- else 86662- ac_cpp_err= 86663- fi 86664-else 86665- ac_cpp_err=yes 86666-fi 86667-if test -z "$ac_cpp_err"; then 86668- ac_header_preproc=yes 86669-else 86670- echo "$as_me: failed program was:" >&5 86671-sed 's/^/| /' conftest.$ac_ext >&5 86672- 86673- ac_header_preproc=no 86674-fi 86675-rm -f conftest.err conftest.$ac_ext 86676-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 86677-echo "${ECHO_T}$ac_header_preproc" >&6 86678- 86679-# So? What about this header? 86680-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 86681- yes:no: ) 86682- { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5 86683-echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 86684- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5 86685-echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;} 86686- ac_header_preproc=yes 86687- ;; 86688- no:yes:* ) 86689- { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5 86690-echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;} 86691- { echo "$as_me:$LINENO: WARNING: stdarg.h: check for missing prerequisite headers?" >&5 86692-echo "$as_me: WARNING: stdarg.h: check for missing prerequisite headers?" >&2;} 86693- { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5 86694-echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;} 86695- { echo "$as_me:$LINENO: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&5 86696-echo "$as_me: WARNING: stdarg.h: section \"Present But Cannot Be Compiled\"" >&2;} 86697- { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5 86698-echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;} 86699- { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5 86700-echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;} 86701- ( 86702- cat <<\_ASBOX 86703-## ------------------------------------------ ## 86704-## Report this to the AC_PACKAGE_NAME lists. ## 86705-## ------------------------------------------ ## 86706-_ASBOX 86707- ) | 86708- sed "s/^/$as_me: WARNING: /" >&2 86709- ;; 86710-esac 86711-echo "$as_me:$LINENO: checking for stdarg.h" >&5 86712-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6 86713-if test "${ac_cv_header_stdarg_h+set}" = set; then 86714- echo $ECHO_N "(cached) $ECHO_C" >&6 86715+EOF 86716+if { (eval echo configure:56313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 86717+then 86718+ ac_cv_func_memcmp_clean=yes 86719 else 86720- ac_cv_header_stdarg_h=$ac_header_preproc 86721+ echo "configure: failed program was:" >&5 86722+ cat conftest.$ac_ext >&5 86723+ rm -fr conftest* 86724+ ac_cv_func_memcmp_clean=no 86725+fi 86726+rm -fr conftest* 86727 fi 86728-echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5 86729-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6 86730 86731 fi 86732-if test $ac_cv_header_stdarg_h = yes; then 86733 86734+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 86735+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" 86736 86737-cat >>confdefs.h <<\_ACEOF 86738+ ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` 86739+echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 86740+echo "configure:56332: checking for stdarg.h" >&5 86741+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 86742+ echo $ac_n "(cached) $ac_c" 1>&6 86743+else 86744+ cat > conftest.$ac_ext <<EOF 86745+#line 56337 "configure" 86746+#include "confdefs.h" 86747+#include <stdarg.h> 86748+EOF 86749+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 86750+{ (eval echo configure:56342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 86751+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 86752+if test -z "$ac_err"; then 86753+ rm -rf conftest* 86754+ eval "ac_cv_header_$ac_safe=yes" 86755+else 86756+ echo "$ac_err" >&5 86757+ echo "configure: failed program was:" >&5 86758+ cat conftest.$ac_ext >&5 86759+ rm -rf conftest* 86760+ eval "ac_cv_header_$ac_safe=no" 86761+fi 86762+rm -f conftest* 86763+fi 86764+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 86765+ echo "$ac_t""yes" 1>&6 86766+ 86767+ cat >> confdefs.h <<\EOF 86768 #define HAVE_STDARG_PROTOTYPES 1 86769-_ACEOF 86770- 86771+EOF 86772 86773+ 86774+else 86775+ echo "$ac_t""no" 1>&6 86776 fi 86777 86778- 86779- 86780-cat >>confdefs.h <<\_ACEOF 86781+ cat >> confdefs.h <<\EOF 86782 #define PHP_ONIG_BUNDLED 1 86783-_ACEOF 86784- 86785+EOF 86786 86787-cat >>confdefs.h <<\_ACEOF 86788+ cat >> confdefs.h <<\EOF 86789 #define HAVE_ONIG 1 86790-_ACEOF 86791- 86792- 86793+EOF 86794+ 86795+ 86796 PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" 86797 86798- 86799+ 86800 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" 86801 86802- 86803+ 86804 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" 86805 86806- 86807+ 86808 PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" 86809 86810- 86811+ 86812 PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" 86813 86814- 86815- PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 86816+ 86817+ PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 86818 oniguruma/regcomp.c 86819 oniguruma/regerror.c 86820 oniguruma/regexec.c 86821@@ -74790,66 +56431,64 @@ 86822 oniguruma/enc/utf32_le.c 86823 " 86824 86825- 86826+ 86827 PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h" 86828 86829 else 86830 if test ! -f "$PHP_ONIG/include/oniguruma.h"; then 86831- { { echo "$as_me:$LINENO: error: oniguruma.h not found in $PHP_ONIG/include" >&5 86832-echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;} 86833- { (exit 1); exit 1; }; } 86834+ { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } 86835 fi 86836- 86837+ 86838 if test "$PHP_ONIG/include" != "/usr/include"; then 86839- 86840+ 86841 if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then 86842 ai_p=$PHP_ONIG/include 86843 else 86844- 86845+ 86846 ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" 86847- 86848+ 86849 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 86850 ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" 86851 fi 86852 86853- 86854- 86855+ 86856+ 86857 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 86858- 86859+ 86860 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 86861 if test -n "$unique" && test "`eval $cmd`" = "" ; then 86862 eval "INCLUDEPATH$unique=set" 86863- 86864+ 86865 if test ""; then 86866 INCLUDES="-I$ai_p $INCLUDES" 86867 else 86868 INCLUDES="$INCLUDES -I$ai_p" 86869 fi 86870- 86871+ 86872 fi 86873 86874 fi 86875 86876 86877- 86878+ 86879 save_old_LDFLAGS=$LDFLAGS 86880 ac_stuff=" 86881 -L$PHP_ONIG/$PHP_LIBDIR 86882 " 86883- 86884+ 86885 save_ext_shared=$ext_shared 86886 ext_shared=yes 86887- 86888+ 86889 for ac_i in $ac_stuff; do 86890 case $ac_i in 86891 -pthread) 86892 if test "$ext_shared" = "yes"; then 86893 LDFLAGS="$LDFLAGS -pthread" 86894 else 86895- 86896- 86897+ 86898+ 86899 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 86900- 86901+ 86902 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 86903 if test -n "$unique" && test "`eval $cmd`" = "" ; then 86904 eval "EXTRA_LDFLAGS$unique=set" 86905@@ -74860,20 +56499,20 @@ 86906 ;; 86907 -l*) 86908 ac_ii=`echo $ac_i|cut -c 3-` 86909- 86910- 86911+ 86912+ 86913 case $ac_ii in 86914 c|c_r|pthread*) ;; 86915- *) 86916+ *) 86917 if test "$ext_shared" = "yes"; then 86918- LDFLAGS="$LDFLAGS -l$ac_ii" 86919+ LDFLAGS="$LDFLAGS -l$ac_ii" 86920 else 86921- 86922- 86923+ 86924+ 86925 case $ac_ii in 86926 c|c_r|pthread*) ;; 86927- *) 86928- LIBS="$LIBS -l$ac_ii" 86929+ *) 86930+ LIBS="$LIBS -l$ac_ii" 86931 ;; 86932 esac 86933 86934@@ -74886,205 +56525,175 @@ 86935 ;; 86936 -L*) 86937 ac_ii=`echo $ac_i|cut -c 3-` 86938- 86939+ 86940 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 86941- 86942+ 86943 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 86944 ai_p=$ac_ii 86945 else 86946- 86947+ 86948 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 86949- 86950+ 86951 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 86952 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 86953 fi 86954 86955- 86956+ 86957 if test "$ext_shared" = "yes"; then 86958 LDFLAGS="-L$ai_p $LDFLAGS" 86959 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 86960 else 86961- 86962- 86963- 86964+ 86965+ 86966+ 86967 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 86968- 86969+ 86970 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 86971 if test -n "$unique" && test "`eval $cmd`" = "" ; then 86972 eval "LIBPATH$unique=set" 86973- 86974+ 86975 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 86976 LDFLAGS="$LDFLAGS -L$ai_p" 86977 PHP_RPATHS="$PHP_RPATHS $ai_p" 86978- 86979+ 86980 fi 86981 86982 86983 fi 86984- 86985+ 86986 fi 86987 86988 ;; 86989 esac 86990 done 86991 86992- echo "$as_me:$LINENO: checking for onig_init in -lonig" >&5 86993-echo $ECHO_N "checking for onig_init in -lonig... $ECHO_C" >&6 86994-if test "${ac_cv_lib_onig_onig_init+set}" = set; then 86995- echo $ECHO_N "(cached) $ECHO_C" >&6 86996+ echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 86997+echo "configure:56572: checking for onig_init in -lonig" >&5 86998+ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` 86999+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 87000+ echo $ac_n "(cached) $ac_c" 1>&6 87001 else 87002- ac_check_lib_save_LIBS=$LIBS 87003+ ac_save_LIBS="$LIBS" 87004 LIBS="-lonig $LIBS" 87005-cat >conftest.$ac_ext <<_ACEOF 87006-/* confdefs.h. */ 87007-_ACEOF 87008-cat confdefs.h >>conftest.$ac_ext 87009-cat >>conftest.$ac_ext <<_ACEOF 87010-/* end confdefs.h. */ 87011- 87012+cat > conftest.$ac_ext <<EOF 87013+#line 56580 "configure" 87014+#include "confdefs.h" 87015 /* Override any gcc2 internal prototype to avoid an error. */ 87016-#ifdef __cplusplus 87017-extern "C" 87018-#endif 87019 /* We use char because int might match the return type of a gcc2 87020- builtin and then its argument prototype would still apply. */ 87021-char onig_init (); 87022-int 87023-main () 87024-{ 87025-onig_init (); 87026- ; 87027- return 0; 87028-} 87029-_ACEOF 87030-rm -f conftest.$ac_objext conftest$ac_exeext 87031-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 87032- (eval $ac_link) 2>conftest.er1 87033- ac_status=$? 87034- grep -v '^ *+' conftest.er1 >conftest.err 87035- rm -f conftest.er1 87036- cat conftest.err >&5 87037- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87038- (exit $ac_status); } && 87039- { ac_try='test -z "$ac_c_werror_flag" 87040- || test ! -s conftest.err' 87041- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87042- (eval $ac_try) 2>&5 87043- ac_status=$? 87044- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87045- (exit $ac_status); }; } && 87046- { ac_try='test -s conftest$ac_exeext' 87047- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87048- (eval $ac_try) 2>&5 87049- ac_status=$? 87050- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87051- (exit $ac_status); }; }; then 87052- ac_cv_lib_onig_onig_init=yes 87053-else 87054- echo "$as_me: failed program was:" >&5 87055-sed 's/^/| /' conftest.$ac_ext >&5 87056- 87057-ac_cv_lib_onig_onig_init=no 87058-fi 87059-rm -f conftest.err conftest.$ac_objext \ 87060- conftest$ac_exeext conftest.$ac_ext 87061-LIBS=$ac_check_lib_save_LIBS 87062-fi 87063-echo "$as_me:$LINENO: result: $ac_cv_lib_onig_onig_init" >&5 87064-echo "${ECHO_T}$ac_cv_lib_onig_onig_init" >&6 87065-if test $ac_cv_lib_onig_onig_init = yes; then 87066+ builtin and then its argument prototype would still apply. */ 87067+char onig_init(); 87068+ 87069+int main() { 87070+onig_init() 87071+; return 0; } 87072+EOF 87073+if { (eval echo configure:56591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 87074+ rm -rf conftest* 87075+ eval "ac_cv_lib_$ac_lib_var=yes" 87076+else 87077+ echo "configure: failed program was:" >&5 87078+ cat conftest.$ac_ext >&5 87079+ rm -rf conftest* 87080+ eval "ac_cv_lib_$ac_lib_var=no" 87081+fi 87082+rm -f conftest* 87083+LIBS="$ac_save_LIBS" 87084 87085+fi 87086+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 87087+ echo "$ac_t""yes" 1>&6 87088+ 87089 LDFLAGS=$save_old_LDFLAGS 87090 ext_shared=$save_ext_shared 87091- 87092- 87093+ 87094+ 87095 87096 if test "$ext_shared" = "yes"; then 87097 MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" 87098 if test -n "$PHP_ONIG/$PHP_LIBDIR"; then 87099- 87100+ 87101 if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then 87102- 87103+ 87104 if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 87105 ai_p=$PHP_ONIG/$PHP_LIBDIR 87106 else 87107- 87108+ 87109 ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 87110- 87111+ 87112 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87113 ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" 87114 fi 87115 87116- 87117+ 87118 if test "$ext_shared" = "yes"; then 87119 MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" 87120 test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD" 87121 else 87122- 87123- 87124- 87125+ 87126+ 87127+ 87128 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87129- 87130+ 87131 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87132 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87133 eval "LIBPATH$unique=set" 87134- 87135+ 87136 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87137 LDFLAGS="$LDFLAGS -L$ai_p" 87138 PHP_RPATHS="$PHP_RPATHS $ai_p" 87139- 87140+ 87141 fi 87142 87143 87144 fi 87145- 87146+ 87147 fi 87148 87149 fi 87150 else 87151- 87152+ 87153 87154 if test -n "$PHP_ONIG/$PHP_LIBDIR"; then 87155- 87156+ 87157 if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then 87158- 87159+ 87160 if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 87161 ai_p=$PHP_ONIG/$PHP_LIBDIR 87162 else 87163- 87164+ 87165 ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 87166- 87167+ 87168 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87169 ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" 87170 fi 87171 87172- 87173- 87174- 87175- 87176+ 87177+ 87178+ 87179+ 87180 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87181- 87182+ 87183 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87184 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87185 eval "LIBPATH$unique=set" 87186- 87187+ 87188 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87189 LDFLAGS="$LDFLAGS -L$ai_p" 87190 PHP_RPATHS="$PHP_RPATHS $ai_p" 87191- 87192+ 87193 fi 87194 87195 87196- 87197+ 87198 fi 87199 87200 fi 87201- 87202- 87203+ 87204+ 87205 case onig in 87206 c|c_r|pthread*) ;; 87207- *) 87208- LIBS="-lonig $LIBS" 87209+ *) 87210+ LIBS="-lonig $LIBS" 87211 ;; 87212 esac 87213 87214@@ -75094,39 +56703,37 @@ 87215 fi 87216 87217 87218- 87219-cat >>confdefs.h <<\_ACEOF 87220+ cat >> confdefs.h <<\EOF 87221 #define HAVE_ONIG 1 87222-_ACEOF 87223- 87224- 87225- 87226+EOF 87227+ 87228+ 87229+ 87230 else 87231+ echo "$ac_t""no" 1>&6 87232 87233 LDFLAGS=$save_old_LDFLAGS 87234 ext_shared=$save_ext_shared 87235 unset ac_cv_lib_onig_onig_init 87236- 87237- { { echo "$as_me:$LINENO: error: Problem with oniguruma. Please check config.log for more information." >&5 87238-echo "$as_me: error: Problem with oniguruma. Please check config.log for more information." >&2;} 87239- { (exit 1); exit 1; }; } 87240- 87241- 87242+ 87243+ { echo "configure: error: Problem with oniguruma. Please check config.log for more information." 1>&2; exit 1; } 87244+ 87245+ 87246 fi 87247 87248 87249 save_old_LDFLAGS=$LDFLAGS 87250- 87251+ 87252 for ac_i in $MBSTRING_SHARED_LIBADD; do 87253 case $ac_i in 87254 -pthread) 87255 if test "$ext_shared" = "yes"; then 87256 LDFLAGS="$LDFLAGS -pthread" 87257 else 87258- 87259- 87260+ 87261+ 87262 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 87263- 87264+ 87265 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 87266 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87267 eval "EXTRA_LDFLAGS$unique=set" 87268@@ -75137,20 +56744,20 @@ 87269 ;; 87270 -l*) 87271 ac_ii=`echo $ac_i|cut -c 3-` 87272- 87273- 87274+ 87275+ 87276 case $ac_ii in 87277 c|c_r|pthread*) ;; 87278- *) 87279+ *) 87280 if test "$ext_shared" = "yes"; then 87281- LDFLAGS="$LDFLAGS -l$ac_ii" 87282+ LDFLAGS="$LDFLAGS -l$ac_ii" 87283 else 87284- 87285- 87286+ 87287+ 87288 case $ac_ii in 87289 c|c_r|pthread*) ;; 87290- *) 87291- LIBS="$LIBS -l$ac_ii" 87292+ *) 87293+ LIBS="$LIBS -l$ac_ii" 87294 ;; 87295 esac 87296 87297@@ -75163,163 +56770,131 @@ 87298 ;; 87299 -L*) 87300 ac_ii=`echo $ac_i|cut -c 3-` 87301- 87302+ 87303 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 87304- 87305+ 87306 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 87307 ai_p=$ac_ii 87308 else 87309- 87310+ 87311 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 87312- 87313+ 87314 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87315 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 87316 fi 87317 87318- 87319+ 87320 if test "$ext_shared" = "yes"; then 87321 LDFLAGS="-L$ai_p $LDFLAGS" 87322 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 87323 else 87324- 87325- 87326- 87327+ 87328+ 87329+ 87330 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87331- 87332+ 87333 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87334 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87335 eval "LIBPATH$unique=set" 87336- 87337+ 87338 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87339 LDFLAGS="$LDFLAGS -L$ai_p" 87340 PHP_RPATHS="$PHP_RPATHS $ai_p" 87341- 87342+ 87343 fi 87344 87345 87346 fi 87347- 87348+ 87349 fi 87350 87351 ;; 87352 esac 87353 done 87354 87355- echo "$as_me:$LINENO: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 87356-echo $ECHO_N "checking if oniguruma has an invalid entry for KOI8 encoding... $ECHO_C" >&6 87357- cat >conftest.$ac_ext <<_ACEOF 87358-/* confdefs.h. */ 87359-_ACEOF 87360-cat confdefs.h >>conftest.$ac_ext 87361-cat >>conftest.$ac_ext <<_ACEOF 87362-/* end confdefs.h. */ 87363+ echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 87364+echo "configure:56817: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 87365+ cat > conftest.$ac_ext <<EOF 87366+#line 56819 "configure" 87367+#include "confdefs.h" 87368 87369 #include <oniguruma.h> 87370- 87371-int 87372-main () 87373-{ 87374+ 87375+int main() { 87376 87377 return (int)(ONIG_ENCODING_KOI8 + 1); 87378- 87379- ; 87380- return 0; 87381-} 87382-_ACEOF 87383-rm -f conftest.$ac_objext conftest$ac_exeext 87384-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 87385- (eval $ac_link) 2>conftest.er1 87386- ac_status=$? 87387- grep -v '^ *+' conftest.er1 >conftest.err 87388- rm -f conftest.er1 87389- cat conftest.err >&5 87390- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87391- (exit $ac_status); } && 87392- { ac_try='test -z "$ac_c_werror_flag" 87393- || test ! -s conftest.err' 87394- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87395- (eval $ac_try) 2>&5 87396- ac_status=$? 87397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87398- (exit $ac_status); }; } && 87399- { ac_try='test -s conftest$ac_exeext' 87400- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87401- (eval $ac_try) 2>&5 87402- ac_status=$? 87403- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87404- (exit $ac_status); }; }; then 87405- 87406- echo "$as_me:$LINENO: result: no" >&5 87407-echo "${ECHO_T}no" >&6 87408- 87409+ 87410+; return 0; } 87411+EOF 87412+if { (eval echo configure:56830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 87413+ rm -rf conftest* 87414+ 87415+ echo "$ac_t""no" 1>&6 87416+ 87417 else 87418- echo "$as_me: failed program was:" >&5 87419-sed 's/^/| /' conftest.$ac_ext >&5 87420- 87421- 87422- echo "$as_me:$LINENO: result: yes" >&5 87423-echo "${ECHO_T}yes" >&6 87424- 87425-cat >>confdefs.h <<\_ACEOF 87426+ echo "configure: failed program was:" >&5 87427+ cat conftest.$ac_ext >&5 87428+ rm -rf conftest* 87429+ 87430+ echo "$ac_t""yes" 1>&6 87431+ cat >> confdefs.h <<\EOF 87432 #define PHP_ONIG_BAD_KOI8_ENTRY 1 87433-_ACEOF 87434- 87435+EOF 87436 87437+ 87438 fi 87439-rm -f conftest.err conftest.$ac_objext \ 87440- conftest$ac_exeext conftest.$ac_ext 87441+rm -f conftest* 87442 LDFLAGS=$save_old_LDFLAGS 87443 fi 87444 87445- 87446+ 87447 PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DONIG_ESCAPE_UCHAR_COLLISION=1" 87448 87449- 87450+ 87451 PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DUChar=OnigUChar" 87452 87453 87454- 87455-cat >>confdefs.h <<\_ACEOF 87456+ cat >> confdefs.h <<\EOF 87457 #define HAVE_MBREGEX 1 87458-_ACEOF 87459- 87460+EOF 87461 87462 87463+ 87464 PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES php_mbregex.c" 87465 87466- 87467+ 87468 PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS php_mbregex.h php_onig_compat.h" 87469 87470 fi 87471 87472 fi 87473- 87474- 87475+ 87476+ 87477 if test "$PHP_LIBMBFL" = "yes" || test "$PHP_LIBMBFL" = "no"; then 87478- 87479+ 87480 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl" 87481 87482- 87483+ 87484 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/mbfl" 87485 87486- 87487+ 87488 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/filters" 87489 87490- 87491+ 87492 PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS libmbfl/nls" 87493 87494- 87495+ 87496 PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl" 87497 87498- 87499+ 87500 PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES libmbfl/mbfl" 87501 87502- 87503+ 87504 PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS libmbfl/config.h" 87505 87506 87507- 87508- PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 87509+ 87510+ PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES 87511 libmbfl/filters/html_entities.c 87512 libmbfl/filters/mbfilter_7bit.c 87513 libmbfl/filters/mbfilter_ascii.c 87514@@ -75401,10 +56976,10 @@ 87515 libmbfl/nls/nls_ua.c 87516 " 87517 87518- 87519+ 87520 PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DHAVE_CONFIG_H" 87521 87522- 87523+ 87524 PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_allocators.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_ident.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h" 87525 87526 else 87527@@ -75416,62 +56991,60 @@ 87528 done 87529 87530 if test -z "$PHP_LIBMBFL_INCLUDE"; then 87531- { { echo "$as_me:$LINENO: error: mbfilter.h not found. Please reinstall libmbfl library." >&5 87532-echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&2;} 87533- { (exit 1); exit 1; }; } 87534- else 87535- 87536+ { echo "configure: error: mbfilter.h not found. Please reinstall libmbfl library." 1>&2; exit 1; } 87537+ else 87538+ 87539 if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then 87540- 87541+ 87542 if test -z "$PHP_LIBMBFL_INCLUDE" || echo "$PHP_LIBMBFL_INCLUDE" | grep '^/' >/dev/null ; then 87543 ai_p=$PHP_LIBMBFL_INCLUDE 87544 else 87545- 87546+ 87547 ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 87548- 87549+ 87550 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87551 ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`" 87552 fi 87553 87554- 87555- 87556+ 87557+ 87558 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87559- 87560+ 87561 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 87562 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87563 eval "INCLUDEPATH$unique=set" 87564- 87565+ 87566 if test ""; then 87567 INCLUDES="-I$ai_p $INCLUDES" 87568 else 87569 INCLUDES="$INCLUDES -I$ai_p" 87570 fi 87571- 87572+ 87573 fi 87574 87575 fi 87576 87577 fi 87578 87579- 87580+ 87581 save_old_LDFLAGS=$LDFLAGS 87582 ac_stuff=" 87583 -L$PHP_LIBMBFL/$PHP_LIBDIR 87584 " 87585- 87586+ 87587 save_ext_shared=$ext_shared 87588 ext_shared=yes 87589- 87590+ 87591 for ac_i in $ac_stuff; do 87592 case $ac_i in 87593 -pthread) 87594 if test "$ext_shared" = "yes"; then 87595 LDFLAGS="$LDFLAGS -pthread" 87596 else 87597- 87598- 87599+ 87600+ 87601 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 87602- 87603+ 87604 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 87605 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87606 eval "EXTRA_LDFLAGS$unique=set" 87607@@ -75482,20 +57055,20 @@ 87608 ;; 87609 -l*) 87610 ac_ii=`echo $ac_i|cut -c 3-` 87611- 87612- 87613+ 87614+ 87615 case $ac_ii in 87616 c|c_r|pthread*) ;; 87617- *) 87618+ *) 87619 if test "$ext_shared" = "yes"; then 87620- LDFLAGS="$LDFLAGS -l$ac_ii" 87621+ LDFLAGS="$LDFLAGS -l$ac_ii" 87622 else 87623- 87624- 87625+ 87626+ 87627 case $ac_ii in 87628 c|c_r|pthread*) ;; 87629- *) 87630- LIBS="$LIBS -l$ac_ii" 87631+ *) 87632+ LIBS="$LIBS -l$ac_ii" 87633 ;; 87634 esac 87635 87636@@ -75508,205 +57081,175 @@ 87637 ;; 87638 -L*) 87639 ac_ii=`echo $ac_i|cut -c 3-` 87640- 87641+ 87642 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 87643- 87644+ 87645 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 87646 ai_p=$ac_ii 87647 else 87648- 87649+ 87650 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 87651- 87652+ 87653 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87654 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 87655 fi 87656 87657- 87658+ 87659 if test "$ext_shared" = "yes"; then 87660 LDFLAGS="-L$ai_p $LDFLAGS" 87661 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 87662 else 87663- 87664- 87665- 87666+ 87667+ 87668+ 87669 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87670- 87671+ 87672 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87673 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87674 eval "LIBPATH$unique=set" 87675- 87676+ 87677 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87678 LDFLAGS="$LDFLAGS -L$ai_p" 87679 PHP_RPATHS="$PHP_RPATHS $ai_p" 87680- 87681+ 87682 fi 87683 87684 87685 fi 87686- 87687+ 87688 fi 87689 87690 ;; 87691 esac 87692 done 87693 87694- echo "$as_me:$LINENO: checking for mbfl_buffer_converter_new in -lmbfl" >&5 87695-echo $ECHO_N "checking for mbfl_buffer_converter_new in -lmbfl... $ECHO_C" >&6 87696-if test "${ac_cv_lib_mbfl_mbfl_buffer_converter_new+set}" = set; then 87697- echo $ECHO_N "(cached) $ECHO_C" >&6 87698+ echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 87699+echo "configure:57128: checking for mbfl_buffer_converter_new in -lmbfl" >&5 87700+ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` 87701+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 87702+ echo $ac_n "(cached) $ac_c" 1>&6 87703 else 87704- ac_check_lib_save_LIBS=$LIBS 87705+ ac_save_LIBS="$LIBS" 87706 LIBS="-lmbfl $LIBS" 87707-cat >conftest.$ac_ext <<_ACEOF 87708-/* confdefs.h. */ 87709-_ACEOF 87710-cat confdefs.h >>conftest.$ac_ext 87711-cat >>conftest.$ac_ext <<_ACEOF 87712-/* end confdefs.h. */ 87713- 87714+cat > conftest.$ac_ext <<EOF 87715+#line 57136 "configure" 87716+#include "confdefs.h" 87717 /* Override any gcc2 internal prototype to avoid an error. */ 87718-#ifdef __cplusplus 87719-extern "C" 87720-#endif 87721 /* We use char because int might match the return type of a gcc2 87722- builtin and then its argument prototype would still apply. */ 87723-char mbfl_buffer_converter_new (); 87724-int 87725-main () 87726-{ 87727-mbfl_buffer_converter_new (); 87728- ; 87729- return 0; 87730-} 87731-_ACEOF 87732-rm -f conftest.$ac_objext conftest$ac_exeext 87733-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 87734- (eval $ac_link) 2>conftest.er1 87735- ac_status=$? 87736- grep -v '^ *+' conftest.er1 >conftest.err 87737- rm -f conftest.er1 87738- cat conftest.err >&5 87739- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87740- (exit $ac_status); } && 87741- { ac_try='test -z "$ac_c_werror_flag" 87742- || test ! -s conftest.err' 87743- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87744- (eval $ac_try) 2>&5 87745- ac_status=$? 87746- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87747- (exit $ac_status); }; } && 87748- { ac_try='test -s conftest$ac_exeext' 87749- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 87750- (eval $ac_try) 2>&5 87751- ac_status=$? 87752- echo "$as_me:$LINENO: \$? = $ac_status" >&5 87753- (exit $ac_status); }; }; then 87754- ac_cv_lib_mbfl_mbfl_buffer_converter_new=yes 87755-else 87756- echo "$as_me: failed program was:" >&5 87757-sed 's/^/| /' conftest.$ac_ext >&5 87758- 87759-ac_cv_lib_mbfl_mbfl_buffer_converter_new=no 87760-fi 87761-rm -f conftest.err conftest.$ac_objext \ 87762- conftest$ac_exeext conftest.$ac_ext 87763-LIBS=$ac_check_lib_save_LIBS 87764-fi 87765-echo "$as_me:$LINENO: result: $ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&5 87766-echo "${ECHO_T}$ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&6 87767-if test $ac_cv_lib_mbfl_mbfl_buffer_converter_new = yes; then 87768+ builtin and then its argument prototype would still apply. */ 87769+char mbfl_buffer_converter_new(); 87770+ 87771+int main() { 87772+mbfl_buffer_converter_new() 87773+; return 0; } 87774+EOF 87775+if { (eval echo configure:57147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 87776+ rm -rf conftest* 87777+ eval "ac_cv_lib_$ac_lib_var=yes" 87778+else 87779+ echo "configure: failed program was:" >&5 87780+ cat conftest.$ac_ext >&5 87781+ rm -rf conftest* 87782+ eval "ac_cv_lib_$ac_lib_var=no" 87783+fi 87784+rm -f conftest* 87785+LIBS="$ac_save_LIBS" 87786 87787+fi 87788+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 87789+ echo "$ac_t""yes" 1>&6 87790+ 87791 LDFLAGS=$save_old_LDFLAGS 87792 ext_shared=$save_ext_shared 87793- 87794- 87795+ 87796+ 87797 87798 if test "$ext_shared" = "yes"; then 87799 MBSTRING_SHARED_LIBADD="-lmbfl $MBSTRING_SHARED_LIBADD" 87800 if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then 87801- 87802+ 87803 if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then 87804- 87805+ 87806 if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 87807 ai_p=$PHP_LIBMBFL/$PHP_LIBDIR 87808 else 87809- 87810+ 87811 ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 87812- 87813+ 87814 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87815 ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`" 87816 fi 87817 87818- 87819+ 87820 if test "$ext_shared" = "yes"; then 87821 MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" 87822 test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_SHARED_LIBADD" 87823 else 87824- 87825- 87826- 87827+ 87828+ 87829+ 87830 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87831- 87832+ 87833 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87834 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87835 eval "LIBPATH$unique=set" 87836- 87837+ 87838 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87839 LDFLAGS="$LDFLAGS -L$ai_p" 87840 PHP_RPATHS="$PHP_RPATHS $ai_p" 87841- 87842+ 87843 fi 87844 87845 87846 fi 87847- 87848+ 87849 fi 87850 87851 fi 87852 else 87853- 87854+ 87855 87856 if test -n "$PHP_LIBMBFL/$PHP_LIBDIR"; then 87857- 87858+ 87859 if test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_LIBMBFL/$PHP_LIBDIR" != "/usr/lib"; then 87860- 87861+ 87862 if test -z "$PHP_LIBMBFL/$PHP_LIBDIR" || echo "$PHP_LIBMBFL/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 87863 ai_p=$PHP_LIBMBFL/$PHP_LIBDIR 87864 else 87865- 87866+ 87867 ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 87868- 87869+ 87870 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 87871 ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`" 87872 fi 87873 87874- 87875- 87876- 87877- 87878+ 87879+ 87880+ 87881+ 87882 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 87883- 87884+ 87885 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 87886 if test -n "$unique" && test "`eval $cmd`" = "" ; then 87887 eval "LIBPATH$unique=set" 87888- 87889+ 87890 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 87891 LDFLAGS="$LDFLAGS -L$ai_p" 87892 PHP_RPATHS="$PHP_RPATHS $ai_p" 87893- 87894+ 87895 fi 87896 87897 87898- 87899+ 87900 fi 87901 87902 fi 87903- 87904- 87905+ 87906+ 87907 case mbfl in 87908 c|c_r|pthread*) ;; 87909- *) 87910- LIBS="-lmbfl $LIBS" 87911+ *) 87912+ LIBS="-lmbfl $LIBS" 87913 ;; 87914 esac 87915 87916@@ -75716,25 +57259,24 @@ 87917 fi 87918 87919 87920- 87921- 87922+ 87923+ 87924 else 87925+ echo "$ac_t""no" 1>&6 87926 87927 LDFLAGS=$save_old_LDFLAGS 87928 ext_shared=$save_ext_shared 87929 unset ac_cv_lib_mbfl_mbfl_buffer_converter_new 87930- 87931- { { echo "$as_me:$LINENO: error: Problem with libmbfl. Please check config.log for more information." >&5 87932-echo "$as_me: error: Problem with libmbfl. Please check config.log for more information." >&2;} 87933- { (exit 1); exit 1; }; } 87934- 87935- 87936+ 87937+ { echo "configure: error: Problem with libmbfl. Please check config.log for more information." 1>&2; exit 1; } 87938+ 87939+ 87940 fi 87941 87942 fi 87943 87944- 87945- 87946+ 87947+ 87948 ext_builddir=ext/mbstring 87949 ext_srcdir=$abs_srcdir/ext/mbstring 87950 87951@@ -75742,15 +57284,15 @@ 87952 87953 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 87954 PHP_MBSTRING_SHARED=no 87955- 87956- 87957+ 87958+ 87959 case ext/mbstring in 87960 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 87961 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 87962 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 87963 esac 87964- 87965- 87966+ 87967+ 87968 87969 b_c_pre=$php_c_pre 87970 b_cxx_pre=$php_cxx_pre 87971@@ -75763,12 +57305,12 @@ 87972 87973 old_IFS=$IFS 87974 for ac_src in $PHP_MBSTRING_SOURCES; do 87975- 87976+ 87977 IFS=. 87978 set $ac_src 87979 ac_obj=$1 87980 IFS=$old_IFS 87981- 87982+ 87983 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 87984 87985 case $ac_src in 87986@@ -75792,14 +57334,14 @@ 87987 else 87988 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 87989 PHP_MBSTRING_SHARED=yes 87990- 87991+ 87992 case ext/mbstring in 87993 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 87994 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 87995 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 87996 esac 87997- 87998- 87999+ 88000+ 88001 88002 b_c_pre=$shared_c_pre 88003 b_cxx_pre=$shared_cxx_pre 88004@@ -75812,12 +57354,12 @@ 88005 88006 old_IFS=$IFS 88007 for ac_src in $PHP_MBSTRING_SOURCES; do 88008- 88009+ 88010 IFS=. 88011 set $ac_src 88012 ac_obj=$1 88013 IFS=$old_IFS 88014- 88015+ 88016 shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo" 88017 88018 case $ac_src in 88019@@ -75835,7 +57377,7 @@ 88020 88021 case $host_alias in 88022 *netware*) 88023- 88024+ 88025 install_modules="install-modules" 88026 88027 case $host_alias in 88028@@ -75845,7 +57387,7 @@ 88029 ;; 88030 *netware*) 88031 suffix=nlm 88032- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(MBSTRING_SHARED_LIBADD)' 88033+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMBSTRING, 3)_SHARED_LIBADD)' 88034 ;; 88035 *) 88036 suffix=la 88037@@ -75858,7 +57400,7 @@ 88038 else 88039 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmbstring.$suffix" 88040 fi 88041- 88042+ 88043 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring" 88044 88045 cat >>Makefile.objects<<EOF 88046@@ -75872,7 +57414,7 @@ 88047 88048 ;; 88049 *) 88050- 88051+ 88052 install_modules="install-modules" 88053 88054 case $host_alias in 88055@@ -75882,7 +57424,7 @@ 88056 ;; 88057 *netware*) 88058 suffix=nlm 88059- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(TRING_SHARED_LIBADD)' 88060+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mbstring) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MBSTRING, 3)_SHARED_LIBADD)' 88061 ;; 88062 *) 88063 suffix=la 88064@@ -75895,7 +57437,7 @@ 88065 else 88066 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mbstring.$suffix" 88067 fi 88068- 88069+ 88070 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mbstring" 88071 88072 cat >>Makefile.objects<<EOF 88073@@ -75909,10 +57451,9 @@ 88074 88075 ;; 88076 esac 88077- 88078-cat >>confdefs.h <<_ACEOF 88079+ cat >> confdefs.h <<EOF 88080 #define COMPILE_DL_MBSTRING 1 88081-_ACEOF 88082+EOF 88083 88084 fi 88085 fi 88086@@ -75921,15 +57462,15 @@ 88087 PHP_MBSTRING_SHARED=no 88088 case "$PHP_SAPI" in 88089 cgi|embed) 88090- 88091- 88092+ 88093+ 88094 case ext/mbstring in 88095 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 88096 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 88097 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 88098 esac 88099- 88100- 88101+ 88102+ 88103 88104 b_c_pre=$php_c_pre 88105 b_cxx_pre=$php_cxx_pre 88106@@ -75942,12 +57483,12 @@ 88107 88108 old_IFS=$IFS 88109 for ac_src in $PHP_MBSTRING_SOURCES; do 88110- 88111+ 88112 IFS=. 88113 set $ac_src 88114 ac_obj=$1 88115 IFS=$old_IFS 88116- 88117+ 88118 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 88119 88120 case $ac_src in 88121@@ -75967,15 +57508,15 @@ 88122 EXT_STATIC="$EXT_STATIC mbstring" 88123 ;; 88124 *) 88125- 88126- 88127+ 88128+ 88129 case ext/mbstring in 88130 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 88131 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 88132 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 88133 esac 88134- 88135- 88136+ 88137+ 88138 88139 b_c_pre=$php_c_pre 88140 b_cxx_pre=$php_cxx_pre 88141@@ -75988,13 +57529,13 @@ 88142 88143 old_IFS=$IFS 88144 for ac_src in $PHP_MBSTRING_SOURCES; do 88145- 88146+ 88147 IFS=. 88148 set $ac_src 88149 ac_obj=$1 88150 IFS=$old_IFS 88151- 88152- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 88153+ 88154+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 88155 88156 case $ac_src in 88157 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 88158@@ -76014,90 +57555,90 @@ 88159 esac 88160 EXT_CLI_STATIC="$EXT_CLI_STATIC mbstring" 88161 fi 88162- 88163- 88164+ 88165+ 88166 BUILD_DIR="$BUILD_DIR $ext_builddir" 88167- 88168+ 88169 88170 88171 if test "$ext_builddir" = "."; then 88172 PHP_PECL_EXTENSION=mbstring 88173- 88174+ 88175 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 88176 88177 fi 88178 88179- 88180+ 88181 PHP_VAR_SUBST="$PHP_VAR_SUBST MBSTRING_SHARED_LIBADD" 88182 88183 88184 for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do 88185- 88186- 88187+ 88188+ 88189 $php_shtool mkdir -p $ext_builddir/$dir 88190- 88191+ 88192 88193 done 88194- 88195+ 88196 for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do 88197- 88198+ 88199 if test "$ext_srcdir/$dir" != "/usr/include"; then 88200- 88201+ 88202 if test -z "$ext_srcdir/$dir" || echo "$ext_srcdir/$dir" | grep '^/' >/dev/null ; then 88203 ai_p=$ext_srcdir/$dir 88204 else 88205- 88206+ 88207 ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`" 88208- 88209+ 88210 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 88211 ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`" 88212 fi 88213 88214- 88215- 88216+ 88217+ 88218 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 88219- 88220+ 88221 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 88222 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88223 eval "INCLUDEPATH$unique=set" 88224- 88225+ 88226 if test ""; then 88227 INCLUDES="-I$ai_p $INCLUDES" 88228 else 88229 INCLUDES="$INCLUDES -I$ai_p" 88230 fi 88231- 88232+ 88233 fi 88234 88235 fi 88236 88237- 88238+ 88239 if test "$ext_builddir/$dir" != "/usr/include"; then 88240- 88241+ 88242 if test -z "$ext_builddir/$dir" || echo "$ext_builddir/$dir" | grep '^/' >/dev/null ; then 88243 ai_p=$ext_builddir/$dir 88244 else 88245- 88246+ 88247 ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`" 88248- 88249+ 88250 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 88251 ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`" 88252 fi 88253 88254- 88255- 88256+ 88257+ 88258 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 88259- 88260+ 88261 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 88262 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88263 eval "INCLUDEPATH$unique=set" 88264- 88265+ 88266 if test ""; then 88267 INCLUDES="-I$ai_p $INCLUDES" 88268 else 88269 INCLUDES="$INCLUDES -I$ai_p" 88270 fi 88271- 88272+ 88273 fi 88274 88275 fi 88276@@ -76105,15 +57646,15 @@ 88277 done 88278 88279 if test "$ext_shared" = "no"; then 88280- 88281- 88282+ 88283+ 88284 case ext/mbstring in 88285 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 88286 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 88287 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 88288 esac 88289- 88290- 88291+ 88292+ 88293 88294 b_c_pre=$php_c_pre 88295 b_cxx_pre=$php_cxx_pre 88296@@ -76126,12 +57667,12 @@ 88297 88298 old_IFS=$IFS 88299 for ac_src in $PHP_MBSTRING_BASE_SOURCES; do 88300- 88301+ 88302 IFS=. 88303 set $ac_src 88304 ac_obj=$1 88305 IFS=$old_IFS 88306- 88307+ 88308 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 88309 88310 case $ac_src in 88311@@ -76150,14 +57691,14 @@ 88312 88313 out="php_config.h" 88314 else 88315- 88316+ 88317 case ext/mbstring in 88318 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 88319 /*) ac_srcdir=`echo "ext/mbstring"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 88320 *) ac_srcdir="$abs_srcdir/ext/mbstring/"; ac_bdir="ext/mbstring/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 88321 esac 88322- 88323- 88324+ 88325+ 88326 88327 b_c_pre=$shared_c_pre 88328 b_cxx_pre=$shared_cxx_pre 88329@@ -76170,12 +57711,12 @@ 88330 88331 old_IFS=$IFS 88332 for ac_src in $PHP_MBSTRING_BASE_SOURCES; do 88333- 88334+ 88335 IFS=. 88336 set $ac_src 88337 ac_obj=$1 88338 IFS=$old_IFS 88339- 88340+ 88341 shared_objects_mbstring="$shared_objects_mbstring $ac_bdir$ac_obj.lo" 88342 88343 case $ac_src in 88344@@ -76197,34 +57738,34 @@ 88345 out="php_config.h" 88346 fi 88347 fi 88348- 88349+ 88350 for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do 88351 cat > $ext_builddir/$cfg <<EOF 88352 #include "$out" 88353 EOF 88354 done 88355- 88356+ 88357 PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS mbstring.h" 88358 88359- 88360- 88361+ 88362+ 88363 header_path=ext/mbstring 88364 for header_file in $PHP_MBSTRING_INSTALL_HEADERS; do 88365 hp_hf="$header_path/$header_file" 88366- 88367- 88368+ 88369+ 88370 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 88371- 88372+ 88373 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 88374 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88375 eval "INSTALLHEADERS$unique=set" 88376- 88377+ 88378 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 88379- 88380+ 88381 fi 88382 88383- done 88384- 88385+ done 88386+ 88387 88388 88389 fi 88390@@ -76232,25 +57773,25 @@ 88391 # vim600: sts=2 sw=2 et 88392 88393 88394- 88395+ 88396 88397 88398 88399 php_with_mcrypt=no 88400 88401-echo "$as_me:$LINENO: checking for mcrypt support" >&5 88402-echo $ECHO_N "checking for mcrypt support... $ECHO_C" >&6 88403- 88404+echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 88405+echo "configure:57784: checking for mcrypt support" >&5 88406 # Check whether --with-mcrypt or --without-mcrypt was given. 88407 if test "${with_mcrypt+set}" = set; then 88408 withval="$with_mcrypt" 88409 PHP_MCRYPT=$withval 88410 else 88411- 88412+ 88413 PHP_MCRYPT=no 88414 test "$PHP_ENABLE_ALL" && PHP_MCRYPT=$PHP_ENABLE_ALL 88415 88416-fi; 88417+fi 88418+ 88419 88420 88421 ext_output="yes, shared" 88422@@ -76274,8 +57815,7 @@ 88423 88424 88425 88426-echo "$as_me:$LINENO: result: $ext_output" >&5 88427-echo "${ECHO_T}$ext_output" >&6 88428+echo "$ac_t""$ext_output" 1>&6 88429 88430 88431 88432@@ -76286,66 +57826,60 @@ 88433 done 88434 88435 if test -z "$MCRYPT_DIR"; then 88436- { { echo "$as_me:$LINENO: error: mcrypt.h not found. Please reinstall libmcrypt." >&5 88437-echo "$as_me: error: mcrypt.h not found. Please reinstall libmcrypt." >&2;} 88438- { (exit 1); exit 1; }; } 88439+ { echo "configure: error: mcrypt.h not found. Please reinstall libmcrypt." 1>&2; exit 1; } 88440 fi 88441 88442- 88443+ 88444 old_CPPFLAGS=$CPPFLAGS 88445 CPPFLAGS=-I$MCRYPT_DIR/include 88446- echo "$as_me:$LINENO: checking for libmcrypt version" >&5 88447-echo $ECHO_N "checking for libmcrypt version... $ECHO_C" >&6 88448- cat >conftest.$ac_ext <<_ACEOF 88449-/* confdefs.h. */ 88450-_ACEOF 88451-cat confdefs.h >>conftest.$ac_ext 88452-cat >>conftest.$ac_ext <<_ACEOF 88453-/* end confdefs.h. */ 88454+ echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 88455+echo "configure:57837: checking for libmcrypt version" >&5 88456+ cat > conftest.$ac_ext <<EOF 88457+#line 57839 "configure" 88458+#include "confdefs.h" 88459 88460 #include <mcrypt.h> 88461 #if MCRYPT_API_VERSION >= 20021217 88462 yes 88463 #endif 88464- 88465-_ACEOF 88466+ 88467+EOF 88468 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 88469- $EGREP "yes" >/dev/null 2>&1; then 88470- 88471- echo "$as_me:$LINENO: result: >= 2.5.6" >&5 88472-echo "${ECHO_T}>= 2.5.6" >&6 88473- 88474+ egrep "yes" >/dev/null 2>&1; then 88475+ rm -rf conftest* 88476+ 88477+ echo "$ac_t"">= 2.5.6" 1>&6 88478+ 88479 else 88480- 88481- { { echo "$as_me:$LINENO: error: libmcrypt version 2.5.6 or greater required." >&5 88482-echo "$as_me: error: libmcrypt version 2.5.6 or greater required." >&2;} 88483- { (exit 1); exit 1; }; } 88484- 88485+ rm -rf conftest* 88486+ 88487+ { echo "configure: error: libmcrypt version 2.5.6 or greater required." 1>&2; exit 1; } 88488+ 88489 fi 88490 rm -f conftest* 88491 88492 CPPFLAGS=$old_CPPFLAGS 88493 88494 88495- 88496+ 88497 save_old_LDFLAGS=$LDFLAGS 88498 ac_stuff=" 88499 -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl 88500 " 88501- 88502+ 88503 save_ext_shared=$ext_shared 88504 ext_shared=yes 88505- 88506+ 88507 for ac_i in $ac_stuff; do 88508 case $ac_i in 88509 -pthread) 88510 if test "$ext_shared" = "yes"; then 88511 LDFLAGS="$LDFLAGS -pthread" 88512 else 88513- 88514- 88515+ 88516+ 88517 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 88518- 88519+ 88520 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 88521 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88522 eval "EXTRA_LDFLAGS$unique=set" 88523@@ -76356,20 +57890,20 @@ 88524 ;; 88525 -l*) 88526 ac_ii=`echo $ac_i|cut -c 3-` 88527- 88528- 88529+ 88530+ 88531 case $ac_ii in 88532 c|c_r|pthread*) ;; 88533- *) 88534+ *) 88535 if test "$ext_shared" = "yes"; then 88536- LDFLAGS="$LDFLAGS -l$ac_ii" 88537+ LDFLAGS="$LDFLAGS -l$ac_ii" 88538 else 88539- 88540- 88541+ 88542+ 88543 case $ac_ii in 88544 c|c_r|pthread*) ;; 88545- *) 88546- LIBS="$LIBS -l$ac_ii" 88547+ *) 88548+ LIBS="$LIBS -l$ac_ii" 88549 ;; 88550 esac 88551 88552@@ -76382,131 +57916,101 @@ 88553 ;; 88554 -L*) 88555 ac_ii=`echo $ac_i|cut -c 3-` 88556- 88557+ 88558 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 88559- 88560+ 88561 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 88562 ai_p=$ac_ii 88563 else 88564- 88565+ 88566 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 88567- 88568+ 88569 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 88570 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 88571 fi 88572 88573- 88574+ 88575 if test "$ext_shared" = "yes"; then 88576 LDFLAGS="-L$ai_p $LDFLAGS" 88577 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 88578 else 88579- 88580- 88581- 88582+ 88583+ 88584+ 88585 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 88586- 88587+ 88588 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 88589 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88590 eval "LIBPATH$unique=set" 88591- 88592+ 88593 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 88594 LDFLAGS="$LDFLAGS -L$ai_p" 88595 PHP_RPATHS="$PHP_RPATHS $ai_p" 88596- 88597+ 88598 fi 88599 88600 88601 fi 88602- 88603+ 88604 fi 88605 88606 ;; 88607 esac 88608 done 88609 88610- echo "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5 88611-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6 88612-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then 88613- echo $ECHO_N "(cached) $ECHO_C" >&6 88614+ echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 88615+echo "configure:57963: checking for mcrypt_module_open in -lmcrypt" >&5 88616+ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` 88617+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 88618+ echo $ac_n "(cached) $ac_c" 1>&6 88619 else 88620- ac_check_lib_save_LIBS=$LIBS 88621+ ac_save_LIBS="$LIBS" 88622 LIBS="-lmcrypt $LIBS" 88623-cat >conftest.$ac_ext <<_ACEOF 88624-/* confdefs.h. */ 88625-_ACEOF 88626-cat confdefs.h >>conftest.$ac_ext 88627-cat >>conftest.$ac_ext <<_ACEOF 88628-/* end confdefs.h. */ 88629- 88630+cat > conftest.$ac_ext <<EOF 88631+#line 57971 "configure" 88632+#include "confdefs.h" 88633 /* Override any gcc2 internal prototype to avoid an error. */ 88634-#ifdef __cplusplus 88635-extern "C" 88636-#endif 88637 /* We use char because int might match the return type of a gcc2 88638- builtin and then its argument prototype would still apply. */ 88639-char mcrypt_module_open (); 88640-int 88641-main () 88642-{ 88643-mcrypt_module_open (); 88644- ; 88645- return 0; 88646-} 88647-_ACEOF 88648-rm -f conftest.$ac_objext conftest$ac_exeext 88649-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 88650- (eval $ac_link) 2>conftest.er1 88651- ac_status=$? 88652- grep -v '^ *+' conftest.er1 >conftest.err 88653- rm -f conftest.er1 88654- cat conftest.err >&5 88655- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88656- (exit $ac_status); } && 88657- { ac_try='test -z "$ac_c_werror_flag" 88658- || test ! -s conftest.err' 88659- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 88660- (eval $ac_try) 2>&5 88661- ac_status=$? 88662- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88663- (exit $ac_status); }; } && 88664- { ac_try='test -s conftest$ac_exeext' 88665- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 88666- (eval $ac_try) 2>&5 88667- ac_status=$? 88668- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88669- (exit $ac_status); }; }; then 88670- ac_cv_lib_mcrypt_mcrypt_module_open=yes 88671-else 88672- echo "$as_me: failed program was:" >&5 88673-sed 's/^/| /' conftest.$ac_ext >&5 88674- 88675-ac_cv_lib_mcrypt_mcrypt_module_open=no 88676-fi 88677-rm -f conftest.err conftest.$ac_objext \ 88678- conftest$ac_exeext conftest.$ac_ext 88679-LIBS=$ac_check_lib_save_LIBS 88680-fi 88681-echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5 88682-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6 88683-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then 88684+ builtin and then its argument prototype would still apply. */ 88685+char mcrypt_module_open(); 88686+ 88687+int main() { 88688+mcrypt_module_open() 88689+; return 0; } 88690+EOF 88691+if { (eval echo configure:57982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 88692+ rm -rf conftest* 88693+ eval "ac_cv_lib_$ac_lib_var=yes" 88694+else 88695+ echo "configure: failed program was:" >&5 88696+ cat conftest.$ac_ext >&5 88697+ rm -rf conftest* 88698+ eval "ac_cv_lib_$ac_lib_var=no" 88699+fi 88700+rm -f conftest* 88701+LIBS="$ac_save_LIBS" 88702 88703+fi 88704+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 88705+ echo "$ac_t""yes" 1>&6 88706+ 88707 LDFLAGS=$save_old_LDFLAGS 88708 ext_shared=$save_ext_shared 88709- 88710- 88711- 88712+ 88713+ 88714+ 88715 case ltdl in 88716 c|c_r|pthread*) ;; 88717- *) 88718+ *) 88719 if test "$ext_shared" = "yes"; then 88720- MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD" 88721+ MCRYPT_SHARED_LIBADD="-lltdl $MCRYPT_SHARED_LIBADD" 88722 else 88723- 88724- 88725+ 88726+ 88727 case ltdl in 88728 c|c_r|pthread*) ;; 88729- *) 88730- LIBS="-lltdl $LIBS" 88731+ *) 88732+ LIBS="-lltdl $LIBS" 88733 ;; 88734 esac 88735 88736@@ -76516,38 +58020,38 @@ 88737 esac 88738 88739 88740- 88741-cat >>confdefs.h <<\_ACEOF 88742+ cat >> confdefs.h <<\EOF 88743 #define HAVE_LIBMCRYPT 1 88744-_ACEOF 88745- 88746- 88747+EOF 88748 88749+ 88750+ 88751 else 88752+ echo "$ac_t""no" 1>&6 88753 88754 LDFLAGS=$save_old_LDFLAGS 88755 ext_shared=$save_ext_shared 88756 unset ac_cv_lib_mcrypt_mcrypt_module_open 88757- 88758- 88759+ 88760+ 88761 save_old_LDFLAGS=$LDFLAGS 88762 ac_stuff=" 88763 -L$MCRYPT_DIR/$PHP_LIBDIR 88764 " 88765- 88766+ 88767 save_ext_shared=$ext_shared 88768 ext_shared=yes 88769- 88770+ 88771 for ac_i in $ac_stuff; do 88772 case $ac_i in 88773 -pthread) 88774 if test "$ext_shared" = "yes"; then 88775 LDFLAGS="$LDFLAGS -pthread" 88776 else 88777- 88778- 88779+ 88780+ 88781 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 88782- 88783+ 88784 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 88785 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88786 eval "EXTRA_LDFLAGS$unique=set" 88787@@ -76558,20 +58062,20 @@ 88788 ;; 88789 -l*) 88790 ac_ii=`echo $ac_i|cut -c 3-` 88791- 88792- 88793+ 88794+ 88795 case $ac_ii in 88796 c|c_r|pthread*) ;; 88797- *) 88798+ *) 88799 if test "$ext_shared" = "yes"; then 88800- LDFLAGS="$LDFLAGS -l$ac_ii" 88801+ LDFLAGS="$LDFLAGS -l$ac_ii" 88802 else 88803- 88804- 88805+ 88806+ 88807 case $ac_ii in 88808 c|c_r|pthread*) ;; 88809- *) 88810- LIBS="$LIBS -l$ac_ii" 88811+ *) 88812+ LIBS="$LIBS -l$ac_ii" 88813 ;; 88814 esac 88815 88816@@ -76584,230 +58088,198 @@ 88817 ;; 88818 -L*) 88819 ac_ii=`echo $ac_i|cut -c 3-` 88820- 88821+ 88822 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 88823- 88824+ 88825 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 88826 ai_p=$ac_ii 88827 else 88828- 88829+ 88830 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 88831- 88832+ 88833 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 88834 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 88835 fi 88836 88837- 88838+ 88839 if test "$ext_shared" = "yes"; then 88840 LDFLAGS="-L$ai_p $LDFLAGS" 88841 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 88842 else 88843- 88844- 88845- 88846+ 88847+ 88848+ 88849 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 88850- 88851+ 88852 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 88853 if test -n "$unique" && test "`eval $cmd`" = "" ; then 88854 eval "LIBPATH$unique=set" 88855- 88856+ 88857 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 88858 LDFLAGS="$LDFLAGS -L$ai_p" 88859 PHP_RPATHS="$PHP_RPATHS $ai_p" 88860- 88861+ 88862 fi 88863 88864 88865 fi 88866- 88867+ 88868 fi 88869 88870 ;; 88871 esac 88872 done 88873 88874- echo "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5 88875-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6 88876-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then 88877- echo $ECHO_N "(cached) $ECHO_C" >&6 88878+ echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 88879+echo "configure:58135: checking for mcrypt_module_open in -lmcrypt" >&5 88880+ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` 88881+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 88882+ echo $ac_n "(cached) $ac_c" 1>&6 88883 else 88884- ac_check_lib_save_LIBS=$LIBS 88885+ ac_save_LIBS="$LIBS" 88886 LIBS="-lmcrypt $LIBS" 88887-cat >conftest.$ac_ext <<_ACEOF 88888-/* confdefs.h. */ 88889-_ACEOF 88890-cat confdefs.h >>conftest.$ac_ext 88891-cat >>conftest.$ac_ext <<_ACEOF 88892-/* end confdefs.h. */ 88893- 88894+cat > conftest.$ac_ext <<EOF 88895+#line 58143 "configure" 88896+#include "confdefs.h" 88897 /* Override any gcc2 internal prototype to avoid an error. */ 88898-#ifdef __cplusplus 88899-extern "C" 88900-#endif 88901 /* We use char because int might match the return type of a gcc2 88902- builtin and then its argument prototype would still apply. */ 88903-char mcrypt_module_open (); 88904-int 88905-main () 88906-{ 88907-mcrypt_module_open (); 88908- ; 88909- return 0; 88910-} 88911-_ACEOF 88912-rm -f conftest.$ac_objext conftest$ac_exeext 88913-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 88914- (eval $ac_link) 2>conftest.er1 88915- ac_status=$? 88916- grep -v '^ *+' conftest.er1 >conftest.err 88917- rm -f conftest.er1 88918- cat conftest.err >&5 88919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88920- (exit $ac_status); } && 88921- { ac_try='test -z "$ac_c_werror_flag" 88922- || test ! -s conftest.err' 88923- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 88924- (eval $ac_try) 2>&5 88925- ac_status=$? 88926- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88927- (exit $ac_status); }; } && 88928- { ac_try='test -s conftest$ac_exeext' 88929- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 88930- (eval $ac_try) 2>&5 88931- ac_status=$? 88932- echo "$as_me:$LINENO: \$? = $ac_status" >&5 88933- (exit $ac_status); }; }; then 88934- ac_cv_lib_mcrypt_mcrypt_module_open=yes 88935-else 88936- echo "$as_me: failed program was:" >&5 88937-sed 's/^/| /' conftest.$ac_ext >&5 88938- 88939-ac_cv_lib_mcrypt_mcrypt_module_open=no 88940-fi 88941-rm -f conftest.err conftest.$ac_objext \ 88942- conftest$ac_exeext conftest.$ac_ext 88943-LIBS=$ac_check_lib_save_LIBS 88944-fi 88945-echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5 88946-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6 88947-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then 88948+ builtin and then its argument prototype would still apply. */ 88949+char mcrypt_module_open(); 88950+ 88951+int main() { 88952+mcrypt_module_open() 88953+; return 0; } 88954+EOF 88955+if { (eval echo configure:58154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 88956+ rm -rf conftest* 88957+ eval "ac_cv_lib_$ac_lib_var=yes" 88958+else 88959+ echo "configure: failed program was:" >&5 88960+ cat conftest.$ac_ext >&5 88961+ rm -rf conftest* 88962+ eval "ac_cv_lib_$ac_lib_var=no" 88963+fi 88964+rm -f conftest* 88965+LIBS="$ac_save_LIBS" 88966 88967+fi 88968+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 88969+ echo "$ac_t""yes" 1>&6 88970+ 88971 LDFLAGS=$save_old_LDFLAGS 88972 ext_shared=$save_ext_shared 88973- 88974- 88975-cat >>confdefs.h <<\_ACEOF 88976+ 88977+ cat >> confdefs.h <<\EOF 88978 #define HAVE_LIBMCRYPT 1 88979-_ACEOF 88980- 88981- 88982+EOF 88983 88984+ 88985+ 88986 else 88987+ echo "$ac_t""no" 1>&6 88988 88989 LDFLAGS=$save_old_LDFLAGS 88990 ext_shared=$save_ext_shared 88991 unset ac_cv_lib_mcrypt_mcrypt_module_open 88992- 88993- { { echo "$as_me:$LINENO: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&5 88994-echo "$as_me: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&2;} 88995- { (exit 1); exit 1; }; } 88996- 88997- 88998+ 88999+ { echo "configure: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." 1>&2; exit 1; } 89000+ 89001+ 89002 fi 89003 89004- 89005- 89006+ 89007+ 89008 fi 89009 89010 89011- 89012+ 89013 89014 if test "$ext_shared" = "yes"; then 89015 MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD" 89016 if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then 89017- 89018+ 89019 if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 89020- 89021+ 89022 if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 89023 ai_p=$MCRYPT_DIR/$PHP_LIBDIR 89024 else 89025- 89026+ 89027 ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 89028- 89029+ 89030 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89031 ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`" 89032 fi 89033 89034- 89035+ 89036 if test "$ext_shared" = "yes"; then 89037 MCRYPT_SHARED_LIBADD="-L$ai_p $MCRYPT_SHARED_LIBADD" 89038 test -n "$ld_runpath_switch" && MCRYPT_SHARED_LIBADD="$ld_runpath_switch$ai_p $MCRYPT_SHARED_LIBADD" 89039 else 89040- 89041- 89042- 89043+ 89044+ 89045+ 89046 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89047- 89048+ 89049 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 89050 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89051 eval "LIBPATH$unique=set" 89052- 89053+ 89054 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 89055 LDFLAGS="$LDFLAGS -L$ai_p" 89056 PHP_RPATHS="$PHP_RPATHS $ai_p" 89057- 89058+ 89059 fi 89060 89061 89062 fi 89063- 89064+ 89065 fi 89066 89067 fi 89068 else 89069- 89070+ 89071 89072 if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then 89073- 89074+ 89075 if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 89076- 89077+ 89078 if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 89079 ai_p=$MCRYPT_DIR/$PHP_LIBDIR 89080 else 89081- 89082+ 89083 ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 89084- 89085+ 89086 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89087 ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`" 89088 fi 89089 89090- 89091- 89092- 89093- 89094+ 89095+ 89096+ 89097+ 89098 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89099- 89100+ 89101 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 89102 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89103 eval "LIBPATH$unique=set" 89104- 89105+ 89106 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 89107 LDFLAGS="$LDFLAGS -L$ai_p" 89108 PHP_RPATHS="$PHP_RPATHS $ai_p" 89109- 89110+ 89111 fi 89112 89113 89114- 89115+ 89116 fi 89117 89118 fi 89119- 89120- 89121+ 89122+ 89123 case mcrypt in 89124 c|c_r|pthread*) ;; 89125- *) 89126- LIBS="-lmcrypt $LIBS" 89127+ *) 89128+ LIBS="-lmcrypt $LIBS" 89129 ;; 89130 esac 89131 89132@@ -76817,42 +58289,42 @@ 89133 fi 89134 89135 89136- 89137+ 89138 if test "$MCRYPT_DIR/include" != "/usr/include"; then 89139- 89140+ 89141 if test -z "$MCRYPT_DIR/include" || echo "$MCRYPT_DIR/include" | grep '^/' >/dev/null ; then 89142 ai_p=$MCRYPT_DIR/include 89143 else 89144- 89145+ 89146 ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 89147- 89148+ 89149 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89150 ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`" 89151 fi 89152 89153- 89154- 89155+ 89156+ 89157 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89158- 89159+ 89160 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 89161 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89162 eval "INCLUDEPATH$unique=set" 89163- 89164+ 89165 if test ""; then 89166 INCLUDES="-I$ai_p $INCLUDES" 89167 else 89168 INCLUDES="$INCLUDES -I$ai_p" 89169 fi 89170- 89171+ 89172 fi 89173 89174 fi 89175 89176 89177- 89178+ 89179 PHP_VAR_SUBST="$PHP_VAR_SUBST MCRYPT_SHARED_LIBADD" 89180 89181- 89182+ 89183 ext_builddir=ext/mcrypt 89184 ext_srcdir=$abs_srcdir/ext/mcrypt 89185 89186@@ -76860,15 +58332,15 @@ 89187 89188 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 89189 PHP_MCRYPT_SHARED=no 89190- 89191- 89192+ 89193+ 89194 case ext/mcrypt in 89195 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89196 /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89197 *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89198 esac 89199- 89200- 89201+ 89202+ 89203 89204 b_c_pre=$php_c_pre 89205 b_cxx_pre=$php_cxx_pre 89206@@ -76881,12 +58353,12 @@ 89207 89208 old_IFS=$IFS 89209 for ac_src in mcrypt.c mcrypt_filter.c; do 89210- 89211+ 89212 IFS=. 89213 set $ac_src 89214 ac_obj=$1 89215 IFS=$old_IFS 89216- 89217+ 89218 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89219 89220 case $ac_src in 89221@@ -76910,14 +58382,14 @@ 89222 else 89223 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 89224 PHP_MCRYPT_SHARED=yes 89225- 89226+ 89227 case ext/mcrypt in 89228 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89229 /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89230 *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89231 esac 89232- 89233- 89234+ 89235+ 89236 89237 b_c_pre=$shared_c_pre 89238 b_cxx_pre=$shared_cxx_pre 89239@@ -76930,12 +58402,12 @@ 89240 89241 old_IFS=$IFS 89242 for ac_src in mcrypt.c mcrypt_filter.c; do 89243- 89244+ 89245 IFS=. 89246 set $ac_src 89247 ac_obj=$1 89248 IFS=$old_IFS 89249- 89250+ 89251 shared_objects_mcrypt="$shared_objects_mcrypt $ac_bdir$ac_obj.lo" 89252 89253 case $ac_src in 89254@@ -76953,7 +58425,7 @@ 89255 89256 case $host_alias in 89257 *netware*) 89258- 89259+ 89260 install_modules="install-modules" 89261 89262 case $host_alias in 89263@@ -76963,7 +58435,7 @@ 89264 ;; 89265 *netware*) 89266 suffix=nlm 89267- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(MCRYPT_SHARED_LIBADD)' 89268+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMCRYPT, 3)_SHARED_LIBADD)' 89269 ;; 89270 *) 89271 suffix=la 89272@@ -76976,7 +58448,7 @@ 89273 else 89274 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmcrypt.$suffix" 89275 fi 89276- 89277+ 89278 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt" 89279 89280 cat >>Makefile.objects<<EOF 89281@@ -76990,7 +58462,7 @@ 89282 89283 ;; 89284 *) 89285- 89286+ 89287 install_modules="install-modules" 89288 89289 case $host_alias in 89290@@ -77000,7 +58472,7 @@ 89291 ;; 89292 *netware*) 89293 suffix=nlm 89294- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(YPT_SHARED_LIBADD)' 89295+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mcrypt) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MCRYPT, 3)_SHARED_LIBADD)' 89296 ;; 89297 *) 89298 suffix=la 89299@@ -77013,7 +58485,7 @@ 89300 else 89301 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mcrypt.$suffix" 89302 fi 89303- 89304+ 89305 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mcrypt" 89306 89307 cat >>Makefile.objects<<EOF 89308@@ -77027,10 +58499,9 @@ 89309 89310 ;; 89311 esac 89312- 89313-cat >>confdefs.h <<_ACEOF 89314+ cat >> confdefs.h <<EOF 89315 #define COMPILE_DL_MCRYPT 1 89316-_ACEOF 89317+EOF 89318 89319 fi 89320 fi 89321@@ -77039,15 +58510,15 @@ 89322 PHP_MCRYPT_SHARED=no 89323 case "$PHP_SAPI" in 89324 cgi|embed) 89325- 89326- 89327+ 89328+ 89329 case ext/mcrypt in 89330 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89331 /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89332 *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89333 esac 89334- 89335- 89336+ 89337+ 89338 89339 b_c_pre=$php_c_pre 89340 b_cxx_pre=$php_cxx_pre 89341@@ -77060,12 +58531,12 @@ 89342 89343 old_IFS=$IFS 89344 for ac_src in mcrypt.c mcrypt_filter.c; do 89345- 89346+ 89347 IFS=. 89348 set $ac_src 89349 ac_obj=$1 89350 IFS=$old_IFS 89351- 89352+ 89353 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89354 89355 case $ac_src in 89356@@ -77085,15 +58556,15 @@ 89357 EXT_STATIC="$EXT_STATIC mcrypt" 89358 ;; 89359 *) 89360- 89361- 89362+ 89363+ 89364 case ext/mcrypt in 89365 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89366 /*) ac_srcdir=`echo "ext/mcrypt"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89367 *) ac_srcdir="$abs_srcdir/ext/mcrypt/"; ac_bdir="ext/mcrypt/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89368 esac 89369- 89370- 89371+ 89372+ 89373 89374 b_c_pre=$php_c_pre 89375 b_cxx_pre=$php_cxx_pre 89376@@ -77106,13 +58577,13 @@ 89377 89378 old_IFS=$IFS 89379 for ac_src in mcrypt.c mcrypt_filter.c; do 89380- 89381+ 89382 IFS=. 89383 set $ac_src 89384 ac_obj=$1 89385 IFS=$old_IFS 89386- 89387- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 89388+ 89389+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89390 89391 case $ac_src in 89392 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 89393@@ -77132,15 +58603,15 @@ 89394 esac 89395 EXT_CLI_STATIC="$EXT_CLI_STATIC mcrypt" 89396 fi 89397- 89398- 89399+ 89400+ 89401 BUILD_DIR="$BUILD_DIR $ext_builddir" 89402- 89403+ 89404 89405 89406 if test "$ext_builddir" = "."; then 89407 PHP_PECL_EXTENSION=mcrypt 89408- 89409+ 89410 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 89411 89412 fi 89413@@ -77151,19 +58622,19 @@ 89414 89415 php_with_mssql=no 89416 89417-echo "$as_me:$LINENO: checking for MSSQL support via FreeTDS" >&5 89418-echo $ECHO_N "checking for MSSQL support via FreeTDS... $ECHO_C" >&6 89419- 89420+echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 89421+echo "configure:58627: checking for MSSQL support via FreeTDS" >&5 89422 # Check whether --with-mssql or --without-mssql was given. 89423 if test "${with_mssql+set}" = set; then 89424 withval="$with_mssql" 89425 PHP_MSSQL=$withval 89426 else 89427- 89428+ 89429 PHP_MSSQL=no 89430 test "$PHP_ENABLE_ALL" && PHP_MSSQL=$PHP_ENABLE_ALL 89431 89432-fi; 89433+fi 89434+ 89435 89436 89437 ext_output="yes, shared" 89438@@ -77187,8 +58658,7 @@ 89439 89440 89441 89442-echo "$as_me:$LINENO: result: $ext_output" >&5 89443-echo "${ECHO_T}$ext_output" >&6 89444+echo "$ac_t""$ext_output" 1>&6 89445 89446 89447 89448@@ -77209,9 +58679,7 @@ 89449 done 89450 89451 if test -z "$FREETDS_INSTALLATION_DIR"; then 89452- { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5 89453-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;} 89454- { (exit 1); exit 1; }; } 89455+ { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; } 89456 fi 89457 89458 elif test "$PHP_MSSQL" != "no"; then 89459@@ -77223,137 +58691,133 @@ 89460 FREETDS_INSTALLATION_DIR=$PHP_MSSQL 89461 FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds 89462 else 89463- { { echo "$as_me:$LINENO: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&5 89464-echo "$as_me: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&2;} 89465- { (exit 1); exit 1; }; } 89466+ { echo "configure: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" 1>&2; exit 1; } 89467 fi 89468- fi 89469+ fi 89470 89471 if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then 89472- { { echo "$as_me:$LINENO: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5 89473-echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;} 89474- { (exit 1); exit 1; }; } 89475+ { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; } 89476 fi 89477 89478- 89479+ 89480 if test "$FREETDS_INCLUDE_DIR" != "/usr/include"; then 89481- 89482+ 89483 if test -z "$FREETDS_INCLUDE_DIR" || echo "$FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then 89484 ai_p=$FREETDS_INCLUDE_DIR 89485 else 89486- 89487+ 89488 ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 89489- 89490+ 89491 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89492 ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`" 89493 fi 89494 89495- 89496- 89497+ 89498+ 89499 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89500- 89501+ 89502 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 89503 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89504 eval "INCLUDEPATH$unique=set" 89505- 89506+ 89507 if test ""; then 89508 INCLUDES="-I$ai_p $INCLUDES" 89509 else 89510 INCLUDES="$INCLUDES -I$ai_p" 89511 fi 89512- 89513+ 89514 fi 89515 89516 fi 89517 89518- 89519+ 89520 89521 if test "$ext_shared" = "yes"; then 89522 MSSQL_SHARED_LIBADD="-lsybdb $MSSQL_SHARED_LIBADD" 89523 if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then 89524- 89525+ 89526 if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then 89527- 89528+ 89529 if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 89530 ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR 89531 else 89532- 89533+ 89534 ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 89535- 89536+ 89537 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89538 ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" 89539 fi 89540 89541- 89542+ 89543 if test "$ext_shared" = "yes"; then 89544 MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD" 89545 test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD" 89546 else 89547- 89548- 89549- 89550+ 89551+ 89552+ 89553 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89554- 89555+ 89556 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 89557 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89558 eval "LIBPATH$unique=set" 89559- 89560+ 89561 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 89562 LDFLAGS="$LDFLAGS -L$ai_p" 89563 PHP_RPATHS="$PHP_RPATHS $ai_p" 89564- 89565+ 89566 fi 89567 89568 89569 fi 89570- 89571+ 89572 fi 89573 89574 fi 89575 else 89576- 89577+ 89578 89579 if test -n "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then 89580- 89581+ 89582 if test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then 89583- 89584+ 89585 if test -z "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 89586 ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR 89587 else 89588- 89589+ 89590 ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 89591- 89592+ 89593 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89594 ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" 89595 fi 89596 89597- 89598- 89599- 89600- 89601+ 89602+ 89603+ 89604+ 89605 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 89606- 89607+ 89608 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 89609 if test -n "$unique" && test "`eval $cmd`" = "" ; then 89610 eval "LIBPATH$unique=set" 89611- 89612+ 89613 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 89614 LDFLAGS="$LDFLAGS -L$ai_p" 89615 PHP_RPATHS="$PHP_RPATHS $ai_p" 89616- 89617+ 89618 fi 89619 89620 89621- 89622+ 89623 fi 89624 89625 fi 89626- 89627- 89628+ 89629+ 89630 case sybdb in 89631 c|c_r|pthread*) ;; 89632- *) 89633- LIBS="-lsybdb $LIBS" 89634+ *) 89635+ LIBS="-lsybdb $LIBS" 89636 ;; 89637 esac 89638 89639@@ -77364,7 +58828,7 @@ 89640 89641 89642 89643- 89644+ 89645 ext_builddir=ext/mssql 89646 ext_srcdir=$abs_srcdir/ext/mssql 89647 89648@@ -77372,15 +58836,15 @@ 89649 89650 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 89651 PHP_MSSQL_SHARED=no 89652- 89653- 89654+ 89655+ 89656 case ext/mssql in 89657 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89658 /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89659 *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89660 esac 89661- 89662- 89663+ 89664+ 89665 89666 b_c_pre=$php_c_pre 89667 b_cxx_pre=$php_cxx_pre 89668@@ -77393,12 +58857,12 @@ 89669 89670 old_IFS=$IFS 89671 for ac_src in php_mssql.c; do 89672- 89673+ 89674 IFS=. 89675 set $ac_src 89676 ac_obj=$1 89677 IFS=$old_IFS 89678- 89679+ 89680 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89681 89682 case $ac_src in 89683@@ -77422,14 +58886,14 @@ 89684 else 89685 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 89686 PHP_MSSQL_SHARED=yes 89687- 89688+ 89689 case ext/mssql in 89690 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89691 /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89692 *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89693 esac 89694- 89695- 89696+ 89697+ 89698 89699 b_c_pre=$shared_c_pre 89700 b_cxx_pre=$shared_cxx_pre 89701@@ -77442,12 +58906,12 @@ 89702 89703 old_IFS=$IFS 89704 for ac_src in php_mssql.c; do 89705- 89706+ 89707 IFS=. 89708 set $ac_src 89709 ac_obj=$1 89710 IFS=$old_IFS 89711- 89712+ 89713 shared_objects_mssql="$shared_objects_mssql $ac_bdir$ac_obj.lo" 89714 89715 case $ac_src in 89716@@ -77465,7 +58929,7 @@ 89717 89718 case $host_alias in 89719 *netware*) 89720- 89721+ 89722 install_modules="install-modules" 89723 89724 case $host_alias in 89725@@ -77475,7 +58939,7 @@ 89726 ;; 89727 *netware*) 89728 suffix=nlm 89729- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(MSSQL_SHARED_LIBADD)' 89730+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMSSQL, 3)_SHARED_LIBADD)' 89731 ;; 89732 *) 89733 suffix=la 89734@@ -77488,7 +58952,7 @@ 89735 else 89736 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmssql.$suffix" 89737 fi 89738- 89739+ 89740 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql" 89741 89742 cat >>Makefile.objects<<EOF 89743@@ -77502,7 +58966,7 @@ 89744 89745 ;; 89746 *) 89747- 89748+ 89749 install_modules="install-modules" 89750 89751 case $host_alias in 89752@@ -77512,7 +58976,7 @@ 89753 ;; 89754 *netware*) 89755 suffix=nlm 89756- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(QL_SHARED_LIBADD)' 89757+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mssql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MSSQL, 3)_SHARED_LIBADD)' 89758 ;; 89759 *) 89760 suffix=la 89761@@ -77525,7 +58989,7 @@ 89762 else 89763 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mssql.$suffix" 89764 fi 89765- 89766+ 89767 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mssql" 89768 89769 cat >>Makefile.objects<<EOF 89770@@ -77539,10 +59003,9 @@ 89771 89772 ;; 89773 esac 89774- 89775-cat >>confdefs.h <<_ACEOF 89776+ cat >> confdefs.h <<EOF 89777 #define COMPILE_DL_MSSQL 1 89778-_ACEOF 89779+EOF 89780 89781 fi 89782 fi 89783@@ -77551,15 +59014,15 @@ 89784 PHP_MSSQL_SHARED=no 89785 case "$PHP_SAPI" in 89786 cgi|embed) 89787- 89788- 89789+ 89790+ 89791 case ext/mssql in 89792 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89793 /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89794 *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89795 esac 89796- 89797- 89798+ 89799+ 89800 89801 b_c_pre=$php_c_pre 89802 b_cxx_pre=$php_cxx_pre 89803@@ -77572,12 +59035,12 @@ 89804 89805 old_IFS=$IFS 89806 for ac_src in php_mssql.c; do 89807- 89808+ 89809 IFS=. 89810 set $ac_src 89811 ac_obj=$1 89812 IFS=$old_IFS 89813- 89814+ 89815 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89816 89817 case $ac_src in 89818@@ -77597,15 +59060,15 @@ 89819 EXT_STATIC="$EXT_STATIC mssql" 89820 ;; 89821 *) 89822- 89823- 89824+ 89825+ 89826 case ext/mssql in 89827 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 89828 /*) ac_srcdir=`echo "ext/mssql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 89829 *) ac_srcdir="$abs_srcdir/ext/mssql/"; ac_bdir="ext/mssql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 89830 esac 89831- 89832- 89833+ 89834+ 89835 89836 b_c_pre=$php_c_pre 89837 b_cxx_pre=$php_cxx_pre 89838@@ -77618,13 +59081,13 @@ 89839 89840 old_IFS=$IFS 89841 for ac_src in php_mssql.c; do 89842- 89843+ 89844 IFS=. 89845 set $ac_src 89846 ac_obj=$1 89847 IFS=$old_IFS 89848- 89849- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 89850+ 89851+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 89852 89853 case $ac_src in 89854 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 89855@@ -77644,172 +59107,142 @@ 89856 esac 89857 EXT_CLI_STATIC="$EXT_CLI_STATIC mssql" 89858 fi 89859- 89860- 89861+ 89862+ 89863 BUILD_DIR="$BUILD_DIR $ext_builddir" 89864- 89865+ 89866 89867 89868 if test "$ext_builddir" = "."; then 89869 PHP_PECL_EXTENSION=mssql 89870- 89871+ 89872 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 89873 89874 fi 89875 89876- echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5 89877-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6 89878-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then 89879- echo $ECHO_N "(cached) $ECHO_C" >&6 89880+ echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 89881+echo "configure:59125: checking for dnet_addr in -ldnet_stub" >&5 89882+ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` 89883+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 89884+ echo $ac_n "(cached) $ac_c" 1>&6 89885 else 89886- ac_check_lib_save_LIBS=$LIBS 89887+ ac_save_LIBS="$LIBS" 89888 LIBS="-ldnet_stub $LIBS" 89889-cat >conftest.$ac_ext <<_ACEOF 89890-/* confdefs.h. */ 89891-_ACEOF 89892-cat confdefs.h >>conftest.$ac_ext 89893-cat >>conftest.$ac_ext <<_ACEOF 89894-/* end confdefs.h. */ 89895- 89896+cat > conftest.$ac_ext <<EOF 89897+#line 59133 "configure" 89898+#include "confdefs.h" 89899 /* Override any gcc2 internal prototype to avoid an error. */ 89900-#ifdef __cplusplus 89901-extern "C" 89902-#endif 89903 /* We use char because int might match the return type of a gcc2 89904- builtin and then its argument prototype would still apply. */ 89905-char dnet_addr (); 89906-int 89907-main () 89908-{ 89909-dnet_addr (); 89910- ; 89911- return 0; 89912-} 89913-_ACEOF 89914-rm -f conftest.$ac_objext conftest$ac_exeext 89915-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 89916- (eval $ac_link) 2>conftest.er1 89917- ac_status=$? 89918- grep -v '^ *+' conftest.er1 >conftest.err 89919- rm -f conftest.er1 89920- cat conftest.err >&5 89921- echo "$as_me:$LINENO: \$? = $ac_status" >&5 89922- (exit $ac_status); } && 89923- { ac_try='test -z "$ac_c_werror_flag" 89924- || test ! -s conftest.err' 89925- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 89926- (eval $ac_try) 2>&5 89927- ac_status=$? 89928- echo "$as_me:$LINENO: \$? = $ac_status" >&5 89929- (exit $ac_status); }; } && 89930- { ac_try='test -s conftest$ac_exeext' 89931- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 89932- (eval $ac_try) 2>&5 89933- ac_status=$? 89934- echo "$as_me:$LINENO: \$? = $ac_status" >&5 89935- (exit $ac_status); }; }; then 89936- ac_cv_lib_dnet_stub_dnet_addr=yes 89937-else 89938- echo "$as_me: failed program was:" >&5 89939-sed 's/^/| /' conftest.$ac_ext >&5 89940- 89941-ac_cv_lib_dnet_stub_dnet_addr=no 89942-fi 89943-rm -f conftest.err conftest.$ac_objext \ 89944- conftest$ac_exeext conftest.$ac_ext 89945-LIBS=$ac_check_lib_save_LIBS 89946-fi 89947-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5 89948-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6 89949-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then 89950+ builtin and then its argument prototype would still apply. */ 89951+char dnet_addr(); 89952+ 89953+int main() { 89954+dnet_addr() 89955+; return 0; } 89956+EOF 89957+if { (eval echo configure:59144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 89958+ rm -rf conftest* 89959+ eval "ac_cv_lib_$ac_lib_var=yes" 89960+else 89961+ echo "configure: failed program was:" >&5 89962+ cat conftest.$ac_ext >&5 89963+ rm -rf conftest* 89964+ eval "ac_cv_lib_$ac_lib_var=no" 89965+fi 89966+rm -f conftest* 89967+LIBS="$ac_save_LIBS" 89968 89969+fi 89970+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 89971+ echo "$ac_t""yes" 1>&6 89972+ 89973 89974 if test "$ext_shared" = "yes"; then 89975 MSSQL_SHARED_LIBADD="-ldnet_stub $MSSQL_SHARED_LIBADD" 89976 if test -n ""; then 89977- 89978+ 89979 if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then 89980- 89981+ 89982 if test -z "" || echo "" | grep '^/' >/dev/null ; then 89983 ai_p= 89984 else 89985- 89986+ 89987 ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" 89988- 89989+ 89990 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 89991 ai_p="$ep_realdir/`basename \"\"`" 89992 fi 89993 89994- 89995+ 89996 if test "$ext_shared" = "yes"; then 89997 MSSQL_SHARED_LIBADD="-L$ai_p $MSSQL_SHARED_LIBADD" 89998 test -n "$ld_runpath_switch" && MSSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MSSQL_SHARED_LIBADD" 89999 else 90000- 90001- 90002- 90003+ 90004+ 90005+ 90006 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90007- 90008+ 90009 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90010 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90011 eval "LIBPATH$unique=set" 90012- 90013+ 90014 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90015 LDFLAGS="$LDFLAGS -L$ai_p" 90016 PHP_RPATHS="$PHP_RPATHS $ai_p" 90017- 90018+ 90019 fi 90020 90021 90022 fi 90023- 90024+ 90025 fi 90026 90027 fi 90028 else 90029- 90030+ 90031 90032 if test -n ""; then 90033- 90034+ 90035 if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then 90036- 90037+ 90038 if test -z "" || echo "" | grep '^/' >/dev/null ; then 90039 ai_p= 90040 else 90041- 90042+ 90043 ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" 90044- 90045+ 90046 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90047 ai_p="$ep_realdir/`basename \"\"`" 90048 fi 90049 90050- 90051- 90052- 90053- 90054+ 90055+ 90056+ 90057+ 90058 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90059- 90060+ 90061 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90062 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90063 eval "LIBPATH$unique=set" 90064- 90065+ 90066 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90067 LDFLAGS="$LDFLAGS -L$ai_p" 90068 PHP_RPATHS="$PHP_RPATHS $ai_p" 90069- 90070+ 90071 fi 90072 90073 90074- 90075+ 90076 fi 90077 90078 fi 90079- 90080- 90081+ 90082+ 90083 case dnet_stub in 90084 c|c_r|pthread*) ;; 90085- *) 90086- LIBS="-ldnet_stub $LIBS" 90087+ *) 90088+ LIBS="-ldnet_stub $LIBS" 90089 ;; 90090 esac 90091 90092@@ -77819,25 +59252,24 @@ 90093 fi 90094 90095 90096- 90097-cat >>confdefs.h <<\_ACEOF 90098+ cat >> confdefs.h <<\EOF 90099 #define HAVE_LIBDNET_STUB 1 90100-_ACEOF 90101- 90102+EOF 90103 90104+ 90105+else 90106+ echo "$ac_t""no" 1>&6 90107 fi 90108 90109- 90110-cat >>confdefs.h <<\_ACEOF 90111+ cat >> confdefs.h <<\EOF 90112 #define HAVE_MSSQL 1 90113-_ACEOF 90114- 90115+EOF 90116 90117-cat >>confdefs.h <<\_ACEOF 90118+ cat >> confdefs.h <<\EOF 90119 #define HAVE_FREETDS 1 90120-_ACEOF 90121- 90122+EOF 90123 90124+ 90125 PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD" 90126 90127 fi 90128@@ -77851,19 +59283,19 @@ 90129 90130 php_with_mysql=no 90131 90132-echo "$as_me:$LINENO: checking for MySQL support" >&5 90133-echo $ECHO_N "checking for MySQL support... $ECHO_C" >&6 90134- 90135+echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 90136+echo "configure:59288: checking for MySQL support" >&5 90137 # Check whether --with-mysql or --without-mysql was given. 90138 if test "${with_mysql+set}" = set; then 90139 withval="$with_mysql" 90140 PHP_MYSQL=$withval 90141 else 90142- 90143+ 90144 PHP_MYSQL=no 90145 test "$PHP_ENABLE_ALL" && PHP_MYSQL=$PHP_ENABLE_ALL 90146 90147-fi; 90148+fi 90149+ 90150 90151 90152 ext_output="yes, shared" 90153@@ -77887,8 +59319,7 @@ 90154 90155 90156 90157-echo "$as_me:$LINENO: result: $ext_output" >&5 90158-echo "${ECHO_T}$ext_output" >&6 90159+echo "$ac_t""$ext_output" 1>&6 90160 90161 90162 90163@@ -77896,48 +59327,46 @@ 90164 90165 php_with_mysql_sock=no 90166 90167-echo "$as_me:$LINENO: checking for specified location of the MySQL UNIX socket" >&5 90168-echo $ECHO_N "checking for specified location of the MySQL UNIX socket... $ECHO_C" >&6 90169- 90170+echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 90171+echo "configure:59332: checking for specified location of the MySQL UNIX socket" >&5 90172 # Check whether --with-mysql-sock or --without-mysql-sock was given. 90173 if test "${with_mysql_sock+set}" = set; then 90174 withval="$with_mysql_sock" 90175 PHP_MYSQL_SOCK=$withval 90176 else 90177- 90178+ 90179 PHP_MYSQL_SOCK=no 90180+ 90181 90182+fi 90183 90184-fi; 90185 90186 ext_output=$PHP_MYSQL_SOCK 90187-echo "$as_me:$LINENO: result: $ext_output" >&5 90188-echo "${ECHO_T}$ext_output" >&6 90189+echo "$ac_t""$ext_output" 1>&6 90190 90191 90192 90193 90194 if test -z "$PHP_ZLIB_DIR"; then 90195- 90196+ 90197 php_with_zlib_dir=no 90198 90199-echo "$as_me:$LINENO: checking for the location of libz" >&5 90200-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6 90201- 90202+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 90203+echo "configure:59356: checking for the location of libz" >&5 90204 # Check whether --with-zlib-dir or --without-zlib-dir was given. 90205 if test "${with_zlib_dir+set}" = set; then 90206 withval="$with_zlib_dir" 90207 PHP_ZLIB_DIR=$withval 90208 else 90209- 90210+ 90211 PHP_ZLIB_DIR=no 90212+ 90213 90214+fi 90215 90216-fi; 90217 90218 ext_output=$PHP_ZLIB_DIR 90219-echo "$as_me:$LINENO: result: $ext_output" >&5 90220-echo "${ECHO_T}$ext_output" >&6 90221+echo "$ac_t""$ext_output" 1>&6 90222 90223 90224 90225@@ -77963,11 +59392,8 @@ 90226 done 90227 90228 if test -z "$MYSQL_DIR"; then 90229- { { echo "$as_me:$LINENO: error: Cannot find MySQL header files under $PHP_MYSQL. 90230-Note that the MySQL client library is not bundled anymore!" >&5 90231-echo "$as_me: error: Cannot find MySQL header files under $PHP_MYSQL. 90232-Note that the MySQL client library is not bundled anymore!" >&2;} 90233- { (exit 1); exit 1; }; } 90234+ { echo "configure: error: Cannot find MySQL header files under $PHP_MYSQL. 90235+Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; } 90236 fi 90237 90238 if test "$enable_maintainer_zts" = "yes"; then 90239@@ -77986,7 +59412,7 @@ 90240 fi 90241 90242 for i in $PHP_LIBDIR $PHP_LIBDIR/mysql; do 90243- 90244+ 90245 str="$MYSQL_DIR/$i/lib$MYSQL_LIBNAME.*" 90246 for j in `echo $str`; do 90247 if test -r $j; then 90248@@ -77998,7 +59424,7 @@ 90249 done 90250 90251 if test -z "$MYSQL_LIB_DIR"; then 90252- 90253+ 90254 str="$MYSQL_DIR/lib/x86_64-linux-gnu/lib$MYSQL_LIBNAME.*" 90255 for j in `echo $str`; do 90256 if test -r $j; then 90257@@ -78009,7 +59435,7 @@ 90258 90259 fi 90260 if test -z "$MYSQL_LIB_DIR"; then 90261- 90262+ 90263 str="$MYSQL_DIR/lib/i386-linux-gnu/lib$MYSQL_LIBNAME.*" 90264 for j in `echo $str`; do 90265 if test -r $j; then 90266@@ -78021,32 +59447,29 @@ 90267 fi 90268 90269 if test -z "$MYSQL_LIB_DIR"; then 90270- { { echo "$as_me:$LINENO: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. 90271-Note that the MySQL client library is not bundled anymore!" >&5 90272-echo "$as_me: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. 90273-Note that the MySQL client library is not bundled anymore!" >&2;} 90274- { (exit 1); exit 1; }; } 90275+ { echo "configure: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. 90276+Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; } 90277 fi 90278 90279- 90280+ 90281 save_old_LDFLAGS=$LDFLAGS 90282 ac_stuff=" 90283- -L$MYSQL_LIB_DIR 90284+ -L$MYSQL_LIB_DIR 90285 " 90286- 90287+ 90288 save_ext_shared=$ext_shared 90289 ext_shared=yes 90290- 90291+ 90292 for ac_i in $ac_stuff; do 90293 case $ac_i in 90294 -pthread) 90295 if test "$ext_shared" = "yes"; then 90296 LDFLAGS="$LDFLAGS -pthread" 90297 else 90298- 90299- 90300+ 90301+ 90302 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 90303- 90304+ 90305 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 90306 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90307 eval "EXTRA_LDFLAGS$unique=set" 90308@@ -78057,20 +59480,20 @@ 90309 ;; 90310 -l*) 90311 ac_ii=`echo $ac_i|cut -c 3-` 90312- 90313- 90314+ 90315+ 90316 case $ac_ii in 90317 c|c_r|pthread*) ;; 90318- *) 90319+ *) 90320 if test "$ext_shared" = "yes"; then 90321- LDFLAGS="$LDFLAGS -l$ac_ii" 90322+ LDFLAGS="$LDFLAGS -l$ac_ii" 90323 else 90324- 90325- 90326+ 90327+ 90328 case $ac_ii in 90329 c|c_r|pthread*) ;; 90330- *) 90331- LIBS="$LIBS -l$ac_ii" 90332+ *) 90333+ LIBS="$LIBS -l$ac_ii" 90334 ;; 90335 esac 90336 90337@@ -78083,214 +59506,184 @@ 90338 ;; 90339 -L*) 90340 ac_ii=`echo $ac_i|cut -c 3-` 90341- 90342+ 90343 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 90344- 90345+ 90346 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 90347 ai_p=$ac_ii 90348 else 90349- 90350+ 90351 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 90352- 90353+ 90354 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90355 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 90356 fi 90357 90358- 90359+ 90360 if test "$ext_shared" = "yes"; then 90361 LDFLAGS="-L$ai_p $LDFLAGS" 90362 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 90363 else 90364- 90365- 90366- 90367+ 90368+ 90369+ 90370 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90371- 90372+ 90373 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90374 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90375 eval "LIBPATH$unique=set" 90376- 90377+ 90378 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90379 LDFLAGS="$LDFLAGS -L$ai_p" 90380 PHP_RPATHS="$PHP_RPATHS $ai_p" 90381- 90382+ 90383 fi 90384 90385 90386 fi 90387- 90388+ 90389 fi 90390 90391 ;; 90392 esac 90393 done 90394 90395- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_close" | $as_tr_sh` 90396-echo "$as_me:$LINENO: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 90397-echo $ECHO_N "checking for mysql_close in -l$MYSQL_LIBNAME... $ECHO_C" >&6 90398-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 90399- echo $ECHO_N "(cached) $ECHO_C" >&6 90400+ echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 90401+echo "configure:59553: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 90402+ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` 90403+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 90404+ echo $ac_n "(cached) $ac_c" 1>&6 90405 else 90406- ac_check_lib_save_LIBS=$LIBS 90407+ ac_save_LIBS="$LIBS" 90408 LIBS="-l$MYSQL_LIBNAME $LIBS" 90409-cat >conftest.$ac_ext <<_ACEOF 90410-/* confdefs.h. */ 90411-_ACEOF 90412-cat confdefs.h >>conftest.$ac_ext 90413-cat >>conftest.$ac_ext <<_ACEOF 90414-/* end confdefs.h. */ 90415- 90416+cat > conftest.$ac_ext <<EOF 90417+#line 59561 "configure" 90418+#include "confdefs.h" 90419 /* Override any gcc2 internal prototype to avoid an error. */ 90420-#ifdef __cplusplus 90421-extern "C" 90422-#endif 90423 /* We use char because int might match the return type of a gcc2 90424- builtin and then its argument prototype would still apply. */ 90425-char mysql_close (); 90426-int 90427-main () 90428-{ 90429-mysql_close (); 90430- ; 90431- return 0; 90432-} 90433-_ACEOF 90434-rm -f conftest.$ac_objext conftest$ac_exeext 90435-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 90436- (eval $ac_link) 2>conftest.er1 90437- ac_status=$? 90438- grep -v '^ *+' conftest.er1 >conftest.err 90439- rm -f conftest.er1 90440- cat conftest.err >&5 90441- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90442- (exit $ac_status); } && 90443- { ac_try='test -z "$ac_c_werror_flag" 90444- || test ! -s conftest.err' 90445- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 90446- (eval $ac_try) 2>&5 90447- ac_status=$? 90448- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90449- (exit $ac_status); }; } && 90450- { ac_try='test -s conftest$ac_exeext' 90451- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 90452- (eval $ac_try) 2>&5 90453- ac_status=$? 90454- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90455- (exit $ac_status); }; }; then 90456- eval "$as_ac_Lib=yes" 90457-else 90458- echo "$as_me: failed program was:" >&5 90459-sed 's/^/| /' conftest.$ac_ext >&5 90460- 90461-eval "$as_ac_Lib=no" 90462-fi 90463-rm -f conftest.err conftest.$ac_objext \ 90464- conftest$ac_exeext conftest.$ac_ext 90465-LIBS=$ac_check_lib_save_LIBS 90466-fi 90467-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 90468-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 90469-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 90470+ builtin and then its argument prototype would still apply. */ 90471+char mysql_close(); 90472 90473+int main() { 90474+mysql_close() 90475+; return 0; } 90476+EOF 90477+if { (eval echo configure:59572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 90478+ rm -rf conftest* 90479+ eval "ac_cv_lib_$ac_lib_var=yes" 90480+else 90481+ echo "configure: failed program was:" >&5 90482+ cat conftest.$ac_ext >&5 90483+ rm -rf conftest* 90484+ eval "ac_cv_lib_$ac_lib_var=no" 90485+fi 90486+rm -f conftest* 90487+LIBS="$ac_save_LIBS" 90488+ 90489+fi 90490+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 90491+ echo "$ac_t""yes" 1>&6 90492+ 90493 LDFLAGS=$save_old_LDFLAGS 90494 ext_shared=$save_ext_shared 90495- 90496- 90497+ 90498+ 90499 else 90500+ echo "$ac_t""no" 1>&6 90501 90502 LDFLAGS=$save_old_LDFLAGS 90503 ext_shared=$save_ext_shared 90504 unset ac_cv_lib_$MYSQL_LIBNAME_mysql_close 90505- 90506+ 90507 if test "$PHP_ZLIB_DIR" != "no"; then 90508- 90509+ 90510 90511 if test "$ext_shared" = "yes"; then 90512 MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" 90513 if test -n "$PHP_ZLIB_DIR"; then 90514- 90515+ 90516 if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then 90517- 90518+ 90519 if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then 90520 ai_p=$PHP_ZLIB_DIR 90521 else 90522- 90523+ 90524 ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 90525- 90526+ 90527 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90528 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 90529 fi 90530 90531- 90532+ 90533 if test "$ext_shared" = "yes"; then 90534 MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD" 90535 test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD" 90536 else 90537- 90538- 90539- 90540+ 90541+ 90542+ 90543 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90544- 90545+ 90546 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90547 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90548 eval "LIBPATH$unique=set" 90549- 90550+ 90551 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90552 LDFLAGS="$LDFLAGS -L$ai_p" 90553 PHP_RPATHS="$PHP_RPATHS $ai_p" 90554- 90555+ 90556 fi 90557 90558 90559 fi 90560- 90561+ 90562 fi 90563 90564 fi 90565 else 90566- 90567+ 90568 90569 if test -n "$PHP_ZLIB_DIR"; then 90570- 90571+ 90572 if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then 90573- 90574+ 90575 if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then 90576 ai_p=$PHP_ZLIB_DIR 90577 else 90578- 90579+ 90580 ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 90581- 90582+ 90583 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90584 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 90585 fi 90586 90587- 90588- 90589- 90590- 90591+ 90592+ 90593+ 90594+ 90595 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90596- 90597+ 90598 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90599 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90600 eval "LIBPATH$unique=set" 90601- 90602+ 90603 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90604 LDFLAGS="$LDFLAGS -L$ai_p" 90605 PHP_RPATHS="$PHP_RPATHS $ai_p" 90606- 90607+ 90608 fi 90609 90610 90611- 90612+ 90613 fi 90614 90615 fi 90616- 90617- 90618+ 90619+ 90620 case z in 90621 c|c_r|pthread*) ;; 90622- *) 90623- LIBS="-lz $LIBS" 90624+ *) 90625+ LIBS="-lz $LIBS" 90626 ;; 90627 esac 90628 90629@@ -78300,25 +59693,25 @@ 90630 fi 90631 90632 90633- 90634+ 90635 save_old_LDFLAGS=$LDFLAGS 90636 ac_stuff=" 90637- -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR 90638+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$MYSQL_LIB_DIR 90639 " 90640- 90641+ 90642 save_ext_shared=$ext_shared 90643 ext_shared=yes 90644- 90645+ 90646 for ac_i in $ac_stuff; do 90647 case $ac_i in 90648 -pthread) 90649 if test "$ext_shared" = "yes"; then 90650 LDFLAGS="$LDFLAGS -pthread" 90651 else 90652- 90653- 90654+ 90655+ 90656 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 90657- 90658+ 90659 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 90660 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90661 eval "EXTRA_LDFLAGS$unique=set" 90662@@ -78329,20 +59722,20 @@ 90663 ;; 90664 -l*) 90665 ac_ii=`echo $ac_i|cut -c 3-` 90666- 90667- 90668+ 90669+ 90670 case $ac_ii in 90671 c|c_r|pthread*) ;; 90672- *) 90673+ *) 90674 if test "$ext_shared" = "yes"; then 90675- LDFLAGS="$LDFLAGS -l$ac_ii" 90676+ LDFLAGS="$LDFLAGS -l$ac_ii" 90677 else 90678- 90679- 90680+ 90681+ 90682 case $ac_ii in 90683 c|c_r|pthread*) ;; 90684- *) 90685- LIBS="$LIBS -l$ac_ii" 90686+ *) 90687+ LIBS="$LIBS -l$ac_ii" 90688 ;; 90689 esac 90690 90691@@ -78355,148 +59748,116 @@ 90692 ;; 90693 -L*) 90694 ac_ii=`echo $ac_i|cut -c 3-` 90695- 90696+ 90697 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 90698- 90699+ 90700 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 90701 ai_p=$ac_ii 90702 else 90703- 90704+ 90705 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 90706- 90707+ 90708 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90709 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 90710 fi 90711 90712- 90713+ 90714 if test "$ext_shared" = "yes"; then 90715 LDFLAGS="-L$ai_p $LDFLAGS" 90716 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 90717 else 90718- 90719- 90720- 90721+ 90722+ 90723+ 90724 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90725- 90726+ 90727 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90728 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90729 eval "LIBPATH$unique=set" 90730- 90731+ 90732 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 90733 LDFLAGS="$LDFLAGS -L$ai_p" 90734 PHP_RPATHS="$PHP_RPATHS $ai_p" 90735- 90736+ 90737 fi 90738 90739 90740 fi 90741- 90742+ 90743 fi 90744 90745 ;; 90746 esac 90747 done 90748 90749- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_error" | $as_tr_sh` 90750-echo "$as_me:$LINENO: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 90751-echo $ECHO_N "checking for mysql_error in -l$MYSQL_LIBNAME... $ECHO_C" >&6 90752-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 90753- echo $ECHO_N "(cached) $ECHO_C" >&6 90754+ echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 90755+echo "configure:59795: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 90756+ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` 90757+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 90758+ echo $ac_n "(cached) $ac_c" 1>&6 90759 else 90760- ac_check_lib_save_LIBS=$LIBS 90761+ ac_save_LIBS="$LIBS" 90762 LIBS="-l$MYSQL_LIBNAME $LIBS" 90763-cat >conftest.$ac_ext <<_ACEOF 90764-/* confdefs.h. */ 90765-_ACEOF 90766-cat confdefs.h >>conftest.$ac_ext 90767-cat >>conftest.$ac_ext <<_ACEOF 90768-/* end confdefs.h. */ 90769- 90770+cat > conftest.$ac_ext <<EOF 90771+#line 59803 "configure" 90772+#include "confdefs.h" 90773 /* Override any gcc2 internal prototype to avoid an error. */ 90774-#ifdef __cplusplus 90775-extern "C" 90776-#endif 90777 /* We use char because int might match the return type of a gcc2 90778- builtin and then its argument prototype would still apply. */ 90779-char mysql_error (); 90780-int 90781-main () 90782-{ 90783-mysql_error (); 90784- ; 90785- return 0; 90786-} 90787-_ACEOF 90788-rm -f conftest.$ac_objext conftest$ac_exeext 90789-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 90790- (eval $ac_link) 2>conftest.er1 90791- ac_status=$? 90792- grep -v '^ *+' conftest.er1 >conftest.err 90793- rm -f conftest.er1 90794- cat conftest.err >&5 90795- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90796- (exit $ac_status); } && 90797- { ac_try='test -z "$ac_c_werror_flag" 90798- || test ! -s conftest.err' 90799- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 90800- (eval $ac_try) 2>&5 90801- ac_status=$? 90802- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90803- (exit $ac_status); }; } && 90804- { ac_try='test -s conftest$ac_exeext' 90805- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 90806- (eval $ac_try) 2>&5 90807- ac_status=$? 90808- echo "$as_me:$LINENO: \$? = $ac_status" >&5 90809- (exit $ac_status); }; }; then 90810- eval "$as_ac_Lib=yes" 90811-else 90812- echo "$as_me: failed program was:" >&5 90813-sed 's/^/| /' conftest.$ac_ext >&5 90814- 90815-eval "$as_ac_Lib=no" 90816-fi 90817-rm -f conftest.err conftest.$ac_objext \ 90818- conftest$ac_exeext conftest.$ac_ext 90819-LIBS=$ac_check_lib_save_LIBS 90820-fi 90821-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 90822-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 90823-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 90824+ builtin and then its argument prototype would still apply. */ 90825+char mysql_error(); 90826+ 90827+int main() { 90828+mysql_error() 90829+; return 0; } 90830+EOF 90831+if { (eval echo configure:59814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 90832+ rm -rf conftest* 90833+ eval "ac_cv_lib_$ac_lib_var=yes" 90834+else 90835+ echo "configure: failed program was:" >&5 90836+ cat conftest.$ac_ext >&5 90837+ rm -rf conftest* 90838+ eval "ac_cv_lib_$ac_lib_var=no" 90839+fi 90840+rm -f conftest* 90841+LIBS="$ac_save_LIBS" 90842 90843+fi 90844+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 90845+ echo "$ac_t""yes" 1>&6 90846+ 90847 LDFLAGS=$save_old_LDFLAGS 90848 ext_shared=$save_ext_shared 90849- 90850- 90851+ 90852+ 90853 else 90854+ echo "$ac_t""no" 1>&6 90855 90856 LDFLAGS=$save_old_LDFLAGS 90857 ext_shared=$save_ext_shared 90858 unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error 90859- 90860- { { echo "$as_me:$LINENO: error: mysql configure failed. Please check config.log for more information." >&5 90861-echo "$as_me: error: mysql configure failed. Please check config.log for more information." >&2;} 90862- { (exit 1); exit 1; }; } 90863- 90864- 90865+ 90866+ { echo "configure: error: mysql configure failed. Please check config.log for more information." 1>&2; exit 1; } 90867+ 90868+ 90869 fi 90870- 90871+ 90872 MYSQL_LIBS="-L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" 90873 else 90874- 90875- 90876+ 90877+ 90878 case z in 90879 c|c_r|pthread*) ;; 90880- *) 90881+ *) 90882 if test "$ext_shared" = "yes"; then 90883- MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" 90884+ MYSQL_SHARED_LIBADD="-lz $MYSQL_SHARED_LIBADD" 90885 else 90886- 90887- 90888+ 90889+ 90890 case z in 90891 c|c_r|pthread*) ;; 90892- *) 90893- LIBS="-lz $LIBS" 90894+ *) 90895+ LIBS="-lz $LIBS" 90896 ;; 90897 esac 90898 90899@@ -78506,25 +59867,25 @@ 90900 esac 90901 90902 90903- 90904+ 90905 save_old_LDFLAGS=$LDFLAGS 90906 ac_stuff=" 90907 -L$MYSQL_LIB_DIR 90908 " 90909- 90910+ 90911 save_ext_shared=$ext_shared 90912 ext_shared=yes 90913- 90914+ 90915 for ac_i in $ac_stuff; do 90916 case $ac_i in 90917 -pthread) 90918 if test "$ext_shared" = "yes"; then 90919 LDFLAGS="$LDFLAGS -pthread" 90920 else 90921- 90922- 90923+ 90924+ 90925 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 90926- 90927+ 90928 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 90929 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90930 eval "EXTRA_LDFLAGS$unique=set" 90931@@ -78535,20 +59896,20 @@ 90932 ;; 90933 -l*) 90934 ac_ii=`echo $ac_i|cut -c 3-` 90935- 90936- 90937+ 90938+ 90939 case $ac_ii in 90940 c|c_r|pthread*) ;; 90941- *) 90942+ *) 90943 if test "$ext_shared" = "yes"; then 90944- LDFLAGS="$LDFLAGS -l$ac_ii" 90945+ LDFLAGS="$LDFLAGS -l$ac_ii" 90946 else 90947- 90948- 90949+ 90950+ 90951 case $ac_ii in 90952 c|c_r|pthread*) ;; 90953- *) 90954- LIBS="$LIBS -l$ac_ii" 90955+ *) 90956+ LIBS="$LIBS -l$ac_ii" 90957 ;; 90958 esac 90959 90960@@ -78561,227 +59922,195 @@ 90961 ;; 90962 -L*) 90963 ac_ii=`echo $ac_i|cut -c 3-` 90964- 90965+ 90966 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 90967- 90968+ 90969 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 90970 ai_p=$ac_ii 90971 else 90972- 90973+ 90974 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 90975- 90976+ 90977 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 90978 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 90979 fi 90980 90981- 90982+ 90983 if test "$ext_shared" = "yes"; then 90984 LDFLAGS="-L$ai_p $LDFLAGS" 90985 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 90986 else 90987- 90988- 90989- 90990+ 90991+ 90992+ 90993 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 90994- 90995+ 90996 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 90997 if test -n "$unique" && test "`eval $cmd`" = "" ; then 90998 eval "LIBPATH$unique=set" 90999- 91000+ 91001 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 91002 LDFLAGS="$LDFLAGS -L$ai_p" 91003 PHP_RPATHS="$PHP_RPATHS $ai_p" 91004- 91005+ 91006 fi 91007 91008 91009 fi 91010- 91011+ 91012 fi 91013 91014 ;; 91015 esac 91016 done 91017 91018- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_errno" | $as_tr_sh` 91019-echo "$as_me:$LINENO: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 91020-echo $ECHO_N "checking for mysql_errno in -l$MYSQL_LIBNAME... $ECHO_C" >&6 91021-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 91022- echo $ECHO_N "(cached) $ECHO_C" >&6 91023+ echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 91024+echo "configure:59969: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 91025+ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` 91026+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 91027+ echo $ac_n "(cached) $ac_c" 1>&6 91028 else 91029- ac_check_lib_save_LIBS=$LIBS 91030+ ac_save_LIBS="$LIBS" 91031 LIBS="-l$MYSQL_LIBNAME $LIBS" 91032-cat >conftest.$ac_ext <<_ACEOF 91033-/* confdefs.h. */ 91034-_ACEOF 91035-cat confdefs.h >>conftest.$ac_ext 91036-cat >>conftest.$ac_ext <<_ACEOF 91037-/* end confdefs.h. */ 91038- 91039+cat > conftest.$ac_ext <<EOF 91040+#line 59977 "configure" 91041+#include "confdefs.h" 91042 /* Override any gcc2 internal prototype to avoid an error. */ 91043-#ifdef __cplusplus 91044-extern "C" 91045-#endif 91046 /* We use char because int might match the return type of a gcc2 91047- builtin and then its argument prototype would still apply. */ 91048-char mysql_errno (); 91049-int 91050-main () 91051-{ 91052-mysql_errno (); 91053- ; 91054- return 0; 91055-} 91056-_ACEOF 91057-rm -f conftest.$ac_objext conftest$ac_exeext 91058-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 91059- (eval $ac_link) 2>conftest.er1 91060- ac_status=$? 91061- grep -v '^ *+' conftest.er1 >conftest.err 91062- rm -f conftest.er1 91063- cat conftest.err >&5 91064- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91065- (exit $ac_status); } && 91066- { ac_try='test -z "$ac_c_werror_flag" 91067- || test ! -s conftest.err' 91068- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 91069- (eval $ac_try) 2>&5 91070- ac_status=$? 91071- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91072- (exit $ac_status); }; } && 91073- { ac_try='test -s conftest$ac_exeext' 91074- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 91075- (eval $ac_try) 2>&5 91076- ac_status=$? 91077- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91078- (exit $ac_status); }; }; then 91079- eval "$as_ac_Lib=yes" 91080-else 91081- echo "$as_me: failed program was:" >&5 91082-sed 's/^/| /' conftest.$ac_ext >&5 91083- 91084-eval "$as_ac_Lib=no" 91085-fi 91086-rm -f conftest.err conftest.$ac_objext \ 91087- conftest$ac_exeext conftest.$ac_ext 91088-LIBS=$ac_check_lib_save_LIBS 91089-fi 91090-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 91091-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 91092-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 91093+ builtin and then its argument prototype would still apply. */ 91094+char mysql_errno(); 91095+ 91096+int main() { 91097+mysql_errno() 91098+; return 0; } 91099+EOF 91100+if { (eval echo configure:59988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 91101+ rm -rf conftest* 91102+ eval "ac_cv_lib_$ac_lib_var=yes" 91103+else 91104+ echo "configure: failed program was:" >&5 91105+ cat conftest.$ac_ext >&5 91106+ rm -rf conftest* 91107+ eval "ac_cv_lib_$ac_lib_var=no" 91108+fi 91109+rm -f conftest* 91110+LIBS="$ac_save_LIBS" 91111 91112+fi 91113+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 91114+ echo "$ac_t""yes" 1>&6 91115+ 91116 LDFLAGS=$save_old_LDFLAGS 91117 ext_shared=$save_ext_shared 91118- 91119- 91120+ 91121+ 91122 else 91123+ echo "$ac_t""no" 1>&6 91124 91125 LDFLAGS=$save_old_LDFLAGS 91126 ext_shared=$save_ext_shared 91127 unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno 91128- 91129- { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5 91130-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;} 91131- { (exit 1); exit 1; }; } 91132- 91133- 91134+ 91135+ { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; } 91136+ 91137+ 91138 fi 91139- 91140+ 91141 MYSQL_LIBS="-lz" 91142 fi 91143- 91144- 91145+ 91146+ 91147 fi 91148 91149 91150- 91151+ 91152 91153 if test "$ext_shared" = "yes"; then 91154 MYSQL_SHARED_LIBADD="-l$MYSQL_LIBNAME $MYSQL_SHARED_LIBADD" 91155 if test -n "$MYSQL_LIB_DIR"; then 91156- 91157+ 91158 if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then 91159- 91160+ 91161 if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then 91162 ai_p=$MYSQL_LIB_DIR 91163 else 91164- 91165+ 91166 ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 91167- 91168+ 91169 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 91170 ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`" 91171 fi 91172 91173- 91174+ 91175 if test "$ext_shared" = "yes"; then 91176 MYSQL_SHARED_LIBADD="-L$ai_p $MYSQL_SHARED_LIBADD" 91177 test -n "$ld_runpath_switch" && MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQL_SHARED_LIBADD" 91178 else 91179- 91180- 91181- 91182+ 91183+ 91184+ 91185 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 91186- 91187+ 91188 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 91189 if test -n "$unique" && test "`eval $cmd`" = "" ; then 91190 eval "LIBPATH$unique=set" 91191- 91192+ 91193 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 91194 LDFLAGS="$LDFLAGS -L$ai_p" 91195 PHP_RPATHS="$PHP_RPATHS $ai_p" 91196- 91197+ 91198 fi 91199 91200 91201 fi 91202- 91203+ 91204 fi 91205 91206 fi 91207 else 91208- 91209+ 91210 91211 if test -n "$MYSQL_LIB_DIR"; then 91212- 91213+ 91214 if test "$MYSQL_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$MYSQL_LIB_DIR" != "/usr/lib"; then 91215- 91216+ 91217 if test -z "$MYSQL_LIB_DIR" || echo "$MYSQL_LIB_DIR" | grep '^/' >/dev/null ; then 91218 ai_p=$MYSQL_LIB_DIR 91219 else 91220- 91221+ 91222 ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 91223- 91224+ 91225 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 91226 ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`" 91227 fi 91228 91229- 91230- 91231- 91232- 91233+ 91234+ 91235+ 91236+ 91237 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 91238- 91239+ 91240 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 91241 if test -n "$unique" && test "`eval $cmd`" = "" ; then 91242 eval "LIBPATH$unique=set" 91243- 91244+ 91245 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 91246 LDFLAGS="$LDFLAGS -L$ai_p" 91247 PHP_RPATHS="$PHP_RPATHS $ai_p" 91248- 91249+ 91250 fi 91251 91252 91253- 91254+ 91255 fi 91256 91257 fi 91258- 91259- 91260+ 91261+ 91262 case $MYSQL_LIBNAME in 91263 c|c_r|pthread*) ;; 91264- *) 91265- LIBS="-l$MYSQL_LIBNAME $LIBS" 91266+ *) 91267+ LIBS="-l$MYSQL_LIBNAME $LIBS" 91268 ;; 91269 esac 91270 91271@@ -78791,33 +60120,33 @@ 91272 fi 91273 91274 91275- 91276+ 91277 if test "$MYSQL_INC_DIR" != "/usr/include"; then 91278- 91279+ 91280 if test -z "$MYSQL_INC_DIR" || echo "$MYSQL_INC_DIR" | grep '^/' >/dev/null ; then 91281 ai_p=$MYSQL_INC_DIR 91282 else 91283- 91284+ 91285 ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 91286- 91287+ 91288 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 91289 ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`" 91290 fi 91291 91292- 91293- 91294+ 91295+ 91296 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 91297- 91298+ 91299 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 91300 if test -n "$unique" && test "`eval $cmd`" = "" ; then 91301 eval "INCLUDEPATH$unique=set" 91302- 91303+ 91304 if test ""; then 91305 INCLUDES="-I$ai_p $INCLUDES" 91306 else 91307 INCLUDES="$INCLUDES -I$ai_p" 91308 fi 91309- 91310+ 91311 fi 91312 91313 fi 91314@@ -78826,41 +60155,39 @@ 91315 MYSQL_MODULE_TYPE=external 91316 MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS" 91317 MYSQL_INCLUDE=-I$MYSQL_INC_DIR 91318- 91319- 91320- 91321+ 91322+ 91323+ 91324 PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_MODULE_TYPE" 91325 91326+ 91327 91328- 91329- 91330- 91331+ 91332+ 91333 PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_LIBS" 91334 91335+ 91336 91337- 91338- 91339- 91340+ 91341+ 91342 PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_INCLUDE" 91343 91344- 91345+ 91346 91347 fi 91348 91349 if test "$PHP_MYSQL" != "no"; then 91350- echo "$as_me:$LINENO: checking for MySQL UNIX socket location" >&5 91351-echo $ECHO_N "checking for MySQL UNIX socket location... $ECHO_C" >&6 91352+ echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 91353+echo "configure:60182: checking for MySQL UNIX socket location" >&5 91354 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then 91355 MYSQL_SOCK=$PHP_MYSQL_SOCK 91356- 91357-cat >>confdefs.h <<_ACEOF 91358+ cat >> confdefs.h <<EOF 91359 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK" 91360-_ACEOF 91361+EOF 91362 91363- echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5 91364-echo "${ECHO_T}$MYSQL_SOCK" >&6 91365+ echo "$ac_t""$MYSQL_SOCK" 1>&6 91366 elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then 91367- 91368+ 91369 for i in \ 91370 /var/run/mysqld/mysqld.sock \ 91371 /var/tmp/mysql.sock \ 91372@@ -78879,29 +60206,24 @@ 91373 done 91374 91375 if test -n "$MYSQL_SOCK"; then 91376- 91377-cat >>confdefs.h <<_ACEOF 91378+ cat >> confdefs.h <<EOF 91379 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK" 91380-_ACEOF 91381+EOF 91382 91383- echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5 91384-echo "${ECHO_T}$MYSQL_SOCK" >&6 91385+ echo "$ac_t""$MYSQL_SOCK" 1>&6 91386 else 91387- echo "$as_me:$LINENO: result: no" >&5 91388-echo "${ECHO_T}no" >&6 91389+ echo "$ac_t""no" 1>&6 91390 fi 91391 91392 else 91393- echo "$as_me:$LINENO: result: no" >&5 91394-echo "${ECHO_T}no" >&6 91395+ echo "$ac_t""no" 1>&6 91396 fi 91397 91398- 91399-cat >>confdefs.h <<\_ACEOF 91400+ cat >> confdefs.h <<\EOF 91401 #define HAVE_MYSQL 1 91402-_ACEOF 91403- 91404+EOF 91405 91406+ 91407 ext_builddir=ext/mysql 91408 ext_srcdir=$abs_srcdir/ext/mysql 91409 91410@@ -78909,15 +60231,15 @@ 91411 91412 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 91413 PHP_MYSQL_SHARED=no 91414- 91415- 91416+ 91417+ 91418 case ext/mysql in 91419 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 91420 /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 91421 *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 91422 esac 91423- 91424- 91425+ 91426+ 91427 91428 b_c_pre=$php_c_pre 91429 b_cxx_pre=$php_cxx_pre 91430@@ -78930,12 +60252,12 @@ 91431 91432 old_IFS=$IFS 91433 for ac_src in php_mysql.c; do 91434- 91435+ 91436 IFS=. 91437 set $ac_src 91438 ac_obj=$1 91439 IFS=$old_IFS 91440- 91441+ 91442 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 91443 91444 case $ac_src in 91445@@ -78959,14 +60281,14 @@ 91446 else 91447 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 91448 PHP_MYSQL_SHARED=yes 91449- 91450+ 91451 case ext/mysql in 91452 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 91453 /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 91454 *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 91455 esac 91456- 91457- 91458+ 91459+ 91460 91461 b_c_pre=$shared_c_pre 91462 b_cxx_pre=$shared_cxx_pre 91463@@ -78979,12 +60301,12 @@ 91464 91465 old_IFS=$IFS 91466 for ac_src in php_mysql.c; do 91467- 91468+ 91469 IFS=. 91470 set $ac_src 91471 ac_obj=$1 91472 IFS=$old_IFS 91473- 91474+ 91475 shared_objects_mysql="$shared_objects_mysql $ac_bdir$ac_obj.lo" 91476 91477 case $ac_src in 91478@@ -79002,7 +60324,7 @@ 91479 91480 case $host_alias in 91481 *netware*) 91482- 91483+ 91484 install_modules="install-modules" 91485 91486 case $host_alias in 91487@@ -79012,7 +60334,7 @@ 91488 ;; 91489 *netware*) 91490 suffix=nlm 91491- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(MYSQL_SHARED_LIBADD)' 91492+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQL, 3)_SHARED_LIBADD)' 91493 ;; 91494 *) 91495 suffix=la 91496@@ -79025,7 +60347,7 @@ 91497 else 91498 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysql.$suffix" 91499 fi 91500- 91501+ 91502 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql" 91503 91504 cat >>Makefile.objects<<EOF 91505@@ -79039,7 +60361,7 @@ 91506 91507 ;; 91508 *) 91509- 91510+ 91511 install_modules="install-modules" 91512 91513 case $host_alias in 91514@@ -79049,7 +60371,7 @@ 91515 ;; 91516 *netware*) 91517 suffix=nlm 91518- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(QL_SHARED_LIBADD)' 91519+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQL, 3)_SHARED_LIBADD)' 91520 ;; 91521 *) 91522 suffix=la 91523@@ -79062,7 +60384,7 @@ 91524 else 91525 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysql.$suffix" 91526 fi 91527- 91528+ 91529 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysql" 91530 91531 cat >>Makefile.objects<<EOF 91532@@ -79076,10 +60398,9 @@ 91533 91534 ;; 91535 esac 91536- 91537-cat >>confdefs.h <<_ACEOF 91538+ cat >> confdefs.h <<EOF 91539 #define COMPILE_DL_MYSQL 1 91540-_ACEOF 91541+EOF 91542 91543 fi 91544 fi 91545@@ -79088,15 +60409,15 @@ 91546 PHP_MYSQL_SHARED=no 91547 case "$PHP_SAPI" in 91548 cgi|embed) 91549- 91550- 91551+ 91552+ 91553 case ext/mysql in 91554 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 91555 /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 91556 *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 91557 esac 91558- 91559- 91560+ 91561+ 91562 91563 b_c_pre=$php_c_pre 91564 b_cxx_pre=$php_cxx_pre 91565@@ -79109,12 +60430,12 @@ 91566 91567 old_IFS=$IFS 91568 for ac_src in php_mysql.c; do 91569- 91570+ 91571 IFS=. 91572 set $ac_src 91573 ac_obj=$1 91574 IFS=$old_IFS 91575- 91576+ 91577 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 91578 91579 case $ac_src in 91580@@ -79134,15 +60455,15 @@ 91581 EXT_STATIC="$EXT_STATIC mysql" 91582 ;; 91583 *) 91584- 91585- 91586+ 91587+ 91588 case ext/mysql in 91589 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 91590 /*) ac_srcdir=`echo "ext/mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 91591 *) ac_srcdir="$abs_srcdir/ext/mysql/"; ac_bdir="ext/mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 91592 esac 91593- 91594- 91595+ 91596+ 91597 91598 b_c_pre=$php_c_pre 91599 b_cxx_pre=$php_cxx_pre 91600@@ -79155,13 +60476,13 @@ 91601 91602 old_IFS=$IFS 91603 for ac_src in php_mysql.c; do 91604- 91605+ 91606 IFS=. 91607 set $ac_src 91608 ac_obj=$1 91609 IFS=$old_IFS 91610- 91611- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 91612+ 91613+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 91614 91615 case $ac_src in 91616 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 91617@@ -79181,59 +60502,46 @@ 91618 esac 91619 EXT_CLI_STATIC="$EXT_CLI_STATIC mysql" 91620 fi 91621- 91622- 91623+ 91624+ 91625 BUILD_DIR="$BUILD_DIR $ext_builddir" 91626- 91627+ 91628 91629 91630 if test "$ext_builddir" = "."; then 91631 PHP_PECL_EXTENSION=mysql 91632- 91633+ 91634 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 91635 91636 fi 91637 91638- 91639+ 91640 PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQL_SHARED_LIBADD" 91641 91642 91643 if test "$PHP_MYSQL" = "mysqlnd"; then 91644- 91645+ 91646 am_i_shared=$PHP_MYSQL_SHARED 91647 is_it_shared=$PHP_MYSQLND_SHARED 91648 is_it_enabled=$PHP_MYSQLND 91649 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 91650- { { echo "$as_me:$LINENO: error: 91651-You've configured extension mysql to build statically, but it 91652-depends on extension mysqlnd, which you've configured to build shared. 91653-You either need to build mysql shared or build mysqlnd statically for the 91654-build to be successful. 91655-" >&5 91656-echo "$as_me: error: 91657+ { echo "configure: error: 91658 You've configured extension mysql to build statically, but it 91659 depends on extension mysqlnd, which you've configured to build shared. 91660 You either need to build mysql shared or build mysqlnd statically for the 91661 build to be successful. 91662-" >&2;} 91663- { (exit 1); exit 1; }; } 91664+" 1>&2; exit 1; } 91665 fi 91666 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 91667- { { echo "$as_me:$LINENO: error: 91668+ { echo "configure: error: 91669 You've configured extension mysql, which depends on extension mysqlnd, 91670 but you've either not enabled mysqlnd, or have disabled it. 91671-" >&5 91672-echo "$as_me: error: 91673-You've configured extension mysql, which depends on extension mysqlnd, 91674-but you've either not enabled mysqlnd, or have disabled it. 91675-" >&2;} 91676- { (exit 1); exit 1; }; } 91677+" 1>&2; exit 1; } 91678 fi 91679- 91680- 91681-cat >>confdefs.h <<\_ACEOF 91682+ 91683+ cat >> confdefs.h <<\EOF 91684 #define MYSQL_USE_MYSQLND 1 91685-_ACEOF 91686+EOF 91687 91688 fi 91689 fi 91690@@ -79242,19 +60550,19 @@ 91691 91692 php_with_mysqli=no 91693 91694-echo "$as_me:$LINENO: checking for MySQLi support" >&5 91695-echo $ECHO_N "checking for MySQLi support... $ECHO_C" >&6 91696- 91697+echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6 91698+echo "configure:60555: checking for MySQLi support" >&5 91699 # Check whether --with-mysqli or --without-mysqli was given. 91700 if test "${with_mysqli+set}" = set; then 91701 withval="$with_mysqli" 91702 PHP_MYSQLI=$withval 91703 else 91704- 91705+ 91706 PHP_MYSQLI=no 91707 test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL 91708 91709-fi; 91710+fi 91711+ 91712 91713 91714 ext_output="yes, shared" 91715@@ -79278,8 +60586,7 @@ 91716 91717 91718 91719-echo "$as_me:$LINENO: result: $ext_output" >&5 91720-echo "${ECHO_T}$ext_output" >&6 91721+echo "$ac_t""$ext_output" 1>&6 91722 91723 91724 91725@@ -79287,22 +60594,22 @@ 91726 91727 php_enable_embedded_mysqli=no 91728 91729-echo "$as_me:$LINENO: checking whether to enable embedded MySQLi support" >&5 91730-echo $ECHO_N "checking whether to enable embedded MySQLi support... $ECHO_C" >&6 91731+echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 91732+echo "configure:60599: checking whether to enable embedded MySQLi support" >&5 91733 # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. 91734 if test "${enable_embedded_mysqli+set}" = set; then 91735 enableval="$enable_embedded_mysqli" 91736 PHP_EMBEDDED_MYSQLI=$enableval 91737 else 91738- 91739+ 91740 PHP_EMBEDDED_MYSQLI=no 91741+ 91742 91743+fi 91744 91745-fi; 91746 91747 ext_output=$PHP_EMBEDDED_MYSQLI 91748-echo "$as_me:$LINENO: result: $ext_output" >&5 91749-echo "${ECHO_T}$ext_output" >&6 91750+echo "$ac_t""$ext_output" 1>&6 91751 91752 91753 91754@@ -79320,10 +60627,9 @@ 91755 91756 MYSQL_LIB_NAME='mysqlclient' 91757 if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then 91758- 91759-cat >>confdefs.h <<\_ACEOF 91760+ cat >> confdefs.h <<\EOF 91761 #define HAVE_EMBEDDED_MYSQLI 1 91762-_ACEOF 91763+EOF 91764 91765 MYSQL_LIB_CFG='--libmysqld-libs' 91766 mysqli_extra_sources="mysqli_embedded.c" 91767@@ -79333,37 +60639,34 @@ 91768 else 91769 MYSQL_LIB_CFG='--libs' 91770 fi 91771- 91772+ 91773 if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then 91774 MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` 91775 MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` 91776 else 91777- echo "$as_me:$LINENO: result: mysql_config not found" >&5 91778-echo "${ECHO_T}mysql_config not found" >&6 91779- { { echo "$as_me:$LINENO: error: Please reinstall the mysql distribution" >&5 91780-echo "$as_me: error: Please reinstall the mysql distribution" >&2;} 91781- { (exit 1); exit 1; }; } 91782+ echo "$ac_t""mysql_config not found" 1>&6 91783+ { echo "configure: error: Please reinstall the mysql distribution" 1>&2; exit 1; } 91784 fi 91785 91786- 91787+ 91788 save_old_LDFLAGS=$LDFLAGS 91789 ac_stuff=" 91790 $MYSQLI_LIBLINE 91791 " 91792- 91793+ 91794 save_ext_shared=$ext_shared 91795 ext_shared=yes 91796- 91797+ 91798 for ac_i in $ac_stuff; do 91799 case $ac_i in 91800 -pthread) 91801 if test "$ext_shared" = "yes"; then 91802 LDFLAGS="$LDFLAGS -pthread" 91803 else 91804- 91805- 91806+ 91807+ 91808 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 91809- 91810+ 91811 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 91812 if test -n "$unique" && test "`eval $cmd`" = "" ; then 91813 eval "EXTRA_LDFLAGS$unique=set" 91814@@ -79374,20 +60677,20 @@ 91815 ;; 91816 -l*) 91817 ac_ii=`echo $ac_i|cut -c 3-` 91818- 91819- 91820+ 91821+ 91822 case $ac_ii in 91823 c|c_r|pthread*) ;; 91824- *) 91825+ *) 91826 if test "$ext_shared" = "yes"; then 91827- LDFLAGS="$LDFLAGS -l$ac_ii" 91828+ LDFLAGS="$LDFLAGS -l$ac_ii" 91829 else 91830- 91831- 91832+ 91833+ 91834 case $ac_ii in 91835 c|c_r|pthread*) ;; 91836- *) 91837- LIBS="$LIBS -l$ac_ii" 91838+ *) 91839+ LIBS="$LIBS -l$ac_ii" 91840 ;; 91841 esac 91842 91843@@ -79400,150 +60703,119 @@ 91844 ;; 91845 -L*) 91846 ac_ii=`echo $ac_i|cut -c 3-` 91847- 91848+ 91849 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 91850- 91851+ 91852 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 91853 ai_p=$ac_ii 91854 else 91855- 91856+ 91857 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 91858- 91859+ 91860 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 91861 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 91862 fi 91863 91864- 91865+ 91866 if test "$ext_shared" = "yes"; then 91867 LDFLAGS="-L$ai_p $LDFLAGS" 91868 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 91869 else 91870- 91871- 91872- 91873+ 91874+ 91875+ 91876 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 91877- 91878+ 91879 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 91880 if test -n "$unique" && test "`eval $cmd`" = "" ; then 91881 eval "LIBPATH$unique=set" 91882- 91883+ 91884 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 91885 LDFLAGS="$LDFLAGS -L$ai_p" 91886 PHP_RPATHS="$PHP_RPATHS $ai_p" 91887- 91888+ 91889 fi 91890 91891 91892 fi 91893- 91894+ 91895 fi 91896 91897 ;; 91898 esac 91899 done 91900 91901- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_server_option" | $as_tr_sh` 91902-echo "$as_me:$LINENO: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 91903-echo $ECHO_N "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME... $ECHO_C" >&6 91904-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 91905- echo $ECHO_N "(cached) $ECHO_C" >&6 91906+ echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 91907+echo "configure:60750: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 91908+ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` 91909+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 91910+ echo $ac_n "(cached) $ac_c" 1>&6 91911 else 91912- ac_check_lib_save_LIBS=$LIBS 91913+ ac_save_LIBS="$LIBS" 91914 LIBS="-l$MYSQL_LIB_NAME $LIBS" 91915-cat >conftest.$ac_ext <<_ACEOF 91916-/* confdefs.h. */ 91917-_ACEOF 91918-cat confdefs.h >>conftest.$ac_ext 91919-cat >>conftest.$ac_ext <<_ACEOF 91920-/* end confdefs.h. */ 91921- 91922+cat > conftest.$ac_ext <<EOF 91923+#line 60758 "configure" 91924+#include "confdefs.h" 91925 /* Override any gcc2 internal prototype to avoid an error. */ 91926-#ifdef __cplusplus 91927-extern "C" 91928-#endif 91929 /* We use char because int might match the return type of a gcc2 91930- builtin and then its argument prototype would still apply. */ 91931-char mysql_set_server_option (); 91932-int 91933-main () 91934-{ 91935-mysql_set_server_option (); 91936- ; 91937- return 0; 91938-} 91939-_ACEOF 91940-rm -f conftest.$ac_objext conftest$ac_exeext 91941-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 91942- (eval $ac_link) 2>conftest.er1 91943- ac_status=$? 91944- grep -v '^ *+' conftest.er1 >conftest.err 91945- rm -f conftest.er1 91946- cat conftest.err >&5 91947- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91948- (exit $ac_status); } && 91949- { ac_try='test -z "$ac_c_werror_flag" 91950- || test ! -s conftest.err' 91951- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 91952- (eval $ac_try) 2>&5 91953- ac_status=$? 91954- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91955- (exit $ac_status); }; } && 91956- { ac_try='test -s conftest$ac_exeext' 91957- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 91958- (eval $ac_try) 2>&5 91959- ac_status=$? 91960- echo "$as_me:$LINENO: \$? = $ac_status" >&5 91961- (exit $ac_status); }; }; then 91962- eval "$as_ac_Lib=yes" 91963-else 91964- echo "$as_me: failed program was:" >&5 91965-sed 's/^/| /' conftest.$ac_ext >&5 91966- 91967-eval "$as_ac_Lib=no" 91968-fi 91969-rm -f conftest.err conftest.$ac_objext \ 91970- conftest$ac_exeext conftest.$ac_ext 91971-LIBS=$ac_check_lib_save_LIBS 91972-fi 91973-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 91974-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 91975-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 91976+ builtin and then its argument prototype would still apply. */ 91977+char mysql_set_server_option(); 91978+ 91979+int main() { 91980+mysql_set_server_option() 91981+; return 0; } 91982+EOF 91983+if { (eval echo configure:60769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 91984+ rm -rf conftest* 91985+ eval "ac_cv_lib_$ac_lib_var=yes" 91986+else 91987+ echo "configure: failed program was:" >&5 91988+ cat conftest.$ac_ext >&5 91989+ rm -rf conftest* 91990+ eval "ac_cv_lib_$ac_lib_var=no" 91991+fi 91992+rm -f conftest* 91993+LIBS="$ac_save_LIBS" 91994 91995+fi 91996+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 91997+ echo "$ac_t""yes" 1>&6 91998+ 91999 LDFLAGS=$save_old_LDFLAGS 92000 ext_shared=$save_ext_shared 92001- 92002- 92003+ 92004+ 92005 for ac_i in $MYSQLI_INCLINE; do 92006 case $ac_i in 92007 -I*) 92008 ac_ii=`echo $ac_i|cut -c 3-` 92009- 92010+ 92011 if test "$ac_ii" != "/usr/include"; then 92012- 92013+ 92014 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 92015 ai_p=$ac_ii 92016 else 92017- 92018+ 92019 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 92020- 92021+ 92022 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 92023 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 92024 fi 92025 92026- 92027- 92028+ 92029+ 92030 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 92031- 92032+ 92033 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 92034 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92035 eval "INCLUDEPATH$unique=set" 92036- 92037+ 92038 if test ""; then 92039 INCLUDES="-I$ai_p $INCLUDES" 92040 else 92041 INCLUDES="$INCLUDES -I$ai_p" 92042 fi 92043- 92044+ 92045 fi 92046 92047 fi 92048@@ -79552,17 +60824,17 @@ 92049 esac 92050 done 92051 92052- 92053+ 92054 for ac_i in $MYSQLI_LIBLINE; do 92055 case $ac_i in 92056 -pthread) 92057 if test "$ext_shared" = "yes"; then 92058 MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -pthread" 92059 else 92060- 92061- 92062+ 92063+ 92064 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 92065- 92066+ 92067 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 92068 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92069 eval "EXTRA_LDFLAGS$unique=set" 92070@@ -79573,20 +60845,20 @@ 92071 ;; 92072 -l*) 92073 ac_ii=`echo $ac_i|cut -c 3-` 92074- 92075- 92076+ 92077+ 92078 case $ac_ii in 92079 c|c_r|pthread*) ;; 92080- *) 92081+ *) 92082 if test "$ext_shared" = "yes"; then 92083- MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii" 92084+ MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -l$ac_ii" 92085 else 92086- 92087- 92088+ 92089+ 92090 case $ac_ii in 92091 c|c_r|pthread*) ;; 92092- *) 92093- LIBS="$LIBS -l$ac_ii" 92094+ *) 92095+ LIBS="$LIBS -l$ac_ii" 92096 ;; 92097 esac 92098 92099@@ -79599,70 +60871,69 @@ 92100 ;; 92101 -L*) 92102 ac_ii=`echo $ac_i|cut -c 3-` 92103- 92104+ 92105 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 92106- 92107+ 92108 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 92109 ai_p=$ac_ii 92110 else 92111- 92112+ 92113 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 92114- 92115+ 92116 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 92117 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 92118 fi 92119 92120- 92121+ 92122 if test "$ext_shared" = "yes"; then 92123 MYSQLI_SHARED_LIBADD="-L$ai_p $MYSQLI_SHARED_LIBADD" 92124 test -n "$ld_runpath_switch" && MYSQLI_SHARED_LIBADD="$ld_runpath_switch$ai_p $MYSQLI_SHARED_LIBADD" 92125 else 92126- 92127- 92128- 92129+ 92130+ 92131+ 92132 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 92133- 92134+ 92135 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 92136 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92137 eval "LIBPATH$unique=set" 92138- 92139+ 92140 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 92141 LDFLAGS="$LDFLAGS -L$ai_p" 92142 PHP_RPATHS="$PHP_RPATHS $ai_p" 92143- 92144+ 92145 fi 92146 92147 92148 fi 92149- 92150+ 92151 fi 92152 92153 ;; 92154 esac 92155 done 92156 92157- 92158-cat >>confdefs.h <<\_ACEOF 92159+ cat >> confdefs.h <<\EOF 92160 #define HAVE_MYSQLILIB 1 92161-_ACEOF 92162- 92163+EOF 92164 92165+ 92166 save_old_LDFLAGS=$LDFLAGS 92167 ac_stuff="$MYSQLI_LIBLINE" 92168- 92169+ 92170 save_ext_shared=$ext_shared 92171 ext_shared=yes 92172- 92173+ 92174 for ac_i in $ac_stuff; do 92175 case $ac_i in 92176 -pthread) 92177 if test "$ext_shared" = "yes"; then 92178 LDFLAGS="$LDFLAGS -pthread" 92179 else 92180- 92181- 92182+ 92183+ 92184 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 92185- 92186+ 92187 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 92188 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92189 eval "EXTRA_LDFLAGS$unique=set" 92190@@ -79673,20 +60944,20 @@ 92191 ;; 92192 -l*) 92193 ac_ii=`echo $ac_i|cut -c 3-` 92194- 92195- 92196+ 92197+ 92198 case $ac_ii in 92199 c|c_r|pthread*) ;; 92200- *) 92201+ *) 92202 if test "$ext_shared" = "yes"; then 92203- LDFLAGS="$LDFLAGS -l$ac_ii" 92204+ LDFLAGS="$LDFLAGS -l$ac_ii" 92205 else 92206- 92207- 92208+ 92209+ 92210 case $ac_ii in 92211 c|c_r|pthread*) ;; 92212- *) 92213- LIBS="$LIBS -l$ac_ii" 92214+ *) 92215+ LIBS="$LIBS -l$ac_ii" 92216 ;; 92217 esac 92218 92219@@ -79699,166 +60970,133 @@ 92220 ;; 92221 -L*) 92222 ac_ii=`echo $ac_i|cut -c 3-` 92223- 92224+ 92225 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 92226- 92227+ 92228 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 92229 ai_p=$ac_ii 92230 else 92231- 92232+ 92233 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 92234- 92235+ 92236 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 92237 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 92238 fi 92239 92240- 92241+ 92242 if test "$ext_shared" = "yes"; then 92243 LDFLAGS="-L$ai_p $LDFLAGS" 92244 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 92245 else 92246- 92247- 92248- 92249+ 92250+ 92251+ 92252 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 92253- 92254+ 92255 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 92256 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92257 eval "LIBPATH$unique=set" 92258- 92259+ 92260 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 92261 LDFLAGS="$LDFLAGS -L$ai_p" 92262 PHP_RPATHS="$PHP_RPATHS $ai_p" 92263- 92264+ 92265 fi 92266 92267 92268 fi 92269- 92270+ 92271 fi 92272 92273 ;; 92274 esac 92275 done 92276 92277- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_character_set" | $as_tr_sh` 92278-echo "$as_me:$LINENO: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 92279-echo $ECHO_N "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME... $ECHO_C" >&6 92280-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 92281- echo $ECHO_N "(cached) $ECHO_C" >&6 92282+ echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 92283+echo "configure:61017: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 92284+ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'` 92285+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 92286+ echo $ac_n "(cached) $ac_c" 1>&6 92287 else 92288- ac_check_lib_save_LIBS=$LIBS 92289+ ac_save_LIBS="$LIBS" 92290 LIBS="-l$MYSQL_LIB_NAME $LIBS" 92291-cat >conftest.$ac_ext <<_ACEOF 92292-/* confdefs.h. */ 92293-_ACEOF 92294-cat confdefs.h >>conftest.$ac_ext 92295-cat >>conftest.$ac_ext <<_ACEOF 92296-/* end confdefs.h. */ 92297- 92298+cat > conftest.$ac_ext <<EOF 92299+#line 61025 "configure" 92300+#include "confdefs.h" 92301 /* Override any gcc2 internal prototype to avoid an error. */ 92302-#ifdef __cplusplus 92303-extern "C" 92304-#endif 92305 /* We use char because int might match the return type of a gcc2 92306- builtin and then its argument prototype would still apply. */ 92307-char mysql_set_character_set (); 92308-int 92309-main () 92310-{ 92311-mysql_set_character_set (); 92312- ; 92313- return 0; 92314-} 92315-_ACEOF 92316-rm -f conftest.$ac_objext conftest$ac_exeext 92317-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 92318- (eval $ac_link) 2>conftest.er1 92319- ac_status=$? 92320- grep -v '^ *+' conftest.er1 >conftest.err 92321- rm -f conftest.er1 92322- cat conftest.err >&5 92323- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92324- (exit $ac_status); } && 92325- { ac_try='test -z "$ac_c_werror_flag" 92326- || test ! -s conftest.err' 92327- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 92328- (eval $ac_try) 2>&5 92329- ac_status=$? 92330- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92331- (exit $ac_status); }; } && 92332- { ac_try='test -s conftest$ac_exeext' 92333- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 92334- (eval $ac_try) 2>&5 92335- ac_status=$? 92336- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92337- (exit $ac_status); }; }; then 92338- eval "$as_ac_Lib=yes" 92339-else 92340- echo "$as_me: failed program was:" >&5 92341-sed 's/^/| /' conftest.$ac_ext >&5 92342- 92343-eval "$as_ac_Lib=no" 92344-fi 92345-rm -f conftest.err conftest.$ac_objext \ 92346- conftest$ac_exeext conftest.$ac_ext 92347-LIBS=$ac_check_lib_save_LIBS 92348-fi 92349-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 92350-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 92351-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 92352+ builtin and then its argument prototype would still apply. */ 92353+char mysql_set_character_set(); 92354+ 92355+int main() { 92356+mysql_set_character_set() 92357+; return 0; } 92358+EOF 92359+if { (eval echo configure:61036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 92360+ rm -rf conftest* 92361+ eval "ac_cv_lib_$ac_lib_var=yes" 92362+else 92363+ echo "configure: failed program was:" >&5 92364+ cat conftest.$ac_ext >&5 92365+ rm -rf conftest* 92366+ eval "ac_cv_lib_$ac_lib_var=no" 92367+fi 92368+rm -f conftest* 92369+LIBS="$ac_save_LIBS" 92370 92371+fi 92372+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 92373+ echo "$ac_t""yes" 1>&6 92374+ 92375 LDFLAGS=$save_old_LDFLAGS 92376 ext_shared=$save_ext_shared 92377- 92378- 92379+ 92380+ 92381 else 92382+ echo "$ac_t""no" 1>&6 92383 92384 LDFLAGS=$save_old_LDFLAGS 92385 ext_shared=$save_ext_shared 92386 unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set 92387- 92388- { { echo "$as_me:$LINENO: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&5 92389-echo "$as_me: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&2;} 92390- { (exit 1); exit 1; }; } 92391- 92392- 92393+ 92394+ { echo "configure: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." 1>&2; exit 1; } 92395+ 92396+ 92397 fi 92398 92399- 92400- 92401+ 92402+ 92403 else 92404+ echo "$ac_t""no" 1>&6 92405 92406 LDFLAGS=$save_old_LDFLAGS 92407 ext_shared=$save_ext_shared 92408 unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option 92409- 92410- { { echo "$as_me:$LINENO: error: wrong mysql library version or lib not found. Check config.log for more information." >&5 92411-echo "$as_me: error: wrong mysql library version or lib not found. Check config.log for more information." >&2;} 92412- { (exit 1); exit 1; }; } 92413- 92414- 92415+ 92416+ { echo "configure: error: wrong mysql library version or lib not found. Check config.log for more information." 1>&2; exit 1; } 92417+ 92418+ 92419 fi 92420 92421- 92422+ 92423 save_old_LDFLAGS=$LDFLAGS 92424 ac_stuff=" 92425 $MYSQLI_LIBLINE 92426 " 92427- 92428+ 92429 save_ext_shared=$ext_shared 92430 ext_shared=yes 92431- 92432+ 92433 for ac_i in $ac_stuff; do 92434 case $ac_i in 92435 -pthread) 92436 if test "$ext_shared" = "yes"; then 92437 LDFLAGS="$LDFLAGS -pthread" 92438 else 92439- 92440- 92441+ 92442+ 92443 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 92444- 92445+ 92446 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 92447 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92448 eval "EXTRA_LDFLAGS$unique=set" 92449@@ -79869,20 +61107,20 @@ 92450 ;; 92451 -l*) 92452 ac_ii=`echo $ac_i|cut -c 3-` 92453- 92454- 92455+ 92456+ 92457 case $ac_ii in 92458 c|c_r|pthread*) ;; 92459- *) 92460+ *) 92461 if test "$ext_shared" = "yes"; then 92462- LDFLAGS="$LDFLAGS -l$ac_ii" 92463+ LDFLAGS="$LDFLAGS -l$ac_ii" 92464 else 92465- 92466- 92467+ 92468+ 92469 case $ac_ii in 92470 c|c_r|pthread*) ;; 92471- *) 92472- LIBS="$LIBS -l$ac_ii" 92473+ *) 92474+ LIBS="$LIBS -l$ac_ii" 92475 ;; 92476 esac 92477 92478@@ -79895,133 +61133,102 @@ 92479 ;; 92480 -L*) 92481 ac_ii=`echo $ac_i|cut -c 3-` 92482- 92483+ 92484 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 92485- 92486+ 92487 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 92488 ai_p=$ac_ii 92489 else 92490- 92491+ 92492 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 92493- 92494+ 92495 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 92496 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 92497 fi 92498 92499- 92500+ 92501 if test "$ext_shared" = "yes"; then 92502 LDFLAGS="-L$ai_p $LDFLAGS" 92503 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 92504 else 92505- 92506- 92507- 92508+ 92509+ 92510+ 92511 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 92512- 92513+ 92514 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 92515 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92516 eval "LIBPATH$unique=set" 92517- 92518+ 92519 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 92520 LDFLAGS="$LDFLAGS -L$ai_p" 92521 PHP_RPATHS="$PHP_RPATHS $ai_p" 92522- 92523+ 92524 fi 92525 92526 92527 fi 92528- 92529+ 92530 fi 92531 92532 ;; 92533 esac 92534 done 92535 92536- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_stmt_next_result" | $as_tr_sh` 92537-echo "$as_me:$LINENO: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 92538-echo $ECHO_N "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME... $ECHO_C" >&6 92539-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 92540- echo $ECHO_N "(cached) $ECHO_C" >&6 92541+ echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 92542+echo "configure:61180: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 92543+ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` 92544+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 92545+ echo $ac_n "(cached) $ac_c" 1>&6 92546 else 92547- ac_check_lib_save_LIBS=$LIBS 92548+ ac_save_LIBS="$LIBS" 92549 LIBS="-l$MYSQL_LIB_NAME $LIBS" 92550-cat >conftest.$ac_ext <<_ACEOF 92551-/* confdefs.h. */ 92552-_ACEOF 92553-cat confdefs.h >>conftest.$ac_ext 92554-cat >>conftest.$ac_ext <<_ACEOF 92555-/* end confdefs.h. */ 92556- 92557+cat > conftest.$ac_ext <<EOF 92558+#line 61188 "configure" 92559+#include "confdefs.h" 92560 /* Override any gcc2 internal prototype to avoid an error. */ 92561-#ifdef __cplusplus 92562-extern "C" 92563-#endif 92564 /* We use char because int might match the return type of a gcc2 92565- builtin and then its argument prototype would still apply. */ 92566-char mysql_stmt_next_result (); 92567-int 92568-main () 92569-{ 92570-mysql_stmt_next_result (); 92571- ; 92572- return 0; 92573-} 92574-_ACEOF 92575-rm -f conftest.$ac_objext conftest$ac_exeext 92576-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 92577- (eval $ac_link) 2>conftest.er1 92578- ac_status=$? 92579- grep -v '^ *+' conftest.er1 >conftest.err 92580- rm -f conftest.er1 92581- cat conftest.err >&5 92582- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92583- (exit $ac_status); } && 92584- { ac_try='test -z "$ac_c_werror_flag" 92585- || test ! -s conftest.err' 92586- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 92587- (eval $ac_try) 2>&5 92588- ac_status=$? 92589- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92590- (exit $ac_status); }; } && 92591- { ac_try='test -s conftest$ac_exeext' 92592- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 92593- (eval $ac_try) 2>&5 92594- ac_status=$? 92595- echo "$as_me:$LINENO: \$? = $ac_status" >&5 92596- (exit $ac_status); }; }; then 92597- eval "$as_ac_Lib=yes" 92598-else 92599- echo "$as_me: failed program was:" >&5 92600-sed 's/^/| /' conftest.$ac_ext >&5 92601- 92602-eval "$as_ac_Lib=no" 92603-fi 92604-rm -f conftest.err conftest.$ac_objext \ 92605- conftest$ac_exeext conftest.$ac_ext 92606-LIBS=$ac_check_lib_save_LIBS 92607-fi 92608-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 92609-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 92610-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 92611+ builtin and then its argument prototype would still apply. */ 92612+char mysql_stmt_next_result(); 92613+ 92614+int main() { 92615+mysql_stmt_next_result() 92616+; return 0; } 92617+EOF 92618+if { (eval echo configure:61199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 92619+ rm -rf conftest* 92620+ eval "ac_cv_lib_$ac_lib_var=yes" 92621+else 92622+ echo "configure: failed program was:" >&5 92623+ cat conftest.$ac_ext >&5 92624+ rm -rf conftest* 92625+ eval "ac_cv_lib_$ac_lib_var=no" 92626+fi 92627+rm -f conftest* 92628+LIBS="$ac_save_LIBS" 92629 92630+fi 92631+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 92632+ echo "$ac_t""yes" 1>&6 92633+ 92634 LDFLAGS=$save_old_LDFLAGS 92635 ext_shared=$save_ext_shared 92636- 92637- 92638-cat >>confdefs.h <<\_ACEOF 92639+ 92640+ cat >> confdefs.h <<\EOF 92641 #define HAVE_STMT_NEXT_RESULT 1 92642-_ACEOF 92643- 92644- 92645+EOF 92646 92647+ 92648+ 92649 else 92650+ echo "$ac_t""no" 1>&6 92651 92652 LDFLAGS=$save_old_LDFLAGS 92653 ext_shared=$save_ext_shared 92654 unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_stmt_next_result 92655- 92656- 92657- 92658+ 92659+ 92660+ 92661 fi 92662 92663 fi 92664@@ -80030,7 +61237,7 @@ 92665 mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ 92666 mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ 92667 mysqli_exception.c $mysqli_extra_sources" 92668- 92669+ 92670 ext_builddir=ext/mysqli 92671 ext_srcdir=$abs_srcdir/ext/mysqli 92672 92673@@ -80038,15 +61245,15 @@ 92674 92675 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 92676 PHP_MYSQLI_SHARED=no 92677- 92678- 92679+ 92680+ 92681 case ext/mysqli in 92682 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 92683 /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 92684 *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 92685 esac 92686- 92687- 92688+ 92689+ 92690 92691 b_c_pre=$php_c_pre 92692 b_cxx_pre=$php_cxx_pre 92693@@ -80059,12 +61266,12 @@ 92694 92695 old_IFS=$IFS 92696 for ac_src in $mysqli_sources; do 92697- 92698+ 92699 IFS=. 92700 set $ac_src 92701 ac_obj=$1 92702 IFS=$old_IFS 92703- 92704+ 92705 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 92706 92707 case $ac_src in 92708@@ -80088,14 +61295,14 @@ 92709 else 92710 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 92711 PHP_MYSQLI_SHARED=yes 92712- 92713+ 92714 case ext/mysqli in 92715 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 92716 /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 92717 *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 92718 esac 92719- 92720- 92721+ 92722+ 92723 92724 b_c_pre=$shared_c_pre 92725 b_cxx_pre=$shared_cxx_pre 92726@@ -80108,12 +61315,12 @@ 92727 92728 old_IFS=$IFS 92729 for ac_src in $mysqli_sources; do 92730- 92731+ 92732 IFS=. 92733 set $ac_src 92734 ac_obj=$1 92735 IFS=$old_IFS 92736- 92737+ 92738 shared_objects_mysqli="$shared_objects_mysqli $ac_bdir$ac_obj.lo" 92739 92740 case $ac_src in 92741@@ -80131,7 +61338,7 @@ 92742 92743 case $host_alias in 92744 *netware*) 92745- 92746+ 92747 install_modules="install-modules" 92748 92749 case $host_alias in 92750@@ -80141,7 +61348,7 @@ 92751 ;; 92752 *netware*) 92753 suffix=nlm 92754- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(MYSQLI_SHARED_LIBADD)' 92755+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLI, 3)_SHARED_LIBADD)' 92756 ;; 92757 *) 92758 suffix=la 92759@@ -80154,7 +61361,7 @@ 92760 else 92761 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqli.$suffix" 92762 fi 92763- 92764+ 92765 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli" 92766 92767 cat >>Makefile.objects<<EOF 92768@@ -80168,7 +61375,7 @@ 92769 92770 ;; 92771 *) 92772- 92773+ 92774 install_modules="install-modules" 92775 92776 case $host_alias in 92777@@ -80178,7 +61385,7 @@ 92778 ;; 92779 *netware*) 92780 suffix=nlm 92781- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(QLI_SHARED_LIBADD)' 92782+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqli) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLI, 3)_SHARED_LIBADD)' 92783 ;; 92784 *) 92785 suffix=la 92786@@ -80191,7 +61398,7 @@ 92787 else 92788 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqli.$suffix" 92789 fi 92790- 92791+ 92792 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqli" 92793 92794 cat >>Makefile.objects<<EOF 92795@@ -80205,10 +61412,9 @@ 92796 92797 ;; 92798 esac 92799- 92800-cat >>confdefs.h <<_ACEOF 92801+ cat >> confdefs.h <<EOF 92802 #define COMPILE_DL_MYSQLI 1 92803-_ACEOF 92804+EOF 92805 92806 fi 92807 fi 92808@@ -80217,15 +61423,15 @@ 92809 PHP_MYSQLI_SHARED=no 92810 case "$PHP_SAPI" in 92811 cgi|embed) 92812- 92813- 92814+ 92815+ 92816 case ext/mysqli in 92817 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 92818 /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 92819 *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 92820 esac 92821- 92822- 92823+ 92824+ 92825 92826 b_c_pre=$php_c_pre 92827 b_cxx_pre=$php_cxx_pre 92828@@ -80238,12 +61444,12 @@ 92829 92830 old_IFS=$IFS 92831 for ac_src in $mysqli_sources; do 92832- 92833+ 92834 IFS=. 92835 set $ac_src 92836 ac_obj=$1 92837 IFS=$old_IFS 92838- 92839+ 92840 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 92841 92842 case $ac_src in 92843@@ -80263,15 +61469,15 @@ 92844 EXT_STATIC="$EXT_STATIC mysqli" 92845 ;; 92846 *) 92847- 92848- 92849+ 92850+ 92851 case ext/mysqli in 92852 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 92853 /*) ac_srcdir=`echo "ext/mysqli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 92854 *) ac_srcdir="$abs_srcdir/ext/mysqli/"; ac_bdir="ext/mysqli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 92855 esac 92856- 92857- 92858+ 92859+ 92860 92861 b_c_pre=$php_c_pre 92862 b_cxx_pre=$php_cxx_pre 92863@@ -80284,13 +61490,13 @@ 92864 92865 old_IFS=$IFS 92866 for ac_src in $mysqli_sources; do 92867- 92868+ 92869 IFS=. 92870 set $ac_src 92871 ac_obj=$1 92872 IFS=$old_IFS 92873- 92874- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 92875+ 92876+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 92877 92878 case $ac_src in 92879 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 92880@@ -80310,77 +61516,64 @@ 92881 esac 92882 EXT_CLI_STATIC="$EXT_CLI_STATIC mysqli" 92883 fi 92884- 92885- 92886+ 92887+ 92888 BUILD_DIR="$BUILD_DIR $ext_builddir" 92889- 92890+ 92891 92892 92893 if test "$ext_builddir" = "."; then 92894 PHP_PECL_EXTENSION=mysqli 92895- 92896+ 92897 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 92898 92899 fi 92900 92901- 92902+ 92903 PHP_VAR_SUBST="$PHP_VAR_SUBST MYSQLI_SHARED_LIBADD" 92904 92905- 92906- 92907+ 92908+ 92909 for header_file in ext/mysqli/php_mysqli_structs.h; do 92910- 92911- 92912+ 92913+ 92914 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 92915- 92916+ 92917 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 92918 if test -n "$unique" && test "`eval $cmd`" = "" ; then 92919 eval "INSTALLHEADERS$unique=set" 92920- 92921+ 92922 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 92923- 92924+ 92925 fi 92926 92927- done 92928- 92929+ done 92930+ 92931 92932 92933 if test "$PHP_MYSQLI" = "mysqlnd"; then 92934- 92935+ 92936 am_i_shared=$PHP_MYSQLI_SHARED 92937 is_it_shared=$PHP_MYSQLND_SHARED 92938 is_it_enabled=$PHP_MYSQLND 92939 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 92940- { { echo "$as_me:$LINENO: error: 92941+ { echo "configure: error: 92942 You've configured extension mysqli to build statically, but it 92943 depends on extension mysqlnd, which you've configured to build shared. 92944 You either need to build mysqli shared or build mysqlnd statically for the 92945 build to be successful. 92946-" >&5 92947-echo "$as_me: error: 92948-You've configured extension mysqli to build statically, but it 92949-depends on extension mysqlnd, which you've configured to build shared. 92950-You either need to build mysqli shared or build mysqlnd statically for the 92951-build to be successful. 92952-" >&2;} 92953- { (exit 1); exit 1; }; } 92954+" 1>&2; exit 1; } 92955 fi 92956 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 92957- { { echo "$as_me:$LINENO: error: 92958+ { echo "configure: error: 92959 You've configured extension mysqli, which depends on extension mysqlnd, 92960 but you've either not enabled mysqlnd, or have disabled it. 92961-" >&5 92962-echo "$as_me: error: 92963-You've configured extension mysqli, which depends on extension mysqlnd, 92964-but you've either not enabled mysqlnd, or have disabled it. 92965-" >&2;} 92966- { (exit 1); exit 1; }; } 92967+" 1>&2; exit 1; } 92968 fi 92969- 92970- 92971-cat >>confdefs.h <<\_ACEOF 92972+ 92973+ cat >> confdefs.h <<\EOF 92974 #define MYSQLI_USE_MYSQLND 1 92975-_ACEOF 92976+EOF 92977 92978 fi 92979 fi 92980@@ -80411,19 +61604,19 @@ 92981 92982 php_with_oci8=no 92983 92984-echo "$as_me:$LINENO: checking for Oracle Database OCI8 support" >&5 92985-echo $ECHO_N "checking for Oracle Database OCI8 support... $ECHO_C" >&6 92986- 92987+echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6 92988+echo "configure:61609: checking for Oracle Database OCI8 support" >&5 92989 # Check whether --with-oci8 or --without-oci8 was given. 92990 if test "${with_oci8+set}" = set; then 92991 withval="$with_oci8" 92992 PHP_OCI8=$withval 92993 else 92994- 92995+ 92996 PHP_OCI8=no 92997 test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL 92998 92999-fi; 93000+fi 93001+ 93002 93003 93004 ext_output="yes, shared" 93005@@ -80447,30 +61640,25 @@ 93006 93007 93008 93009-echo "$as_me:$LINENO: result: $ext_output" >&5 93010-echo "${ECHO_T}$ext_output" >&6 93011+echo "$ac_t""$ext_output" 1>&6 93012 93013 93014 93015 93016-if test "$PHP_OCI8" != "no"; then 93017+if test "$PHP_OCI8" != "no"; then 93018 93019 if test -z "$PHP_OCI8"; then 93020- { { echo "$as_me:$LINENO: error: Empty parameter value passed to --with-oci8" >&5 93021-echo "$as_me: error: Empty parameter value passed to --with-oci8" >&2;} 93022- { (exit 1); exit 1; }; } 93023+ { echo "configure: error: Empty parameter value passed to --with-oci8" 1>&2; exit 1; } 93024 fi 93025 93026- 93027- echo "$as_me:$LINENO: checking PHP version" >&5 93028-echo $ECHO_N "checking PHP version... $ECHO_C" >&6 93029+ 93030+ echo $ac_n "checking PHP version""... $ac_c" 1>&6 93031+echo "configure:61657: checking PHP version" >&5 93032 93033 tmp_version=$PHP_VERSION 93034 if test -z "$tmp_version"; then 93035 if test -z "$PHP_CONFIG"; then 93036- { { echo "$as_me:$LINENO: error: php-config not found" >&5 93037-echo "$as_me: error: php-config not found" >&2;} 93038- { (exit 1); exit 1; }; } 93039+ { echo "configure: error: php-config not found" 1>&2; exit 1; } 93040 fi 93041 php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'` 93042 else 93043@@ -80478,9 +61666,7 @@ 93044 fi 93045 93046 if test -z "$php_version"; then 93047- { { echo "$as_me:$LINENO: error: failed to detect PHP version, please report" >&5 93048-echo "$as_me: error: failed to detect PHP version, please report" >&2;} 93049- { (exit 1); exit 1; }; } 93050+ { echo "configure: error: failed to detect PHP version, please report" 1>&2; exit 1; } 93051 fi 93052 93053 ac_IFS=$IFS 93054@@ -80490,453 +61676,70 @@ 93055 oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3` 93056 93057 if test "$oci8_php_version" -lt "4003009"; then 93058- { { echo "$as_me:$LINENO: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&5 93059-echo "$as_me: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&2;} 93060- { (exit 1); exit 1; }; } 93061+ { echo "configure: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" 1>&2; exit 1; } 93062 elif test "$oci8_php_version" -ge "6000000"; then 93063- { { echo "$as_me:$LINENO: error: This version of OCI8 is not compatible with PHP 6 or higher" >&5 93064-echo "$as_me: error: This version of OCI8 is not compatible with PHP 6 or higher" >&2;} 93065- { (exit 1); exit 1; }; } 93066- else 93067- echo "$as_me:$LINENO: result: $php_version, ok" >&5 93068-echo "${ECHO_T}$php_version, ok" >&6 93069+ { echo "configure: error: This version of OCI8 is not compatible with PHP 6 or higher" 1>&2; exit 1; } 93070+ else 93071+ echo "$ac_t""$php_version, ok" 1>&6 93072 fi 93073 93074- 93075- echo "$as_me:$LINENO: checking for long int" >&5 93076-echo $ECHO_N "checking for long int... $ECHO_C" >&6 93077-if test "${ac_cv_type_long_int+set}" = set; then 93078- echo $ECHO_N "(cached) $ECHO_C" >&6 93079-else 93080- cat >conftest.$ac_ext <<_ACEOF 93081-/* confdefs.h. */ 93082-_ACEOF 93083-cat confdefs.h >>conftest.$ac_ext 93084-cat >>conftest.$ac_ext <<_ACEOF 93085-/* end confdefs.h. */ 93086-$ac_includes_default 93087-int 93088-main () 93089-{ 93090-if ((long int *) 0) 93091- return 0; 93092-if (sizeof (long int)) 93093- return 0; 93094- ; 93095- return 0; 93096-} 93097-_ACEOF 93098-rm -f conftest.$ac_objext 93099-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93100- (eval $ac_compile) 2>conftest.er1 93101- ac_status=$? 93102- grep -v '^ *+' conftest.er1 >conftest.err 93103- rm -f conftest.er1 93104- cat conftest.err >&5 93105- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93106- (exit $ac_status); } && 93107- { ac_try='test -z "$ac_c_werror_flag" 93108- || test ! -s conftest.err' 93109- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93110- (eval $ac_try) 2>&5 93111- ac_status=$? 93112- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93113- (exit $ac_status); }; } && 93114- { ac_try='test -s conftest.$ac_objext' 93115- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93116- (eval $ac_try) 2>&5 93117- ac_status=$? 93118- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93119- (exit $ac_status); }; }; then 93120- ac_cv_type_long_int=yes 93121-else 93122- echo "$as_me: failed program was:" >&5 93123-sed 's/^/| /' conftest.$ac_ext >&5 93124- 93125-ac_cv_type_long_int=no 93126-fi 93127-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93128-fi 93129-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 93130-echo "${ECHO_T}$ac_cv_type_long_int" >&6 93131- 93132-echo "$as_me:$LINENO: checking size of long int" >&5 93133-echo $ECHO_N "checking size of long int... $ECHO_C" >&6 93134-if test "${ac_cv_sizeof_long_int+set}" = set; then 93135- echo $ECHO_N "(cached) $ECHO_C" >&6 93136-else 93137- if test "$ac_cv_type_long_int" = yes; then 93138- # The cast to unsigned long works around a bug in the HP C Compiler 93139- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 93140- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 93141- # This bug is HP SR number 8606223364. 93142- if test "$cross_compiling" = yes; then 93143- # Depending upon the size, compute the lo and hi bounds. 93144-cat >conftest.$ac_ext <<_ACEOF 93145-/* confdefs.h. */ 93146-_ACEOF 93147-cat confdefs.h >>conftest.$ac_ext 93148-cat >>conftest.$ac_ext <<_ACEOF 93149-/* end confdefs.h. */ 93150-$ac_includes_default 93151-int 93152-main () 93153-{ 93154-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; 93155-test_array [0] = 0 93156- 93157- ; 93158- return 0; 93159-} 93160-_ACEOF 93161-rm -f conftest.$ac_objext 93162-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93163- (eval $ac_compile) 2>conftest.er1 93164- ac_status=$? 93165- grep -v '^ *+' conftest.er1 >conftest.err 93166- rm -f conftest.er1 93167- cat conftest.err >&5 93168- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93169- (exit $ac_status); } && 93170- { ac_try='test -z "$ac_c_werror_flag" 93171- || test ! -s conftest.err' 93172- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93173- (eval $ac_try) 2>&5 93174- ac_status=$? 93175- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93176- (exit $ac_status); }; } && 93177- { ac_try='test -s conftest.$ac_objext' 93178- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93179- (eval $ac_try) 2>&5 93180- ac_status=$? 93181- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93182- (exit $ac_status); }; }; then 93183- ac_lo=0 ac_mid=0 93184- while :; do 93185- cat >conftest.$ac_ext <<_ACEOF 93186-/* confdefs.h. */ 93187-_ACEOF 93188-cat confdefs.h >>conftest.$ac_ext 93189-cat >>conftest.$ac_ext <<_ACEOF 93190-/* end confdefs.h. */ 93191-$ac_includes_default 93192-int 93193-main () 93194-{ 93195-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 93196-test_array [0] = 0 93197- 93198- ; 93199- return 0; 93200-} 93201-_ACEOF 93202-rm -f conftest.$ac_objext 93203-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93204- (eval $ac_compile) 2>conftest.er1 93205- ac_status=$? 93206- grep -v '^ *+' conftest.er1 >conftest.err 93207- rm -f conftest.er1 93208- cat conftest.err >&5 93209- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93210- (exit $ac_status); } && 93211- { ac_try='test -z "$ac_c_werror_flag" 93212- || test ! -s conftest.err' 93213- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93214- (eval $ac_try) 2>&5 93215- ac_status=$? 93216- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93217- (exit $ac_status); }; } && 93218- { ac_try='test -s conftest.$ac_objext' 93219- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93220- (eval $ac_try) 2>&5 93221- ac_status=$? 93222- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93223- (exit $ac_status); }; }; then 93224- ac_hi=$ac_mid; break 93225-else 93226- echo "$as_me: failed program was:" >&5 93227-sed 's/^/| /' conftest.$ac_ext >&5 93228- 93229-ac_lo=`expr $ac_mid + 1` 93230- if test $ac_lo -le $ac_mid; then 93231- ac_lo= ac_hi= 93232- break 93233- fi 93234- ac_mid=`expr 2 '*' $ac_mid + 1` 93235-fi 93236-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93237- done 93238-else 93239- echo "$as_me: failed program was:" >&5 93240-sed 's/^/| /' conftest.$ac_ext >&5 93241- 93242-cat >conftest.$ac_ext <<_ACEOF 93243-/* confdefs.h. */ 93244-_ACEOF 93245-cat confdefs.h >>conftest.$ac_ext 93246-cat >>conftest.$ac_ext <<_ACEOF 93247-/* end confdefs.h. */ 93248-$ac_includes_default 93249-int 93250-main () 93251-{ 93252-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; 93253-test_array [0] = 0 93254- 93255- ; 93256- return 0; 93257-} 93258-_ACEOF 93259-rm -f conftest.$ac_objext 93260-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93261- (eval $ac_compile) 2>conftest.er1 93262- ac_status=$? 93263- grep -v '^ *+' conftest.er1 >conftest.err 93264- rm -f conftest.er1 93265- cat conftest.err >&5 93266- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93267- (exit $ac_status); } && 93268- { ac_try='test -z "$ac_c_werror_flag" 93269- || test ! -s conftest.err' 93270- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93271- (eval $ac_try) 2>&5 93272- ac_status=$? 93273- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93274- (exit $ac_status); }; } && 93275- { ac_try='test -s conftest.$ac_objext' 93276- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93277- (eval $ac_try) 2>&5 93278- ac_status=$? 93279- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93280- (exit $ac_status); }; }; then 93281- ac_hi=-1 ac_mid=-1 93282- while :; do 93283- cat >conftest.$ac_ext <<_ACEOF 93284-/* confdefs.h. */ 93285-_ACEOF 93286-cat confdefs.h >>conftest.$ac_ext 93287-cat >>conftest.$ac_ext <<_ACEOF 93288-/* end confdefs.h. */ 93289-$ac_includes_default 93290-int 93291-main () 93292-{ 93293-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; 93294-test_array [0] = 0 93295- 93296- ; 93297- return 0; 93298-} 93299-_ACEOF 93300-rm -f conftest.$ac_objext 93301-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93302- (eval $ac_compile) 2>conftest.er1 93303- ac_status=$? 93304- grep -v '^ *+' conftest.er1 >conftest.err 93305- rm -f conftest.er1 93306- cat conftest.err >&5 93307- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93308- (exit $ac_status); } && 93309- { ac_try='test -z "$ac_c_werror_flag" 93310- || test ! -s conftest.err' 93311- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93312- (eval $ac_try) 2>&5 93313- ac_status=$? 93314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93315- (exit $ac_status); }; } && 93316- { ac_try='test -s conftest.$ac_objext' 93317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93318- (eval $ac_try) 2>&5 93319- ac_status=$? 93320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93321- (exit $ac_status); }; }; then 93322- ac_lo=$ac_mid; break 93323-else 93324- echo "$as_me: failed program was:" >&5 93325-sed 's/^/| /' conftest.$ac_ext >&5 93326- 93327-ac_hi=`expr '(' $ac_mid ')' - 1` 93328- if test $ac_mid -le $ac_hi; then 93329- ac_lo= ac_hi= 93330- break 93331- fi 93332- ac_mid=`expr 2 '*' $ac_mid` 93333-fi 93334-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93335- done 93336-else 93337- echo "$as_me: failed program was:" >&5 93338-sed 's/^/| /' conftest.$ac_ext >&5 93339- 93340-ac_lo= ac_hi= 93341-fi 93342-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93343-fi 93344-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93345-# Binary search between lo and hi bounds. 93346-while test "x$ac_lo" != "x$ac_hi"; do 93347- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 93348- cat >conftest.$ac_ext <<_ACEOF 93349-/* confdefs.h. */ 93350-_ACEOF 93351-cat confdefs.h >>conftest.$ac_ext 93352-cat >>conftest.$ac_ext <<_ACEOF 93353-/* end confdefs.h. */ 93354-$ac_includes_default 93355-int 93356-main () 93357-{ 93358-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 93359-test_array [0] = 0 93360- 93361- ; 93362- return 0; 93363-} 93364-_ACEOF 93365-rm -f conftest.$ac_objext 93366-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 93367- (eval $ac_compile) 2>conftest.er1 93368- ac_status=$? 93369- grep -v '^ *+' conftest.er1 >conftest.err 93370- rm -f conftest.er1 93371- cat conftest.err >&5 93372- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93373- (exit $ac_status); } && 93374- { ac_try='test -z "$ac_c_werror_flag" 93375- || test ! -s conftest.err' 93376- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93377- (eval $ac_try) 2>&5 93378- ac_status=$? 93379- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93380- (exit $ac_status); }; } && 93381- { ac_try='test -s conftest.$ac_objext' 93382- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93383- (eval $ac_try) 2>&5 93384- ac_status=$? 93385- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93386- (exit $ac_status); }; }; then 93387- ac_hi=$ac_mid 93388-else 93389- echo "$as_me: failed program was:" >&5 93390-sed 's/^/| /' conftest.$ac_ext >&5 93391- 93392-ac_lo=`expr '(' $ac_mid ')' + 1` 93393-fi 93394-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 93395-done 93396-case $ac_lo in 93397-?*) ac_cv_sizeof_long_int=$ac_lo;; 93398-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 93399-See \`config.log' for more details." >&5 93400-echo "$as_me: error: cannot compute sizeof (long int), 77 93401-See \`config.log' for more details." >&2;} 93402- { (exit 1); exit 1; }; } ;; 93403-esac 93404+ 93405+ echo $ac_n "checking size of long int""... $ac_c" 1>&6 93406+echo "configure:61689: checking size of long int" >&5 93407+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then 93408+ echo $ac_n "(cached) $ac_c" 1>&6 93409 else 93410 if test "$cross_compiling" = yes; then 93411- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 93412-See \`config.log' for more details." >&5 93413-echo "$as_me: error: cannot run test program while cross compiling 93414-See \`config.log' for more details." >&2;} 93415- { (exit 1); exit 1; }; } 93416-else 93417- cat >conftest.$ac_ext <<_ACEOF 93418-/* confdefs.h. */ 93419-_ACEOF 93420-cat confdefs.h >>conftest.$ac_ext 93421-cat >>conftest.$ac_ext <<_ACEOF 93422-/* end confdefs.h. */ 93423-$ac_includes_default 93424-long longval () { return (long) (sizeof (long int)); } 93425-unsigned long ulongval () { return (long) (sizeof (long int)); } 93426+ ac_cv_sizeof_long_int=4 93427+else 93428+ cat > conftest.$ac_ext <<EOF 93429+#line 61697 "configure" 93430+#include "confdefs.h" 93431 #include <stdio.h> 93432-#include <stdlib.h> 93433-int 93434-main () 93435+main() 93436 { 93437- 93438- FILE *f = fopen ("conftest.val", "w"); 93439- if (! f) 93440- exit (1); 93441- if (((long) (sizeof (long int))) < 0) 93442- { 93443- long i = longval (); 93444- if (i != ((long) (sizeof (long int)))) 93445- exit (1); 93446- fprintf (f, "%ld\n", i); 93447- } 93448- else 93449- { 93450- unsigned long i = ulongval (); 93451- if (i != ((long) (sizeof (long int)))) 93452- exit (1); 93453- fprintf (f, "%lu\n", i); 93454- } 93455- exit (ferror (f) || fclose (f) != 0); 93456- 93457- ; 93458- return 0; 93459+ FILE *f=fopen("conftestval", "w"); 93460+ if (!f) exit(1); 93461+ fprintf(f, "%d\n", sizeof(long int)); 93462+ exit(0); 93463 } 93464-_ACEOF 93465-rm -f conftest$ac_exeext 93466-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 93467- (eval $ac_link) 2>&5 93468- ac_status=$? 93469- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93470- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 93471- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 93472- (eval $ac_try) 2>&5 93473- ac_status=$? 93474- echo "$as_me:$LINENO: \$? = $ac_status" >&5 93475- (exit $ac_status); }; }; then 93476- ac_cv_sizeof_long_int=`cat conftest.val` 93477-else 93478- echo "$as_me: program exited with status $ac_status" >&5 93479-echo "$as_me: failed program was:" >&5 93480-sed 's/^/| /' conftest.$ac_ext >&5 93481- 93482-( exit $ac_status ) 93483-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 93484-See \`config.log' for more details." >&5 93485-echo "$as_me: error: cannot compute sizeof (long int), 77 93486-See \`config.log' for more details." >&2;} 93487- { (exit 1); exit 1; }; } 93488-fi 93489-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 93490-fi 93491-fi 93492-rm -f conftest.val 93493+EOF 93494+if { (eval echo configure:61708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 93495+then 93496+ ac_cv_sizeof_long_int=`cat conftestval` 93497 else 93498+ echo "configure: failed program was:" >&5 93499+ cat conftest.$ac_ext >&5 93500+ rm -fr conftest* 93501 ac_cv_sizeof_long_int=0 93502 fi 93503+rm -fr conftest* 93504+fi 93505+ 93506 fi 93507-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 93508-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 93509-cat >>confdefs.h <<_ACEOF 93510+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 93511+cat >> confdefs.h <<EOF 93512 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int 93513-_ACEOF 93514+EOF 93515 93516 93517- echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5 93518-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6 93519+ echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 93520+echo "configure:61728: checking checking if we're on a 64-bit platform" >&5 93521 if test "$ac_cv_sizeof_long_int" = "4"; then 93522- echo "$as_me:$LINENO: result: no" >&5 93523-echo "${ECHO_T}no" >&6 93524- PHP_OCI8_OH_LIBDIR=lib32 93525+ echo "$ac_t""no" 1>&6 93526+ PHP_OCI8_OH_LIBDIR=lib32 93527 PHP_OCI8_IC_LIBDIR_SUFFIX="" 93528 else 93529- echo "$as_me:$LINENO: result: yes" >&5 93530-echo "${ECHO_T}yes" >&6 93531+ echo "$ac_t""yes" 1>&6 93532 PHP_OCI8_OH_LIBDIR=lib 93533 PHP_OCI8_IC_LIBDIR_SUFFIX=64 93534 fi 93535 93536- 93537+ 93538 PHP_OCI8_INSTANT_CLIENT="no" 93539 93540 if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then 93541- { echo "$as_me:$LINENO: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5 93542-echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;} 93543+ echo "configure: warning: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" 1>&2 93544 PHP_OCI8=instantclient 93545 fi 93546 93547@@ -80963,25 +61766,22 @@ 93548 fi 93549 93550 if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then 93551- 93552- echo "$as_me:$LINENO: checking Oracle ORACLE_HOME install directory" >&5 93553-echo $ECHO_N "checking Oracle ORACLE_HOME install directory... $ECHO_C" >&6 93554+ 93555+ echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 93556+echo "configure:61772: checking Oracle ORACLE_HOME install directory" >&5 93557 93558 if test "$PHP_OCI8" = "yes"; then 93559 OCI8_DIR=$ORACLE_HOME 93560 else 93561 OCI8_DIR=$PHP_OCI8 93562 fi 93563- echo "$as_me:$LINENO: result: $OCI8_DIR" >&5 93564-echo "${ECHO_T}$OCI8_DIR" >&6 93565- 93566+ echo "$ac_t""$OCI8_DIR" 1>&6 93567 93568- echo "$as_me:$LINENO: checking ORACLE_HOME library validity" >&5 93569-echo $ECHO_N "checking ORACLE_HOME library validity... $ECHO_C" >&6 93570+ 93571+ echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 93572+echo "configure:61783: checking ORACLE_HOME library validity" >&5 93573 if test ! -d "$OCI8_DIR"; then 93574- { { echo "$as_me:$LINENO: error: ${OCI8_DIR} is not a directory" >&5 93575-echo "$as_me: error: ${OCI8_DIR} is not a directory" >&2;} 93576- { (exit 1); exit 1; }; } 93577+ { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } 93578 fi 93579 if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then 93580 OCI8_LIB_DIR=lib 93581@@ -80991,47 +61791,42 @@ 93582 OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR 93583 else 93584 if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then 93585- { { echo "$as_me:$LINENO: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&5 93586-echo "$as_me: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&2;} 93587- { (exit 1); exit 1; }; } 93588+ { echo "configure: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" 1>&2; exit 1; } 93589 else 93590- { { echo "$as_me:$LINENO: error: Oracle library directory not found in ${OCI8_DIR}" >&5 93591-echo "$as_me: error: Oracle library directory not found in ${OCI8_DIR}" >&2;} 93592- { (exit 1); exit 1; }; } 93593+ { echo "configure: error: Oracle library directory not found in ${OCI8_DIR}" 1>&2; exit 1; } 93594 fi 93595 fi 93596- echo "$as_me:$LINENO: result: $OCI8_LIB_DIR" >&5 93597-echo "${ECHO_T}$OCI8_LIB_DIR" >&6 93598+ echo "$ac_t""$OCI8_LIB_DIR" 1>&6 93599 93600 93601 if test -d "$OCI8_DIR/rdbms/public"; then 93602- 93603+ 93604 if test "$OCI8_DIR/rdbms/public" != "/usr/include"; then 93605- 93606+ 93607 if test -z "$OCI8_DIR/rdbms/public" || echo "$OCI8_DIR/rdbms/public" | grep '^/' >/dev/null ; then 93608 ai_p=$OCI8_DIR/rdbms/public 93609 else 93610- 93611+ 93612 ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`" 93613- 93614+ 93615 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93616 ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`" 93617 fi 93618 93619- 93620- 93621+ 93622+ 93623 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93624- 93625+ 93626 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 93627 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93628 eval "INCLUDEPATH$unique=set" 93629- 93630+ 93631 if test ""; then 93632 INCLUDES="-I$ai_p $INCLUDES" 93633 else 93634 INCLUDES="$INCLUDES -I$ai_p" 93635 fi 93636- 93637+ 93638 fi 93639 93640 fi 93641@@ -81039,33 +61834,33 @@ 93642 OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public" 93643 fi 93644 if test -d "$OCI8_DIR/rdbms/demo"; then 93645- 93646+ 93647 if test "$OCI8_DIR/rdbms/demo" != "/usr/include"; then 93648- 93649+ 93650 if test -z "$OCI8_DIR/rdbms/demo" || echo "$OCI8_DIR/rdbms/demo" | grep '^/' >/dev/null ; then 93651 ai_p=$OCI8_DIR/rdbms/demo 93652 else 93653- 93654+ 93655 ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`" 93656- 93657+ 93658 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93659 ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`" 93660 fi 93661 93662- 93663- 93664+ 93665+ 93666 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93667- 93668+ 93669 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 93670 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93671 eval "INCLUDEPATH$unique=set" 93672- 93673+ 93674 if test ""; then 93675 INCLUDES="-I$ai_p $INCLUDES" 93676 else 93677 INCLUDES="$INCLUDES -I$ai_p" 93678 fi 93679- 93680+ 93681 fi 93682 93683 fi 93684@@ -81073,33 +61868,33 @@ 93685 OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo" 93686 fi 93687 if test -d "$OCI8_DIR/network/public"; then 93688- 93689+ 93690 if test "$OCI8_DIR/network/public" != "/usr/include"; then 93691- 93692+ 93693 if test -z "$OCI8_DIR/network/public" || echo "$OCI8_DIR/network/public" | grep '^/' >/dev/null ; then 93694 ai_p=$OCI8_DIR/network/public 93695 else 93696- 93697+ 93698 ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`" 93699- 93700+ 93701 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93702 ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`" 93703 fi 93704 93705- 93706- 93707+ 93708+ 93709 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93710- 93711+ 93712 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 93713 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93714 eval "INCLUDEPATH$unique=set" 93715- 93716+ 93717 if test ""; then 93718 INCLUDES="-I$ai_p $INCLUDES" 93719 else 93720 INCLUDES="$INCLUDES -I$ai_p" 93721 fi 93722- 93723+ 93724 fi 93725 93726 fi 93727@@ -81107,33 +61902,33 @@ 93728 OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public" 93729 fi 93730 if test -d "$OCI8_DIR/plsql/public"; then 93731- 93732+ 93733 if test "$OCI8_DIR/plsql/public" != "/usr/include"; then 93734- 93735+ 93736 if test -z "$OCI8_DIR/plsql/public" || echo "$OCI8_DIR/plsql/public" | grep '^/' >/dev/null ; then 93737 ai_p=$OCI8_DIR/plsql/public 93738 else 93739- 93740+ 93741 ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`" 93742- 93743+ 93744 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93745 ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`" 93746 fi 93747 93748- 93749- 93750+ 93751+ 93752 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93753- 93754+ 93755 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 93756 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93757 eval "INCLUDEPATH$unique=set" 93758- 93759+ 93760 if test ""; then 93761 INCLUDES="-I$ai_p $INCLUDES" 93762 else 93763 INCLUDES="$INCLUDES -I$ai_p" 93764 fi 93765- 93766+ 93767 fi 93768 93769 fi 93770@@ -81142,17 +61937,17 @@ 93771 fi 93772 93773 if test -f "$OCI8_DIR/$OCI8_LIB_DIR/sysliblist"; then 93774- 93775+ 93776 for ac_i in `cat $OCI8_DIR/$OCI8_LIB_DIR/sysliblist`; do 93777 case $ac_i in 93778 -pthread) 93779 if test "$ext_shared" = "yes"; then 93780 OCI8_SYSLIB="$OCI8_SYSLIB -pthread" 93781 else 93782- 93783- 93784+ 93785+ 93786 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 93787- 93788+ 93789 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 93790 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93791 eval "EXTRA_LDFLAGS$unique=set" 93792@@ -81163,20 +61958,20 @@ 93793 ;; 93794 -l*) 93795 ac_ii=`echo $ac_i|cut -c 3-` 93796- 93797- 93798+ 93799+ 93800 case $ac_ii in 93801 c|c_r|pthread*) ;; 93802- *) 93803+ *) 93804 if test "$ext_shared" = "yes"; then 93805- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 93806+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 93807 else 93808- 93809- 93810+ 93811+ 93812 case $ac_ii in 93813 c|c_r|pthread*) ;; 93814- *) 93815- LIBS="$LIBS -l$ac_ii" 93816+ *) 93817+ LIBS="$LIBS -l$ac_ii" 93818 ;; 93819 esac 93820 93821@@ -81189,42 +61984,42 @@ 93822 ;; 93823 -L*) 93824 ac_ii=`echo $ac_i|cut -c 3-` 93825- 93826+ 93827 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 93828- 93829+ 93830 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 93831 ai_p=$ac_ii 93832 else 93833- 93834+ 93835 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 93836- 93837+ 93838 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93839 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 93840 fi 93841 93842- 93843+ 93844 if test "$ext_shared" = "yes"; then 93845 OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" 93846 test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" 93847 else 93848- 93849- 93850- 93851+ 93852+ 93853+ 93854 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93855- 93856+ 93857 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 93858 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93859 eval "LIBPATH$unique=set" 93860- 93861+ 93862 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 93863 LDFLAGS="$LDFLAGS -L$ai_p" 93864 PHP_RPATHS="$PHP_RPATHS $ai_p" 93865- 93866+ 93867 fi 93868 93869 93870 fi 93871- 93872+ 93873 fi 93874 93875 ;; 93876@@ -81232,17 +62027,17 @@ 93877 done 93878 93879 elif test -f "$OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist"; then 93880- 93881+ 93882 for ac_i in `cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`; do 93883 case $ac_i in 93884 -pthread) 93885 if test "$ext_shared" = "yes"; then 93886 OCI8_SYSLIB="$OCI8_SYSLIB -pthread" 93887 else 93888- 93889- 93890+ 93891+ 93892 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 93893- 93894+ 93895 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 93896 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93897 eval "EXTRA_LDFLAGS$unique=set" 93898@@ -81253,20 +62048,20 @@ 93899 ;; 93900 -l*) 93901 ac_ii=`echo $ac_i|cut -c 3-` 93902- 93903- 93904+ 93905+ 93906 case $ac_ii in 93907 c|c_r|pthread*) ;; 93908- *) 93909+ *) 93910 if test "$ext_shared" = "yes"; then 93911- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 93912+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 93913 else 93914- 93915- 93916+ 93917+ 93918 case $ac_ii in 93919 c|c_r|pthread*) ;; 93920- *) 93921- LIBS="$LIBS -l$ac_ii" 93922+ *) 93923+ LIBS="$LIBS -l$ac_ii" 93924 ;; 93925 esac 93926 93927@@ -81279,42 +62074,42 @@ 93928 ;; 93929 -L*) 93930 ac_ii=`echo $ac_i|cut -c 3-` 93931- 93932+ 93933 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 93934- 93935+ 93936 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 93937 ai_p=$ac_ii 93938 else 93939- 93940+ 93941 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 93942- 93943+ 93944 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 93945 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 93946 fi 93947 93948- 93949+ 93950 if test "$ext_shared" = "yes"; then 93951 OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" 93952 test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" 93953 else 93954- 93955- 93956- 93957+ 93958+ 93959+ 93960 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 93961- 93962+ 93963 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 93964 if test -n "$unique" && test "`eval $cmd`" = "" ; then 93965 eval "LIBPATH$unique=set" 93966- 93967+ 93968 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 93969 LDFLAGS="$LDFLAGS -L$ai_p" 93970 PHP_RPATHS="$PHP_RPATHS $ai_p" 93971- 93972+ 93973 fi 93974 93975 93976 fi 93977- 93978+ 93979 fi 93980 93981 ;; 93982@@ -81323,9 +62118,9 @@ 93983 93984 fi 93985 93986- 93987- echo "$as_me:$LINENO: checking Oracle library version compatibility" >&5 93988-echo $ECHO_N "checking Oracle library version compatibility... $ECHO_C" >&6 93989+ 93990+ echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6 93991+echo "configure:62124: checking Oracle library version compatibility" >&5 93992 OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME 93993 OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle 10g, 11g etc 93994 if test -s "$OCI8_DIR/orainst/unix.rgs"; then 93995@@ -81339,48 +62134,43 @@ 93996 OCI8_ORACLE_VERSION=8.1 93997 elif test -f $OCI8_LCS_BASE.1.0; then 93998 OCI8_ORACLE_VERSION=8.0 93999- elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then 94000- if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then 94001+ elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then 94002+ if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then 94003 OCI8_ORACLE_VERSION=8.0 94004 else 94005 OCI8_ORACLE_VERSION=8.1 94006 fi 94007 else 94008- { { echo "$as_me:$LINENO: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&5 94009-echo "$as_me: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&2;} 94010- { (exit 1); exit 1; }; } 94011+ { echo "configure: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" 1>&2; exit 1; } 94012 fi 94013- echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5 94014-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6 94015+ echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6 94016 94017 94018 case $OCI8_ORACLE_VERSION in 94019 7.3|8.0|8.1) 94020- { { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5 94021-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;} 94022- { (exit 1); exit 1; }; } 94023+ { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; } 94024 ;; 94025 94026 9.0) 94027- 94028+ 94029 save_old_LDFLAGS=$LDFLAGS 94030 ac_stuff=" 94031 -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD 94032 " 94033- 94034+ 94035 save_ext_shared=$ext_shared 94036 ext_shared=yes 94037- 94038+ 94039 for ac_i in $ac_stuff; do 94040 case $ac_i in 94041 -pthread) 94042 if test "$ext_shared" = "yes"; then 94043 LDFLAGS="$LDFLAGS -pthread" 94044 else 94045- 94046- 94047+ 94048+ 94049 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 94050- 94051+ 94052 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 94053 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94054 eval "EXTRA_LDFLAGS$unique=set" 94055@@ -81391,20 +62181,20 @@ 94056 ;; 94057 -l*) 94058 ac_ii=`echo $ac_i|cut -c 3-` 94059- 94060- 94061+ 94062+ 94063 case $ac_ii in 94064 c|c_r|pthread*) ;; 94065- *) 94066+ *) 94067 if test "$ext_shared" = "yes"; then 94068- LDFLAGS="$LDFLAGS -l$ac_ii" 94069+ LDFLAGS="$LDFLAGS -l$ac_ii" 94070 else 94071- 94072- 94073+ 94074+ 94075 case $ac_ii in 94076 c|c_r|pthread*) ;; 94077- *) 94078- LIBS="$LIBS -l$ac_ii" 94079+ *) 94080+ LIBS="$LIBS -l$ac_ii" 94081 ;; 94082 esac 94083 94084@@ -81417,158 +62207,126 @@ 94085 ;; 94086 -L*) 94087 ac_ii=`echo $ac_i|cut -c 3-` 94088- 94089+ 94090 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 94091- 94092+ 94093 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 94094 ai_p=$ac_ii 94095 else 94096- 94097+ 94098 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 94099- 94100+ 94101 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94102 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 94103 fi 94104 94105- 94106+ 94107 if test "$ext_shared" = "yes"; then 94108 LDFLAGS="-L$ai_p $LDFLAGS" 94109 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 94110 else 94111- 94112- 94113- 94114+ 94115+ 94116+ 94117 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94118- 94119+ 94120 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 94121 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94122 eval "LIBPATH$unique=set" 94123- 94124+ 94125 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 94126 LDFLAGS="$LDFLAGS -L$ai_p" 94127 PHP_RPATHS="$PHP_RPATHS $ai_p" 94128- 94129+ 94130 fi 94131 94132 94133 fi 94134- 94135+ 94136 fi 94137 94138 ;; 94139 esac 94140 done 94141 94142- echo "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5 94143-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6 94144-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then 94145- echo $ECHO_N "(cached) $ECHO_C" >&6 94146+ echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 94147+echo "configure:62254: checking for OCIEnvNlsCreate in -lclntsh" >&5 94148+ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` 94149+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 94150+ echo $ac_n "(cached) $ac_c" 1>&6 94151 else 94152- ac_check_lib_save_LIBS=$LIBS 94153+ ac_save_LIBS="$LIBS" 94154 LIBS="-lclntsh $LIBS" 94155-cat >conftest.$ac_ext <<_ACEOF 94156-/* confdefs.h. */ 94157-_ACEOF 94158-cat confdefs.h >>conftest.$ac_ext 94159-cat >>conftest.$ac_ext <<_ACEOF 94160-/* end confdefs.h. */ 94161- 94162+cat > conftest.$ac_ext <<EOF 94163+#line 62262 "configure" 94164+#include "confdefs.h" 94165 /* Override any gcc2 internal prototype to avoid an error. */ 94166-#ifdef __cplusplus 94167-extern "C" 94168-#endif 94169 /* We use char because int might match the return type of a gcc2 94170- builtin and then its argument prototype would still apply. */ 94171-char OCIEnvNlsCreate (); 94172-int 94173-main () 94174-{ 94175-OCIEnvNlsCreate (); 94176- ; 94177- return 0; 94178-} 94179-_ACEOF 94180-rm -f conftest.$ac_objext conftest$ac_exeext 94181-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 94182- (eval $ac_link) 2>conftest.er1 94183- ac_status=$? 94184- grep -v '^ *+' conftest.er1 >conftest.err 94185- rm -f conftest.er1 94186- cat conftest.err >&5 94187- echo "$as_me:$LINENO: \$? = $ac_status" >&5 94188- (exit $ac_status); } && 94189- { ac_try='test -z "$ac_c_werror_flag" 94190- || test ! -s conftest.err' 94191- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 94192- (eval $ac_try) 2>&5 94193- ac_status=$? 94194- echo "$as_me:$LINENO: \$? = $ac_status" >&5 94195- (exit $ac_status); }; } && 94196- { ac_try='test -s conftest$ac_exeext' 94197- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 94198- (eval $ac_try) 2>&5 94199- ac_status=$? 94200- echo "$as_me:$LINENO: \$? = $ac_status" >&5 94201- (exit $ac_status); }; }; then 94202- ac_cv_lib_clntsh_OCIEnvNlsCreate=yes 94203-else 94204- echo "$as_me: failed program was:" >&5 94205-sed 's/^/| /' conftest.$ac_ext >&5 94206- 94207-ac_cv_lib_clntsh_OCIEnvNlsCreate=no 94208-fi 94209-rm -f conftest.err conftest.$ac_objext \ 94210- conftest$ac_exeext conftest.$ac_ext 94211-LIBS=$ac_check_lib_save_LIBS 94212-fi 94213-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5 94214-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6 94215-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then 94216+ builtin and then its argument prototype would still apply. */ 94217+char OCIEnvNlsCreate(); 94218+ 94219+int main() { 94220+OCIEnvNlsCreate() 94221+; return 0; } 94222+EOF 94223+if { (eval echo configure:62273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 94224+ rm -rf conftest* 94225+ eval "ac_cv_lib_$ac_lib_var=yes" 94226+else 94227+ echo "configure: failed program was:" >&5 94228+ cat conftest.$ac_ext >&5 94229+ rm -rf conftest* 94230+ eval "ac_cv_lib_$ac_lib_var=no" 94231+fi 94232+rm -f conftest* 94233+LIBS="$ac_save_LIBS" 94234 94235+fi 94236+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 94237+ echo "$ac_t""yes" 1>&6 94238+ 94239 LDFLAGS=$save_old_LDFLAGS 94240 ext_shared=$save_ext_shared 94241- 94242+ 94243 OCI8_ORACLE_VERSION=9.2 94244- 94245- 94246+ 94247+ 94248 else 94249+ echo "$ac_t""no" 1>&6 94250 94251 LDFLAGS=$save_old_LDFLAGS 94252 ext_shared=$save_ext_shared 94253 unset ac_cv_lib_clntsh_OCIEnvNlsCreate 94254- 94255- { { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5 94256-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;} 94257- { (exit 1); exit 1; }; } 94258- 94259- 94260+ 94261+ { echo "configure: error: Oracle client libraries < 9.2 are not supported" 1>&2; exit 1; } 94262+ 94263+ 94264 fi 94265 94266 ;; 94267 94268 *) 94269- 94270-cat >>confdefs.h <<\_ACEOF 94271+ cat >> confdefs.h <<\EOF 94272 #define HAVE_OCI_LOB_READ2 1 94273-_ACEOF 94274+EOF 94275 94276 ;; 94277 esac 94278 94279- 94280- 94281+ 94282+ 94283 case clntsh in 94284 c|c_r|pthread*) ;; 94285- *) 94286+ *) 94287 if test "$ext_shared" = "yes"; then 94288- OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 94289+ OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 94290 else 94291- 94292- 94293+ 94294+ 94295 case clntsh in 94296 c|c_r|pthread*) ;; 94297- *) 94298- LIBS="$LIBS -lclntsh" 94299+ *) 94300+ LIBS="$LIBS -lclntsh" 94301 ;; 94302 esac 94303 94304@@ -81578,45 +62336,45 @@ 94305 esac 94306 94307 94308- 94309+ 94310 if test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$OCI8_DIR/$OCI8_LIB_DIR" != "/usr/lib"; then 94311- 94312+ 94313 if test -z "$OCI8_DIR/$OCI8_LIB_DIR" || echo "$OCI8_DIR/$OCI8_LIB_DIR" | grep '^/' >/dev/null ; then 94314 ai_p=$OCI8_DIR/$OCI8_LIB_DIR 94315 else 94316- 94317+ 94318 ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 94319- 94320+ 94321 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94322 ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`" 94323 fi 94324 94325- 94326+ 94327 if test "$ext_shared" = "yes"; then 94328 OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD" 94329 test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD" 94330 else 94331- 94332- 94333- 94334+ 94335+ 94336+ 94337 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94338- 94339+ 94340 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 94341 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94342 eval "LIBPATH$unique=set" 94343- 94344+ 94345 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 94346 LDFLAGS="$LDFLAGS -L$ai_p" 94347 PHP_RPATHS="$PHP_RPATHS $ai_p" 94348- 94349+ 94350 fi 94351 94352 94353 fi 94354- 94355+ 94356 fi 94357 94358- 94359+ 94360 ext_builddir=ext/oci8 94361 ext_srcdir=$abs_srcdir/ext/oci8 94362 94363@@ -81624,15 +62382,15 @@ 94364 94365 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 94366 PHP_OCI8_SHARED=no 94367- 94368- 94369+ 94370+ 94371 case ext/oci8 in 94372 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 94373 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 94374 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 94375 esac 94376- 94377- 94378+ 94379+ 94380 94381 b_c_pre=$php_c_pre 94382 b_cxx_pre=$php_cxx_pre 94383@@ -81645,12 +62403,12 @@ 94384 94385 old_IFS=$IFS 94386 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 94387- 94388+ 94389 IFS=. 94390 set $ac_src 94391 ac_obj=$1 94392 IFS=$old_IFS 94393- 94394+ 94395 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 94396 94397 case $ac_src in 94398@@ -81674,14 +62432,14 @@ 94399 else 94400 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 94401 PHP_OCI8_SHARED=yes 94402- 94403+ 94404 case ext/oci8 in 94405 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 94406 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 94407 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 94408 esac 94409- 94410- 94411+ 94412+ 94413 94414 b_c_pre=$shared_c_pre 94415 b_cxx_pre=$shared_cxx_pre 94416@@ -81694,12 +62452,12 @@ 94417 94418 old_IFS=$IFS 94419 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 94420- 94421+ 94422 IFS=. 94423 set $ac_src 94424 ac_obj=$1 94425 IFS=$old_IFS 94426- 94427+ 94428 shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo" 94429 94430 case $ac_src in 94431@@ -81717,7 +62475,7 @@ 94432 94433 case $host_alias in 94434 *netware*) 94435- 94436+ 94437 install_modules="install-modules" 94438 94439 case $host_alias in 94440@@ -81727,7 +62485,7 @@ 94441 ;; 94442 *netware*) 94443 suffix=nlm 94444- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_SHARED_LIBADD)' 94445+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)' 94446 ;; 94447 *) 94448 suffix=la 94449@@ -81740,7 +62498,7 @@ 94450 else 94451 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix" 94452 fi 94453- 94454+ 94455 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" 94456 94457 cat >>Makefile.objects<<EOF 94458@@ -81754,7 +62512,7 @@ 94459 94460 ;; 94461 *) 94462- 94463+ 94464 install_modules="install-modules" 94465 94466 case $host_alias in 94467@@ -81764,7 +62522,7 @@ 94468 ;; 94469 *netware*) 94470 suffix=nlm 94471- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(8_SHARED_LIBADD)' 94472+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)' 94473 ;; 94474 *) 94475 suffix=la 94476@@ -81777,7 +62535,7 @@ 94477 else 94478 PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix" 94479 fi 94480- 94481+ 94482 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" 94483 94484 cat >>Makefile.objects<<EOF 94485@@ -81791,10 +62549,9 @@ 94486 94487 ;; 94488 esac 94489- 94490-cat >>confdefs.h <<_ACEOF 94491+ cat >> confdefs.h <<EOF 94492 #define COMPILE_DL_OCI8 1 94493-_ACEOF 94494+EOF 94495 94496 fi 94497 fi 94498@@ -81803,15 +62560,15 @@ 94499 PHP_OCI8_SHARED=no 94500 case "$PHP_SAPI" in 94501 cgi|embed) 94502- 94503- 94504+ 94505+ 94506 case ext/oci8 in 94507 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 94508 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 94509 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 94510 esac 94511- 94512- 94513+ 94514+ 94515 94516 b_c_pre=$php_c_pre 94517 b_cxx_pre=$php_cxx_pre 94518@@ -81824,12 +62581,12 @@ 94519 94520 old_IFS=$IFS 94521 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 94522- 94523+ 94524 IFS=. 94525 set $ac_src 94526 ac_obj=$1 94527 IFS=$old_IFS 94528- 94529+ 94530 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 94531 94532 case $ac_src in 94533@@ -81849,15 +62606,15 @@ 94534 EXT_STATIC="$EXT_STATIC oci8" 94535 ;; 94536 *) 94537- 94538- 94539+ 94540+ 94541 case ext/oci8 in 94542 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 94543 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 94544 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 94545 esac 94546- 94547- 94548+ 94549+ 94550 94551 b_c_pre=$php_c_pre 94552 b_cxx_pre=$php_cxx_pre 94553@@ -81870,13 +62627,13 @@ 94554 94555 old_IFS=$IFS 94556 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 94557- 94558+ 94559 IFS=. 94560 set $ac_src 94561 ac_obj=$1 94562 IFS=$old_IFS 94563- 94564- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 94565+ 94566+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 94567 94568 case $ac_src in 94569 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 94570@@ -81896,75 +62653,69 @@ 94571 esac 94572 EXT_CLI_STATIC="$EXT_CLI_STATIC oci8" 94573 fi 94574- 94575- 94576+ 94577+ 94578 BUILD_DIR="$BUILD_DIR $ext_builddir" 94579- 94580+ 94581 94582 94583 if test "$ext_builddir" = "."; then 94584 PHP_PECL_EXTENSION=oci8 94585- 94586+ 94587 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 94588 94589 fi 94590 94591- 94592-cat >>confdefs.h <<\_ACEOF 94593+ cat >> confdefs.h <<\EOF 94594 #define HAVE_OCI8 1 94595-_ACEOF 94596- 94597- 94598+EOF 94599 94600 94601+ 94602+ 94603 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD" 94604 94605+ 94606 94607- 94608- 94609- 94610+ 94611+ 94612 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR" 94613 94614+ 94615 94616- 94617- 94618- 94619+ 94620+ 94621 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION" 94622 94623+ 94624 94625 94626- 94627- 94628-cat >>confdefs.h <<_ACEOF 94629+ cat >> confdefs.h <<EOF 94630 #define PHP_OCI8_DEF_DIR "$OCI8_DIR" 94631-_ACEOF 94632- 94633+EOF 94634 94635-cat >>confdefs.h <<_ACEOF 94636+ cat >> confdefs.h <<EOF 94637 #define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD" 94638-_ACEOF 94639+EOF 94640 94641 94642 else 94643- 94644- echo "$as_me:$LINENO: checking Oracle Instant Client directory" >&5 94645-echo $ECHO_N "checking Oracle Instant Client directory... $ECHO_C" >&6 94646+ 94647+ echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 94648+echo "configure:62706: checking Oracle Instant Client directory" >&5 94649 94650 if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then 94651 PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` 94652 if test -z "$PHP_OCI8_INSTANT_CLIENT"; then 94653- { { echo "$as_me:$LINENO: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&5 94654-echo "$as_me: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&2;} 94655- { (exit 1); exit 1; }; } 94656+ { echo "configure: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" 1>&2; exit 1; } 94657 fi 94658 fi 94659- echo "$as_me:$LINENO: result: $PHP_OCI8_INSTANT_CLIENT" >&5 94660-echo "${ECHO_T}$PHP_OCI8_INSTANT_CLIENT" >&6 94661+ echo "$ac_t""$PHP_OCI8_INSTANT_CLIENT" 1>&6 94662 94663 OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT 94664 94665- echo "$as_me:$LINENO: checking Oracle Instant Client SDK header directory" >&5 94666-echo $ECHO_N "checking Oracle Instant Client SDK header directory... $ECHO_C" >&6 94667+ echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 94668+echo "configure:62719: checking Oracle Instant Client SDK header directory" >&5 94669 94670 OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` 94671 94672@@ -81973,129 +62724,124 @@ 94673 OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'` 94674 94675 if test -f "$OCISDKRPMINC/oci.h"; then 94676- echo "$as_me:$LINENO: result: $OCISDKRPMINC" >&5 94677-echo "${ECHO_T}$OCISDKRPMINC" >&6 94678- 94679+ echo "$ac_t""$OCISDKRPMINC" 1>&6 94680+ 94681 if test "$OCISDKRPMINC" != "/usr/include"; then 94682- 94683+ 94684 if test -z "$OCISDKRPMINC" || echo "$OCISDKRPMINC" | grep '^/' >/dev/null ; then 94685 ai_p=$OCISDKRPMINC 94686 else 94687- 94688+ 94689 ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`" 94690- 94691+ 94692 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94693 ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`" 94694 fi 94695 94696- 94697- 94698+ 94699+ 94700 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94701- 94702+ 94703 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 94704 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94705 eval "INCLUDEPATH$unique=set" 94706- 94707+ 94708 if test ""; then 94709 INCLUDES="-I$ai_p $INCLUDES" 94710 else 94711 INCLUDES="$INCLUDES -I$ai_p" 94712 fi 94713- 94714+ 94715 fi 94716 94717 fi 94718 94719 OCI8INCDIR=$OCISDKRPMINC 94720 elif test -f "$OCISDKZIPINC/oci.h"; then 94721- echo "$as_me:$LINENO: result: $OCISDKZIPINC" >&5 94722-echo "${ECHO_T}$OCISDKZIPINC" >&6 94723- 94724+ echo "$ac_t""$OCISDKZIPINC" 1>&6 94725+ 94726 if test "$OCISDKZIPINC" != "/usr/include"; then 94727- 94728+ 94729 if test -z "$OCISDKZIPINC" || echo "$OCISDKZIPINC" | grep '^/' >/dev/null ; then 94730 ai_p=$OCISDKZIPINC 94731 else 94732- 94733+ 94734 ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`" 94735- 94736+ 94737 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94738 ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`" 94739 fi 94740 94741- 94742- 94743+ 94744+ 94745 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94746- 94747+ 94748 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 94749 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94750 eval "INCLUDEPATH$unique=set" 94751- 94752+ 94753 if test ""; then 94754 INCLUDES="-I$ai_p $INCLUDES" 94755 else 94756 INCLUDES="$INCLUDES -I$ai_p" 94757 fi 94758- 94759+ 94760 fi 94761 94762 fi 94763 94764 OCI8INCDIR=$OCISDKZIPINC 94765 elif test -f "$OCISDKMANINC/oci.h"; then 94766- echo "$as_me:$LINENO: result: $OCISDKMANINC" >&5 94767-echo "${ECHO_T}$OCISDKMANINC" >&6 94768- 94769+ echo "$ac_t""$OCISDKMANINC" 1>&6 94770+ 94771 if test "$OCISDKMANINC" != "/usr/include"; then 94772- 94773+ 94774 if test -z "$OCISDKMANINC" || echo "$OCISDKMANINC" | grep '^/' >/dev/null ; then 94775 ai_p=$OCISDKMANINC 94776 else 94777- 94778+ 94779 ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`" 94780- 94781+ 94782 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94783 ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`" 94784 fi 94785 94786- 94787- 94788+ 94789+ 94790 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94791- 94792+ 94793 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 94794 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94795 eval "INCLUDEPATH$unique=set" 94796- 94797+ 94798 if test ""; then 94799 INCLUDES="-I$ai_p $INCLUDES" 94800 else 94801 INCLUDES="$INCLUDES -I$ai_p" 94802 fi 94803- 94804+ 94805 fi 94806 94807 fi 94808 94809 OCI8INCDIR=$OCISDKMANINC 94810 else 94811- { { echo "$as_me:$LINENO: error: Oracle Instant Client SDK header files not found" >&5 94812-echo "$as_me: error: Oracle Instant Client SDK header files not found" >&2;} 94813- { (exit 1); exit 1; }; } 94814+ { echo "configure: error: Oracle Instant Client SDK header files not found" 1>&2; exit 1; } 94815 fi 94816 94817 OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'` 94818 if test -f "$OCISYSLIBLIST"; then 94819- 94820+ 94821 for ac_i in `cat $OCISYSLIBLIST`; do 94822 case $ac_i in 94823 -pthread) 94824 if test "$ext_shared" = "yes"; then 94825 OCI8_SYSLIB="$OCI8_SYSLIB -pthread" 94826 else 94827- 94828- 94829+ 94830+ 94831 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 94832- 94833+ 94834 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 94835 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94836 eval "EXTRA_LDFLAGS$unique=set" 94837@@ -82106,20 +62852,20 @@ 94838 ;; 94839 -l*) 94840 ac_ii=`echo $ac_i|cut -c 3-` 94841- 94842- 94843+ 94844+ 94845 case $ac_ii in 94846 c|c_r|pthread*) ;; 94847- *) 94848+ *) 94849 if test "$ext_shared" = "yes"; then 94850- OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 94851+ OCI8_SYSLIB="$OCI8_SYSLIB -l$ac_ii" 94852 else 94853- 94854- 94855+ 94856+ 94857 case $ac_ii in 94858 c|c_r|pthread*) ;; 94859- *) 94860- LIBS="$LIBS -l$ac_ii" 94861+ *) 94862+ LIBS="$LIBS -l$ac_ii" 94863 ;; 94864 esac 94865 94866@@ -82132,42 +62878,42 @@ 94867 ;; 94868 -L*) 94869 ac_ii=`echo $ac_i|cut -c 3-` 94870- 94871+ 94872 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 94873- 94874+ 94875 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 94876 ai_p=$ac_ii 94877 else 94878- 94879+ 94880 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 94881- 94882+ 94883 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94884 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 94885 fi 94886 94887- 94888+ 94889 if test "$ext_shared" = "yes"; then 94890 OCI8_SYSLIB="-L$ai_p $OCI8_SYSLIB" 94891 test -n "$ld_runpath_switch" && OCI8_SYSLIB="$ld_runpath_switch$ai_p $OCI8_SYSLIB" 94892 else 94893- 94894- 94895- 94896+ 94897+ 94898+ 94899 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 94900- 94901+ 94902 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 94903 if test -n "$unique" && test "`eval $cmd`" = "" ; then 94904 eval "LIBPATH$unique=set" 94905- 94906+ 94907 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 94908 LDFLAGS="$LDFLAGS -L$ai_p" 94909 PHP_RPATHS="$PHP_RPATHS $ai_p" 94910- 94911+ 94912 fi 94913 94914 94915 fi 94916- 94917+ 94918 fi 94919 94920 ;; 94921@@ -82176,41 +62922,36 @@ 94922 94923 fi 94924 94925- 94926- echo "$as_me:$LINENO: checking Oracle Instant Client library version compatibility" >&5 94927-echo $ECHO_N "checking Oracle Instant Client library version compatibility... $ECHO_C" >&6 94928+ 94929+ echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6 94930+echo "configure:62928: checking Oracle Instant Client library version compatibility" >&5 94931 OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME 94932 OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle 10g, 11g etc 94933 OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1` 94934 if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then 94935 if test ! -f "$OCI8_LCS_BASE"; then 94936- { { echo "$as_me:$LINENO: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&5 94937-echo "$as_me: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&2;} 94938- { (exit 1); exit 1; }; } 94939+ { echo "configure: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" 1>&2; exit 1; } 94940 fi 94941 OCI8_ORACLE_VERSION=`echo $OCI8_LCS | $PHP_OCI8_SED -e 's/.*\.\(.*\)\.1$/\1.1/'` 94942 else 94943- { { echo "$as_me:$LINENO: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&5 94944-echo "$as_me: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&2;} 94945- { (exit 1); exit 1; }; } 94946+ { echo "configure: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" 1>&2; exit 1; } 94947 fi 94948- echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5 94949-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6 94950- 94951- 94952+ echo "$ac_t""$OCI8_ORACLE_VERSION" 1>&6 94953 94954+ 94955+ 94956 case clntsh in 94957 c|c_r|pthread*) ;; 94958- *) 94959+ *) 94960 if test "$ext_shared" = "yes"; then 94961- OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 94962+ OCI8_SHARED_LIBADD="$OCI8_SHARED_LIBADD -lclntsh" 94963 else 94964- 94965- 94966+ 94967+ 94968 case clntsh in 94969 c|c_r|pthread*) ;; 94970- *) 94971- LIBS="$LIBS -lclntsh" 94972+ *) 94973+ LIBS="$LIBS -lclntsh" 94974 ;; 94975 esac 94976 94977@@ -82220,57 +62961,55 @@ 94978 esac 94979 94980 94981- 94982+ 94983 if test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/$PHP_LIBDIR" && test "$PHP_OCI8_INSTANT_CLIENT" != "/usr/lib"; then 94984- 94985+ 94986 if test -z "$PHP_OCI8_INSTANT_CLIENT" || echo "$PHP_OCI8_INSTANT_CLIENT" | grep '^/' >/dev/null ; then 94987 ai_p=$PHP_OCI8_INSTANT_CLIENT 94988 else 94989- 94990+ 94991 ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`" 94992- 94993+ 94994 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 94995 ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`" 94996 fi 94997 94998- 94999+ 95000 if test "$ext_shared" = "yes"; then 95001 OCI8_SHARED_LIBADD="-L$ai_p $OCI8_SHARED_LIBADD" 95002 test -n "$ld_runpath_switch" && OCI8_SHARED_LIBADD="$ld_runpath_switch$ai_p $OCI8_SHARED_LIBADD" 95003 else 95004- 95005- 95006- 95007+ 95008+ 95009+ 95010 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95011- 95012+ 95013 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 95014 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95015 eval "LIBPATH$unique=set" 95016- 95017+ 95018 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 95019 LDFLAGS="$LDFLAGS -L$ai_p" 95020 PHP_RPATHS="$PHP_RPATHS $ai_p" 95021- 95022+ 95023 fi 95024 95025 95026 fi 95027- 95028+ 95029 fi 95030 95031 95032- 95033-cat >>confdefs.h <<\_ACEOF 95034+ cat >> confdefs.h <<\EOF 95035 #define HAVE_OCI_INSTANT_CLIENT 1 95036-_ACEOF 95037- 95038+EOF 95039 95040-cat >>confdefs.h <<\_ACEOF 95041+ cat >> confdefs.h <<\EOF 95042 #define HAVE_OCI_LOB_READ2 1 95043-_ACEOF 95044- 95045+EOF 95046 95047 95048+ 95049 ext_builddir=ext/oci8 95050 ext_srcdir=$abs_srcdir/ext/oci8 95051 95052@@ -82278,15 +63017,15 @@ 95053 95054 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 95055 PHP_OCI8_SHARED=no 95056- 95057- 95058+ 95059+ 95060 case ext/oci8 in 95061 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 95062 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 95063 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 95064 esac 95065- 95066- 95067+ 95068+ 95069 95070 b_c_pre=$php_c_pre 95071 b_cxx_pre=$php_cxx_pre 95072@@ -82299,12 +63038,12 @@ 95073 95074 old_IFS=$IFS 95075 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 95076- 95077+ 95078 IFS=. 95079 set $ac_src 95080 ac_obj=$1 95081 IFS=$old_IFS 95082- 95083+ 95084 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 95085 95086 case $ac_src in 95087@@ -82328,14 +63067,14 @@ 95088 else 95089 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 95090 PHP_OCI8_SHARED=yes 95091- 95092+ 95093 case ext/oci8 in 95094 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 95095 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 95096 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 95097 esac 95098- 95099- 95100+ 95101+ 95102 95103 b_c_pre=$shared_c_pre 95104 b_cxx_pre=$shared_cxx_pre 95105@@ -82348,12 +63087,12 @@ 95106 95107 old_IFS=$IFS 95108 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 95109- 95110+ 95111 IFS=. 95112 set $ac_src 95113 ac_obj=$1 95114 IFS=$old_IFS 95115- 95116+ 95117 shared_objects_oci8="$shared_objects_oci8 $ac_bdir$ac_obj.lo" 95118 95119 case $ac_src in 95120@@ -82371,7 +63110,7 @@ 95121 95122 case $host_alias in 95123 *netware*) 95124- 95125+ 95126 install_modules="install-modules" 95127 95128 case $host_alias in 95129@@ -82381,7 +63120,7 @@ 95130 ;; 95131 *netware*) 95132 suffix=nlm 95133- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(OCI8_SHARED_LIBADD)' 95134+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPOCI8, 3)_SHARED_LIBADD)' 95135 ;; 95136 *) 95137 suffix=la 95138@@ -82394,7 +63133,7 @@ 95139 else 95140 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpoci8.$suffix" 95141 fi 95142- 95143+ 95144 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" 95145 95146 cat >>Makefile.objects<<EOF 95147@@ -82408,7 +63147,7 @@ 95148 95149 ;; 95150 *) 95151- 95152+ 95153 install_modules="install-modules" 95154 95155 case $host_alias in 95156@@ -82418,7 +63157,7 @@ 95157 ;; 95158 *netware*) 95159 suffix=nlm 95160- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(8_SHARED_LIBADD)' 95161+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_oci8) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(OCI8, 3)_SHARED_LIBADD)' 95162 ;; 95163 *) 95164 suffix=la 95165@@ -82431,7 +63170,7 @@ 95166 else 95167 PHP_MODULES="$PHP_MODULES \$(phplibdir)/oci8.$suffix" 95168 fi 95169- 95170+ 95171 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_oci8" 95172 95173 cat >>Makefile.objects<<EOF 95174@@ -82445,10 +63184,9 @@ 95175 95176 ;; 95177 esac 95178- 95179-cat >>confdefs.h <<_ACEOF 95180+ cat >> confdefs.h <<EOF 95181 #define COMPILE_DL_OCI8 1 95182-_ACEOF 95183+EOF 95184 95185 fi 95186 fi 95187@@ -82457,15 +63195,15 @@ 95188 PHP_OCI8_SHARED=no 95189 case "$PHP_SAPI" in 95190 cgi|embed) 95191- 95192- 95193+ 95194+ 95195 case ext/oci8 in 95196 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 95197 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 95198 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 95199 esac 95200- 95201- 95202+ 95203+ 95204 95205 b_c_pre=$php_c_pre 95206 b_cxx_pre=$php_cxx_pre 95207@@ -82478,12 +63216,12 @@ 95208 95209 old_IFS=$IFS 95210 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 95211- 95212+ 95213 IFS=. 95214 set $ac_src 95215 ac_obj=$1 95216 IFS=$old_IFS 95217- 95218+ 95219 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 95220 95221 case $ac_src in 95222@@ -82503,15 +63241,15 @@ 95223 EXT_STATIC="$EXT_STATIC oci8" 95224 ;; 95225 *) 95226- 95227- 95228+ 95229+ 95230 case ext/oci8 in 95231 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 95232 /*) ac_srcdir=`echo "ext/oci8"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 95233 *) ac_srcdir="$abs_srcdir/ext/oci8/"; ac_bdir="ext/oci8/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 95234 esac 95235- 95236- 95237+ 95238+ 95239 95240 b_c_pre=$php_c_pre 95241 b_cxx_pre=$php_cxx_pre 95242@@ -82524,13 +63262,13 @@ 95243 95244 old_IFS=$IFS 95245 for ac_src in oci8.c oci8_lob.c oci8_statement.c oci8_collection.c oci8_interface.c; do 95246- 95247+ 95248 IFS=. 95249 set $ac_src 95250 ac_obj=$1 95251 IFS=$old_IFS 95252- 95253- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 95254+ 95255+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 95256 95257 case $ac_src in 95258 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 95259@@ -82550,42 +63288,41 @@ 95260 esac 95261 EXT_CLI_STATIC="$EXT_CLI_STATIC oci8" 95262 fi 95263- 95264- 95265+ 95266+ 95267 BUILD_DIR="$BUILD_DIR $ext_builddir" 95268- 95269+ 95270 95271 95272 if test "$ext_builddir" = "."; then 95273 PHP_PECL_EXTENSION=oci8 95274- 95275+ 95276 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 95277 95278 fi 95279 95280- 95281-cat >>confdefs.h <<\_ACEOF 95282+ cat >> confdefs.h <<\EOF 95283 #define HAVE_OCI8 1 95284-_ACEOF 95285- 95286- 95287+EOF 95288 95289 95290+ 95291+ 95292 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_SHARED_LIBADD" 95293 95294+ 95295 95296- 95297- 95298- 95299+ 95300+ 95301 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DIR" 95302 95303+ 95304 95305- 95306- 95307- 95308+ 95309+ 95310 PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_ORACLE_VERSION" 95311 95312- 95313+ 95314 95315 95316 fi 95317@@ -82607,17 +63344,17 @@ 95318 php_with_adabas=no 95319 95320 95321- 95322 # Check whether --with-adabas or --without-adabas was given. 95323 if test "${with_adabas+set}" = set; then 95324 withval="$with_adabas" 95325 PHP_ADABAS=$withval 95326 else 95327- 95328+ 95329 PHP_ADABAS=no 95330 test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL 95331 95332-fi; 95333+fi 95334+ 95335 95336 95337 ext_output="yes, shared" 95338@@ -82647,73 +63384,73 @@ 95339 95340 95341 if test "$PHP_ADABAS" != "no"; then 95342- echo "$as_me:$LINENO: checking for Adabas support" >&5 95343-echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6 95344+ echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 95345+echo "configure:63389: checking for Adabas support" >&5 95346 if test "$PHP_ADABAS" = "yes"; then 95347 PHP_ADABAS=/usr/local 95348 fi 95349- 95350+ 95351 if test "$PHP_ADABAS/incl" != "/usr/include"; then 95352- 95353+ 95354 if test -z "$PHP_ADABAS/incl" || echo "$PHP_ADABAS/incl" | grep '^/' >/dev/null ; then 95355 ai_p=$PHP_ADABAS/incl 95356 else 95357- 95358+ 95359 ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`" 95360- 95361+ 95362 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 95363 ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`" 95364 fi 95365 95366- 95367- 95368+ 95369+ 95370 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95371- 95372+ 95373 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 95374 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95375 eval "INCLUDEPATH$unique=set" 95376- 95377+ 95378 if test ""; then 95379 INCLUDES="-I$ai_p $INCLUDES" 95380 else 95381 INCLUDES="$INCLUDES -I$ai_p" 95382 fi 95383- 95384+ 95385 fi 95386 95387 fi 95388 95389- 95390+ 95391 if test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ADABAS/$PHP_LIBDIR" != "/usr/lib"; then 95392- 95393+ 95394 if test -z "$PHP_ADABAS/$PHP_LIBDIR" || echo "$PHP_ADABAS/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 95395 ai_p=$PHP_ADABAS/$PHP_LIBDIR 95396 else 95397- 95398+ 95399 ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 95400- 95401+ 95402 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 95403 ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`" 95404 fi 95405 95406- 95407- 95408- 95409- 95410+ 95411+ 95412+ 95413+ 95414 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95415- 95416+ 95417 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 95418 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95419 eval "LIBPATH$unique=set" 95420- 95421+ 95422 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 95423 LDFLAGS="$LDFLAGS -L$ai_p" 95424 PHP_RPATHS="$PHP_RPATHS $ai_p" 95425- 95426+ 95427 fi 95428 95429 95430- 95431+ 95432 fi 95433 95434 ODBC_OBJS="$PHP_ADABAS/$PHP_LIBDIR/odbclib.a" 95435@@ -82721,69 +63458,69 @@ 95436 $srcdir/build/shtool mkdir -f -p ext/odbc 95437 rm -f "$ODBC_LIB" 95438 cp "$ODBC_OBJS" "$ODBC_LIB" 95439- 95440- 95441+ 95442+ 95443 case sqlptc in 95444 c|c_r|pthread*) ;; 95445- *) 95446- LIBS="-lsqlptc $LIBS" 95447+ *) 95448+ LIBS="-lsqlptc $LIBS" 95449 ;; 95450 esac 95451 95452 95453- 95454- 95455+ 95456+ 95457 case sqlrte in 95458 c|c_r|pthread*) ;; 95459- *) 95460- LIBS="-lsqlrte $LIBS" 95461+ *) 95462+ LIBS="-lsqlrte $LIBS" 95463 ;; 95464 esac 95465 95466 95467- 95468+ 95469 95470 if test -n "$abs_builddir/ext/odbc"; then 95471- 95472+ 95473 if test "$abs_builddir/ext/odbc" != "/usr/$PHP_LIBDIR" && test "$abs_builddir/ext/odbc" != "/usr/lib"; then 95474- 95475+ 95476 if test -z "$abs_builddir/ext/odbc" || echo "$abs_builddir/ext/odbc" | grep '^/' >/dev/null ; then 95477 ai_p=$abs_builddir/ext/odbc 95478 else 95479- 95480+ 95481 ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`" 95482- 95483+ 95484 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 95485 ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`" 95486 fi 95487 95488- 95489- 95490- 95491- 95492+ 95493+ 95494+ 95495+ 95496 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95497- 95498+ 95499 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 95500 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95501 eval "LIBPATH$unique=set" 95502- 95503+ 95504 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 95505 LDFLAGS="$LDFLAGS -L$ai_p" 95506 PHP_RPATHS="$PHP_RPATHS $ai_p" 95507- 95508+ 95509 fi 95510 95511 95512- 95513+ 95514 fi 95515 95516 fi 95517- 95518- 95519+ 95520+ 95521 case odbc_adabas in 95522 c|c_r|pthread*) ;; 95523- *) 95524- LIBS="-lodbc_adabas $LIBS" 95525+ *) 95526+ LIBS="-lodbc_adabas $LIBS" 95527 ;; 95528 esac 95529 95530@@ -82792,20 +63529,16 @@ 95531 95532 ODBC_TYPE=adabas 95533 ODBC_INCDIR=$PHP_ADABAS/incl 95534- 95535+ 95536 if ! test -f "$ODBC_INCDIR/sqlext.h"; then 95537- { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5 95538-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;} 95539- { (exit 1); exit 1; }; } 95540+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; } 95541 fi 95542 95543- 95544-cat >>confdefs.h <<\_ACEOF 95545+ cat >> confdefs.h <<\EOF 95546 #define HAVE_ADABAS 1 95547-_ACEOF 95548+EOF 95549 95550- echo "$as_me:$LINENO: result: $ext_output" >&5 95551-echo "${ECHO_T}$ext_output" >&6 95552+ echo "$ac_t""$ext_output" 1>&6 95553 fi 95554 fi 95555 95556@@ -82814,17 +63547,17 @@ 95557 php_with_sapdb=no 95558 95559 95560- 95561 # Check whether --with-sapdb or --without-sapdb was given. 95562 if test "${with_sapdb+set}" = set; then 95563 withval="$with_sapdb" 95564 PHP_SAPDB=$withval 95565 else 95566- 95567+ 95568 PHP_SAPDB=no 95569 test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL 95570 95571-fi; 95572+fi 95573+ 95574 95575 95576 ext_output="yes, shared" 95577@@ -82854,93 +63587,91 @@ 95578 95579 95580 if test "$PHP_SAPDB" != "no"; then 95581- echo "$as_me:$LINENO: checking for SAP DB support" >&5 95582-echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6 95583+ echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 95584+echo "configure:63592: checking for SAP DB support" >&5 95585 if test "$PHP_SAPDB" = "yes"; then 95586 PHP_SAPDB=/usr/local 95587 fi 95588- 95589+ 95590 if test "$PHP_SAPDB/incl" != "/usr/include"; then 95591- 95592+ 95593 if test -z "$PHP_SAPDB/incl" || echo "$PHP_SAPDB/incl" | grep '^/' >/dev/null ; then 95594 ai_p=$PHP_SAPDB/incl 95595 else 95596- 95597+ 95598 ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`" 95599- 95600+ 95601 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 95602 ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`" 95603 fi 95604 95605- 95606- 95607+ 95608+ 95609 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95610- 95611+ 95612 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 95613 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95614 eval "INCLUDEPATH$unique=set" 95615- 95616+ 95617 if test ""; then 95618 INCLUDES="-I$ai_p $INCLUDES" 95619 else 95620 INCLUDES="$INCLUDES -I$ai_p" 95621 fi 95622- 95623+ 95624 fi 95625 95626 fi 95627 95628- 95629+ 95630 if test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_SAPDB/$PHP_LIBDIR" != "/usr/lib"; then 95631- 95632+ 95633 if test -z "$PHP_SAPDB/$PHP_LIBDIR" || echo "$PHP_SAPDB/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 95634 ai_p=$PHP_SAPDB/$PHP_LIBDIR 95635 else 95636- 95637+ 95638 ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 95639- 95640+ 95641 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 95642 ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`" 95643 fi 95644 95645- 95646- 95647- 95648- 95649+ 95650+ 95651+ 95652+ 95653 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 95654- 95655+ 95656 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 95657 if test -n "$unique" && test "`eval $cmd`" = "" ; then 95658 eval "LIBPATH$unique=set" 95659- 95660+ 95661 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 95662 LDFLAGS="$LDFLAGS -L$ai_p" 95663 PHP_RPATHS="$PHP_RPATHS $ai_p" 95664- 95665+ 95666 fi 95667 95668 95669- 95670+ 95671 fi 95672 95673- 95674- 95675+ 95676+ 95677 case sqlod in 95678 c|c_r|pthread*) ;; 95679- *) 95680- LIBS="-lsqlod $LIBS" 95681+ *) 95682+ LIBS="-lsqlod $LIBS" 95683 ;; 95684 esac 95685 95686 95687 ODBC_TYPE=sapdb 95688- 95689-cat >>confdefs.h <<\_ACEOF 95690+ cat >> confdefs.h <<\EOF 95691 #define HAVE_SAPDB 1 95692-_ACEOF 95693+EOF 95694 95695- echo "$as_me:$LINENO: result: $ext_output" >&5 95696-echo "${ECHO_T}$ext_output" >&6 95697+ echo "$ac_t""$ext_output" 1>&6 95698 fi 95699 fi 95700 95701@@ -82949,17 +63680,17 @@ 95702 php_with_solid=no 95703 95704 95705- 95706 # Check whether --with-solid or --without-solid was given. 95707 if test "${with_solid+set}" = set; then 95708 withval="$with_solid" 95709 PHP_SOLID=$withval 95710 else 95711- 95712+ 95713 PHP_SOLID=no 95714 test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL 95715 95716-fi; 95717+fi 95718+ 95719 95720 95721 ext_output="yes, shared" 95722@@ -82989,8 +63720,8 @@ 95723 95724 95725 if test "$PHP_SOLID" != "no"; then 95726- echo "$as_me:$LINENO: checking for Solid support" >&5 95727-echo $ECHO_N "checking for Solid support... $ECHO_C" >&6 95728+ echo $ac_n "checking for Solid support""... $ac_c" 1>&6 95729+echo "configure:63725: checking for Solid support" >&5 95730 if test "$PHP_SOLID" = "yes"; then 95731 PHP_SOLID=/usr/local/solid 95732 fi 95733@@ -82999,66 +63730,58 @@ 95734 ODBC_INCLUDE=-I$ODBC_INCDIR 95735 ODBC_TYPE=solid 95736 if test -f $ODBC_LIBDIR/soc*35.a; then 95737- 95738-cat >>confdefs.h <<\_ACEOF 95739+ cat >> confdefs.h <<\EOF 95740 #define HAVE_SOLID_35 1 95741-_ACEOF 95742+EOF 95743 95744 elif test -f $ODBC_LIBDIR/scl*30.a; then 95745- 95746-cat >>confdefs.h <<\_ACEOF 95747+ cat >> confdefs.h <<\EOF 95748 #define HAVE_SOLID_30 1 95749-_ACEOF 95750+EOF 95751 95752 elif test -f $ODBC_LIBDIR/scl*23.a; then 95753- 95754-cat >>confdefs.h <<\_ACEOF 95755+ cat >> confdefs.h <<\EOF 95756 #define HAVE_SOLID 1 95757-_ACEOF 95758+EOF 95759 95760 fi 95761- echo "$as_me:$LINENO: result: $ext_output" >&5 95762-echo "${ECHO_T}$ext_output" >&6 95763- 95764- echo "$as_me:$LINENO: checking Solid library file" >&5 95765-echo $ECHO_N "checking Solid library file... $ECHO_C" >&6 95766+ echo "$ac_t""$ext_output" 1>&6 95767+ 95768+ echo $ac_n "checking Solid library file""... $ac_c" 1>&6 95769+echo "configure:63752: checking Solid library file" >&5 95770 ac_solid_uname_r=`uname -r 2>/dev/null` 95771 ac_solid_uname_s=`uname -s 2>/dev/null` 95772 case $ac_solid_uname_s in 95773 AIX) ac_solid_os=a3x;; # a4x for AIX4/ Solid 2.3/3.0 only 95774 HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10 95775 IRIX) ac_solid_os=irx;; # Solid 2.3(?)/ 3.0 only 95776- Linux) 95777+ Linux) 95778 if ldd -v /bin/sh | grep GLIBC > /dev/null; then 95779- 95780-cat >>confdefs.h <<\_ACEOF 95781+ cat >> confdefs.h <<\EOF 95782 #define SS_LINUX 1 95783-_ACEOF 95784+EOF 95785 95786 ac_solid_os=l2x 95787 else 95788- 95789-cat >>confdefs.h <<\_ACEOF 95790+ cat >> confdefs.h <<\EOF 95791 #define SS_LINUX 1 95792-_ACEOF 95793+EOF 95794 95795 ac_solid_os=lux 95796- fi;; 95797- SunOS) 95798+ fi;; 95799+ SunOS) 95800 ac_solid_os=ssx;; # should we deal with SunOS 4? 95801- FreeBSD) 95802+ FreeBSD) 95803 if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then 95804- 95805-cat >>confdefs.h <<\_ACEOF 95806+ cat >> confdefs.h <<\EOF 95807 #define SS_FBX 1 95808-_ACEOF 95809+EOF 95810 95811 ac_solid_os=fex 95812- else 95813- 95814-cat >>confdefs.h <<\_ACEOF 95815+ else 95816+ cat >> confdefs.h <<\EOF 95817 #define SS_FBX 1 95818-_ACEOF 95819+EOF 95820 95821 ac_solid_os=fbx 95822 fi;; 95823@@ -83095,8 +63818,7 @@ 95824 ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} 95825 fi 95826 95827- echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5 95828-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6 95829+ echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6 95830 95831 fi 95832 fi 95833@@ -83106,17 +63828,17 @@ 95834 php_with_ibm_db2=no 95835 95836 95837- 95838 # Check whether --with-ibm-db2 or --without-ibm-db2 was given. 95839 if test "${with_ibm_db2+set}" = set; then 95840 withval="$with_ibm_db2" 95841 PHP_IBM_DB2=$withval 95842 else 95843- 95844+ 95845 PHP_IBM_DB2=no 95846 test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL 95847 95848-fi; 95849+fi 95850+ 95851 95852 95853 ext_output="yes, shared" 95854@@ -83146,8 +63868,8 @@ 95855 95856 95857 if test "$PHP_IBM_DB2" != "no"; then 95858- echo "$as_me:$LINENO: checking for IBM DB2 support" >&5 95859-echo $ECHO_N "checking for IBM DB2 support... $ECHO_C" >&6 95860+ echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 95861+echo "configure:63873: checking for IBM DB2 support" >&5 95862 if test "$PHP_IBM_DB2" = "yes"; then 95863 ODBC_INCDIR=/home/db2inst1/sqllib/include 95864 ODBC_LIBDIR=/home/db2inst1/sqllib/lib 95865@@ -83156,11 +63878,9 @@ 95866 ODBC_LIBDIR=$PHP_IBM_DB2/$PHP_LIBDIR 95867 fi 95868 95869- 95870+ 95871 if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then 95872- { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&5 95873-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&2;} 95874- { (exit 1); exit 1; }; } 95875+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" 1>&2; exit 1; } 95876 fi 95877 95878 95879@@ -83169,82 +63889,60 @@ 95880 ODBC_TYPE=ibm-db2 95881 ODBC_LIBS=-ldb2 95882 95883- 95884+ 95885 old_LIBS=$LIBS 95886 LIBS=" 95887 $ODBC_LFLAGS $ODBC_LIBS 95888 $LIBS" 95889 if test "$cross_compiling" = yes; then 95890- 95891+ 95892 LIBS=$old_LIBS 95893- 95894+ 95895 else 95896- cat >conftest.$ac_ext <<_ACEOF 95897-/* confdefs.h. */ 95898-_ACEOF 95899-cat confdefs.h >>conftest.$ac_ext 95900-cat >>conftest.$ac_ext <<_ACEOF 95901-/* end confdefs.h. */ 95902- 95903+ cat > conftest.$ac_ext <<EOF 95904+#line 63904 "configure" 95905+#include "confdefs.h" 95906 95907+ 95908 char SQLExecute(); 95909 int main() { 95910 SQLExecute(); 95911 return 0; 95912 } 95913- 95914-_ACEOF 95915-rm -f conftest$ac_exeext 95916-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 95917- (eval $ac_link) 2>&5 95918- ac_status=$? 95919- echo "$as_me:$LINENO: \$? = $ac_status" >&5 95920- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 95921- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 95922- (eval $ac_try) 2>&5 95923- ac_status=$? 95924- echo "$as_me:$LINENO: \$? = $ac_status" >&5 95925- (exit $ac_status); }; }; then 95926- 95927+ 95928+EOF 95929+if { (eval echo configure:63915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 95930+then 95931+ 95932 LIBS=$old_LIBS 95933- 95934- 95935-cat >>confdefs.h <<\_ACEOF 95936+ 95937+ cat >> confdefs.h <<\EOF 95938 #define HAVE_IBMDB2 1 95939-_ACEOF 95940- 95941- echo "$as_me:$LINENO: result: $ext_output" >&5 95942-echo "${ECHO_T}$ext_output" >&6 95943- 95944+EOF 95945 95946+ echo "$ac_t""$ext_output" 1>&6 95947+ 95948+ 95949 else 95950- echo "$as_me: program exited with status $ac_status" >&5 95951-echo "$as_me: failed program was:" >&5 95952-sed 's/^/| /' conftest.$ac_ext >&5 95953- 95954-( exit $ac_status ) 95955- 95956+ echo "configure: failed program was:" >&5 95957+ cat conftest.$ac_ext >&5 95958+ rm -fr conftest* 95959+ 95960 LIBS=$old_LIBS 95961- 95962- echo "$as_me:$LINENO: result: no" >&5 95963-echo "${ECHO_T}no" >&6 95964- { { echo "$as_me:$LINENO: error: 95965-build test failed. Please check the config.log for details. 95966-You need to source your DB2 environment before running PHP configure: 95967-# . \$IBM_DB2/db2profile 95968-" >&5 95969-echo "$as_me: error: 95970+ 95971+ echo "$ac_t""no" 1>&6 95972+ { echo "configure: error: 95973 build test failed. Please check the config.log for details. 95974 You need to source your DB2 environment before running PHP configure: 95975 # . \$IBM_DB2/db2profile 95976-" >&2;} 95977- { (exit 1); exit 1; }; } 95978- 95979- 95980+" 1>&2; exit 1; } 95981+ 95982+ 95983 fi 95984-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 95985+rm -fr conftest* 95986 fi 95987 95988+ 95989 fi 95990 fi 95991 95992@@ -83253,17 +63951,17 @@ 95993 php_with_odbcrouter=no 95994 95995 95996- 95997 # Check whether --with-ODBCRouter or --without-ODBCRouter was given. 95998 if test "${with_ODBCRouter+set}" = set; then 95999 withval="$with_ODBCRouter" 96000 PHP_ODBCROUTER=$withval 96001 else 96002- 96003+ 96004 PHP_ODBCROUTER=no 96005 test "$PHP_ENABLE_ALL" && PHP_ODBCROUTER=$PHP_ENABLE_ALL 96006 96007-fi; 96008+fi 96009+ 96010 96011 96012 ext_output="yes, shared" 96013@@ -83293,8 +63991,8 @@ 96014 96015 96016 if test "$PHP_ODBCROUTER" != "no"; then 96017- echo "$as_me:$LINENO: checking for ODBCRouter.com support" >&5 96018-echo $ECHO_N "checking for ODBCRouter.com support... $ECHO_C" >&6 96019+ echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 96020+echo "configure:63996: checking for ODBCRouter.com support" >&5 96021 if test "$PHP_ODBCROUTER" = "yes"; then 96022 PHP_ODBCROUTER=/usr 96023 fi 96024@@ -83304,13 +64002,11 @@ 96025 ODBC_INCLUDE=-I$ODBC_INCDIR 96026 ODBC_LIBS=-lodbcsdk 96027 ODBC_TYPE=ODBCRouter 96028- 96029-cat >>confdefs.h <<\_ACEOF 96030+ cat >> confdefs.h <<\EOF 96031 #define HAVE_ODBC_ROUTER 1 96032-_ACEOF 96033+EOF 96034 96035- echo "$as_me:$LINENO: result: $ext_output" >&5 96036-echo "${ECHO_T}$ext_output" >&6 96037+ echo "$ac_t""$ext_output" 1>&6 96038 fi 96039 fi 96040 96041@@ -83319,17 +64015,17 @@ 96042 php_with_empress=no 96043 96044 96045- 96046 # Check whether --with-empress or --without-empress was given. 96047 if test "${with_empress+set}" = set; then 96048 withval="$with_empress" 96049 PHP_EMPRESS=$withval 96050 else 96051- 96052+ 96053 PHP_EMPRESS=no 96054 test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL 96055 96056-fi; 96057+fi 96058+ 96059 96060 96061 ext_output="yes, shared" 96062@@ -83359,8 +64055,8 @@ 96063 96064 96065 if test "$PHP_EMPRESS" != "no"; then 96066- echo "$as_me:$LINENO: checking for Empress support" >&5 96067-echo $ECHO_N "checking for Empress support... $ECHO_C" >&6 96068+ echo $ac_n "checking for Empress support""... $ac_c" 1>&6 96069+echo "configure:64060: checking for Empress support" >&5 96070 if test "$PHP_EMPRESS" = "yes"; then 96071 ODBC_INCDIR=$EMPRESSPATH/include/odbc 96072 ODBC_LIBDIR=$EMPRESSPATH/shlib 96073@@ -83371,22 +64067,19 @@ 96074 ODBC_INCLUDE=-I$ODBC_INCDIR 96075 ODBC_LFLAGS=-L$ODBC_LIBDIR 96076 ODBC_TYPE=empress 96077- 96078-cat >>confdefs.h <<\_ACEOF 96079+ cat >> confdefs.h <<\EOF 96080 #define HAVE_EMPRESS 1 96081-_ACEOF 96082- 96083- echo "$as_me:$LINENO: result: $ext_output" >&5 96084-echo "${ECHO_T}$ext_output" >&6 96085+EOF 96086 96087- echo "$as_me:$LINENO: checking Empress library file" >&5 96088-echo $ECHO_N "checking Empress library file... $ECHO_C" >&6 96089+ echo "$ac_t""$ext_output" 1>&6 96090+ 96091+ echo $ac_n "checking Empress library file""... $ac_c" 1>&6 96092+echo "configure:64078: checking Empress library file" >&5 96093 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` 96094 if test ! -f $ODBC_LIBS; then 96095 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` 96096 fi 96097- echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5 96098-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6 96099+ echo "$ac_t""`echo $ODBC_LIBS | sed -e 's!.*/!!'`" 1>&6 96100 96101 fi 96102 fi 96103@@ -83396,17 +64089,17 @@ 96104 php_with_empress_bcs=no 96105 96106 96107- 96108 # Check whether --with-empress-bcs or --without-empress-bcs was given. 96109 if test "${with_empress_bcs+set}" = set; then 96110 withval="$with_empress_bcs" 96111 PHP_EMPRESS_BCS=$withval 96112 else 96113- 96114+ 96115 PHP_EMPRESS_BCS=no 96116 test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL 96117 96118-fi; 96119+fi 96120+ 96121 96122 96123 ext_output="yes, shared" 96124@@ -83436,8 +64129,8 @@ 96125 96126 96127 if test "$PHP_EMPRESS_BCS" != "no"; then 96128- echo "$as_me:$LINENO: checking for Empress local access support" >&5 96129-echo $ECHO_N "checking for Empress local access support... $ECHO_C" >&6 96130+ echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 96131+echo "configure:64134: checking for Empress local access support" >&5 96132 if test "$PHP_EMPRESS_BCS" = "yes"; then 96133 ODBC_INCDIR=$EMPRESSPATH/include/odbc 96134 ODBC_LIBDIR=$EMPRESSPATH/shlib 96135@@ -83464,22 +64157,19 @@ 96136 done 96137 ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt" 96138 ODBC_TYPE=empress-bcs 96139- 96140-cat >>confdefs.h <<\_ACEOF 96141+ cat >> confdefs.h <<\EOF 96142 #define HAVE_EMPRESS 1 96143-_ACEOF 96144- 96145- echo "$as_me:$LINENO: result: $ext_output" >&5 96146-echo "${ECHO_T}$ext_output" >&6 96147+EOF 96148 96149- echo "$as_me:$LINENO: checking Empress local access library file" >&5 96150-echo $ECHO_N "checking Empress local access library file... $ECHO_C" >&6 96151+ echo "$ac_t""$ext_output" 1>&6 96152+ 96153+ echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 96154+echo "configure:64168: checking Empress local access library file" >&5 96155 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` 96156 if test ! -f $ODBCBCS_LIBS; then 96157 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` 96158 fi 96159- echo "$as_me:$LINENO: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5 96160-echo "${ECHO_T}\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6 96161+ echo "$ac_t""`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'`" 1>&6 96162 96163 fi 96164 fi 96165@@ -83489,17 +64179,17 @@ 96166 php_with_birdstep=no 96167 96168 96169- 96170 # Check whether --with-birdstep or --without-birdstep was given. 96171 if test "${with_birdstep+set}" = set; then 96172 withval="$with_birdstep" 96173 PHP_BIRDSTEP=$withval 96174 else 96175- 96176+ 96177 PHP_BIRDSTEP=no 96178 test "$PHP_ENABLE_ALL" && PHP_BIRDSTEP=$PHP_ENABLE_ALL 96179 96180-fi; 96181+fi 96182+ 96183 96184 96185 ext_output="yes, shared" 96186@@ -83527,10 +64217,10 @@ 96187 96188 96189 96190- 96191+ 96192 if test "$PHP_BIRDSTEP" != "no"; then 96193- echo "$as_me:$LINENO: checking for Birdstep support" >&5 96194-echo $ECHO_N "checking for Birdstep support... $ECHO_C" >&6 96195+ echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 96196+echo "configure:64224: checking for Birdstep support" >&5 96197 if test "$PHP_BIRDSTEP" = "yes"; then 96198 ODBC_INCDIR=/usr/local/birdstep/include 96199 ODBC_LIBDIR=/usr/local/birdstep/lib 96200@@ -83538,49 +64228,42 @@ 96201 ODBC_INCDIR=$PHP_BIRDSTEP/include 96202 ODBC_LIBDIR=$PHP_BIRDSTEP/$PHP_LIBDIR 96203 fi 96204- 96205+ 96206 case $host_alias in 96207 *aix*) 96208- 96209-cat >>confdefs.h <<\_ACEOF 96210+ cat >> confdefs.h <<\EOF 96211 #define AIX 1 96212-_ACEOF 96213+EOF 96214 ;; 96215 *hpux*) 96216- 96217-cat >>confdefs.h <<\_ACEOF 96218+ cat >> confdefs.h <<\EOF 96219 #define HPUX 1 96220-_ACEOF 96221+EOF 96222 ;; 96223 *linux*) 96224- 96225-cat >>confdefs.h <<\_ACEOF 96226+ cat >> confdefs.h <<\EOF 96227 #define LINUX 1 96228-_ACEOF 96229+EOF 96230 ;; 96231 *qnx*) 96232- 96233-cat >>confdefs.h <<\_ACEOF 96234+ cat >> confdefs.h <<\EOF 96235 #define NEUTRINO 1 96236-_ACEOF 96237+EOF 96238 ;; 96239 i?86-*-solaris*) 96240- 96241-cat >>confdefs.h <<\_ACEOF 96242+ cat >> confdefs.h <<\EOF 96243 #define ISOLARIS 1 96244-_ACEOF 96245+EOF 96246 ;; 96247 sparc-*-solaris*) 96248- 96249-cat >>confdefs.h <<\_ACEOF 96250+ cat >> confdefs.h <<\EOF 96251 #define SOLARIS 1 96252-_ACEOF 96253+EOF 96254 ;; 96255 *unixware*) 96256- 96257-cat >>confdefs.h <<\_ACEOF 96258+ cat >> confdefs.h <<\EOF 96259 #define UNIXWARE 1 96260-_ACEOF 96261+EOF 96262 ;; 96263 esac 96264 96265@@ -83595,13 +64278,11 @@ 96266 ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil" 96267 fi 96268 96269- 96270-cat >>confdefs.h <<\_ACEOF 96271+ cat >> confdefs.h <<\EOF 96272 #define HAVE_BIRDSTEP 1 96273-_ACEOF 96274+EOF 96275 96276- echo "$as_me:$LINENO: result: $ext_output" >&5 96277-echo "${ECHO_T}$ext_output" >&6 96278+ echo "$ac_t""$ext_output" 1>&6 96279 fi 96280 fi 96281 96282@@ -83610,17 +64291,17 @@ 96283 php_with_custom_odbc=no 96284 96285 96286- 96287 # Check whether --with-custom-odbc or --without-custom-odbc was given. 96288 if test "${with_custom_odbc+set}" = set; then 96289 withval="$with_custom_odbc" 96290 PHP_CUSTOM_ODBC=$withval 96291 else 96292- 96293+ 96294 PHP_CUSTOM_ODBC=no 96295 test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL 96296 96297-fi; 96298+fi 96299+ 96300 96301 96302 ext_output="yes, shared" 96303@@ -83650,8 +64331,8 @@ 96304 96305 96306 if test "$PHP_CUSTOM_ODBC" != "no"; then 96307- echo "$as_me:$LINENO: checking for a custom ODBC support" >&5 96308-echo $ECHO_N "checking for a custom ODBC support... $ECHO_C" >&6 96309+ echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 96310+echo "configure:64336: checking for a custom ODBC support" >&5 96311 if test "$PHP_CUSTOM_ODBC" = "yes"; then 96312 PHP_CUSTOM_ODBC=/usr/local 96313 fi 96314@@ -83661,13 +64342,11 @@ 96315 ODBC_INCLUDE=-I$ODBC_INCDIR 96316 ODBC_LIBS=$CUSTOM_ODBC_LIBS 96317 ODBC_TYPE=custom-odbc 96318- 96319-cat >>confdefs.h <<\_ACEOF 96320+ cat >> confdefs.h <<\EOF 96321 #define HAVE_CODBC 1 96322-_ACEOF 96323+EOF 96324 96325- echo "$as_me:$LINENO: result: $ext_ouput" >&5 96326-echo "${ECHO_T}$ext_ouput" >&6 96327+ echo "$ac_t""$ext_ouput" 1>&6 96328 fi 96329 fi 96330 96331@@ -83676,17 +64355,17 @@ 96332 php_with_iodbc=no 96333 96334 96335- 96336 # Check whether --with-iodbc or --without-iodbc was given. 96337 if test "${with_iodbc+set}" = set; then 96338 withval="$with_iodbc" 96339 PHP_IODBC=$withval 96340 else 96341- 96342+ 96343 PHP_IODBC=no 96344 test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL 96345 96346-fi; 96347+fi 96348+ 96349 96350 96351 ext_output="yes, shared" 96352@@ -83716,87 +64395,87 @@ 96353 96354 96355 if test "$PHP_IODBC" != "no"; then 96356- echo "$as_me:$LINENO: checking for iODBC support" >&5 96357-echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6 96358+ echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 96359+echo "configure:64400: checking for iODBC support" >&5 96360 if test "$PHP_IODBC" = "yes"; then 96361 PHP_IODBC=/usr/local 96362 fi 96363- 96364+ 96365 96366 if test -n "$PHP_IODBC/$PHP_LIBDIR"; then 96367- 96368+ 96369 if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then 96370- 96371+ 96372 if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 96373 ai_p=$PHP_IODBC/$PHP_LIBDIR 96374 else 96375- 96376+ 96377 ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 96378- 96379+ 96380 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 96381 ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`" 96382 fi 96383 96384- 96385- 96386- 96387- 96388+ 96389+ 96390+ 96391+ 96392 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 96393- 96394+ 96395 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 96396 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96397 eval "LIBPATH$unique=set" 96398- 96399+ 96400 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 96401 LDFLAGS="$LDFLAGS -L$ai_p" 96402 PHP_RPATHS="$PHP_RPATHS $ai_p" 96403- 96404+ 96405 fi 96406 96407 96408- 96409+ 96410 fi 96411 96412 fi 96413- 96414- 96415+ 96416+ 96417 case iodbc in 96418 c|c_r|pthread*) ;; 96419- *) 96420- LIBS="-liodbc $LIBS" 96421+ *) 96422+ LIBS="-liodbc $LIBS" 96423 ;; 96424 esac 96425 96426 96427 96428 96429- 96430+ 96431 if test "$PHP_IODBC/include" != "/usr/include"; then 96432- 96433+ 96434 if test -z "$PHP_IODBC/include" || echo "$PHP_IODBC/include" | grep '^/' >/dev/null ; then 96435 ai_p=$PHP_IODBC/include 96436 else 96437- 96438+ 96439 ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`" 96440- 96441+ 96442 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 96443 ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`" 96444 fi 96445 96446- 96447- 96448+ 96449+ 96450 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 96451- 96452+ 96453 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 96454 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96455 eval "INCLUDEPATH$unique=set" 96456- 96457+ 96458 if test "1"; then 96459 INCLUDES="-I$ai_p $INCLUDES" 96460 else 96461 INCLUDES="$INCLUDES -I$ai_p" 96462 fi 96463- 96464+ 96465 fi 96466 96467 fi 96468@@ -83805,18 +64484,15 @@ 96469 ODBC_INCLUDE=-I$PHP_IODBC/include 96470 ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR 96471 ODBC_LIBS=-liodbc 96472- 96473-cat >>confdefs.h <<\_ACEOF 96474+ cat >> confdefs.h <<\EOF 96475 #define HAVE_IODBC 1 96476-_ACEOF 96477- 96478+EOF 96479 96480-cat >>confdefs.h <<\_ACEOF 96481+ cat >> confdefs.h <<\EOF 96482 #define HAVE_ODBC2 1 96483-_ACEOF 96484+EOF 96485 96486- echo "$as_me:$LINENO: result: $ext_output" >&5 96487-echo "${ECHO_T}$ext_output" >&6 96488+ echo "$ac_t""$ext_output" 1>&6 96489 fi 96490 fi 96491 96492@@ -83825,17 +64501,17 @@ 96493 php_with_esoob=no 96494 96495 96496- 96497 # Check whether --with-esoob or --without-esoob was given. 96498 if test "${with_esoob+set}" = set; then 96499 withval="$with_esoob" 96500 PHP_ESOOB=$withval 96501 else 96502- 96503+ 96504 PHP_ESOOB=no 96505 test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL 96506 96507-fi; 96508+fi 96509+ 96510 96511 96512 ext_output="yes, shared" 96513@@ -83865,8 +64541,8 @@ 96514 96515 96516 if test "$PHP_ESOOB" != "no"; then 96517- echo "$as_me:$LINENO: checking for Easysoft ODBC-ODBC Bridge support" >&5 96518-echo $ECHO_N "checking for Easysoft ODBC-ODBC Bridge support... $ECHO_C" >&6 96519+ echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 96520+echo "configure:64546: checking for Easysoft ODBC-ODBC Bridge support" >&5 96521 if test "$PHP_ESOOB" = "yes"; then 96522 PHP_ESOOB=/usr/local/easysoft/oob/client 96523 fi 96524@@ -83876,13 +64552,11 @@ 96525 ODBC_INCLUDE=-I$ODBC_INCDIR 96526 ODBC_LIBS=-lesoobclient 96527 ODBC_TYPE=esoob 96528- 96529-cat >>confdefs.h <<\_ACEOF 96530+ cat >> confdefs.h <<\EOF 96531 #define HAVE_ESOOB 1 96532-_ACEOF 96533+EOF 96534 96535- echo "$as_me:$LINENO: result: $ext_output" >&5 96536-echo "${ECHO_T}$ext_output" >&6 96537+ echo "$ac_t""$ext_output" 1>&6 96538 fi 96539 fi 96540 96541@@ -83891,17 +64565,17 @@ 96542 php_with_unixodbc=no 96543 96544 96545- 96546 # Check whether --with-unixODBC or --without-unixODBC was given. 96547 if test "${with_unixODBC+set}" = set; then 96548 withval="$with_unixODBC" 96549 PHP_UNIXODBC=$withval 96550 else 96551- 96552+ 96553 PHP_UNIXODBC=no 96554 test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL 96555 96556-fi; 96557+fi 96558+ 96559 96560 96561 ext_output="yes, shared" 96562@@ -83931,8 +64605,8 @@ 96563 96564 96565 if test "$PHP_UNIXODBC" != "no"; then 96566- echo "$as_me:$LINENO: checking for unixODBC support" >&5 96567-echo $ECHO_N "checking for unixODBC support... $ECHO_C" >&6 96568+ echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 96569+echo "configure:64610: checking for unixODBC support" >&5 96570 if test "$PHP_UNIXODBC" = "yes"; then 96571 PHP_UNIXODBC=/usr/local 96572 fi 96573@@ -83942,20 +64616,16 @@ 96574 ODBC_INCLUDE=-I$ODBC_INCDIR 96575 ODBC_LIBS=-lodbc 96576 ODBC_TYPE=unixODBC 96577- 96578+ 96579 if ! test -f "$ODBC_INCDIR/sqlext.h"; then 96580- { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5 96581-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;} 96582- { (exit 1); exit 1; }; } 96583+ { echo "configure: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" 1>&2; exit 1; } 96584 fi 96585 96586- 96587-cat >>confdefs.h <<\_ACEOF 96588+ cat >> confdefs.h <<\EOF 96589 #define HAVE_UNIXODBC 1 96590-_ACEOF 96591+EOF 96592 96593- echo "$as_me:$LINENO: result: $ext_output" >&5 96594-echo "${ECHO_T}$ext_output" >&6 96595+ echo "$ac_t""$ext_output" 1>&6 96596 fi 96597 fi 96598 96599@@ -83964,17 +64634,17 @@ 96600 php_with_dbmaker=no 96601 96602 96603- 96604 # Check whether --with-dbmaker or --without-dbmaker was given. 96605 if test "${with_dbmaker+set}" = set; then 96606 withval="$with_dbmaker" 96607 PHP_DBMAKER=$withval 96608 else 96609- 96610+ 96611 PHP_DBMAKER=no 96612 test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL 96613 96614-fi; 96615+fi 96616+ 96617 96618 96619 ext_output="yes, shared" 96620@@ -84004,8 +64674,8 @@ 96621 96622 96623 if test "$PHP_DBMAKER" != "no"; then 96624- echo "$as_me:$LINENO: checking for DBMaker support" >&5 96625-echo $ECHO_N "checking for DBMaker support... $ECHO_C" >&6 96626+ echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 96627+echo "configure:64679: checking for DBMaker support" >&5 96628 if test "$PHP_DBMAKER" = "yes"; then 96629 # find dbmaker's home directory 96630 DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` 96631@@ -84035,96 +64705,93 @@ 96632 ODBC_LIBS="-ldmapic -lc" 96633 ODBC_TYPE=dbmaker 96634 96635- 96636-cat >>confdefs.h <<\_ACEOF 96637+ cat >> confdefs.h <<\EOF 96638 #define HAVE_DBMAKER 1 96639-_ACEOF 96640+EOF 96641 96642 96643 if test "$ext_shared" = "yes"; then 96644- echo "$as_me:$LINENO: result: yes (shared)" >&5 96645-echo "${ECHO_T}yes (shared)" >&6 96646+ echo "$ac_t""yes (shared)" 1>&6 96647 ODBC_LIBS="-ldmapic -lc -lm" 96648 ODBC_SHARED="odbc.la" 96649 else 96650- echo "$as_me:$LINENO: result: yes (static)" >&5 96651-echo "${ECHO_T}yes (static)" >&6 96652- 96653+ echo "$ac_t""yes (static)" 1>&6 96654+ 96655 96656 if test -n "$ODBC_LIBDIR"; then 96657- 96658+ 96659 if test "$ODBC_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ODBC_LIBDIR" != "/usr/lib"; then 96660- 96661+ 96662 if test -z "$ODBC_LIBDIR" || echo "$ODBC_LIBDIR" | grep '^/' >/dev/null ; then 96663 ai_p=$ODBC_LIBDIR 96664 else 96665- 96666+ 96667 ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 96668- 96669+ 96670 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 96671 ai_p="$ep_realdir/`basename \"$ODBC_LIBDIR\"`" 96672 fi 96673 96674- 96675- 96676- 96677- 96678+ 96679+ 96680+ 96681+ 96682 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 96683- 96684+ 96685 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 96686 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96687 eval "LIBPATH$unique=set" 96688- 96689+ 96690 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 96691 LDFLAGS="$LDFLAGS -L$ai_p" 96692 PHP_RPATHS="$PHP_RPATHS $ai_p" 96693- 96694+ 96695 fi 96696 96697 96698- 96699+ 96700 fi 96701 96702 fi 96703- 96704- 96705+ 96706+ 96707 case dmapic in 96708 c|c_r|pthread*) ;; 96709- *) 96710- LIBS="-ldmapic $LIBS" 96711+ *) 96712+ LIBS="-ldmapic $LIBS" 96713 ;; 96714 esac 96715 96716 96717 96718 96719- 96720+ 96721 if test "$ODBC_INCDIR" != "/usr/include"; then 96722- 96723+ 96724 if test -z "$ODBC_INCDIR" || echo "$ODBC_INCDIR" | grep '^/' >/dev/null ; then 96725 ai_p=$ODBC_INCDIR 96726 else 96727- 96728+ 96729 ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 96730- 96731+ 96732 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 96733 ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`" 96734 fi 96735 96736- 96737- 96738+ 96739+ 96740 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 96741- 96742+ 96743 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 96744 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96745 eval "INCLUDEPATH$unique=set" 96746- 96747+ 96748 if test ""; then 96749 INCLUDES="-I$ai_p $INCLUDES" 96750 else 96751 INCLUDES="$INCLUDES -I$ai_p" 96752 fi 96753- 96754+ 96755 fi 96756 96757 fi 96758@@ -84136,17 +64803,17 @@ 96759 96760 if test -n "$ODBC_TYPE"; then 96761 if test "$ODBC_TYPE" != "dbmaker"; then 96762- 96763+ 96764 for ac_i in $ODBC_LFLAGS $ODBC_LIBS; do 96765 case $ac_i in 96766 -pthread) 96767 if test "$ext_shared" = "yes"; then 96768 ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -pthread" 96769 else 96770- 96771- 96772+ 96773+ 96774 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 96775- 96776+ 96777 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 96778 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96779 eval "EXTRA_LDFLAGS$unique=set" 96780@@ -84157,20 +64824,20 @@ 96781 ;; 96782 -l*) 96783 ac_ii=`echo $ac_i|cut -c 3-` 96784- 96785- 96786+ 96787+ 96788 case $ac_ii in 96789 c|c_r|pthread*) ;; 96790- *) 96791+ *) 96792 if test "$ext_shared" = "yes"; then 96793- ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii" 96794+ ODBC_SHARED_LIBADD="$ODBC_SHARED_LIBADD -l$ac_ii" 96795 else 96796- 96797- 96798+ 96799+ 96800 case $ac_ii in 96801 c|c_r|pthread*) ;; 96802- *) 96803- LIBS="$LIBS -l$ac_ii" 96804+ *) 96805+ LIBS="$LIBS -l$ac_ii" 96806 ;; 96807 esac 96808 96809@@ -84183,42 +64850,42 @@ 96810 ;; 96811 -L*) 96812 ac_ii=`echo $ac_i|cut -c 3-` 96813- 96814+ 96815 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 96816- 96817+ 96818 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 96819 ai_p=$ac_ii 96820 else 96821- 96822+ 96823 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 96824- 96825+ 96826 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 96827 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 96828 fi 96829 96830- 96831+ 96832 if test "$ext_shared" = "yes"; then 96833 ODBC_SHARED_LIBADD="-L$ai_p $ODBC_SHARED_LIBADD" 96834 test -n "$ld_runpath_switch" && ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $ODBC_SHARED_LIBADD" 96835 else 96836- 96837- 96838- 96839+ 96840+ 96841+ 96842 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 96843- 96844+ 96845 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 96846 if test -n "$unique" && test "`eval $cmd`" = "" ; then 96847 eval "LIBPATH$unique=set" 96848- 96849+ 96850 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 96851 LDFLAGS="$LDFLAGS -L$ai_p" 96852 PHP_RPATHS="$PHP_RPATHS $ai_p" 96853- 96854+ 96855 fi 96856 96857 96858 fi 96859- 96860+ 96861 fi 96862 96863 ;; 96864@@ -84226,54 +64893,52 @@ 96865 done 96866 96867 if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then 96868- 96869-cat >>confdefs.h <<\_ACEOF 96870+ cat >> confdefs.h <<\EOF 96871 #define HAVE_SQLDATASOURCES 1 96872-_ACEOF 96873+EOF 96874 96875 fi 96876 fi 96877- 96878- 96879-cat >>confdefs.h <<\_ACEOF 96880+ 96881+ cat >> confdefs.h <<\EOF 96882 #define HAVE_UODBC 1 96883-_ACEOF 96884- 96885+EOF 96886 96887+ 96888 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD" 96889 96890- 96891+ 96892 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCDIR" 96893 96894- 96895+ 96896 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBDIR" 96897 96898- 96899- 96900+ 96901+ 96902 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_INCLUDE" 96903 96904+ 96905 96906- 96907- 96908- 96909+ 96910+ 96911 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LIBS" 96912 96913+ 96914 96915- 96916- 96917- 96918+ 96919+ 96920 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_LFLAGS" 96921 96922+ 96923 96924- 96925- 96926- 96927+ 96928+ 96929 PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_TYPE" 96930 96931+ 96932 96933 96934- 96935- 96936+ 96937 ext_builddir=ext/odbc 96938 ext_srcdir=$abs_srcdir/ext/odbc 96939 96940@@ -84281,15 +64946,15 @@ 96941 96942 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 96943 PHP_ODBC_SHARED=no 96944- 96945- 96946+ 96947+ 96948 case ext/odbc in 96949 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 96950 /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 96951 *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 96952 esac 96953- 96954- 96955+ 96956+ 96957 96958 b_c_pre=$php_c_pre 96959 b_cxx_pre=$php_cxx_pre 96960@@ -84302,12 +64967,12 @@ 96961 96962 old_IFS=$IFS 96963 for ac_src in php_odbc.c; do 96964- 96965+ 96966 IFS=. 96967 set $ac_src 96968 ac_obj=$1 96969 IFS=$old_IFS 96970- 96971+ 96972 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 96973 96974 case $ac_src in 96975@@ -84331,14 +64996,14 @@ 96976 else 96977 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 96978 PHP_ODBC_SHARED=yes 96979- 96980+ 96981 case ext/odbc in 96982 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 96983 /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 96984 *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 96985 esac 96986- 96987- 96988+ 96989+ 96990 96991 b_c_pre=$shared_c_pre 96992 b_cxx_pre=$shared_cxx_pre 96993@@ -84351,12 +65016,12 @@ 96994 96995 old_IFS=$IFS 96996 for ac_src in php_odbc.c; do 96997- 96998+ 96999 IFS=. 97000 set $ac_src 97001 ac_obj=$1 97002 IFS=$old_IFS 97003- 97004+ 97005 shared_objects_odbc="$shared_objects_odbc $ac_bdir$ac_obj.lo" 97006 97007 case $ac_src in 97008@@ -84374,7 +65039,7 @@ 97009 97010 case $host_alias in 97011 *netware*) 97012- 97013+ 97014 install_modules="install-modules" 97015 97016 case $host_alias in 97017@@ -84384,7 +65049,7 @@ 97018 ;; 97019 *netware*) 97020 suffix=nlm 97021- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(ODBC_SHARED_LIBADD)' 97022+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPODBC, 3)_SHARED_LIBADD)' 97023 ;; 97024 *) 97025 suffix=la 97026@@ -84397,7 +65062,7 @@ 97027 else 97028 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpodbc.$suffix" 97029 fi 97030- 97031+ 97032 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc" 97033 97034 cat >>Makefile.objects<<EOF 97035@@ -84411,7 +65076,7 @@ 97036 97037 ;; 97038 *) 97039- 97040+ 97041 install_modules="install-modules" 97042 97043 case $host_alias in 97044@@ -84421,7 +65086,7 @@ 97045 ;; 97046 *netware*) 97047 suffix=nlm 97048- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(C_SHARED_LIBADD)' 97049+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ODBC, 3)_SHARED_LIBADD)' 97050 ;; 97051 *) 97052 suffix=la 97053@@ -84434,7 +65099,7 @@ 97054 else 97055 PHP_MODULES="$PHP_MODULES \$(phplibdir)/odbc.$suffix" 97056 fi 97057- 97058+ 97059 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_odbc" 97060 97061 cat >>Makefile.objects<<EOF 97062@@ -84448,10 +65113,9 @@ 97063 97064 ;; 97065 esac 97066- 97067-cat >>confdefs.h <<_ACEOF 97068+ cat >> confdefs.h <<EOF 97069 #define COMPILE_DL_ODBC 1 97070-_ACEOF 97071+EOF 97072 97073 fi 97074 fi 97075@@ -84460,15 +65124,15 @@ 97076 PHP_ODBC_SHARED=no 97077 case "$PHP_SAPI" in 97078 cgi|embed) 97079- 97080- 97081+ 97082+ 97083 case ext/odbc in 97084 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97085 /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97086 *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97087 esac 97088- 97089- 97090+ 97091+ 97092 97093 b_c_pre=$php_c_pre 97094 b_cxx_pre=$php_cxx_pre 97095@@ -84481,12 +65145,12 @@ 97096 97097 old_IFS=$IFS 97098 for ac_src in php_odbc.c; do 97099- 97100+ 97101 IFS=. 97102 set $ac_src 97103 ac_obj=$1 97104 IFS=$old_IFS 97105- 97106+ 97107 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 97108 97109 case $ac_src in 97110@@ -84506,15 +65170,15 @@ 97111 EXT_STATIC="$EXT_STATIC odbc" 97112 ;; 97113 *) 97114- 97115- 97116+ 97117+ 97118 case ext/odbc in 97119 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97120 /*) ac_srcdir=`echo "ext/odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97121 *) ac_srcdir="$abs_srcdir/ext/odbc/"; ac_bdir="ext/odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97122 esac 97123- 97124- 97125+ 97126+ 97127 97128 b_c_pre=$php_c_pre 97129 b_cxx_pre=$php_cxx_pre 97130@@ -84527,13 +65191,13 @@ 97131 97132 old_IFS=$IFS 97133 for ac_src in php_odbc.c; do 97134- 97135+ 97136 IFS=. 97137 set $ac_src 97138 ac_obj=$1 97139 IFS=$old_IFS 97140- 97141- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 97142+ 97143+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 97144 97145 case $ac_src in 97146 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 97147@@ -84553,15 +65217,15 @@ 97148 esac 97149 EXT_CLI_STATIC="$EXT_CLI_STATIC odbc" 97150 fi 97151- 97152- 97153+ 97154+ 97155 BUILD_DIR="$BUILD_DIR $ext_builddir" 97156- 97157+ 97158 97159 97160 if test "$ext_builddir" = "."; then 97161 PHP_PECL_EXTENSION=odbc 97162- 97163+ 97164 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 97165 97166 fi 97167@@ -84572,18 +65236,19 @@ 97168 97169 php_enable_pcntl=no 97170 97171-echo "$as_me:$LINENO: checking whether to enable pcntl support" >&5 97172-echo $ECHO_N "checking whether to enable pcntl support... $ECHO_C" >&6 97173+echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 97174+echo "configure:65241: checking whether to enable pcntl support" >&5 97175 # Check whether --enable-pcntl or --disable-pcntl was given. 97176 if test "${enable_pcntl+set}" = set; then 97177 enableval="$enable_pcntl" 97178 PHP_PCNTL=$enableval 97179 else 97180- 97181+ 97182 PHP_PCNTL=no 97183 test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL 97184 97185-fi; 97186+fi 97187+ 97188 97189 97190 ext_output="yes, shared" 97191@@ -84607,451 +65272,245 @@ 97192 97193 97194 97195-echo "$as_me:$LINENO: result: $ext_output" >&5 97196-echo "${ECHO_T}$ext_output" >&6 97197+echo "$ac_t""$ext_output" 1>&6 97198 97199 97200 97201 97202 if test "$PHP_PCNTL" != "no"; then 97203- 97204-for ac_func in fork 97205+ for ac_func in fork 97206 do 97207-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 97208-echo "$as_me:$LINENO: checking for $ac_func" >&5 97209-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 97210-if eval "test \"\${$as_ac_var+set}\" = set"; then 97211- echo $ECHO_N "(cached) $ECHO_C" >&6 97212-else 97213- cat >conftest.$ac_ext <<_ACEOF 97214-/* confdefs.h. */ 97215-_ACEOF 97216-cat confdefs.h >>conftest.$ac_ext 97217-cat >>conftest.$ac_ext <<_ACEOF 97218-/* end confdefs.h. */ 97219-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 97220- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 97221-#define $ac_func innocuous_$ac_func 97222- 97223+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 97224+echo "configure:65285: checking for $ac_func" >&5 97225+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 97226+ echo $ac_n "(cached) $ac_c" 1>&6 97227+else 97228+ cat > conftest.$ac_ext <<EOF 97229+#line 65290 "configure" 97230+#include "confdefs.h" 97231 /* System header to define __stub macros and hopefully few prototypes, 97232- which can conflict with char $ac_func (); below. 97233- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 97234- <limits.h> exists even on freestanding compilers. */ 97235- 97236-#ifdef __STDC__ 97237-# include <limits.h> 97238-#else 97239-# include <assert.h> 97240-#endif 97241- 97242-#undef $ac_func 97243- 97244+ which can conflict with char $ac_func(); below. */ 97245+#include <assert.h> 97246 /* Override any gcc2 internal prototype to avoid an error. */ 97247-#ifdef __cplusplus 97248-extern "C" 97249-{ 97250-#endif 97251 /* We use char because int might match the return type of a gcc2 97252- builtin and then its argument prototype would still apply. */ 97253-char $ac_func (); 97254+ builtin and then its argument prototype would still apply. */ 97255+char $ac_func(); 97256+ 97257+int main() { 97258+ 97259 /* The GNU C library defines this for functions which it implements 97260 to always fail with ENOSYS. Some functions are actually named 97261 something starting with __ and the normal name is an alias. */ 97262 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 97263 choke me 97264 #else 97265-char (*f) () = $ac_func; 97266-#endif 97267-#ifdef __cplusplus 97268-} 97269+$ac_func(); 97270 #endif 97271 97272-int 97273-main () 97274-{ 97275-return f != $ac_func; 97276- ; 97277- return 0; 97278-} 97279-_ACEOF 97280-rm -f conftest.$ac_objext conftest$ac_exeext 97281-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 97282- (eval $ac_link) 2>conftest.er1 97283- ac_status=$? 97284- grep -v '^ *+' conftest.er1 >conftest.err 97285- rm -f conftest.er1 97286- cat conftest.err >&5 97287- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97288- (exit $ac_status); } && 97289- { ac_try='test -z "$ac_c_werror_flag" 97290- || test ! -s conftest.err' 97291- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97292- (eval $ac_try) 2>&5 97293- ac_status=$? 97294- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97295- (exit $ac_status); }; } && 97296- { ac_try='test -s conftest$ac_exeext' 97297- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97298- (eval $ac_try) 2>&5 97299- ac_status=$? 97300- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97301- (exit $ac_status); }; }; then 97302- eval "$as_ac_var=yes" 97303-else 97304- echo "$as_me: failed program was:" >&5 97305-sed 's/^/| /' conftest.$ac_ext >&5 97306- 97307-eval "$as_ac_var=no" 97308-fi 97309-rm -f conftest.err conftest.$ac_objext \ 97310- conftest$ac_exeext conftest.$ac_ext 97311-fi 97312-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 97313-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 97314-if test `eval echo '${'$as_ac_var'}'` = yes; then 97315- cat >>confdefs.h <<_ACEOF 97316-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 97317-_ACEOF 97318+; return 0; } 97319+EOF 97320+if { (eval echo configure:65313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 97321+ rm -rf conftest* 97322+ eval "ac_cv_func_$ac_func=yes" 97323+else 97324+ echo "configure: failed program was:" >&5 97325+ cat conftest.$ac_ext >&5 97326+ rm -rf conftest* 97327+ eval "ac_cv_func_$ac_func=no" 97328+fi 97329+rm -f conftest* 97330+fi 97331 97332-cat >>confdefs.h <<\_ACEOF 97333+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 97334+ echo "$ac_t""yes" 1>&6 97335+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 97336+ cat >> confdefs.h <<EOF 97337+#define $ac_tr_func 1 97338+EOF 97339+ cat >> confdefs.h <<\EOF 97340 #define HAVE_FORK 1 97341-_ACEOF 97342- 97343+EOF 97344+ 97345 else 97346- { { echo "$as_me:$LINENO: error: pcntl: fork() not supported by this platform" >&5 97347-echo "$as_me: error: pcntl: fork() not supported by this platform" >&2;} 97348- { (exit 1); exit 1; }; } 97349+ echo "$ac_t""no" 1>&6 97350+{ echo "configure: error: pcntl: fork() not supported by this platform" 1>&2; exit 1; } 97351 fi 97352 done 97353 97354- 97355-for ac_func in waitpid 97356+ for ac_func in waitpid 97357 do 97358-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 97359-echo "$as_me:$LINENO: checking for $ac_func" >&5 97360-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 97361-if eval "test \"\${$as_ac_var+set}\" = set"; then 97362- echo $ECHO_N "(cached) $ECHO_C" >&6 97363-else 97364- cat >conftest.$ac_ext <<_ACEOF 97365-/* confdefs.h. */ 97366-_ACEOF 97367-cat confdefs.h >>conftest.$ac_ext 97368-cat >>conftest.$ac_ext <<_ACEOF 97369-/* end confdefs.h. */ 97370-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 97371- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 97372-#define $ac_func innocuous_$ac_func 97373- 97374+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 97375+echo "configure:65344: checking for $ac_func" >&5 97376+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 97377+ echo $ac_n "(cached) $ac_c" 1>&6 97378+else 97379+ cat > conftest.$ac_ext <<EOF 97380+#line 65349 "configure" 97381+#include "confdefs.h" 97382 /* System header to define __stub macros and hopefully few prototypes, 97383- which can conflict with char $ac_func (); below. 97384- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 97385- <limits.h> exists even on freestanding compilers. */ 97386- 97387-#ifdef __STDC__ 97388-# include <limits.h> 97389-#else 97390-# include <assert.h> 97391-#endif 97392- 97393-#undef $ac_func 97394- 97395+ which can conflict with char $ac_func(); below. */ 97396+#include <assert.h> 97397 /* Override any gcc2 internal prototype to avoid an error. */ 97398-#ifdef __cplusplus 97399-extern "C" 97400-{ 97401-#endif 97402 /* We use char because int might match the return type of a gcc2 97403- builtin and then its argument prototype would still apply. */ 97404-char $ac_func (); 97405+ builtin and then its argument prototype would still apply. */ 97406+char $ac_func(); 97407+ 97408+int main() { 97409+ 97410 /* The GNU C library defines this for functions which it implements 97411 to always fail with ENOSYS. Some functions are actually named 97412 something starting with __ and the normal name is an alias. */ 97413 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 97414 choke me 97415 #else 97416-char (*f) () = $ac_func; 97417-#endif 97418-#ifdef __cplusplus 97419-} 97420+$ac_func(); 97421 #endif 97422 97423-int 97424-main () 97425-{ 97426-return f != $ac_func; 97427- ; 97428- return 0; 97429-} 97430-_ACEOF 97431-rm -f conftest.$ac_objext conftest$ac_exeext 97432-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 97433- (eval $ac_link) 2>conftest.er1 97434- ac_status=$? 97435- grep -v '^ *+' conftest.er1 >conftest.err 97436- rm -f conftest.er1 97437- cat conftest.err >&5 97438- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97439- (exit $ac_status); } && 97440- { ac_try='test -z "$ac_c_werror_flag" 97441- || test ! -s conftest.err' 97442- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97443- (eval $ac_try) 2>&5 97444- ac_status=$? 97445- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97446- (exit $ac_status); }; } && 97447- { ac_try='test -s conftest$ac_exeext' 97448- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97449- (eval $ac_try) 2>&5 97450- ac_status=$? 97451- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97452- (exit $ac_status); }; }; then 97453- eval "$as_ac_var=yes" 97454-else 97455- echo "$as_me: failed program was:" >&5 97456-sed 's/^/| /' conftest.$ac_ext >&5 97457- 97458-eval "$as_ac_var=no" 97459-fi 97460-rm -f conftest.err conftest.$ac_objext \ 97461- conftest$ac_exeext conftest.$ac_ext 97462-fi 97463-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 97464-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 97465-if test `eval echo '${'$as_ac_var'}'` = yes; then 97466- cat >>confdefs.h <<_ACEOF 97467-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 97468-_ACEOF 97469+; return 0; } 97470+EOF 97471+if { (eval echo configure:65372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 97472+ rm -rf conftest* 97473+ eval "ac_cv_func_$ac_func=yes" 97474+else 97475+ echo "configure: failed program was:" >&5 97476+ cat conftest.$ac_ext >&5 97477+ rm -rf conftest* 97478+ eval "ac_cv_func_$ac_func=no" 97479+fi 97480+rm -f conftest* 97481+fi 97482 97483-cat >>confdefs.h <<\_ACEOF 97484+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 97485+ echo "$ac_t""yes" 1>&6 97486+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 97487+ cat >> confdefs.h <<EOF 97488+#define $ac_tr_func 1 97489+EOF 97490+ cat >> confdefs.h <<\EOF 97491 #define HAVE_WAITPID 1 97492-_ACEOF 97493- 97494+EOF 97495+ 97496 else 97497- { { echo "$as_me:$LINENO: error: pcntl: waitpid() not supported by this platform" >&5 97498-echo "$as_me: error: pcntl: waitpid() not supported by this platform" >&2;} 97499- { (exit 1); exit 1; }; } 97500+ echo "$ac_t""no" 1>&6 97501+{ echo "configure: error: pcntl: waitpid() not supported by this platform" 1>&2; exit 1; } 97502 fi 97503 done 97504 97505- 97506-for ac_func in sigaction 97507+ for ac_func in sigaction 97508 do 97509-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 97510-echo "$as_me:$LINENO: checking for $ac_func" >&5 97511-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 97512-if eval "test \"\${$as_ac_var+set}\" = set"; then 97513- echo $ECHO_N "(cached) $ECHO_C" >&6 97514-else 97515- cat >conftest.$ac_ext <<_ACEOF 97516-/* confdefs.h. */ 97517-_ACEOF 97518-cat confdefs.h >>conftest.$ac_ext 97519-cat >>conftest.$ac_ext <<_ACEOF 97520-/* end confdefs.h. */ 97521-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 97522- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 97523-#define $ac_func innocuous_$ac_func 97524- 97525+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 97526+echo "configure:65403: checking for $ac_func" >&5 97527+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 97528+ echo $ac_n "(cached) $ac_c" 1>&6 97529+else 97530+ cat > conftest.$ac_ext <<EOF 97531+#line 65408 "configure" 97532+#include "confdefs.h" 97533 /* System header to define __stub macros and hopefully few prototypes, 97534- which can conflict with char $ac_func (); below. 97535- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 97536- <limits.h> exists even on freestanding compilers. */ 97537- 97538-#ifdef __STDC__ 97539-# include <limits.h> 97540-#else 97541-# include <assert.h> 97542-#endif 97543- 97544-#undef $ac_func 97545- 97546+ which can conflict with char $ac_func(); below. */ 97547+#include <assert.h> 97548 /* Override any gcc2 internal prototype to avoid an error. */ 97549-#ifdef __cplusplus 97550-extern "C" 97551-{ 97552-#endif 97553 /* We use char because int might match the return type of a gcc2 97554- builtin and then its argument prototype would still apply. */ 97555-char $ac_func (); 97556+ builtin and then its argument prototype would still apply. */ 97557+char $ac_func(); 97558+ 97559+int main() { 97560+ 97561 /* The GNU C library defines this for functions which it implements 97562 to always fail with ENOSYS. Some functions are actually named 97563 something starting with __ and the normal name is an alias. */ 97564 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 97565 choke me 97566 #else 97567-char (*f) () = $ac_func; 97568-#endif 97569-#ifdef __cplusplus 97570-} 97571+$ac_func(); 97572 #endif 97573 97574-int 97575-main () 97576-{ 97577-return f != $ac_func; 97578- ; 97579- return 0; 97580-} 97581-_ACEOF 97582-rm -f conftest.$ac_objext conftest$ac_exeext 97583-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 97584- (eval $ac_link) 2>conftest.er1 97585- ac_status=$? 97586- grep -v '^ *+' conftest.er1 >conftest.err 97587- rm -f conftest.er1 97588- cat conftest.err >&5 97589- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97590- (exit $ac_status); } && 97591- { ac_try='test -z "$ac_c_werror_flag" 97592- || test ! -s conftest.err' 97593- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97594- (eval $ac_try) 2>&5 97595- ac_status=$? 97596- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97597- (exit $ac_status); }; } && 97598- { ac_try='test -s conftest$ac_exeext' 97599- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97600- (eval $ac_try) 2>&5 97601- ac_status=$? 97602- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97603- (exit $ac_status); }; }; then 97604- eval "$as_ac_var=yes" 97605-else 97606- echo "$as_me: failed program was:" >&5 97607-sed 's/^/| /' conftest.$ac_ext >&5 97608- 97609-eval "$as_ac_var=no" 97610-fi 97611-rm -f conftest.err conftest.$ac_objext \ 97612- conftest$ac_exeext conftest.$ac_ext 97613-fi 97614-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 97615-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 97616-if test `eval echo '${'$as_ac_var'}'` = yes; then 97617- cat >>confdefs.h <<_ACEOF 97618-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 97619-_ACEOF 97620+; return 0; } 97621+EOF 97622+if { (eval echo configure:65431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 97623+ rm -rf conftest* 97624+ eval "ac_cv_func_$ac_func=yes" 97625+else 97626+ echo "configure: failed program was:" >&5 97627+ cat conftest.$ac_ext >&5 97628+ rm -rf conftest* 97629+ eval "ac_cv_func_$ac_func=no" 97630+fi 97631+rm -f conftest* 97632+fi 97633 97634-cat >>confdefs.h <<\_ACEOF 97635+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 97636+ echo "$ac_t""yes" 1>&6 97637+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 97638+ cat >> confdefs.h <<EOF 97639+#define $ac_tr_func 1 97640+EOF 97641+ cat >> confdefs.h <<\EOF 97642 #define HAVE_SIGACTION 1 97643-_ACEOF 97644- 97645+EOF 97646+ 97647 else 97648- { { echo "$as_me:$LINENO: error: pcntl: sigaction() not supported by this platform" >&5 97649-echo "$as_me: error: pcntl: sigaction() not supported by this platform" >&2;} 97650- { (exit 1); exit 1; }; } 97651+ echo "$ac_t""no" 1>&6 97652+{ echo "configure: error: pcntl: sigaction() not supported by this platform" 1>&2; exit 1; } 97653 fi 97654 done 97655 97656- 97657- 97658- 97659- 97660- 97661- 97662-for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait 97663+ for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait 97664 do 97665-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 97666-echo "$as_me:$LINENO: checking for $ac_func" >&5 97667-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 97668-if eval "test \"\${$as_ac_var+set}\" = set"; then 97669- echo $ECHO_N "(cached) $ECHO_C" >&6 97670-else 97671- cat >conftest.$ac_ext <<_ACEOF 97672-/* confdefs.h. */ 97673-_ACEOF 97674-cat confdefs.h >>conftest.$ac_ext 97675-cat >>conftest.$ac_ext <<_ACEOF 97676-/* end confdefs.h. */ 97677-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 97678- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 97679-#define $ac_func innocuous_$ac_func 97680- 97681+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 97682+echo "configure:65462: checking for $ac_func" >&5 97683+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 97684+ echo $ac_n "(cached) $ac_c" 1>&6 97685+else 97686+ cat > conftest.$ac_ext <<EOF 97687+#line 65467 "configure" 97688+#include "confdefs.h" 97689 /* System header to define __stub macros and hopefully few prototypes, 97690- which can conflict with char $ac_func (); below. 97691- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 97692- <limits.h> exists even on freestanding compilers. */ 97693- 97694-#ifdef __STDC__ 97695-# include <limits.h> 97696-#else 97697-# include <assert.h> 97698-#endif 97699- 97700-#undef $ac_func 97701- 97702+ which can conflict with char $ac_func(); below. */ 97703+#include <assert.h> 97704 /* Override any gcc2 internal prototype to avoid an error. */ 97705-#ifdef __cplusplus 97706-extern "C" 97707-{ 97708-#endif 97709 /* We use char because int might match the return type of a gcc2 97710- builtin and then its argument prototype would still apply. */ 97711-char $ac_func (); 97712+ builtin and then its argument prototype would still apply. */ 97713+char $ac_func(); 97714+ 97715+int main() { 97716+ 97717 /* The GNU C library defines this for functions which it implements 97718 to always fail with ENOSYS. Some functions are actually named 97719 something starting with __ and the normal name is an alias. */ 97720 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 97721 choke me 97722 #else 97723-char (*f) () = $ac_func; 97724-#endif 97725-#ifdef __cplusplus 97726-} 97727+$ac_func(); 97728 #endif 97729 97730-int 97731-main () 97732-{ 97733-return f != $ac_func; 97734- ; 97735- return 0; 97736-} 97737-_ACEOF 97738-rm -f conftest.$ac_objext conftest$ac_exeext 97739-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 97740- (eval $ac_link) 2>conftest.er1 97741- ac_status=$? 97742- grep -v '^ *+' conftest.er1 >conftest.err 97743- rm -f conftest.er1 97744- cat conftest.err >&5 97745- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97746- (exit $ac_status); } && 97747- { ac_try='test -z "$ac_c_werror_flag" 97748- || test ! -s conftest.err' 97749- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97750- (eval $ac_try) 2>&5 97751- ac_status=$? 97752- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97753- (exit $ac_status); }; } && 97754- { ac_try='test -s conftest$ac_exeext' 97755- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 97756- (eval $ac_try) 2>&5 97757- ac_status=$? 97758- echo "$as_me:$LINENO: \$? = $ac_status" >&5 97759- (exit $ac_status); }; }; then 97760- eval "$as_ac_var=yes" 97761-else 97762- echo "$as_me: failed program was:" >&5 97763-sed 's/^/| /' conftest.$ac_ext >&5 97764- 97765-eval "$as_ac_var=no" 97766-fi 97767-rm -f conftest.err conftest.$ac_objext \ 97768- conftest$ac_exeext conftest.$ac_ext 97769-fi 97770-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 97771-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 97772-if test `eval echo '${'$as_ac_var'}'` = yes; then 97773- cat >>confdefs.h <<_ACEOF 97774-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 97775-_ACEOF 97776+; return 0; } 97777+EOF 97778+if { (eval echo configure:65490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 97779+ rm -rf conftest* 97780+ eval "ac_cv_func_$ac_func=yes" 97781+else 97782+ echo "configure: failed program was:" >&5 97783+ cat conftest.$ac_ext >&5 97784+ rm -rf conftest* 97785+ eval "ac_cv_func_$ac_func=no" 97786+fi 97787+rm -f conftest* 97788+fi 97789 97790+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 97791+ echo "$ac_t""yes" 1>&6 97792+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 97793+ cat >> confdefs.h <<EOF 97794+#define $ac_tr_func 1 97795+EOF 97796+ 97797+else 97798+ echo "$ac_t""no" 1>&6 97799 fi 97800 done 97801 97802- 97803+ 97804 ext_builddir=ext/pcntl 97805 ext_srcdir=$abs_srcdir/ext/pcntl 97806 97807@@ -85059,15 +65518,15 @@ 97808 97809 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then 97810 PHP_PCNTL_SHARED=no 97811- 97812- 97813+ 97814+ 97815 case ext/pcntl in 97816 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97817 /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97818 *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97819 esac 97820- 97821- 97822+ 97823+ 97824 97825 b_c_pre=$php_c_pre 97826 b_cxx_pre=$php_cxx_pre 97827@@ -85080,12 +65539,12 @@ 97828 97829 old_IFS=$IFS 97830 for ac_src in pcntl.c php_signal.c; do 97831- 97832+ 97833 IFS=. 97834 set $ac_src 97835 ac_obj=$1 97836 IFS=$old_IFS 97837- 97838+ 97839 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 97840 97841 case $ac_src in 97842@@ -85109,14 +65568,14 @@ 97843 else 97844 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 97845 PHP_PCNTL_SHARED=yes 97846- 97847+ 97848 case ext/pcntl in 97849 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97850 /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97851 *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97852 esac 97853- 97854- 97855+ 97856+ 97857 97858 b_c_pre=$shared_c_pre 97859 b_cxx_pre=$shared_cxx_pre 97860@@ -85129,12 +65588,12 @@ 97861 97862 old_IFS=$IFS 97863 for ac_src in pcntl.c php_signal.c; do 97864- 97865+ 97866 IFS=. 97867 set $ac_src 97868 ac_obj=$1 97869 IFS=$old_IFS 97870- 97871+ 97872 shared_objects_pcntl="$shared_objects_pcntl $ac_bdir$ac_obj.lo" 97873 97874 case $ac_src in 97875@@ -85152,7 +65611,7 @@ 97876 97877 case $host_alias in 97878 *netware*) 97879- 97880+ 97881 install_modules="install-modules" 97882 97883 case $host_alias in 97884@@ -85162,7 +65621,7 @@ 97885 ;; 97886 *netware*) 97887 suffix=nlm 97888- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(PCNTL_SHARED_LIBADD)' 97889+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPCNTL, 3)_SHARED_LIBADD)' 97890 ;; 97891 *) 97892 suffix=la 97893@@ -85175,7 +65634,7 @@ 97894 else 97895 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppcntl.$suffix" 97896 fi 97897- 97898+ 97899 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl" 97900 97901 cat >>Makefile.objects<<EOF 97902@@ -85189,7 +65648,7 @@ 97903 97904 ;; 97905 *) 97906- 97907+ 97908 install_modules="install-modules" 97909 97910 case $host_alias in 97911@@ -85199,7 +65658,7 @@ 97912 ;; 97913 *netware*) 97914 suffix=nlm 97915- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(TL_SHARED_LIBADD)' 97916+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pcntl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PCNTL, 3)_SHARED_LIBADD)' 97917 ;; 97918 *) 97919 suffix=la 97920@@ -85212,7 +65671,7 @@ 97921 else 97922 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pcntl.$suffix" 97923 fi 97924- 97925+ 97926 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pcntl" 97927 97928 cat >>Makefile.objects<<EOF 97929@@ -85226,10 +65685,9 @@ 97930 97931 ;; 97932 esac 97933- 97934-cat >>confdefs.h <<_ACEOF 97935+ cat >> confdefs.h <<EOF 97936 #define COMPILE_DL_PCNTL 1 97937-_ACEOF 97938+EOF 97939 97940 fi 97941 fi 97942@@ -85238,15 +65696,15 @@ 97943 PHP_PCNTL_SHARED=no 97944 case "$PHP_SAPI" in 97945 cgi|embed) 97946- 97947- 97948+ 97949+ 97950 case ext/pcntl in 97951 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97952 /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97953 *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97954 esac 97955- 97956- 97957+ 97958+ 97959 97960 b_c_pre=$php_c_pre 97961 b_cxx_pre=$php_cxx_pre 97962@@ -85259,12 +65717,12 @@ 97963 97964 old_IFS=$IFS 97965 for ac_src in pcntl.c php_signal.c; do 97966- 97967+ 97968 IFS=. 97969 set $ac_src 97970 ac_obj=$1 97971 IFS=$old_IFS 97972- 97973+ 97974 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 97975 97976 case $ac_src in 97977@@ -85284,15 +65742,15 @@ 97978 EXT_STATIC="$EXT_STATIC pcntl" 97979 ;; 97980 *) 97981- 97982- 97983+ 97984+ 97985 case ext/pcntl in 97986 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 97987 /*) ac_srcdir=`echo "ext/pcntl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 97988 *) ac_srcdir="$abs_srcdir/ext/pcntl/"; ac_bdir="ext/pcntl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 97989 esac 97990- 97991- 97992+ 97993+ 97994 97995 b_c_pre=$php_c_pre 97996 b_cxx_pre=$php_cxx_pre 97997@@ -85305,13 +65763,13 @@ 97998 97999 old_IFS=$IFS 98000 for ac_src in pcntl.c php_signal.c; do 98001- 98002+ 98003 IFS=. 98004 set $ac_src 98005 ac_obj=$1 98006 IFS=$old_IFS 98007- 98008- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 98009+ 98010+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98011 98012 case $ac_src in 98013 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 98014@@ -85331,15 +65789,15 @@ 98015 esac 98016 EXT_CLI_STATIC="$EXT_CLI_STATIC pcntl" 98017 fi 98018- 98019- 98020+ 98021+ 98022 BUILD_DIR="$BUILD_DIR $ext_builddir" 98023- 98024+ 98025 98026 98027 if test "$ext_builddir" = "."; then 98028 PHP_PECL_EXTENSION=pcntl 98029- 98030+ 98031 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 98032 98033 fi 98034@@ -85352,18 +65810,19 @@ 98035 98036 php_enable_pdo=yes 98037 98038-echo "$as_me:$LINENO: checking whether to enable PDO support" >&5 98039-echo $ECHO_N "checking whether to enable PDO support... $ECHO_C" >&6 98040+echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 98041+echo "configure:65815: checking whether to enable PDO support" >&5 98042 # Check whether --enable-pdo or --disable-pdo was given. 98043 if test "${enable_pdo+set}" = set; then 98044 enableval="$enable_pdo" 98045 PHP_PDO=$enableval 98046 else 98047- 98048+ 98049 PHP_PDO=yes 98050 test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL 98051 98052-fi; 98053+fi 98054+ 98055 98056 98057 ext_output="yes, shared" 98058@@ -85387,8 +65846,7 @@ 98059 98060 98061 98062-echo "$as_me:$LINENO: result: $ext_output" >&5 98063-echo "${ECHO_T}$ext_output" >&6 98064+echo "$ac_t""$ext_output" 1>&6 98065 98066 98067 98068@@ -85397,7 +65855,7 @@ 98069 98070 PHP_PDO=yes 98071 98072- 98073+ 98074 pdo_running_under_pear=0 98075 case `pwd` in 98076 /var/tmp/pear-build-*) 98077@@ -85409,17 +65867,7 @@ 98078 # we're running in an environment that smells like pear, 98079 # and the PHP_PEAR_VERSION env var is not set. That implies 98080 # that we're running under a slightly broken pear installer 98081- { { echo "$as_me:$LINENO: error: 98082-PDO requires that you upgrade your PEAR installer tools. Please 98083-do so now by running: 98084- 98085- % sudo pear upgrade pear 98086- 98087-or by manually downloading and installing PEAR version 1.3.5 or higher. 98088- 98089-Once you've upgraded, please re-try your PDO install. 98090- " >&5 98091-echo "$as_me: error: 98092+ { echo "configure: error: 98093 PDO requires that you upgrade your PEAR installer tools. Please 98094 do so now by running: 98095 98096@@ -85428,34 +65876,25 @@ 98097 or by manually downloading and installing PEAR version 1.3.5 or higher. 98098 98099 Once you've upgraded, please re-try your PDO install. 98100- " >&2;} 98101- { (exit 1); exit 1; }; } 98102+ " 1>&2; exit 1; } 98103 fi 98104 98105 98106 if test "$ext_shared" = "yes" ; then 98107 case $host_alias in 98108 *darwin*) 98109- { { echo "$as_me:$LINENO: error: 98110-Due to the way that loadable modules work on OSX/Darwin, you need to 98111-compile the PDO package statically into the PHP core. 98112- 98113-Please follow the instructions at: http://netevil.org/node.php?nid=202 98114-for more detail on this issue. 98115- " >&5 98116-echo "$as_me: error: 98117+ { echo "configure: error: 98118 Due to the way that loadable modules work on OSX/Darwin, you need to 98119 compile the PDO package statically into the PHP core. 98120 98121 Please follow the instructions at: http://netevil.org/node.php?nid=202 98122 for more detail on this issue. 98123- " >&2;} 98124- { (exit 1); exit 1; }; } 98125+ " 1>&2; exit 1; } 98126 ext_shared=no 98127 ;; 98128 esac 98129 fi 98130- 98131+ 98132 ext_builddir=ext/pdo 98133 ext_srcdir=$abs_srcdir/ext/pdo 98134 98135@@ -85463,15 +65902,15 @@ 98136 98137 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 98138 PHP_PDO_SHARED=no 98139- 98140- 98141+ 98142+ 98143 case ext/pdo in 98144 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98145 /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98146 *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98147 esac 98148- 98149- 98150+ 98151+ 98152 98153 b_c_pre=$php_c_pre 98154 b_cxx_pre=$php_cxx_pre 98155@@ -85484,12 +65923,12 @@ 98156 98157 old_IFS=$IFS 98158 for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do 98159- 98160+ 98161 IFS=. 98162 set $ac_src 98163 ac_obj=$1 98164 IFS=$old_IFS 98165- 98166+ 98167 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98168 98169 case $ac_src in 98170@@ -85513,14 +65952,14 @@ 98171 else 98172 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 98173 PHP_PDO_SHARED=yes 98174- 98175+ 98176 case ext/pdo in 98177 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98178 /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98179 *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98180 esac 98181- 98182- 98183+ 98184+ 98185 98186 b_c_pre=$shared_c_pre 98187 b_cxx_pre=$shared_cxx_pre 98188@@ -85533,12 +65972,12 @@ 98189 98190 old_IFS=$IFS 98191 for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do 98192- 98193+ 98194 IFS=. 98195 set $ac_src 98196 ac_obj=$1 98197 IFS=$old_IFS 98198- 98199+ 98200 shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo" 98201 98202 case $ac_src in 98203@@ -85556,7 +65995,7 @@ 98204 98205 case $host_alias in 98206 *netware*) 98207- 98208+ 98209 install_modules="install-modules" 98210 98211 case $host_alias in 98212@@ -85566,7 +66005,7 @@ 98213 ;; 98214 *netware*) 98215 suffix=nlm 98216- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(PDO_SHARED_LIBADD)' 98217+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO, 3)_SHARED_LIBADD)' 98218 ;; 98219 *) 98220 suffix=la 98221@@ -85579,7 +66018,7 @@ 98222 else 98223 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo.$suffix" 98224 fi 98225- 98226+ 98227 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo" 98228 98229 cat >>Makefile.objects<<EOF 98230@@ -85593,7 +66032,7 @@ 98231 98232 ;; 98233 *) 98234- 98235+ 98236 install_modules="install-modules" 98237 98238 case $host_alias in 98239@@ -85603,7 +66042,7 @@ 98240 ;; 98241 *netware*) 98242 suffix=nlm 98243- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 98244+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO, 3)_SHARED_LIBADD)' 98245 ;; 98246 *) 98247 suffix=la 98248@@ -85616,7 +66055,7 @@ 98249 else 98250 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix" 98251 fi 98252- 98253+ 98254 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo" 98255 98256 cat >>Makefile.objects<<EOF 98257@@ -85630,10 +66069,9 @@ 98258 98259 ;; 98260 esac 98261- 98262-cat >>confdefs.h <<_ACEOF 98263+ cat >> confdefs.h <<EOF 98264 #define COMPILE_DL_PDO 1 98265-_ACEOF 98266+EOF 98267 98268 fi 98269 fi 98270@@ -85642,15 +66080,15 @@ 98271 PHP_PDO_SHARED=no 98272 case "$PHP_SAPI" in 98273 cgi|embed) 98274- 98275- 98276+ 98277+ 98278 case ext/pdo in 98279 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98280 /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98281 *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98282 esac 98283- 98284- 98285+ 98286+ 98287 98288 b_c_pre=$php_c_pre 98289 b_cxx_pre=$php_cxx_pre 98290@@ -85663,12 +66101,12 @@ 98291 98292 old_IFS=$IFS 98293 for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do 98294- 98295+ 98296 IFS=. 98297 set $ac_src 98298 ac_obj=$1 98299 IFS=$old_IFS 98300- 98301+ 98302 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98303 98304 case $ac_src in 98305@@ -85688,15 +66126,15 @@ 98306 EXT_STATIC="$EXT_STATIC pdo" 98307 ;; 98308 *) 98309- 98310- 98311+ 98312+ 98313 case ext/pdo in 98314 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98315 /*) ac_srcdir=`echo "ext/pdo"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98316 *) ac_srcdir="$abs_srcdir/ext/pdo/"; ac_bdir="ext/pdo/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98317 esac 98318- 98319- 98320+ 98321+ 98322 98323 b_c_pre=$php_c_pre 98324 b_cxx_pre=$php_cxx_pre 98325@@ -85709,13 +66147,13 @@ 98326 98327 old_IFS=$IFS 98328 for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do 98329- 98330+ 98331 IFS=. 98332 set $ac_src 98333 ac_obj=$1 98334 IFS=$old_IFS 98335- 98336- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 98337+ 98338+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98339 98340 case $ac_src in 98341 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 98342@@ -85735,77 +66173,65 @@ 98343 esac 98344 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo" 98345 fi 98346- 98347- 98348+ 98349+ 98350 BUILD_DIR="$BUILD_DIR $ext_builddir" 98351- 98352+ 98353 98354 98355 if test "$ext_builddir" = "."; then 98356 PHP_PECL_EXTENSION=pdo 98357- 98358+ 98359 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 98360 98361 fi 98362 98363- 98364- 98365+ 98366+ 98367 am_i_shared=$PHP_PDO_SHARED 98368 is_it_shared=$PHP_SPL_SHARED 98369 is_it_enabled=$PHP_SPL 98370 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 98371- { { echo "$as_me:$LINENO: error: 98372+ { echo "configure: error: 98373 You've configured extension pdo to build statically, but it 98374 depends on extension spl, which you've configured to build shared. 98375 You either need to build pdo shared or build spl statically for the 98376 build to be successful. 98377-" >&5 98378-echo "$as_me: error: 98379-You've configured extension pdo to build statically, but it 98380-depends on extension spl, which you've configured to build shared. 98381-You either need to build pdo shared or build spl statically for the 98382-build to be successful. 98383-" >&2;} 98384- { (exit 1); exit 1; }; } 98385+" 1>&2; exit 1; } 98386 fi 98387 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 98388- { { echo "$as_me:$LINENO: error: 98389+ { echo "configure: error: 98390 You've configured extension pdo, which depends on extension spl, 98391 but you've either not enabled spl, or have disabled it. 98392-" >&5 98393-echo "$as_me: error: 98394-You've configured extension pdo, which depends on extension spl, 98395-but you've either not enabled spl, or have disabled it. 98396-" >&2;} 98397- { (exit 1); exit 1; }; } 98398+" 1>&2; exit 1; } 98399 fi 98400- 98401- 98402- 98403- 98404- 98405- 98406+ 98407+ 98408+ 98409+ 98410+ 98411+ 98412 header_path=ext/pdo 98413 for header_file in php_pdo.h php_pdo_driver.h; do 98414 hp_hf="$header_path/$header_file" 98415- 98416- 98417+ 98418+ 98419 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 98420- 98421+ 98422 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 98423 if test -n "$unique" && test "`eval $cmd`" = "" ; then 98424 eval "INSTALLHEADERS$unique=set" 98425- 98426+ 98427 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 98428- 98429+ 98430 fi 98431 98432- done 98433- 98434- 98435- 98436+ done 98437+ 98438 98439+ 98440 98441+ 98442 src=$ext_srcdir/Makefile.frag 98443 ac_srcdir=$ext_srcdir 98444 ac_builddir=$ext_builddir 98445@@ -85818,19 +66244,19 @@ 98446 98447 php_with_pdo_dblib=no 98448 98449-echo "$as_me:$LINENO: checking for PDO_DBLIB support via FreeTDS" >&5 98450-echo $ECHO_N "checking for PDO_DBLIB support via FreeTDS... $ECHO_C" >&6 98451- 98452+echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 98453+echo "configure:66249: checking for PDO_DBLIB support via FreeTDS" >&5 98454 # Check whether --with-pdo-dblib or --without-pdo-dblib was given. 98455 if test "${with_pdo_dblib+set}" = set; then 98456 withval="$with_pdo_dblib" 98457 PHP_PDO_DBLIB=$withval 98458 else 98459- 98460+ 98461 PHP_PDO_DBLIB=no 98462 test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL 98463 98464-fi; 98465+fi 98466+ 98467 98468 98469 ext_output="yes, shared" 98470@@ -85854,8 +66280,7 @@ 98471 98472 98473 98474-echo "$as_me:$LINENO: result: $ext_output" >&5 98475-echo "${ECHO_T}$ext_output" >&6 98476+echo "$ac_t""$ext_output" 1>&6 98477 98478 98479 98480@@ -85863,9 +66288,7 @@ 98481 if test "$PHP_PDO_DBLIB" != "no"; then 98482 98483 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 98484- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 98485-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 98486- { (exit 1); exit 1; }; } 98487+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 98488 fi 98489 98490 if test "$PHP_PDO_DBLIB" = "yes"; then 98491@@ -85883,9 +66306,7 @@ 98492 done 98493 98494 if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then 98495- { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5 98496-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;} 98497- { (exit 1); exit 1; }; } 98498+ { echo "configure: error: Cannot find FreeTDS in known installation directories" 1>&2; exit 1; } 98499 fi 98500 98501 elif test "$PHP_PDO_DBLIB" != "no"; then 98502@@ -85897,141 +66318,137 @@ 98503 PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB 98504 PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds 98505 else 98506- { { echo "$as_me:$LINENO: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&5 98507-echo "$as_me: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&2;} 98508- { (exit 1); exit 1; }; } 98509+ { echo "configure: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" 1>&2; exit 1; } 98510 fi 98511- fi 98512+ fi 98513 98514 if test "x$PHP_LIBDIR" = "x" ; then 98515 PHP_LIBDIR=lib 98516 fi 98517 98518 if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then 98519- { { echo "$as_me:$LINENO: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5 98520-echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;} 98521- { (exit 1); exit 1; }; } 98522+ { echo "configure: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" 1>&2; exit 1; } 98523 fi 98524 98525- 98526+ 98527 if test "$PDO_FREETDS_INCLUDE_DIR" != "/usr/include"; then 98528- 98529+ 98530 if test -z "$PDO_FREETDS_INCLUDE_DIR" || echo "$PDO_FREETDS_INCLUDE_DIR" | grep '^/' >/dev/null ; then 98531 ai_p=$PDO_FREETDS_INCLUDE_DIR 98532 else 98533- 98534+ 98535 ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 98536- 98537+ 98538 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 98539 ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`" 98540 fi 98541 98542- 98543- 98544+ 98545+ 98546 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 98547- 98548+ 98549 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 98550 if test -n "$unique" && test "`eval $cmd`" = "" ; then 98551 eval "INCLUDEPATH$unique=set" 98552- 98553+ 98554 if test ""; then 98555 INCLUDES="-I$ai_p $INCLUDES" 98556 else 98557 INCLUDES="$INCLUDES -I$ai_p" 98558 fi 98559- 98560+ 98561 fi 98562 98563 fi 98564 98565- 98566+ 98567 98568 if test "$ext_shared" = "yes"; then 98569 PDO_DBLIB_SHARED_LIBADD="-lsybdb $PDO_DBLIB_SHARED_LIBADD" 98570 if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then 98571- 98572+ 98573 if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then 98574- 98575+ 98576 if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 98577 ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR 98578 else 98579- 98580+ 98581 ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 98582- 98583+ 98584 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 98585 ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" 98586 fi 98587 98588- 98589+ 98590 if test "$ext_shared" = "yes"; then 98591 PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD" 98592 test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD" 98593 else 98594- 98595- 98596- 98597+ 98598+ 98599+ 98600 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 98601- 98602+ 98603 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 98604 if test -n "$unique" && test "`eval $cmd`" = "" ; then 98605 eval "LIBPATH$unique=set" 98606- 98607+ 98608 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 98609 LDFLAGS="$LDFLAGS -L$ai_p" 98610 PHP_RPATHS="$PHP_RPATHS $ai_p" 98611- 98612+ 98613 fi 98614 98615 98616 fi 98617- 98618+ 98619 fi 98620 98621 fi 98622 else 98623- 98624+ 98625 98626 if test -n "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"; then 98627- 98628+ 98629 if test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" != "/usr/lib"; then 98630- 98631+ 98632 if test -z "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" || echo "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 98633 ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR 98634 else 98635- 98636+ 98637 ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 98638- 98639+ 98640 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 98641 ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`" 98642 fi 98643 98644- 98645- 98646- 98647- 98648+ 98649+ 98650+ 98651+ 98652 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 98653- 98654+ 98655 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 98656 if test -n "$unique" && test "`eval $cmd`" = "" ; then 98657 eval "LIBPATH$unique=set" 98658- 98659+ 98660 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 98661 LDFLAGS="$LDFLAGS -L$ai_p" 98662 PHP_RPATHS="$PHP_RPATHS $ai_p" 98663- 98664+ 98665 fi 98666 98667 98668- 98669+ 98670 fi 98671 98672 fi 98673- 98674- 98675+ 98676+ 98677 case sybdb in 98678 c|c_r|pthread*) ;; 98679- *) 98680- LIBS="-lsybdb $LIBS" 98681+ *) 98682+ LIBS="-lsybdb $LIBS" 98683 ;; 98684 esac 98685 98686@@ -86042,16 +66459,16 @@ 98687 98688 98689 98690- 98691- 98692- echo "$as_me:$LINENO: checking for PDO includes" >&5 98693-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 98694-if test "${pdo_inc_path+set}" = set; then 98695- echo $ECHO_N "(cached) $ECHO_C" >&6 98696+ 98697+ 98698+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 98699+echo "configure:66466: checking for PDO includes" >&5 98700+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 98701+ echo $ac_n "(cached) $ac_c" 1>&6 98702 else 98703- 98704- echo "$as_me:$LINENO: checking for PDO includes" >&5 98705-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 98706+ 98707+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 98708+echo "configure:66472: checking for PDO includes" >&5 98709 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 98710 pdo_inc_path=$abs_srcdir/ext 98711 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 98712@@ -86059,22 +66476,20 @@ 98713 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 98714 pdo_inc_path=$prefix/include/php/ext 98715 fi 98716- 98717+ 98718 fi 98719-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 98720-echo "${ECHO_T}$pdo_inc_path" >&6 98721+ 98722+echo "$ac_t""$pdo_inc_path" 1>&6 98723 if test -n "$pdo_inc_path"; then 98724 : 98725 else 98726-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 98727-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 98728- { (exit 1); exit 1; }; } 98729+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 98730 fi 98731 98732- 98733+ 98734 98735 PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\"" 98736- 98737+ 98738 ext_builddir=ext/pdo_dblib 98739 ext_srcdir=$abs_srcdir/ext/pdo_dblib 98740 98741@@ -86082,15 +66497,15 @@ 98742 98743 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 98744 PHP_PDO_DBLIB_SHARED=no 98745- 98746- 98747+ 98748+ 98749 case ext/pdo_dblib in 98750 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98751 /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98752 *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98753 esac 98754- 98755- 98756+ 98757+ 98758 98759 b_c_pre=$php_c_pre 98760 b_cxx_pre=$php_cxx_pre 98761@@ -86103,12 +66518,12 @@ 98762 98763 old_IFS=$IFS 98764 for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do 98765- 98766+ 98767 IFS=. 98768 set $ac_src 98769 ac_obj=$1 98770 IFS=$old_IFS 98771- 98772+ 98773 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98774 98775 case $ac_src in 98776@@ -86132,14 +66547,14 @@ 98777 else 98778 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 98779 PHP_PDO_DBLIB_SHARED=yes 98780- 98781+ 98782 case ext/pdo_dblib in 98783 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98784 /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98785 *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98786 esac 98787- 98788- 98789+ 98790+ 98791 98792 b_c_pre=$shared_c_pre 98793 b_cxx_pre=$shared_cxx_pre 98794@@ -86152,12 +66567,12 @@ 98795 98796 old_IFS=$IFS 98797 for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do 98798- 98799+ 98800 IFS=. 98801 set $ac_src 98802 ac_obj=$1 98803 IFS=$old_IFS 98804- 98805+ 98806 shared_objects_pdo_dblib="$shared_objects_pdo_dblib $ac_bdir$ac_obj.lo" 98807 98808 case $ac_src in 98809@@ -86175,7 +66590,7 @@ 98810 98811 case $host_alias in 98812 *netware*) 98813- 98814+ 98815 install_modules="install-modules" 98816 98817 case $host_alias in 98818@@ -86185,7 +66600,7 @@ 98819 ;; 98820 *netware*) 98821 suffix=nlm 98822- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(PDO_DBLIB_SHARED_LIBADD)' 98823+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_DBLIB, 3)_SHARED_LIBADD)' 98824 ;; 98825 *) 98826 suffix=la 98827@@ -86198,7 +66613,7 @@ 98828 else 98829 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_dblib.$suffix" 98830 fi 98831- 98832+ 98833 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib" 98834 98835 cat >>Makefile.objects<<EOF 98836@@ -86212,7 +66627,7 @@ 98837 98838 ;; 98839 *) 98840- 98841+ 98842 install_modules="install-modules" 98843 98844 case $host_alias in 98845@@ -86222,7 +66637,7 @@ 98846 ;; 98847 *netware*) 98848 suffix=nlm 98849- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(_DBLIB_SHARED_LIBADD)' 98850+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_dblib) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_DBLIB, 3)_SHARED_LIBADD)' 98851 ;; 98852 *) 98853 suffix=la 98854@@ -86235,7 +66650,7 @@ 98855 else 98856 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_dblib.$suffix" 98857 fi 98858- 98859+ 98860 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_dblib" 98861 98862 cat >>Makefile.objects<<EOF 98863@@ -86249,10 +66664,9 @@ 98864 98865 ;; 98866 esac 98867- 98868-cat >>confdefs.h <<_ACEOF 98869+ cat >> confdefs.h <<EOF 98870 #define COMPILE_DL_PDO_DBLIB 1 98871-_ACEOF 98872+EOF 98873 98874 fi 98875 fi 98876@@ -86261,15 +66675,15 @@ 98877 PHP_PDO_DBLIB_SHARED=no 98878 case "$PHP_SAPI" in 98879 cgi|embed) 98880- 98881- 98882+ 98883+ 98884 case ext/pdo_dblib in 98885 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98886 /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98887 *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98888 esac 98889- 98890- 98891+ 98892+ 98893 98894 b_c_pre=$php_c_pre 98895 b_cxx_pre=$php_cxx_pre 98896@@ -86282,12 +66696,12 @@ 98897 98898 old_IFS=$IFS 98899 for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do 98900- 98901+ 98902 IFS=. 98903 set $ac_src 98904 ac_obj=$1 98905 IFS=$old_IFS 98906- 98907+ 98908 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98909 98910 case $ac_src in 98911@@ -86307,15 +66721,15 @@ 98912 EXT_STATIC="$EXT_STATIC pdo_dblib" 98913 ;; 98914 *) 98915- 98916- 98917+ 98918+ 98919 case ext/pdo_dblib in 98920 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 98921 /*) ac_srcdir=`echo "ext/pdo_dblib"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 98922 *) ac_srcdir="$abs_srcdir/ext/pdo_dblib/"; ac_bdir="ext/pdo_dblib/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 98923 esac 98924- 98925- 98926+ 98927+ 98928 98929 b_c_pre=$php_c_pre 98930 b_cxx_pre=$php_cxx_pre 98931@@ -86328,13 +66742,13 @@ 98932 98933 old_IFS=$IFS 98934 for ac_src in pdo_dblib.c dblib_driver.c dblib_stmt.c; do 98935- 98936+ 98937 IFS=. 98938 set $ac_src 98939 ac_obj=$1 98940 IFS=$old_IFS 98941- 98942- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 98943+ 98944+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 98945 98946 case $ac_src in 98947 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 98948@@ -86354,172 +66768,142 @@ 98949 esac 98950 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_dblib" 98951 fi 98952- 98953- 98954+ 98955+ 98956 BUILD_DIR="$BUILD_DIR $ext_builddir" 98957- 98958+ 98959 98960 98961 if test "$ext_builddir" = "."; then 98962 PHP_PECL_EXTENSION=pdo_dblib 98963- 98964+ 98965 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 98966 98967 fi 98968 98969- echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5 98970-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6 98971-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then 98972- echo $ECHO_N "(cached) $ECHO_C" >&6 98973+ echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 98974+echo "configure:66786: checking for dnet_addr in -ldnet_stub" >&5 98975+ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` 98976+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 98977+ echo $ac_n "(cached) $ac_c" 1>&6 98978 else 98979- ac_check_lib_save_LIBS=$LIBS 98980+ ac_save_LIBS="$LIBS" 98981 LIBS="-ldnet_stub $LIBS" 98982-cat >conftest.$ac_ext <<_ACEOF 98983-/* confdefs.h. */ 98984-_ACEOF 98985-cat confdefs.h >>conftest.$ac_ext 98986-cat >>conftest.$ac_ext <<_ACEOF 98987-/* end confdefs.h. */ 98988- 98989+cat > conftest.$ac_ext <<EOF 98990+#line 66794 "configure" 98991+#include "confdefs.h" 98992 /* Override any gcc2 internal prototype to avoid an error. */ 98993-#ifdef __cplusplus 98994-extern "C" 98995-#endif 98996 /* We use char because int might match the return type of a gcc2 98997- builtin and then its argument prototype would still apply. */ 98998-char dnet_addr (); 98999-int 99000-main () 99001-{ 99002-dnet_addr (); 99003- ; 99004- return 0; 99005-} 99006-_ACEOF 99007-rm -f conftest.$ac_objext conftest$ac_exeext 99008-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 99009- (eval $ac_link) 2>conftest.er1 99010- ac_status=$? 99011- grep -v '^ *+' conftest.er1 >conftest.err 99012- rm -f conftest.er1 99013- cat conftest.err >&5 99014- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99015- (exit $ac_status); } && 99016- { ac_try='test -z "$ac_c_werror_flag" 99017- || test ! -s conftest.err' 99018- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99019- (eval $ac_try) 2>&5 99020- ac_status=$? 99021- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99022- (exit $ac_status); }; } && 99023- { ac_try='test -s conftest$ac_exeext' 99024- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99025- (eval $ac_try) 2>&5 99026- ac_status=$? 99027- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99028- (exit $ac_status); }; }; then 99029- ac_cv_lib_dnet_stub_dnet_addr=yes 99030-else 99031- echo "$as_me: failed program was:" >&5 99032-sed 's/^/| /' conftest.$ac_ext >&5 99033- 99034-ac_cv_lib_dnet_stub_dnet_addr=no 99035-fi 99036-rm -f conftest.err conftest.$ac_objext \ 99037- conftest$ac_exeext conftest.$ac_ext 99038-LIBS=$ac_check_lib_save_LIBS 99039-fi 99040-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5 99041-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6 99042-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then 99043+ builtin and then its argument prototype would still apply. */ 99044+char dnet_addr(); 99045+ 99046+int main() { 99047+dnet_addr() 99048+; return 0; } 99049+EOF 99050+if { (eval echo configure:66805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 99051+ rm -rf conftest* 99052+ eval "ac_cv_lib_$ac_lib_var=yes" 99053+else 99054+ echo "configure: failed program was:" >&5 99055+ cat conftest.$ac_ext >&5 99056+ rm -rf conftest* 99057+ eval "ac_cv_lib_$ac_lib_var=no" 99058+fi 99059+rm -f conftest* 99060+LIBS="$ac_save_LIBS" 99061 99062+fi 99063+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 99064+ echo "$ac_t""yes" 1>&6 99065+ 99066 99067 if test "$ext_shared" = "yes"; then 99068 PDO_DBLIB_SHARED_LIBADD="-ldnet_stub $PDO_DBLIB_SHARED_LIBADD" 99069 if test -n ""; then 99070- 99071+ 99072 if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then 99073- 99074+ 99075 if test -z "" || echo "" | grep '^/' >/dev/null ; then 99076 ai_p= 99077 else 99078- 99079+ 99080 ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" 99081- 99082+ 99083 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 99084 ai_p="$ep_realdir/`basename \"\"`" 99085 fi 99086 99087- 99088+ 99089 if test "$ext_shared" = "yes"; then 99090 PDO_DBLIB_SHARED_LIBADD="-L$ai_p $PDO_DBLIB_SHARED_LIBADD" 99091 test -n "$ld_runpath_switch" && PDO_DBLIB_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_DBLIB_SHARED_LIBADD" 99092 else 99093- 99094- 99095- 99096+ 99097+ 99098+ 99099 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 99100- 99101+ 99102 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 99103 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99104 eval "LIBPATH$unique=set" 99105- 99106+ 99107 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 99108 LDFLAGS="$LDFLAGS -L$ai_p" 99109 PHP_RPATHS="$PHP_RPATHS $ai_p" 99110- 99111+ 99112 fi 99113 99114 99115 fi 99116- 99117+ 99118 fi 99119 99120 fi 99121 else 99122- 99123+ 99124 99125 if test -n ""; then 99126- 99127+ 99128 if test "" != "/usr/$PHP_LIBDIR" && test "" != "/usr/lib"; then 99129- 99130+ 99131 if test -z "" || echo "" | grep '^/' >/dev/null ; then 99132 ai_p= 99133 else 99134- 99135+ 99136 ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`" 99137- 99138+ 99139 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 99140 ai_p="$ep_realdir/`basename \"\"`" 99141 fi 99142 99143- 99144- 99145- 99146- 99147+ 99148+ 99149+ 99150+ 99151 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 99152- 99153+ 99154 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 99155 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99156 eval "LIBPATH$unique=set" 99157- 99158+ 99159 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 99160 LDFLAGS="$LDFLAGS -L$ai_p" 99161 PHP_RPATHS="$PHP_RPATHS $ai_p" 99162- 99163+ 99164 fi 99165 99166 99167- 99168+ 99169 fi 99170 99171 fi 99172- 99173- 99174+ 99175+ 99176 case dnet_stub in 99177 c|c_r|pthread*) ;; 99178- *) 99179- LIBS="-ldnet_stub $LIBS" 99180+ *) 99181+ LIBS="-ldnet_stub $LIBS" 99182 ;; 99183 esac 99184 99185@@ -86529,80 +66913,67 @@ 99186 fi 99187 99188 99189- 99190-cat >>confdefs.h <<\_ACEOF 99191+ cat >> confdefs.h <<\EOF 99192 #define HAVE_LIBDNET_STUB 1 99193-_ACEOF 99194- 99195+EOF 99196 99197+ 99198+else 99199+ echo "$ac_t""no" 1>&6 99200 fi 99201 99202- 99203-cat >>confdefs.h <<\_ACEOF 99204+ cat >> confdefs.h <<\EOF 99205 #define HAVE_PDO_DBLIB 1 99206-_ACEOF 99207- 99208+EOF 99209 99210-cat >>confdefs.h <<\_ACEOF 99211+ cat >> confdefs.h <<\EOF 99212 #define HAVE_FREETDS 1 99213-_ACEOF 99214- 99215+EOF 99216 99217+ 99218 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD" 99219 99220 99221- 99222- 99223+ 99224+ 99225 am_i_shared=$PHP_PDO_DBLIB_SHARED 99226 is_it_shared=$PHP_PDO_SHARED 99227 is_it_enabled=$PHP_PDO 99228 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 99229- { { echo "$as_me:$LINENO: error: 99230-You've configured extension pdo_dblib to build statically, but it 99231-depends on extension pdo, which you've configured to build shared. 99232-You either need to build pdo_dblib shared or build pdo statically for the 99233-build to be successful. 99234-" >&5 99235-echo "$as_me: error: 99236+ { echo "configure: error: 99237 You've configured extension pdo_dblib to build statically, but it 99238 depends on extension pdo, which you've configured to build shared. 99239 You either need to build pdo_dblib shared or build pdo statically for the 99240 build to be successful. 99241-" >&2;} 99242- { (exit 1); exit 1; }; } 99243+" 1>&2; exit 1; } 99244 fi 99245 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 99246- { { echo "$as_me:$LINENO: error: 99247-You've configured extension pdo_dblib, which depends on extension pdo, 99248-but you've either not enabled pdo, or have disabled it. 99249-" >&5 99250-echo "$as_me: error: 99251+ { echo "configure: error: 99252 You've configured extension pdo_dblib, which depends on extension pdo, 99253 but you've either not enabled pdo, or have disabled it. 99254-" >&2;} 99255- { (exit 1); exit 1; }; } 99256+" 1>&2; exit 1; } 99257 fi 99258- 99259- 99260+ 99261+ 99262 fi 99263 99264 99265 99266 php_with_pdo_firebird=no 99267 99268-echo "$as_me:$LINENO: checking for Firebird support for PDO" >&5 99269-echo $ECHO_N "checking for Firebird support for PDO... $ECHO_C" >&6 99270- 99271+echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 99272+echo "configure:66966: checking for Firebird support for PDO" >&5 99273 # Check whether --with-pdo-firebird or --without-pdo-firebird was given. 99274 if test "${with_pdo_firebird+set}" = set; then 99275 withval="$with_pdo_firebird" 99276 PHP_PDO_FIREBIRD=$withval 99277 else 99278- 99279+ 99280 PHP_PDO_FIREBIRD=no 99281 test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL 99282 99283-fi; 99284+fi 99285+ 99286 99287 99288 ext_output="yes, shared" 99289@@ -86626,8 +66997,7 @@ 99290 99291 99292 99293-echo "$as_me:$LINENO: result: $ext_output" >&5 99294-echo "${ECHO_T}$ext_output" >&6 99295+echo "$ac_t""$ext_output" 1>&6 99296 99297 99298 99299@@ -86635,9 +67005,7 @@ 99300 if test "$PHP_PDO_FIREBIRD" != "no"; then 99301 99302 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 99303- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 99304-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 99305- { (exit 1); exit 1; }; } 99306+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 99307 fi 99308 99309 if test "$PHP_PDO_FIREBIRD" = "yes"; then 99310@@ -86650,25 +67018,25 @@ 99311 FIREBIRD_LIBDIR_FLAG=-L$FIREBIRD_LIBDIR 99312 fi 99313 99314- 99315+ 99316 save_old_LDFLAGS=$LDFLAGS 99317 ac_stuff=" 99318 $FIREBIRD_LIBDIR_FLAG 99319 " 99320- 99321+ 99322 save_ext_shared=$ext_shared 99323 ext_shared=yes 99324- 99325+ 99326 for ac_i in $ac_stuff; do 99327 case $ac_i in 99328 -pthread) 99329 if test "$ext_shared" = "yes"; then 99330 LDFLAGS="$LDFLAGS -pthread" 99331 else 99332- 99333- 99334+ 99335+ 99336 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 99337- 99338+ 99339 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 99340 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99341 eval "EXTRA_LDFLAGS$unique=set" 99342@@ -86679,20 +67047,20 @@ 99343 ;; 99344 -l*) 99345 ac_ii=`echo $ac_i|cut -c 3-` 99346- 99347- 99348+ 99349+ 99350 case $ac_ii in 99351 c|c_r|pthread*) ;; 99352- *) 99353+ *) 99354 if test "$ext_shared" = "yes"; then 99355- LDFLAGS="$LDFLAGS -l$ac_ii" 99356+ LDFLAGS="$LDFLAGS -l$ac_ii" 99357 else 99358- 99359- 99360+ 99361+ 99362 case $ac_ii in 99363 c|c_r|pthread*) ;; 99364- *) 99365- LIBS="$LIBS -l$ac_ii" 99366+ *) 99367+ LIBS="$LIBS -l$ac_ii" 99368 ;; 99369 esac 99370 99371@@ -86705,145 +67073,116 @@ 99372 ;; 99373 -L*) 99374 ac_ii=`echo $ac_i|cut -c 3-` 99375- 99376+ 99377 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 99378- 99379+ 99380 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 99381 ai_p=$ac_ii 99382 else 99383- 99384+ 99385 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 99386- 99387+ 99388 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 99389 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 99390 fi 99391 99392- 99393+ 99394 if test "$ext_shared" = "yes"; then 99395 LDFLAGS="-L$ai_p $LDFLAGS" 99396 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 99397 else 99398- 99399- 99400- 99401+ 99402+ 99403+ 99404 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 99405- 99406+ 99407 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 99408 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99409 eval "LIBPATH$unique=set" 99410- 99411+ 99412 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 99413 LDFLAGS="$LDFLAGS -L$ai_p" 99414 PHP_RPATHS="$PHP_RPATHS $ai_p" 99415- 99416+ 99417 fi 99418 99419 99420 fi 99421- 99422+ 99423 fi 99424 99425 ;; 99426 esac 99427 done 99428 99429- echo "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5 99430-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6 99431-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then 99432- echo $ECHO_N "(cached) $ECHO_C" >&6 99433+ echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 99434+echo "configure:67120: checking for isc_detach_database in -lfbclient" >&5 99435+ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` 99436+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 99437+ echo $ac_n "(cached) $ac_c" 1>&6 99438 else 99439- ac_check_lib_save_LIBS=$LIBS 99440+ ac_save_LIBS="$LIBS" 99441 LIBS="-lfbclient $LIBS" 99442-cat >conftest.$ac_ext <<_ACEOF 99443-/* confdefs.h. */ 99444-_ACEOF 99445-cat confdefs.h >>conftest.$ac_ext 99446-cat >>conftest.$ac_ext <<_ACEOF 99447-/* end confdefs.h. */ 99448- 99449+cat > conftest.$ac_ext <<EOF 99450+#line 67128 "configure" 99451+#include "confdefs.h" 99452 /* Override any gcc2 internal prototype to avoid an error. */ 99453-#ifdef __cplusplus 99454-extern "C" 99455-#endif 99456 /* We use char because int might match the return type of a gcc2 99457- builtin and then its argument prototype would still apply. */ 99458-char isc_detach_database (); 99459-int 99460-main () 99461-{ 99462-isc_detach_database (); 99463- ; 99464- return 0; 99465-} 99466-_ACEOF 99467-rm -f conftest.$ac_objext conftest$ac_exeext 99468-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 99469- (eval $ac_link) 2>conftest.er1 99470- ac_status=$? 99471- grep -v '^ *+' conftest.er1 >conftest.err 99472- rm -f conftest.er1 99473- cat conftest.err >&5 99474- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99475- (exit $ac_status); } && 99476- { ac_try='test -z "$ac_c_werror_flag" 99477- || test ! -s conftest.err' 99478- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99479- (eval $ac_try) 2>&5 99480- ac_status=$? 99481- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99482- (exit $ac_status); }; } && 99483- { ac_try='test -s conftest$ac_exeext' 99484- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99485- (eval $ac_try) 2>&5 99486- ac_status=$? 99487- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99488- (exit $ac_status); }; }; then 99489- ac_cv_lib_fbclient_isc_detach_database=yes 99490-else 99491- echo "$as_me: failed program was:" >&5 99492-sed 's/^/| /' conftest.$ac_ext >&5 99493- 99494-ac_cv_lib_fbclient_isc_detach_database=no 99495-fi 99496-rm -f conftest.err conftest.$ac_objext \ 99497- conftest$ac_exeext conftest.$ac_ext 99498-LIBS=$ac_check_lib_save_LIBS 99499-fi 99500-echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5 99501-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6 99502-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then 99503+ builtin and then its argument prototype would still apply. */ 99504+char isc_detach_database(); 99505+ 99506+int main() { 99507+isc_detach_database() 99508+; return 0; } 99509+EOF 99510+if { (eval echo configure:67139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 99511+ rm -rf conftest* 99512+ eval "ac_cv_lib_$ac_lib_var=yes" 99513+else 99514+ echo "configure: failed program was:" >&5 99515+ cat conftest.$ac_ext >&5 99516+ rm -rf conftest* 99517+ eval "ac_cv_lib_$ac_lib_var=no" 99518+fi 99519+rm -f conftest* 99520+LIBS="$ac_save_LIBS" 99521 99522+fi 99523+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 99524+ echo "$ac_t""yes" 1>&6 99525+ 99526 LDFLAGS=$save_old_LDFLAGS 99527 ext_shared=$save_ext_shared 99528- 99529+ 99530 FIREBIRD_LIBNAME=fbclient 99531- 99532- 99533+ 99534+ 99535 else 99536+ echo "$ac_t""no" 1>&6 99537 99538 LDFLAGS=$save_old_LDFLAGS 99539 ext_shared=$save_ext_shared 99540 unset ac_cv_lib_fbclient_isc_detach_database 99541- 99542- 99543+ 99544+ 99545 save_old_LDFLAGS=$LDFLAGS 99546 ac_stuff=" 99547 $FIREBIRD_LIBDIR_FLAG 99548 " 99549- 99550+ 99551 save_ext_shared=$ext_shared 99552 ext_shared=yes 99553- 99554+ 99555 for ac_i in $ac_stuff; do 99556 case $ac_i in 99557 -pthread) 99558 if test "$ext_shared" = "yes"; then 99559 LDFLAGS="$LDFLAGS -pthread" 99560 else 99561- 99562- 99563+ 99564+ 99565 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 99566- 99567+ 99568 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 99569 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99570 eval "EXTRA_LDFLAGS$unique=set" 99571@@ -86854,20 +67193,20 @@ 99572 ;; 99573 -l*) 99574 ac_ii=`echo $ac_i|cut -c 3-` 99575- 99576- 99577+ 99578+ 99579 case $ac_ii in 99580 c|c_r|pthread*) ;; 99581- *) 99582+ *) 99583 if test "$ext_shared" = "yes"; then 99584- LDFLAGS="$LDFLAGS -l$ac_ii" 99585+ LDFLAGS="$LDFLAGS -l$ac_ii" 99586 else 99587- 99588- 99589+ 99590+ 99591 case $ac_ii in 99592 c|c_r|pthread*) ;; 99593- *) 99594- LIBS="$LIBS -l$ac_ii" 99595+ *) 99596+ LIBS="$LIBS -l$ac_ii" 99597 ;; 99598 esac 99599 99600@@ -86880,145 +67219,116 @@ 99601 ;; 99602 -L*) 99603 ac_ii=`echo $ac_i|cut -c 3-` 99604- 99605+ 99606 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 99607- 99608+ 99609 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 99610 ai_p=$ac_ii 99611 else 99612- 99613+ 99614 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 99615- 99616+ 99617 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 99618 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 99619 fi 99620 99621- 99622+ 99623 if test "$ext_shared" = "yes"; then 99624 LDFLAGS="-L$ai_p $LDFLAGS" 99625 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 99626 else 99627- 99628- 99629- 99630+ 99631+ 99632+ 99633 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 99634- 99635+ 99636 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 99637 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99638 eval "LIBPATH$unique=set" 99639- 99640+ 99641 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 99642 LDFLAGS="$LDFLAGS -L$ai_p" 99643 PHP_RPATHS="$PHP_RPATHS $ai_p" 99644- 99645+ 99646 fi 99647 99648 99649 fi 99650- 99651+ 99652 fi 99653 99654 ;; 99655 esac 99656 done 99657 99658- echo "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5 99659-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6 99660-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then 99661- echo $ECHO_N "(cached) $ECHO_C" >&6 99662+ echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 99663+echo "configure:67266: checking for isc_detach_database in -lgds" >&5 99664+ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` 99665+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 99666+ echo $ac_n "(cached) $ac_c" 1>&6 99667 else 99668- ac_check_lib_save_LIBS=$LIBS 99669+ ac_save_LIBS="$LIBS" 99670 LIBS="-lgds $LIBS" 99671-cat >conftest.$ac_ext <<_ACEOF 99672-/* confdefs.h. */ 99673-_ACEOF 99674-cat confdefs.h >>conftest.$ac_ext 99675-cat >>conftest.$ac_ext <<_ACEOF 99676-/* end confdefs.h. */ 99677- 99678+cat > conftest.$ac_ext <<EOF 99679+#line 67274 "configure" 99680+#include "confdefs.h" 99681 /* Override any gcc2 internal prototype to avoid an error. */ 99682-#ifdef __cplusplus 99683-extern "C" 99684-#endif 99685 /* We use char because int might match the return type of a gcc2 99686- builtin and then its argument prototype would still apply. */ 99687-char isc_detach_database (); 99688-int 99689-main () 99690-{ 99691-isc_detach_database (); 99692- ; 99693- return 0; 99694-} 99695-_ACEOF 99696-rm -f conftest.$ac_objext conftest$ac_exeext 99697-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 99698- (eval $ac_link) 2>conftest.er1 99699- ac_status=$? 99700- grep -v '^ *+' conftest.er1 >conftest.err 99701- rm -f conftest.er1 99702- cat conftest.err >&5 99703- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99704- (exit $ac_status); } && 99705- { ac_try='test -z "$ac_c_werror_flag" 99706- || test ! -s conftest.err' 99707- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99708- (eval $ac_try) 2>&5 99709- ac_status=$? 99710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99711- (exit $ac_status); }; } && 99712- { ac_try='test -s conftest$ac_exeext' 99713- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99714- (eval $ac_try) 2>&5 99715- ac_status=$? 99716- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99717- (exit $ac_status); }; }; then 99718- ac_cv_lib_gds_isc_detach_database=yes 99719-else 99720- echo "$as_me: failed program was:" >&5 99721-sed 's/^/| /' conftest.$ac_ext >&5 99722- 99723-ac_cv_lib_gds_isc_detach_database=no 99724-fi 99725-rm -f conftest.err conftest.$ac_objext \ 99726- conftest$ac_exeext conftest.$ac_ext 99727-LIBS=$ac_check_lib_save_LIBS 99728-fi 99729-echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5 99730-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6 99731-if test $ac_cv_lib_gds_isc_detach_database = yes; then 99732+ builtin and then its argument prototype would still apply. */ 99733+char isc_detach_database(); 99734+ 99735+int main() { 99736+isc_detach_database() 99737+; return 0; } 99738+EOF 99739+if { (eval echo configure:67285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 99740+ rm -rf conftest* 99741+ eval "ac_cv_lib_$ac_lib_var=yes" 99742+else 99743+ echo "configure: failed program was:" >&5 99744+ cat conftest.$ac_ext >&5 99745+ rm -rf conftest* 99746+ eval "ac_cv_lib_$ac_lib_var=no" 99747+fi 99748+rm -f conftest* 99749+LIBS="$ac_save_LIBS" 99750 99751+fi 99752+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 99753+ echo "$ac_t""yes" 1>&6 99754+ 99755 LDFLAGS=$save_old_LDFLAGS 99756 ext_shared=$save_ext_shared 99757- 99758+ 99759 FIREBIRD_LIBNAME=gds 99760- 99761- 99762+ 99763+ 99764 else 99765+ echo "$ac_t""no" 1>&6 99766 99767 LDFLAGS=$save_old_LDFLAGS 99768 ext_shared=$save_ext_shared 99769 unset ac_cv_lib_gds_isc_detach_database 99770- 99771- 99772+ 99773+ 99774 save_old_LDFLAGS=$LDFLAGS 99775 ac_stuff=" 99776 $FIREBIRD_LIBDIR_FLAG 99777 " 99778- 99779+ 99780 save_ext_shared=$ext_shared 99781 ext_shared=yes 99782- 99783+ 99784 for ac_i in $ac_stuff; do 99785 case $ac_i in 99786 -pthread) 99787 if test "$ext_shared" = "yes"; then 99788 LDFLAGS="$LDFLAGS -pthread" 99789 else 99790- 99791- 99792+ 99793+ 99794 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 99795- 99796+ 99797 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 99798 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99799 eval "EXTRA_LDFLAGS$unique=set" 99800@@ -87029,20 +67339,20 @@ 99801 ;; 99802 -l*) 99803 ac_ii=`echo $ac_i|cut -c 3-` 99804- 99805- 99806+ 99807+ 99808 case $ac_ii in 99809 c|c_r|pthread*) ;; 99810- *) 99811+ *) 99812 if test "$ext_shared" = "yes"; then 99813- LDFLAGS="$LDFLAGS -l$ac_ii" 99814+ LDFLAGS="$LDFLAGS -l$ac_ii" 99815 else 99816- 99817- 99818+ 99819+ 99820 case $ac_ii in 99821 c|c_r|pthread*) ;; 99822- *) 99823- LIBS="$LIBS -l$ac_ii" 99824+ *) 99825+ LIBS="$LIBS -l$ac_ii" 99826 ;; 99827 esac 99828 99829@@ -87055,151 +67365,120 @@ 99830 ;; 99831 -L*) 99832 ac_ii=`echo $ac_i|cut -c 3-` 99833- 99834+ 99835 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 99836- 99837+ 99838 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 99839 ai_p=$ac_ii 99840 else 99841- 99842+ 99843 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 99844- 99845+ 99846 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 99847 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 99848 fi 99849 99850- 99851+ 99852 if test "$ext_shared" = "yes"; then 99853 LDFLAGS="-L$ai_p $LDFLAGS" 99854 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 99855 else 99856- 99857- 99858- 99859+ 99860+ 99861+ 99862 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 99863- 99864+ 99865 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 99866 if test -n "$unique" && test "`eval $cmd`" = "" ; then 99867 eval "LIBPATH$unique=set" 99868- 99869+ 99870 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 99871 LDFLAGS="$LDFLAGS -L$ai_p" 99872 PHP_RPATHS="$PHP_RPATHS $ai_p" 99873- 99874+ 99875 fi 99876 99877 99878 fi 99879- 99880+ 99881 fi 99882 99883 ;; 99884 esac 99885 done 99886 99887- echo "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5 99888-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6 99889-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then 99890- echo $ECHO_N "(cached) $ECHO_C" >&6 99891+ echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 99892+echo "configure:67412: checking for isc_detach_database in -lib_util" >&5 99893+ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` 99894+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 99895+ echo $ac_n "(cached) $ac_c" 1>&6 99896 else 99897- ac_check_lib_save_LIBS=$LIBS 99898+ ac_save_LIBS="$LIBS" 99899 LIBS="-lib_util $LIBS" 99900-cat >conftest.$ac_ext <<_ACEOF 99901-/* confdefs.h. */ 99902-_ACEOF 99903-cat confdefs.h >>conftest.$ac_ext 99904-cat >>conftest.$ac_ext <<_ACEOF 99905-/* end confdefs.h. */ 99906- 99907+cat > conftest.$ac_ext <<EOF 99908+#line 67420 "configure" 99909+#include "confdefs.h" 99910 /* Override any gcc2 internal prototype to avoid an error. */ 99911-#ifdef __cplusplus 99912-extern "C" 99913-#endif 99914 /* We use char because int might match the return type of a gcc2 99915- builtin and then its argument prototype would still apply. */ 99916-char isc_detach_database (); 99917-int 99918-main () 99919-{ 99920-isc_detach_database (); 99921- ; 99922- return 0; 99923-} 99924-_ACEOF 99925-rm -f conftest.$ac_objext conftest$ac_exeext 99926-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 99927- (eval $ac_link) 2>conftest.er1 99928- ac_status=$? 99929- grep -v '^ *+' conftest.er1 >conftest.err 99930- rm -f conftest.er1 99931- cat conftest.err >&5 99932- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99933- (exit $ac_status); } && 99934- { ac_try='test -z "$ac_c_werror_flag" 99935- || test ! -s conftest.err' 99936- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99937- (eval $ac_try) 2>&5 99938- ac_status=$? 99939- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99940- (exit $ac_status); }; } && 99941- { ac_try='test -s conftest$ac_exeext' 99942- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 99943- (eval $ac_try) 2>&5 99944- ac_status=$? 99945- echo "$as_me:$LINENO: \$? = $ac_status" >&5 99946- (exit $ac_status); }; }; then 99947- ac_cv_lib_ib_util_isc_detach_database=yes 99948-else 99949- echo "$as_me: failed program was:" >&5 99950-sed 's/^/| /' conftest.$ac_ext >&5 99951- 99952-ac_cv_lib_ib_util_isc_detach_database=no 99953-fi 99954-rm -f conftest.err conftest.$ac_objext \ 99955- conftest$ac_exeext conftest.$ac_ext 99956-LIBS=$ac_check_lib_save_LIBS 99957-fi 99958-echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5 99959-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6 99960-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then 99961+ builtin and then its argument prototype would still apply. */ 99962+char isc_detach_database(); 99963+ 99964+int main() { 99965+isc_detach_database() 99966+; return 0; } 99967+EOF 99968+if { (eval echo configure:67431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 99969+ rm -rf conftest* 99970+ eval "ac_cv_lib_$ac_lib_var=yes" 99971+else 99972+ echo "configure: failed program was:" >&5 99973+ cat conftest.$ac_ext >&5 99974+ rm -rf conftest* 99975+ eval "ac_cv_lib_$ac_lib_var=no" 99976+fi 99977+rm -f conftest* 99978+LIBS="$ac_save_LIBS" 99979 99980+fi 99981+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 99982+ echo "$ac_t""yes" 1>&6 99983+ 99984 LDFLAGS=$save_old_LDFLAGS 99985 ext_shared=$save_ext_shared 99986- 99987+ 99988 FIREBIRD_LIBNAME=ib_util 99989- 99990- 99991+ 99992+ 99993 else 99994+ echo "$ac_t""no" 1>&6 99995 99996 LDFLAGS=$save_old_LDFLAGS 99997 ext_shared=$save_ext_shared 99998 unset ac_cv_lib_ib_util_isc_detach_database 99999- 100000- { { echo "$as_me:$LINENO: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&5 100001-echo "$as_me: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&2;} 100002- { (exit 1); exit 1; }; } 100003- 100004- 100005+ 100006+ { echo "configure: error: libfbclient, libgds or libib_util not found! Check config.log for more information." 1>&2; exit 1; } 100007+ 100008+ 100009 fi 100010 100011- 100012- 100013+ 100014+ 100015 fi 100016 100017- 100018- 100019+ 100020+ 100021 fi 100022 100023- 100024- 100025- echo "$as_me:$LINENO: checking for PDO includes" >&5 100026-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 100027-if test "${pdo_inc_path+set}" = set; then 100028- echo $ECHO_N "(cached) $ECHO_C" >&6 100029+ 100030+ 100031+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 100032+echo "configure:67476: checking for PDO includes" >&5 100033+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 100034+ echo $ac_n "(cached) $ac_c" 1>&6 100035 else 100036- 100037- echo "$as_me:$LINENO: checking for PDO includes" >&5 100038-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 100039+ 100040+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 100041+echo "configure:67482: checking for PDO includes" >&5 100042 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 100043 pdo_inc_path=$abs_srcdir/ext 100044 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 100045@@ -87207,107 +67486,105 @@ 100046 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 100047 pdo_inc_path=$prefix/include/php/ext 100048 fi 100049- 100050+ 100051 fi 100052-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 100053-echo "${ECHO_T}$pdo_inc_path" >&6 100054+ 100055+echo "$ac_t""$pdo_inc_path" 1>&6 100056 if test -n "$pdo_inc_path"; then 100057 : 100058 else 100059-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 100060-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 100061- { (exit 1); exit 1; }; } 100062+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 100063 fi 100064 100065 100066- 100067+ 100068 100069 if test "$ext_shared" = "yes"; then 100070 PDO_FIREBIRD_SHARED_LIBADD="-l$FIREBIRD_LIBNAME $PDO_FIREBIRD_SHARED_LIBADD" 100071 if test -n "$FIREBIRD_LIBDIR"; then 100072- 100073+ 100074 if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then 100075- 100076+ 100077 if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then 100078 ai_p=$FIREBIRD_LIBDIR 100079 else 100080- 100081+ 100082 ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 100083- 100084+ 100085 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 100086 ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`" 100087 fi 100088 100089- 100090+ 100091 if test "$ext_shared" = "yes"; then 100092 PDO_FIREBIRD_SHARED_LIBADD="-L$ai_p $PDO_FIREBIRD_SHARED_LIBADD" 100093 test -n "$ld_runpath_switch" && PDO_FIREBIRD_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_FIREBIRD_SHARED_LIBADD" 100094 else 100095- 100096- 100097- 100098+ 100099+ 100100+ 100101 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 100102- 100103+ 100104 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 100105 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100106 eval "LIBPATH$unique=set" 100107- 100108+ 100109 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 100110 LDFLAGS="$LDFLAGS -L$ai_p" 100111 PHP_RPATHS="$PHP_RPATHS $ai_p" 100112- 100113+ 100114 fi 100115 100116 100117 fi 100118- 100119+ 100120 fi 100121 100122 fi 100123 else 100124- 100125+ 100126 100127 if test -n "$FIREBIRD_LIBDIR"; then 100128- 100129+ 100130 if test "$FIREBIRD_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$FIREBIRD_LIBDIR" != "/usr/lib"; then 100131- 100132+ 100133 if test -z "$FIREBIRD_LIBDIR" || echo "$FIREBIRD_LIBDIR" | grep '^/' >/dev/null ; then 100134 ai_p=$FIREBIRD_LIBDIR 100135 else 100136- 100137+ 100138 ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 100139- 100140+ 100141 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 100142 ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`" 100143 fi 100144 100145- 100146- 100147- 100148- 100149+ 100150+ 100151+ 100152+ 100153 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 100154- 100155+ 100156 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 100157 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100158 eval "LIBPATH$unique=set" 100159- 100160+ 100161 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 100162 LDFLAGS="$LDFLAGS -L$ai_p" 100163 PHP_RPATHS="$PHP_RPATHS $ai_p" 100164- 100165+ 100166 fi 100167 100168 100169- 100170+ 100171 fi 100172 100173 fi 100174- 100175- 100176+ 100177+ 100178 case $FIREBIRD_LIBNAME in 100179 c|c_r|pthread*) ;; 100180- *) 100181- LIBS="-l$FIREBIRD_LIBNAME $LIBS" 100182+ *) 100183+ LIBS="-l$FIREBIRD_LIBNAME $LIBS" 100184 ;; 100185 esac 100186 100187@@ -87317,43 +67594,42 @@ 100188 fi 100189 100190 100191- 100192+ 100193 if test "$FIREBIRD_INCDIR" != "/usr/include"; then 100194- 100195+ 100196 if test -z "$FIREBIRD_INCDIR" || echo "$FIREBIRD_INCDIR" | grep '^/' >/dev/null ; then 100197 ai_p=$FIREBIRD_INCDIR 100198 else 100199- 100200+ 100201 ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 100202- 100203+ 100204 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 100205 ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`" 100206 fi 100207 100208- 100209- 100210+ 100211+ 100212 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 100213- 100214+ 100215 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 100216 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100217 eval "INCLUDEPATH$unique=set" 100218- 100219+ 100220 if test ""; then 100221 INCLUDES="-I$ai_p $INCLUDES" 100222 else 100223 INCLUDES="$INCLUDES -I$ai_p" 100224 fi 100225- 100226+ 100227 fi 100228 100229 fi 100230 100231- 100232-cat >>confdefs.h <<\_ACEOF 100233+ cat >> confdefs.h <<\EOF 100234 #define HAVE_PDO_FIREBIRD 1 100235-_ACEOF 100236- 100237+EOF 100238 100239+ 100240 ext_builddir=ext/pdo_firebird 100241 ext_srcdir=$abs_srcdir/ext/pdo_firebird 100242 100243@@ -87361,15 +67637,15 @@ 100244 100245 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 100246 PHP_PDO_FIREBIRD_SHARED=no 100247- 100248- 100249+ 100250+ 100251 case ext/pdo_firebird in 100252 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 100253 /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 100254 *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 100255 esac 100256- 100257- 100258+ 100259+ 100260 100261 b_c_pre=$php_c_pre 100262 b_cxx_pre=$php_cxx_pre 100263@@ -87382,12 +67658,12 @@ 100264 100265 old_IFS=$IFS 100266 for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do 100267- 100268+ 100269 IFS=. 100270 set $ac_src 100271 ac_obj=$1 100272 IFS=$old_IFS 100273- 100274+ 100275 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 100276 100277 case $ac_src in 100278@@ -87411,14 +67687,14 @@ 100279 else 100280 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 100281 PHP_PDO_FIREBIRD_SHARED=yes 100282- 100283+ 100284 case ext/pdo_firebird in 100285 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 100286 /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 100287 *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 100288 esac 100289- 100290- 100291+ 100292+ 100293 100294 b_c_pre=$shared_c_pre 100295 b_cxx_pre=$shared_cxx_pre 100296@@ -87431,12 +67707,12 @@ 100297 100298 old_IFS=$IFS 100299 for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do 100300- 100301+ 100302 IFS=. 100303 set $ac_src 100304 ac_obj=$1 100305 IFS=$old_IFS 100306- 100307+ 100308 shared_objects_pdo_firebird="$shared_objects_pdo_firebird $ac_bdir$ac_obj.lo" 100309 100310 case $ac_src in 100311@@ -87454,7 +67730,7 @@ 100312 100313 case $host_alias in 100314 *netware*) 100315- 100316+ 100317 install_modules="install-modules" 100318 100319 case $host_alias in 100320@@ -87464,7 +67740,7 @@ 100321 ;; 100322 *netware*) 100323 suffix=nlm 100324- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(PDO_FIREBIRD_SHARED_LIBADD)' 100325+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_FIREBIRD, 3)_SHARED_LIBADD)' 100326 ;; 100327 *) 100328 suffix=la 100329@@ -87477,7 +67753,7 @@ 100330 else 100331 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_firebird.$suffix" 100332 fi 100333- 100334+ 100335 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird" 100336 100337 cat >>Makefile.objects<<EOF 100338@@ -87491,7 +67767,7 @@ 100339 100340 ;; 100341 *) 100342- 100343+ 100344 install_modules="install-modules" 100345 100346 case $host_alias in 100347@@ -87501,7 +67777,7 @@ 100348 ;; 100349 *netware*) 100350 suffix=nlm 100351- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(_FIREBIRD_SHARED_LIBADD)' 100352+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_firebird) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_FIREBIRD, 3)_SHARED_LIBADD)' 100353 ;; 100354 *) 100355 suffix=la 100356@@ -87514,7 +67790,7 @@ 100357 else 100358 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_firebird.$suffix" 100359 fi 100360- 100361+ 100362 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_firebird" 100363 100364 cat >>Makefile.objects<<EOF 100365@@ -87528,10 +67804,9 @@ 100366 100367 ;; 100368 esac 100369- 100370-cat >>confdefs.h <<_ACEOF 100371+ cat >> confdefs.h <<EOF 100372 #define COMPILE_DL_PDO_FIREBIRD 1 100373-_ACEOF 100374+EOF 100375 100376 fi 100377 fi 100378@@ -87540,15 +67815,15 @@ 100379 PHP_PDO_FIREBIRD_SHARED=no 100380 case "$PHP_SAPI" in 100381 cgi|embed) 100382- 100383- 100384+ 100385+ 100386 case ext/pdo_firebird in 100387 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 100388 /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 100389 *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 100390 esac 100391- 100392- 100393+ 100394+ 100395 100396 b_c_pre=$php_c_pre 100397 b_cxx_pre=$php_cxx_pre 100398@@ -87561,12 +67836,12 @@ 100399 100400 old_IFS=$IFS 100401 for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do 100402- 100403+ 100404 IFS=. 100405 set $ac_src 100406 ac_obj=$1 100407 IFS=$old_IFS 100408- 100409+ 100410 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 100411 100412 case $ac_src in 100413@@ -87586,15 +67861,15 @@ 100414 EXT_STATIC="$EXT_STATIC pdo_firebird" 100415 ;; 100416 *) 100417- 100418- 100419+ 100420+ 100421 case ext/pdo_firebird in 100422 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 100423 /*) ac_srcdir=`echo "ext/pdo_firebird"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 100424 *) ac_srcdir="$abs_srcdir/ext/pdo_firebird/"; ac_bdir="ext/pdo_firebird/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 100425 esac 100426- 100427- 100428+ 100429+ 100430 100431 b_c_pre=$php_c_pre 100432 b_cxx_pre=$php_cxx_pre 100433@@ -87607,13 +67882,13 @@ 100434 100435 old_IFS=$IFS 100436 for ac_src in pdo_firebird.c firebird_driver.c firebird_statement.c; do 100437- 100438+ 100439 IFS=. 100440 set $ac_src 100441 ac_obj=$1 100442 IFS=$old_IFS 100443- 100444- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 100445+ 100446+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 100447 100448 case $ac_src in 100449 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 100450@@ -87633,72 +67908,60 @@ 100451 esac 100452 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_firebird" 100453 fi 100454- 100455- 100456+ 100457+ 100458 BUILD_DIR="$BUILD_DIR $ext_builddir" 100459- 100460+ 100461 100462 100463 if test "$ext_builddir" = "."; then 100464 PHP_PECL_EXTENSION=pdo_firebird 100465- 100466+ 100467 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 100468 100469 fi 100470 100471- 100472+ 100473 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_FIREBIRD_SHARED_LIBADD" 100474 100475- 100476+ 100477 am_i_shared=$PHP_PDO_FIREBIRD_SHARED 100478 is_it_shared=$PHP_PDO_SHARED 100479 is_it_enabled=$PHP_PDO 100480 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 100481- { { echo "$as_me:$LINENO: error: 100482-You've configured extension pdo_firebird to build statically, but it 100483-depends on extension pdo, which you've configured to build shared. 100484-You either need to build pdo_firebird shared or build pdo statically for the 100485-build to be successful. 100486-" >&5 100487-echo "$as_me: error: 100488+ { echo "configure: error: 100489 You've configured extension pdo_firebird to build statically, but it 100490 depends on extension pdo, which you've configured to build shared. 100491 You either need to build pdo_firebird shared or build pdo statically for the 100492 build to be successful. 100493-" >&2;} 100494- { (exit 1); exit 1; }; } 100495+" 1>&2; exit 1; } 100496 fi 100497 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 100498- { { echo "$as_me:$LINENO: error: 100499+ { echo "configure: error: 100500 You've configured extension pdo_firebird, which depends on extension pdo, 100501 but you've either not enabled pdo, or have disabled it. 100502-" >&5 100503-echo "$as_me: error: 100504-You've configured extension pdo_firebird, which depends on extension pdo, 100505-but you've either not enabled pdo, or have disabled it. 100506-" >&2;} 100507- { (exit 1); exit 1; }; } 100508+" 1>&2; exit 1; } 100509 fi 100510- 100511+ 100512 fi 100513 100514 100515 100516 php_with_pdo_mysql=no 100517 100518-echo "$as_me:$LINENO: checking for MySQL support for PDO" >&5 100519-echo $ECHO_N "checking for MySQL support for PDO... $ECHO_C" >&6 100520- 100521+echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 100522+echo "configure:67954: checking for MySQL support for PDO" >&5 100523 # Check whether --with-pdo-mysql or --without-pdo-mysql was given. 100524 if test "${with_pdo_mysql+set}" = set; then 100525 withval="$with_pdo_mysql" 100526 PHP_PDO_MYSQL=$withval 100527 else 100528- 100529+ 100530 PHP_PDO_MYSQL=no 100531 test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL 100532 100533-fi; 100534+fi 100535+ 100536 100537 100538 ext_output="yes, shared" 100539@@ -87722,33 +67985,31 @@ 100540 100541 100542 100543-echo "$as_me:$LINENO: result: $ext_output" >&5 100544-echo "${ECHO_T}$ext_output" >&6 100545+echo "$ac_t""$ext_output" 1>&6 100546 100547 100548 100549 100550 if test -z "$PHP_ZLIB_DIR"; then 100551- 100552+ 100553 php_with_zlib_dir=no 100554 100555-echo "$as_me:$LINENO: checking for the location of libz" >&5 100556-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6 100557- 100558+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 100559+echo "configure:67999: checking for the location of libz" >&5 100560 # Check whether --with-zlib-dir or --without-zlib-dir was given. 100561 if test "${with_zlib_dir+set}" = set; then 100562 withval="$with_zlib_dir" 100563 PHP_ZLIB_DIR=$withval 100564 else 100565- 100566+ 100567 PHP_ZLIB_DIR=no 100568+ 100569 100570+fi 100571 100572-fi; 100573 100574 ext_output=$PHP_ZLIB_DIR 100575-echo "$as_me:$LINENO: result: $ext_output" >&5 100576-echo "${ECHO_T}$ext_output" >&6 100577+echo "$ac_t""$ext_output" 1>&6 100578 100579 100580 100581@@ -87757,12 +68018,10 @@ 100582 if test "$PHP_PDO_MYSQL" != "no"; then 100583 100584 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 100585- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 100586-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 100587- { (exit 1); exit 1; }; } 100588+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 100589 fi 100590 100591- 100592+ 100593 100594 if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then 100595 PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL 100596@@ -87789,61 +68048,54 @@ 100597 100598 if test "$PHP_PDO_MYSQL" = "mysqlnd"; then 100599 PHP_MYSQLND_ENABLED=yes 100600- 100601-cat >>confdefs.h <<\_ACEOF 100602+ cat >> confdefs.h <<\EOF 100603 #define PDO_USE_MYSQLND 1 100604-_ACEOF 100605+EOF 100606 100607 else 100608- 100609-cat >>confdefs.h <<\_ACEOF 100610+ cat >> confdefs.h <<\EOF 100611 #define HAVE_MYSQL 1 100612-_ACEOF 100613+EOF 100614 100615 100616- echo "$as_me:$LINENO: checking for mysql_config" >&5 100617-echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6 100618+ echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 100619+echo "configure:68063: checking for mysql_config" >&5 100620 if test -n "$PDO_MYSQL_CONFIG"; then 100621- echo "$as_me:$LINENO: result: $PDO_MYSQL_CONFIG" >&5 100622-echo "${ECHO_T}$PDO_MYSQL_CONFIG" >&6 100623+ echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 100624 if test "x$SED" = "x"; then 100625 # Extract the first word of "sed", so it can be a program name with args. 100626 set dummy sed; ac_word=$2 100627-echo "$as_me:$LINENO: checking for $ac_word" >&5 100628-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 100629-if test "${ac_cv_path_SED+set}" = set; then 100630- echo $ECHO_N "(cached) $ECHO_C" >&6 100631+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 100632+echo "configure:68070: checking for $ac_word" >&5 100633+if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then 100634+ echo $ac_n "(cached) $ac_c" 1>&6 100635 else 100636- case $SED in 100637- [\\/]* | ?:[\\/]*) 100638+ case "$SED" in 100639+ /*) 100640 ac_cv_path_SED="$SED" # Let the user override the test with a path. 100641 ;; 100642+ ?:/*) 100643+ ac_cv_path_SED="$SED" # Let the user override the test with a dos path. 100644+ ;; 100645 *) 100646- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 100647-for as_dir in $PATH 100648-do 100649- IFS=$as_save_IFS 100650- test -z "$as_dir" && as_dir=. 100651- for ac_exec_ext in '' $ac_executable_extensions; do 100652- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 100653- ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" 100654- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 100655- break 2 100656- fi 100657-done 100658-done 100659- 100660+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 100661+ ac_dummy="$PATH" 100662+ for ac_dir in $ac_dummy; do 100663+ test -z "$ac_dir" && ac_dir=. 100664+ if test -f $ac_dir/$ac_word; then 100665+ ac_cv_path_SED="$ac_dir/$ac_word" 100666+ break 100667+ fi 100668+ done 100669+ IFS="$ac_save_ifs" 100670 ;; 100671 esac 100672 fi 100673-SED=$ac_cv_path_SED 100674- 100675+SED="$ac_cv_path_SED" 100676 if test -n "$SED"; then 100677- echo "$as_me:$LINENO: result: $SED" >&5 100678-echo "${ECHO_T}$SED" >&6 100679+ echo "$ac_t""$SED" 1>&6 100680 else 100681- echo "$as_me:$LINENO: result: no" >&5 100682-echo "${ECHO_T}no" >&6 100683+ echo "$ac_t""no" 1>&6 100684 fi 100685 100686 fi 100687@@ -87856,10 +68108,9 @@ 100688 fi 100689 PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"` 100690 elif test -n "$PDO_MYSQL_DIR"; then 100691- echo "$as_me:$LINENO: result: not found" >&5 100692-echo "${ECHO_T}not found" >&6 100693- echo "$as_me:$LINENO: checking for mysql install under $PDO_MYSQL_DIR" >&5 100694-echo $ECHO_N "checking for mysql install under $PDO_MYSQL_DIR... $ECHO_C" >&6 100695+ echo "$ac_t""not found" 1>&6 100696+ echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 100697+echo "configure:68114: checking for mysql install under $PDO_MYSQL_DIR" >&5 100698 if test -r $PDO_MYSQL_DIR/include/mysql; then 100699 PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql 100700 else 100701@@ -87872,75 +68123,68 @@ 100702 fi 100703 100704 if test -r "$PDO_MYSQL_LIB_DIR"; then 100705- echo "$as_me:$LINENO: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5 100706-echo "${ECHO_T}libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6 100707+ echo "$ac_t""libs under $PDO_MYSQL_LIB_DIR; seems promising" 1>&6 100708 else 100709- echo "$as_me:$LINENO: result: can not find it" >&5 100710-echo "${ECHO_T}can not find it" >&6 100711- { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5 100712-echo "$as_me: error: Unable to find your mysql installation" >&2;} 100713- { (exit 1); exit 1; }; } 100714+ echo "$ac_t""can not find it" 1>&6 100715+ { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; } 100716 fi 100717 100718- 100719+ 100720 if test "$PDO_MYSQL_INC_DIR" != "/usr/include"; then 100721- 100722+ 100723 if test -z "$PDO_MYSQL_INC_DIR" || echo "$PDO_MYSQL_INC_DIR" | grep '^/' >/dev/null ; then 100724 ai_p=$PDO_MYSQL_INC_DIR 100725 else 100726- 100727+ 100728 ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 100729- 100730+ 100731 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 100732 ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`" 100733 fi 100734 100735- 100736- 100737+ 100738+ 100739 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 100740- 100741+ 100742 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 100743 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100744 eval "INCLUDEPATH$unique=set" 100745- 100746+ 100747 if test ""; then 100748 INCLUDES="-I$ai_p $INCLUDES" 100749 else 100750 INCLUDES="$INCLUDES -I$ai_p" 100751 fi 100752- 100753+ 100754 fi 100755 100756 fi 100757 100758 PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR 100759 else 100760- echo "$as_me:$LINENO: result: not found" >&5 100761-echo "${ECHO_T}not found" >&6 100762- { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5 100763-echo "$as_me: error: Unable to find your mysql installation" >&2;} 100764- { (exit 1); exit 1; }; } 100765+ echo "$ac_t""not found" 1>&6 100766+ { echo "configure: error: Unable to find your mysql installation" 1>&2; exit 1; } 100767 fi 100768 100769- 100770+ 100771 save_old_LDFLAGS=$LDFLAGS 100772 ac_stuff=" 100773 $PDO_MYSQL_LIBS 100774 " 100775- 100776+ 100777 save_ext_shared=$ext_shared 100778 ext_shared=yes 100779- 100780+ 100781 for ac_i in $ac_stuff; do 100782 case $ac_i in 100783 -pthread) 100784 if test "$ext_shared" = "yes"; then 100785 LDFLAGS="$LDFLAGS -pthread" 100786 else 100787- 100788- 100789+ 100790+ 100791 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 100792- 100793+ 100794 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 100795 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100796 eval "EXTRA_LDFLAGS$unique=set" 100797@@ -87951,20 +68195,20 @@ 100798 ;; 100799 -l*) 100800 ac_ii=`echo $ac_i|cut -c 3-` 100801- 100802- 100803+ 100804+ 100805 case $ac_ii in 100806 c|c_r|pthread*) ;; 100807- *) 100808+ *) 100809 if test "$ext_shared" = "yes"; then 100810- LDFLAGS="$LDFLAGS -l$ac_ii" 100811+ LDFLAGS="$LDFLAGS -l$ac_ii" 100812 else 100813- 100814- 100815+ 100816+ 100817 case $ac_ii in 100818 c|c_r|pthread*) ;; 100819- *) 100820- LIBS="$LIBS -l$ac_ii" 100821+ *) 100822+ LIBS="$LIBS -l$ac_ii" 100823 ;; 100824 esac 100825 100826@@ -87977,150 +68221,119 @@ 100827 ;; 100828 -L*) 100829 ac_ii=`echo $ac_i|cut -c 3-` 100830- 100831+ 100832 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 100833- 100834+ 100835 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 100836 ai_p=$ac_ii 100837 else 100838- 100839+ 100840 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 100841- 100842+ 100843 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 100844 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 100845 fi 100846 100847- 100848+ 100849 if test "$ext_shared" = "yes"; then 100850 LDFLAGS="-L$ai_p $LDFLAGS" 100851 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 100852 else 100853- 100854- 100855- 100856+ 100857+ 100858+ 100859 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 100860- 100861+ 100862 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 100863 if test -n "$unique" && test "`eval $cmd`" = "" ; then 100864 eval "LIBPATH$unique=set" 100865- 100866+ 100867 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 100868 LDFLAGS="$LDFLAGS -L$ai_p" 100869 PHP_RPATHS="$PHP_RPATHS $ai_p" 100870- 100871+ 100872 fi 100873 100874 100875 fi 100876- 100877+ 100878 fi 100879 100880 ;; 100881 esac 100882 done 100883 100884- as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh` 100885-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 100886-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6 100887-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 100888- echo $ECHO_N "(cached) $ECHO_C" >&6 100889+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 100890+echo "configure:68268: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 100891+ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` 100892+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 100893+ echo $ac_n "(cached) $ac_c" 1>&6 100894 else 100895- ac_check_lib_save_LIBS=$LIBS 100896+ ac_save_LIBS="$LIBS" 100897 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" 100898-cat >conftest.$ac_ext <<_ACEOF 100899-/* confdefs.h. */ 100900-_ACEOF 100901-cat confdefs.h >>conftest.$ac_ext 100902-cat >>conftest.$ac_ext <<_ACEOF 100903-/* end confdefs.h. */ 100904- 100905+cat > conftest.$ac_ext <<EOF 100906+#line 68276 "configure" 100907+#include "confdefs.h" 100908 /* Override any gcc2 internal prototype to avoid an error. */ 100909-#ifdef __cplusplus 100910-extern "C" 100911-#endif 100912 /* We use char because int might match the return type of a gcc2 100913- builtin and then its argument prototype would still apply. */ 100914-char mysql_query (); 100915-int 100916-main () 100917-{ 100918-mysql_query (); 100919- ; 100920- return 0; 100921-} 100922-_ACEOF 100923-rm -f conftest.$ac_objext conftest$ac_exeext 100924-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 100925- (eval $ac_link) 2>conftest.er1 100926- ac_status=$? 100927- grep -v '^ *+' conftest.er1 >conftest.err 100928- rm -f conftest.er1 100929- cat conftest.err >&5 100930- echo "$as_me:$LINENO: \$? = $ac_status" >&5 100931- (exit $ac_status); } && 100932- { ac_try='test -z "$ac_c_werror_flag" 100933- || test ! -s conftest.err' 100934- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 100935- (eval $ac_try) 2>&5 100936- ac_status=$? 100937- echo "$as_me:$LINENO: \$? = $ac_status" >&5 100938- (exit $ac_status); }; } && 100939- { ac_try='test -s conftest$ac_exeext' 100940- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 100941- (eval $ac_try) 2>&5 100942- ac_status=$? 100943- echo "$as_me:$LINENO: \$? = $ac_status" >&5 100944- (exit $ac_status); }; }; then 100945- eval "$as_ac_Lib=yes" 100946-else 100947- echo "$as_me: failed program was:" >&5 100948-sed 's/^/| /' conftest.$ac_ext >&5 100949- 100950-eval "$as_ac_Lib=no" 100951-fi 100952-rm -f conftest.err conftest.$ac_objext \ 100953- conftest$ac_exeext conftest.$ac_ext 100954-LIBS=$ac_check_lib_save_LIBS 100955-fi 100956-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 100957-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 100958-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 100959+ builtin and then its argument prototype would still apply. */ 100960+char mysql_query(); 100961+ 100962+int main() { 100963+mysql_query() 100964+; return 0; } 100965+EOF 100966+if { (eval echo configure:68287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 100967+ rm -rf conftest* 100968+ eval "ac_cv_lib_$ac_lib_var=yes" 100969+else 100970+ echo "configure: failed program was:" >&5 100971+ cat conftest.$ac_ext >&5 100972+ rm -rf conftest* 100973+ eval "ac_cv_lib_$ac_lib_var=no" 100974+fi 100975+rm -f conftest* 100976+LIBS="$ac_save_LIBS" 100977 100978+fi 100979+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 100980+ echo "$ac_t""yes" 1>&6 100981+ 100982 LDFLAGS=$save_old_LDFLAGS 100983 ext_shared=$save_ext_shared 100984- 100985- 100986+ 100987+ 100988 for ac_i in $PDO_MYSQL_INCLUDE; do 100989 case $ac_i in 100990 -I*) 100991 ac_ii=`echo $ac_i|cut -c 3-` 100992- 100993+ 100994 if test "$ac_ii" != "/usr/include"; then 100995- 100996+ 100997 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 100998 ai_p=$ac_ii 100999 else 101000- 101001+ 101002 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101003- 101004+ 101005 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101006 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101007 fi 101008 101009- 101010- 101011+ 101012+ 101013 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101014- 101015+ 101016 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 101017 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101018 eval "INCLUDEPATH$unique=set" 101019- 101020+ 101021 if test ""; then 101022 INCLUDES="-I$ai_p $INCLUDES" 101023 else 101024 INCLUDES="$INCLUDES -I$ai_p" 101025 fi 101026- 101027+ 101028 fi 101029 101030 fi 101031@@ -88129,17 +68342,17 @@ 101032 esac 101033 done 101034 101035- 101036+ 101037 for ac_i in $PDO_MYSQL_LIBS; do 101038 case $ac_i in 101039 -pthread) 101040 if test "$ext_shared" = "yes"; then 101041 PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread" 101042 else 101043- 101044- 101045+ 101046+ 101047 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 101048- 101049+ 101050 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 101051 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101052 eval "EXTRA_LDFLAGS$unique=set" 101053@@ -88150,20 +68363,20 @@ 101054 ;; 101055 -l*) 101056 ac_ii=`echo $ac_i|cut -c 3-` 101057- 101058- 101059+ 101060+ 101061 case $ac_ii in 101062 c|c_r|pthread*) ;; 101063- *) 101064+ *) 101065 if test "$ext_shared" = "yes"; then 101066- PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 101067+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 101068 else 101069- 101070- 101071+ 101072+ 101073 case $ac_ii in 101074 c|c_r|pthread*) ;; 101075- *) 101076- LIBS="$LIBS -l$ac_ii" 101077+ *) 101078+ LIBS="$LIBS -l$ac_ii" 101079 ;; 101080 esac 101081 101082@@ -88176,145 +68389,146 @@ 101083 ;; 101084 -L*) 101085 ac_ii=`echo $ac_i|cut -c 3-` 101086- 101087+ 101088 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 101089- 101090+ 101091 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 101092 ai_p=$ac_ii 101093 else 101094- 101095+ 101096 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101097- 101098+ 101099 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101100 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101101 fi 101102 101103- 101104+ 101105 if test "$ext_shared" = "yes"; then 101106 PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" 101107 test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" 101108 else 101109- 101110- 101111- 101112+ 101113+ 101114+ 101115 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101116- 101117+ 101118 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101119 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101120 eval "LIBPATH$unique=set" 101121- 101122+ 101123 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101124 LDFLAGS="$LDFLAGS -L$ai_p" 101125 PHP_RPATHS="$PHP_RPATHS $ai_p" 101126- 101127+ 101128 fi 101129 101130 101131 fi 101132- 101133+ 101134 fi 101135 101136 ;; 101137 esac 101138 done 101139 101140- 101141- 101142+ 101143+ 101144 else 101145+ echo "$ac_t""no" 1>&6 101146 101147 LDFLAGS=$save_old_LDFLAGS 101148 ext_shared=$save_ext_shared 101149 unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query 101150- 101151+ 101152 if test "$PHP_ZLIB_DIR" != "no"; then 101153- 101154+ 101155 101156 if test "$ext_shared" = "yes"; then 101157 PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" 101158 if test -n "$PHP_ZLIB_DIR"; then 101159- 101160+ 101161 if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then 101162- 101163+ 101164 if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then 101165 ai_p=$PHP_ZLIB_DIR 101166 else 101167- 101168+ 101169 ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 101170- 101171+ 101172 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101173 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 101174 fi 101175 101176- 101177+ 101178 if test "$ext_shared" = "yes"; then 101179 PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" 101180 test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" 101181 else 101182- 101183- 101184- 101185+ 101186+ 101187+ 101188 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101189- 101190+ 101191 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101192 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101193 eval "LIBPATH$unique=set" 101194- 101195+ 101196 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101197 LDFLAGS="$LDFLAGS -L$ai_p" 101198 PHP_RPATHS="$PHP_RPATHS $ai_p" 101199- 101200+ 101201 fi 101202 101203 101204 fi 101205- 101206+ 101207 fi 101208 101209 fi 101210 else 101211- 101212+ 101213 101214 if test -n "$PHP_ZLIB_DIR"; then 101215- 101216+ 101217 if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then 101218- 101219+ 101220 if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then 101221 ai_p=$PHP_ZLIB_DIR 101222 else 101223- 101224+ 101225 ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 101226- 101227+ 101228 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101229 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" 101230 fi 101231 101232- 101233- 101234- 101235- 101236+ 101237+ 101238+ 101239+ 101240 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101241- 101242+ 101243 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101244 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101245 eval "LIBPATH$unique=set" 101246- 101247+ 101248 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101249 LDFLAGS="$LDFLAGS -L$ai_p" 101250 PHP_RPATHS="$PHP_RPATHS $ai_p" 101251- 101252+ 101253 fi 101254 101255 101256- 101257+ 101258 fi 101259 101260 fi 101261- 101262- 101263+ 101264+ 101265 case z in 101266 c|c_r|pthread*) ;; 101267- *) 101268- LIBS="-lz $LIBS" 101269+ *) 101270+ LIBS="-lz $LIBS" 101271 ;; 101272 esac 101273 101274@@ -88324,25 +68538,25 @@ 101275 fi 101276 101277 101278- 101279+ 101280 save_old_LDFLAGS=$LDFLAGS 101281 ac_stuff=" 101282- -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR 101283+ -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR 101284 " 101285- 101286+ 101287 save_ext_shared=$ext_shared 101288 ext_shared=yes 101289- 101290+ 101291 for ac_i in $ac_stuff; do 101292 case $ac_i in 101293 -pthread) 101294 if test "$ext_shared" = "yes"; then 101295 LDFLAGS="$LDFLAGS -pthread" 101296 else 101297- 101298- 101299+ 101300+ 101301 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 101302- 101303+ 101304 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 101305 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101306 eval "EXTRA_LDFLAGS$unique=set" 101307@@ -88353,20 +68567,20 @@ 101308 ;; 101309 -l*) 101310 ac_ii=`echo $ac_i|cut -c 3-` 101311- 101312- 101313+ 101314+ 101315 case $ac_ii in 101316 c|c_r|pthread*) ;; 101317- *) 101318+ *) 101319 if test "$ext_shared" = "yes"; then 101320- LDFLAGS="$LDFLAGS -l$ac_ii" 101321+ LDFLAGS="$LDFLAGS -l$ac_ii" 101322 else 101323- 101324- 101325+ 101326+ 101327 case $ac_ii in 101328 c|c_r|pthread*) ;; 101329- *) 101330- LIBS="$LIBS -l$ac_ii" 101331+ *) 101332+ LIBS="$LIBS -l$ac_ii" 101333 ;; 101334 esac 101335 101336@@ -88379,148 +68593,116 @@ 101337 ;; 101338 -L*) 101339 ac_ii=`echo $ac_i|cut -c 3-` 101340- 101341+ 101342 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 101343- 101344+ 101345 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 101346 ai_p=$ac_ii 101347 else 101348- 101349+ 101350 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101351- 101352+ 101353 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101354 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101355 fi 101356 101357- 101358+ 101359 if test "$ext_shared" = "yes"; then 101360 LDFLAGS="-L$ai_p $LDFLAGS" 101361 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 101362 else 101363- 101364- 101365- 101366+ 101367+ 101368+ 101369 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101370- 101371+ 101372 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101373 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101374 eval "LIBPATH$unique=set" 101375- 101376+ 101377 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101378 LDFLAGS="$LDFLAGS -L$ai_p" 101379 PHP_RPATHS="$PHP_RPATHS $ai_p" 101380- 101381+ 101382 fi 101383 101384 101385 fi 101386- 101387+ 101388 fi 101389 101390 ;; 101391 esac 101392 done 101393 101394- as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh` 101395-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 101396-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6 101397-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 101398- echo $ECHO_N "(cached) $ECHO_C" >&6 101399+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 101400+echo "configure:68640: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 101401+ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` 101402+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 101403+ echo $ac_n "(cached) $ac_c" 1>&6 101404 else 101405- ac_check_lib_save_LIBS=$LIBS 101406+ ac_save_LIBS="$LIBS" 101407 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" 101408-cat >conftest.$ac_ext <<_ACEOF 101409-/* confdefs.h. */ 101410-_ACEOF 101411-cat confdefs.h >>conftest.$ac_ext 101412-cat >>conftest.$ac_ext <<_ACEOF 101413-/* end confdefs.h. */ 101414- 101415+cat > conftest.$ac_ext <<EOF 101416+#line 68648 "configure" 101417+#include "confdefs.h" 101418 /* Override any gcc2 internal prototype to avoid an error. */ 101419-#ifdef __cplusplus 101420-extern "C" 101421-#endif 101422 /* We use char because int might match the return type of a gcc2 101423- builtin and then its argument prototype would still apply. */ 101424-char mysql_query (); 101425-int 101426-main () 101427-{ 101428-mysql_query (); 101429- ; 101430- return 0; 101431-} 101432-_ACEOF 101433-rm -f conftest.$ac_objext conftest$ac_exeext 101434-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 101435- (eval $ac_link) 2>conftest.er1 101436- ac_status=$? 101437- grep -v '^ *+' conftest.er1 >conftest.err 101438- rm -f conftest.er1 101439- cat conftest.err >&5 101440- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101441- (exit $ac_status); } && 101442- { ac_try='test -z "$ac_c_werror_flag" 101443- || test ! -s conftest.err' 101444- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 101445- (eval $ac_try) 2>&5 101446- ac_status=$? 101447- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101448- (exit $ac_status); }; } && 101449- { ac_try='test -s conftest$ac_exeext' 101450- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 101451- (eval $ac_try) 2>&5 101452- ac_status=$? 101453- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101454- (exit $ac_status); }; }; then 101455- eval "$as_ac_Lib=yes" 101456-else 101457- echo "$as_me: failed program was:" >&5 101458-sed 's/^/| /' conftest.$ac_ext >&5 101459- 101460-eval "$as_ac_Lib=no" 101461-fi 101462-rm -f conftest.err conftest.$ac_objext \ 101463- conftest$ac_exeext conftest.$ac_ext 101464-LIBS=$ac_check_lib_save_LIBS 101465-fi 101466-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 101467-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 101468-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 101469+ builtin and then its argument prototype would still apply. */ 101470+char mysql_query(); 101471+ 101472+int main() { 101473+mysql_query() 101474+; return 0; } 101475+EOF 101476+if { (eval echo configure:68659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 101477+ rm -rf conftest* 101478+ eval "ac_cv_lib_$ac_lib_var=yes" 101479+else 101480+ echo "configure: failed program was:" >&5 101481+ cat conftest.$ac_ext >&5 101482+ rm -rf conftest* 101483+ eval "ac_cv_lib_$ac_lib_var=no" 101484+fi 101485+rm -f conftest* 101486+LIBS="$ac_save_LIBS" 101487 101488+fi 101489+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 101490+ echo "$ac_t""yes" 1>&6 101491+ 101492 LDFLAGS=$save_old_LDFLAGS 101493 ext_shared=$save_ext_shared 101494- 101495- 101496+ 101497+ 101498 else 101499+ echo "$ac_t""no" 1>&6 101500 101501 LDFLAGS=$save_old_LDFLAGS 101502 ext_shared=$save_ext_shared 101503 unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query 101504- 101505- { { echo "$as_me:$LINENO: error: PDO_MYSQL configure failed. Please check config.log for more information." >&5 101506-echo "$as_me: error: PDO_MYSQL configure failed. Please check config.log for more information." >&2;} 101507- { (exit 1); exit 1; }; } 101508- 101509- 101510+ 101511+ { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; } 101512+ 101513+ 101514 fi 101515- 101516+ 101517 PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" 101518 else 101519- 101520- 101521+ 101522+ 101523 case z in 101524 c|c_r|pthread*) ;; 101525- *) 101526+ *) 101527 if test "$ext_shared" = "yes"; then 101528- PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" 101529+ PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" 101530 else 101531- 101532- 101533+ 101534+ 101535 case z in 101536 c|c_r|pthread*) ;; 101537- *) 101538- LIBS="-lz $LIBS" 101539+ *) 101540+ LIBS="-lz $LIBS" 101541 ;; 101542 esac 101543 101544@@ -88530,25 +68712,25 @@ 101545 esac 101546 101547 101548- 101549+ 101550 save_old_LDFLAGS=$LDFLAGS 101551 ac_stuff=" 101552 -L$PDO_MYSQL_LIB_DIR 101553 " 101554- 101555+ 101556 save_ext_shared=$ext_shared 101557 ext_shared=yes 101558- 101559+ 101560 for ac_i in $ac_stuff; do 101561 case $ac_i in 101562 -pthread) 101563 if test "$ext_shared" = "yes"; then 101564 LDFLAGS="$LDFLAGS -pthread" 101565 else 101566- 101567- 101568+ 101569+ 101570 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 101571- 101572+ 101573 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 101574 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101575 eval "EXTRA_LDFLAGS$unique=set" 101576@@ -88559,20 +68741,20 @@ 101577 ;; 101578 -l*) 101579 ac_ii=`echo $ac_i|cut -c 3-` 101580- 101581- 101582+ 101583+ 101584 case $ac_ii in 101585 c|c_r|pthread*) ;; 101586- *) 101587+ *) 101588 if test "$ext_shared" = "yes"; then 101589- LDFLAGS="$LDFLAGS -l$ac_ii" 101590+ LDFLAGS="$LDFLAGS -l$ac_ii" 101591 else 101592- 101593- 101594+ 101595+ 101596 case $ac_ii in 101597 c|c_r|pthread*) ;; 101598- *) 101599- LIBS="$LIBS -l$ac_ii" 101600+ *) 101601+ LIBS="$LIBS -l$ac_ii" 101602 ;; 101603 esac 101604 101605@@ -88585,167 +68767,135 @@ 101606 ;; 101607 -L*) 101608 ac_ii=`echo $ac_i|cut -c 3-` 101609- 101610+ 101611 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 101612- 101613+ 101614 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 101615 ai_p=$ac_ii 101616 else 101617- 101618+ 101619 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101620- 101621+ 101622 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101623 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101624 fi 101625 101626- 101627+ 101628 if test "$ext_shared" = "yes"; then 101629 LDFLAGS="-L$ai_p $LDFLAGS" 101630 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 101631 else 101632- 101633- 101634- 101635+ 101636+ 101637+ 101638 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101639- 101640+ 101641 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101642 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101643 eval "LIBPATH$unique=set" 101644- 101645+ 101646 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101647 LDFLAGS="$LDFLAGS -L$ai_p" 101648 PHP_RPATHS="$PHP_RPATHS $ai_p" 101649- 101650+ 101651 fi 101652 101653 101654 fi 101655- 101656+ 101657 fi 101658 101659 ;; 101660 esac 101661 done 101662 101663- as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh` 101664-echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 101665-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6 101666-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 101667- echo $ECHO_N "(cached) $ECHO_C" >&6 101668+ echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 101669+echo "configure:68814: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 101670+ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` 101671+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 101672+ echo $ac_n "(cached) $ac_c" 1>&6 101673 else 101674- ac_check_lib_save_LIBS=$LIBS 101675+ ac_save_LIBS="$LIBS" 101676 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" 101677-cat >conftest.$ac_ext <<_ACEOF 101678-/* confdefs.h. */ 101679-_ACEOF 101680-cat confdefs.h >>conftest.$ac_ext 101681-cat >>conftest.$ac_ext <<_ACEOF 101682-/* end confdefs.h. */ 101683- 101684+cat > conftest.$ac_ext <<EOF 101685+#line 68822 "configure" 101686+#include "confdefs.h" 101687 /* Override any gcc2 internal prototype to avoid an error. */ 101688-#ifdef __cplusplus 101689-extern "C" 101690-#endif 101691 /* We use char because int might match the return type of a gcc2 101692- builtin and then its argument prototype would still apply. */ 101693-char mysql_query (); 101694-int 101695-main () 101696-{ 101697-mysql_query (); 101698- ; 101699- return 0; 101700-} 101701-_ACEOF 101702-rm -f conftest.$ac_objext conftest$ac_exeext 101703-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 101704- (eval $ac_link) 2>conftest.er1 101705- ac_status=$? 101706- grep -v '^ *+' conftest.er1 >conftest.err 101707- rm -f conftest.er1 101708- cat conftest.err >&5 101709- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101710- (exit $ac_status); } && 101711- { ac_try='test -z "$ac_c_werror_flag" 101712- || test ! -s conftest.err' 101713- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 101714- (eval $ac_try) 2>&5 101715- ac_status=$? 101716- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101717- (exit $ac_status); }; } && 101718- { ac_try='test -s conftest$ac_exeext' 101719- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 101720- (eval $ac_try) 2>&5 101721- ac_status=$? 101722- echo "$as_me:$LINENO: \$? = $ac_status" >&5 101723- (exit $ac_status); }; }; then 101724- eval "$as_ac_Lib=yes" 101725-else 101726- echo "$as_me: failed program was:" >&5 101727-sed 's/^/| /' conftest.$ac_ext >&5 101728- 101729-eval "$as_ac_Lib=no" 101730-fi 101731-rm -f conftest.err conftest.$ac_objext \ 101732- conftest$ac_exeext conftest.$ac_ext 101733-LIBS=$ac_check_lib_save_LIBS 101734-fi 101735-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 101736-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 101737-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 101738+ builtin and then its argument prototype would still apply. */ 101739+char mysql_query(); 101740+ 101741+int main() { 101742+mysql_query() 101743+; return 0; } 101744+EOF 101745+if { (eval echo configure:68833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 101746+ rm -rf conftest* 101747+ eval "ac_cv_lib_$ac_lib_var=yes" 101748+else 101749+ echo "configure: failed program was:" >&5 101750+ cat conftest.$ac_ext >&5 101751+ rm -rf conftest* 101752+ eval "ac_cv_lib_$ac_lib_var=no" 101753+fi 101754+rm -f conftest* 101755+LIBS="$ac_save_LIBS" 101756 101757+fi 101758+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 101759+ echo "$ac_t""yes" 1>&6 101760+ 101761 LDFLAGS=$save_old_LDFLAGS 101762 ext_shared=$save_ext_shared 101763- 101764- 101765+ 101766+ 101767 else 101768+ echo "$ac_t""no" 1>&6 101769 101770 LDFLAGS=$save_old_LDFLAGS 101771 ext_shared=$save_ext_shared 101772 unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query 101773- 101774- { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5 101775-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;} 101776- { (exit 1); exit 1; }; } 101777- 101778- 101779+ 101780+ { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; } 101781+ 101782+ 101783 fi 101784- 101785+ 101786 PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" 101787 fi 101788 101789- 101790+ 101791 for ac_i in $PDO_MYSQL_INCLUDE; do 101792 case $ac_i in 101793 -I*) 101794 ac_ii=`echo $ac_i|cut -c 3-` 101795- 101796+ 101797 if test "$ac_ii" != "/usr/include"; then 101798- 101799+ 101800 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 101801 ai_p=$ac_ii 101802 else 101803- 101804+ 101805 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101806- 101807+ 101808 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101809 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101810 fi 101811 101812- 101813- 101814+ 101815+ 101816 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101817- 101818+ 101819 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 101820 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101821 eval "INCLUDEPATH$unique=set" 101822- 101823+ 101824 if test ""; then 101825 INCLUDES="-I$ai_p $INCLUDES" 101826 else 101827 INCLUDES="$INCLUDES -I$ai_p" 101828 fi 101829- 101830+ 101831 fi 101832 101833 fi 101834@@ -88754,17 +68904,17 @@ 101835 esac 101836 done 101837 101838- 101839+ 101840 for ac_i in $PDO_MYSQL_LIBS; do 101841 case $ac_i in 101842 -pthread) 101843 if test "$ext_shared" = "yes"; then 101844 PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread" 101845 else 101846- 101847- 101848+ 101849+ 101850 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 101851- 101852+ 101853 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 101854 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101855 eval "EXTRA_LDFLAGS$unique=set" 101856@@ -88775,20 +68925,20 @@ 101857 ;; 101858 -l*) 101859 ac_ii=`echo $ac_i|cut -c 3-` 101860- 101861- 101862+ 101863+ 101864 case $ac_ii in 101865 c|c_r|pthread*) ;; 101866- *) 101867+ *) 101868 if test "$ext_shared" = "yes"; then 101869- PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 101870+ PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" 101871 else 101872- 101873- 101874+ 101875+ 101876 case $ac_ii in 101877 c|c_r|pthread*) ;; 101878- *) 101879- LIBS="$LIBS -l$ac_ii" 101880+ *) 101881+ LIBS="$LIBS -l$ac_ii" 101882 ;; 101883 esac 101884 101885@@ -88801,173 +68951,123 @@ 101886 ;; 101887 -L*) 101888 ac_ii=`echo $ac_i|cut -c 3-` 101889- 101890+ 101891 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 101892- 101893+ 101894 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 101895 ai_p=$ac_ii 101896 else 101897- 101898+ 101899 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 101900- 101901+ 101902 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 101903 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 101904 fi 101905 101906- 101907+ 101908 if test "$ext_shared" = "yes"; then 101909 PDO_MYSQL_SHARED_LIBADD="-L$ai_p $PDO_MYSQL_SHARED_LIBADD" 101910 test -n "$ld_runpath_switch" && PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_MYSQL_SHARED_LIBADD" 101911 else 101912- 101913- 101914- 101915+ 101916+ 101917+ 101918 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 101919- 101920+ 101921 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 101922 if test -n "$unique" && test "`eval $cmd`" = "" ; then 101923 eval "LIBPATH$unique=set" 101924- 101925+ 101926 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 101927 LDFLAGS="$LDFLAGS -L$ai_p" 101928 PHP_RPATHS="$PHP_RPATHS $ai_p" 101929- 101930+ 101931 fi 101932 101933 101934 fi 101935- 101936+ 101937 fi 101938 101939 ;; 101940 esac 101941 done 101942 101943- 101944- 101945+ 101946+ 101947 fi 101948 101949 101950 _SAVE_LIBS=$LIBS 101951 LIBS="$LIBS $PDO_MYSQL_LIBS" 101952- 101953- 101954- 101955- 101956-for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate 101957+ for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate 101958 do 101959-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 101960-echo "$as_me:$LINENO: checking for $ac_func" >&5 101961-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 101962-if eval "test \"\${$as_ac_var+set}\" = set"; then 101963- echo $ECHO_N "(cached) $ECHO_C" >&6 101964-else 101965- cat >conftest.$ac_ext <<_ACEOF 101966-/* confdefs.h. */ 101967-_ACEOF 101968-cat confdefs.h >>conftest.$ac_ext 101969-cat >>conftest.$ac_ext <<_ACEOF 101970-/* end confdefs.h. */ 101971-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 101972- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 101973-#define $ac_func innocuous_$ac_func 101974- 101975+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 101976+echo "configure:69007: checking for $ac_func" >&5 101977+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 101978+ echo $ac_n "(cached) $ac_c" 1>&6 101979+else 101980+ cat > conftest.$ac_ext <<EOF 101981+#line 69012 "configure" 101982+#include "confdefs.h" 101983 /* System header to define __stub macros and hopefully few prototypes, 101984- which can conflict with char $ac_func (); below. 101985- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 101986- <limits.h> exists even on freestanding compilers. */ 101987- 101988-#ifdef __STDC__ 101989-# include <limits.h> 101990-#else 101991-# include <assert.h> 101992-#endif 101993- 101994-#undef $ac_func 101995- 101996+ which can conflict with char $ac_func(); below. */ 101997+#include <assert.h> 101998 /* Override any gcc2 internal prototype to avoid an error. */ 101999-#ifdef __cplusplus 102000-extern "C" 102001-{ 102002-#endif 102003 /* We use char because int might match the return type of a gcc2 102004- builtin and then its argument prototype would still apply. */ 102005-char $ac_func (); 102006+ builtin and then its argument prototype would still apply. */ 102007+char $ac_func(); 102008+ 102009+int main() { 102010+ 102011 /* The GNU C library defines this for functions which it implements 102012 to always fail with ENOSYS. Some functions are actually named 102013 something starting with __ and the normal name is an alias. */ 102014 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 102015 choke me 102016 #else 102017-char (*f) () = $ac_func; 102018-#endif 102019-#ifdef __cplusplus 102020-} 102021+$ac_func(); 102022 #endif 102023 102024-int 102025-main () 102026-{ 102027-return f != $ac_func; 102028- ; 102029- return 0; 102030-} 102031-_ACEOF 102032-rm -f conftest.$ac_objext conftest$ac_exeext 102033-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 102034- (eval $ac_link) 2>conftest.er1 102035- ac_status=$? 102036- grep -v '^ *+' conftest.er1 >conftest.err 102037- rm -f conftest.er1 102038- cat conftest.err >&5 102039- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102040- (exit $ac_status); } && 102041- { ac_try='test -z "$ac_c_werror_flag" 102042- || test ! -s conftest.err' 102043- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102044- (eval $ac_try) 2>&5 102045- ac_status=$? 102046- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102047- (exit $ac_status); }; } && 102048- { ac_try='test -s conftest$ac_exeext' 102049- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102050- (eval $ac_try) 2>&5 102051- ac_status=$? 102052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102053- (exit $ac_status); }; }; then 102054- eval "$as_ac_var=yes" 102055-else 102056- echo "$as_me: failed program was:" >&5 102057-sed 's/^/| /' conftest.$ac_ext >&5 102058- 102059-eval "$as_ac_var=no" 102060-fi 102061-rm -f conftest.err conftest.$ac_objext \ 102062- conftest$ac_exeext conftest.$ac_ext 102063-fi 102064-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 102065-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 102066-if test `eval echo '${'$as_ac_var'}'` = yes; then 102067- cat >>confdefs.h <<_ACEOF 102068-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 102069-_ACEOF 102070+; return 0; } 102071+EOF 102072+if { (eval echo configure:69035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 102073+ rm -rf conftest* 102074+ eval "ac_cv_func_$ac_func=yes" 102075+else 102076+ echo "configure: failed program was:" >&5 102077+ cat conftest.$ac_ext >&5 102078+ rm -rf conftest* 102079+ eval "ac_cv_func_$ac_func=no" 102080+fi 102081+rm -f conftest* 102082+fi 102083 102084+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 102085+ echo "$ac_t""yes" 1>&6 102086+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 102087+ cat >> confdefs.h <<EOF 102088+#define $ac_tr_func 1 102089+EOF 102090+ 102091+else 102092+ echo "$ac_t""no" 1>&6 102093 fi 102094 done 102095- 102096+ 102097 LIBS=$_SAVE_LIBS 102098 fi 102099 102100- 102101- 102102- echo "$as_me:$LINENO: checking for PDO includes" >&5 102103-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 102104-if test "${pdo_inc_path+set}" = set; then 102105- echo $ECHO_N "(cached) $ECHO_C" >&6 102106-else 102107- 102108- echo "$as_me:$LINENO: checking for PDO includes" >&5 102109-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 102110+ 102111+ 102112+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 102113+echo "configure:69065: checking for PDO includes" >&5 102114+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 102115+ echo $ac_n "(cached) $ac_c" 1>&6 102116+else 102117+ 102118+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 102119+echo "configure:69071: checking for PDO includes" >&5 102120 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 102121 pdo_inc_path=$abs_srcdir/ext 102122 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 102123@@ -88975,30 +69075,27 @@ 102124 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 102125 pdo_inc_path=$prefix/include/php/ext 102126 fi 102127- 102128+ 102129 fi 102130-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 102131-echo "${ECHO_T}$pdo_inc_path" >&6 102132+ 102133+echo "$ac_t""$pdo_inc_path" 1>&6 102134 if test -n "$pdo_inc_path"; then 102135 : 102136 else 102137-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 102138-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 102139- { (exit 1); exit 1; }; } 102140+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 102141 fi 102142 102143- 102144+ 102145 102146 if test -n "$PDO_MYSQL_CONFIG"; then 102147 PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket` 102148- 102149-cat >>confdefs.h <<_ACEOF 102150+ cat >> confdefs.h <<EOF 102151 #define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET" 102152-_ACEOF 102153+EOF 102154 102155 fi 102156 102157- 102158+ 102159 ext_builddir=ext/pdo_mysql 102160 ext_srcdir=$abs_srcdir/ext/pdo_mysql 102161 102162@@ -89006,15 +69103,15 @@ 102163 102164 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 102165 PHP_PDO_MYSQL_SHARED=no 102166- 102167- 102168+ 102169+ 102170 case ext/pdo_mysql in 102171 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 102172 /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 102173 *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 102174 esac 102175- 102176- 102177+ 102178+ 102179 102180 b_c_pre=$php_c_pre 102181 b_cxx_pre=$php_cxx_pre 102182@@ -89027,12 +69124,12 @@ 102183 102184 old_IFS=$IFS 102185 for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do 102186- 102187+ 102188 IFS=. 102189 set $ac_src 102190 ac_obj=$1 102191 IFS=$old_IFS 102192- 102193+ 102194 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 102195 102196 case $ac_src in 102197@@ -89056,14 +69153,14 @@ 102198 else 102199 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 102200 PHP_PDO_MYSQL_SHARED=yes 102201- 102202+ 102203 case ext/pdo_mysql in 102204 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 102205 /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 102206 *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 102207 esac 102208- 102209- 102210+ 102211+ 102212 102213 b_c_pre=$shared_c_pre 102214 b_cxx_pre=$shared_cxx_pre 102215@@ -89076,12 +69173,12 @@ 102216 102217 old_IFS=$IFS 102218 for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do 102219- 102220+ 102221 IFS=. 102222 set $ac_src 102223 ac_obj=$1 102224 IFS=$old_IFS 102225- 102226+ 102227 shared_objects_pdo_mysql="$shared_objects_pdo_mysql $ac_bdir$ac_obj.lo" 102228 102229 case $ac_src in 102230@@ -89099,7 +69196,7 @@ 102231 102232 case $host_alias in 102233 *netware*) 102234- 102235+ 102236 install_modules="install-modules" 102237 102238 case $host_alias in 102239@@ -89109,7 +69206,7 @@ 102240 ;; 102241 *netware*) 102242 suffix=nlm 102243- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(PDO_MYSQL_SHARED_LIBADD)' 102244+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_MYSQL, 3)_SHARED_LIBADD)' 102245 ;; 102246 *) 102247 suffix=la 102248@@ -89122,7 +69219,7 @@ 102249 else 102250 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_mysql.$suffix" 102251 fi 102252- 102253+ 102254 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql" 102255 102256 cat >>Makefile.objects<<EOF 102257@@ -89136,7 +69233,7 @@ 102258 102259 ;; 102260 *) 102261- 102262+ 102263 install_modules="install-modules" 102264 102265 case $host_alias in 102266@@ -89146,7 +69243,7 @@ 102267 ;; 102268 *netware*) 102269 suffix=nlm 102270- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(_MYSQL_SHARED_LIBADD)' 102271+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_mysql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_MYSQL, 3)_SHARED_LIBADD)' 102272 ;; 102273 *) 102274 suffix=la 102275@@ -89159,7 +69256,7 @@ 102276 else 102277 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_mysql.$suffix" 102278 fi 102279- 102280+ 102281 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_mysql" 102282 102283 cat >>Makefile.objects<<EOF 102284@@ -89173,10 +69270,9 @@ 102285 102286 ;; 102287 esac 102288- 102289-cat >>confdefs.h <<_ACEOF 102290+ cat >> confdefs.h <<EOF 102291 #define COMPILE_DL_PDO_MYSQL 1 102292-_ACEOF 102293+EOF 102294 102295 fi 102296 fi 102297@@ -89185,15 +69281,15 @@ 102298 PHP_PDO_MYSQL_SHARED=no 102299 case "$PHP_SAPI" in 102300 cgi|embed) 102301- 102302- 102303+ 102304+ 102305 case ext/pdo_mysql in 102306 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 102307 /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 102308 *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 102309 esac 102310- 102311- 102312+ 102313+ 102314 102315 b_c_pre=$php_c_pre 102316 b_cxx_pre=$php_cxx_pre 102317@@ -89206,12 +69302,12 @@ 102318 102319 old_IFS=$IFS 102320 for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do 102321- 102322+ 102323 IFS=. 102324 set $ac_src 102325 ac_obj=$1 102326 IFS=$old_IFS 102327- 102328+ 102329 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 102330 102331 case $ac_src in 102332@@ -89231,15 +69327,15 @@ 102333 EXT_STATIC="$EXT_STATIC pdo_mysql" 102334 ;; 102335 *) 102336- 102337- 102338+ 102339+ 102340 case ext/pdo_mysql in 102341 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 102342 /*) ac_srcdir=`echo "ext/pdo_mysql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 102343 *) ac_srcdir="$abs_srcdir/ext/pdo_mysql/"; ac_bdir="ext/pdo_mysql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 102344 esac 102345- 102346- 102347+ 102348+ 102349 102350 b_c_pre=$php_c_pre 102351 b_cxx_pre=$php_cxx_pre 102352@@ -89252,13 +69348,13 @@ 102353 102354 old_IFS=$IFS 102355 for ac_src in pdo_mysql.c mysql_driver.c mysql_statement.c; do 102356- 102357+ 102358 IFS=. 102359 set $ac_src 102360 ac_obj=$1 102361 IFS=$old_IFS 102362- 102363- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 102364+ 102365+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 102366 102367 case $ac_src in 102368 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 102369@@ -89278,120 +69374,96 @@ 102370 esac 102371 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_mysql" 102372 fi 102373- 102374- 102375+ 102376+ 102377 BUILD_DIR="$BUILD_DIR $ext_builddir" 102378- 102379+ 102380 102381 102382 if test "$ext_builddir" = "."; then 102383 PHP_PECL_EXTENSION=pdo_mysql 102384- 102385+ 102386 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 102387 102388 fi 102389 102390- 102391- 102392+ 102393+ 102394 am_i_shared=$PHP_PDO_MYSQL_SHARED 102395 is_it_shared=$PHP_PDO_SHARED 102396 is_it_enabled=$PHP_PDO 102397 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 102398- { { echo "$as_me:$LINENO: error: 102399-You've configured extension pdo_mysql to build statically, but it 102400-depends on extension pdo, which you've configured to build shared. 102401-You either need to build pdo_mysql shared or build pdo statically for the 102402-build to be successful. 102403-" >&5 102404-echo "$as_me: error: 102405+ { echo "configure: error: 102406 You've configured extension pdo_mysql to build statically, but it 102407 depends on extension pdo, which you've configured to build shared. 102408 You either need to build pdo_mysql shared or build pdo statically for the 102409 build to be successful. 102410-" >&2;} 102411- { (exit 1); exit 1; }; } 102412+" 1>&2; exit 1; } 102413 fi 102414 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 102415- { { echo "$as_me:$LINENO: error: 102416-You've configured extension pdo_mysql, which depends on extension pdo, 102417-but you've either not enabled pdo, or have disabled it. 102418-" >&5 102419-echo "$as_me: error: 102420+ { echo "configure: error: 102421 You've configured extension pdo_mysql, which depends on extension pdo, 102422 but you've either not enabled pdo, or have disabled it. 102423-" >&2;} 102424- { (exit 1); exit 1; }; } 102425+" 1>&2; exit 1; } 102426 fi 102427- 102428+ 102429 if test "$PHP_MYSQL" = "mysqlnd"; then 102430- 102431+ 102432 am_i_shared=$PHP_PDO_MYSQL_SHARED 102433 is_it_shared=$PHP_MYSQLND_SHARED 102434 is_it_enabled=$PHP_MYSQLND 102435 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 102436- { { echo "$as_me:$LINENO: error: 102437-You've configured extension pdo_mysql to build statically, but it 102438-depends on extension mysqlnd, which you've configured to build shared. 102439-You either need to build pdo_mysql shared or build mysqlnd statically for the 102440-build to be successful. 102441-" >&5 102442-echo "$as_me: error: 102443+ { echo "configure: error: 102444 You've configured extension pdo_mysql to build statically, but it 102445 depends on extension mysqlnd, which you've configured to build shared. 102446 You either need to build pdo_mysql shared or build mysqlnd statically for the 102447 build to be successful. 102448-" >&2;} 102449- { (exit 1); exit 1; }; } 102450+" 1>&2; exit 1; } 102451 fi 102452 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 102453- { { echo "$as_me:$LINENO: error: 102454-You've configured extension pdo_mysql, which depends on extension mysqlnd, 102455-but you've either not enabled mysqlnd, or have disabled it. 102456-" >&5 102457-echo "$as_me: error: 102458+ { echo "configure: error: 102459 You've configured extension pdo_mysql, which depends on extension mysqlnd, 102460 but you've either not enabled mysqlnd, or have disabled it. 102461-" >&2;} 102462- { (exit 1); exit 1; }; } 102463+" 1>&2; exit 1; } 102464 fi 102465- 102466+ 102467 fi 102468- 102469+ 102470 PDO_MYSQL_MODULE_TYPE=external 102471 102472- 102473+ 102474 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_SHARED_LIBADD" 102475 102476- 102477- 102478+ 102479+ 102480 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_MYSQL_MODULE_TYPE" 102481 102482- 102483+ 102484 102485 fi 102486 102487 102488 SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 11.1 installs 102489- 102490+ 102491 102492 102493 102494 102495 php_with_pdo_oci=no 102496 102497-echo "$as_me:$LINENO: checking Oracle OCI support for PDO" >&5 102498-echo $ECHO_N "checking Oracle OCI support for PDO... $ECHO_C" >&6 102499- 102500+echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 102501+echo "configure:69456: checking Oracle OCI support for PDO" >&5 102502 # Check whether --with-pdo-oci or --without-pdo-oci was given. 102503 if test "${with_pdo_oci+set}" = set; then 102504 withval="$with_pdo_oci" 102505 PHP_PDO_OCI=$withval 102506 else 102507- 102508+ 102509 PHP_PDO_OCI=no 102510 test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL 102511 102512-fi; 102513+fi 102514+ 102515 102516 102517 ext_output="yes, shared" 102518@@ -89415,8 +69487,7 @@ 102519 102520 102521 102522-echo "$as_me:$LINENO: result: $ext_output" >&5 102523-echo "${ECHO_T}$ext_output" >&6 102524+echo "$ac_t""$ext_output" 1>&6 102525 102526 102527 102528@@ -89424,449 +69495,66 @@ 102529 if test "$PHP_PDO_OCI" != "no"; then 102530 102531 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 102532- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 102533-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 102534- { (exit 1); exit 1; }; } 102535+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 102536 fi 102537 102538- echo "$as_me:$LINENO: checking Oracle Install-Dir" >&5 102539-echo $ECHO_N "checking Oracle Install-Dir... $ECHO_C" >&6 102540+ echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 102541+echo "configure:69503: checking Oracle Install-Dir" >&5 102542 if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then 102543 PDO_OCI_DIR=$ORACLE_HOME 102544 else 102545 PDO_OCI_DIR=$PHP_PDO_OCI 102546 fi 102547- echo "$as_me:$LINENO: result: $PHP_PDO_OCI" >&5 102548-echo "${ECHO_T}$PHP_PDO_OCI" >&6 102549+ echo "$ac_t""$PHP_PDO_OCI" 1>&6 102550 102551- echo "$as_me:$LINENO: checking if that is sane" >&5 102552-echo $ECHO_N "checking if that is sane... $ECHO_C" >&6 102553+ echo $ac_n "checking if that is sane""... $ac_c" 1>&6 102554+echo "configure:69512: checking if that is sane" >&5 102555 if test -z "$PDO_OCI_DIR"; then 102556- { { echo "$as_me:$LINENO: error: 102557-You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. 102558-" >&5 102559-echo "$as_me: error: 102560+ { echo "configure: error: 102561 You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. 102562-" >&2;} 102563- { (exit 1); exit 1; }; } 102564+" 1>&2; exit 1; } 102565 else 102566- echo "$as_me:$LINENO: result: yes" >&5 102567-echo "${ECHO_T}yes" >&6 102568+ echo "$ac_t""yes" 1>&6 102569 fi 102570 102571 if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then 102572- echo "$as_me:$LINENO: checking for long int" >&5 102573-echo $ECHO_N "checking for long int... $ECHO_C" >&6 102574-if test "${ac_cv_type_long_int+set}" = set; then 102575- echo $ECHO_N "(cached) $ECHO_C" >&6 102576-else 102577- cat >conftest.$ac_ext <<_ACEOF 102578-/* confdefs.h. */ 102579-_ACEOF 102580-cat confdefs.h >>conftest.$ac_ext 102581-cat >>conftest.$ac_ext <<_ACEOF 102582-/* end confdefs.h. */ 102583-$ac_includes_default 102584-int 102585-main () 102586-{ 102587-if ((long int *) 0) 102588- return 0; 102589-if (sizeof (long int)) 102590- return 0; 102591- ; 102592- return 0; 102593-} 102594-_ACEOF 102595-rm -f conftest.$ac_objext 102596-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102597- (eval $ac_compile) 2>conftest.er1 102598- ac_status=$? 102599- grep -v '^ *+' conftest.er1 >conftest.err 102600- rm -f conftest.er1 102601- cat conftest.err >&5 102602- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102603- (exit $ac_status); } && 102604- { ac_try='test -z "$ac_c_werror_flag" 102605- || test ! -s conftest.err' 102606- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102607- (eval $ac_try) 2>&5 102608- ac_status=$? 102609- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102610- (exit $ac_status); }; } && 102611- { ac_try='test -s conftest.$ac_objext' 102612- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102613- (eval $ac_try) 2>&5 102614- ac_status=$? 102615- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102616- (exit $ac_status); }; }; then 102617- ac_cv_type_long_int=yes 102618-else 102619- echo "$as_me: failed program was:" >&5 102620-sed 's/^/| /' conftest.$ac_ext >&5 102621- 102622-ac_cv_type_long_int=no 102623-fi 102624-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102625-fi 102626-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 102627-echo "${ECHO_T}$ac_cv_type_long_int" >&6 102628- 102629-echo "$as_me:$LINENO: checking size of long int" >&5 102630-echo $ECHO_N "checking size of long int... $ECHO_C" >&6 102631-if test "${ac_cv_sizeof_long_int+set}" = set; then 102632- echo $ECHO_N "(cached) $ECHO_C" >&6 102633-else 102634- if test "$ac_cv_type_long_int" = yes; then 102635- # The cast to unsigned long works around a bug in the HP C Compiler 102636- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 102637- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 102638- # This bug is HP SR number 8606223364. 102639- if test "$cross_compiling" = yes; then 102640- # Depending upon the size, compute the lo and hi bounds. 102641-cat >conftest.$ac_ext <<_ACEOF 102642-/* confdefs.h. */ 102643-_ACEOF 102644-cat confdefs.h >>conftest.$ac_ext 102645-cat >>conftest.$ac_ext <<_ACEOF 102646-/* end confdefs.h. */ 102647-$ac_includes_default 102648-int 102649-main () 102650-{ 102651-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; 102652-test_array [0] = 0 102653- 102654- ; 102655- return 0; 102656-} 102657-_ACEOF 102658-rm -f conftest.$ac_objext 102659-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102660- (eval $ac_compile) 2>conftest.er1 102661- ac_status=$? 102662- grep -v '^ *+' conftest.er1 >conftest.err 102663- rm -f conftest.er1 102664- cat conftest.err >&5 102665- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102666- (exit $ac_status); } && 102667- { ac_try='test -z "$ac_c_werror_flag" 102668- || test ! -s conftest.err' 102669- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102670- (eval $ac_try) 2>&5 102671- ac_status=$? 102672- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102673- (exit $ac_status); }; } && 102674- { ac_try='test -s conftest.$ac_objext' 102675- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102676- (eval $ac_try) 2>&5 102677- ac_status=$? 102678- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102679- (exit $ac_status); }; }; then 102680- ac_lo=0 ac_mid=0 102681- while :; do 102682- cat >conftest.$ac_ext <<_ACEOF 102683-/* confdefs.h. */ 102684-_ACEOF 102685-cat confdefs.h >>conftest.$ac_ext 102686-cat >>conftest.$ac_ext <<_ACEOF 102687-/* end confdefs.h. */ 102688-$ac_includes_default 102689-int 102690-main () 102691-{ 102692-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 102693-test_array [0] = 0 102694- 102695- ; 102696- return 0; 102697-} 102698-_ACEOF 102699-rm -f conftest.$ac_objext 102700-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102701- (eval $ac_compile) 2>conftest.er1 102702- ac_status=$? 102703- grep -v '^ *+' conftest.er1 >conftest.err 102704- rm -f conftest.er1 102705- cat conftest.err >&5 102706- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102707- (exit $ac_status); } && 102708- { ac_try='test -z "$ac_c_werror_flag" 102709- || test ! -s conftest.err' 102710- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102711- (eval $ac_try) 2>&5 102712- ac_status=$? 102713- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102714- (exit $ac_status); }; } && 102715- { ac_try='test -s conftest.$ac_objext' 102716- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102717- (eval $ac_try) 2>&5 102718- ac_status=$? 102719- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102720- (exit $ac_status); }; }; then 102721- ac_hi=$ac_mid; break 102722-else 102723- echo "$as_me: failed program was:" >&5 102724-sed 's/^/| /' conftest.$ac_ext >&5 102725- 102726-ac_lo=`expr $ac_mid + 1` 102727- if test $ac_lo -le $ac_mid; then 102728- ac_lo= ac_hi= 102729- break 102730- fi 102731- ac_mid=`expr 2 '*' $ac_mid + 1` 102732-fi 102733-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102734- done 102735-else 102736- echo "$as_me: failed program was:" >&5 102737-sed 's/^/| /' conftest.$ac_ext >&5 102738- 102739-cat >conftest.$ac_ext <<_ACEOF 102740-/* confdefs.h. */ 102741-_ACEOF 102742-cat confdefs.h >>conftest.$ac_ext 102743-cat >>conftest.$ac_ext <<_ACEOF 102744-/* end confdefs.h. */ 102745-$ac_includes_default 102746-int 102747-main () 102748-{ 102749-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; 102750-test_array [0] = 0 102751- 102752- ; 102753- return 0; 102754-} 102755-_ACEOF 102756-rm -f conftest.$ac_objext 102757-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102758- (eval $ac_compile) 2>conftest.er1 102759- ac_status=$? 102760- grep -v '^ *+' conftest.er1 >conftest.err 102761- rm -f conftest.er1 102762- cat conftest.err >&5 102763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102764- (exit $ac_status); } && 102765- { ac_try='test -z "$ac_c_werror_flag" 102766- || test ! -s conftest.err' 102767- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102768- (eval $ac_try) 2>&5 102769- ac_status=$? 102770- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102771- (exit $ac_status); }; } && 102772- { ac_try='test -s conftest.$ac_objext' 102773- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102774- (eval $ac_try) 2>&5 102775- ac_status=$? 102776- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102777- (exit $ac_status); }; }; then 102778- ac_hi=-1 ac_mid=-1 102779- while :; do 102780- cat >conftest.$ac_ext <<_ACEOF 102781-/* confdefs.h. */ 102782-_ACEOF 102783-cat confdefs.h >>conftest.$ac_ext 102784-cat >>conftest.$ac_ext <<_ACEOF 102785-/* end confdefs.h. */ 102786-$ac_includes_default 102787-int 102788-main () 102789-{ 102790-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; 102791-test_array [0] = 0 102792- 102793- ; 102794- return 0; 102795-} 102796-_ACEOF 102797-rm -f conftest.$ac_objext 102798-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102799- (eval $ac_compile) 2>conftest.er1 102800- ac_status=$? 102801- grep -v '^ *+' conftest.er1 >conftest.err 102802- rm -f conftest.er1 102803- cat conftest.err >&5 102804- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102805- (exit $ac_status); } && 102806- { ac_try='test -z "$ac_c_werror_flag" 102807- || test ! -s conftest.err' 102808- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102809- (eval $ac_try) 2>&5 102810- ac_status=$? 102811- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102812- (exit $ac_status); }; } && 102813- { ac_try='test -s conftest.$ac_objext' 102814- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102815- (eval $ac_try) 2>&5 102816- ac_status=$? 102817- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102818- (exit $ac_status); }; }; then 102819- ac_lo=$ac_mid; break 102820-else 102821- echo "$as_me: failed program was:" >&5 102822-sed 's/^/| /' conftest.$ac_ext >&5 102823- 102824-ac_hi=`expr '(' $ac_mid ')' - 1` 102825- if test $ac_mid -le $ac_hi; then 102826- ac_lo= ac_hi= 102827- break 102828- fi 102829- ac_mid=`expr 2 '*' $ac_mid` 102830-fi 102831-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102832- done 102833-else 102834- echo "$as_me: failed program was:" >&5 102835-sed 's/^/| /' conftest.$ac_ext >&5 102836- 102837-ac_lo= ac_hi= 102838-fi 102839-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102840-fi 102841-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102842-# Binary search between lo and hi bounds. 102843-while test "x$ac_lo" != "x$ac_hi"; do 102844- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 102845- cat >conftest.$ac_ext <<_ACEOF 102846-/* confdefs.h. */ 102847-_ACEOF 102848-cat confdefs.h >>conftest.$ac_ext 102849-cat >>conftest.$ac_ext <<_ACEOF 102850-/* end confdefs.h. */ 102851-$ac_includes_default 102852-int 102853-main () 102854-{ 102855-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 102856-test_array [0] = 0 102857- 102858- ; 102859- return 0; 102860-} 102861-_ACEOF 102862-rm -f conftest.$ac_objext 102863-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 102864- (eval $ac_compile) 2>conftest.er1 102865- ac_status=$? 102866- grep -v '^ *+' conftest.er1 >conftest.err 102867- rm -f conftest.er1 102868- cat conftest.err >&5 102869- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102870- (exit $ac_status); } && 102871- { ac_try='test -z "$ac_c_werror_flag" 102872- || test ! -s conftest.err' 102873- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102874- (eval $ac_try) 2>&5 102875- ac_status=$? 102876- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102877- (exit $ac_status); }; } && 102878- { ac_try='test -s conftest.$ac_objext' 102879- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102880- (eval $ac_try) 2>&5 102881- ac_status=$? 102882- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102883- (exit $ac_status); }; }; then 102884- ac_hi=$ac_mid 102885-else 102886- echo "$as_me: failed program was:" >&5 102887-sed 's/^/| /' conftest.$ac_ext >&5 102888- 102889-ac_lo=`expr '(' $ac_mid ')' + 1` 102890-fi 102891-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 102892-done 102893-case $ac_lo in 102894-?*) ac_cv_sizeof_long_int=$ac_lo;; 102895-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 102896-See \`config.log' for more details." >&5 102897-echo "$as_me: error: cannot compute sizeof (long int), 77 102898-See \`config.log' for more details." >&2;} 102899- { (exit 1); exit 1; }; } ;; 102900-esac 102901+ echo $ac_n "checking size of long int""... $ac_c" 1>&6 102902+echo "configure:69523: checking size of long int" >&5 102903+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then 102904+ echo $ac_n "(cached) $ac_c" 1>&6 102905 else 102906 if test "$cross_compiling" = yes; then 102907- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 102908-See \`config.log' for more details." >&5 102909-echo "$as_me: error: cannot run test program while cross compiling 102910-See \`config.log' for more details." >&2;} 102911- { (exit 1); exit 1; }; } 102912-else 102913- cat >conftest.$ac_ext <<_ACEOF 102914-/* confdefs.h. */ 102915-_ACEOF 102916-cat confdefs.h >>conftest.$ac_ext 102917-cat >>conftest.$ac_ext <<_ACEOF 102918-/* end confdefs.h. */ 102919-$ac_includes_default 102920-long longval () { return (long) (sizeof (long int)); } 102921-unsigned long ulongval () { return (long) (sizeof (long int)); } 102922+ ac_cv_sizeof_long_int=4 102923+else 102924+ cat > conftest.$ac_ext <<EOF 102925+#line 69531 "configure" 102926+#include "confdefs.h" 102927 #include <stdio.h> 102928-#include <stdlib.h> 102929-int 102930-main () 102931+main() 102932 { 102933- 102934- FILE *f = fopen ("conftest.val", "w"); 102935- if (! f) 102936- exit (1); 102937- if (((long) (sizeof (long int))) < 0) 102938- { 102939- long i = longval (); 102940- if (i != ((long) (sizeof (long int)))) 102941- exit (1); 102942- fprintf (f, "%ld\n", i); 102943- } 102944- else 102945- { 102946- unsigned long i = ulongval (); 102947- if (i != ((long) (sizeof (long int)))) 102948- exit (1); 102949- fprintf (f, "%lu\n", i); 102950- } 102951- exit (ferror (f) || fclose (f) != 0); 102952- 102953- ; 102954- return 0; 102955+ FILE *f=fopen("conftestval", "w"); 102956+ if (!f) exit(1); 102957+ fprintf(f, "%d\n", sizeof(long int)); 102958+ exit(0); 102959 } 102960-_ACEOF 102961-rm -f conftest$ac_exeext 102962-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 102963- (eval $ac_link) 2>&5 102964- ac_status=$? 102965- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102966- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 102967- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 102968- (eval $ac_try) 2>&5 102969- ac_status=$? 102970- echo "$as_me:$LINENO: \$? = $ac_status" >&5 102971- (exit $ac_status); }; }; then 102972- ac_cv_sizeof_long_int=`cat conftest.val` 102973-else 102974- echo "$as_me: program exited with status $ac_status" >&5 102975-echo "$as_me: failed program was:" >&5 102976-sed 's/^/| /' conftest.$ac_ext >&5 102977- 102978-( exit $ac_status ) 102979-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 102980-See \`config.log' for more details." >&5 102981-echo "$as_me: error: cannot compute sizeof (long int), 77 102982-See \`config.log' for more details." >&2;} 102983- { (exit 1); exit 1; }; } 102984-fi 102985-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 102986-fi 102987-fi 102988-rm -f conftest.val 102989+EOF 102990+if { (eval echo configure:69542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 102991+then 102992+ ac_cv_sizeof_long_int=`cat conftestval` 102993 else 102994+ echo "configure: failed program was:" >&5 102995+ cat conftest.$ac_ext >&5 102996+ rm -fr conftest* 102997 ac_cv_sizeof_long_int=0 102998 fi 102999+rm -fr conftest* 103000+fi 103001+ 103002 fi 103003-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 103004-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 103005-cat >>confdefs.h <<_ACEOF 103006+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 103007+cat >> confdefs.h <<EOF 103008 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int 103009-_ACEOF 103010+EOF 103011 103012 103013 if test "$ac_cv_sizeof_long_int" = "4" ; then 103014@@ -89883,148 +69571,142 @@ 103015 PDO_OCI_IC_VERS="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`" 103016 fi 103017 fi 103018- echo "$as_me:$LINENO: checking for oci.h" >&5 103019-echo $ECHO_N "checking for oci.h... $ECHO_C" >&6 103020+ echo $ac_n "checking for oci.h""... $ac_c" 1>&6 103021+echo "configure:69576: checking for oci.h" >&5 103022 if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then 103023- 103024+ 103025 if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then 103026- 103027+ 103028 if test -z "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" || echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" | grep '^/' >/dev/null ; then 103029 ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR 103030 else 103031- 103032+ 103033 ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 103034- 103035+ 103036 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103037 ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR\"`" 103038 fi 103039 103040- 103041- 103042+ 103043+ 103044 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103045- 103046+ 103047 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103048 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103049 eval "INCLUDEPATH$unique=set" 103050- 103051+ 103052 if test ""; then 103053 INCLUDES="-I$ai_p $INCLUDES" 103054 else 103055 INCLUDES="$INCLUDES -I$ai_p" 103056 fi 103057- 103058+ 103059 fi 103060 103061 fi 103062 103063- echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&5 103064-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&6 103065+ echo "$ac_t""$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" 1>&6 103066 elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include/oci.h ; then 103067- 103068+ 103069 if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then 103070- 103071+ 103072 if test -z "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" || echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" | grep '^/' >/dev/null ; then 103073 ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include 103074 else 103075- 103076+ 103077 ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 103078- 103079+ 103080 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103081 ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include\"`" 103082 fi 103083 103084- 103085- 103086+ 103087+ 103088 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103089- 103090+ 103091 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103092 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103093 eval "INCLUDEPATH$unique=set" 103094- 103095+ 103096 if test ""; then 103097 INCLUDES="-I$ai_p $INCLUDES" 103098 else 103099 INCLUDES="$INCLUDES -I$ai_p" 103100 fi 103101- 103102+ 103103 fi 103104 103105 fi 103106 103107- echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&5 103108-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&6 103109+ echo "$ac_t""$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" 1>&6 103110 elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then 103111- 103112+ 103113 if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then 103114- 103115+ 103116 if test -z "$PDO_OCI_IC_PREFIX/sdk/include" || echo "$PDO_OCI_IC_PREFIX/sdk/include" | grep '^/' >/dev/null ; then 103117 ai_p=$PDO_OCI_IC_PREFIX/sdk/include 103118 else 103119- 103120+ 103121 ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`" 103122- 103123+ 103124 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103125 ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`" 103126 fi 103127 103128- 103129- 103130+ 103131+ 103132 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103133- 103134+ 103135 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103136 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103137 eval "INCLUDEPATH$unique=set" 103138- 103139+ 103140 if test ""; then 103141 INCLUDES="-I$ai_p $INCLUDES" 103142 else 103143 INCLUDES="$INCLUDES -I$ai_p" 103144 fi 103145- 103146+ 103147 fi 103148 103149 fi 103150 103151- echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/sdk/include" >&5 103152-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/sdk/include" >&6 103153+ echo "$ac_t""$PDO_OCI_IC_PREFIX/sdk/include" 1>&6 103154 elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then 103155- 103156+ 103157 if test "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then 103158- 103159+ 103160 if test -z "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" || echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" | grep '^/' >/dev/null ; then 103161 ai_p=$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include 103162 else 103163- 103164+ 103165 ep_dir="`echo $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 103166- 103167+ 103168 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103169 ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include\"`" 103170 fi 103171 103172- 103173- 103174+ 103175+ 103176 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103177- 103178+ 103179 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103180 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103181 eval "INCLUDEPATH$unique=set" 103182- 103183+ 103184 if test ""; then 103185 INCLUDES="-I$ai_p $INCLUDES" 103186 else 103187 INCLUDES="$INCLUDES -I$ai_p" 103188 fi 103189- 103190+ 103191 fi 103192 103193 fi 103194 103195- echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&5 103196-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6 103197+ echo "$ac_t""$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" 1>&6 103198 else 103199- { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&5 103200-echo "$as_me: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&2;} 103201- { (exit 1); exit 1; }; } 103202+ { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; } 103203 fi 103204 if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then 103205 PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib" 103206@@ -90033,441 +69715,62 @@ 103207 elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then 103208 PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX" 103209 else 103210- { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&5 103211-echo "$as_me: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&2;} 103212- { (exit 1); exit 1; }; } 103213+ { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; } 103214 fi 103215 PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`" 103216 else 103217- 103218- echo "$as_me:$LINENO: checking for long int" >&5 103219-echo $ECHO_N "checking for long int... $ECHO_C" >&6 103220-if test "${ac_cv_type_long_int+set}" = set; then 103221- echo $ECHO_N "(cached) $ECHO_C" >&6 103222-else 103223- cat >conftest.$ac_ext <<_ACEOF 103224-/* confdefs.h. */ 103225-_ACEOF 103226-cat confdefs.h >>conftest.$ac_ext 103227-cat >>conftest.$ac_ext <<_ACEOF 103228-/* end confdefs.h. */ 103229-$ac_includes_default 103230-int 103231-main () 103232-{ 103233-if ((long int *) 0) 103234- return 0; 103235-if (sizeof (long int)) 103236- return 0; 103237- ; 103238- return 0; 103239-} 103240-_ACEOF 103241-rm -f conftest.$ac_objext 103242-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103243- (eval $ac_compile) 2>conftest.er1 103244- ac_status=$? 103245- grep -v '^ *+' conftest.er1 >conftest.err 103246- rm -f conftest.er1 103247- cat conftest.err >&5 103248- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103249- (exit $ac_status); } && 103250- { ac_try='test -z "$ac_c_werror_flag" 103251- || test ! -s conftest.err' 103252- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103253- (eval $ac_try) 2>&5 103254- ac_status=$? 103255- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103256- (exit $ac_status); }; } && 103257- { ac_try='test -s conftest.$ac_objext' 103258- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103259- (eval $ac_try) 2>&5 103260- ac_status=$? 103261- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103262- (exit $ac_status); }; }; then 103263- ac_cv_type_long_int=yes 103264-else 103265- echo "$as_me: failed program was:" >&5 103266-sed 's/^/| /' conftest.$ac_ext >&5 103267- 103268-ac_cv_type_long_int=no 103269-fi 103270-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103271-fi 103272-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 103273-echo "${ECHO_T}$ac_cv_type_long_int" >&6 103274- 103275-echo "$as_me:$LINENO: checking size of long int" >&5 103276-echo $ECHO_N "checking size of long int... $ECHO_C" >&6 103277-if test "${ac_cv_sizeof_long_int+set}" = set; then 103278- echo $ECHO_N "(cached) $ECHO_C" >&6 103279-else 103280- if test "$ac_cv_type_long_int" = yes; then 103281- # The cast to unsigned long works around a bug in the HP C Compiler 103282- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 103283- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 103284- # This bug is HP SR number 8606223364. 103285- if test "$cross_compiling" = yes; then 103286- # Depending upon the size, compute the lo and hi bounds. 103287-cat >conftest.$ac_ext <<_ACEOF 103288-/* confdefs.h. */ 103289-_ACEOF 103290-cat confdefs.h >>conftest.$ac_ext 103291-cat >>conftest.$ac_ext <<_ACEOF 103292-/* end confdefs.h. */ 103293-$ac_includes_default 103294-int 103295-main () 103296-{ 103297-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; 103298-test_array [0] = 0 103299- 103300- ; 103301- return 0; 103302-} 103303-_ACEOF 103304-rm -f conftest.$ac_objext 103305-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103306- (eval $ac_compile) 2>conftest.er1 103307- ac_status=$? 103308- grep -v '^ *+' conftest.er1 >conftest.err 103309- rm -f conftest.er1 103310- cat conftest.err >&5 103311- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103312- (exit $ac_status); } && 103313- { ac_try='test -z "$ac_c_werror_flag" 103314- || test ! -s conftest.err' 103315- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103316- (eval $ac_try) 2>&5 103317- ac_status=$? 103318- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103319- (exit $ac_status); }; } && 103320- { ac_try='test -s conftest.$ac_objext' 103321- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103322- (eval $ac_try) 2>&5 103323- ac_status=$? 103324- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103325- (exit $ac_status); }; }; then 103326- ac_lo=0 ac_mid=0 103327- while :; do 103328- cat >conftest.$ac_ext <<_ACEOF 103329-/* confdefs.h. */ 103330-_ACEOF 103331-cat confdefs.h >>conftest.$ac_ext 103332-cat >>conftest.$ac_ext <<_ACEOF 103333-/* end confdefs.h. */ 103334-$ac_includes_default 103335-int 103336-main () 103337-{ 103338-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 103339-test_array [0] = 0 103340- 103341- ; 103342- return 0; 103343-} 103344-_ACEOF 103345-rm -f conftest.$ac_objext 103346-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103347- (eval $ac_compile) 2>conftest.er1 103348- ac_status=$? 103349- grep -v '^ *+' conftest.er1 >conftest.err 103350- rm -f conftest.er1 103351- cat conftest.err >&5 103352- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103353- (exit $ac_status); } && 103354- { ac_try='test -z "$ac_c_werror_flag" 103355- || test ! -s conftest.err' 103356- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103357- (eval $ac_try) 2>&5 103358- ac_status=$? 103359- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103360- (exit $ac_status); }; } && 103361- { ac_try='test -s conftest.$ac_objext' 103362- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103363- (eval $ac_try) 2>&5 103364- ac_status=$? 103365- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103366- (exit $ac_status); }; }; then 103367- ac_hi=$ac_mid; break 103368-else 103369- echo "$as_me: failed program was:" >&5 103370-sed 's/^/| /' conftest.$ac_ext >&5 103371- 103372-ac_lo=`expr $ac_mid + 1` 103373- if test $ac_lo -le $ac_mid; then 103374- ac_lo= ac_hi= 103375- break 103376- fi 103377- ac_mid=`expr 2 '*' $ac_mid + 1` 103378-fi 103379-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103380- done 103381-else 103382- echo "$as_me: failed program was:" >&5 103383-sed 's/^/| /' conftest.$ac_ext >&5 103384- 103385-cat >conftest.$ac_ext <<_ACEOF 103386-/* confdefs.h. */ 103387-_ACEOF 103388-cat confdefs.h >>conftest.$ac_ext 103389-cat >>conftest.$ac_ext <<_ACEOF 103390-/* end confdefs.h. */ 103391-$ac_includes_default 103392-int 103393-main () 103394-{ 103395-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; 103396-test_array [0] = 0 103397- 103398- ; 103399- return 0; 103400-} 103401-_ACEOF 103402-rm -f conftest.$ac_objext 103403-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103404- (eval $ac_compile) 2>conftest.er1 103405- ac_status=$? 103406- grep -v '^ *+' conftest.er1 >conftest.err 103407- rm -f conftest.er1 103408- cat conftest.err >&5 103409- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103410- (exit $ac_status); } && 103411- { ac_try='test -z "$ac_c_werror_flag" 103412- || test ! -s conftest.err' 103413- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103414- (eval $ac_try) 2>&5 103415- ac_status=$? 103416- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103417- (exit $ac_status); }; } && 103418- { ac_try='test -s conftest.$ac_objext' 103419- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103420- (eval $ac_try) 2>&5 103421- ac_status=$? 103422- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103423- (exit $ac_status); }; }; then 103424- ac_hi=-1 ac_mid=-1 103425- while :; do 103426- cat >conftest.$ac_ext <<_ACEOF 103427-/* confdefs.h. */ 103428-_ACEOF 103429-cat confdefs.h >>conftest.$ac_ext 103430-cat >>conftest.$ac_ext <<_ACEOF 103431-/* end confdefs.h. */ 103432-$ac_includes_default 103433-int 103434-main () 103435-{ 103436-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; 103437-test_array [0] = 0 103438- 103439- ; 103440- return 0; 103441-} 103442-_ACEOF 103443-rm -f conftest.$ac_objext 103444-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103445- (eval $ac_compile) 2>conftest.er1 103446- ac_status=$? 103447- grep -v '^ *+' conftest.er1 >conftest.err 103448- rm -f conftest.er1 103449- cat conftest.err >&5 103450- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103451- (exit $ac_status); } && 103452- { ac_try='test -z "$ac_c_werror_flag" 103453- || test ! -s conftest.err' 103454- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103455- (eval $ac_try) 2>&5 103456- ac_status=$? 103457- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103458- (exit $ac_status); }; } && 103459- { ac_try='test -s conftest.$ac_objext' 103460- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103461- (eval $ac_try) 2>&5 103462- ac_status=$? 103463- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103464- (exit $ac_status); }; }; then 103465- ac_lo=$ac_mid; break 103466-else 103467- echo "$as_me: failed program was:" >&5 103468-sed 's/^/| /' conftest.$ac_ext >&5 103469- 103470-ac_hi=`expr '(' $ac_mid ')' - 1` 103471- if test $ac_mid -le $ac_hi; then 103472- ac_lo= ac_hi= 103473- break 103474- fi 103475- ac_mid=`expr 2 '*' $ac_mid` 103476-fi 103477-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103478- done 103479-else 103480- echo "$as_me: failed program was:" >&5 103481-sed 's/^/| /' conftest.$ac_ext >&5 103482- 103483-ac_lo= ac_hi= 103484-fi 103485-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103486-fi 103487-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103488-# Binary search between lo and hi bounds. 103489-while test "x$ac_lo" != "x$ac_hi"; do 103490- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 103491- cat >conftest.$ac_ext <<_ACEOF 103492-/* confdefs.h. */ 103493-_ACEOF 103494-cat confdefs.h >>conftest.$ac_ext 103495-cat >>conftest.$ac_ext <<_ACEOF 103496-/* end confdefs.h. */ 103497-$ac_includes_default 103498-int 103499-main () 103500-{ 103501-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 103502-test_array [0] = 0 103503- 103504- ; 103505- return 0; 103506-} 103507-_ACEOF 103508-rm -f conftest.$ac_objext 103509-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 103510- (eval $ac_compile) 2>conftest.er1 103511- ac_status=$? 103512- grep -v '^ *+' conftest.er1 >conftest.err 103513- rm -f conftest.er1 103514- cat conftest.err >&5 103515- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103516- (exit $ac_status); } && 103517- { ac_try='test -z "$ac_c_werror_flag" 103518- || test ! -s conftest.err' 103519- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103520- (eval $ac_try) 2>&5 103521- ac_status=$? 103522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103523- (exit $ac_status); }; } && 103524- { ac_try='test -s conftest.$ac_objext' 103525- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103526- (eval $ac_try) 2>&5 103527- ac_status=$? 103528- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103529- (exit $ac_status); }; }; then 103530- ac_hi=$ac_mid 103531-else 103532- echo "$as_me: failed program was:" >&5 103533-sed 's/^/| /' conftest.$ac_ext >&5 103534- 103535-ac_lo=`expr '(' $ac_mid ')' + 1` 103536-fi 103537-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 103538-done 103539-case $ac_lo in 103540-?*) ac_cv_sizeof_long_int=$ac_lo;; 103541-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 103542-See \`config.log' for more details." >&5 103543-echo "$as_me: error: cannot compute sizeof (long int), 77 103544-See \`config.log' for more details." >&2;} 103545- { (exit 1); exit 1; }; } ;; 103546-esac 103547+ 103548+ echo $ac_n "checking size of long int""... $ac_c" 1>&6 103549+echo "configure:69725: checking size of long int" >&5 103550+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then 103551+ echo $ac_n "(cached) $ac_c" 1>&6 103552 else 103553 if test "$cross_compiling" = yes; then 103554- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 103555-See \`config.log' for more details." >&5 103556-echo "$as_me: error: cannot run test program while cross compiling 103557-See \`config.log' for more details." >&2;} 103558- { (exit 1); exit 1; }; } 103559-else 103560- cat >conftest.$ac_ext <<_ACEOF 103561-/* confdefs.h. */ 103562-_ACEOF 103563-cat confdefs.h >>conftest.$ac_ext 103564-cat >>conftest.$ac_ext <<_ACEOF 103565-/* end confdefs.h. */ 103566-$ac_includes_default 103567-long longval () { return (long) (sizeof (long int)); } 103568-unsigned long ulongval () { return (long) (sizeof (long int)); } 103569+ ac_cv_sizeof_long_int=4 103570+else 103571+ cat > conftest.$ac_ext <<EOF 103572+#line 69733 "configure" 103573+#include "confdefs.h" 103574 #include <stdio.h> 103575-#include <stdlib.h> 103576-int 103577-main () 103578+main() 103579 { 103580- 103581- FILE *f = fopen ("conftest.val", "w"); 103582- if (! f) 103583- exit (1); 103584- if (((long) (sizeof (long int))) < 0) 103585- { 103586- long i = longval (); 103587- if (i != ((long) (sizeof (long int)))) 103588- exit (1); 103589- fprintf (f, "%ld\n", i); 103590- } 103591- else 103592- { 103593- unsigned long i = ulongval (); 103594- if (i != ((long) (sizeof (long int)))) 103595- exit (1); 103596- fprintf (f, "%lu\n", i); 103597- } 103598- exit (ferror (f) || fclose (f) != 0); 103599- 103600- ; 103601- return 0; 103602+ FILE *f=fopen("conftestval", "w"); 103603+ if (!f) exit(1); 103604+ fprintf(f, "%d\n", sizeof(long int)); 103605+ exit(0); 103606 } 103607-_ACEOF 103608-rm -f conftest$ac_exeext 103609-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 103610- (eval $ac_link) 2>&5 103611- ac_status=$? 103612- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103613- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 103614- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 103615- (eval $ac_try) 2>&5 103616- ac_status=$? 103617- echo "$as_me:$LINENO: \$? = $ac_status" >&5 103618- (exit $ac_status); }; }; then 103619- ac_cv_sizeof_long_int=`cat conftest.val` 103620-else 103621- echo "$as_me: program exited with status $ac_status" >&5 103622-echo "$as_me: failed program was:" >&5 103623-sed 's/^/| /' conftest.$ac_ext >&5 103624- 103625-( exit $ac_status ) 103626-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 103627-See \`config.log' for more details." >&5 103628-echo "$as_me: error: cannot compute sizeof (long int), 77 103629-See \`config.log' for more details." >&2;} 103630- { (exit 1); exit 1; }; } 103631-fi 103632-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 103633-fi 103634-fi 103635-rm -f conftest.val 103636+EOF 103637+if { (eval echo configure:69744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 103638+then 103639+ ac_cv_sizeof_long_int=`cat conftestval` 103640 else 103641+ echo "configure: failed program was:" >&5 103642+ cat conftest.$ac_ext >&5 103643+ rm -fr conftest* 103644 ac_cv_sizeof_long_int=0 103645 fi 103646+rm -fr conftest* 103647+fi 103648+ 103649 fi 103650-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 103651-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 103652-cat >>confdefs.h <<_ACEOF 103653+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 103654+cat >> confdefs.h <<EOF 103655 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int 103656-_ACEOF 103657+EOF 103658 103659 103660- echo "$as_me:$LINENO: checking if we're on a 64-bit platform" >&5 103661-echo $ECHO_N "checking if we're on a 64-bit platform... $ECHO_C" >&6 103662+ echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 103663+echo "configure:69764: checking if we're on a 64-bit platform" >&5 103664 if test "$ac_cv_sizeof_long_int" = "4" ; then 103665- echo "$as_me:$LINENO: result: no" >&5 103666-echo "${ECHO_T}no" >&6 103667+ echo "$ac_t""no" 1>&6 103668 TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" 103669 else 103670- echo "$as_me:$LINENO: result: yes" >&5 103671-echo "${ECHO_T}yes" >&6 103672+ echo "$ac_t""yes" 1>&6 103673 TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" 103674 fi 103675 103676- echo "$as_me:$LINENO: checking OCI8 libraries dir" >&5 103677-echo $ECHO_N "checking OCI8 libraries dir... $ECHO_C" >&6 103678+ echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 103679+echo "configure:69774: checking OCI8 libraries dir" >&5 103680 if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then 103681 PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" 103682 elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then 103683@@ -90475,42 +69778,39 @@ 103684 elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then 103685 PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR 103686 else 103687- { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found" >&5 103688-echo "$as_me: error: Oracle required OCI8 libraries not found" >&2;} 103689- { (exit 1); exit 1; }; } 103690+ { echo "configure: error: Oracle required OCI8 libraries not found" 1>&2; exit 1; } 103691 fi 103692- echo "$as_me:$LINENO: result: $PDO_OCI_LIB_DIR" >&5 103693-echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6 103694+ echo "$ac_t""$PDO_OCI_LIB_DIR" 1>&6 103695 103696 103697 if test -d "$PDO_OCI_DIR/rdbms/public"; then 103698- 103699+ 103700 if test "$PDO_OCI_DIR/rdbms/public" != "/usr/include"; then 103701- 103702+ 103703 if test -z "$PDO_OCI_DIR/rdbms/public" || echo "$PDO_OCI_DIR/rdbms/public" | grep '^/' >/dev/null ; then 103704 ai_p=$PDO_OCI_DIR/rdbms/public 103705 else 103706- 103707+ 103708 ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`" 103709- 103710+ 103711 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103712 ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`" 103713 fi 103714 103715- 103716- 103717+ 103718+ 103719 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103720- 103721+ 103722 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103723 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103724 eval "INCLUDEPATH$unique=set" 103725- 103726+ 103727 if test ""; then 103728 INCLUDES="-I$ai_p $INCLUDES" 103729 else 103730 INCLUDES="$INCLUDES -I$ai_p" 103731 fi 103732- 103733+ 103734 fi 103735 103736 fi 103737@@ -90518,33 +69818,33 @@ 103738 PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public" 103739 fi 103740 if test -d "$PDO_OCI_DIR/rdbms/demo"; then 103741- 103742+ 103743 if test "$PDO_OCI_DIR/rdbms/demo" != "/usr/include"; then 103744- 103745+ 103746 if test -z "$PDO_OCI_DIR/rdbms/demo" || echo "$PDO_OCI_DIR/rdbms/demo" | grep '^/' >/dev/null ; then 103747 ai_p=$PDO_OCI_DIR/rdbms/demo 103748 else 103749- 103750+ 103751 ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`" 103752- 103753+ 103754 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103755 ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`" 103756 fi 103757 103758- 103759- 103760+ 103761+ 103762 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103763- 103764+ 103765 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103766 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103767 eval "INCLUDEPATH$unique=set" 103768- 103769+ 103770 if test ""; then 103771 INCLUDES="-I$ai_p $INCLUDES" 103772 else 103773 INCLUDES="$INCLUDES -I$ai_p" 103774 fi 103775- 103776+ 103777 fi 103778 103779 fi 103780@@ -90552,33 +69852,33 @@ 103781 PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/demo" 103782 fi 103783 if test -d "$PDO_OCI_DIR/network/public"; then 103784- 103785+ 103786 if test "$PDO_OCI_DIR/network/public" != "/usr/include"; then 103787- 103788+ 103789 if test -z "$PDO_OCI_DIR/network/public" || echo "$PDO_OCI_DIR/network/public" | grep '^/' >/dev/null ; then 103790 ai_p=$PDO_OCI_DIR/network/public 103791 else 103792- 103793+ 103794 ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`" 103795- 103796+ 103797 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103798 ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`" 103799 fi 103800 103801- 103802- 103803+ 103804+ 103805 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103806- 103807+ 103808 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103809 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103810 eval "INCLUDEPATH$unique=set" 103811- 103812+ 103813 if test ""; then 103814 INCLUDES="-I$ai_p $INCLUDES" 103815 else 103816 INCLUDES="$INCLUDES -I$ai_p" 103817 fi 103818- 103819+ 103820 fi 103821 103822 fi 103823@@ -90586,33 +69886,33 @@ 103824 PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/network/public" 103825 fi 103826 if test -d "$PDO_OCI_DIR/plsql/public"; then 103827- 103828+ 103829 if test "$PDO_OCI_DIR/plsql/public" != "/usr/include"; then 103830- 103831+ 103832 if test -z "$PDO_OCI_DIR/plsql/public" || echo "$PDO_OCI_DIR/plsql/public" | grep '^/' >/dev/null ; then 103833 ai_p=$PDO_OCI_DIR/plsql/public 103834 else 103835- 103836+ 103837 ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`" 103838- 103839+ 103840 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103841 ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`" 103842 fi 103843 103844- 103845- 103846+ 103847+ 103848 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103849- 103850+ 103851 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103852 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103853 eval "INCLUDEPATH$unique=set" 103854- 103855+ 103856 if test ""; then 103857 INCLUDES="-I$ai_p $INCLUDES" 103858 else 103859 INCLUDES="$INCLUDES -I$ai_p" 103860 fi 103861- 103862+ 103863 fi 103864 103865 fi 103866@@ -90620,33 +69920,33 @@ 103867 PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/plsql/public" 103868 fi 103869 if test -d "$PDO_OCI_DIR/include"; then 103870- 103871+ 103872 if test "$PDO_OCI_DIR/include" != "/usr/include"; then 103873- 103874+ 103875 if test -z "$PDO_OCI_DIR/include" || echo "$PDO_OCI_DIR/include" | grep '^/' >/dev/null ; then 103876 ai_p=$PDO_OCI_DIR/include 103877 else 103878- 103879+ 103880 ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 103881- 103882+ 103883 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103884 ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`" 103885 fi 103886 103887- 103888- 103889+ 103890+ 103891 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103892- 103893+ 103894 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 103895 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103896 eval "INCLUDEPATH$unique=set" 103897- 103898+ 103899 if test ""; then 103900 INCLUDES="-I$ai_p $INCLUDES" 103901 else 103902 INCLUDES="$INCLUDES -I$ai_p" 103903 fi 103904- 103905+ 103906 fi 103907 103908 fi 103909@@ -90655,17 +69955,17 @@ 103910 fi 103911 103912 if test -f "$PDO_OCI_LIB_DIR/sysliblist"; then 103913- 103914+ 103915 for ac_i in `cat $PDO_OCI_LIB_DIR/sysliblist`; do 103916 case $ac_i in 103917 -pthread) 103918 if test "$ext_shared" = "yes"; then 103919 PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread" 103920 else 103921- 103922- 103923+ 103924+ 103925 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 103926- 103927+ 103928 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 103929 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103930 eval "EXTRA_LDFLAGS$unique=set" 103931@@ -90676,20 +69976,20 @@ 103932 ;; 103933 -l*) 103934 ac_ii=`echo $ac_i|cut -c 3-` 103935- 103936- 103937+ 103938+ 103939 case $ac_ii in 103940 c|c_r|pthread*) ;; 103941- *) 103942+ *) 103943 if test "$ext_shared" = "yes"; then 103944- PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 103945+ PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 103946 else 103947- 103948- 103949+ 103950+ 103951 case $ac_ii in 103952 c|c_r|pthread*) ;; 103953- *) 103954- LIBS="$LIBS -l$ac_ii" 103955+ *) 103956+ LIBS="$LIBS -l$ac_ii" 103957 ;; 103958 esac 103959 103960@@ -90702,42 +70002,42 @@ 103961 ;; 103962 -L*) 103963 ac_ii=`echo $ac_i|cut -c 3-` 103964- 103965+ 103966 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 103967- 103968+ 103969 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 103970 ai_p=$ac_ii 103971 else 103972- 103973+ 103974 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 103975- 103976+ 103977 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 103978 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 103979 fi 103980 103981- 103982+ 103983 if test "$ext_shared" = "yes"; then 103984 PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB" 103985 test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB" 103986 else 103987- 103988- 103989- 103990+ 103991+ 103992+ 103993 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 103994- 103995+ 103996 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 103997 if test -n "$unique" && test "`eval $cmd`" = "" ; then 103998 eval "LIBPATH$unique=set" 103999- 104000+ 104001 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104002 LDFLAGS="$LDFLAGS -L$ai_p" 104003 PHP_RPATHS="$PHP_RPATHS $ai_p" 104004- 104005+ 104006 fi 104007 104008 104009 fi 104010- 104011+ 104012 fi 104013 104014 ;; 104015@@ -90745,17 +70045,17 @@ 104016 done 104017 104018 elif test -f "$PDO_OCI_DIR/rdbms/lib/sysliblist"; then 104019- 104020+ 104021 for ac_i in `cat $PDO_OCI_DIR/rdbms/lib/sysliblist`; do 104022 case $ac_i in 104023 -pthread) 104024 if test "$ext_shared" = "yes"; then 104025 PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -pthread" 104026 else 104027- 104028- 104029+ 104030+ 104031 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 104032- 104033+ 104034 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 104035 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104036 eval "EXTRA_LDFLAGS$unique=set" 104037@@ -90766,20 +70066,20 @@ 104038 ;; 104039 -l*) 104040 ac_ii=`echo $ac_i|cut -c 3-` 104041- 104042- 104043+ 104044+ 104045 case $ac_ii in 104046 c|c_r|pthread*) ;; 104047- *) 104048+ *) 104049 if test "$ext_shared" = "yes"; then 104050- PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 104051+ PDO_OCI_SYSLIB="$PDO_OCI_SYSLIB -l$ac_ii" 104052 else 104053- 104054- 104055+ 104056+ 104057 case $ac_ii in 104058 c|c_r|pthread*) ;; 104059- *) 104060- LIBS="$LIBS -l$ac_ii" 104061+ *) 104062+ LIBS="$LIBS -l$ac_ii" 104063 ;; 104064 esac 104065 104066@@ -90792,42 +70092,42 @@ 104067 ;; 104068 -L*) 104069 ac_ii=`echo $ac_i|cut -c 3-` 104070- 104071+ 104072 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 104073- 104074+ 104075 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 104076 ai_p=$ac_ii 104077 else 104078- 104079+ 104080 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 104081- 104082+ 104083 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 104084 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 104085 fi 104086 104087- 104088+ 104089 if test "$ext_shared" = "yes"; then 104090 PDO_OCI_SYSLIB="-L$ai_p $PDO_OCI_SYSLIB" 104091 test -n "$ld_runpath_switch" && PDO_OCI_SYSLIB="$ld_runpath_switch$ai_p $PDO_OCI_SYSLIB" 104092 else 104093- 104094- 104095- 104096+ 104097+ 104098+ 104099 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 104100- 104101+ 104102 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 104103 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104104 eval "LIBPATH$unique=set" 104105- 104106+ 104107 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104108 LDFLAGS="$LDFLAGS -L$ai_p" 104109 PHP_RPATHS="$PHP_RPATHS $ai_p" 104110- 104111+ 104112 fi 104113 104114 104115 fi 104116- 104117+ 104118 fi 104119 104120 ;; 104121@@ -90835,40 +70135,37 @@ 104122 done 104123 104124 fi 104125- 104126- echo "$as_me:$LINENO: checking Oracle version" >&5 104127-echo $ECHO_N "checking Oracle version... $ECHO_C" >&6 104128+ 104129+ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 104130+echo "configure:70141: checking Oracle version" >&5 104131 for OCI_VER in $SUPPORTED_LIB_VERS; do 104132 if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then 104133 PDO_OCI_VERSION="$OCI_VER" 104134 fi 104135 done 104136 if test -z "$PDO_OCI_VERSION"; then 104137- { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&5 104138-echo "$as_me: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&2;} 104139- { (exit 1); exit 1; }; } 104140+ { echo "configure: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" 1>&2; exit 1; } 104141 fi 104142- echo "$as_me:$LINENO: result: $PDO_OCI_VERSION" >&5 104143-echo "${ECHO_T}$PDO_OCI_VERSION" >&6 104144+ echo "$ac_t""$PDO_OCI_VERSION" 1>&6 104145 104146 fi 104147 104148 case $PDO_OCI_VERSION in 104149 9.0|10.1|10.2|11.1|11.2) 104150- 104151- 104152+ 104153+ 104154 case clntsh in 104155 c|c_r|pthread*) ;; 104156- *) 104157+ *) 104158 if test "$ext_shared" = "yes"; then 104159- PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh" 104160+ PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -lclntsh" 104161 else 104162- 104163- 104164+ 104165+ 104166 case clntsh in 104167 c|c_r|pthread*) ;; 104168- *) 104169- LIBS="$LIBS -lclntsh" 104170+ *) 104171+ LIBS="$LIBS -lclntsh" 104172 ;; 104173 esac 104174 104175@@ -90881,70 +70178,68 @@ 104176 ;; 104177 104178 *) 104179- { { echo "$as_me:$LINENO: error: Unsupported Oracle version $PDO_OCI_VERSION" >&5 104180-echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;} 104181- { (exit 1); exit 1; }; } 104182+ { echo "configure: error: Unsupported Oracle version $PDO_OCI_VERSION" 1>&2; exit 1; } 104183 ;; 104184 esac 104185 104186- 104187+ 104188 if test "$PDO_OCI_LIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PDO_OCI_LIB_DIR" != "/usr/lib"; then 104189- 104190+ 104191 if test -z "$PDO_OCI_LIB_DIR" || echo "$PDO_OCI_LIB_DIR" | grep '^/' >/dev/null ; then 104192 ai_p=$PDO_OCI_LIB_DIR 104193 else 104194- 104195+ 104196 ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 104197- 104198+ 104199 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 104200 ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`" 104201 fi 104202 104203- 104204+ 104205 if test "$ext_shared" = "yes"; then 104206 PDO_OCI_SHARED_LIBADD="-L$ai_p $PDO_OCI_SHARED_LIBADD" 104207 test -n "$ld_runpath_switch" && PDO_OCI_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_OCI_SHARED_LIBADD" 104208 else 104209- 104210- 104211- 104212+ 104213+ 104214+ 104215 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 104216- 104217+ 104218 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 104219 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104220 eval "LIBPATH$unique=set" 104221- 104222+ 104223 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104224 LDFLAGS="$LDFLAGS -L$ai_p" 104225 PHP_RPATHS="$PHP_RPATHS $ai_p" 104226- 104227+ 104228 fi 104229 104230 104231 fi 104232- 104233+ 104234 fi 104235 104236 104237- 104238+ 104239 save_old_LDFLAGS=$LDFLAGS 104240 ac_stuff=" 104241 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 104242 " 104243- 104244+ 104245 save_ext_shared=$ext_shared 104246 ext_shared=yes 104247- 104248+ 104249 for ac_i in $ac_stuff; do 104250 case $ac_i in 104251 -pthread) 104252 if test "$ext_shared" = "yes"; then 104253 LDFLAGS="$LDFLAGS -pthread" 104254 else 104255- 104256- 104257+ 104258+ 104259 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 104260- 104261+ 104262 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 104263 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104264 eval "EXTRA_LDFLAGS$unique=set" 104265@@ -90955,20 +70250,20 @@ 104266 ;; 104267 -l*) 104268 ac_ii=`echo $ac_i|cut -c 3-` 104269- 104270- 104271+ 104272+ 104273 case $ac_ii in 104274 c|c_r|pthread*) ;; 104275- *) 104276+ *) 104277 if test "$ext_shared" = "yes"; then 104278- LDFLAGS="$LDFLAGS -l$ac_ii" 104279+ LDFLAGS="$LDFLAGS -l$ac_ii" 104280 else 104281- 104282- 104283+ 104284+ 104285 case $ac_ii in 104286 c|c_r|pthread*) ;; 104287- *) 104288- LIBS="$LIBS -l$ac_ii" 104289+ *) 104290+ LIBS="$LIBS -l$ac_ii" 104291 ;; 104292 esac 104293 104294@@ -90981,153 +70276,123 @@ 104295 ;; 104296 -L*) 104297 ac_ii=`echo $ac_i|cut -c 3-` 104298- 104299+ 104300 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 104301- 104302+ 104303 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 104304 ai_p=$ac_ii 104305 else 104306- 104307+ 104308 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 104309- 104310+ 104311 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 104312 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 104313 fi 104314 104315- 104316+ 104317 if test "$ext_shared" = "yes"; then 104318 LDFLAGS="-L$ai_p $LDFLAGS" 104319 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 104320 else 104321- 104322- 104323- 104324+ 104325+ 104326+ 104327 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 104328- 104329+ 104330 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 104331 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104332 eval "LIBPATH$unique=set" 104333- 104334+ 104335 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104336 LDFLAGS="$LDFLAGS -L$ai_p" 104337 PHP_RPATHS="$PHP_RPATHS $ai_p" 104338- 104339+ 104340 fi 104341 104342 104343 fi 104344- 104345+ 104346 fi 104347 104348 ;; 104349 esac 104350 done 104351 104352- echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5 104353-echo $ECHO_N "checking for OCIEnvCreate in -lclntsh... $ECHO_C" >&6 104354-if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then 104355- echo $ECHO_N "(cached) $ECHO_C" >&6 104356+ echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 104357+echo "configure:70323: checking for OCIEnvCreate in -lclntsh" >&5 104358+ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` 104359+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 104360+ echo $ac_n "(cached) $ac_c" 1>&6 104361 else 104362- ac_check_lib_save_LIBS=$LIBS 104363+ ac_save_LIBS="$LIBS" 104364 LIBS="-lclntsh $LIBS" 104365-cat >conftest.$ac_ext <<_ACEOF 104366-/* confdefs.h. */ 104367-_ACEOF 104368-cat confdefs.h >>conftest.$ac_ext 104369-cat >>conftest.$ac_ext <<_ACEOF 104370-/* end confdefs.h. */ 104371- 104372+cat > conftest.$ac_ext <<EOF 104373+#line 70331 "configure" 104374+#include "confdefs.h" 104375 /* Override any gcc2 internal prototype to avoid an error. */ 104376-#ifdef __cplusplus 104377-extern "C" 104378-#endif 104379 /* We use char because int might match the return type of a gcc2 104380- builtin and then its argument prototype would still apply. */ 104381-char OCIEnvCreate (); 104382-int 104383-main () 104384-{ 104385-OCIEnvCreate (); 104386- ; 104387- return 0; 104388-} 104389-_ACEOF 104390-rm -f conftest.$ac_objext conftest$ac_exeext 104391-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 104392- (eval $ac_link) 2>conftest.er1 104393- ac_status=$? 104394- grep -v '^ *+' conftest.er1 >conftest.err 104395- rm -f conftest.er1 104396- cat conftest.err >&5 104397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104398- (exit $ac_status); } && 104399- { ac_try='test -z "$ac_c_werror_flag" 104400- || test ! -s conftest.err' 104401- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104402- (eval $ac_try) 2>&5 104403- ac_status=$? 104404- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104405- (exit $ac_status); }; } && 104406- { ac_try='test -s conftest$ac_exeext' 104407- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104408- (eval $ac_try) 2>&5 104409- ac_status=$? 104410- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104411- (exit $ac_status); }; }; then 104412- ac_cv_lib_clntsh_OCIEnvCreate=yes 104413-else 104414- echo "$as_me: failed program was:" >&5 104415-sed 's/^/| /' conftest.$ac_ext >&5 104416- 104417-ac_cv_lib_clntsh_OCIEnvCreate=no 104418-fi 104419-rm -f conftest.err conftest.$ac_objext \ 104420- conftest$ac_exeext conftest.$ac_ext 104421-LIBS=$ac_check_lib_save_LIBS 104422-fi 104423-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5 104424-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvCreate" >&6 104425-if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then 104426+ builtin and then its argument prototype would still apply. */ 104427+char OCIEnvCreate(); 104428 104429+int main() { 104430+OCIEnvCreate() 104431+; return 0; } 104432+EOF 104433+if { (eval echo configure:70342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 104434+ rm -rf conftest* 104435+ eval "ac_cv_lib_$ac_lib_var=yes" 104436+else 104437+ echo "configure: failed program was:" >&5 104438+ cat conftest.$ac_ext >&5 104439+ rm -rf conftest* 104440+ eval "ac_cv_lib_$ac_lib_var=no" 104441+fi 104442+rm -f conftest* 104443+LIBS="$ac_save_LIBS" 104444+ 104445+fi 104446+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 104447+ echo "$ac_t""yes" 1>&6 104448+ 104449 LDFLAGS=$save_old_LDFLAGS 104450 ext_shared=$save_ext_shared 104451- 104452- 104453-cat >>confdefs.h <<\_ACEOF 104454+ 104455+ cat >> confdefs.h <<\EOF 104456 #define HAVE_OCIENVCREATE 1 104457-_ACEOF 104458- 104459- 104460+EOF 104461 104462+ 104463+ 104464 else 104465+ echo "$ac_t""no" 1>&6 104466 104467 LDFLAGS=$save_old_LDFLAGS 104468 ext_shared=$save_ext_shared 104469 unset ac_cv_lib_clntsh_OCIEnvCreate 104470- 104471- 104472+ 104473+ 104474 fi 104475 104476 104477- 104478+ 104479 save_old_LDFLAGS=$LDFLAGS 104480 ac_stuff=" 104481 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 104482 " 104483- 104484+ 104485 save_ext_shared=$ext_shared 104486 ext_shared=yes 104487- 104488+ 104489 for ac_i in $ac_stuff; do 104490 case $ac_i in 104491 -pthread) 104492 if test "$ext_shared" = "yes"; then 104493 LDFLAGS="$LDFLAGS -pthread" 104494 else 104495- 104496- 104497+ 104498+ 104499 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 104500- 104501+ 104502 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 104503 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104504 eval "EXTRA_LDFLAGS$unique=set" 104505@@ -91138,20 +70403,20 @@ 104506 ;; 104507 -l*) 104508 ac_ii=`echo $ac_i|cut -c 3-` 104509- 104510- 104511+ 104512+ 104513 case $ac_ii in 104514 c|c_r|pthread*) ;; 104515- *) 104516+ *) 104517 if test "$ext_shared" = "yes"; then 104518- LDFLAGS="$LDFLAGS -l$ac_ii" 104519+ LDFLAGS="$LDFLAGS -l$ac_ii" 104520 else 104521- 104522- 104523+ 104524+ 104525 case $ac_ii in 104526 c|c_r|pthread*) ;; 104527- *) 104528- LIBS="$LIBS -l$ac_ii" 104529+ *) 104530+ LIBS="$LIBS -l$ac_ii" 104531 ;; 104532 esac 104533 104534@@ -91164,153 +70429,123 @@ 104535 ;; 104536 -L*) 104537 ac_ii=`echo $ac_i|cut -c 3-` 104538- 104539+ 104540 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 104541- 104542+ 104543 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 104544 ai_p=$ac_ii 104545 else 104546- 104547+ 104548 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 104549- 104550+ 104551 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 104552 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 104553 fi 104554 104555- 104556+ 104557 if test "$ext_shared" = "yes"; then 104558 LDFLAGS="-L$ai_p $LDFLAGS" 104559 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 104560 else 104561- 104562- 104563- 104564+ 104565+ 104566+ 104567 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 104568- 104569+ 104570 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 104571 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104572 eval "LIBPATH$unique=set" 104573- 104574+ 104575 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104576 LDFLAGS="$LDFLAGS -L$ai_p" 104577 PHP_RPATHS="$PHP_RPATHS $ai_p" 104578- 104579+ 104580 fi 104581 104582 104583 fi 104584- 104585+ 104586 fi 104587 104588 ;; 104589 esac 104590 done 104591 104592- echo "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5 104593-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6 104594-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then 104595- echo $ECHO_N "(cached) $ECHO_C" >&6 104596+ echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 104597+echo "configure:70476: checking for OCIEnvNlsCreate in -lclntsh" >&5 104598+ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` 104599+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 104600+ echo $ac_n "(cached) $ac_c" 1>&6 104601 else 104602- ac_check_lib_save_LIBS=$LIBS 104603+ ac_save_LIBS="$LIBS" 104604 LIBS="-lclntsh $LIBS" 104605-cat >conftest.$ac_ext <<_ACEOF 104606-/* confdefs.h. */ 104607-_ACEOF 104608-cat confdefs.h >>conftest.$ac_ext 104609-cat >>conftest.$ac_ext <<_ACEOF 104610-/* end confdefs.h. */ 104611- 104612+cat > conftest.$ac_ext <<EOF 104613+#line 70484 "configure" 104614+#include "confdefs.h" 104615 /* Override any gcc2 internal prototype to avoid an error. */ 104616-#ifdef __cplusplus 104617-extern "C" 104618-#endif 104619 /* We use char because int might match the return type of a gcc2 104620- builtin and then its argument prototype would still apply. */ 104621-char OCIEnvNlsCreate (); 104622-int 104623-main () 104624-{ 104625-OCIEnvNlsCreate (); 104626- ; 104627- return 0; 104628-} 104629-_ACEOF 104630-rm -f conftest.$ac_objext conftest$ac_exeext 104631-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 104632- (eval $ac_link) 2>conftest.er1 104633- ac_status=$? 104634- grep -v '^ *+' conftest.er1 >conftest.err 104635- rm -f conftest.er1 104636- cat conftest.err >&5 104637- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104638- (exit $ac_status); } && 104639- { ac_try='test -z "$ac_c_werror_flag" 104640- || test ! -s conftest.err' 104641- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104642- (eval $ac_try) 2>&5 104643- ac_status=$? 104644- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104645- (exit $ac_status); }; } && 104646- { ac_try='test -s conftest$ac_exeext' 104647- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104648- (eval $ac_try) 2>&5 104649- ac_status=$? 104650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104651- (exit $ac_status); }; }; then 104652- ac_cv_lib_clntsh_OCIEnvNlsCreate=yes 104653-else 104654- echo "$as_me: failed program was:" >&5 104655-sed 's/^/| /' conftest.$ac_ext >&5 104656- 104657-ac_cv_lib_clntsh_OCIEnvNlsCreate=no 104658-fi 104659-rm -f conftest.err conftest.$ac_objext \ 104660- conftest$ac_exeext conftest.$ac_ext 104661-LIBS=$ac_check_lib_save_LIBS 104662-fi 104663-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5 104664-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6 104665-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then 104666+ builtin and then its argument prototype would still apply. */ 104667+char OCIEnvNlsCreate(); 104668+ 104669+int main() { 104670+OCIEnvNlsCreate() 104671+; return 0; } 104672+EOF 104673+if { (eval echo configure:70495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 104674+ rm -rf conftest* 104675+ eval "ac_cv_lib_$ac_lib_var=yes" 104676+else 104677+ echo "configure: failed program was:" >&5 104678+ cat conftest.$ac_ext >&5 104679+ rm -rf conftest* 104680+ eval "ac_cv_lib_$ac_lib_var=no" 104681+fi 104682+rm -f conftest* 104683+LIBS="$ac_save_LIBS" 104684 104685+fi 104686+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 104687+ echo "$ac_t""yes" 1>&6 104688+ 104689 LDFLAGS=$save_old_LDFLAGS 104690 ext_shared=$save_ext_shared 104691- 104692- 104693-cat >>confdefs.h <<\_ACEOF 104694+ 104695+ cat >> confdefs.h <<\EOF 104696 #define HAVE_OCIENVNLSCREATE 1 104697-_ACEOF 104698- 104699- 104700+EOF 104701 104702+ 104703+ 104704 else 104705+ echo "$ac_t""no" 1>&6 104706 104707 LDFLAGS=$save_old_LDFLAGS 104708 ext_shared=$save_ext_shared 104709 unset ac_cv_lib_clntsh_OCIEnvNlsCreate 104710- 104711- 104712+ 104713+ 104714 fi 104715 104716 104717- 104718+ 104719 save_old_LDFLAGS=$LDFLAGS 104720 ac_stuff=" 104721 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 104722 " 104723- 104724+ 104725 save_ext_shared=$ext_shared 104726 ext_shared=yes 104727- 104728+ 104729 for ac_i in $ac_stuff; do 104730 case $ac_i in 104731 -pthread) 104732 if test "$ext_shared" = "yes"; then 104733 LDFLAGS="$LDFLAGS -pthread" 104734 else 104735- 104736- 104737+ 104738+ 104739 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 104740- 104741+ 104742 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 104743 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104744 eval "EXTRA_LDFLAGS$unique=set" 104745@@ -91321,20 +70556,20 @@ 104746 ;; 104747 -l*) 104748 ac_ii=`echo $ac_i|cut -c 3-` 104749- 104750- 104751+ 104752+ 104753 case $ac_ii in 104754 c|c_r|pthread*) ;; 104755- *) 104756+ *) 104757 if test "$ext_shared" = "yes"; then 104758- LDFLAGS="$LDFLAGS -l$ac_ii" 104759+ LDFLAGS="$LDFLAGS -l$ac_ii" 104760 else 104761- 104762- 104763+ 104764+ 104765 case $ac_ii in 104766 c|c_r|pthread*) ;; 104767- *) 104768- LIBS="$LIBS -l$ac_ii" 104769+ *) 104770+ LIBS="$LIBS -l$ac_ii" 104771 ;; 104772 esac 104773 104774@@ -91347,149 +70582,119 @@ 104775 ;; 104776 -L*) 104777 ac_ii=`echo $ac_i|cut -c 3-` 104778- 104779+ 104780 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 104781- 104782+ 104783 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 104784 ai_p=$ac_ii 104785 else 104786- 104787+ 104788 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 104789- 104790+ 104791 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 104792 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 104793 fi 104794 104795- 104796+ 104797 if test "$ext_shared" = "yes"; then 104798 LDFLAGS="-L$ai_p $LDFLAGS" 104799 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 104800 else 104801- 104802- 104803- 104804+ 104805+ 104806+ 104807 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 104808- 104809+ 104810 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 104811 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104812 eval "LIBPATH$unique=set" 104813- 104814+ 104815 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 104816 LDFLAGS="$LDFLAGS -L$ai_p" 104817 PHP_RPATHS="$PHP_RPATHS $ai_p" 104818- 104819+ 104820 fi 104821 104822 104823 fi 104824- 104825+ 104826 fi 104827 104828 ;; 104829 esac 104830 done 104831 104832- echo "$as_me:$LINENO: checking for OCILobIsTemporary in -lclntsh" >&5 104833-echo $ECHO_N "checking for OCILobIsTemporary in -lclntsh... $ECHO_C" >&6 104834-if test "${ac_cv_lib_clntsh_OCILobIsTemporary+set}" = set; then 104835- echo $ECHO_N "(cached) $ECHO_C" >&6 104836+ echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 104837+echo "configure:70629: checking for OCILobIsTemporary in -lclntsh" >&5 104838+ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` 104839+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 104840+ echo $ac_n "(cached) $ac_c" 1>&6 104841 else 104842- ac_check_lib_save_LIBS=$LIBS 104843+ ac_save_LIBS="$LIBS" 104844 LIBS="-lclntsh $LIBS" 104845-cat >conftest.$ac_ext <<_ACEOF 104846-/* confdefs.h. */ 104847-_ACEOF 104848-cat confdefs.h >>conftest.$ac_ext 104849-cat >>conftest.$ac_ext <<_ACEOF 104850-/* end confdefs.h. */ 104851- 104852+cat > conftest.$ac_ext <<EOF 104853+#line 70637 "configure" 104854+#include "confdefs.h" 104855 /* Override any gcc2 internal prototype to avoid an error. */ 104856-#ifdef __cplusplus 104857-extern "C" 104858-#endif 104859 /* We use char because int might match the return type of a gcc2 104860- builtin and then its argument prototype would still apply. */ 104861-char OCILobIsTemporary (); 104862-int 104863-main () 104864-{ 104865-OCILobIsTemporary (); 104866- ; 104867- return 0; 104868-} 104869-_ACEOF 104870-rm -f conftest.$ac_objext conftest$ac_exeext 104871-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 104872- (eval $ac_link) 2>conftest.er1 104873- ac_status=$? 104874- grep -v '^ *+' conftest.er1 >conftest.err 104875- rm -f conftest.er1 104876- cat conftest.err >&5 104877- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104878- (exit $ac_status); } && 104879- { ac_try='test -z "$ac_c_werror_flag" 104880- || test ! -s conftest.err' 104881- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104882- (eval $ac_try) 2>&5 104883- ac_status=$? 104884- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104885- (exit $ac_status); }; } && 104886- { ac_try='test -s conftest$ac_exeext' 104887- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 104888- (eval $ac_try) 2>&5 104889- ac_status=$? 104890- echo "$as_me:$LINENO: \$? = $ac_status" >&5 104891- (exit $ac_status); }; }; then 104892- ac_cv_lib_clntsh_OCILobIsTemporary=yes 104893-else 104894- echo "$as_me: failed program was:" >&5 104895-sed 's/^/| /' conftest.$ac_ext >&5 104896- 104897-ac_cv_lib_clntsh_OCILobIsTemporary=no 104898-fi 104899-rm -f conftest.err conftest.$ac_objext \ 104900- conftest$ac_exeext conftest.$ac_ext 104901-LIBS=$ac_check_lib_save_LIBS 104902-fi 104903-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCILobIsTemporary" >&5 104904-echo "${ECHO_T}$ac_cv_lib_clntsh_OCILobIsTemporary" >&6 104905-if test $ac_cv_lib_clntsh_OCILobIsTemporary = yes; then 104906+ builtin and then its argument prototype would still apply. */ 104907+char OCILobIsTemporary(); 104908+ 104909+int main() { 104910+OCILobIsTemporary() 104911+; return 0; } 104912+EOF 104913+if { (eval echo configure:70648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 104914+ rm -rf conftest* 104915+ eval "ac_cv_lib_$ac_lib_var=yes" 104916+else 104917+ echo "configure: failed program was:" >&5 104918+ cat conftest.$ac_ext >&5 104919+ rm -rf conftest* 104920+ eval "ac_cv_lib_$ac_lib_var=no" 104921+fi 104922+rm -f conftest* 104923+LIBS="$ac_save_LIBS" 104924 104925+fi 104926+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 104927+ echo "$ac_t""yes" 1>&6 104928+ 104929 LDFLAGS=$save_old_LDFLAGS 104930 ext_shared=$save_ext_shared 104931- 104932- 104933-cat >>confdefs.h <<\_ACEOF 104934+ 104935+ cat >> confdefs.h <<\EOF 104936 #define HAVE_OCILOBISTEMPORARY 1 104937-_ACEOF 104938- 104939- 104940+EOF 104941 104942+ 104943+ 104944 else 104945+ echo "$ac_t""no" 1>&6 104946 104947 LDFLAGS=$save_old_LDFLAGS 104948 ext_shared=$save_ext_shared 104949 unset ac_cv_lib_clntsh_OCILobIsTemporary 104950- 104951- 104952+ 104953+ 104954 save_old_LDFLAGS=$LDFLAGS 104955 ac_stuff=" 104956 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 104957 " 104958- 104959+ 104960 save_ext_shared=$ext_shared 104961 ext_shared=yes 104962- 104963+ 104964 for ac_i in $ac_stuff; do 104965 case $ac_i in 104966 -pthread) 104967 if test "$ext_shared" = "yes"; then 104968 LDFLAGS="$LDFLAGS -pthread" 104969 else 104970- 104971- 104972+ 104973+ 104974 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 104975- 104976+ 104977 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 104978 if test -n "$unique" && test "`eval $cmd`" = "" ; then 104979 eval "EXTRA_LDFLAGS$unique=set" 104980@@ -91500,20 +70705,20 @@ 104981 ;; 104982 -l*) 104983 ac_ii=`echo $ac_i|cut -c 3-` 104984- 104985- 104986+ 104987+ 104988 case $ac_ii in 104989 c|c_r|pthread*) ;; 104990- *) 104991+ *) 104992 if test "$ext_shared" = "yes"; then 104993- LDFLAGS="$LDFLAGS -l$ac_ii" 104994+ LDFLAGS="$LDFLAGS -l$ac_ii" 104995 else 104996- 104997- 104998+ 104999+ 105000 case $ac_ii in 105001 c|c_r|pthread*) ;; 105002- *) 105003- LIBS="$LIBS -l$ac_ii" 105004+ *) 105005+ LIBS="$LIBS -l$ac_ii" 105006 ;; 105007 esac 105008 105009@@ -91526,131 +70731,101 @@ 105010 ;; 105011 -L*) 105012 ac_ii=`echo $ac_i|cut -c 3-` 105013- 105014+ 105015 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 105016- 105017+ 105018 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 105019 ai_p=$ac_ii 105020 else 105021- 105022+ 105023 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 105024- 105025+ 105026 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 105027 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 105028 fi 105029 105030- 105031+ 105032 if test "$ext_shared" = "yes"; then 105033 LDFLAGS="-L$ai_p $LDFLAGS" 105034 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 105035 else 105036- 105037- 105038- 105039+ 105040+ 105041+ 105042 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 105043- 105044+ 105045 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 105046 if test -n "$unique" && test "`eval $cmd`" = "" ; then 105047 eval "LIBPATH$unique=set" 105048- 105049+ 105050 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 105051 LDFLAGS="$LDFLAGS -L$ai_p" 105052 PHP_RPATHS="$PHP_RPATHS $ai_p" 105053- 105054+ 105055 fi 105056 105057 105058 fi 105059- 105060+ 105061 fi 105062 105063 ;; 105064 esac 105065 done 105066 105067- echo "$as_me:$LINENO: checking for OCILobIsTemporary in -locijdbc8" >&5 105068-echo $ECHO_N "checking for OCILobIsTemporary in -locijdbc8... $ECHO_C" >&6 105069-if test "${ac_cv_lib_ocijdbc8_OCILobIsTemporary+set}" = set; then 105070- echo $ECHO_N "(cached) $ECHO_C" >&6 105071+ echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 105072+echo "configure:70778: checking for OCILobIsTemporary in -locijdbc8" >&5 105073+ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` 105074+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 105075+ echo $ac_n "(cached) $ac_c" 1>&6 105076 else 105077- ac_check_lib_save_LIBS=$LIBS 105078+ ac_save_LIBS="$LIBS" 105079 LIBS="-locijdbc8 $LIBS" 105080-cat >conftest.$ac_ext <<_ACEOF 105081-/* confdefs.h. */ 105082-_ACEOF 105083-cat confdefs.h >>conftest.$ac_ext 105084-cat >>conftest.$ac_ext <<_ACEOF 105085-/* end confdefs.h. */ 105086- 105087+cat > conftest.$ac_ext <<EOF 105088+#line 70786 "configure" 105089+#include "confdefs.h" 105090 /* Override any gcc2 internal prototype to avoid an error. */ 105091-#ifdef __cplusplus 105092-extern "C" 105093-#endif 105094 /* We use char because int might match the return type of a gcc2 105095- builtin and then its argument prototype would still apply. */ 105096-char OCILobIsTemporary (); 105097-int 105098-main () 105099-{ 105100-OCILobIsTemporary (); 105101- ; 105102- return 0; 105103-} 105104-_ACEOF 105105-rm -f conftest.$ac_objext conftest$ac_exeext 105106-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 105107- (eval $ac_link) 2>conftest.er1 105108- ac_status=$? 105109- grep -v '^ *+' conftest.er1 >conftest.err 105110- rm -f conftest.er1 105111- cat conftest.err >&5 105112- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105113- (exit $ac_status); } && 105114- { ac_try='test -z "$ac_c_werror_flag" 105115- || test ! -s conftest.err' 105116- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105117- (eval $ac_try) 2>&5 105118- ac_status=$? 105119- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105120- (exit $ac_status); }; } && 105121- { ac_try='test -s conftest$ac_exeext' 105122- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105123- (eval $ac_try) 2>&5 105124- ac_status=$? 105125- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105126- (exit $ac_status); }; }; then 105127- ac_cv_lib_ocijdbc8_OCILobIsTemporary=yes 105128-else 105129- echo "$as_me: failed program was:" >&5 105130-sed 's/^/| /' conftest.$ac_ext >&5 105131- 105132-ac_cv_lib_ocijdbc8_OCILobIsTemporary=no 105133-fi 105134-rm -f conftest.err conftest.$ac_objext \ 105135- conftest$ac_exeext conftest.$ac_ext 105136-LIBS=$ac_check_lib_save_LIBS 105137-fi 105138-echo "$as_me:$LINENO: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5 105139-echo "${ECHO_T}$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6 105140-if test $ac_cv_lib_ocijdbc8_OCILobIsTemporary = yes; then 105141+ builtin and then its argument prototype would still apply. */ 105142+char OCILobIsTemporary(); 105143+ 105144+int main() { 105145+OCILobIsTemporary() 105146+; return 0; } 105147+EOF 105148+if { (eval echo configure:70797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 105149+ rm -rf conftest* 105150+ eval "ac_cv_lib_$ac_lib_var=yes" 105151+else 105152+ echo "configure: failed program was:" >&5 105153+ cat conftest.$ac_ext >&5 105154+ rm -rf conftest* 105155+ eval "ac_cv_lib_$ac_lib_var=no" 105156+fi 105157+rm -f conftest* 105158+LIBS="$ac_save_LIBS" 105159 105160+fi 105161+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 105162+ echo "$ac_t""yes" 1>&6 105163+ 105164 LDFLAGS=$save_old_LDFLAGS 105165 ext_shared=$save_ext_shared 105166- 105167- 105168- 105169+ 105170+ 105171+ 105172 case ocijdbc8 in 105173 c|c_r|pthread*) ;; 105174- *) 105175+ *) 105176 if test "$ext_shared" = "yes"; then 105177- PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8" 105178+ PDO_OCI_SHARED_LIBADD="$PDO_OCI_SHARED_LIBADD -locijdbc8" 105179 else 105180- 105181- 105182+ 105183+ 105184 case ocijdbc8 in 105185 c|c_r|pthread*) ;; 105186- *) 105187- LIBS="$LIBS -locijdbc8" 105188+ *) 105189+ LIBS="$LIBS -locijdbc8" 105190 ;; 105191 esac 105192 105193@@ -91660,46 +70835,46 @@ 105194 esac 105195 105196 105197- 105198-cat >>confdefs.h <<\_ACEOF 105199+ cat >> confdefs.h <<\EOF 105200 #define HAVE_OCILOBISTEMPORARY 1 105201-_ACEOF 105202- 105203- 105204+EOF 105205 105206+ 105207+ 105208 else 105209+ echo "$ac_t""no" 1>&6 105210 105211 LDFLAGS=$save_old_LDFLAGS 105212 ext_shared=$save_ext_shared 105213 unset ac_cv_lib_ocijdbc8_OCILobIsTemporary 105214- 105215- 105216+ 105217+ 105218 fi 105219 105220- 105221- 105222+ 105223+ 105224 fi 105225 105226 105227- 105228+ 105229 save_old_LDFLAGS=$LDFLAGS 105230 ac_stuff=" 105231 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 105232 " 105233- 105234+ 105235 save_ext_shared=$ext_shared 105236 ext_shared=yes 105237- 105238+ 105239 for ac_i in $ac_stuff; do 105240 case $ac_i in 105241 -pthread) 105242 if test "$ext_shared" = "yes"; then 105243 LDFLAGS="$LDFLAGS -pthread" 105244 else 105245- 105246- 105247+ 105248+ 105249 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 105250- 105251+ 105252 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 105253 if test -n "$unique" && test "`eval $cmd`" = "" ; then 105254 eval "EXTRA_LDFLAGS$unique=set" 105255@@ -91710,20 +70885,20 @@ 105256 ;; 105257 -l*) 105258 ac_ii=`echo $ac_i|cut -c 3-` 105259- 105260- 105261+ 105262+ 105263 case $ac_ii in 105264 c|c_r|pthread*) ;; 105265- *) 105266+ *) 105267 if test "$ext_shared" = "yes"; then 105268- LDFLAGS="$LDFLAGS -l$ac_ii" 105269+ LDFLAGS="$LDFLAGS -l$ac_ii" 105270 else 105271- 105272- 105273+ 105274+ 105275 case $ac_ii in 105276 c|c_r|pthread*) ;; 105277- *) 105278- LIBS="$LIBS -l$ac_ii" 105279+ *) 105280+ LIBS="$LIBS -l$ac_ii" 105281 ;; 105282 esac 105283 105284@@ -91736,153 +70911,123 @@ 105285 ;; 105286 -L*) 105287 ac_ii=`echo $ac_i|cut -c 3-` 105288- 105289+ 105290 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 105291- 105292+ 105293 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 105294 ai_p=$ac_ii 105295 else 105296- 105297+ 105298 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 105299- 105300+ 105301 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 105302 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 105303 fi 105304 105305- 105306+ 105307 if test "$ext_shared" = "yes"; then 105308 LDFLAGS="-L$ai_p $LDFLAGS" 105309 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 105310 else 105311- 105312- 105313- 105314+ 105315+ 105316+ 105317 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 105318- 105319+ 105320 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 105321 if test -n "$unique" && test "`eval $cmd`" = "" ; then 105322 eval "LIBPATH$unique=set" 105323- 105324+ 105325 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 105326 LDFLAGS="$LDFLAGS -L$ai_p" 105327 PHP_RPATHS="$PHP_RPATHS $ai_p" 105328- 105329+ 105330 fi 105331 105332 105333 fi 105334- 105335+ 105336 fi 105337 105338 ;; 105339 esac 105340 done 105341 105342- echo "$as_me:$LINENO: checking for OCICollAssign in -lclntsh" >&5 105343-echo $ECHO_N "checking for OCICollAssign in -lclntsh... $ECHO_C" >&6 105344-if test "${ac_cv_lib_clntsh_OCICollAssign+set}" = set; then 105345- echo $ECHO_N "(cached) $ECHO_C" >&6 105346+ echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 105347+echo "configure:70958: checking for OCICollAssign in -lclntsh" >&5 105348+ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` 105349+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 105350+ echo $ac_n "(cached) $ac_c" 1>&6 105351 else 105352- ac_check_lib_save_LIBS=$LIBS 105353+ ac_save_LIBS="$LIBS" 105354 LIBS="-lclntsh $LIBS" 105355-cat >conftest.$ac_ext <<_ACEOF 105356-/* confdefs.h. */ 105357-_ACEOF 105358-cat confdefs.h >>conftest.$ac_ext 105359-cat >>conftest.$ac_ext <<_ACEOF 105360-/* end confdefs.h. */ 105361- 105362+cat > conftest.$ac_ext <<EOF 105363+#line 70966 "configure" 105364+#include "confdefs.h" 105365 /* Override any gcc2 internal prototype to avoid an error. */ 105366-#ifdef __cplusplus 105367-extern "C" 105368-#endif 105369 /* We use char because int might match the return type of a gcc2 105370- builtin and then its argument prototype would still apply. */ 105371-char OCICollAssign (); 105372-int 105373-main () 105374-{ 105375-OCICollAssign (); 105376- ; 105377- return 0; 105378-} 105379-_ACEOF 105380-rm -f conftest.$ac_objext conftest$ac_exeext 105381-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 105382- (eval $ac_link) 2>conftest.er1 105383- ac_status=$? 105384- grep -v '^ *+' conftest.er1 >conftest.err 105385- rm -f conftest.er1 105386- cat conftest.err >&5 105387- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105388- (exit $ac_status); } && 105389- { ac_try='test -z "$ac_c_werror_flag" 105390- || test ! -s conftest.err' 105391- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105392- (eval $ac_try) 2>&5 105393- ac_status=$? 105394- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105395- (exit $ac_status); }; } && 105396- { ac_try='test -s conftest$ac_exeext' 105397- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105398- (eval $ac_try) 2>&5 105399- ac_status=$? 105400- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105401- (exit $ac_status); }; }; then 105402- ac_cv_lib_clntsh_OCICollAssign=yes 105403-else 105404- echo "$as_me: failed program was:" >&5 105405-sed 's/^/| /' conftest.$ac_ext >&5 105406- 105407-ac_cv_lib_clntsh_OCICollAssign=no 105408-fi 105409-rm -f conftest.err conftest.$ac_objext \ 105410- conftest$ac_exeext conftest.$ac_ext 105411-LIBS=$ac_check_lib_save_LIBS 105412-fi 105413-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCICollAssign" >&5 105414-echo "${ECHO_T}$ac_cv_lib_clntsh_OCICollAssign" >&6 105415-if test $ac_cv_lib_clntsh_OCICollAssign = yes; then 105416+ builtin and then its argument prototype would still apply. */ 105417+char OCICollAssign(); 105418+ 105419+int main() { 105420+OCICollAssign() 105421+; return 0; } 105422+EOF 105423+if { (eval echo configure:70977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 105424+ rm -rf conftest* 105425+ eval "ac_cv_lib_$ac_lib_var=yes" 105426+else 105427+ echo "configure: failed program was:" >&5 105428+ cat conftest.$ac_ext >&5 105429+ rm -rf conftest* 105430+ eval "ac_cv_lib_$ac_lib_var=no" 105431+fi 105432+rm -f conftest* 105433+LIBS="$ac_save_LIBS" 105434 105435+fi 105436+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 105437+ echo "$ac_t""yes" 1>&6 105438+ 105439 LDFLAGS=$save_old_LDFLAGS 105440 ext_shared=$save_ext_shared 105441- 105442- 105443-cat >>confdefs.h <<\_ACEOF 105444+ 105445+ cat >> confdefs.h <<\EOF 105446 #define HAVE_OCICOLLASSIGN 1 105447-_ACEOF 105448- 105449- 105450+EOF 105451 105452+ 105453+ 105454 else 105455+ echo "$ac_t""no" 1>&6 105456 105457 LDFLAGS=$save_old_LDFLAGS 105458 ext_shared=$save_ext_shared 105459 unset ac_cv_lib_clntsh_OCICollAssign 105460- 105461- 105462+ 105463+ 105464 fi 105465 105466 105467- 105468+ 105469 save_old_LDFLAGS=$LDFLAGS 105470 ac_stuff=" 105471 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD 105472 " 105473- 105474+ 105475 save_ext_shared=$ext_shared 105476 ext_shared=yes 105477- 105478+ 105479 for ac_i in $ac_stuff; do 105480 case $ac_i in 105481 -pthread) 105482 if test "$ext_shared" = "yes"; then 105483 LDFLAGS="$LDFLAGS -pthread" 105484 else 105485- 105486- 105487+ 105488+ 105489 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 105490- 105491+ 105492 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 105493 if test -n "$unique" && test "`eval $cmd`" = "" ; then 105494 eval "EXTRA_LDFLAGS$unique=set" 105495@@ -91893,20 +71038,20 @@ 105496 ;; 105497 -l*) 105498 ac_ii=`echo $ac_i|cut -c 3-` 105499- 105500- 105501+ 105502+ 105503 case $ac_ii in 105504 c|c_r|pthread*) ;; 105505- *) 105506+ *) 105507 if test "$ext_shared" = "yes"; then 105508- LDFLAGS="$LDFLAGS -l$ac_ii" 105509+ LDFLAGS="$LDFLAGS -l$ac_ii" 105510 else 105511- 105512- 105513+ 105514+ 105515 case $ac_ii in 105516 c|c_r|pthread*) ;; 105517- *) 105518- LIBS="$LIBS -l$ac_ii" 105519+ *) 105520+ LIBS="$LIBS -l$ac_ii" 105521 ;; 105522 esac 105523 105524@@ -91919,144 +71064,114 @@ 105525 ;; 105526 -L*) 105527 ac_ii=`echo $ac_i|cut -c 3-` 105528- 105529+ 105530 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 105531- 105532+ 105533 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 105534 ai_p=$ac_ii 105535 else 105536- 105537+ 105538 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 105539- 105540+ 105541 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 105542 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 105543 fi 105544 105545- 105546+ 105547 if test "$ext_shared" = "yes"; then 105548 LDFLAGS="-L$ai_p $LDFLAGS" 105549 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 105550 else 105551- 105552- 105553- 105554+ 105555+ 105556+ 105557 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 105558- 105559+ 105560 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 105561 if test -n "$unique" && test "`eval $cmd`" = "" ; then 105562 eval "LIBPATH$unique=set" 105563- 105564+ 105565 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 105566 LDFLAGS="$LDFLAGS -L$ai_p" 105567 PHP_RPATHS="$PHP_RPATHS $ai_p" 105568- 105569+ 105570 fi 105571 105572 105573 fi 105574- 105575+ 105576 fi 105577 105578 ;; 105579 esac 105580 done 105581 105582- echo "$as_me:$LINENO: checking for OCIStmtFetch2 in -lclntsh" >&5 105583-echo $ECHO_N "checking for OCIStmtFetch2 in -lclntsh... $ECHO_C" >&6 105584-if test "${ac_cv_lib_clntsh_OCIStmtFetch2+set}" = set; then 105585- echo $ECHO_N "(cached) $ECHO_C" >&6 105586+ echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 105587+echo "configure:71111: checking for OCIStmtFetch2 in -lclntsh" >&5 105588+ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` 105589+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 105590+ echo $ac_n "(cached) $ac_c" 1>&6 105591 else 105592- ac_check_lib_save_LIBS=$LIBS 105593+ ac_save_LIBS="$LIBS" 105594 LIBS="-lclntsh $LIBS" 105595-cat >conftest.$ac_ext <<_ACEOF 105596-/* confdefs.h. */ 105597-_ACEOF 105598-cat confdefs.h >>conftest.$ac_ext 105599-cat >>conftest.$ac_ext <<_ACEOF 105600-/* end confdefs.h. */ 105601- 105602+cat > conftest.$ac_ext <<EOF 105603+#line 71119 "configure" 105604+#include "confdefs.h" 105605 /* Override any gcc2 internal prototype to avoid an error. */ 105606-#ifdef __cplusplus 105607-extern "C" 105608-#endif 105609 /* We use char because int might match the return type of a gcc2 105610- builtin and then its argument prototype would still apply. */ 105611-char OCIStmtFetch2 (); 105612-int 105613-main () 105614-{ 105615-OCIStmtFetch2 (); 105616- ; 105617- return 0; 105618-} 105619-_ACEOF 105620-rm -f conftest.$ac_objext conftest$ac_exeext 105621-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 105622- (eval $ac_link) 2>conftest.er1 105623- ac_status=$? 105624- grep -v '^ *+' conftest.er1 >conftest.err 105625- rm -f conftest.er1 105626- cat conftest.err >&5 105627- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105628- (exit $ac_status); } && 105629- { ac_try='test -z "$ac_c_werror_flag" 105630- || test ! -s conftest.err' 105631- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105632- (eval $ac_try) 2>&5 105633- ac_status=$? 105634- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105635- (exit $ac_status); }; } && 105636- { ac_try='test -s conftest$ac_exeext' 105637- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 105638- (eval $ac_try) 2>&5 105639- ac_status=$? 105640- echo "$as_me:$LINENO: \$? = $ac_status" >&5 105641- (exit $ac_status); }; }; then 105642- ac_cv_lib_clntsh_OCIStmtFetch2=yes 105643-else 105644- echo "$as_me: failed program was:" >&5 105645-sed 's/^/| /' conftest.$ac_ext >&5 105646- 105647-ac_cv_lib_clntsh_OCIStmtFetch2=no 105648-fi 105649-rm -f conftest.err conftest.$ac_objext \ 105650- conftest$ac_exeext conftest.$ac_ext 105651-LIBS=$ac_check_lib_save_LIBS 105652-fi 105653-echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5 105654-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIStmtFetch2" >&6 105655-if test $ac_cv_lib_clntsh_OCIStmtFetch2 = yes; then 105656+ builtin and then its argument prototype would still apply. */ 105657+char OCIStmtFetch2(); 105658+ 105659+int main() { 105660+OCIStmtFetch2() 105661+; return 0; } 105662+EOF 105663+if { (eval echo configure:71130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 105664+ rm -rf conftest* 105665+ eval "ac_cv_lib_$ac_lib_var=yes" 105666+else 105667+ echo "configure: failed program was:" >&5 105668+ cat conftest.$ac_ext >&5 105669+ rm -rf conftest* 105670+ eval "ac_cv_lib_$ac_lib_var=no" 105671+fi 105672+rm -f conftest* 105673+LIBS="$ac_save_LIBS" 105674 105675+fi 105676+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 105677+ echo "$ac_t""yes" 1>&6 105678+ 105679 LDFLAGS=$save_old_LDFLAGS 105680 ext_shared=$save_ext_shared 105681- 105682- 105683-cat >>confdefs.h <<\_ACEOF 105684+ 105685+ cat >> confdefs.h <<\EOF 105686 #define HAVE_OCISTMTFETCH2 1 105687-_ACEOF 105688- 105689- 105690+EOF 105691 105692+ 105693+ 105694 else 105695+ echo "$ac_t""no" 1>&6 105696 105697 LDFLAGS=$save_old_LDFLAGS 105698 ext_shared=$save_ext_shared 105699 unset ac_cv_lib_clntsh_OCIStmtFetch2 105700- 105701- 105702+ 105703+ 105704 fi 105705 105706 105707- 105708- 105709- echo "$as_me:$LINENO: checking for PDO includes" >&5 105710-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 105711-if test "${pdo_inc_path+set}" = set; then 105712- echo $ECHO_N "(cached) $ECHO_C" >&6 105713+ 105714+ 105715+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 105716+echo "configure:71169: checking for PDO includes" >&5 105717+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 105718+ echo $ac_n "(cached) $ac_c" 1>&6 105719 else 105720- 105721- echo "$as_me:$LINENO: checking for PDO includes" >&5 105722-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 105723+ 105724+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 105725+echo "configure:71175: checking for PDO includes" >&5 105726 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 105727 pdo_inc_path=$abs_srcdir/ext 105728 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 105729@@ -92064,21 +71179,19 @@ 105730 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 105731 pdo_inc_path=$prefix/include/php/ext 105732 fi 105733- 105734+ 105735 fi 105736-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 105737-echo "${ECHO_T}$pdo_inc_path" >&6 105738+ 105739+echo "$ac_t""$pdo_inc_path" 1>&6 105740 if test -n "$pdo_inc_path"; then 105741 : 105742 else 105743-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 105744-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 105745- { (exit 1); exit 1; }; } 105746+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 105747 fi 105748 105749+ 105750 105751- 105752- 105753+ 105754 ext_builddir=ext/pdo_oci 105755 ext_srcdir=$abs_srcdir/ext/pdo_oci 105756 105757@@ -92086,15 +71199,15 @@ 105758 105759 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 105760 PHP_PDO_OCI_SHARED=no 105761- 105762- 105763+ 105764+ 105765 case ext/pdo_oci in 105766 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 105767 /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 105768 *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 105769 esac 105770- 105771- 105772+ 105773+ 105774 105775 b_c_pre=$php_c_pre 105776 b_cxx_pre=$php_cxx_pre 105777@@ -92107,12 +71220,12 @@ 105778 105779 old_IFS=$IFS 105780 for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do 105781- 105782+ 105783 IFS=. 105784 set $ac_src 105785 ac_obj=$1 105786 IFS=$old_IFS 105787- 105788+ 105789 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 105790 105791 case $ac_src in 105792@@ -92136,14 +71249,14 @@ 105793 else 105794 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 105795 PHP_PDO_OCI_SHARED=yes 105796- 105797+ 105798 case ext/pdo_oci in 105799 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 105800 /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 105801 *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 105802 esac 105803- 105804- 105805+ 105806+ 105807 105808 b_c_pre=$shared_c_pre 105809 b_cxx_pre=$shared_cxx_pre 105810@@ -92156,12 +71269,12 @@ 105811 105812 old_IFS=$IFS 105813 for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do 105814- 105815+ 105816 IFS=. 105817 set $ac_src 105818 ac_obj=$1 105819 IFS=$old_IFS 105820- 105821+ 105822 shared_objects_pdo_oci="$shared_objects_pdo_oci $ac_bdir$ac_obj.lo" 105823 105824 case $ac_src in 105825@@ -92179,7 +71292,7 @@ 105826 105827 case $host_alias in 105828 *netware*) 105829- 105830+ 105831 install_modules="install-modules" 105832 105833 case $host_alias in 105834@@ -92189,7 +71302,7 @@ 105835 ;; 105836 *netware*) 105837 suffix=nlm 105838- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(PDO_OCI_SHARED_LIBADD)' 105839+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_OCI, 3)_SHARED_LIBADD)' 105840 ;; 105841 *) 105842 suffix=la 105843@@ -92202,7 +71315,7 @@ 105844 else 105845 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_oci.$suffix" 105846 fi 105847- 105848+ 105849 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci" 105850 105851 cat >>Makefile.objects<<EOF 105852@@ -92216,7 +71329,7 @@ 105853 105854 ;; 105855 *) 105856- 105857+ 105858 install_modules="install-modules" 105859 105860 case $host_alias in 105861@@ -92226,7 +71339,7 @@ 105862 ;; 105863 *netware*) 105864 suffix=nlm 105865- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(_OCI_SHARED_LIBADD)' 105866+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_oci) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_OCI, 3)_SHARED_LIBADD)' 105867 ;; 105868 *) 105869 suffix=la 105870@@ -92239,7 +71352,7 @@ 105871 else 105872 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_oci.$suffix" 105873 fi 105874- 105875+ 105876 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_oci" 105877 105878 cat >>Makefile.objects<<EOF 105879@@ -92253,10 +71366,9 @@ 105880 105881 ;; 105882 esac 105883- 105884-cat >>confdefs.h <<_ACEOF 105885+ cat >> confdefs.h <<EOF 105886 #define COMPILE_DL_PDO_OCI 1 105887-_ACEOF 105888+EOF 105889 105890 fi 105891 fi 105892@@ -92265,15 +71377,15 @@ 105893 PHP_PDO_OCI_SHARED=no 105894 case "$PHP_SAPI" in 105895 cgi|embed) 105896- 105897- 105898+ 105899+ 105900 case ext/pdo_oci in 105901 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 105902 /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 105903 *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 105904 esac 105905- 105906- 105907+ 105908+ 105909 105910 b_c_pre=$php_c_pre 105911 b_cxx_pre=$php_cxx_pre 105912@@ -92286,12 +71398,12 @@ 105913 105914 old_IFS=$IFS 105915 for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do 105916- 105917+ 105918 IFS=. 105919 set $ac_src 105920 ac_obj=$1 105921 IFS=$old_IFS 105922- 105923+ 105924 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 105925 105926 case $ac_src in 105927@@ -92311,15 +71423,15 @@ 105928 EXT_STATIC="$EXT_STATIC pdo_oci" 105929 ;; 105930 *) 105931- 105932- 105933+ 105934+ 105935 case ext/pdo_oci in 105936 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 105937 /*) ac_srcdir=`echo "ext/pdo_oci"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 105938 *) ac_srcdir="$abs_srcdir/ext/pdo_oci/"; ac_bdir="ext/pdo_oci/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 105939 esac 105940- 105941- 105942+ 105943+ 105944 105945 b_c_pre=$php_c_pre 105946 b_cxx_pre=$php_cxx_pre 105947@@ -92332,13 +71444,13 @@ 105948 105949 old_IFS=$IFS 105950 for ac_src in pdo_oci.c oci_driver.c oci_statement.c; do 105951- 105952+ 105953 IFS=. 105954 set $ac_src 105955 ac_obj=$1 105956 IFS=$old_IFS 105957- 105958- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 105959+ 105960+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 105961 105962 case $ac_src in 105963 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 105964@@ -92358,77 +71470,64 @@ 105965 esac 105966 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_oci" 105967 fi 105968- 105969- 105970+ 105971+ 105972 BUILD_DIR="$BUILD_DIR $ext_builddir" 105973- 105974+ 105975 105976 105977 if test "$ext_builddir" = "."; then 105978 PHP_PECL_EXTENSION=pdo_oci 105979- 105980+ 105981 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 105982 105983 fi 105984 105985 105986- 105987- 105988+ 105989+ 105990 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_SHARED_LIBADD" 105991 105992+ 105993 105994- 105995- 105996- 105997+ 105998+ 105999 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_DIR" 106000 106001+ 106002 106003- 106004- 106005- 106006+ 106007+ 106008 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_OCI_VERSION" 106009 106010+ 106011 106012 106013- 106014- 106015- 106016+ 106017+ 106018 am_i_shared=$PHP_PDO_OCI_SHARED 106019 is_it_shared=$PHP_PDO_SHARED 106020 is_it_enabled=$PHP_PDO 106021 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 106022- { { echo "$as_me:$LINENO: error: 106023-You've configured extension pdo_oci to build statically, but it 106024-depends on extension pdo, which you've configured to build shared. 106025-You either need to build pdo_oci shared or build pdo statically for the 106026-build to be successful. 106027-" >&5 106028-echo "$as_me: error: 106029+ { echo "configure: error: 106030 You've configured extension pdo_oci to build statically, but it 106031 depends on extension pdo, which you've configured to build shared. 106032 You either need to build pdo_oci shared or build pdo statically for the 106033 build to be successful. 106034-" >&2;} 106035- { (exit 1); exit 1; }; } 106036+" 1>&2; exit 1; } 106037 fi 106038 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 106039- { { echo "$as_me:$LINENO: error: 106040-You've configured extension pdo_oci, which depends on extension pdo, 106041-but you've either not enabled pdo, or have disabled it. 106042-" >&5 106043-echo "$as_me: error: 106044+ { echo "configure: error: 106045 You've configured extension pdo_oci, which depends on extension pdo, 106046 but you've either not enabled pdo, or have disabled it. 106047-" >&2;} 106048- { (exit 1); exit 1; }; } 106049+" 1>&2; exit 1; } 106050 fi 106051+ 106052+ 106053 106054- 106055- 106056- 106057-cat >>confdefs.h <<_ACEOF 106058+ cat >> confdefs.h <<EOF 106059 #define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION" 106060-_ACEOF 106061+EOF 106062 106063 fi 106064 106065@@ -92439,19 +71538,19 @@ 106066 106067 php_with_pdo_odbc=no 106068 106069-echo "$as_me:$LINENO: checking for ODBC v3 support for PDO" >&5 106070-echo $ECHO_N "checking for ODBC v3 support for PDO... $ECHO_C" >&6 106071- 106072+echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 106073+echo "configure:71543: checking for ODBC v3 support for PDO" >&5 106074 # Check whether --with-pdo-odbc or --without-pdo-odbc was given. 106075 if test "${with_pdo_odbc+set}" = set; then 106076 withval="$with_pdo_odbc" 106077 PHP_PDO_ODBC=$withval 106078 else 106079- 106080+ 106081 PHP_PDO_ODBC=no 106082 test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL 106083 106084-fi; 106085+fi 106086+ 106087 106088 106089 ext_output="yes, shared" 106090@@ -92475,33 +71574,30 @@ 106091 106092 106093 106094-echo "$as_me:$LINENO: result: $ext_output" >&5 106095-echo "${ECHO_T}$ext_output" >&6 106096- 106097+echo "$ac_t""$ext_output" 1>&6 106098 106099 106100 106101 106102 106103 106104+ 106105 if test "$PHP_PDO_ODBC" != "no"; then 106106 106107 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 106108- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 106109-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 106110- { (exit 1); exit 1; }; } 106111+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 106112 fi 106113 106114- 106115- 106116- echo "$as_me:$LINENO: checking for PDO includes" >&5 106117-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 106118-if test "${pdo_inc_path+set}" = set; then 106119- echo $ECHO_N "(cached) $ECHO_C" >&6 106120-else 106121- 106122- echo "$as_me:$LINENO: checking for PDO includes" >&5 106123-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 106124+ 106125+ 106126+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 106127+echo "configure:71595: checking for PDO includes" >&5 106128+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 106129+ echo $ac_n "(cached) $ac_c" 1>&6 106130+else 106131+ 106132+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 106133+echo "configure:71601: checking for PDO includes" >&5 106134 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 106135 pdo_inc_path=$abs_srcdir/ext 106136 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 106137@@ -92509,22 +71605,20 @@ 106138 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 106139 pdo_inc_path=$prefix/include/php/ext 106140 fi 106141- 106142+ 106143 fi 106144-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 106145-echo "${ECHO_T}$pdo_inc_path" >&6 106146+ 106147+echo "$ac_t""$pdo_inc_path" 1>&6 106148 if test -n "$pdo_inc_path"; then 106149 : 106150 else 106151-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 106152-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 106153- { (exit 1); exit 1; }; } 106154+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 106155 fi 106156 106157+ 106158 106159- 106160- echo "$as_me:$LINENO: checking for selected PDO ODBC flavour" >&5 106161-echo $ECHO_N "checking for selected PDO ODBC flavour... $ECHO_C" >&6 106162+ echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 106163+echo "configure:71622: checking for selected PDO ODBC flavour" >&5 106164 106165 pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" 106166 pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" 106167@@ -92566,39 +71660,22 @@ 106168 ;; 106169 106170 *) 106171- { { echo "$as_me:$LINENO: error: Unknown ODBC flavour $pdo_odbc_flavour 106172- include and lib dirs are looked for under 'dir'. 106173- 106174- 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic 106175- If ',dir' part is omitted, default for the flavour 106176- you have selected will used. e.g.: 106177- 106178- --with-pdo-odbc=unixODBC 106179- 106180- will check for unixODBC under /usr/local. You may attempt 106181- to use an otherwise unsupported driver using the \"generic\" 106182- flavour. The syntax for generic ODBC support is: 106183- 106184- --with-pdo-odbc=generic,dir,libname,ldflags,cflags 106185- 106186- When build as shared the extension filename is always pdo_odbc.so" >&5 106187-echo "$as_me: error: Unknown ODBC flavour $pdo_odbc_flavour 106188+ { echo "configure: error: Unknown ODBC flavour $pdo_odbc_flavour 106189 include and lib dirs are looked for under 'dir'. 106190- 106191+ 106192 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic 106193- If ',dir' part is omitted, default for the flavour 106194+ If ',dir' part is omitted, default for the flavour 106195 you have selected will used. e.g.: 106196- 106197+ 106198 --with-pdo-odbc=unixODBC 106199- 106200- will check for unixODBC under /usr/local. You may attempt 106201- to use an otherwise unsupported driver using the \"generic\" 106202+ 106203+ will check for unixODBC under /usr/local. You may attempt 106204+ to use an otherwise unsupported driver using the \"generic\" 106205 flavour. The syntax for generic ODBC support is: 106206- 106207+ 106208 --with-pdo-odbc=generic,dir,libname,ldflags,cflags 106209 106210- When build as shared the extension filename is always pdo_odbc.so" >&2;} 106211- { (exit 1); exit 1; }; } 106212+ When build as shared the extension filename is always pdo_odbc.so" 1>&2; exit 1; } 106213 ;; 106214 esac 106215 106216@@ -92609,346 +71686,286 @@ 106217 PDO_ODBC_INCDIR="$pdo_odbc_def_incdir" 106218 PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir" 106219 fi 106220- 106221- echo "$as_me:$LINENO: result: $pdo_odbc_flavour 106222+ 106223+ echo "$ac_t""$pdo_odbc_flavour 106224 libs $PDO_ODBC_LIBDIR, 106225- headers $PDO_ODBC_INCDIR" >&5 106226-echo "${ECHO_T}$pdo_odbc_flavour 106227- libs $PDO_ODBC_LIBDIR, 106228- headers $PDO_ODBC_INCDIR" >&6 106229+ headers $PDO_ODBC_INCDIR" 1>&6 106230 106231 if test ! -d "$PDO_ODBC_LIBDIR" ; then 106232- { echo "$as_me:$LINENO: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5 106233-echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;} 106234+ echo "configure: warning: library dir $PDO_ODBC_LIBDIR does not exist" 1>&2 106235 fi 106236 106237- 106238- echo "$as_me:$LINENO: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 106239-echo $ECHO_N "checking for odbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106240+ 106241+ echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106242+echo "configure:71701: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 106243 if test -f "$PDO_ODBC_INCDIR/odbc.h"; then 106244 php_pdo_have_header=yes 106245- 106246-cat >>confdefs.h <<\_ACEOF 106247+ cat >> confdefs.h <<\EOF 106248 #define HAVE_ODBC_H 1 106249-_ACEOF 106250+EOF 106251 106252- echo "$as_me:$LINENO: result: yes" >&5 106253-echo "${ECHO_T}yes" >&6 106254+ echo "$ac_t""yes" 1>&6 106255 else 106256- echo "$as_me:$LINENO: result: no" >&5 106257-echo "${ECHO_T}no" >&6 106258+ echo "$ac_t""no" 1>&6 106259 fi 106260 106261- 106262- echo "$as_me:$LINENO: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 106263-echo $ECHO_N "checking for odbcsdk.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106264+ 106265+ echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106266+echo "configure:71715: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 106267 if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then 106268 php_pdo_have_header=yes 106269- 106270-cat >>confdefs.h <<\_ACEOF 106271+ cat >> confdefs.h <<\EOF 106272 #define HAVE_ODBCSDK_H 1 106273-_ACEOF 106274+EOF 106275 106276- echo "$as_me:$LINENO: result: yes" >&5 106277-echo "${ECHO_T}yes" >&6 106278+ echo "$ac_t""yes" 1>&6 106279 else 106280- echo "$as_me:$LINENO: result: no" >&5 106281-echo "${ECHO_T}no" >&6 106282+ echo "$ac_t""no" 1>&6 106283 fi 106284 106285- 106286- echo "$as_me:$LINENO: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 106287-echo $ECHO_N "checking for iodbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106288+ 106289+ echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106290+echo "configure:71729: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 106291 if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then 106292 php_pdo_have_header=yes 106293- 106294-cat >>confdefs.h <<\_ACEOF 106295+ cat >> confdefs.h <<\EOF 106296 #define HAVE_IODBC_H 1 106297-_ACEOF 106298+EOF 106299 106300- echo "$as_me:$LINENO: result: yes" >&5 106301-echo "${ECHO_T}yes" >&6 106302+ echo "$ac_t""yes" 1>&6 106303 else 106304- echo "$as_me:$LINENO: result: no" >&5 106305-echo "${ECHO_T}no" >&6 106306+ echo "$ac_t""no" 1>&6 106307 fi 106308 106309- 106310- echo "$as_me:$LINENO: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 106311-echo $ECHO_N "checking for sqlunix.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106312+ 106313+ echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106314+echo "configure:71743: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 106315 if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then 106316 php_pdo_have_header=yes 106317- 106318-cat >>confdefs.h <<\_ACEOF 106319+ cat >> confdefs.h <<\EOF 106320 #define HAVE_SQLUNIX_H 1 106321-_ACEOF 106322+EOF 106323 106324- echo "$as_me:$LINENO: result: yes" >&5 106325-echo "${ECHO_T}yes" >&6 106326+ echo "$ac_t""yes" 1>&6 106327 else 106328- echo "$as_me:$LINENO: result: no" >&5 106329-echo "${ECHO_T}no" >&6 106330+ echo "$ac_t""no" 1>&6 106331 fi 106332 106333- 106334- echo "$as_me:$LINENO: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 106335-echo $ECHO_N "checking for sqltypes.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106336+ 106337+ echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106338+echo "configure:71757: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 106339 if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then 106340 php_pdo_have_header=yes 106341- 106342-cat >>confdefs.h <<\_ACEOF 106343+ cat >> confdefs.h <<\EOF 106344 #define HAVE_SQLTYPES_H 1 106345-_ACEOF 106346+EOF 106347 106348- echo "$as_me:$LINENO: result: yes" >&5 106349-echo "${ECHO_T}yes" >&6 106350+ echo "$ac_t""yes" 1>&6 106351 else 106352- echo "$as_me:$LINENO: result: no" >&5 106353-echo "${ECHO_T}no" >&6 106354+ echo "$ac_t""no" 1>&6 106355 fi 106356 106357- 106358- echo "$as_me:$LINENO: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 106359-echo $ECHO_N "checking for sqlucode.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106360+ 106361+ echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106362+echo "configure:71771: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 106363 if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then 106364 php_pdo_have_header=yes 106365- 106366-cat >>confdefs.h <<\_ACEOF 106367+ cat >> confdefs.h <<\EOF 106368 #define HAVE_SQLUCODE_H 1 106369-_ACEOF 106370+EOF 106371 106372- echo "$as_me:$LINENO: result: yes" >&5 106373-echo "${ECHO_T}yes" >&6 106374+ echo "$ac_t""yes" 1>&6 106375 else 106376- echo "$as_me:$LINENO: result: no" >&5 106377-echo "${ECHO_T}no" >&6 106378+ echo "$ac_t""no" 1>&6 106379 fi 106380 106381- 106382- echo "$as_me:$LINENO: checking for sql.h in $PDO_ODBC_INCDIR" >&5 106383-echo $ECHO_N "checking for sql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106384+ 106385+ echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106386+echo "configure:71785: checking for sql.h in $PDO_ODBC_INCDIR" >&5 106387 if test -f "$PDO_ODBC_INCDIR/sql.h"; then 106388 php_pdo_have_header=yes 106389- 106390-cat >>confdefs.h <<\_ACEOF 106391+ cat >> confdefs.h <<\EOF 106392 #define HAVE_SQL_H 1 106393-_ACEOF 106394+EOF 106395 106396- echo "$as_me:$LINENO: result: yes" >&5 106397-echo "${ECHO_T}yes" >&6 106398+ echo "$ac_t""yes" 1>&6 106399 else 106400- echo "$as_me:$LINENO: result: no" >&5 106401-echo "${ECHO_T}no" >&6 106402+ echo "$ac_t""no" 1>&6 106403 fi 106404 106405- 106406- echo "$as_me:$LINENO: checking for isql.h in $PDO_ODBC_INCDIR" >&5 106407-echo $ECHO_N "checking for isql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106408+ 106409+ echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106410+echo "configure:71799: checking for isql.h in $PDO_ODBC_INCDIR" >&5 106411 if test -f "$PDO_ODBC_INCDIR/isql.h"; then 106412 php_pdo_have_header=yes 106413- 106414-cat >>confdefs.h <<\_ACEOF 106415+ cat >> confdefs.h <<\EOF 106416 #define HAVE_ISQL_H 1 106417-_ACEOF 106418+EOF 106419 106420- echo "$as_me:$LINENO: result: yes" >&5 106421-echo "${ECHO_T}yes" >&6 106422+ echo "$ac_t""yes" 1>&6 106423 else 106424- echo "$as_me:$LINENO: result: no" >&5 106425-echo "${ECHO_T}no" >&6 106426+ echo "$ac_t""no" 1>&6 106427 fi 106428 106429- 106430- echo "$as_me:$LINENO: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 106431-echo $ECHO_N "checking for sqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106432+ 106433+ echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106434+echo "configure:71813: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 106435 if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then 106436 php_pdo_have_header=yes 106437- 106438-cat >>confdefs.h <<\_ACEOF 106439+ cat >> confdefs.h <<\EOF 106440 #define HAVE_SQLEXT_H 1 106441-_ACEOF 106442+EOF 106443 106444- echo "$as_me:$LINENO: result: yes" >&5 106445-echo "${ECHO_T}yes" >&6 106446+ echo "$ac_t""yes" 1>&6 106447 else 106448- echo "$as_me:$LINENO: result: no" >&5 106449-echo "${ECHO_T}no" >&6 106450+ echo "$ac_t""no" 1>&6 106451 fi 106452 106453- 106454- echo "$as_me:$LINENO: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 106455-echo $ECHO_N "checking for isqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106456+ 106457+ echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106458+echo "configure:71827: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 106459 if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then 106460 php_pdo_have_header=yes 106461- 106462-cat >>confdefs.h <<\_ACEOF 106463+ cat >> confdefs.h <<\EOF 106464 #define HAVE_ISQLEXT_H 1 106465-_ACEOF 106466+EOF 106467 106468- echo "$as_me:$LINENO: result: yes" >&5 106469-echo "${ECHO_T}yes" >&6 106470+ echo "$ac_t""yes" 1>&6 106471 else 106472- echo "$as_me:$LINENO: result: no" >&5 106473-echo "${ECHO_T}no" >&6 106474+ echo "$ac_t""no" 1>&6 106475 fi 106476 106477- 106478- echo "$as_me:$LINENO: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 106479-echo $ECHO_N "checking for udbcext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106480+ 106481+ echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106482+echo "configure:71841: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 106483 if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then 106484 php_pdo_have_header=yes 106485- 106486-cat >>confdefs.h <<\_ACEOF 106487+ cat >> confdefs.h <<\EOF 106488 #define HAVE_UDBCEXT_H 1 106489-_ACEOF 106490+EOF 106491 106492- echo "$as_me:$LINENO: result: yes" >&5 106493-echo "${ECHO_T}yes" >&6 106494+ echo "$ac_t""yes" 1>&6 106495 else 106496- echo "$as_me:$LINENO: result: no" >&5 106497-echo "${ECHO_T}no" >&6 106498+ echo "$ac_t""no" 1>&6 106499 fi 106500 106501- 106502- echo "$as_me:$LINENO: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 106503-echo $ECHO_N "checking for sqlcli1.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106504+ 106505+ echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106506+echo "configure:71855: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 106507 if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then 106508 php_pdo_have_header=yes 106509- 106510-cat >>confdefs.h <<\_ACEOF 106511+ cat >> confdefs.h <<\EOF 106512 #define HAVE_SQLCLI1_H 1 106513-_ACEOF 106514+EOF 106515 106516- echo "$as_me:$LINENO: result: yes" >&5 106517-echo "${ECHO_T}yes" >&6 106518+ echo "$ac_t""yes" 1>&6 106519 else 106520- echo "$as_me:$LINENO: result: no" >&5 106521-echo "${ECHO_T}no" >&6 106522+ echo "$ac_t""no" 1>&6 106523 fi 106524 106525- 106526- echo "$as_me:$LINENO: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 106527-echo $ECHO_N "checking for LibraryManager.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106528+ 106529+ echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106530+echo "configure:71869: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 106531 if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then 106532 php_pdo_have_header=yes 106533- 106534-cat >>confdefs.h <<\_ACEOF 106535+ cat >> confdefs.h <<\EOF 106536 #define HAVE_LIBRARYMANAGER_H 1 106537-_ACEOF 106538+EOF 106539 106540- echo "$as_me:$LINENO: result: yes" >&5 106541-echo "${ECHO_T}yes" >&6 106542+ echo "$ac_t""yes" 1>&6 106543 else 106544- echo "$as_me:$LINENO: result: no" >&5 106545-echo "${ECHO_T}no" >&6 106546+ echo "$ac_t""no" 1>&6 106547 fi 106548 106549- 106550- echo "$as_me:$LINENO: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 106551-echo $ECHO_N "checking for cli0core.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106552+ 106553+ echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106554+echo "configure:71883: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 106555 if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then 106556 php_pdo_have_header=yes 106557- 106558-cat >>confdefs.h <<\_ACEOF 106559+ cat >> confdefs.h <<\EOF 106560 #define HAVE_CLI0CORE_H 1 106561-_ACEOF 106562+EOF 106563 106564- echo "$as_me:$LINENO: result: yes" >&5 106565-echo "${ECHO_T}yes" >&6 106566+ echo "$ac_t""yes" 1>&6 106567 else 106568- echo "$as_me:$LINENO: result: no" >&5 106569-echo "${ECHO_T}no" >&6 106570+ echo "$ac_t""no" 1>&6 106571 fi 106572 106573- 106574- echo "$as_me:$LINENO: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 106575-echo $ECHO_N "checking for cli0ext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106576+ 106577+ echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106578+echo "configure:71897: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 106579 if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then 106580 php_pdo_have_header=yes 106581- 106582-cat >>confdefs.h <<\_ACEOF 106583+ cat >> confdefs.h <<\EOF 106584 #define HAVE_CLI0EXT_H 1 106585-_ACEOF 106586+EOF 106587 106588- echo "$as_me:$LINENO: result: yes" >&5 106589-echo "${ECHO_T}yes" >&6 106590+ echo "$ac_t""yes" 1>&6 106591 else 106592- echo "$as_me:$LINENO: result: no" >&5 106593-echo "${ECHO_T}no" >&6 106594+ echo "$ac_t""no" 1>&6 106595 fi 106596 106597- 106598- echo "$as_me:$LINENO: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 106599-echo $ECHO_N "checking for cli0cli.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106600+ 106601+ echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106602+echo "configure:71911: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 106603 if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then 106604 php_pdo_have_header=yes 106605- 106606-cat >>confdefs.h <<\_ACEOF 106607+ cat >> confdefs.h <<\EOF 106608 #define HAVE_CLI0CLI_H 1 106609-_ACEOF 106610+EOF 106611 106612- echo "$as_me:$LINENO: result: yes" >&5 106613-echo "${ECHO_T}yes" >&6 106614+ echo "$ac_t""yes" 1>&6 106615 else 106616- echo "$as_me:$LINENO: result: no" >&5 106617-echo "${ECHO_T}no" >&6 106618+ echo "$ac_t""no" 1>&6 106619 fi 106620 106621- 106622- echo "$as_me:$LINENO: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 106623-echo $ECHO_N "checking for cli0defs.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106624+ 106625+ echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106626+echo "configure:71925: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 106627 if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then 106628 php_pdo_have_header=yes 106629- 106630-cat >>confdefs.h <<\_ACEOF 106631+ cat >> confdefs.h <<\EOF 106632 #define HAVE_CLI0DEFS_H 1 106633-_ACEOF 106634+EOF 106635 106636- echo "$as_me:$LINENO: result: yes" >&5 106637-echo "${ECHO_T}yes" >&6 106638+ echo "$ac_t""yes" 1>&6 106639 else 106640- echo "$as_me:$LINENO: result: no" >&5 106641-echo "${ECHO_T}no" >&6 106642+ echo "$ac_t""no" 1>&6 106643 fi 106644 106645- 106646- echo "$as_me:$LINENO: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 106647-echo $ECHO_N "checking for cli0env.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6 106648+ 106649+ echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 106650+echo "configure:71939: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 106651 if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then 106652 php_pdo_have_header=yes 106653- 106654-cat >>confdefs.h <<\_ACEOF 106655+ cat >> confdefs.h <<\EOF 106656 #define HAVE_CLI0ENV_H 1 106657-_ACEOF 106658+EOF 106659 106660- echo "$as_me:$LINENO: result: yes" >&5 106661-echo "${ECHO_T}yes" >&6 106662+ echo "$ac_t""yes" 1>&6 106663 else 106664- echo "$as_me:$LINENO: result: no" >&5 106665-echo "${ECHO_T}no" >&6 106666+ echo "$ac_t""no" 1>&6 106667 fi 106668 106669 106670 if test "$php_pdo_have_header" != "yes"; then 106671- { { echo "$as_me:$LINENO: error: Cannot find header file(s) for pdo_odbc" >&5 106672-echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;} 106673- { (exit 1); exit 1; }; } 106674+ { echo "configure: error: Cannot find header file(s) for pdo_odbc" 1>&2; exit 1; } 106675 fi 106676 106677 PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\"" 106678 PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib" 106679 106680- 106681+ 106682 for ac_i in $PDO_ODBC_LDFLAGS; do 106683 case $ac_i in 106684 -pthread) 106685 if test "$ext_shared" = "yes"; then 106686 PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -pthread" 106687 else 106688- 106689- 106690+ 106691+ 106692 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 106693- 106694+ 106695 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 106696 if test -n "$unique" && test "`eval $cmd`" = "" ; then 106697 eval "EXTRA_LDFLAGS$unique=set" 106698@@ -92959,20 +71976,20 @@ 106699 ;; 106700 -l*) 106701 ac_ii=`echo $ac_i|cut -c 3-` 106702- 106703- 106704+ 106705+ 106706 case $ac_ii in 106707 c|c_r|pthread*) ;; 106708- *) 106709+ *) 106710 if test "$ext_shared" = "yes"; then 106711- PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii" 106712+ PDO_ODBC_SHARED_LIBADD="$PDO_ODBC_SHARED_LIBADD -l$ac_ii" 106713 else 106714- 106715- 106716+ 106717+ 106718 case $ac_ii in 106719 c|c_r|pthread*) ;; 106720- *) 106721- LIBS="$LIBS -l$ac_ii" 106722+ *) 106723+ LIBS="$LIBS -l$ac_ii" 106724 ;; 106725 esac 106726 106727@@ -92985,42 +72002,42 @@ 106728 ;; 106729 -L*) 106730 ac_ii=`echo $ac_i|cut -c 3-` 106731- 106732+ 106733 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 106734- 106735+ 106736 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 106737 ai_p=$ac_ii 106738 else 106739- 106740+ 106741 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 106742- 106743+ 106744 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 106745 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 106746 fi 106747 106748- 106749+ 106750 if test "$ext_shared" = "yes"; then 106751 PDO_ODBC_SHARED_LIBADD="-L$ai_p $PDO_ODBC_SHARED_LIBADD" 106752 test -n "$ld_runpath_switch" && PDO_ODBC_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_ODBC_SHARED_LIBADD" 106753 else 106754- 106755- 106756- 106757+ 106758+ 106759+ 106760 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 106761- 106762+ 106763 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 106764 if test -n "$unique" && test "`eval $cmd`" = "" ; then 106765 eval "LIBPATH$unique=set" 106766- 106767+ 106768 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 106769 LDFLAGS="$LDFLAGS -L$ai_p" 106770 PHP_RPATHS="$PHP_RPATHS $ai_p" 106771- 106772+ 106773 fi 106774 106775 106776 fi 106777- 106778+ 106779 fi 106780 106781 ;; 106782@@ -93028,23 +72045,23 @@ 106783 done 106784 106785 106786- 106787+ 106788 save_old_LDFLAGS=$LDFLAGS 106789 ac_stuff="$PDO_ODBC_LDFLAGS" 106790- 106791+ 106792 save_ext_shared=$ext_shared 106793 ext_shared=yes 106794- 106795+ 106796 for ac_i in $ac_stuff; do 106797 case $ac_i in 106798 -pthread) 106799 if test "$ext_shared" = "yes"; then 106800 LDFLAGS="$LDFLAGS -pthread" 106801 else 106802- 106803- 106804+ 106805+ 106806 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 106807- 106808+ 106809 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 106810 if test -n "$unique" && test "`eval $cmd`" = "" ; then 106811 eval "EXTRA_LDFLAGS$unique=set" 106812@@ -93055,20 +72072,20 @@ 106813 ;; 106814 -l*) 106815 ac_ii=`echo $ac_i|cut -c 3-` 106816- 106817- 106818+ 106819+ 106820 case $ac_ii in 106821 c|c_r|pthread*) ;; 106822- *) 106823+ *) 106824 if test "$ext_shared" = "yes"; then 106825- LDFLAGS="$LDFLAGS -l$ac_ii" 106826+ LDFLAGS="$LDFLAGS -l$ac_ii" 106827 else 106828- 106829- 106830+ 106831+ 106832 case $ac_ii in 106833 c|c_r|pthread*) ;; 106834- *) 106835- LIBS="$LIBS -l$ac_ii" 106836+ *) 106837+ LIBS="$LIBS -l$ac_ii" 106838 ;; 106839 esac 106840 106841@@ -93081,135 +72098,104 @@ 106842 ;; 106843 -L*) 106844 ac_ii=`echo $ac_i|cut -c 3-` 106845- 106846+ 106847 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 106848- 106849+ 106850 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 106851 ai_p=$ac_ii 106852 else 106853- 106854+ 106855 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 106856- 106857+ 106858 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 106859 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 106860 fi 106861 106862- 106863+ 106864 if test "$ext_shared" = "yes"; then 106865 LDFLAGS="-L$ai_p $LDFLAGS" 106866 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 106867 else 106868- 106869- 106870- 106871+ 106872+ 106873+ 106874 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 106875- 106876+ 106877 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 106878 if test -n "$unique" && test "`eval $cmd`" = "" ; then 106879 eval "LIBPATH$unique=set" 106880- 106881+ 106882 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 106883 LDFLAGS="$LDFLAGS -L$ai_p" 106884 PHP_RPATHS="$PHP_RPATHS $ai_p" 106885- 106886+ 106887 fi 106888 106889 106890 fi 106891- 106892+ 106893 fi 106894 106895 ;; 106896 esac 106897 done 106898 106899- as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh` 106900-echo "$as_me:$LINENO: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 106901-echo $ECHO_N "checking for SQLBindCol in -l$pdo_odbc_def_lib... $ECHO_C" >&6 106902-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 106903- echo $ECHO_N "(cached) $ECHO_C" >&6 106904+ echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 106905+echo "configure:72145: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 106906+ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` 106907+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 106908+ echo $ac_n "(cached) $ac_c" 1>&6 106909 else 106910- ac_check_lib_save_LIBS=$LIBS 106911+ ac_save_LIBS="$LIBS" 106912 LIBS="-l$pdo_odbc_def_lib $LIBS" 106913-cat >conftest.$ac_ext <<_ACEOF 106914-/* confdefs.h. */ 106915-_ACEOF 106916-cat confdefs.h >>conftest.$ac_ext 106917-cat >>conftest.$ac_ext <<_ACEOF 106918-/* end confdefs.h. */ 106919- 106920+cat > conftest.$ac_ext <<EOF 106921+#line 72153 "configure" 106922+#include "confdefs.h" 106923 /* Override any gcc2 internal prototype to avoid an error. */ 106924-#ifdef __cplusplus 106925-extern "C" 106926-#endif 106927 /* We use char because int might match the return type of a gcc2 106928- builtin and then its argument prototype would still apply. */ 106929-char SQLBindCol (); 106930-int 106931-main () 106932-{ 106933-SQLBindCol (); 106934- ; 106935- return 0; 106936-} 106937-_ACEOF 106938-rm -f conftest.$ac_objext conftest$ac_exeext 106939-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 106940- (eval $ac_link) 2>conftest.er1 106941- ac_status=$? 106942- grep -v '^ *+' conftest.er1 >conftest.err 106943- rm -f conftest.er1 106944- cat conftest.err >&5 106945- echo "$as_me:$LINENO: \$? = $ac_status" >&5 106946- (exit $ac_status); } && 106947- { ac_try='test -z "$ac_c_werror_flag" 106948- || test ! -s conftest.err' 106949- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 106950- (eval $ac_try) 2>&5 106951- ac_status=$? 106952- echo "$as_me:$LINENO: \$? = $ac_status" >&5 106953- (exit $ac_status); }; } && 106954- { ac_try='test -s conftest$ac_exeext' 106955- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 106956- (eval $ac_try) 2>&5 106957- ac_status=$? 106958- echo "$as_me:$LINENO: \$? = $ac_status" >&5 106959- (exit $ac_status); }; }; then 106960- eval "$as_ac_Lib=yes" 106961-else 106962- echo "$as_me: failed program was:" >&5 106963-sed 's/^/| /' conftest.$ac_ext >&5 106964- 106965-eval "$as_ac_Lib=no" 106966-fi 106967-rm -f conftest.err conftest.$ac_objext \ 106968- conftest$ac_exeext conftest.$ac_ext 106969-LIBS=$ac_check_lib_save_LIBS 106970-fi 106971-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 106972-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 106973-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 106974+ builtin and then its argument prototype would still apply. */ 106975+char SQLBindCol(); 106976+ 106977+int main() { 106978+SQLBindCol() 106979+; return 0; } 106980+EOF 106981+if { (eval echo configure:72164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 106982+ rm -rf conftest* 106983+ eval "ac_cv_lib_$ac_lib_var=yes" 106984+else 106985+ echo "configure: failed program was:" >&5 106986+ cat conftest.$ac_ext >&5 106987+ rm -rf conftest* 106988+ eval "ac_cv_lib_$ac_lib_var=no" 106989+fi 106990+rm -f conftest* 106991+LIBS="$ac_save_LIBS" 106992 106993+fi 106994+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 106995+ echo "$ac_t""yes" 1>&6 106996+ 106997 LDFLAGS=$save_old_LDFLAGS 106998 ext_shared=$save_ext_shared 106999- 107000- 107001+ 107002+ 107003 save_old_LDFLAGS=$LDFLAGS 107004 ac_stuff="$PDO_ODBC_LDFLAGS" 107005- 107006+ 107007 save_ext_shared=$ext_shared 107008 ext_shared=yes 107009- 107010+ 107011 for ac_i in $ac_stuff; do 107012 case $ac_i in 107013 -pthread) 107014 if test "$ext_shared" = "yes"; then 107015 LDFLAGS="$LDFLAGS -pthread" 107016 else 107017- 107018- 107019+ 107020+ 107021 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 107022- 107023+ 107024 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 107025 if test -n "$unique" && test "`eval $cmd`" = "" ; then 107026 eval "EXTRA_LDFLAGS$unique=set" 107027@@ -93220,20 +72206,20 @@ 107028 ;; 107029 -l*) 107030 ac_ii=`echo $ac_i|cut -c 3-` 107031- 107032- 107033+ 107034+ 107035 case $ac_ii in 107036 c|c_r|pthread*) ;; 107037- *) 107038+ *) 107039 if test "$ext_shared" = "yes"; then 107040- LDFLAGS="$LDFLAGS -l$ac_ii" 107041+ LDFLAGS="$LDFLAGS -l$ac_ii" 107042 else 107043- 107044- 107045+ 107046+ 107047 case $ac_ii in 107048 c|c_r|pthread*) ;; 107049- *) 107050- LIBS="$LIBS -l$ac_ii" 107051+ *) 107052+ LIBS="$LIBS -l$ac_ii" 107053 ;; 107054 esac 107055 107056@@ -93246,158 +72232,120 @@ 107057 ;; 107058 -L*) 107059 ac_ii=`echo $ac_i|cut -c 3-` 107060- 107061+ 107062 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 107063- 107064+ 107065 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 107066 ai_p=$ac_ii 107067 else 107068- 107069+ 107070 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 107071- 107072+ 107073 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 107074 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 107075 fi 107076 107077- 107078+ 107079 if test "$ext_shared" = "yes"; then 107080 LDFLAGS="-L$ai_p $LDFLAGS" 107081 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 107082 else 107083- 107084- 107085- 107086+ 107087+ 107088+ 107089 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 107090- 107091+ 107092 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 107093 if test -n "$unique" && test "`eval $cmd`" = "" ; then 107094 eval "LIBPATH$unique=set" 107095- 107096+ 107097 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 107098 LDFLAGS="$LDFLAGS -L$ai_p" 107099 PHP_RPATHS="$PHP_RPATHS $ai_p" 107100- 107101+ 107102 fi 107103 107104 107105 fi 107106- 107107+ 107108 fi 107109 107110 ;; 107111 esac 107112 done 107113 107114- as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh` 107115-echo "$as_me:$LINENO: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 107116-echo $ECHO_N "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... $ECHO_C" >&6 107117-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 107118- echo $ECHO_N "(cached) $ECHO_C" >&6 107119+ echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 107120+echo "configure:72279: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 107121+ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` 107122+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 107123+ echo $ac_n "(cached) $ac_c" 1>&6 107124 else 107125- ac_check_lib_save_LIBS=$LIBS 107126+ ac_save_LIBS="$LIBS" 107127 LIBS="-l$pdo_odbc_def_lib $LIBS" 107128-cat >conftest.$ac_ext <<_ACEOF 107129-/* confdefs.h. */ 107130-_ACEOF 107131-cat confdefs.h >>conftest.$ac_ext 107132-cat >>conftest.$ac_ext <<_ACEOF 107133-/* end confdefs.h. */ 107134- 107135+cat > conftest.$ac_ext <<EOF 107136+#line 72287 "configure" 107137+#include "confdefs.h" 107138 /* Override any gcc2 internal prototype to avoid an error. */ 107139-#ifdef __cplusplus 107140-extern "C" 107141-#endif 107142 /* We use char because int might match the return type of a gcc2 107143- builtin and then its argument prototype would still apply. */ 107144-char SQLAllocHandle (); 107145-int 107146-main () 107147-{ 107148-SQLAllocHandle (); 107149- ; 107150- return 0; 107151-} 107152-_ACEOF 107153-rm -f conftest.$ac_objext conftest$ac_exeext 107154-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 107155- (eval $ac_link) 2>conftest.er1 107156- ac_status=$? 107157- grep -v '^ *+' conftest.er1 >conftest.err 107158- rm -f conftest.er1 107159- cat conftest.err >&5 107160- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107161- (exit $ac_status); } && 107162- { ac_try='test -z "$ac_c_werror_flag" 107163- || test ! -s conftest.err' 107164- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107165- (eval $ac_try) 2>&5 107166- ac_status=$? 107167- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107168- (exit $ac_status); }; } && 107169- { ac_try='test -s conftest$ac_exeext' 107170- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107171- (eval $ac_try) 2>&5 107172- ac_status=$? 107173- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107174- (exit $ac_status); }; }; then 107175- eval "$as_ac_Lib=yes" 107176-else 107177- echo "$as_me: failed program was:" >&5 107178-sed 's/^/| /' conftest.$ac_ext >&5 107179- 107180-eval "$as_ac_Lib=no" 107181-fi 107182-rm -f conftest.err conftest.$ac_objext \ 107183- conftest$ac_exeext conftest.$ac_ext 107184-LIBS=$ac_check_lib_save_LIBS 107185-fi 107186-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 107187-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 107188-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 107189+ builtin and then its argument prototype would still apply. */ 107190+char SQLAllocHandle(); 107191+ 107192+int main() { 107193+SQLAllocHandle() 107194+; return 0; } 107195+EOF 107196+if { (eval echo configure:72298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 107197+ rm -rf conftest* 107198+ eval "ac_cv_lib_$ac_lib_var=yes" 107199+else 107200+ echo "configure: failed program was:" >&5 107201+ cat conftest.$ac_ext >&5 107202+ rm -rf conftest* 107203+ eval "ac_cv_lib_$ac_lib_var=no" 107204+fi 107205+rm -f conftest* 107206+LIBS="$ac_save_LIBS" 107207 107208+fi 107209+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 107210+ echo "$ac_t""yes" 1>&6 107211+ 107212 LDFLAGS=$save_old_LDFLAGS 107213 ext_shared=$save_ext_shared 107214- 107215- 107216+ 107217+ 107218 else 107219+ echo "$ac_t""no" 1>&6 107220 107221 LDFLAGS=$save_old_LDFLAGS 107222 ext_shared=$save_ext_shared 107223 unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle 107224- 107225- { { echo "$as_me:$LINENO: error: 107226-Your ODBC library does not appear to be ODBC 3 compatible. 107227-You should consider using iODBC or unixODBC instead, and loading your 107228-libraries as a driver in that environment; it will emulate the 107229-functions required for PDO support. 107230-" >&5 107231-echo "$as_me: error: 107232+ 107233+ { echo "configure: error: 107234 Your ODBC library does not appear to be ODBC 3 compatible. 107235 You should consider using iODBC or unixODBC instead, and loading your 107236 libraries as a driver in that environment; it will emulate the 107237 functions required for PDO support. 107238-" >&2;} 107239- { (exit 1); exit 1; }; } 107240- 107241+" 1>&2; exit 1; } 107242+ 107243 fi 107244 107245- 107246- 107247+ 107248+ 107249 else 107250+ echo "$ac_t""no" 1>&6 107251 107252 LDFLAGS=$save_old_LDFLAGS 107253 ext_shared=$save_ext_shared 107254 unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol 107255- 107256- { { echo "$as_me:$LINENO: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&5 107257-echo "$as_me: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&2;} 107258- { (exit 1); exit 1; }; } 107259- 107260- 107261+ 107262+ { echo "configure: error: Your ODBC library does not exist or there was an error. Check config.log for more information" 1>&2; exit 1; } 107263+ 107264+ 107265 fi 107266 107267 107268- 107269+ 107270 ext_builddir=ext/pdo_odbc 107271 ext_srcdir=$abs_srcdir/ext/pdo_odbc 107272 107273@@ -93405,15 +72353,15 @@ 107274 107275 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 107276 PHP_PDO_ODBC_SHARED=no 107277- 107278- 107279+ 107280+ 107281 case ext/pdo_odbc in 107282 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 107283 /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 107284 *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 107285 esac 107286- 107287- 107288+ 107289+ 107290 107291 b_c_pre=$php_c_pre 107292 b_cxx_pre=$php_cxx_pre 107293@@ -93426,12 +72374,12 @@ 107294 107295 old_IFS=$IFS 107296 for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do 107297- 107298+ 107299 IFS=. 107300 set $ac_src 107301 ac_obj=$1 107302 IFS=$old_IFS 107303- 107304+ 107305 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 107306 107307 case $ac_src in 107308@@ -93455,14 +72403,14 @@ 107309 else 107310 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 107311 PHP_PDO_ODBC_SHARED=yes 107312- 107313+ 107314 case ext/pdo_odbc in 107315 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 107316 /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 107317 *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 107318 esac 107319- 107320- 107321+ 107322+ 107323 107324 b_c_pre=$shared_c_pre 107325 b_cxx_pre=$shared_cxx_pre 107326@@ -93475,12 +72423,12 @@ 107327 107328 old_IFS=$IFS 107329 for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do 107330- 107331+ 107332 IFS=. 107333 set $ac_src 107334 ac_obj=$1 107335 IFS=$old_IFS 107336- 107337+ 107338 shared_objects_pdo_odbc="$shared_objects_pdo_odbc $ac_bdir$ac_obj.lo" 107339 107340 case $ac_src in 107341@@ -93498,7 +72446,7 @@ 107342 107343 case $host_alias in 107344 *netware*) 107345- 107346+ 107347 install_modules="install-modules" 107348 107349 case $host_alias in 107350@@ -93508,7 +72456,7 @@ 107351 ;; 107352 *netware*) 107353 suffix=nlm 107354- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(PDO_ODBC_SHARED_LIBADD)' 107355+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_ODBC, 3)_SHARED_LIBADD)' 107356 ;; 107357 *) 107358 suffix=la 107359@@ -93521,7 +72469,7 @@ 107360 else 107361 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_odbc.$suffix" 107362 fi 107363- 107364+ 107365 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc" 107366 107367 cat >>Makefile.objects<<EOF 107368@@ -93535,7 +72483,7 @@ 107369 107370 ;; 107371 *) 107372- 107373+ 107374 install_modules="install-modules" 107375 107376 case $host_alias in 107377@@ -93545,7 +72493,7 @@ 107378 ;; 107379 *netware*) 107380 suffix=nlm 107381- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(_ODBC_SHARED_LIBADD)' 107382+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_odbc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_ODBC, 3)_SHARED_LIBADD)' 107383 ;; 107384 *) 107385 suffix=la 107386@@ -93558,7 +72506,7 @@ 107387 else 107388 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_odbc.$suffix" 107389 fi 107390- 107391+ 107392 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_odbc" 107393 107394 cat >>Makefile.objects<<EOF 107395@@ -93572,10 +72520,9 @@ 107396 107397 ;; 107398 esac 107399- 107400-cat >>confdefs.h <<_ACEOF 107401+ cat >> confdefs.h <<EOF 107402 #define COMPILE_DL_PDO_ODBC 1 107403-_ACEOF 107404+EOF 107405 107406 fi 107407 fi 107408@@ -93584,15 +72531,15 @@ 107409 PHP_PDO_ODBC_SHARED=no 107410 case "$PHP_SAPI" in 107411 cgi|embed) 107412- 107413- 107414+ 107415+ 107416 case ext/pdo_odbc in 107417 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 107418 /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 107419 *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 107420 esac 107421- 107422- 107423+ 107424+ 107425 107426 b_c_pre=$php_c_pre 107427 b_cxx_pre=$php_cxx_pre 107428@@ -93605,12 +72552,12 @@ 107429 107430 old_IFS=$IFS 107431 for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do 107432- 107433+ 107434 IFS=. 107435 set $ac_src 107436 ac_obj=$1 107437 IFS=$old_IFS 107438- 107439+ 107440 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 107441 107442 case $ac_src in 107443@@ -93630,15 +72577,15 @@ 107444 EXT_STATIC="$EXT_STATIC pdo_odbc" 107445 ;; 107446 *) 107447- 107448- 107449+ 107450+ 107451 case ext/pdo_odbc in 107452 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 107453 /*) ac_srcdir=`echo "ext/pdo_odbc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 107454 *) ac_srcdir="$abs_srcdir/ext/pdo_odbc/"; ac_bdir="ext/pdo_odbc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 107455 esac 107456- 107457- 107458+ 107459+ 107460 107461 b_c_pre=$php_c_pre 107462 b_cxx_pre=$php_cxx_pre 107463@@ -93651,13 +72598,13 @@ 107464 107465 old_IFS=$IFS 107466 for ac_src in pdo_odbc.c odbc_driver.c odbc_stmt.c; do 107467- 107468+ 107469 IFS=. 107470 set $ac_src 107471 ac_obj=$1 107472 IFS=$old_IFS 107473- 107474- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 107475+ 107476+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 107477 107478 case $ac_src in 107479 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 107480@@ -93677,74 +72624,62 @@ 107481 esac 107482 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_odbc" 107483 fi 107484- 107485- 107486+ 107487+ 107488 BUILD_DIR="$BUILD_DIR $ext_builddir" 107489- 107490+ 107491 107492 107493 if test "$ext_builddir" = "."; then 107494 PHP_PECL_EXTENSION=pdo_odbc 107495- 107496+ 107497 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 107498 107499 fi 107500 107501- 107502+ 107503 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_ODBC_SHARED_LIBADD" 107504 107505- 107506- 107507+ 107508+ 107509 am_i_shared=$PHP_PDO_ODBC_SHARED 107510 is_it_shared=$PHP_PDO_SHARED 107511 is_it_enabled=$PHP_PDO 107512 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 107513- { { echo "$as_me:$LINENO: error: 107514-You've configured extension pdo_odbc to build statically, but it 107515-depends on extension pdo, which you've configured to build shared. 107516-You either need to build pdo_odbc shared or build pdo statically for the 107517-build to be successful. 107518-" >&5 107519-echo "$as_me: error: 107520+ { echo "configure: error: 107521 You've configured extension pdo_odbc to build statically, but it 107522 depends on extension pdo, which you've configured to build shared. 107523 You either need to build pdo_odbc shared or build pdo statically for the 107524 build to be successful. 107525-" >&2;} 107526- { (exit 1); exit 1; }; } 107527+" 1>&2; exit 1; } 107528 fi 107529 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 107530- { { echo "$as_me:$LINENO: error: 107531-You've configured extension pdo_odbc, which depends on extension pdo, 107532-but you've either not enabled pdo, or have disabled it. 107533-" >&5 107534-echo "$as_me: error: 107535+ { echo "configure: error: 107536 You've configured extension pdo_odbc, which depends on extension pdo, 107537 but you've either not enabled pdo, or have disabled it. 107538-" >&2;} 107539- { (exit 1); exit 1; }; } 107540+" 1>&2; exit 1; } 107541 fi 107542- 107543- 107544+ 107545+ 107546 fi 107547 107548 107549 107550 php_with_pdo_pgsql=no 107551 107552-echo "$as_me:$LINENO: checking for PostgreSQL support for PDO" >&5 107553-echo $ECHO_N "checking for PostgreSQL support for PDO... $ECHO_C" >&6 107554- 107555+echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 107556+echo "configure:72672: checking for PostgreSQL support for PDO" >&5 107557 # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. 107558 if test "${with_pdo_pgsql+set}" = set; then 107559 withval="$with_pdo_pgsql" 107560 PHP_PDO_PGSQL=$withval 107561 else 107562- 107563+ 107564 PHP_PDO_PGSQL=no 107565 test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL 107566 107567-fi; 107568+fi 107569+ 107570 107571 107572 ext_output="yes, shared" 107573@@ -93768,8 +72703,7 @@ 107574 107575 107576 107577-echo "$as_me:$LINENO: result: $ext_output" >&5 107578-echo "${ECHO_T}$ext_output" >&6 107579+echo "$ac_t""$ext_output" 1>&6 107580 107581 107582 107583@@ -93777,25 +72711,23 @@ 107584 if test "$PHP_PDO_PGSQL" != "no"; then 107585 107586 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 107587- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 107588-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 107589- { (exit 1); exit 1; }; } 107590+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 107591 fi 107592 107593- 107594+ 107595 if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then 107596 PGSQL_INCLUDE=$PGSQL_INCLUDE 107597 else 107598- 107599+ 107600 ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 107601- 107602+ 107603 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 107604 PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 107605 fi 107606 107607 107608- echo "$as_me:$LINENO: checking for pg_config" >&5 107609-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6 107610+ echo $ac_n "checking for pg_config""... $ac_c" 1>&6 107611+echo "configure:72731: checking for pg_config" >&5 107612 for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do 107613 if test -x $i/pg_config; then 107614 PG_CONFIG="$i/pg_config" 107615@@ -93804,41 +72736,37 @@ 107616 done 107617 107618 if test -n "$PG_CONFIG"; then 107619- echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 107620-echo "${ECHO_T}$PG_CONFIG" >&6 107621+ echo "$ac_t""$PG_CONFIG" 1>&6 107622 PGSQL_INCLUDE=`$PG_CONFIG --includedir` 107623 PGSQL_LIBDIR=`$PG_CONFIG --libdir` 107624- 107625-cat >>confdefs.h <<\_ACEOF 107626+ cat >> confdefs.h <<\EOF 107627 #define HAVE_PG_CONFIG_H 1 107628-_ACEOF 107629+EOF 107630 107631 else 107632- echo "$as_me:$LINENO: result: not found" >&5 107633-echo "${ECHO_T}not found" >&6 107634+ echo "$ac_t""not found" 1>&6 107635 if test "$PHP_PDO_PGSQL" = "yes"; then 107636 PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql" 107637 else 107638 PGSQL_SEARCH_PATHS=$PHP_PDO_PGSQL 107639 fi 107640- 107641+ 107642 for i in $PGSQL_SEARCH_PATHS; do 107643 for j in include include/pgsql include/postgres include/postgresql ""; do 107644 if test -r "$i/$j/libpq-fe.h"; then 107645 PGSQL_INC_BASE=$i 107646 PGSQL_INCLUDE=$i/$j 107647 if test -r "$i/$j/pg_config.h"; then 107648- 107649-cat >>confdefs.h <<\_ACEOF 107650+ cat >> confdefs.h <<\EOF 107651 #define HAVE_PG_CONFIG_H 1 107652-_ACEOF 107653+EOF 107654 107655 fi 107656 fi 107657 done 107658 107659 for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do 107660- if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 107661+ if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 107662 PGSQL_LIBDIR=$i/$j 107663 fi 107664 done 107665@@ -93846,546 +72774,387 @@ 107666 fi 107667 107668 if test -z "$PGSQL_INCLUDE"; then 107669- { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5 107670-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;} 107671- { (exit 1); exit 1; }; } 107672+ { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } 107673 fi 107674 107675 if test -z "$PGSQL_LIBDIR"; then 107676- { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5 107677-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;} 107678- { (exit 1); exit 1; }; } 107679+ { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } 107680 fi 107681 107682 if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then 107683- { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5 107684-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;} 107685- { (exit 1); exit 1; }; } 107686+ { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; } 107687 fi 107688 107689- 107690-cat >>confdefs.h <<\_ACEOF 107691+ cat >> confdefs.h <<\EOF 107692 #define HAVE_PDO_PGSQL 1 107693-_ACEOF 107694+EOF 107695 107696 107697- echo "$as_me:$LINENO: checking for openssl dependencies" >&5 107698-echo $ECHO_N "checking for openssl dependencies... $ECHO_C" >&6 107699+ echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 107700+echo "configure:72795: checking for openssl dependencies" >&5 107701 grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 107702 if test $? -eq 0 ; then 107703- echo "$as_me:$LINENO: result: yes" >&5 107704-echo "${ECHO_T}yes" >&6 107705+ echo "$ac_t""yes" 1>&6 107706 # Extract the first word of "pkg-config", so it can be a program name with args. 107707 set dummy pkg-config; ac_word=$2 107708-echo "$as_me:$LINENO: checking for $ac_word" >&5 107709-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 107710-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then 107711- echo $ECHO_N "(cached) $ECHO_C" >&6 107712+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 107713+echo "configure:72802: checking for $ac_word" >&5 107714+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 107715+ echo $ac_n "(cached) $ac_c" 1>&6 107716 else 107717- case $PKG_CONFIG in 107718- [\\/]* | ?:[\\/]*) 107719+ case "$PKG_CONFIG" in 107720+ /*) 107721 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 107722 ;; 107723+ ?:/*) 107724+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 107725+ ;; 107726 *) 107727- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 107728-for as_dir in $PATH 107729-do 107730- IFS=$as_save_IFS 107731- test -z "$as_dir" && as_dir=. 107732- for ac_exec_ext in '' $ac_executable_extensions; do 107733- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 107734- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 107735- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 107736- break 2 107737- fi 107738-done 107739-done 107740- 107741+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 107742+ ac_dummy="$PATH" 107743+ for ac_dir in $ac_dummy; do 107744+ test -z "$ac_dir" && ac_dir=. 107745+ if test -f $ac_dir/$ac_word; then 107746+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 107747+ break 107748+ fi 107749+ done 107750+ IFS="$ac_save_ifs" 107751 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 107752 ;; 107753 esac 107754 fi 107755-PKG_CONFIG=$ac_cv_path_PKG_CONFIG 107756- 107757+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 107758 if test -n "$PKG_CONFIG"; then 107759- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 107760-echo "${ECHO_T}$PKG_CONFIG" >&6 107761+ echo "$ac_t""$PKG_CONFIG" 1>&6 107762 else 107763- echo "$as_me:$LINENO: result: no" >&5 107764-echo "${ECHO_T}no" >&6 107765+ echo "$ac_t""no" 1>&6 107766 fi 107767 107768 if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then 107769 PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags` 107770 fi 107771 else 107772- echo "$as_me:$LINENO: result: no" >&5 107773-echo "${ECHO_T}no" >&6 107774+ echo "$ac_t""no" 1>&6 107775 fi 107776 107777 old_LIBS=$LIBS 107778 old_LDFLAGS=$LDFLAGS 107779 LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" 107780- echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5 107781-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6 107782-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then 107783- echo $ECHO_N "(cached) $ECHO_C" >&6 107784+ echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 107785+echo "configure:72846: checking for PQparameterStatus in -lpq" >&5 107786+ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` 107787+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 107788+ echo $ac_n "(cached) $ac_c" 1>&6 107789 else 107790- ac_check_lib_save_LIBS=$LIBS 107791+ ac_save_LIBS="$LIBS" 107792 LIBS="-lpq $LIBS" 107793-cat >conftest.$ac_ext <<_ACEOF 107794-/* confdefs.h. */ 107795-_ACEOF 107796-cat confdefs.h >>conftest.$ac_ext 107797-cat >>conftest.$ac_ext <<_ACEOF 107798-/* end confdefs.h. */ 107799- 107800+cat > conftest.$ac_ext <<EOF 107801+#line 72854 "configure" 107802+#include "confdefs.h" 107803 /* Override any gcc2 internal prototype to avoid an error. */ 107804-#ifdef __cplusplus 107805-extern "C" 107806-#endif 107807 /* We use char because int might match the return type of a gcc2 107808- builtin and then its argument prototype would still apply. */ 107809-char PQparameterStatus (); 107810-int 107811-main () 107812-{ 107813-PQparameterStatus (); 107814- ; 107815- return 0; 107816-} 107817-_ACEOF 107818-rm -f conftest.$ac_objext conftest$ac_exeext 107819-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 107820- (eval $ac_link) 2>conftest.er1 107821- ac_status=$? 107822- grep -v '^ *+' conftest.er1 >conftest.err 107823- rm -f conftest.er1 107824- cat conftest.err >&5 107825- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107826- (exit $ac_status); } && 107827- { ac_try='test -z "$ac_c_werror_flag" 107828- || test ! -s conftest.err' 107829- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107830- (eval $ac_try) 2>&5 107831- ac_status=$? 107832- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107833- (exit $ac_status); }; } && 107834- { ac_try='test -s conftest$ac_exeext' 107835- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107836- (eval $ac_try) 2>&5 107837- ac_status=$? 107838- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107839- (exit $ac_status); }; }; then 107840- ac_cv_lib_pq_PQparameterStatus=yes 107841-else 107842- echo "$as_me: failed program was:" >&5 107843-sed 's/^/| /' conftest.$ac_ext >&5 107844- 107845-ac_cv_lib_pq_PQparameterStatus=no 107846-fi 107847-rm -f conftest.err conftest.$ac_objext \ 107848- conftest$ac_exeext conftest.$ac_ext 107849-LIBS=$ac_check_lib_save_LIBS 107850-fi 107851-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5 107852-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6 107853-if test $ac_cv_lib_pq_PQparameterStatus = yes; then 107854+ builtin and then its argument prototype would still apply. */ 107855+char PQparameterStatus(); 107856+ 107857+int main() { 107858+PQparameterStatus() 107859+; return 0; } 107860+EOF 107861+if { (eval echo configure:72865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 107862+ rm -rf conftest* 107863+ eval "ac_cv_lib_$ac_lib_var=yes" 107864+else 107865+ echo "configure: failed program was:" >&5 107866+ cat conftest.$ac_ext >&5 107867+ rm -rf conftest* 107868+ eval "ac_cv_lib_$ac_lib_var=no" 107869+fi 107870+rm -f conftest* 107871+LIBS="$ac_save_LIBS" 107872 107873-cat >>confdefs.h <<\_ACEOF 107874+fi 107875+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 107876+ echo "$ac_t""yes" 1>&6 107877+ cat >> confdefs.h <<\EOF 107878 #define HAVE_PQPARAMETERSTATUS 1 107879-_ACEOF 107880+EOF 107881 107882 else 107883+ echo "$ac_t""no" 1>&6 107884 107885 echo "Unable to build the PDO PostgreSQL driver: libpq 7.4+ is required" 107886 exit 1 107887- 107888+ 107889 fi 107890 107891 107892- echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5 107893-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6 107894-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then 107895- echo $ECHO_N "(cached) $ECHO_C" >&6 107896+ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 107897+echo "configure:72894: checking for PQprepare in -lpq" >&5 107898+ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` 107899+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 107900+ echo $ac_n "(cached) $ac_c" 1>&6 107901 else 107902- ac_check_lib_save_LIBS=$LIBS 107903+ ac_save_LIBS="$LIBS" 107904 LIBS="-lpq $LIBS" 107905-cat >conftest.$ac_ext <<_ACEOF 107906-/* confdefs.h. */ 107907-_ACEOF 107908-cat confdefs.h >>conftest.$ac_ext 107909-cat >>conftest.$ac_ext <<_ACEOF 107910-/* end confdefs.h. */ 107911- 107912+cat > conftest.$ac_ext <<EOF 107913+#line 72902 "configure" 107914+#include "confdefs.h" 107915 /* Override any gcc2 internal prototype to avoid an error. */ 107916-#ifdef __cplusplus 107917-extern "C" 107918-#endif 107919 /* We use char because int might match the return type of a gcc2 107920- builtin and then its argument prototype would still apply. */ 107921-char PQprepare (); 107922-int 107923-main () 107924-{ 107925-PQprepare (); 107926- ; 107927- return 0; 107928-} 107929-_ACEOF 107930-rm -f conftest.$ac_objext conftest$ac_exeext 107931-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 107932- (eval $ac_link) 2>conftest.er1 107933- ac_status=$? 107934- grep -v '^ *+' conftest.er1 >conftest.err 107935- rm -f conftest.er1 107936- cat conftest.err >&5 107937- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107938- (exit $ac_status); } && 107939- { ac_try='test -z "$ac_c_werror_flag" 107940- || test ! -s conftest.err' 107941- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107942- (eval $ac_try) 2>&5 107943- ac_status=$? 107944- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107945- (exit $ac_status); }; } && 107946- { ac_try='test -s conftest$ac_exeext' 107947- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 107948- (eval $ac_try) 2>&5 107949- ac_status=$? 107950- echo "$as_me:$LINENO: \$? = $ac_status" >&5 107951- (exit $ac_status); }; }; then 107952- ac_cv_lib_pq_PQprepare=yes 107953-else 107954- echo "$as_me: failed program was:" >&5 107955-sed 's/^/| /' conftest.$ac_ext >&5 107956- 107957-ac_cv_lib_pq_PQprepare=no 107958-fi 107959-rm -f conftest.err conftest.$ac_objext \ 107960- conftest$ac_exeext conftest.$ac_ext 107961-LIBS=$ac_check_lib_save_LIBS 107962-fi 107963-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5 107964-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6 107965-if test $ac_cv_lib_pq_PQprepare = yes; then 107966+ builtin and then its argument prototype would still apply. */ 107967+char PQprepare(); 107968+ 107969+int main() { 107970+PQprepare() 107971+; return 0; } 107972+EOF 107973+if { (eval echo configure:72913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 107974+ rm -rf conftest* 107975+ eval "ac_cv_lib_$ac_lib_var=yes" 107976+else 107977+ echo "configure: failed program was:" >&5 107978+ cat conftest.$ac_ext >&5 107979+ rm -rf conftest* 107980+ eval "ac_cv_lib_$ac_lib_var=no" 107981+fi 107982+rm -f conftest* 107983+LIBS="$ac_save_LIBS" 107984 107985-cat >>confdefs.h <<\_ACEOF 107986+fi 107987+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 107988+ echo "$ac_t""yes" 1>&6 107989+ cat >> confdefs.h <<\EOF 107990 #define HAVE_PQPREPARE 1 107991-_ACEOF 107992+EOF 107993 107994+else 107995+ echo "$ac_t""no" 1>&6 107996 fi 107997 107998- echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5 107999-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6 108000-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then 108001- echo $ECHO_N "(cached) $ECHO_C" >&6 108002+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 108003+echo "configure:72937: checking for PQescapeStringConn in -lpq" >&5 108004+ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` 108005+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 108006+ echo $ac_n "(cached) $ac_c" 1>&6 108007 else 108008- ac_check_lib_save_LIBS=$LIBS 108009+ ac_save_LIBS="$LIBS" 108010 LIBS="-lpq $LIBS" 108011-cat >conftest.$ac_ext <<_ACEOF 108012-/* confdefs.h. */ 108013-_ACEOF 108014-cat confdefs.h >>conftest.$ac_ext 108015-cat >>conftest.$ac_ext <<_ACEOF 108016-/* end confdefs.h. */ 108017- 108018+cat > conftest.$ac_ext <<EOF 108019+#line 72945 "configure" 108020+#include "confdefs.h" 108021 /* Override any gcc2 internal prototype to avoid an error. */ 108022-#ifdef __cplusplus 108023-extern "C" 108024-#endif 108025 /* We use char because int might match the return type of a gcc2 108026- builtin and then its argument prototype would still apply. */ 108027-char PQescapeStringConn (); 108028-int 108029-main () 108030-{ 108031-PQescapeStringConn (); 108032- ; 108033- return 0; 108034-} 108035-_ACEOF 108036-rm -f conftest.$ac_objext conftest$ac_exeext 108037-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 108038- (eval $ac_link) 2>conftest.er1 108039- ac_status=$? 108040- grep -v '^ *+' conftest.er1 >conftest.err 108041- rm -f conftest.er1 108042- cat conftest.err >&5 108043- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108044- (exit $ac_status); } && 108045- { ac_try='test -z "$ac_c_werror_flag" 108046- || test ! -s conftest.err' 108047- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108048- (eval $ac_try) 2>&5 108049- ac_status=$? 108050- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108051- (exit $ac_status); }; } && 108052- { ac_try='test -s conftest$ac_exeext' 108053- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108054- (eval $ac_try) 2>&5 108055- ac_status=$? 108056- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108057- (exit $ac_status); }; }; then 108058- ac_cv_lib_pq_PQescapeStringConn=yes 108059-else 108060- echo "$as_me: failed program was:" >&5 108061-sed 's/^/| /' conftest.$ac_ext >&5 108062- 108063-ac_cv_lib_pq_PQescapeStringConn=no 108064-fi 108065-rm -f conftest.err conftest.$ac_objext \ 108066- conftest$ac_exeext conftest.$ac_ext 108067-LIBS=$ac_check_lib_save_LIBS 108068-fi 108069-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 108070-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6 108071-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then 108072+ builtin and then its argument prototype would still apply. */ 108073+char PQescapeStringConn(); 108074+ 108075+int main() { 108076+PQescapeStringConn() 108077+; return 0; } 108078+EOF 108079+if { (eval echo configure:72956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 108080+ rm -rf conftest* 108081+ eval "ac_cv_lib_$ac_lib_var=yes" 108082+else 108083+ echo "configure: failed program was:" >&5 108084+ cat conftest.$ac_ext >&5 108085+ rm -rf conftest* 108086+ eval "ac_cv_lib_$ac_lib_var=no" 108087+fi 108088+rm -f conftest* 108089+LIBS="$ac_save_LIBS" 108090 108091-cat >>confdefs.h <<\_ACEOF 108092+fi 108093+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 108094+ echo "$ac_t""yes" 1>&6 108095+ cat >> confdefs.h <<\EOF 108096 #define HAVE_PQESCAPE_CONN 1 108097-_ACEOF 108098+EOF 108099 108100+else 108101+ echo "$ac_t""no" 1>&6 108102 fi 108103 108104- echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5 108105-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6 108106-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then 108107- echo $ECHO_N "(cached) $ECHO_C" >&6 108108+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 108109+echo "configure:72980: checking for PQescapeByteaConn in -lpq" >&5 108110+ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` 108111+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 108112+ echo $ac_n "(cached) $ac_c" 1>&6 108113 else 108114- ac_check_lib_save_LIBS=$LIBS 108115+ ac_save_LIBS="$LIBS" 108116 LIBS="-lpq $LIBS" 108117-cat >conftest.$ac_ext <<_ACEOF 108118-/* confdefs.h. */ 108119-_ACEOF 108120-cat confdefs.h >>conftest.$ac_ext 108121-cat >>conftest.$ac_ext <<_ACEOF 108122-/* end confdefs.h. */ 108123- 108124+cat > conftest.$ac_ext <<EOF 108125+#line 72988 "configure" 108126+#include "confdefs.h" 108127 /* Override any gcc2 internal prototype to avoid an error. */ 108128-#ifdef __cplusplus 108129-extern "C" 108130-#endif 108131 /* We use char because int might match the return type of a gcc2 108132- builtin and then its argument prototype would still apply. */ 108133-char PQescapeByteaConn (); 108134-int 108135-main () 108136-{ 108137-PQescapeByteaConn (); 108138- ; 108139- return 0; 108140-} 108141-_ACEOF 108142-rm -f conftest.$ac_objext conftest$ac_exeext 108143-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 108144- (eval $ac_link) 2>conftest.er1 108145- ac_status=$? 108146- grep -v '^ *+' conftest.er1 >conftest.err 108147- rm -f conftest.er1 108148- cat conftest.err >&5 108149- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108150- (exit $ac_status); } && 108151- { ac_try='test -z "$ac_c_werror_flag" 108152- || test ! -s conftest.err' 108153- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108154- (eval $ac_try) 2>&5 108155- ac_status=$? 108156- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108157- (exit $ac_status); }; } && 108158- { ac_try='test -s conftest$ac_exeext' 108159- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108160- (eval $ac_try) 2>&5 108161- ac_status=$? 108162- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108163- (exit $ac_status); }; }; then 108164- ac_cv_lib_pq_PQescapeByteaConn=yes 108165-else 108166- echo "$as_me: failed program was:" >&5 108167-sed 's/^/| /' conftest.$ac_ext >&5 108168- 108169-ac_cv_lib_pq_PQescapeByteaConn=no 108170-fi 108171-rm -f conftest.err conftest.$ac_objext \ 108172- conftest$ac_exeext conftest.$ac_ext 108173-LIBS=$ac_check_lib_save_LIBS 108174-fi 108175-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5 108176-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6 108177-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then 108178+ builtin and then its argument prototype would still apply. */ 108179+char PQescapeByteaConn(); 108180+ 108181+int main() { 108182+PQescapeByteaConn() 108183+; return 0; } 108184+EOF 108185+if { (eval echo configure:72999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 108186+ rm -rf conftest* 108187+ eval "ac_cv_lib_$ac_lib_var=yes" 108188+else 108189+ echo "configure: failed program was:" >&5 108190+ cat conftest.$ac_ext >&5 108191+ rm -rf conftest* 108192+ eval "ac_cv_lib_$ac_lib_var=no" 108193+fi 108194+rm -f conftest* 108195+LIBS="$ac_save_LIBS" 108196 108197-cat >>confdefs.h <<\_ACEOF 108198+fi 108199+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 108200+ echo "$ac_t""yes" 1>&6 108201+ cat >> confdefs.h <<\EOF 108202 #define HAVE_PQESCAPE_BYTEA_CONN 1 108203-_ACEOF 108204+EOF 108205 108206+else 108207+ echo "$ac_t""no" 1>&6 108208 fi 108209 108210 108211- echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5 108212-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6 108213-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then 108214- echo $ECHO_N "(cached) $ECHO_C" >&6 108215+ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 108216+echo "configure:73024: checking for pg_encoding_to_char in -lpq" >&5 108217+ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` 108218+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 108219+ echo $ac_n "(cached) $ac_c" 1>&6 108220 else 108221- ac_check_lib_save_LIBS=$LIBS 108222+ ac_save_LIBS="$LIBS" 108223 LIBS="-lpq $LIBS" 108224-cat >conftest.$ac_ext <<_ACEOF 108225-/* confdefs.h. */ 108226-_ACEOF 108227-cat confdefs.h >>conftest.$ac_ext 108228-cat >>conftest.$ac_ext <<_ACEOF 108229-/* end confdefs.h. */ 108230- 108231+cat > conftest.$ac_ext <<EOF 108232+#line 73032 "configure" 108233+#include "confdefs.h" 108234 /* Override any gcc2 internal prototype to avoid an error. */ 108235-#ifdef __cplusplus 108236-extern "C" 108237-#endif 108238 /* We use char because int might match the return type of a gcc2 108239- builtin and then its argument prototype would still apply. */ 108240-char pg_encoding_to_char (); 108241-int 108242-main () 108243-{ 108244-pg_encoding_to_char (); 108245- ; 108246- return 0; 108247-} 108248-_ACEOF 108249-rm -f conftest.$ac_objext conftest$ac_exeext 108250-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 108251- (eval $ac_link) 2>conftest.er1 108252- ac_status=$? 108253- grep -v '^ *+' conftest.er1 >conftest.err 108254- rm -f conftest.er1 108255- cat conftest.err >&5 108256- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108257- (exit $ac_status); } && 108258- { ac_try='test -z "$ac_c_werror_flag" 108259- || test ! -s conftest.err' 108260- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108261- (eval $ac_try) 2>&5 108262- ac_status=$? 108263- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108264- (exit $ac_status); }; } && 108265- { ac_try='test -s conftest$ac_exeext' 108266- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 108267- (eval $ac_try) 2>&5 108268- ac_status=$? 108269- echo "$as_me:$LINENO: \$? = $ac_status" >&5 108270- (exit $ac_status); }; }; then 108271- ac_cv_lib_pq_pg_encoding_to_char=yes 108272-else 108273- echo "$as_me: failed program was:" >&5 108274-sed 's/^/| /' conftest.$ac_ext >&5 108275- 108276-ac_cv_lib_pq_pg_encoding_to_char=no 108277-fi 108278-rm -f conftest.err conftest.$ac_objext \ 108279- conftest$ac_exeext conftest.$ac_ext 108280-LIBS=$ac_check_lib_save_LIBS 108281-fi 108282-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5 108283-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6 108284-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then 108285+ builtin and then its argument prototype would still apply. */ 108286+char pg_encoding_to_char(); 108287 108288-cat >>confdefs.h <<\_ACEOF 108289-#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 108290-_ACEOF 108291+int main() { 108292+pg_encoding_to_char() 108293+; return 0; } 108294+EOF 108295+if { (eval echo configure:73043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 108296+ rm -rf conftest* 108297+ eval "ac_cv_lib_$ac_lib_var=yes" 108298+else 108299+ echo "configure: failed program was:" >&5 108300+ cat conftest.$ac_ext >&5 108301+ rm -rf conftest* 108302+ eval "ac_cv_lib_$ac_lib_var=no" 108303+fi 108304+rm -f conftest* 108305+LIBS="$ac_save_LIBS" 108306 108307 fi 108308+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 108309+ echo "$ac_t""yes" 1>&6 108310+ cat >> confdefs.h <<\EOF 108311+#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 108312+EOF 108313 108314+else 108315+ echo "$ac_t""no" 1>&6 108316+fi 108317 108318+ 108319 108320 LIBS=$old_LIBS 108321 LDFLAGS=$old_LDFLAGS 108322 108323- 108324+ 108325 108326 if test "$ext_shared" = "yes"; then 108327 PDO_PGSQL_SHARED_LIBADD="-lpq $PDO_PGSQL_SHARED_LIBADD" 108328 if test -n "$PGSQL_LIBDIR"; then 108329- 108330+ 108331 if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then 108332- 108333+ 108334 if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then 108335 ai_p=$PGSQL_LIBDIR 108336 else 108337- 108338+ 108339 ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 108340- 108341+ 108342 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 108343 ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" 108344 fi 108345 108346- 108347+ 108348 if test "$ext_shared" = "yes"; then 108349 PDO_PGSQL_SHARED_LIBADD="-L$ai_p $PDO_PGSQL_SHARED_LIBADD" 108350 test -n "$ld_runpath_switch" && PDO_PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_PGSQL_SHARED_LIBADD" 108351 else 108352- 108353- 108354- 108355+ 108356+ 108357+ 108358 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 108359- 108360+ 108361 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 108362 if test -n "$unique" && test "`eval $cmd`" = "" ; then 108363 eval "LIBPATH$unique=set" 108364- 108365+ 108366 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 108367 LDFLAGS="$LDFLAGS -L$ai_p" 108368 PHP_RPATHS="$PHP_RPATHS $ai_p" 108369- 108370+ 108371 fi 108372 108373 108374 fi 108375- 108376+ 108377 fi 108378 108379 fi 108380 else 108381- 108382+ 108383 108384 if test -n "$PGSQL_LIBDIR"; then 108385- 108386+ 108387 if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then 108388- 108389+ 108390 if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then 108391 ai_p=$PGSQL_LIBDIR 108392 else 108393- 108394+ 108395 ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 108396- 108397+ 108398 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 108399 ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" 108400 fi 108401 108402- 108403- 108404- 108405- 108406+ 108407+ 108408+ 108409+ 108410 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 108411- 108412+ 108413 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 108414 if test -n "$unique" && test "`eval $cmd`" = "" ; then 108415 eval "LIBPATH$unique=set" 108416- 108417+ 108418 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 108419 LDFLAGS="$LDFLAGS -L$ai_p" 108420 PHP_RPATHS="$PHP_RPATHS $ai_p" 108421- 108422+ 108423 fi 108424 108425 108426- 108427+ 108428 fi 108429 108430 fi 108431- 108432- 108433+ 108434+ 108435 case pq in 108436 c|c_r|pthread*) ;; 108437- *) 108438- LIBS="-lpq $LIBS" 108439+ *) 108440+ LIBS="-lpq $LIBS" 108441 ;; 108442 esac 108443 108444@@ -94395,52 +73164,52 @@ 108445 fi 108446 108447 108448- 108449+ 108450 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_PGSQL_SHARED_LIBADD" 108451 108452 108453- 108454+ 108455 if test "$PGSQL_INCLUDE" != "/usr/include"; then 108456- 108457+ 108458 if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then 108459 ai_p=$PGSQL_INCLUDE 108460 else 108461- 108462+ 108463 ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 108464- 108465+ 108466 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 108467 ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 108468 fi 108469 108470- 108471- 108472+ 108473+ 108474 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 108475- 108476+ 108477 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 108478 if test -n "$unique" && test "`eval $cmd`" = "" ; then 108479 eval "INCLUDEPATH$unique=set" 108480- 108481+ 108482 if test ""; then 108483 INCLUDES="-I$ai_p $INCLUDES" 108484 else 108485 INCLUDES="$INCLUDES -I$ai_p" 108486 fi 108487- 108488+ 108489 fi 108490 108491 fi 108492 108493 108494- 108495- 108496- echo "$as_me:$LINENO: checking for PDO includes" >&5 108497-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 108498-if test "${pdo_inc_path+set}" = set; then 108499- echo $ECHO_N "(cached) $ECHO_C" >&6 108500+ 108501+ 108502+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 108503+echo "configure:73207: checking for PDO includes" >&5 108504+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 108505+ echo $ac_n "(cached) $ac_c" 1>&6 108506 else 108507- 108508- echo "$as_me:$LINENO: checking for PDO includes" >&5 108509-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 108510+ 108511+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 108512+echo "configure:73213: checking for PDO includes" >&5 108513 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 108514 pdo_inc_path=$abs_srcdir/ext 108515 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 108516@@ -94448,21 +73217,19 @@ 108517 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 108518 pdo_inc_path=$prefix/include/php/ext 108519 fi 108520- 108521+ 108522 fi 108523-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 108524-echo "${ECHO_T}$pdo_inc_path" >&6 108525+ 108526+echo "$ac_t""$pdo_inc_path" 1>&6 108527 if test -n "$pdo_inc_path"; then 108528 : 108529 else 108530-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 108531-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 108532- { (exit 1); exit 1; }; } 108533+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 108534 fi 108535 108536+ 108537 108538- 108539- 108540+ 108541 ext_builddir=ext/pdo_pgsql 108542 ext_srcdir=$abs_srcdir/ext/pdo_pgsql 108543 108544@@ -94470,15 +73237,15 @@ 108545 108546 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 108547 PHP_PDO_PGSQL_SHARED=no 108548- 108549- 108550+ 108551+ 108552 case ext/pdo_pgsql in 108553 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 108554 /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 108555 *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 108556 esac 108557- 108558- 108559+ 108560+ 108561 108562 b_c_pre=$php_c_pre 108563 b_cxx_pre=$php_cxx_pre 108564@@ -94491,12 +73258,12 @@ 108565 108566 old_IFS=$IFS 108567 for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do 108568- 108569+ 108570 IFS=. 108571 set $ac_src 108572 ac_obj=$1 108573 IFS=$old_IFS 108574- 108575+ 108576 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 108577 108578 case $ac_src in 108579@@ -94520,14 +73287,14 @@ 108580 else 108581 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 108582 PHP_PDO_PGSQL_SHARED=yes 108583- 108584+ 108585 case ext/pdo_pgsql in 108586 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 108587 /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 108588 *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 108589 esac 108590- 108591- 108592+ 108593+ 108594 108595 b_c_pre=$shared_c_pre 108596 b_cxx_pre=$shared_cxx_pre 108597@@ -94540,12 +73307,12 @@ 108598 108599 old_IFS=$IFS 108600 for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do 108601- 108602+ 108603 IFS=. 108604 set $ac_src 108605 ac_obj=$1 108606 IFS=$old_IFS 108607- 108608+ 108609 shared_objects_pdo_pgsql="$shared_objects_pdo_pgsql $ac_bdir$ac_obj.lo" 108610 108611 case $ac_src in 108612@@ -94563,7 +73330,7 @@ 108613 108614 case $host_alias in 108615 *netware*) 108616- 108617+ 108618 install_modules="install-modules" 108619 108620 case $host_alias in 108621@@ -94573,7 +73340,7 @@ 108622 ;; 108623 *netware*) 108624 suffix=nlm 108625- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(PDO_PGSQL_SHARED_LIBADD)' 108626+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_PGSQL, 3)_SHARED_LIBADD)' 108627 ;; 108628 *) 108629 suffix=la 108630@@ -94586,7 +73353,7 @@ 108631 else 108632 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_pgsql.$suffix" 108633 fi 108634- 108635+ 108636 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql" 108637 108638 cat >>Makefile.objects<<EOF 108639@@ -94600,7 +73367,7 @@ 108640 108641 ;; 108642 *) 108643- 108644+ 108645 install_modules="install-modules" 108646 108647 case $host_alias in 108648@@ -94610,7 +73377,7 @@ 108649 ;; 108650 *netware*) 108651 suffix=nlm 108652- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(_PGSQL_SHARED_LIBADD)' 108653+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_PGSQL, 3)_SHARED_LIBADD)' 108654 ;; 108655 *) 108656 suffix=la 108657@@ -94623,7 +73390,7 @@ 108658 else 108659 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_pgsql.$suffix" 108660 fi 108661- 108662+ 108663 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_pgsql" 108664 108665 cat >>Makefile.objects<<EOF 108666@@ -94637,10 +73404,9 @@ 108667 108668 ;; 108669 esac 108670- 108671-cat >>confdefs.h <<_ACEOF 108672+ cat >> confdefs.h <<EOF 108673 #define COMPILE_DL_PDO_PGSQL 1 108674-_ACEOF 108675+EOF 108676 108677 fi 108678 fi 108679@@ -94649,15 +73415,15 @@ 108680 PHP_PDO_PGSQL_SHARED=no 108681 case "$PHP_SAPI" in 108682 cgi|embed) 108683- 108684- 108685+ 108686+ 108687 case ext/pdo_pgsql in 108688 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 108689 /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 108690 *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 108691 esac 108692- 108693- 108694+ 108695+ 108696 108697 b_c_pre=$php_c_pre 108698 b_cxx_pre=$php_cxx_pre 108699@@ -94670,12 +73436,12 @@ 108700 108701 old_IFS=$IFS 108702 for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do 108703- 108704+ 108705 IFS=. 108706 set $ac_src 108707 ac_obj=$1 108708 IFS=$old_IFS 108709- 108710+ 108711 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 108712 108713 case $ac_src in 108714@@ -94695,15 +73461,15 @@ 108715 EXT_STATIC="$EXT_STATIC pdo_pgsql" 108716 ;; 108717 *) 108718- 108719- 108720+ 108721+ 108722 case ext/pdo_pgsql in 108723 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 108724 /*) ac_srcdir=`echo "ext/pdo_pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 108725 *) ac_srcdir="$abs_srcdir/ext/pdo_pgsql/"; ac_bdir="ext/pdo_pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 108726 esac 108727- 108728- 108729+ 108730+ 108731 108732 b_c_pre=$php_c_pre 108733 b_cxx_pre=$php_cxx_pre 108734@@ -94716,13 +73482,13 @@ 108735 108736 old_IFS=$IFS 108737 for ac_src in pdo_pgsql.c pgsql_driver.c pgsql_statement.c; do 108738- 108739+ 108740 IFS=. 108741 set $ac_src 108742 ac_obj=$1 108743 IFS=$old_IFS 108744- 108745- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 108746+ 108747+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 108748 108749 case $ac_src in 108750 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 108751@@ -94742,71 +73508,59 @@ 108752 esac 108753 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_pgsql" 108754 fi 108755- 108756- 108757+ 108758+ 108759 BUILD_DIR="$BUILD_DIR $ext_builddir" 108760- 108761+ 108762 108763 108764 if test "$ext_builddir" = "."; then 108765 PHP_PECL_EXTENSION=pdo_pgsql 108766- 108767+ 108768 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 108769 108770 fi 108771 108772- 108773- 108774+ 108775+ 108776 am_i_shared=$PHP_PDO_PGSQL_SHARED 108777 is_it_shared=$PHP_PDO_SHARED 108778 is_it_enabled=$PHP_PDO 108779 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 108780- { { echo "$as_me:$LINENO: error: 108781-You've configured extension pdo_pgsql to build statically, but it 108782-depends on extension pdo, which you've configured to build shared. 108783-You either need to build pdo_pgsql shared or build pdo statically for the 108784-build to be successful. 108785-" >&5 108786-echo "$as_me: error: 108787+ { echo "configure: error: 108788 You've configured extension pdo_pgsql to build statically, but it 108789 depends on extension pdo, which you've configured to build shared. 108790 You either need to build pdo_pgsql shared or build pdo statically for the 108791 build to be successful. 108792-" >&2;} 108793- { (exit 1); exit 1; }; } 108794+" 1>&2; exit 1; } 108795 fi 108796 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 108797- { { echo "$as_me:$LINENO: error: 108798-You've configured extension pdo_pgsql, which depends on extension pdo, 108799-but you've either not enabled pdo, or have disabled it. 108800-" >&5 108801-echo "$as_me: error: 108802+ { echo "configure: error: 108803 You've configured extension pdo_pgsql, which depends on extension pdo, 108804 but you've either not enabled pdo, or have disabled it. 108805-" >&2;} 108806- { (exit 1); exit 1; }; } 108807+" 1>&2; exit 1; } 108808 fi 108809- 108810- 108811+ 108812+ 108813 fi 108814 108815 108816 108817 php_with_pdo_sqlite=$PHP_PDO 108818 108819-echo "$as_me:$LINENO: checking for sqlite 3 support for PDO" >&5 108820-echo $ECHO_N "checking for sqlite 3 support for PDO... $ECHO_C" >&6 108821- 108822+echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 108823+echo "configure:73553: checking for sqlite 3 support for PDO" >&5 108824 # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. 108825 if test "${with_pdo_sqlite+set}" = set; then 108826 withval="$with_pdo_sqlite" 108827 PHP_PDO_SQLITE=$withval 108828 else 108829- 108830+ 108831 PHP_PDO_SQLITE=$PHP_PDO 108832 test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL 108833 108834-fi; 108835+fi 108836+ 108837 108838 108839 ext_output="yes, shared" 108840@@ -94830,8 +73584,7 @@ 108841 108842 108843 108844-echo "$as_me:$LINENO: result: $ext_output" >&5 108845-echo "${ECHO_T}$ext_output" >&6 108846+echo "$ac_t""$ext_output" 1>&6 108847 108848 108849 108850@@ -94839,21 +73592,19 @@ 108851 if test "$PHP_PDO_SQLITE" != "no"; then 108852 108853 if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then 108854- { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5 108855-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;} 108856- { (exit 1); exit 1; }; } 108857+ { echo "configure: error: PDO is not enabled! Add --enable-pdo to your configure line." 1>&2; exit 1; } 108858 fi 108859 108860- 108861- 108862- echo "$as_me:$LINENO: checking for PDO includes" >&5 108863-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 108864-if test "${pdo_inc_path+set}" = set; then 108865- echo $ECHO_N "(cached) $ECHO_C" >&6 108866-else 108867- 108868- echo "$as_me:$LINENO: checking for PDO includes" >&5 108869-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 108870+ 108871+ 108872+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 108873+echo "configure:73602: checking for PDO includes" >&5 108874+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 108875+ echo $ac_n "(cached) $ac_c" 1>&6 108876+else 108877+ 108878+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 108879+echo "configure:73608: checking for PDO includes" >&5 108880 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 108881 pdo_inc_path=$abs_srcdir/ext 108882 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 108883@@ -94861,19 +73612,17 @@ 108884 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 108885 pdo_inc_path=$prefix/include/php/ext 108886 fi 108887- 108888+ 108889 fi 108890-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 108891-echo "${ECHO_T}$pdo_inc_path" >&6 108892+ 108893+echo "$ac_t""$pdo_inc_path" 1>&6 108894 if test -n "$pdo_inc_path"; then 108895 : 108896 else 108897-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5 108898-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;} 108899- { (exit 1); exit 1; }; } 108900+{ echo "configure: error: Cannot find php_pdo_driver.h." 1>&2; exit 1; } 108901 fi 108902 108903- 108904+ 108905 108906 php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c" 108907 108908@@ -94883,51 +73632,47 @@ 108909 if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter 108910 PDO_SQLITE_DIR=$PHP_PDO_SQLITE 108911 else # search default path list 108912- echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5 108913-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6 108914+ echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 108915+echo "configure:73637: checking for sqlite3 files in default path" >&5 108916 for i in $SEARCH_PATH ; do 108917 if test -r $i/$SEARCH_FOR; then 108918 PDO_SQLITE_DIR=$i 108919- echo "$as_me:$LINENO: result: found in $i" >&5 108920-echo "${ECHO_T}found in $i" >&6 108921+ echo "$ac_t""found in $i" 1>&6 108922 fi 108923 done 108924 fi 108925 if test -z "$PDO_SQLITE_DIR"; then 108926- echo "$as_me:$LINENO: result: not found" >&5 108927-echo "${ECHO_T}not found" >&6 108928- { { echo "$as_me:$LINENO: error: Please reinstall the sqlite3 distribution" >&5 108929-echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;} 108930- { (exit 1); exit 1; }; } 108931+ echo "$ac_t""not found" 1>&6 108932+ { echo "configure: error: Please reinstall the sqlite3 distribution" 1>&2; exit 1; } 108933 fi 108934 108935- 108936+ 108937 if test "$PDO_SQLITE_DIR/include" != "/usr/include"; then 108938- 108939+ 108940 if test -z "$PDO_SQLITE_DIR/include" || echo "$PDO_SQLITE_DIR/include" | grep '^/' >/dev/null ; then 108941 ai_p=$PDO_SQLITE_DIR/include 108942 else 108943- 108944+ 108945 ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 108946- 108947+ 108948 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 108949 ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`" 108950 fi 108951 108952- 108953- 108954+ 108955+ 108956 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 108957- 108958+ 108959 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 108960 if test -n "$unique" && test "`eval $cmd`" = "" ; then 108961 eval "INCLUDEPATH$unique=set" 108962- 108963+ 108964 if test ""; then 108965 INCLUDES="-I$ai_p $INCLUDES" 108966 else 108967 INCLUDES="$INCLUDES -I$ai_p" 108968 fi 108969- 108970+ 108971 fi 108972 108973 fi 108974@@ -94936,25 +73681,25 @@ 108975 LIBNAME=sqlite3 108976 LIBSYMBOL=sqlite3_open 108977 108978- 108979+ 108980 save_old_LDFLAGS=$LDFLAGS 108981 ac_stuff=" 108982 -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm 108983 " 108984- 108985+ 108986 save_ext_shared=$ext_shared 108987 ext_shared=yes 108988- 108989+ 108990 for ac_i in $ac_stuff; do 108991 case $ac_i in 108992 -pthread) 108993 if test "$ext_shared" = "yes"; then 108994 LDFLAGS="$LDFLAGS -pthread" 108995 else 108996- 108997- 108998+ 108999+ 109000 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 109001- 109002+ 109003 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 109004 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109005 eval "EXTRA_LDFLAGS$unique=set" 109006@@ -94965,20 +73710,20 @@ 109007 ;; 109008 -l*) 109009 ac_ii=`echo $ac_i|cut -c 3-` 109010- 109011- 109012+ 109013+ 109014 case $ac_ii in 109015 c|c_r|pthread*) ;; 109016- *) 109017+ *) 109018 if test "$ext_shared" = "yes"; then 109019- LDFLAGS="$LDFLAGS -l$ac_ii" 109020+ LDFLAGS="$LDFLAGS -l$ac_ii" 109021 else 109022- 109023- 109024+ 109025+ 109026 case $ac_ii in 109027 c|c_r|pthread*) ;; 109028- *) 109029- LIBS="$LIBS -l$ac_ii" 109030+ *) 109031+ LIBS="$LIBS -l$ac_ii" 109032 ;; 109033 esac 109034 109035@@ -94991,206 +73736,175 @@ 109036 ;; 109037 -L*) 109038 ac_ii=`echo $ac_i|cut -c 3-` 109039- 109040+ 109041 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 109042- 109043+ 109044 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 109045 ai_p=$ac_ii 109046 else 109047- 109048+ 109049 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 109050- 109051+ 109052 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 109053 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 109054 fi 109055 109056- 109057+ 109058 if test "$ext_shared" = "yes"; then 109059 LDFLAGS="-L$ai_p $LDFLAGS" 109060 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 109061 else 109062- 109063- 109064- 109065+ 109066+ 109067+ 109068 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 109069- 109070+ 109071 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 109072 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109073 eval "LIBPATH$unique=set" 109074- 109075+ 109076 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 109077 LDFLAGS="$LDFLAGS -L$ai_p" 109078 PHP_RPATHS="$PHP_RPATHS $ai_p" 109079- 109080+ 109081 fi 109082 109083 109084 fi 109085- 109086+ 109087 fi 109088 109089 ;; 109090 esac 109091 done 109092 109093- as_ac_Lib=`echo "ac_cv_lib_$LIBNAME''_$LIBSYMBOL" | $as_tr_sh` 109094-echo "$as_me:$LINENO: checking for $LIBSYMBOL in -l$LIBNAME" >&5 109095-echo $ECHO_N "checking for $LIBSYMBOL in -l$LIBNAME... $ECHO_C" >&6 109096-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 109097- echo $ECHO_N "(cached) $ECHO_C" >&6 109098+ echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 109099+echo "configure:73783: checking for $LIBSYMBOL in -l$LIBNAME" >&5 109100+ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` 109101+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 109102+ echo $ac_n "(cached) $ac_c" 1>&6 109103 else 109104- ac_check_lib_save_LIBS=$LIBS 109105+ ac_save_LIBS="$LIBS" 109106 LIBS="-l$LIBNAME $LIBS" 109107-cat >conftest.$ac_ext <<_ACEOF 109108-/* confdefs.h. */ 109109-_ACEOF 109110-cat confdefs.h >>conftest.$ac_ext 109111-cat >>conftest.$ac_ext <<_ACEOF 109112-/* end confdefs.h. */ 109113- 109114+cat > conftest.$ac_ext <<EOF 109115+#line 73791 "configure" 109116+#include "confdefs.h" 109117 /* Override any gcc2 internal prototype to avoid an error. */ 109118-#ifdef __cplusplus 109119-extern "C" 109120-#endif 109121 /* We use char because int might match the return type of a gcc2 109122- builtin and then its argument prototype would still apply. */ 109123-char $LIBSYMBOL (); 109124-int 109125-main () 109126-{ 109127-$LIBSYMBOL (); 109128- ; 109129- return 0; 109130-} 109131-_ACEOF 109132-rm -f conftest.$ac_objext conftest$ac_exeext 109133-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 109134- (eval $ac_link) 2>conftest.er1 109135- ac_status=$? 109136- grep -v '^ *+' conftest.er1 >conftest.err 109137- rm -f conftest.er1 109138- cat conftest.err >&5 109139- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109140- (exit $ac_status); } && 109141- { ac_try='test -z "$ac_c_werror_flag" 109142- || test ! -s conftest.err' 109143- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 109144- (eval $ac_try) 2>&5 109145- ac_status=$? 109146- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109147- (exit $ac_status); }; } && 109148- { ac_try='test -s conftest$ac_exeext' 109149- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 109150- (eval $ac_try) 2>&5 109151- ac_status=$? 109152- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109153- (exit $ac_status); }; }; then 109154- eval "$as_ac_Lib=yes" 109155-else 109156- echo "$as_me: failed program was:" >&5 109157-sed 's/^/| /' conftest.$ac_ext >&5 109158- 109159-eval "$as_ac_Lib=no" 109160-fi 109161-rm -f conftest.err conftest.$ac_objext \ 109162- conftest$ac_exeext conftest.$ac_ext 109163-LIBS=$ac_check_lib_save_LIBS 109164-fi 109165-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 109166-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 109167-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 109168+ builtin and then its argument prototype would still apply. */ 109169+char $LIBSYMBOL(); 109170+ 109171+int main() { 109172+$LIBSYMBOL() 109173+; return 0; } 109174+EOF 109175+if { (eval echo configure:73802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 109176+ rm -rf conftest* 109177+ eval "ac_cv_lib_$ac_lib_var=yes" 109178+else 109179+ echo "configure: failed program was:" >&5 109180+ cat conftest.$ac_ext >&5 109181+ rm -rf conftest* 109182+ eval "ac_cv_lib_$ac_lib_var=no" 109183+fi 109184+rm -f conftest* 109185+LIBS="$ac_save_LIBS" 109186 109187+fi 109188+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 109189+ echo "$ac_t""yes" 1>&6 109190+ 109191 LDFLAGS=$save_old_LDFLAGS 109192 ext_shared=$save_ext_shared 109193- 109194- 109195+ 109196+ 109197 109198 if test "$ext_shared" = "yes"; then 109199 PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD" 109200 if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then 109201- 109202+ 109203 if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 109204- 109205+ 109206 if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 109207 ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR 109208 else 109209- 109210+ 109211 ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 109212- 109213+ 109214 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 109215 ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`" 109216 fi 109217 109218- 109219+ 109220 if test "$ext_shared" = "yes"; then 109221 PDO_SQLITE_SHARED_LIBADD="-L$ai_p $PDO_SQLITE_SHARED_LIBADD" 109222 test -n "$ld_runpath_switch" && PDO_SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $PDO_SQLITE_SHARED_LIBADD" 109223 else 109224- 109225- 109226- 109227+ 109228+ 109229+ 109230 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 109231- 109232+ 109233 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 109234 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109235 eval "LIBPATH$unique=set" 109236- 109237+ 109238 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 109239 LDFLAGS="$LDFLAGS -L$ai_p" 109240 PHP_RPATHS="$PHP_RPATHS $ai_p" 109241- 109242+ 109243 fi 109244 109245 109246 fi 109247- 109248+ 109249 fi 109250 109251 fi 109252 else 109253- 109254+ 109255 109256 if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then 109257- 109258+ 109259 if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 109260- 109261+ 109262 if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 109263 ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR 109264 else 109265- 109266+ 109267 ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 109268- 109269+ 109270 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 109271 ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`" 109272 fi 109273 109274- 109275- 109276- 109277- 109278+ 109279+ 109280+ 109281+ 109282 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 109283- 109284+ 109285 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 109286 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109287 eval "LIBPATH$unique=set" 109288- 109289+ 109290 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 109291 LDFLAGS="$LDFLAGS -L$ai_p" 109292 PHP_RPATHS="$PHP_RPATHS $ai_p" 109293- 109294+ 109295 fi 109296 109297 109298- 109299+ 109300 fi 109301 109302 fi 109303- 109304- 109305+ 109306+ 109307 case $LIBNAME in 109308 c|c_r|pthread*) ;; 109309- *) 109310- LIBS="-l$LIBNAME $LIBS" 109311+ *) 109312+ LIBS="-l$LIBNAME $LIBS" 109313 ;; 109314 esac 109315 109316@@ -95200,43 +73914,41 @@ 109317 fi 109318 109319 109320+ cat >> confdefs.h <<\EOF 109321+#define HAVE_PDO_SQLITELIB 1 109322+EOF 109323 109324-cat >>confdefs.h <<\_ACEOF 109325-#define HAVE_PDO_SQLITELIB 1 109326-_ACEOF 109327- 109328- 109329- 109330+ 109331+ 109332 else 109333+ echo "$ac_t""no" 1>&6 109334 109335 LDFLAGS=$save_old_LDFLAGS 109336 ext_shared=$save_ext_shared 109337 unset ac_cv_lib_$LIBNAME_$LIBSYMBOL 109338- 109339- { { echo "$as_me:$LINENO: error: wrong sqlite lib version or lib not found" >&5 109340-echo "$as_me: error: wrong sqlite lib version or lib not found" >&2;} 109341- { (exit 1); exit 1; }; } 109342- 109343- 109344+ 109345+ { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } 109346+ 109347+ 109348 fi 109349 109350- 109351+ 109352 save_old_LDFLAGS=$LDFLAGS 109353 ac_stuff="" 109354- 109355+ 109356 save_ext_shared=$ext_shared 109357 ext_shared=yes 109358- 109359+ 109360 for ac_i in $ac_stuff; do 109361 case $ac_i in 109362 -pthread) 109363 if test "$ext_shared" = "yes"; then 109364 LDFLAGS="$LDFLAGS -pthread" 109365 else 109366- 109367- 109368+ 109369+ 109370 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 109371- 109372+ 109373 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 109374 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109375 eval "EXTRA_LDFLAGS$unique=set" 109376@@ -95247,20 +73959,20 @@ 109377 ;; 109378 -l*) 109379 ac_ii=`echo $ac_i|cut -c 3-` 109380- 109381- 109382+ 109383+ 109384 case $ac_ii in 109385 c|c_r|pthread*) ;; 109386- *) 109387+ *) 109388 if test "$ext_shared" = "yes"; then 109389- LDFLAGS="$LDFLAGS -l$ac_ii" 109390+ LDFLAGS="$LDFLAGS -l$ac_ii" 109391 else 109392- 109393- 109394+ 109395+ 109396 case $ac_ii in 109397 c|c_r|pthread*) ;; 109398- *) 109399- LIBS="$LIBS -l$ac_ii" 109400+ *) 109401+ LIBS="$LIBS -l$ac_ii" 109402 ;; 109403 esac 109404 109405@@ -95273,138 +73985,108 @@ 109406 ;; 109407 -L*) 109408 ac_ii=`echo $ac_i|cut -c 3-` 109409- 109410+ 109411 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 109412- 109413+ 109414 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 109415 ai_p=$ac_ii 109416 else 109417- 109418+ 109419 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 109420- 109421+ 109422 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 109423 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 109424 fi 109425 109426- 109427+ 109428 if test "$ext_shared" = "yes"; then 109429 LDFLAGS="-L$ai_p $LDFLAGS" 109430 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 109431 else 109432- 109433- 109434- 109435+ 109436+ 109437+ 109438 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 109439- 109440+ 109441 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 109442 if test -n "$unique" && test "`eval $cmd`" = "" ; then 109443 eval "LIBPATH$unique=set" 109444- 109445+ 109446 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 109447 LDFLAGS="$LDFLAGS -L$ai_p" 109448 PHP_RPATHS="$PHP_RPATHS $ai_p" 109449- 109450+ 109451 fi 109452 109453 109454 fi 109455- 109456+ 109457 fi 109458 109459 ;; 109460 esac 109461 done 109462 109463- echo "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5 109464-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6 109465-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then 109466- echo $ECHO_N "(cached) $ECHO_C" >&6 109467+ echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 109468+echo "configure:74032: checking for sqlite3_key in -lsqlite3" >&5 109469+ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` 109470+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 109471+ echo $ac_n "(cached) $ac_c" 1>&6 109472 else 109473- ac_check_lib_save_LIBS=$LIBS 109474+ ac_save_LIBS="$LIBS" 109475 LIBS="-lsqlite3 $LIBS" 109476-cat >conftest.$ac_ext <<_ACEOF 109477-/* confdefs.h. */ 109478-_ACEOF 109479-cat confdefs.h >>conftest.$ac_ext 109480-cat >>conftest.$ac_ext <<_ACEOF 109481-/* end confdefs.h. */ 109482- 109483+cat > conftest.$ac_ext <<EOF 109484+#line 74040 "configure" 109485+#include "confdefs.h" 109486 /* Override any gcc2 internal prototype to avoid an error. */ 109487-#ifdef __cplusplus 109488-extern "C" 109489-#endif 109490 /* We use char because int might match the return type of a gcc2 109491- builtin and then its argument prototype would still apply. */ 109492-char sqlite3_key (); 109493-int 109494-main () 109495-{ 109496-sqlite3_key (); 109497- ; 109498- return 0; 109499-} 109500-_ACEOF 109501-rm -f conftest.$ac_objext conftest$ac_exeext 109502-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 109503- (eval $ac_link) 2>conftest.er1 109504- ac_status=$? 109505- grep -v '^ *+' conftest.er1 >conftest.err 109506- rm -f conftest.er1 109507- cat conftest.err >&5 109508- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109509- (exit $ac_status); } && 109510- { ac_try='test -z "$ac_c_werror_flag" 109511- || test ! -s conftest.err' 109512- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 109513- (eval $ac_try) 2>&5 109514- ac_status=$? 109515- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109516- (exit $ac_status); }; } && 109517- { ac_try='test -s conftest$ac_exeext' 109518- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 109519- (eval $ac_try) 2>&5 109520- ac_status=$? 109521- echo "$as_me:$LINENO: \$? = $ac_status" >&5 109522- (exit $ac_status); }; }; then 109523- ac_cv_lib_sqlite3_sqlite3_key=yes 109524-else 109525- echo "$as_me: failed program was:" >&5 109526-sed 's/^/| /' conftest.$ac_ext >&5 109527- 109528-ac_cv_lib_sqlite3_sqlite3_key=no 109529-fi 109530-rm -f conftest.err conftest.$ac_objext \ 109531- conftest$ac_exeext conftest.$ac_ext 109532-LIBS=$ac_check_lib_save_LIBS 109533-fi 109534-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5 109535-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6 109536-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then 109537+ builtin and then its argument prototype would still apply. */ 109538+char sqlite3_key(); 109539+ 109540+int main() { 109541+sqlite3_key() 109542+; return 0; } 109543+EOF 109544+if { (eval echo configure:74051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 109545+ rm -rf conftest* 109546+ eval "ac_cv_lib_$ac_lib_var=yes" 109547+else 109548+ echo "configure: failed program was:" >&5 109549+ cat conftest.$ac_ext >&5 109550+ rm -rf conftest* 109551+ eval "ac_cv_lib_$ac_lib_var=no" 109552+fi 109553+rm -f conftest* 109554+LIBS="$ac_save_LIBS" 109555 109556+fi 109557+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 109558+ echo "$ac_t""yes" 1>&6 109559+ 109560 LDFLAGS=$save_old_LDFLAGS 109561 ext_shared=$save_ext_shared 109562- 109563- 109564-cat >>confdefs.h <<\_ACEOF 109565+ 109566+ cat >> confdefs.h <<\EOF 109567 #define HAVE_SQLITE3_KEY 1 109568-_ACEOF 109569- 109570- 109571+EOF 109572 109573+ 109574+ 109575 else 109576+ echo "$ac_t""no" 1>&6 109577 109578 LDFLAGS=$save_old_LDFLAGS 109579 ext_shared=$save_ext_shared 109580 unset ac_cv_lib_sqlite3_sqlite3_key 109581- 109582- 109583+ 109584+ 109585 fi 109586 109587 109588- 109589+ 109590 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD" 109591 109592- 109593+ 109594 ext_builddir=ext/pdo_sqlite 109595 ext_srcdir=$abs_srcdir/ext/pdo_sqlite 109596 109597@@ -95412,15 +74094,15 @@ 109598 109599 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 109600 PHP_PDO_SQLITE_SHARED=no 109601- 109602- 109603+ 109604+ 109605 case ext/pdo_sqlite in 109606 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109607 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109608 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109609 esac 109610- 109611- 109612+ 109613+ 109614 109615 b_c_pre=$php_c_pre 109616 b_cxx_pre=$php_cxx_pre 109617@@ -95433,12 +74115,12 @@ 109618 109619 old_IFS=$IFS 109620 for ac_src in $php_pdo_sqlite_sources_core; do 109621- 109622+ 109623 IFS=. 109624 set $ac_src 109625 ac_obj=$1 109626 IFS=$old_IFS 109627- 109628+ 109629 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 109630 109631 case $ac_src in 109632@@ -95462,14 +74144,14 @@ 109633 else 109634 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 109635 PHP_PDO_SQLITE_SHARED=yes 109636- 109637+ 109638 case ext/pdo_sqlite in 109639 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109640 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109641 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109642 esac 109643- 109644- 109645+ 109646+ 109647 109648 b_c_pre=$shared_c_pre 109649 b_cxx_pre=$shared_cxx_pre 109650@@ -95482,12 +74164,12 @@ 109651 109652 old_IFS=$IFS 109653 for ac_src in $php_pdo_sqlite_sources_core; do 109654- 109655+ 109656 IFS=. 109657 set $ac_src 109658 ac_obj=$1 109659 IFS=$old_IFS 109660- 109661+ 109662 shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo" 109663 109664 case $ac_src in 109665@@ -95505,7 +74187,7 @@ 109666 109667 case $host_alias in 109668 *netware*) 109669- 109670+ 109671 install_modules="install-modules" 109672 109673 case $host_alias in 109674@@ -95515,7 +74197,7 @@ 109675 ;; 109676 *netware*) 109677 suffix=nlm 109678- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_SHARED_LIBADD)' 109679+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)' 109680 ;; 109681 *) 109682 suffix=la 109683@@ -95528,7 +74210,7 @@ 109684 else 109685 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix" 109686 fi 109687- 109688+ 109689 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" 109690 109691 cat >>Makefile.objects<<EOF 109692@@ -95542,7 +74224,7 @@ 109693 109694 ;; 109695 *) 109696- 109697+ 109698 install_modules="install-modules" 109699 109700 case $host_alias in 109701@@ -95552,7 +74234,7 @@ 109702 ;; 109703 *netware*) 109704 suffix=nlm 109705- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(_SQLITE_SHARED_LIBADD)' 109706+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)' 109707 ;; 109708 *) 109709 suffix=la 109710@@ -95565,7 +74247,7 @@ 109711 else 109712 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix" 109713 fi 109714- 109715+ 109716 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" 109717 109718 cat >>Makefile.objects<<EOF 109719@@ -95579,10 +74261,9 @@ 109720 109721 ;; 109722 esac 109723- 109724-cat >>confdefs.h <<_ACEOF 109725+ cat >> confdefs.h <<EOF 109726 #define COMPILE_DL_PDO_SQLITE 1 109727-_ACEOF 109728+EOF 109729 109730 fi 109731 fi 109732@@ -95591,15 +74272,15 @@ 109733 PHP_PDO_SQLITE_SHARED=no 109734 case "$PHP_SAPI" in 109735 cgi|embed) 109736- 109737- 109738+ 109739+ 109740 case ext/pdo_sqlite in 109741 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109742 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109743 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109744 esac 109745- 109746- 109747+ 109748+ 109749 109750 b_c_pre=$php_c_pre 109751 b_cxx_pre=$php_cxx_pre 109752@@ -95612,12 +74293,12 @@ 109753 109754 old_IFS=$IFS 109755 for ac_src in $php_pdo_sqlite_sources_core; do 109756- 109757+ 109758 IFS=. 109759 set $ac_src 109760 ac_obj=$1 109761 IFS=$old_IFS 109762- 109763+ 109764 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 109765 109766 case $ac_src in 109767@@ -95637,15 +74318,15 @@ 109768 EXT_STATIC="$EXT_STATIC pdo_sqlite" 109769 ;; 109770 *) 109771- 109772- 109773+ 109774+ 109775 case ext/pdo_sqlite in 109776 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109777 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109778 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109779 esac 109780- 109781- 109782+ 109783+ 109784 109785 b_c_pre=$php_c_pre 109786 b_cxx_pre=$php_cxx_pre 109787@@ -95658,13 +74339,13 @@ 109788 109789 old_IFS=$IFS 109790 for ac_src in $php_pdo_sqlite_sources_core; do 109791- 109792+ 109793 IFS=. 109794 set $ac_src 109795 ac_obj=$1 109796 IFS=$old_IFS 109797- 109798- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 109799+ 109800+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 109801 109802 case $ac_src in 109803 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 109804@@ -95684,15 +74365,15 @@ 109805 esac 109806 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite" 109807 fi 109808- 109809- 109810+ 109811+ 109812 BUILD_DIR="$BUILD_DIR $ext_builddir" 109813- 109814+ 109815 109816 109817 if test "$ext_builddir" = "."; then 109818 PHP_PECL_EXTENSION=pdo_sqlite 109819- 109820+ 109821 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 109822 109823 fi 109824@@ -95712,15 +74393,15 @@ 109825 fi 109826 109827 if test "$PHP_SQLITE3" != "yes"; then 109828- 109829- 109830+ 109831+ 109832 case ext/sqlite3 in 109833 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109834 /*) ac_srcdir=`echo "ext/sqlite3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109835 *) ac_srcdir="$abs_srcdir/ext/sqlite3/"; ac_bdir="ext/sqlite3/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109836 esac 109837- 109838- 109839+ 109840+ 109841 109842 b_c_pre=$php_c_pre 109843 b_cxx_pre=$php_cxx_pre 109844@@ -95733,12 +74414,12 @@ 109845 109846 old_IFS=$IFS 109847 for ac_src in libsqlite/sqlite3.c; do 109848- 109849+ 109850 IFS=. 109851 set $ac_src 109852 ac_obj=$1 109853 IFS=$old_IFS 109854- 109855+ 109856 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 109857 109858 case $ac_src in 109859@@ -95757,7 +74438,7 @@ 109860 109861 fi 109862 109863- 109864+ 109865 ext_builddir=ext/pdo_sqlite 109866 ext_srcdir=$abs_srcdir/ext/pdo_sqlite 109867 109868@@ -95765,15 +74446,15 @@ 109869 109870 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 109871 PHP_PDO_SQLITE_SHARED=no 109872- 109873- 109874+ 109875+ 109876 case ext/pdo_sqlite in 109877 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109878 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109879 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109880 esac 109881- 109882- 109883+ 109884+ 109885 109886 b_c_pre=$php_c_pre 109887 b_cxx_pre=$php_cxx_pre 109888@@ -95786,12 +74467,12 @@ 109889 109890 old_IFS=$IFS 109891 for ac_src in $php_pdo_sqlite_sources_core; do 109892- 109893+ 109894 IFS=. 109895 set $ac_src 109896 ac_obj=$1 109897 IFS=$old_IFS 109898- 109899+ 109900 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 109901 109902 case $ac_src in 109903@@ -95815,14 +74496,14 @@ 109904 else 109905 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 109906 PHP_PDO_SQLITE_SHARED=yes 109907- 109908+ 109909 case ext/pdo_sqlite in 109910 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 109911 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 109912 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 109913 esac 109914- 109915- 109916+ 109917+ 109918 109919 b_c_pre=$shared_c_pre 109920 b_cxx_pre=$shared_cxx_pre 109921@@ -95835,12 +74516,12 @@ 109922 109923 old_IFS=$IFS 109924 for ac_src in $php_pdo_sqlite_sources_core; do 109925- 109926+ 109927 IFS=. 109928 set $ac_src 109929 ac_obj=$1 109930 IFS=$old_IFS 109931- 109932+ 109933 shared_objects_pdo_sqlite="$shared_objects_pdo_sqlite $ac_bdir$ac_obj.lo" 109934 109935 case $ac_src in 109936@@ -95858,7 +74539,7 @@ 109937 109938 case $host_alias in 109939 *netware*) 109940- 109941+ 109942 install_modules="install-modules" 109943 109944 case $host_alias in 109945@@ -95868,7 +74549,7 @@ 109946 ;; 109947 *netware*) 109948 suffix=nlm 109949- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(PDO_SQLITE_SHARED_LIBADD)' 109950+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPDO_SQLITE, 3)_SHARED_LIBADD)' 109951 ;; 109952 *) 109953 suffix=la 109954@@ -95881,7 +74562,7 @@ 109955 else 109956 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppdo_sqlite.$suffix" 109957 fi 109958- 109959+ 109960 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" 109961 109962 cat >>Makefile.objects<<EOF 109963@@ -95895,7 +74576,7 @@ 109964 109965 ;; 109966 *) 109967- 109968+ 109969 install_modules="install-modules" 109970 109971 case $host_alias in 109972@@ -95905,7 +74586,7 @@ 109973 ;; 109974 *netware*) 109975 suffix=nlm 109976- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(_SQLITE_SHARED_LIBADD)' 109977+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pdo_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PDO_SQLITE, 3)_SHARED_LIBADD)' 109978 ;; 109979 *) 109980 suffix=la 109981@@ -95918,7 +74599,7 @@ 109982 else 109983 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo_sqlite.$suffix" 109984 fi 109985- 109986+ 109987 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo_sqlite" 109988 109989 cat >>Makefile.objects<<EOF 109990@@ -95932,10 +74613,9 @@ 109991 109992 ;; 109993 esac 109994- 109995-cat >>confdefs.h <<_ACEOF 109996+ cat >> confdefs.h <<EOF 109997 #define COMPILE_DL_PDO_SQLITE 1 109998-_ACEOF 109999+EOF 110000 110001 fi 110002 fi 110003@@ -95944,15 +74624,15 @@ 110004 PHP_PDO_SQLITE_SHARED=no 110005 case "$PHP_SAPI" in 110006 cgi|embed) 110007- 110008- 110009+ 110010+ 110011 case ext/pdo_sqlite in 110012 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 110013 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 110014 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 110015 esac 110016- 110017- 110018+ 110019+ 110020 110021 b_c_pre=$php_c_pre 110022 b_cxx_pre=$php_cxx_pre 110023@@ -95965,12 +74645,12 @@ 110024 110025 old_IFS=$IFS 110026 for ac_src in $php_pdo_sqlite_sources_core; do 110027- 110028+ 110029 IFS=. 110030 set $ac_src 110031 ac_obj=$1 110032 IFS=$old_IFS 110033- 110034+ 110035 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 110036 110037 case $ac_src in 110038@@ -95990,15 +74670,15 @@ 110039 EXT_STATIC="$EXT_STATIC pdo_sqlite" 110040 ;; 110041 *) 110042- 110043- 110044+ 110045+ 110046 case ext/pdo_sqlite in 110047 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 110048 /*) ac_srcdir=`echo "ext/pdo_sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 110049 *) ac_srcdir="$abs_srcdir/ext/pdo_sqlite/"; ac_bdir="ext/pdo_sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 110050 esac 110051- 110052- 110053+ 110054+ 110055 110056 b_c_pre=$php_c_pre 110057 b_cxx_pre=$php_cxx_pre 110058@@ -96011,13 +74691,13 @@ 110059 110060 old_IFS=$IFS 110061 for ac_src in $php_pdo_sqlite_sources_core; do 110062- 110063+ 110064 IFS=. 110065 set $ac_src 110066 ac_obj=$1 110067 IFS=$old_IFS 110068- 110069- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 110070+ 110071+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 110072 110073 case $ac_src in 110074 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 110075@@ -96037,358 +74717,188 @@ 110076 esac 110077 EXT_CLI_STATIC="$EXT_CLI_STATIC pdo_sqlite" 110078 fi 110079- 110080- 110081+ 110082+ 110083 BUILD_DIR="$BUILD_DIR $ext_builddir" 110084- 110085+ 110086 110087 110088 if test "$ext_builddir" = "."; then 110089 PHP_PECL_EXTENSION=pdo_sqlite 110090- 110091+ 110092 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 110093 110094 fi 110095 110096 110097- 110098+ 110099 PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_SQLITE_SHARED_LIBADD" 110100 110101- 110102+ 110103 am_i_shared=$PHP_PDO_SQLITE_SHARED 110104 is_it_shared=$PHP_SQLITE3_SHARED 110105 is_it_enabled=$PHP_SQLITE3 110106 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 110107- { { echo "$as_me:$LINENO: error: 110108-You've configured extension pdo_sqlite to build statically, but it 110109-depends on extension sqlite3, which you've configured to build shared. 110110-You either need to build pdo_sqlite shared or build sqlite3 statically for the 110111-build to be successful. 110112-" >&5 110113-echo "$as_me: error: 110114+ { echo "configure: error: 110115 You've configured extension pdo_sqlite to build statically, but it 110116 depends on extension sqlite3, which you've configured to build shared. 110117 You either need to build pdo_sqlite shared or build sqlite3 statically for the 110118 build to be successful. 110119-" >&2;} 110120- { (exit 1); exit 1; }; } 110121+" 1>&2; exit 1; } 110122 fi 110123 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 110124- { { echo "$as_me:$LINENO: error: 110125-You've configured extension pdo_sqlite, which depends on extension sqlite3, 110126-but you've either not enabled sqlite3, or have disabled it. 110127-" >&5 110128-echo "$as_me: error: 110129+ { echo "configure: error: 110130 You've configured extension pdo_sqlite, which depends on extension sqlite3, 110131 but you've either not enabled sqlite3, or have disabled it. 110132-" >&2;} 110133- { (exit 1); exit 1; }; } 110134+" 1>&2; exit 1; } 110135 fi 110136- 110137- 110138+ 110139+ 110140 if test "$abs_srcdir/ext/sqlite3/libsqlite" != "/usr/include"; then 110141- 110142+ 110143 if test -z "$abs_srcdir/ext/sqlite3/libsqlite" || echo "$abs_srcdir/ext/sqlite3/libsqlite" | grep '^/' >/dev/null ; then 110144 ai_p=$abs_srcdir/ext/sqlite3/libsqlite 110145 else 110146- 110147+ 110148 ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`" 110149- 110150+ 110151 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 110152 ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`" 110153 fi 110154 110155- 110156- 110157+ 110158+ 110159 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 110160- 110161+ 110162 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 110163 if test -n "$unique" && test "`eval $cmd`" = "" ; then 110164 eval "INCLUDEPATH$unique=set" 110165- 110166+ 110167 if test ""; then 110168 INCLUDES="-I$ai_p $INCLUDES" 110169 else 110170 INCLUDES="$INCLUDES -I$ai_p" 110171 fi 110172- 110173+ 110174 fi 110175 110176 fi 110177 110178 110179- 110180- 110181-for ac_func in usleep nanosleep 110182+ for ac_func in usleep nanosleep 110183 do 110184-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 110185-echo "$as_me:$LINENO: checking for $ac_func" >&5 110186-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 110187-if eval "test \"\${$as_ac_var+set}\" = set"; then 110188- echo $ECHO_N "(cached) $ECHO_C" >&6 110189-else 110190- cat >conftest.$ac_ext <<_ACEOF 110191-/* confdefs.h. */ 110192-_ACEOF 110193-cat confdefs.h >>conftest.$ac_ext 110194-cat >>conftest.$ac_ext <<_ACEOF 110195-/* end confdefs.h. */ 110196-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 110197- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 110198-#define $ac_func innocuous_$ac_func 110199- 110200+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 110201+echo "configure:74792: checking for $ac_func" >&5 110202+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 110203+ echo $ac_n "(cached) $ac_c" 1>&6 110204+else 110205+ cat > conftest.$ac_ext <<EOF 110206+#line 74797 "configure" 110207+#include "confdefs.h" 110208 /* System header to define __stub macros and hopefully few prototypes, 110209- which can conflict with char $ac_func (); below. 110210- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 110211- <limits.h> exists even on freestanding compilers. */ 110212- 110213-#ifdef __STDC__ 110214-# include <limits.h> 110215-#else 110216-# include <assert.h> 110217-#endif 110218- 110219-#undef $ac_func 110220- 110221+ which can conflict with char $ac_func(); below. */ 110222+#include <assert.h> 110223 /* Override any gcc2 internal prototype to avoid an error. */ 110224-#ifdef __cplusplus 110225-extern "C" 110226-{ 110227-#endif 110228 /* We use char because int might match the return type of a gcc2 110229- builtin and then its argument prototype would still apply. */ 110230-char $ac_func (); 110231+ builtin and then its argument prototype would still apply. */ 110232+char $ac_func(); 110233+ 110234+int main() { 110235+ 110236 /* The GNU C library defines this for functions which it implements 110237 to always fail with ENOSYS. Some functions are actually named 110238 something starting with __ and the normal name is an alias. */ 110239 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 110240 choke me 110241 #else 110242-char (*f) () = $ac_func; 110243-#endif 110244-#ifdef __cplusplus 110245-} 110246+$ac_func(); 110247 #endif 110248 110249-int 110250-main () 110251-{ 110252-return f != $ac_func; 110253- ; 110254- return 0; 110255-} 110256-_ACEOF 110257-rm -f conftest.$ac_objext conftest$ac_exeext 110258-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 110259- (eval $ac_link) 2>conftest.er1 110260- ac_status=$? 110261- grep -v '^ *+' conftest.er1 >conftest.err 110262- rm -f conftest.er1 110263- cat conftest.err >&5 110264- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110265- (exit $ac_status); } && 110266- { ac_try='test -z "$ac_c_werror_flag" 110267- || test ! -s conftest.err' 110268- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110269- (eval $ac_try) 2>&5 110270- ac_status=$? 110271- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110272- (exit $ac_status); }; } && 110273- { ac_try='test -s conftest$ac_exeext' 110274- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110275- (eval $ac_try) 2>&5 110276- ac_status=$? 110277- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110278- (exit $ac_status); }; }; then 110279- eval "$as_ac_var=yes" 110280-else 110281- echo "$as_me: failed program was:" >&5 110282-sed 's/^/| /' conftest.$ac_ext >&5 110283- 110284-eval "$as_ac_var=no" 110285-fi 110286-rm -f conftest.err conftest.$ac_objext \ 110287- conftest$ac_exeext conftest.$ac_ext 110288-fi 110289-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 110290-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 110291-if test `eval echo '${'$as_ac_var'}'` = yes; then 110292- cat >>confdefs.h <<_ACEOF 110293-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 110294-_ACEOF 110295+; return 0; } 110296+EOF 110297+if { (eval echo configure:74820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 110298+ rm -rf conftest* 110299+ eval "ac_cv_func_$ac_func=yes" 110300+else 110301+ echo "configure: failed program was:" >&5 110302+ cat conftest.$ac_ext >&5 110303+ rm -rf conftest* 110304+ eval "ac_cv_func_$ac_func=no" 110305+fi 110306+rm -f conftest* 110307+fi 110308 110309+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 110310+ echo "$ac_t""yes" 1>&6 110311+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 110312+ cat >> confdefs.h <<EOF 110313+#define $ac_tr_func 1 110314+EOF 110315+ 110316+else 110317+ echo "$ac_t""no" 1>&6 110318 fi 110319 done 110320 110321- 110322-for ac_header in time.h 110323+ for ac_hdr in time.h 110324 do 110325-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 110326-if eval "test \"\${$as_ac_Header+set}\" = set"; then 110327- echo "$as_me:$LINENO: checking for $ac_header" >&5 110328-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 110329-if eval "test \"\${$as_ac_Header+set}\" = set"; then 110330- echo $ECHO_N "(cached) $ECHO_C" >&6 110331-fi 110332-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 110333-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 110334-else 110335- # Is the header compilable? 110336-echo "$as_me:$LINENO: checking $ac_header usability" >&5 110337-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 110338-cat >conftest.$ac_ext <<_ACEOF 110339-/* confdefs.h. */ 110340-_ACEOF 110341-cat confdefs.h >>conftest.$ac_ext 110342-cat >>conftest.$ac_ext <<_ACEOF 110343-/* end confdefs.h. */ 110344-$ac_includes_default 110345-#include <$ac_header> 110346-_ACEOF 110347-rm -f conftest.$ac_objext 110348-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 110349- (eval $ac_compile) 2>conftest.er1 110350- ac_status=$? 110351- grep -v '^ *+' conftest.er1 >conftest.err 110352- rm -f conftest.er1 110353- cat conftest.err >&5 110354- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110355- (exit $ac_status); } && 110356- { ac_try='test -z "$ac_c_werror_flag" 110357- || test ! -s conftest.err' 110358- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110359- (eval $ac_try) 2>&5 110360- ac_status=$? 110361- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110362- (exit $ac_status); }; } && 110363- { ac_try='test -s conftest.$ac_objext' 110364- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110365- (eval $ac_try) 2>&5 110366- ac_status=$? 110367- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110368- (exit $ac_status); }; }; then 110369- ac_header_compiler=yes 110370-else 110371- echo "$as_me: failed program was:" >&5 110372-sed 's/^/| /' conftest.$ac_ext >&5 110373- 110374-ac_header_compiler=no 110375-fi 110376-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 110377-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 110378-echo "${ECHO_T}$ac_header_compiler" >&6 110379- 110380-# Is the header present? 110381-echo "$as_me:$LINENO: checking $ac_header presence" >&5 110382-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 110383-cat >conftest.$ac_ext <<_ACEOF 110384-/* confdefs.h. */ 110385-_ACEOF 110386-cat confdefs.h >>conftest.$ac_ext 110387-cat >>conftest.$ac_ext <<_ACEOF 110388-/* end confdefs.h. */ 110389-#include <$ac_header> 110390-_ACEOF 110391-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 110392- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 110393- ac_status=$? 110394- grep -v '^ *+' conftest.er1 >conftest.err 110395- rm -f conftest.er1 110396- cat conftest.err >&5 110397- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110398- (exit $ac_status); } >/dev/null; then 110399- if test -s conftest.err; then 110400- ac_cpp_err=$ac_c_preproc_warn_flag 110401- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 110402- else 110403- ac_cpp_err= 110404- fi 110405-else 110406- ac_cpp_err=yes 110407-fi 110408-if test -z "$ac_cpp_err"; then 110409- ac_header_preproc=yes 110410-else 110411- echo "$as_me: failed program was:" >&5 110412-sed 's/^/| /' conftest.$ac_ext >&5 110413- 110414- ac_header_preproc=no 110415-fi 110416-rm -f conftest.err conftest.$ac_ext 110417-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 110418-echo "${ECHO_T}$ac_header_preproc" >&6 110419- 110420-# So? What about this header? 110421-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 110422- yes:no: ) 110423- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 110424-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 110425- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 110426-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 110427- ac_header_preproc=yes 110428- ;; 110429- no:yes:* ) 110430- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 110431-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 110432- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 110433-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 110434- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 110435-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 110436- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 110437-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 110438- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 110439-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 110440- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 110441-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 110442- ( 110443- cat <<\_ASBOX 110444-## ------------------------------------------ ## 110445-## Report this to the AC_PACKAGE_NAME lists. ## 110446-## ------------------------------------------ ## 110447-_ASBOX 110448- ) | 110449- sed "s/^/$as_me: WARNING: /" >&2 110450- ;; 110451-esac 110452-echo "$as_me:$LINENO: checking for $ac_header" >&5 110453-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 110454-if eval "test \"\${$as_ac_Header+set}\" = set"; then 110455- echo $ECHO_N "(cached) $ECHO_C" >&6 110456+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 110457+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 110458+echo "configure:74848: checking for $ac_hdr" >&5 110459+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 110460+ echo $ac_n "(cached) $ac_c" 1>&6 110461+else 110462+ cat > conftest.$ac_ext <<EOF 110463+#line 74853 "configure" 110464+#include "confdefs.h" 110465+#include <$ac_hdr> 110466+EOF 110467+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 110468+{ (eval echo configure:74858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 110469+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 110470+if test -z "$ac_err"; then 110471+ rm -rf conftest* 110472+ eval "ac_cv_header_$ac_safe=yes" 110473 else 110474- eval "$as_ac_Header=\$ac_header_preproc" 110475+ echo "$ac_err" >&5 110476+ echo "configure: failed program was:" >&5 110477+ cat conftest.$ac_ext >&5 110478+ rm -rf conftest* 110479+ eval "ac_cv_header_$ac_safe=no" 110480 fi 110481-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 110482-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 110483- 110484+rm -f conftest* 110485 fi 110486-if test `eval echo '${'$as_ac_Header'}'` = yes; then 110487- cat >>confdefs.h <<_ACEOF 110488-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 110489-_ACEOF 110490- 110491+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 110492+ echo "$ac_t""yes" 1>&6 110493+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 110494+ cat >> confdefs.h <<EOF 110495+#define $ac_tr_hdr 1 110496+EOF 110497+ 110498+else 110499+ echo "$ac_t""no" 1>&6 110500 fi 110501- 110502 done 110503 110504 fi 110505 110506- 110507+ 110508 save_old_LDFLAGS=$LDFLAGS 110509 ac_stuff="" 110510- 110511+ 110512 save_ext_shared=$ext_shared 110513 ext_shared=yes 110514- 110515+ 110516 for ac_i in $ac_stuff; do 110517 case $ac_i in 110518 -pthread) 110519 if test "$ext_shared" = "yes"; then 110520 LDFLAGS="$LDFLAGS -pthread" 110521 else 110522- 110523- 110524+ 110525+ 110526 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 110527- 110528+ 110529 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 110530 if test -n "$unique" && test "`eval $cmd`" = "" ; then 110531 eval "EXTRA_LDFLAGS$unique=set" 110532@@ -96399,20 +74909,20 @@ 110533 ;; 110534 -l*) 110535 ac_ii=`echo $ac_i|cut -c 3-` 110536- 110537- 110538+ 110539+ 110540 case $ac_ii in 110541 c|c_r|pthread*) ;; 110542- *) 110543+ *) 110544 if test "$ext_shared" = "yes"; then 110545- LDFLAGS="$LDFLAGS -l$ac_ii" 110546+ LDFLAGS="$LDFLAGS -l$ac_ii" 110547 else 110548- 110549- 110550+ 110551+ 110552 case $ac_ii in 110553 c|c_r|pthread*) ;; 110554- *) 110555- LIBS="$LIBS -l$ac_ii" 110556+ *) 110557+ LIBS="$LIBS -l$ac_ii" 110558 ;; 110559 esac 110560 110561@@ -96425,130 +74935,100 @@ 110562 ;; 110563 -L*) 110564 ac_ii=`echo $ac_i|cut -c 3-` 110565- 110566+ 110567 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 110568- 110569+ 110570 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 110571 ai_p=$ac_ii 110572 else 110573- 110574+ 110575 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 110576- 110577+ 110578 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 110579 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 110580 fi 110581 110582- 110583+ 110584 if test "$ext_shared" = "yes"; then 110585 LDFLAGS="-L$ai_p $LDFLAGS" 110586 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 110587 else 110588- 110589- 110590- 110591+ 110592+ 110593+ 110594 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 110595- 110596+ 110597 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 110598 if test -n "$unique" && test "`eval $cmd`" = "" ; then 110599 eval "LIBPATH$unique=set" 110600- 110601+ 110602 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 110603 LDFLAGS="$LDFLAGS -L$ai_p" 110604 PHP_RPATHS="$PHP_RPATHS $ai_p" 110605- 110606+ 110607 fi 110608 110609 110610 fi 110611- 110612+ 110613 fi 110614 110615 ;; 110616 esac 110617 done 110618 110619- echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5 110620-echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6 110621-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then 110622- echo $ECHO_N "(cached) $ECHO_C" >&6 110623+ echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 110624+echo "configure:74982: checking for fdatasync in -lrt" >&5 110625+ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` 110626+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 110627+ echo $ac_n "(cached) $ac_c" 1>&6 110628 else 110629- ac_check_lib_save_LIBS=$LIBS 110630+ ac_save_LIBS="$LIBS" 110631 LIBS="-lrt $LIBS" 110632-cat >conftest.$ac_ext <<_ACEOF 110633-/* confdefs.h. */ 110634-_ACEOF 110635-cat confdefs.h >>conftest.$ac_ext 110636-cat >>conftest.$ac_ext <<_ACEOF 110637-/* end confdefs.h. */ 110638- 110639+cat > conftest.$ac_ext <<EOF 110640+#line 74990 "configure" 110641+#include "confdefs.h" 110642 /* Override any gcc2 internal prototype to avoid an error. */ 110643-#ifdef __cplusplus 110644-extern "C" 110645-#endif 110646 /* We use char because int might match the return type of a gcc2 110647- builtin and then its argument prototype would still apply. */ 110648-char fdatasync (); 110649-int 110650-main () 110651-{ 110652-fdatasync (); 110653- ; 110654- return 0; 110655-} 110656-_ACEOF 110657-rm -f conftest.$ac_objext conftest$ac_exeext 110658-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 110659- (eval $ac_link) 2>conftest.er1 110660- ac_status=$? 110661- grep -v '^ *+' conftest.er1 >conftest.err 110662- rm -f conftest.er1 110663- cat conftest.err >&5 110664- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110665- (exit $ac_status); } && 110666- { ac_try='test -z "$ac_c_werror_flag" 110667- || test ! -s conftest.err' 110668- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110669- (eval $ac_try) 2>&5 110670- ac_status=$? 110671- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110672- (exit $ac_status); }; } && 110673- { ac_try='test -s conftest$ac_exeext' 110674- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 110675- (eval $ac_try) 2>&5 110676- ac_status=$? 110677- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110678- (exit $ac_status); }; }; then 110679- ac_cv_lib_rt_fdatasync=yes 110680-else 110681- echo "$as_me: failed program was:" >&5 110682-sed 's/^/| /' conftest.$ac_ext >&5 110683- 110684-ac_cv_lib_rt_fdatasync=no 110685-fi 110686-rm -f conftest.err conftest.$ac_objext \ 110687- conftest$ac_exeext conftest.$ac_ext 110688-LIBS=$ac_check_lib_save_LIBS 110689-fi 110690-echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5 110691-echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6 110692-if test $ac_cv_lib_rt_fdatasync = yes; then 110693+ builtin and then its argument prototype would still apply. */ 110694+char fdatasync(); 110695+ 110696+int main() { 110697+fdatasync() 110698+; return 0; } 110699+EOF 110700+if { (eval echo configure:75001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 110701+ rm -rf conftest* 110702+ eval "ac_cv_lib_$ac_lib_var=yes" 110703+else 110704+ echo "configure: failed program was:" >&5 110705+ cat conftest.$ac_ext >&5 110706+ rm -rf conftest* 110707+ eval "ac_cv_lib_$ac_lib_var=no" 110708+fi 110709+rm -f conftest* 110710+LIBS="$ac_save_LIBS" 110711 110712+fi 110713+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 110714+ echo "$ac_t""yes" 1>&6 110715+ 110716 LDFLAGS=$save_old_LDFLAGS 110717 ext_shared=$save_ext_shared 110718- 110719- 110720+ 110721+ 110722 case rt in 110723 c|c_r|pthread*) ;; 110724- *) 110725+ *) 110726 if test "$ext_shared" = "yes"; then 110727- PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD" 110728+ PDO_SQLITE_SHARED_LIBADD="-lrt $PDO_SQLITE_SHARED_LIBADD" 110729 else 110730- 110731- 110732+ 110733+ 110734 case rt in 110735 c|c_r|pthread*) ;; 110736- *) 110737- LIBS="-lrt $LIBS" 110738+ *) 110739+ LIBS="-lrt $LIBS" 110740 ;; 110741 esac 110742 110743@@ -96558,69 +75038,58 @@ 110744 esac 110745 110746 110747- 110748+ 110749 else 110750+ echo "$ac_t""no" 1>&6 110751 110752 LDFLAGS=$save_old_LDFLAGS 110753 ext_shared=$save_ext_shared 110754 unset ac_cv_lib_rt_fdatasync 110755- 110756- 110757+ 110758+ 110759 fi 110760 110761 110762- 110763- 110764+ 110765+ 110766 am_i_shared=$PHP_PDO_SQLITE_SHARED 110767 is_it_shared=$PHP_PDO_SHARED 110768 is_it_enabled=$PHP_PDO 110769 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 110770- { { echo "$as_me:$LINENO: error: 110771-You've configured extension pdo_sqlite to build statically, but it 110772-depends on extension pdo, which you've configured to build shared. 110773-You either need to build pdo_sqlite shared or build pdo statically for the 110774-build to be successful. 110775-" >&5 110776-echo "$as_me: error: 110777+ { echo "configure: error: 110778 You've configured extension pdo_sqlite to build statically, but it 110779 depends on extension pdo, which you've configured to build shared. 110780 You either need to build pdo_sqlite shared or build pdo statically for the 110781 build to be successful. 110782-" >&2;} 110783- { (exit 1); exit 1; }; } 110784+" 1>&2; exit 1; } 110785 fi 110786 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 110787- { { echo "$as_me:$LINENO: error: 110788+ { echo "configure: error: 110789 You've configured extension pdo_sqlite, which depends on extension pdo, 110790 but you've either not enabled pdo, or have disabled it. 110791-" >&5 110792-echo "$as_me: error: 110793-You've configured extension pdo_sqlite, which depends on extension pdo, 110794-but you've either not enabled pdo, or have disabled it. 110795-" >&2;} 110796- { (exit 1); exit 1; }; } 110797+" 1>&2; exit 1; } 110798 fi 110799- 110800- 110801+ 110802+ 110803 fi 110804 110805 110806 110807 php_with_pgsql=no 110808 110809-echo "$as_me:$LINENO: checking for PostgreSQL support" >&5 110810-echo $ECHO_N "checking for PostgreSQL support... $ECHO_C" >&6 110811- 110812+echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 110813+echo "configure:75082: checking for PostgreSQL support" >&5 110814 # Check whether --with-pgsql or --without-pgsql was given. 110815 if test "${with_pgsql+set}" = set; then 110816 withval="$with_pgsql" 110817 PHP_PGSQL=$withval 110818 else 110819- 110820+ 110821 PHP_PGSQL=no 110822 test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL 110823 110824-fi; 110825+fi 110826+ 110827 110828 110829 ext_output="yes, shared" 110830@@ -96644,27 +75113,26 @@ 110831 110832 110833 110834-echo "$as_me:$LINENO: result: $ext_output" >&5 110835-echo "${ECHO_T}$ext_output" >&6 110836+echo "$ac_t""$ext_output" 1>&6 110837 110838 110839 110840 110841 if test "$PHP_PGSQL" != "no"; then 110842- 110843+ 110844 if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then 110845 PGSQL_INCLUDE=$PGSQL_INCLUDE 110846 else 110847- 110848+ 110849 ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 110850- 110851+ 110852 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 110853 PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 110854 fi 110855 110856 110857- echo "$as_me:$LINENO: checking for pg_config" >&5 110858-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6 110859+ echo $ac_n "checking for pg_config""... $ac_c" 1>&6 110860+echo "configure:75136: checking for pg_config" >&5 110861 for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do 110862 if test -x $i/pg_config; then 110863 PG_CONFIG="$i/pg_config" 110864@@ -96673,43 +75141,39 @@ 110865 done 110866 110867 if test -n "$PG_CONFIG"; then 110868- echo "$as_me:$LINENO: result: $PG_CONFIG" >&5 110869-echo "${ECHO_T}$PG_CONFIG" >&6 110870+ echo "$ac_t""$PG_CONFIG" 1>&6 110871 PGSQL_INCLUDE=`$PG_CONFIG --includedir` 110872 PGSQL_LIBDIR=`$PG_CONFIG --libdir` 110873 if test -r "$PGSQL_INCLUDE/pg_config.h"; then 110874- 110875-cat >>confdefs.h <<\_ACEOF 110876+ cat >> confdefs.h <<\EOF 110877 #define HAVE_PG_CONFIG_H 1 110878-_ACEOF 110879+EOF 110880 110881 fi 110882 else 110883- echo "$as_me:$LINENO: result: not found" >&5 110884-echo "${ECHO_T}not found" >&6 110885+ echo "$ac_t""not found" 1>&6 110886 if test "$PHP_PGSQL" = "yes"; then 110887 PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql" 110888 else 110889 PGSQL_SEARCH_PATHS=$PHP_PGSQL 110890 fi 110891- 110892+ 110893 for i in $PGSQL_SEARCH_PATHS; do 110894 for j in include include/pgsql include/postgres include/postgresql ""; do 110895 if test -r "$i/$j/libpq-fe.h"; then 110896 PGSQL_INC_BASE=$i 110897 PGSQL_INCLUDE=$i/$j 110898 if test -r "$i/$j/pg_config.h"; then 110899- 110900-cat >>confdefs.h <<\_ACEOF 110901+ cat >> confdefs.h <<\EOF 110902 #define HAVE_PG_CONFIG_H 1 110903-_ACEOF 110904+EOF 110905 110906 fi 110907 fi 110908 done 110909 110910 for j in lib $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do 110911- if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 110912+ if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 110913 PGSQL_LIBDIR=$i/$j 110914 fi 110915 done 110916@@ -96717,2066 +75181,1276 @@ 110917 fi 110918 110919 if test -z "$PGSQL_INCLUDE"; then 110920- { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5 110921-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;} 110922- { (exit 1); exit 1; }; } 110923+ { echo "configure: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } 110924 fi 110925 110926 if test -z "$PGSQL_LIBDIR"; then 110927- { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5 110928-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;} 110929- { (exit 1); exit 1; }; } 110930+ { echo "configure: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" 1>&2; exit 1; } 110931 fi 110932 110933 if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then 110934- { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5 110935-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;} 110936- { (exit 1); exit 1; }; } 110937+ { echo "configure: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" 1>&2; exit 1; } 110938 fi 110939 110940- 110941-cat >>confdefs.h <<\_ACEOF 110942+ cat >> confdefs.h <<\EOF 110943 #define HAVE_PGSQL 1 110944-_ACEOF 110945+EOF 110946 110947 old_LIBS=$LIBS 110948 old_LDFLAGS=$LDFLAGS 110949 LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" 110950- echo "$as_me:$LINENO: checking for PQescapeString in -lpq" >&5 110951-echo $ECHO_N "checking for PQescapeString in -lpq... $ECHO_C" >&6 110952-if test "${ac_cv_lib_pq_PQescapeString+set}" = set; then 110953- echo $ECHO_N "(cached) $ECHO_C" >&6 110954+ echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 110955+echo "configure:75204: checking for PQescapeString in -lpq" >&5 110956+ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` 110957+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 110958+ echo $ac_n "(cached) $ac_c" 1>&6 110959 else 110960- ac_check_lib_save_LIBS=$LIBS 110961+ ac_save_LIBS="$LIBS" 110962 LIBS="-lpq $LIBS" 110963-cat >conftest.$ac_ext <<_ACEOF 110964-/* confdefs.h. */ 110965-_ACEOF 110966-cat confdefs.h >>conftest.$ac_ext 110967-cat >>conftest.$ac_ext <<_ACEOF 110968-/* end confdefs.h. */ 110969- 110970+cat > conftest.$ac_ext <<EOF 110971+#line 75212 "configure" 110972+#include "confdefs.h" 110973 /* Override any gcc2 internal prototype to avoid an error. */ 110974-#ifdef __cplusplus 110975-extern "C" 110976-#endif 110977 /* We use char because int might match the return type of a gcc2 110978- builtin and then its argument prototype would still apply. */ 110979-char PQescapeString (); 110980-int 110981-main () 110982-{ 110983-PQescapeString (); 110984- ; 110985- return 0; 110986-} 110987-_ACEOF 110988-rm -f conftest.$ac_objext conftest$ac_exeext 110989-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 110990- (eval $ac_link) 2>conftest.er1 110991- ac_status=$? 110992- grep -v '^ *+' conftest.er1 >conftest.err 110993- rm -f conftest.er1 110994- cat conftest.err >&5 110995- echo "$as_me:$LINENO: \$? = $ac_status" >&5 110996- (exit $ac_status); } && 110997- { ac_try='test -z "$ac_c_werror_flag" 110998- || test ! -s conftest.err' 110999- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111000- (eval $ac_try) 2>&5 111001- ac_status=$? 111002- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111003- (exit $ac_status); }; } && 111004- { ac_try='test -s conftest$ac_exeext' 111005- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111006- (eval $ac_try) 2>&5 111007- ac_status=$? 111008- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111009- (exit $ac_status); }; }; then 111010- ac_cv_lib_pq_PQescapeString=yes 111011-else 111012- echo "$as_me: failed program was:" >&5 111013-sed 's/^/| /' conftest.$ac_ext >&5 111014- 111015-ac_cv_lib_pq_PQescapeString=no 111016-fi 111017-rm -f conftest.err conftest.$ac_objext \ 111018- conftest$ac_exeext conftest.$ac_ext 111019-LIBS=$ac_check_lib_save_LIBS 111020-fi 111021-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeString" >&5 111022-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeString" >&6 111023-if test $ac_cv_lib_pq_PQescapeString = yes; then 111024+ builtin and then its argument prototype would still apply. */ 111025+char PQescapeString(); 111026+ 111027+int main() { 111028+PQescapeString() 111029+; return 0; } 111030+EOF 111031+if { (eval echo configure:75223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111032+ rm -rf conftest* 111033+ eval "ac_cv_lib_$ac_lib_var=yes" 111034+else 111035+ echo "configure: failed program was:" >&5 111036+ cat conftest.$ac_ext >&5 111037+ rm -rf conftest* 111038+ eval "ac_cv_lib_$ac_lib_var=no" 111039+fi 111040+rm -f conftest* 111041+LIBS="$ac_save_LIBS" 111042 111043-cat >>confdefs.h <<\_ACEOF 111044+fi 111045+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111046+ echo "$ac_t""yes" 1>&6 111047+ cat >> confdefs.h <<\EOF 111048 #define HAVE_PQESCAPE 1 111049-_ACEOF 111050+EOF 111051 111052+else 111053+ echo "$ac_t""no" 1>&6 111054 fi 111055 111056- echo "$as_me:$LINENO: checking for PQunescapeBytea in -lpq" >&5 111057-echo $ECHO_N "checking for PQunescapeBytea in -lpq... $ECHO_C" >&6 111058-if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then 111059- echo $ECHO_N "(cached) $ECHO_C" >&6 111060+ echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 111061+echo "configure:75247: checking for PQunescapeBytea in -lpq" >&5 111062+ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` 111063+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111064+ echo $ac_n "(cached) $ac_c" 1>&6 111065 else 111066- ac_check_lib_save_LIBS=$LIBS 111067+ ac_save_LIBS="$LIBS" 111068 LIBS="-lpq $LIBS" 111069-cat >conftest.$ac_ext <<_ACEOF 111070-/* confdefs.h. */ 111071-_ACEOF 111072-cat confdefs.h >>conftest.$ac_ext 111073-cat >>conftest.$ac_ext <<_ACEOF 111074-/* end confdefs.h. */ 111075- 111076+cat > conftest.$ac_ext <<EOF 111077+#line 75255 "configure" 111078+#include "confdefs.h" 111079 /* Override any gcc2 internal prototype to avoid an error. */ 111080-#ifdef __cplusplus 111081-extern "C" 111082-#endif 111083 /* We use char because int might match the return type of a gcc2 111084- builtin and then its argument prototype would still apply. */ 111085-char PQunescapeBytea (); 111086-int 111087-main () 111088-{ 111089-PQunescapeBytea (); 111090- ; 111091- return 0; 111092-} 111093-_ACEOF 111094-rm -f conftest.$ac_objext conftest$ac_exeext 111095-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111096- (eval $ac_link) 2>conftest.er1 111097- ac_status=$? 111098- grep -v '^ *+' conftest.er1 >conftest.err 111099- rm -f conftest.er1 111100- cat conftest.err >&5 111101- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111102- (exit $ac_status); } && 111103- { ac_try='test -z "$ac_c_werror_flag" 111104- || test ! -s conftest.err' 111105- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111106- (eval $ac_try) 2>&5 111107- ac_status=$? 111108- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111109- (exit $ac_status); }; } && 111110- { ac_try='test -s conftest$ac_exeext' 111111- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111112- (eval $ac_try) 2>&5 111113- ac_status=$? 111114- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111115- (exit $ac_status); }; }; then 111116- ac_cv_lib_pq_PQunescapeBytea=yes 111117-else 111118- echo "$as_me: failed program was:" >&5 111119-sed 's/^/| /' conftest.$ac_ext >&5 111120- 111121-ac_cv_lib_pq_PQunescapeBytea=no 111122-fi 111123-rm -f conftest.err conftest.$ac_objext \ 111124- conftest$ac_exeext conftest.$ac_ext 111125-LIBS=$ac_check_lib_save_LIBS 111126-fi 111127-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQunescapeBytea" >&5 111128-echo "${ECHO_T}$ac_cv_lib_pq_PQunescapeBytea" >&6 111129-if test $ac_cv_lib_pq_PQunescapeBytea = yes; then 111130+ builtin and then its argument prototype would still apply. */ 111131+char PQunescapeBytea(); 111132+ 111133+int main() { 111134+PQunescapeBytea() 111135+; return 0; } 111136+EOF 111137+if { (eval echo configure:75266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111138+ rm -rf conftest* 111139+ eval "ac_cv_lib_$ac_lib_var=yes" 111140+else 111141+ echo "configure: failed program was:" >&5 111142+ cat conftest.$ac_ext >&5 111143+ rm -rf conftest* 111144+ eval "ac_cv_lib_$ac_lib_var=no" 111145+fi 111146+rm -f conftest* 111147+LIBS="$ac_save_LIBS" 111148 111149-cat >>confdefs.h <<\_ACEOF 111150+fi 111151+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111152+ echo "$ac_t""yes" 1>&6 111153+ cat >> confdefs.h <<\EOF 111154 #define HAVE_PQUNESCAPEBYTEA 1 111155-_ACEOF 111156+EOF 111157 111158+else 111159+ echo "$ac_t""no" 1>&6 111160 fi 111161 111162- echo "$as_me:$LINENO: checking for PQsetnonblocking in -lpq" >&5 111163-echo $ECHO_N "checking for PQsetnonblocking in -lpq... $ECHO_C" >&6 111164-if test "${ac_cv_lib_pq_PQsetnonblocking+set}" = set; then 111165- echo $ECHO_N "(cached) $ECHO_C" >&6 111166+ echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 111167+echo "configure:75290: checking for PQsetnonblocking in -lpq" >&5 111168+ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` 111169+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111170+ echo $ac_n "(cached) $ac_c" 1>&6 111171 else 111172- ac_check_lib_save_LIBS=$LIBS 111173+ ac_save_LIBS="$LIBS" 111174 LIBS="-lpq $LIBS" 111175-cat >conftest.$ac_ext <<_ACEOF 111176-/* confdefs.h. */ 111177-_ACEOF 111178-cat confdefs.h >>conftest.$ac_ext 111179-cat >>conftest.$ac_ext <<_ACEOF 111180-/* end confdefs.h. */ 111181- 111182+cat > conftest.$ac_ext <<EOF 111183+#line 75298 "configure" 111184+#include "confdefs.h" 111185 /* Override any gcc2 internal prototype to avoid an error. */ 111186-#ifdef __cplusplus 111187-extern "C" 111188-#endif 111189 /* We use char because int might match the return type of a gcc2 111190- builtin and then its argument prototype would still apply. */ 111191-char PQsetnonblocking (); 111192-int 111193-main () 111194-{ 111195-PQsetnonblocking (); 111196- ; 111197- return 0; 111198-} 111199-_ACEOF 111200-rm -f conftest.$ac_objext conftest$ac_exeext 111201-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111202- (eval $ac_link) 2>conftest.er1 111203- ac_status=$? 111204- grep -v '^ *+' conftest.er1 >conftest.err 111205- rm -f conftest.er1 111206- cat conftest.err >&5 111207- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111208- (exit $ac_status); } && 111209- { ac_try='test -z "$ac_c_werror_flag" 111210- || test ! -s conftest.err' 111211- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111212- (eval $ac_try) 2>&5 111213- ac_status=$? 111214- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111215- (exit $ac_status); }; } && 111216- { ac_try='test -s conftest$ac_exeext' 111217- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111218- (eval $ac_try) 2>&5 111219- ac_status=$? 111220- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111221- (exit $ac_status); }; }; then 111222- ac_cv_lib_pq_PQsetnonblocking=yes 111223-else 111224- echo "$as_me: failed program was:" >&5 111225-sed 's/^/| /' conftest.$ac_ext >&5 111226- 111227-ac_cv_lib_pq_PQsetnonblocking=no 111228-fi 111229-rm -f conftest.err conftest.$ac_objext \ 111230- conftest$ac_exeext conftest.$ac_ext 111231-LIBS=$ac_check_lib_save_LIBS 111232-fi 111233-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetnonblocking" >&5 111234-echo "${ECHO_T}$ac_cv_lib_pq_PQsetnonblocking" >&6 111235-if test $ac_cv_lib_pq_PQsetnonblocking = yes; then 111236+ builtin and then its argument prototype would still apply. */ 111237+char PQsetnonblocking(); 111238 111239-cat >>confdefs.h <<\_ACEOF 111240+int main() { 111241+PQsetnonblocking() 111242+; return 0; } 111243+EOF 111244+if { (eval echo configure:75309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111245+ rm -rf conftest* 111246+ eval "ac_cv_lib_$ac_lib_var=yes" 111247+else 111248+ echo "configure: failed program was:" >&5 111249+ cat conftest.$ac_ext >&5 111250+ rm -rf conftest* 111251+ eval "ac_cv_lib_$ac_lib_var=no" 111252+fi 111253+rm -f conftest* 111254+LIBS="$ac_save_LIBS" 111255+ 111256+fi 111257+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111258+ echo "$ac_t""yes" 1>&6 111259+ cat >> confdefs.h <<\EOF 111260 #define HAVE_PQSETNONBLOCKING 1 111261-_ACEOF 111262+EOF 111263 111264+else 111265+ echo "$ac_t""no" 1>&6 111266 fi 111267 111268- echo "$as_me:$LINENO: checking for PQcmdTuples in -lpq" >&5 111269-echo $ECHO_N "checking for PQcmdTuples in -lpq... $ECHO_C" >&6 111270-if test "${ac_cv_lib_pq_PQcmdTuples+set}" = set; then 111271- echo $ECHO_N "(cached) $ECHO_C" >&6 111272+ echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 111273+echo "configure:75333: checking for PQcmdTuples in -lpq" >&5 111274+ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` 111275+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111276+ echo $ac_n "(cached) $ac_c" 1>&6 111277 else 111278- ac_check_lib_save_LIBS=$LIBS 111279+ ac_save_LIBS="$LIBS" 111280 LIBS="-lpq $LIBS" 111281-cat >conftest.$ac_ext <<_ACEOF 111282-/* confdefs.h. */ 111283-_ACEOF 111284-cat confdefs.h >>conftest.$ac_ext 111285-cat >>conftest.$ac_ext <<_ACEOF 111286-/* end confdefs.h. */ 111287- 111288+cat > conftest.$ac_ext <<EOF 111289+#line 75341 "configure" 111290+#include "confdefs.h" 111291 /* Override any gcc2 internal prototype to avoid an error. */ 111292-#ifdef __cplusplus 111293-extern "C" 111294-#endif 111295 /* We use char because int might match the return type of a gcc2 111296- builtin and then its argument prototype would still apply. */ 111297-char PQcmdTuples (); 111298-int 111299-main () 111300-{ 111301-PQcmdTuples (); 111302- ; 111303- return 0; 111304-} 111305-_ACEOF 111306-rm -f conftest.$ac_objext conftest$ac_exeext 111307-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111308- (eval $ac_link) 2>conftest.er1 111309- ac_status=$? 111310- grep -v '^ *+' conftest.er1 >conftest.err 111311- rm -f conftest.er1 111312- cat conftest.err >&5 111313- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111314- (exit $ac_status); } && 111315- { ac_try='test -z "$ac_c_werror_flag" 111316- || test ! -s conftest.err' 111317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111318- (eval $ac_try) 2>&5 111319- ac_status=$? 111320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111321- (exit $ac_status); }; } && 111322- { ac_try='test -s conftest$ac_exeext' 111323- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111324- (eval $ac_try) 2>&5 111325- ac_status=$? 111326- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111327- (exit $ac_status); }; }; then 111328- ac_cv_lib_pq_PQcmdTuples=yes 111329-else 111330- echo "$as_me: failed program was:" >&5 111331-sed 's/^/| /' conftest.$ac_ext >&5 111332- 111333-ac_cv_lib_pq_PQcmdTuples=no 111334-fi 111335-rm -f conftest.err conftest.$ac_objext \ 111336- conftest$ac_exeext conftest.$ac_ext 111337-LIBS=$ac_check_lib_save_LIBS 111338-fi 111339-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQcmdTuples" >&5 111340-echo "${ECHO_T}$ac_cv_lib_pq_PQcmdTuples" >&6 111341-if test $ac_cv_lib_pq_PQcmdTuples = yes; then 111342+ builtin and then its argument prototype would still apply. */ 111343+char PQcmdTuples(); 111344+ 111345+int main() { 111346+PQcmdTuples() 111347+; return 0; } 111348+EOF 111349+if { (eval echo configure:75352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111350+ rm -rf conftest* 111351+ eval "ac_cv_lib_$ac_lib_var=yes" 111352+else 111353+ echo "configure: failed program was:" >&5 111354+ cat conftest.$ac_ext >&5 111355+ rm -rf conftest* 111356+ eval "ac_cv_lib_$ac_lib_var=no" 111357+fi 111358+rm -f conftest* 111359+LIBS="$ac_save_LIBS" 111360 111361-cat >>confdefs.h <<\_ACEOF 111362+fi 111363+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111364+ echo "$ac_t""yes" 1>&6 111365+ cat >> confdefs.h <<\EOF 111366 #define HAVE_PQCMDTUPLES 1 111367-_ACEOF 111368+EOF 111369 111370+else 111371+ echo "$ac_t""no" 1>&6 111372 fi 111373 111374- echo "$as_me:$LINENO: checking for PQoidValue in -lpq" >&5 111375-echo $ECHO_N "checking for PQoidValue in -lpq... $ECHO_C" >&6 111376-if test "${ac_cv_lib_pq_PQoidValue+set}" = set; then 111377- echo $ECHO_N "(cached) $ECHO_C" >&6 111378+ echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 111379+echo "configure:75376: checking for PQoidValue in -lpq" >&5 111380+ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` 111381+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111382+ echo $ac_n "(cached) $ac_c" 1>&6 111383 else 111384- ac_check_lib_save_LIBS=$LIBS 111385+ ac_save_LIBS="$LIBS" 111386 LIBS="-lpq $LIBS" 111387-cat >conftest.$ac_ext <<_ACEOF 111388-/* confdefs.h. */ 111389-_ACEOF 111390-cat confdefs.h >>conftest.$ac_ext 111391-cat >>conftest.$ac_ext <<_ACEOF 111392-/* end confdefs.h. */ 111393- 111394+cat > conftest.$ac_ext <<EOF 111395+#line 75384 "configure" 111396+#include "confdefs.h" 111397 /* Override any gcc2 internal prototype to avoid an error. */ 111398-#ifdef __cplusplus 111399-extern "C" 111400-#endif 111401 /* We use char because int might match the return type of a gcc2 111402- builtin and then its argument prototype would still apply. */ 111403-char PQoidValue (); 111404-int 111405-main () 111406-{ 111407-PQoidValue (); 111408- ; 111409- return 0; 111410-} 111411-_ACEOF 111412-rm -f conftest.$ac_objext conftest$ac_exeext 111413-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111414- (eval $ac_link) 2>conftest.er1 111415- ac_status=$? 111416- grep -v '^ *+' conftest.er1 >conftest.err 111417- rm -f conftest.er1 111418- cat conftest.err >&5 111419- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111420- (exit $ac_status); } && 111421- { ac_try='test -z "$ac_c_werror_flag" 111422- || test ! -s conftest.err' 111423- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111424- (eval $ac_try) 2>&5 111425- ac_status=$? 111426- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111427- (exit $ac_status); }; } && 111428- { ac_try='test -s conftest$ac_exeext' 111429- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111430- (eval $ac_try) 2>&5 111431- ac_status=$? 111432- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111433- (exit $ac_status); }; }; then 111434- ac_cv_lib_pq_PQoidValue=yes 111435-else 111436- echo "$as_me: failed program was:" >&5 111437-sed 's/^/| /' conftest.$ac_ext >&5 111438- 111439-ac_cv_lib_pq_PQoidValue=no 111440-fi 111441-rm -f conftest.err conftest.$ac_objext \ 111442- conftest$ac_exeext conftest.$ac_ext 111443-LIBS=$ac_check_lib_save_LIBS 111444-fi 111445-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQoidValue" >&5 111446-echo "${ECHO_T}$ac_cv_lib_pq_PQoidValue" >&6 111447-if test $ac_cv_lib_pq_PQoidValue = yes; then 111448+ builtin and then its argument prototype would still apply. */ 111449+char PQoidValue(); 111450+ 111451+int main() { 111452+PQoidValue() 111453+; return 0; } 111454+EOF 111455+if { (eval echo configure:75395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111456+ rm -rf conftest* 111457+ eval "ac_cv_lib_$ac_lib_var=yes" 111458+else 111459+ echo "configure: failed program was:" >&5 111460+ cat conftest.$ac_ext >&5 111461+ rm -rf conftest* 111462+ eval "ac_cv_lib_$ac_lib_var=no" 111463+fi 111464+rm -f conftest* 111465+LIBS="$ac_save_LIBS" 111466 111467-cat >>confdefs.h <<\_ACEOF 111468+fi 111469+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111470+ echo "$ac_t""yes" 1>&6 111471+ cat >> confdefs.h <<\EOF 111472 #define HAVE_PQOIDVALUE 1 111473-_ACEOF 111474+EOF 111475 111476+else 111477+ echo "$ac_t""no" 1>&6 111478 fi 111479 111480- echo "$as_me:$LINENO: checking for PQclientEncoding in -lpq" >&5 111481-echo $ECHO_N "checking for PQclientEncoding in -lpq... $ECHO_C" >&6 111482-if test "${ac_cv_lib_pq_PQclientEncoding+set}" = set; then 111483- echo $ECHO_N "(cached) $ECHO_C" >&6 111484+ echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 111485+echo "configure:75419: checking for PQclientEncoding in -lpq" >&5 111486+ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` 111487+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111488+ echo $ac_n "(cached) $ac_c" 1>&6 111489 else 111490- ac_check_lib_save_LIBS=$LIBS 111491+ ac_save_LIBS="$LIBS" 111492 LIBS="-lpq $LIBS" 111493-cat >conftest.$ac_ext <<_ACEOF 111494-/* confdefs.h. */ 111495-_ACEOF 111496-cat confdefs.h >>conftest.$ac_ext 111497-cat >>conftest.$ac_ext <<_ACEOF 111498-/* end confdefs.h. */ 111499- 111500+cat > conftest.$ac_ext <<EOF 111501+#line 75427 "configure" 111502+#include "confdefs.h" 111503 /* Override any gcc2 internal prototype to avoid an error. */ 111504-#ifdef __cplusplus 111505-extern "C" 111506-#endif 111507 /* We use char because int might match the return type of a gcc2 111508- builtin and then its argument prototype would still apply. */ 111509-char PQclientEncoding (); 111510-int 111511-main () 111512-{ 111513-PQclientEncoding (); 111514- ; 111515- return 0; 111516-} 111517-_ACEOF 111518-rm -f conftest.$ac_objext conftest$ac_exeext 111519-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111520- (eval $ac_link) 2>conftest.er1 111521- ac_status=$? 111522- grep -v '^ *+' conftest.er1 >conftest.err 111523- rm -f conftest.er1 111524- cat conftest.err >&5 111525- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111526- (exit $ac_status); } && 111527- { ac_try='test -z "$ac_c_werror_flag" 111528- || test ! -s conftest.err' 111529- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111530- (eval $ac_try) 2>&5 111531- ac_status=$? 111532- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111533- (exit $ac_status); }; } && 111534- { ac_try='test -s conftest$ac_exeext' 111535- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111536- (eval $ac_try) 2>&5 111537- ac_status=$? 111538- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111539- (exit $ac_status); }; }; then 111540- ac_cv_lib_pq_PQclientEncoding=yes 111541-else 111542- echo "$as_me: failed program was:" >&5 111543-sed 's/^/| /' conftest.$ac_ext >&5 111544- 111545-ac_cv_lib_pq_PQclientEncoding=no 111546-fi 111547-rm -f conftest.err conftest.$ac_objext \ 111548- conftest$ac_exeext conftest.$ac_ext 111549-LIBS=$ac_check_lib_save_LIBS 111550-fi 111551-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQclientEncoding" >&5 111552-echo "${ECHO_T}$ac_cv_lib_pq_PQclientEncoding" >&6 111553-if test $ac_cv_lib_pq_PQclientEncoding = yes; then 111554+ builtin and then its argument prototype would still apply. */ 111555+char PQclientEncoding(); 111556+ 111557+int main() { 111558+PQclientEncoding() 111559+; return 0; } 111560+EOF 111561+if { (eval echo configure:75438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111562+ rm -rf conftest* 111563+ eval "ac_cv_lib_$ac_lib_var=yes" 111564+else 111565+ echo "configure: failed program was:" >&5 111566+ cat conftest.$ac_ext >&5 111567+ rm -rf conftest* 111568+ eval "ac_cv_lib_$ac_lib_var=no" 111569+fi 111570+rm -f conftest* 111571+LIBS="$ac_save_LIBS" 111572 111573-cat >>confdefs.h <<\_ACEOF 111574+fi 111575+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111576+ echo "$ac_t""yes" 1>&6 111577+ cat >> confdefs.h <<\EOF 111578 #define HAVE_PQCLIENTENCODING 1 111579-_ACEOF 111580+EOF 111581 111582+else 111583+ echo "$ac_t""no" 1>&6 111584 fi 111585 111586- echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5 111587-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6 111588-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then 111589- echo $ECHO_N "(cached) $ECHO_C" >&6 111590+ echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 111591+echo "configure:75462: checking for PQparameterStatus in -lpq" >&5 111592+ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` 111593+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111594+ echo $ac_n "(cached) $ac_c" 1>&6 111595 else 111596- ac_check_lib_save_LIBS=$LIBS 111597+ ac_save_LIBS="$LIBS" 111598 LIBS="-lpq $LIBS" 111599-cat >conftest.$ac_ext <<_ACEOF 111600-/* confdefs.h. */ 111601-_ACEOF 111602-cat confdefs.h >>conftest.$ac_ext 111603-cat >>conftest.$ac_ext <<_ACEOF 111604-/* end confdefs.h. */ 111605- 111606+cat > conftest.$ac_ext <<EOF 111607+#line 75470 "configure" 111608+#include "confdefs.h" 111609 /* Override any gcc2 internal prototype to avoid an error. */ 111610-#ifdef __cplusplus 111611-extern "C" 111612-#endif 111613 /* We use char because int might match the return type of a gcc2 111614- builtin and then its argument prototype would still apply. */ 111615-char PQparameterStatus (); 111616-int 111617-main () 111618-{ 111619-PQparameterStatus (); 111620- ; 111621- return 0; 111622-} 111623-_ACEOF 111624-rm -f conftest.$ac_objext conftest$ac_exeext 111625-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111626- (eval $ac_link) 2>conftest.er1 111627- ac_status=$? 111628- grep -v '^ *+' conftest.er1 >conftest.err 111629- rm -f conftest.er1 111630- cat conftest.err >&5 111631- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111632- (exit $ac_status); } && 111633- { ac_try='test -z "$ac_c_werror_flag" 111634- || test ! -s conftest.err' 111635- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111636- (eval $ac_try) 2>&5 111637- ac_status=$? 111638- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111639- (exit $ac_status); }; } && 111640- { ac_try='test -s conftest$ac_exeext' 111641- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111642- (eval $ac_try) 2>&5 111643- ac_status=$? 111644- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111645- (exit $ac_status); }; }; then 111646- ac_cv_lib_pq_PQparameterStatus=yes 111647-else 111648- echo "$as_me: failed program was:" >&5 111649-sed 's/^/| /' conftest.$ac_ext >&5 111650- 111651-ac_cv_lib_pq_PQparameterStatus=no 111652-fi 111653-rm -f conftest.err conftest.$ac_objext \ 111654- conftest$ac_exeext conftest.$ac_ext 111655-LIBS=$ac_check_lib_save_LIBS 111656-fi 111657-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5 111658-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6 111659-if test $ac_cv_lib_pq_PQparameterStatus = yes; then 111660+ builtin and then its argument prototype would still apply. */ 111661+char PQparameterStatus(); 111662+ 111663+int main() { 111664+PQparameterStatus() 111665+; return 0; } 111666+EOF 111667+if { (eval echo configure:75481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111668+ rm -rf conftest* 111669+ eval "ac_cv_lib_$ac_lib_var=yes" 111670+else 111671+ echo "configure: failed program was:" >&5 111672+ cat conftest.$ac_ext >&5 111673+ rm -rf conftest* 111674+ eval "ac_cv_lib_$ac_lib_var=no" 111675+fi 111676+rm -f conftest* 111677+LIBS="$ac_save_LIBS" 111678 111679-cat >>confdefs.h <<\_ACEOF 111680+fi 111681+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111682+ echo "$ac_t""yes" 1>&6 111683+ cat >> confdefs.h <<\EOF 111684 #define HAVE_PQPARAMETERSTATUS 1 111685-_ACEOF 111686+EOF 111687 111688+else 111689+ echo "$ac_t""no" 1>&6 111690 fi 111691 111692- echo "$as_me:$LINENO: checking for PQprotocolVersion in -lpq" >&5 111693-echo $ECHO_N "checking for PQprotocolVersion in -lpq... $ECHO_C" >&6 111694-if test "${ac_cv_lib_pq_PQprotocolVersion+set}" = set; then 111695- echo $ECHO_N "(cached) $ECHO_C" >&6 111696+ echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 111697+echo "configure:75505: checking for PQprotocolVersion in -lpq" >&5 111698+ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` 111699+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111700+ echo $ac_n "(cached) $ac_c" 1>&6 111701 else 111702- ac_check_lib_save_LIBS=$LIBS 111703+ ac_save_LIBS="$LIBS" 111704 LIBS="-lpq $LIBS" 111705-cat >conftest.$ac_ext <<_ACEOF 111706-/* confdefs.h. */ 111707-_ACEOF 111708-cat confdefs.h >>conftest.$ac_ext 111709-cat >>conftest.$ac_ext <<_ACEOF 111710-/* end confdefs.h. */ 111711- 111712+cat > conftest.$ac_ext <<EOF 111713+#line 75513 "configure" 111714+#include "confdefs.h" 111715 /* Override any gcc2 internal prototype to avoid an error. */ 111716-#ifdef __cplusplus 111717-extern "C" 111718-#endif 111719 /* We use char because int might match the return type of a gcc2 111720- builtin and then its argument prototype would still apply. */ 111721-char PQprotocolVersion (); 111722-int 111723-main () 111724-{ 111725-PQprotocolVersion (); 111726- ; 111727- return 0; 111728-} 111729-_ACEOF 111730-rm -f conftest.$ac_objext conftest$ac_exeext 111731-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111732- (eval $ac_link) 2>conftest.er1 111733- ac_status=$? 111734- grep -v '^ *+' conftest.er1 >conftest.err 111735- rm -f conftest.er1 111736- cat conftest.err >&5 111737- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111738- (exit $ac_status); } && 111739- { ac_try='test -z "$ac_c_werror_flag" 111740- || test ! -s conftest.err' 111741- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111742- (eval $ac_try) 2>&5 111743- ac_status=$? 111744- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111745- (exit $ac_status); }; } && 111746- { ac_try='test -s conftest$ac_exeext' 111747- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111748- (eval $ac_try) 2>&5 111749- ac_status=$? 111750- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111751- (exit $ac_status); }; }; then 111752- ac_cv_lib_pq_PQprotocolVersion=yes 111753-else 111754- echo "$as_me: failed program was:" >&5 111755-sed 's/^/| /' conftest.$ac_ext >&5 111756- 111757-ac_cv_lib_pq_PQprotocolVersion=no 111758-fi 111759-rm -f conftest.err conftest.$ac_objext \ 111760- conftest$ac_exeext conftest.$ac_ext 111761-LIBS=$ac_check_lib_save_LIBS 111762-fi 111763-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprotocolVersion" >&5 111764-echo "${ECHO_T}$ac_cv_lib_pq_PQprotocolVersion" >&6 111765-if test $ac_cv_lib_pq_PQprotocolVersion = yes; then 111766+ builtin and then its argument prototype would still apply. */ 111767+char PQprotocolVersion(); 111768+ 111769+int main() { 111770+PQprotocolVersion() 111771+; return 0; } 111772+EOF 111773+if { (eval echo configure:75524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111774+ rm -rf conftest* 111775+ eval "ac_cv_lib_$ac_lib_var=yes" 111776+else 111777+ echo "configure: failed program was:" >&5 111778+ cat conftest.$ac_ext >&5 111779+ rm -rf conftest* 111780+ eval "ac_cv_lib_$ac_lib_var=no" 111781+fi 111782+rm -f conftest* 111783+LIBS="$ac_save_LIBS" 111784 111785-cat >>confdefs.h <<\_ACEOF 111786+fi 111787+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111788+ echo "$ac_t""yes" 1>&6 111789+ cat >> confdefs.h <<\EOF 111790 #define HAVE_PQPROTOCOLVERSION 1 111791-_ACEOF 111792+EOF 111793 111794+else 111795+ echo "$ac_t""no" 1>&6 111796 fi 111797 111798- echo "$as_me:$LINENO: checking for PQtransactionStatus in -lpq" >&5 111799-echo $ECHO_N "checking for PQtransactionStatus in -lpq... $ECHO_C" >&6 111800-if test "${ac_cv_lib_pq_PQtransactionStatus+set}" = set; then 111801- echo $ECHO_N "(cached) $ECHO_C" >&6 111802+ echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 111803+echo "configure:75548: checking for PQtransactionStatus in -lpq" >&5 111804+ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` 111805+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111806+ echo $ac_n "(cached) $ac_c" 1>&6 111807 else 111808- ac_check_lib_save_LIBS=$LIBS 111809+ ac_save_LIBS="$LIBS" 111810 LIBS="-lpq $LIBS" 111811-cat >conftest.$ac_ext <<_ACEOF 111812-/* confdefs.h. */ 111813-_ACEOF 111814-cat confdefs.h >>conftest.$ac_ext 111815-cat >>conftest.$ac_ext <<_ACEOF 111816-/* end confdefs.h. */ 111817- 111818+cat > conftest.$ac_ext <<EOF 111819+#line 75556 "configure" 111820+#include "confdefs.h" 111821 /* Override any gcc2 internal prototype to avoid an error. */ 111822-#ifdef __cplusplus 111823-extern "C" 111824-#endif 111825 /* We use char because int might match the return type of a gcc2 111826- builtin and then its argument prototype would still apply. */ 111827-char PQtransactionStatus (); 111828-int 111829-main () 111830-{ 111831-PQtransactionStatus (); 111832- ; 111833- return 0; 111834-} 111835-_ACEOF 111836-rm -f conftest.$ac_objext conftest$ac_exeext 111837-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111838- (eval $ac_link) 2>conftest.er1 111839- ac_status=$? 111840- grep -v '^ *+' conftest.er1 >conftest.err 111841- rm -f conftest.er1 111842- cat conftest.err >&5 111843- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111844- (exit $ac_status); } && 111845- { ac_try='test -z "$ac_c_werror_flag" 111846- || test ! -s conftest.err' 111847- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111848- (eval $ac_try) 2>&5 111849- ac_status=$? 111850- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111851- (exit $ac_status); }; } && 111852- { ac_try='test -s conftest$ac_exeext' 111853- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111854- (eval $ac_try) 2>&5 111855- ac_status=$? 111856- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111857- (exit $ac_status); }; }; then 111858- ac_cv_lib_pq_PQtransactionStatus=yes 111859-else 111860- echo "$as_me: failed program was:" >&5 111861-sed 's/^/| /' conftest.$ac_ext >&5 111862- 111863-ac_cv_lib_pq_PQtransactionStatus=no 111864-fi 111865-rm -f conftest.err conftest.$ac_objext \ 111866- conftest$ac_exeext conftest.$ac_ext 111867-LIBS=$ac_check_lib_save_LIBS 111868-fi 111869-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQtransactionStatus" >&5 111870-echo "${ECHO_T}$ac_cv_lib_pq_PQtransactionStatus" >&6 111871-if test $ac_cv_lib_pq_PQtransactionStatus = yes; then 111872+ builtin and then its argument prototype would still apply. */ 111873+char PQtransactionStatus(); 111874+ 111875+int main() { 111876+PQtransactionStatus() 111877+; return 0; } 111878+EOF 111879+if { (eval echo configure:75567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111880+ rm -rf conftest* 111881+ eval "ac_cv_lib_$ac_lib_var=yes" 111882+else 111883+ echo "configure: failed program was:" >&5 111884+ cat conftest.$ac_ext >&5 111885+ rm -rf conftest* 111886+ eval "ac_cv_lib_$ac_lib_var=no" 111887+fi 111888+rm -f conftest* 111889+LIBS="$ac_save_LIBS" 111890 111891-cat >>confdefs.h <<\_ACEOF 111892+fi 111893+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 111894+ echo "$ac_t""yes" 1>&6 111895+ cat >> confdefs.h <<\EOF 111896 #define HAVE_PGTRANSACTIONSTATUS 1 111897-_ACEOF 111898+EOF 111899 111900+else 111901+ echo "$ac_t""no" 1>&6 111902 fi 111903 111904- echo "$as_me:$LINENO: checking for PQexecParams in -lpq" >&5 111905-echo $ECHO_N "checking for PQexecParams in -lpq... $ECHO_C" >&6 111906-if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then 111907- echo $ECHO_N "(cached) $ECHO_C" >&6 111908+ echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 111909+echo "configure:75591: checking for PQexecParams in -lpq" >&5 111910+ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` 111911+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 111912+ echo $ac_n "(cached) $ac_c" 1>&6 111913 else 111914- ac_check_lib_save_LIBS=$LIBS 111915+ ac_save_LIBS="$LIBS" 111916 LIBS="-lpq $LIBS" 111917-cat >conftest.$ac_ext <<_ACEOF 111918-/* confdefs.h. */ 111919-_ACEOF 111920-cat confdefs.h >>conftest.$ac_ext 111921-cat >>conftest.$ac_ext <<_ACEOF 111922-/* end confdefs.h. */ 111923- 111924+cat > conftest.$ac_ext <<EOF 111925+#line 75599 "configure" 111926+#include "confdefs.h" 111927 /* Override any gcc2 internal prototype to avoid an error. */ 111928-#ifdef __cplusplus 111929-extern "C" 111930-#endif 111931 /* We use char because int might match the return type of a gcc2 111932- builtin and then its argument prototype would still apply. */ 111933-char PQexecParams (); 111934-int 111935-main () 111936-{ 111937-PQexecParams (); 111938- ; 111939- return 0; 111940-} 111941-_ACEOF 111942-rm -f conftest.$ac_objext conftest$ac_exeext 111943-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 111944- (eval $ac_link) 2>conftest.er1 111945- ac_status=$? 111946- grep -v '^ *+' conftest.er1 >conftest.err 111947- rm -f conftest.er1 111948- cat conftest.err >&5 111949- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111950- (exit $ac_status); } && 111951- { ac_try='test -z "$ac_c_werror_flag" 111952- || test ! -s conftest.err' 111953- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111954- (eval $ac_try) 2>&5 111955- ac_status=$? 111956- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111957- (exit $ac_status); }; } && 111958- { ac_try='test -s conftest$ac_exeext' 111959- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 111960- (eval $ac_try) 2>&5 111961- ac_status=$? 111962- echo "$as_me:$LINENO: \$? = $ac_status" >&5 111963- (exit $ac_status); }; }; then 111964- ac_cv_lib_pq_PQexecParams=yes 111965-else 111966- echo "$as_me: failed program was:" >&5 111967-sed 's/^/| /' conftest.$ac_ext >&5 111968- 111969-ac_cv_lib_pq_PQexecParams=no 111970-fi 111971-rm -f conftest.err conftest.$ac_objext \ 111972- conftest$ac_exeext conftest.$ac_ext 111973-LIBS=$ac_check_lib_save_LIBS 111974-fi 111975-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecParams" >&5 111976-echo "${ECHO_T}$ac_cv_lib_pq_PQexecParams" >&6 111977-if test $ac_cv_lib_pq_PQexecParams = yes; then 111978+ builtin and then its argument prototype would still apply. */ 111979+char PQexecParams(); 111980+ 111981+int main() { 111982+PQexecParams() 111983+; return 0; } 111984+EOF 111985+if { (eval echo configure:75610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 111986+ rm -rf conftest* 111987+ eval "ac_cv_lib_$ac_lib_var=yes" 111988+else 111989+ echo "configure: failed program was:" >&5 111990+ cat conftest.$ac_ext >&5 111991+ rm -rf conftest* 111992+ eval "ac_cv_lib_$ac_lib_var=no" 111993+fi 111994+rm -f conftest* 111995+LIBS="$ac_save_LIBS" 111996 111997-cat >>confdefs.h <<\_ACEOF 111998+fi 111999+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112000+ echo "$ac_t""yes" 1>&6 112001+ cat >> confdefs.h <<\EOF 112002 #define HAVE_PQEXECPARAMS 1 112003-_ACEOF 112004+EOF 112005 112006+else 112007+ echo "$ac_t""no" 1>&6 112008 fi 112009 112010- echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5 112011-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6 112012-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then 112013- echo $ECHO_N "(cached) $ECHO_C" >&6 112014+ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 112015+echo "configure:75634: checking for PQprepare in -lpq" >&5 112016+ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` 112017+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112018+ echo $ac_n "(cached) $ac_c" 1>&6 112019 else 112020- ac_check_lib_save_LIBS=$LIBS 112021+ ac_save_LIBS="$LIBS" 112022 LIBS="-lpq $LIBS" 112023-cat >conftest.$ac_ext <<_ACEOF 112024-/* confdefs.h. */ 112025-_ACEOF 112026-cat confdefs.h >>conftest.$ac_ext 112027-cat >>conftest.$ac_ext <<_ACEOF 112028-/* end confdefs.h. */ 112029- 112030+cat > conftest.$ac_ext <<EOF 112031+#line 75642 "configure" 112032+#include "confdefs.h" 112033 /* Override any gcc2 internal prototype to avoid an error. */ 112034-#ifdef __cplusplus 112035-extern "C" 112036-#endif 112037 /* We use char because int might match the return type of a gcc2 112038- builtin and then its argument prototype would still apply. */ 112039-char PQprepare (); 112040-int 112041-main () 112042-{ 112043-PQprepare (); 112044- ; 112045- return 0; 112046-} 112047-_ACEOF 112048-rm -f conftest.$ac_objext conftest$ac_exeext 112049-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112050- (eval $ac_link) 2>conftest.er1 112051- ac_status=$? 112052- grep -v '^ *+' conftest.er1 >conftest.err 112053- rm -f conftest.er1 112054- cat conftest.err >&5 112055- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112056- (exit $ac_status); } && 112057- { ac_try='test -z "$ac_c_werror_flag" 112058- || test ! -s conftest.err' 112059- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112060- (eval $ac_try) 2>&5 112061- ac_status=$? 112062- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112063- (exit $ac_status); }; } && 112064- { ac_try='test -s conftest$ac_exeext' 112065- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112066- (eval $ac_try) 2>&5 112067- ac_status=$? 112068- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112069- (exit $ac_status); }; }; then 112070- ac_cv_lib_pq_PQprepare=yes 112071-else 112072- echo "$as_me: failed program was:" >&5 112073-sed 's/^/| /' conftest.$ac_ext >&5 112074- 112075-ac_cv_lib_pq_PQprepare=no 112076-fi 112077-rm -f conftest.err conftest.$ac_objext \ 112078- conftest$ac_exeext conftest.$ac_ext 112079-LIBS=$ac_check_lib_save_LIBS 112080-fi 112081-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5 112082-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6 112083-if test $ac_cv_lib_pq_PQprepare = yes; then 112084+ builtin and then its argument prototype would still apply. */ 112085+char PQprepare(); 112086 112087-cat >>confdefs.h <<\_ACEOF 112088+int main() { 112089+PQprepare() 112090+; return 0; } 112091+EOF 112092+if { (eval echo configure:75653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112093+ rm -rf conftest* 112094+ eval "ac_cv_lib_$ac_lib_var=yes" 112095+else 112096+ echo "configure: failed program was:" >&5 112097+ cat conftest.$ac_ext >&5 112098+ rm -rf conftest* 112099+ eval "ac_cv_lib_$ac_lib_var=no" 112100+fi 112101+rm -f conftest* 112102+LIBS="$ac_save_LIBS" 112103+ 112104+fi 112105+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112106+ echo "$ac_t""yes" 1>&6 112107+ cat >> confdefs.h <<\EOF 112108 #define HAVE_PQPREPARE 1 112109-_ACEOF 112110+EOF 112111 112112+else 112113+ echo "$ac_t""no" 1>&6 112114 fi 112115 112116- echo "$as_me:$LINENO: checking for PQexecPrepared in -lpq" >&5 112117-echo $ECHO_N "checking for PQexecPrepared in -lpq... $ECHO_C" >&6 112118-if test "${ac_cv_lib_pq_PQexecPrepared+set}" = set; then 112119- echo $ECHO_N "(cached) $ECHO_C" >&6 112120+ echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 112121+echo "configure:75677: checking for PQexecPrepared in -lpq" >&5 112122+ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` 112123+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112124+ echo $ac_n "(cached) $ac_c" 1>&6 112125 else 112126- ac_check_lib_save_LIBS=$LIBS 112127+ ac_save_LIBS="$LIBS" 112128 LIBS="-lpq $LIBS" 112129-cat >conftest.$ac_ext <<_ACEOF 112130-/* confdefs.h. */ 112131-_ACEOF 112132-cat confdefs.h >>conftest.$ac_ext 112133-cat >>conftest.$ac_ext <<_ACEOF 112134-/* end confdefs.h. */ 112135- 112136+cat > conftest.$ac_ext <<EOF 112137+#line 75685 "configure" 112138+#include "confdefs.h" 112139 /* Override any gcc2 internal prototype to avoid an error. */ 112140-#ifdef __cplusplus 112141-extern "C" 112142-#endif 112143 /* We use char because int might match the return type of a gcc2 112144- builtin and then its argument prototype would still apply. */ 112145-char PQexecPrepared (); 112146-int 112147-main () 112148-{ 112149-PQexecPrepared (); 112150- ; 112151- return 0; 112152-} 112153-_ACEOF 112154-rm -f conftest.$ac_objext conftest$ac_exeext 112155-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112156- (eval $ac_link) 2>conftest.er1 112157- ac_status=$? 112158- grep -v '^ *+' conftest.er1 >conftest.err 112159- rm -f conftest.er1 112160- cat conftest.err >&5 112161- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112162- (exit $ac_status); } && 112163- { ac_try='test -z "$ac_c_werror_flag" 112164- || test ! -s conftest.err' 112165- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112166- (eval $ac_try) 2>&5 112167- ac_status=$? 112168- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112169- (exit $ac_status); }; } && 112170- { ac_try='test -s conftest$ac_exeext' 112171- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112172- (eval $ac_try) 2>&5 112173- ac_status=$? 112174- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112175- (exit $ac_status); }; }; then 112176- ac_cv_lib_pq_PQexecPrepared=yes 112177-else 112178- echo "$as_me: failed program was:" >&5 112179-sed 's/^/| /' conftest.$ac_ext >&5 112180- 112181-ac_cv_lib_pq_PQexecPrepared=no 112182-fi 112183-rm -f conftest.err conftest.$ac_objext \ 112184- conftest$ac_exeext conftest.$ac_ext 112185-LIBS=$ac_check_lib_save_LIBS 112186-fi 112187-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecPrepared" >&5 112188-echo "${ECHO_T}$ac_cv_lib_pq_PQexecPrepared" >&6 112189-if test $ac_cv_lib_pq_PQexecPrepared = yes; then 112190+ builtin and then its argument prototype would still apply. */ 112191+char PQexecPrepared(); 112192+ 112193+int main() { 112194+PQexecPrepared() 112195+; return 0; } 112196+EOF 112197+if { (eval echo configure:75696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112198+ rm -rf conftest* 112199+ eval "ac_cv_lib_$ac_lib_var=yes" 112200+else 112201+ echo "configure: failed program was:" >&5 112202+ cat conftest.$ac_ext >&5 112203+ rm -rf conftest* 112204+ eval "ac_cv_lib_$ac_lib_var=no" 112205+fi 112206+rm -f conftest* 112207+LIBS="$ac_save_LIBS" 112208 112209-cat >>confdefs.h <<\_ACEOF 112210+fi 112211+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112212+ echo "$ac_t""yes" 1>&6 112213+ cat >> confdefs.h <<\EOF 112214 #define HAVE_PQEXECPREPARED 1 112215-_ACEOF 112216+EOF 112217 112218+else 112219+ echo "$ac_t""no" 1>&6 112220 fi 112221 112222- echo "$as_me:$LINENO: checking for PQresultErrorField in -lpq" >&5 112223-echo $ECHO_N "checking for PQresultErrorField in -lpq... $ECHO_C" >&6 112224-if test "${ac_cv_lib_pq_PQresultErrorField+set}" = set; then 112225- echo $ECHO_N "(cached) $ECHO_C" >&6 112226+ echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 112227+echo "configure:75720: checking for PQresultErrorField in -lpq" >&5 112228+ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` 112229+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112230+ echo $ac_n "(cached) $ac_c" 1>&6 112231 else 112232- ac_check_lib_save_LIBS=$LIBS 112233+ ac_save_LIBS="$LIBS" 112234 LIBS="-lpq $LIBS" 112235-cat >conftest.$ac_ext <<_ACEOF 112236-/* confdefs.h. */ 112237-_ACEOF 112238-cat confdefs.h >>conftest.$ac_ext 112239-cat >>conftest.$ac_ext <<_ACEOF 112240-/* end confdefs.h. */ 112241- 112242+cat > conftest.$ac_ext <<EOF 112243+#line 75728 "configure" 112244+#include "confdefs.h" 112245 /* Override any gcc2 internal prototype to avoid an error. */ 112246-#ifdef __cplusplus 112247-extern "C" 112248-#endif 112249 /* We use char because int might match the return type of a gcc2 112250- builtin and then its argument prototype would still apply. */ 112251-char PQresultErrorField (); 112252-int 112253-main () 112254-{ 112255-PQresultErrorField (); 112256- ; 112257- return 0; 112258-} 112259-_ACEOF 112260-rm -f conftest.$ac_objext conftest$ac_exeext 112261-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112262- (eval $ac_link) 2>conftest.er1 112263- ac_status=$? 112264- grep -v '^ *+' conftest.er1 >conftest.err 112265- rm -f conftest.er1 112266- cat conftest.err >&5 112267- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112268- (exit $ac_status); } && 112269- { ac_try='test -z "$ac_c_werror_flag" 112270- || test ! -s conftest.err' 112271- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112272- (eval $ac_try) 2>&5 112273- ac_status=$? 112274- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112275- (exit $ac_status); }; } && 112276- { ac_try='test -s conftest$ac_exeext' 112277- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112278- (eval $ac_try) 2>&5 112279- ac_status=$? 112280- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112281- (exit $ac_status); }; }; then 112282- ac_cv_lib_pq_PQresultErrorField=yes 112283-else 112284- echo "$as_me: failed program was:" >&5 112285-sed 's/^/| /' conftest.$ac_ext >&5 112286- 112287-ac_cv_lib_pq_PQresultErrorField=no 112288-fi 112289-rm -f conftest.err conftest.$ac_objext \ 112290- conftest$ac_exeext conftest.$ac_ext 112291-LIBS=$ac_check_lib_save_LIBS 112292-fi 112293-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQresultErrorField" >&5 112294-echo "${ECHO_T}$ac_cv_lib_pq_PQresultErrorField" >&6 112295-if test $ac_cv_lib_pq_PQresultErrorField = yes; then 112296+ builtin and then its argument prototype would still apply. */ 112297+char PQresultErrorField(); 112298+ 112299+int main() { 112300+PQresultErrorField() 112301+; return 0; } 112302+EOF 112303+if { (eval echo configure:75739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112304+ rm -rf conftest* 112305+ eval "ac_cv_lib_$ac_lib_var=yes" 112306+else 112307+ echo "configure: failed program was:" >&5 112308+ cat conftest.$ac_ext >&5 112309+ rm -rf conftest* 112310+ eval "ac_cv_lib_$ac_lib_var=no" 112311+fi 112312+rm -f conftest* 112313+LIBS="$ac_save_LIBS" 112314 112315-cat >>confdefs.h <<\_ACEOF 112316+fi 112317+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112318+ echo "$ac_t""yes" 1>&6 112319+ cat >> confdefs.h <<\EOF 112320 #define HAVE_PQRESULTERRORFIELD 1 112321-_ACEOF 112322+EOF 112323 112324+else 112325+ echo "$ac_t""no" 1>&6 112326 fi 112327 112328- echo "$as_me:$LINENO: checking for PQsendQueryParams in -lpq" >&5 112329-echo $ECHO_N "checking for PQsendQueryParams in -lpq... $ECHO_C" >&6 112330-if test "${ac_cv_lib_pq_PQsendQueryParams+set}" = set; then 112331- echo $ECHO_N "(cached) $ECHO_C" >&6 112332+ echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 112333+echo "configure:75763: checking for PQsendQueryParams in -lpq" >&5 112334+ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` 112335+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112336+ echo $ac_n "(cached) $ac_c" 1>&6 112337 else 112338- ac_check_lib_save_LIBS=$LIBS 112339+ ac_save_LIBS="$LIBS" 112340 LIBS="-lpq $LIBS" 112341-cat >conftest.$ac_ext <<_ACEOF 112342-/* confdefs.h. */ 112343-_ACEOF 112344-cat confdefs.h >>conftest.$ac_ext 112345-cat >>conftest.$ac_ext <<_ACEOF 112346-/* end confdefs.h. */ 112347- 112348+cat > conftest.$ac_ext <<EOF 112349+#line 75771 "configure" 112350+#include "confdefs.h" 112351 /* Override any gcc2 internal prototype to avoid an error. */ 112352-#ifdef __cplusplus 112353-extern "C" 112354-#endif 112355 /* We use char because int might match the return type of a gcc2 112356- builtin and then its argument prototype would still apply. */ 112357-char PQsendQueryParams (); 112358-int 112359-main () 112360-{ 112361-PQsendQueryParams (); 112362- ; 112363- return 0; 112364-} 112365-_ACEOF 112366-rm -f conftest.$ac_objext conftest$ac_exeext 112367-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112368- (eval $ac_link) 2>conftest.er1 112369- ac_status=$? 112370- grep -v '^ *+' conftest.er1 >conftest.err 112371- rm -f conftest.er1 112372- cat conftest.err >&5 112373- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112374- (exit $ac_status); } && 112375- { ac_try='test -z "$ac_c_werror_flag" 112376- || test ! -s conftest.err' 112377- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112378- (eval $ac_try) 2>&5 112379- ac_status=$? 112380- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112381- (exit $ac_status); }; } && 112382- { ac_try='test -s conftest$ac_exeext' 112383- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112384- (eval $ac_try) 2>&5 112385- ac_status=$? 112386- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112387- (exit $ac_status); }; }; then 112388- ac_cv_lib_pq_PQsendQueryParams=yes 112389-else 112390- echo "$as_me: failed program was:" >&5 112391-sed 's/^/| /' conftest.$ac_ext >&5 112392- 112393-ac_cv_lib_pq_PQsendQueryParams=no 112394-fi 112395-rm -f conftest.err conftest.$ac_objext \ 112396- conftest$ac_exeext conftest.$ac_ext 112397-LIBS=$ac_check_lib_save_LIBS 112398-fi 112399-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryParams" >&5 112400-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryParams" >&6 112401-if test $ac_cv_lib_pq_PQsendQueryParams = yes; then 112402+ builtin and then its argument prototype would still apply. */ 112403+char PQsendQueryParams(); 112404+ 112405+int main() { 112406+PQsendQueryParams() 112407+; return 0; } 112408+EOF 112409+if { (eval echo configure:75782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112410+ rm -rf conftest* 112411+ eval "ac_cv_lib_$ac_lib_var=yes" 112412+else 112413+ echo "configure: failed program was:" >&5 112414+ cat conftest.$ac_ext >&5 112415+ rm -rf conftest* 112416+ eval "ac_cv_lib_$ac_lib_var=no" 112417+fi 112418+rm -f conftest* 112419+LIBS="$ac_save_LIBS" 112420 112421-cat >>confdefs.h <<\_ACEOF 112422+fi 112423+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112424+ echo "$ac_t""yes" 1>&6 112425+ cat >> confdefs.h <<\EOF 112426 #define HAVE_PQSENDQUERYPARAMS 1 112427-_ACEOF 112428+EOF 112429 112430+else 112431+ echo "$ac_t""no" 1>&6 112432 fi 112433 112434- echo "$as_me:$LINENO: checking for PQsendPrepare in -lpq" >&5 112435-echo $ECHO_N "checking for PQsendPrepare in -lpq... $ECHO_C" >&6 112436-if test "${ac_cv_lib_pq_PQsendPrepare+set}" = set; then 112437- echo $ECHO_N "(cached) $ECHO_C" >&6 112438+ echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 112439+echo "configure:75806: checking for PQsendPrepare in -lpq" >&5 112440+ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` 112441+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112442+ echo $ac_n "(cached) $ac_c" 1>&6 112443 else 112444- ac_check_lib_save_LIBS=$LIBS 112445+ ac_save_LIBS="$LIBS" 112446 LIBS="-lpq $LIBS" 112447-cat >conftest.$ac_ext <<_ACEOF 112448-/* confdefs.h. */ 112449-_ACEOF 112450-cat confdefs.h >>conftest.$ac_ext 112451-cat >>conftest.$ac_ext <<_ACEOF 112452-/* end confdefs.h. */ 112453- 112454+cat > conftest.$ac_ext <<EOF 112455+#line 75814 "configure" 112456+#include "confdefs.h" 112457 /* Override any gcc2 internal prototype to avoid an error. */ 112458-#ifdef __cplusplus 112459-extern "C" 112460-#endif 112461 /* We use char because int might match the return type of a gcc2 112462- builtin and then its argument prototype would still apply. */ 112463-char PQsendPrepare (); 112464-int 112465-main () 112466-{ 112467-PQsendPrepare (); 112468- ; 112469- return 0; 112470-} 112471-_ACEOF 112472-rm -f conftest.$ac_objext conftest$ac_exeext 112473-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112474- (eval $ac_link) 2>conftest.er1 112475- ac_status=$? 112476- grep -v '^ *+' conftest.er1 >conftest.err 112477- rm -f conftest.er1 112478- cat conftest.err >&5 112479- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112480- (exit $ac_status); } && 112481- { ac_try='test -z "$ac_c_werror_flag" 112482- || test ! -s conftest.err' 112483- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112484- (eval $ac_try) 2>&5 112485- ac_status=$? 112486- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112487- (exit $ac_status); }; } && 112488- { ac_try='test -s conftest$ac_exeext' 112489- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112490- (eval $ac_try) 2>&5 112491- ac_status=$? 112492- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112493- (exit $ac_status); }; }; then 112494- ac_cv_lib_pq_PQsendPrepare=yes 112495-else 112496- echo "$as_me: failed program was:" >&5 112497-sed 's/^/| /' conftest.$ac_ext >&5 112498- 112499-ac_cv_lib_pq_PQsendPrepare=no 112500-fi 112501-rm -f conftest.err conftest.$ac_objext \ 112502- conftest$ac_exeext conftest.$ac_ext 112503-LIBS=$ac_check_lib_save_LIBS 112504-fi 112505-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendPrepare" >&5 112506-echo "${ECHO_T}$ac_cv_lib_pq_PQsendPrepare" >&6 112507-if test $ac_cv_lib_pq_PQsendPrepare = yes; then 112508+ builtin and then its argument prototype would still apply. */ 112509+char PQsendPrepare(); 112510+ 112511+int main() { 112512+PQsendPrepare() 112513+; return 0; } 112514+EOF 112515+if { (eval echo configure:75825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112516+ rm -rf conftest* 112517+ eval "ac_cv_lib_$ac_lib_var=yes" 112518+else 112519+ echo "configure: failed program was:" >&5 112520+ cat conftest.$ac_ext >&5 112521+ rm -rf conftest* 112522+ eval "ac_cv_lib_$ac_lib_var=no" 112523+fi 112524+rm -f conftest* 112525+LIBS="$ac_save_LIBS" 112526 112527-cat >>confdefs.h <<\_ACEOF 112528+fi 112529+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112530+ echo "$ac_t""yes" 1>&6 112531+ cat >> confdefs.h <<\EOF 112532 #define HAVE_PQSENDPREPARE 1 112533-_ACEOF 112534+EOF 112535 112536+else 112537+ echo "$ac_t""no" 1>&6 112538 fi 112539 112540- echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5 112541-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6 112542-if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then 112543- echo $ECHO_N "(cached) $ECHO_C" >&6 112544+ echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 112545+echo "configure:75849: checking for PQsendQueryPrepared in -lpq" >&5 112546+ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` 112547+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112548+ echo $ac_n "(cached) $ac_c" 1>&6 112549 else 112550- ac_check_lib_save_LIBS=$LIBS 112551+ ac_save_LIBS="$LIBS" 112552 LIBS="-lpq $LIBS" 112553-cat >conftest.$ac_ext <<_ACEOF 112554-/* confdefs.h. */ 112555-_ACEOF 112556-cat confdefs.h >>conftest.$ac_ext 112557-cat >>conftest.$ac_ext <<_ACEOF 112558-/* end confdefs.h. */ 112559- 112560+cat > conftest.$ac_ext <<EOF 112561+#line 75857 "configure" 112562+#include "confdefs.h" 112563 /* Override any gcc2 internal prototype to avoid an error. */ 112564-#ifdef __cplusplus 112565-extern "C" 112566-#endif 112567 /* We use char because int might match the return type of a gcc2 112568- builtin and then its argument prototype would still apply. */ 112569-char PQsendQueryPrepared (); 112570-int 112571-main () 112572-{ 112573-PQsendQueryPrepared (); 112574- ; 112575- return 0; 112576-} 112577-_ACEOF 112578-rm -f conftest.$ac_objext conftest$ac_exeext 112579-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112580- (eval $ac_link) 2>conftest.er1 112581- ac_status=$? 112582- grep -v '^ *+' conftest.er1 >conftest.err 112583- rm -f conftest.er1 112584- cat conftest.err >&5 112585- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112586- (exit $ac_status); } && 112587- { ac_try='test -z "$ac_c_werror_flag" 112588- || test ! -s conftest.err' 112589- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112590- (eval $ac_try) 2>&5 112591- ac_status=$? 112592- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112593- (exit $ac_status); }; } && 112594- { ac_try='test -s conftest$ac_exeext' 112595- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112596- (eval $ac_try) 2>&5 112597- ac_status=$? 112598- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112599- (exit $ac_status); }; }; then 112600- ac_cv_lib_pq_PQsendQueryPrepared=yes 112601-else 112602- echo "$as_me: failed program was:" >&5 112603-sed 's/^/| /' conftest.$ac_ext >&5 112604- 112605-ac_cv_lib_pq_PQsendQueryPrepared=no 112606-fi 112607-rm -f conftest.err conftest.$ac_objext \ 112608- conftest$ac_exeext conftest.$ac_ext 112609-LIBS=$ac_check_lib_save_LIBS 112610-fi 112611-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5 112612-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6 112613-if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then 112614+ builtin and then its argument prototype would still apply. */ 112615+char PQsendQueryPrepared(); 112616+ 112617+int main() { 112618+PQsendQueryPrepared() 112619+; return 0; } 112620+EOF 112621+if { (eval echo configure:75868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112622+ rm -rf conftest* 112623+ eval "ac_cv_lib_$ac_lib_var=yes" 112624+else 112625+ echo "configure: failed program was:" >&5 112626+ cat conftest.$ac_ext >&5 112627+ rm -rf conftest* 112628+ eval "ac_cv_lib_$ac_lib_var=no" 112629+fi 112630+rm -f conftest* 112631+LIBS="$ac_save_LIBS" 112632 112633-cat >>confdefs.h <<\_ACEOF 112634+fi 112635+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112636+ echo "$ac_t""yes" 1>&6 112637+ cat >> confdefs.h <<\EOF 112638 #define HAVE_PQSENDQUERYPREPARED 1 112639-_ACEOF 112640+EOF 112641 112642+else 112643+ echo "$ac_t""no" 1>&6 112644 fi 112645 112646- echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5 112647-echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6 112648-if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then 112649- echo $ECHO_N "(cached) $ECHO_C" >&6 112650+ echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 112651+echo "configure:75892: checking for PQputCopyData in -lpq" >&5 112652+ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` 112653+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112654+ echo $ac_n "(cached) $ac_c" 1>&6 112655 else 112656- ac_check_lib_save_LIBS=$LIBS 112657+ ac_save_LIBS="$LIBS" 112658 LIBS="-lpq $LIBS" 112659-cat >conftest.$ac_ext <<_ACEOF 112660-/* confdefs.h. */ 112661-_ACEOF 112662-cat confdefs.h >>conftest.$ac_ext 112663-cat >>conftest.$ac_ext <<_ACEOF 112664-/* end confdefs.h. */ 112665- 112666+cat > conftest.$ac_ext <<EOF 112667+#line 75900 "configure" 112668+#include "confdefs.h" 112669 /* Override any gcc2 internal prototype to avoid an error. */ 112670-#ifdef __cplusplus 112671-extern "C" 112672-#endif 112673 /* We use char because int might match the return type of a gcc2 112674- builtin and then its argument prototype would still apply. */ 112675-char PQputCopyData (); 112676-int 112677-main () 112678-{ 112679-PQputCopyData (); 112680- ; 112681- return 0; 112682-} 112683-_ACEOF 112684-rm -f conftest.$ac_objext conftest$ac_exeext 112685-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112686- (eval $ac_link) 2>conftest.er1 112687- ac_status=$? 112688- grep -v '^ *+' conftest.er1 >conftest.err 112689- rm -f conftest.er1 112690- cat conftest.err >&5 112691- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112692- (exit $ac_status); } && 112693- { ac_try='test -z "$ac_c_werror_flag" 112694- || test ! -s conftest.err' 112695- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112696- (eval $ac_try) 2>&5 112697- ac_status=$? 112698- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112699- (exit $ac_status); }; } && 112700- { ac_try='test -s conftest$ac_exeext' 112701- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112702- (eval $ac_try) 2>&5 112703- ac_status=$? 112704- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112705- (exit $ac_status); }; }; then 112706- ac_cv_lib_pq_PQputCopyData=yes 112707-else 112708- echo "$as_me: failed program was:" >&5 112709-sed 's/^/| /' conftest.$ac_ext >&5 112710- 112711-ac_cv_lib_pq_PQputCopyData=no 112712-fi 112713-rm -f conftest.err conftest.$ac_objext \ 112714- conftest$ac_exeext conftest.$ac_ext 112715-LIBS=$ac_check_lib_save_LIBS 112716-fi 112717-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyData" >&5 112718-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyData" >&6 112719-if test $ac_cv_lib_pq_PQputCopyData = yes; then 112720+ builtin and then its argument prototype would still apply. */ 112721+char PQputCopyData(); 112722+ 112723+int main() { 112724+PQputCopyData() 112725+; return 0; } 112726+EOF 112727+if { (eval echo configure:75911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112728+ rm -rf conftest* 112729+ eval "ac_cv_lib_$ac_lib_var=yes" 112730+else 112731+ echo "configure: failed program was:" >&5 112732+ cat conftest.$ac_ext >&5 112733+ rm -rf conftest* 112734+ eval "ac_cv_lib_$ac_lib_var=no" 112735+fi 112736+rm -f conftest* 112737+LIBS="$ac_save_LIBS" 112738 112739-cat >>confdefs.h <<\_ACEOF 112740+fi 112741+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112742+ echo "$ac_t""yes" 1>&6 112743+ cat >> confdefs.h <<\EOF 112744 #define HAVE_PQPUTCOPYDATA 1 112745-_ACEOF 112746+EOF 112747 112748+else 112749+ echo "$ac_t""no" 1>&6 112750 fi 112751 112752- echo "$as_me:$LINENO: checking for PQputCopyEnd in -lpq" >&5 112753-echo $ECHO_N "checking for PQputCopyEnd in -lpq... $ECHO_C" >&6 112754-if test "${ac_cv_lib_pq_PQputCopyEnd+set}" = set; then 112755- echo $ECHO_N "(cached) $ECHO_C" >&6 112756+ echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 112757+echo "configure:75935: checking for PQputCopyEnd in -lpq" >&5 112758+ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` 112759+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112760+ echo $ac_n "(cached) $ac_c" 1>&6 112761 else 112762- ac_check_lib_save_LIBS=$LIBS 112763+ ac_save_LIBS="$LIBS" 112764 LIBS="-lpq $LIBS" 112765-cat >conftest.$ac_ext <<_ACEOF 112766-/* confdefs.h. */ 112767-_ACEOF 112768-cat confdefs.h >>conftest.$ac_ext 112769-cat >>conftest.$ac_ext <<_ACEOF 112770-/* end confdefs.h. */ 112771- 112772+cat > conftest.$ac_ext <<EOF 112773+#line 75943 "configure" 112774+#include "confdefs.h" 112775 /* Override any gcc2 internal prototype to avoid an error. */ 112776-#ifdef __cplusplus 112777-extern "C" 112778-#endif 112779 /* We use char because int might match the return type of a gcc2 112780- builtin and then its argument prototype would still apply. */ 112781-char PQputCopyEnd (); 112782-int 112783-main () 112784-{ 112785-PQputCopyEnd (); 112786- ; 112787- return 0; 112788-} 112789-_ACEOF 112790-rm -f conftest.$ac_objext conftest$ac_exeext 112791-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112792- (eval $ac_link) 2>conftest.er1 112793- ac_status=$? 112794- grep -v '^ *+' conftest.er1 >conftest.err 112795- rm -f conftest.er1 112796- cat conftest.err >&5 112797- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112798- (exit $ac_status); } && 112799- { ac_try='test -z "$ac_c_werror_flag" 112800- || test ! -s conftest.err' 112801- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112802- (eval $ac_try) 2>&5 112803- ac_status=$? 112804- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112805- (exit $ac_status); }; } && 112806- { ac_try='test -s conftest$ac_exeext' 112807- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112808- (eval $ac_try) 2>&5 112809- ac_status=$? 112810- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112811- (exit $ac_status); }; }; then 112812- ac_cv_lib_pq_PQputCopyEnd=yes 112813-else 112814- echo "$as_me: failed program was:" >&5 112815-sed 's/^/| /' conftest.$ac_ext >&5 112816- 112817-ac_cv_lib_pq_PQputCopyEnd=no 112818-fi 112819-rm -f conftest.err conftest.$ac_objext \ 112820- conftest$ac_exeext conftest.$ac_ext 112821-LIBS=$ac_check_lib_save_LIBS 112822-fi 112823-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyEnd" >&5 112824-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyEnd" >&6 112825-if test $ac_cv_lib_pq_PQputCopyEnd = yes; then 112826+ builtin and then its argument prototype would still apply. */ 112827+char PQputCopyEnd(); 112828+ 112829+int main() { 112830+PQputCopyEnd() 112831+; return 0; } 112832+EOF 112833+if { (eval echo configure:75954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112834+ rm -rf conftest* 112835+ eval "ac_cv_lib_$ac_lib_var=yes" 112836+else 112837+ echo "configure: failed program was:" >&5 112838+ cat conftest.$ac_ext >&5 112839+ rm -rf conftest* 112840+ eval "ac_cv_lib_$ac_lib_var=no" 112841+fi 112842+rm -f conftest* 112843+LIBS="$ac_save_LIBS" 112844 112845-cat >>confdefs.h <<\_ACEOF 112846+fi 112847+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112848+ echo "$ac_t""yes" 1>&6 112849+ cat >> confdefs.h <<\EOF 112850 #define HAVE_PQPUTCOPYEND 1 112851-_ACEOF 112852+EOF 112853 112854+else 112855+ echo "$ac_t""no" 1>&6 112856 fi 112857 112858- echo "$as_me:$LINENO: checking for PQgetCopyData in -lpq" >&5 112859-echo $ECHO_N "checking for PQgetCopyData in -lpq... $ECHO_C" >&6 112860-if test "${ac_cv_lib_pq_PQgetCopyData+set}" = set; then 112861- echo $ECHO_N "(cached) $ECHO_C" >&6 112862+ echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 112863+echo "configure:75978: checking for PQgetCopyData in -lpq" >&5 112864+ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` 112865+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112866+ echo $ac_n "(cached) $ac_c" 1>&6 112867 else 112868- ac_check_lib_save_LIBS=$LIBS 112869+ ac_save_LIBS="$LIBS" 112870 LIBS="-lpq $LIBS" 112871-cat >conftest.$ac_ext <<_ACEOF 112872-/* confdefs.h. */ 112873-_ACEOF 112874-cat confdefs.h >>conftest.$ac_ext 112875-cat >>conftest.$ac_ext <<_ACEOF 112876-/* end confdefs.h. */ 112877- 112878+cat > conftest.$ac_ext <<EOF 112879+#line 75986 "configure" 112880+#include "confdefs.h" 112881 /* Override any gcc2 internal prototype to avoid an error. */ 112882-#ifdef __cplusplus 112883-extern "C" 112884-#endif 112885 /* We use char because int might match the return type of a gcc2 112886- builtin and then its argument prototype would still apply. */ 112887-char PQgetCopyData (); 112888-int 112889-main () 112890-{ 112891-PQgetCopyData (); 112892- ; 112893- return 0; 112894-} 112895-_ACEOF 112896-rm -f conftest.$ac_objext conftest$ac_exeext 112897-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 112898- (eval $ac_link) 2>conftest.er1 112899- ac_status=$? 112900- grep -v '^ *+' conftest.er1 >conftest.err 112901- rm -f conftest.er1 112902- cat conftest.err >&5 112903- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112904- (exit $ac_status); } && 112905- { ac_try='test -z "$ac_c_werror_flag" 112906- || test ! -s conftest.err' 112907- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112908- (eval $ac_try) 2>&5 112909- ac_status=$? 112910- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112911- (exit $ac_status); }; } && 112912- { ac_try='test -s conftest$ac_exeext' 112913- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 112914- (eval $ac_try) 2>&5 112915- ac_status=$? 112916- echo "$as_me:$LINENO: \$? = $ac_status" >&5 112917- (exit $ac_status); }; }; then 112918- ac_cv_lib_pq_PQgetCopyData=yes 112919-else 112920- echo "$as_me: failed program was:" >&5 112921-sed 's/^/| /' conftest.$ac_ext >&5 112922- 112923-ac_cv_lib_pq_PQgetCopyData=no 112924-fi 112925-rm -f conftest.err conftest.$ac_objext \ 112926- conftest$ac_exeext conftest.$ac_ext 112927-LIBS=$ac_check_lib_save_LIBS 112928-fi 112929-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQgetCopyData" >&5 112930-echo "${ECHO_T}$ac_cv_lib_pq_PQgetCopyData" >&6 112931-if test $ac_cv_lib_pq_PQgetCopyData = yes; then 112932+ builtin and then its argument prototype would still apply. */ 112933+char PQgetCopyData(); 112934 112935-cat >>confdefs.h <<\_ACEOF 112936+int main() { 112937+PQgetCopyData() 112938+; return 0; } 112939+EOF 112940+if { (eval echo configure:75997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 112941+ rm -rf conftest* 112942+ eval "ac_cv_lib_$ac_lib_var=yes" 112943+else 112944+ echo "configure: failed program was:" >&5 112945+ cat conftest.$ac_ext >&5 112946+ rm -rf conftest* 112947+ eval "ac_cv_lib_$ac_lib_var=no" 112948+fi 112949+rm -f conftest* 112950+LIBS="$ac_save_LIBS" 112951+ 112952+fi 112953+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 112954+ echo "$ac_t""yes" 1>&6 112955+ cat >> confdefs.h <<\EOF 112956 #define HAVE_PQGETCOPYDATA 1 112957-_ACEOF 112958+EOF 112959 112960+else 112961+ echo "$ac_t""no" 1>&6 112962 fi 112963 112964- echo "$as_me:$LINENO: checking for PQfreemem in -lpq" >&5 112965-echo $ECHO_N "checking for PQfreemem in -lpq... $ECHO_C" >&6 112966-if test "${ac_cv_lib_pq_PQfreemem+set}" = set; then 112967- echo $ECHO_N "(cached) $ECHO_C" >&6 112968+ echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 112969+echo "configure:76021: checking for PQfreemem in -lpq" >&5 112970+ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` 112971+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 112972+ echo $ac_n "(cached) $ac_c" 1>&6 112973 else 112974- ac_check_lib_save_LIBS=$LIBS 112975+ ac_save_LIBS="$LIBS" 112976 LIBS="-lpq $LIBS" 112977-cat >conftest.$ac_ext <<_ACEOF 112978-/* confdefs.h. */ 112979-_ACEOF 112980-cat confdefs.h >>conftest.$ac_ext 112981-cat >>conftest.$ac_ext <<_ACEOF 112982-/* end confdefs.h. */ 112983- 112984+cat > conftest.$ac_ext <<EOF 112985+#line 76029 "configure" 112986+#include "confdefs.h" 112987 /* Override any gcc2 internal prototype to avoid an error. */ 112988-#ifdef __cplusplus 112989-extern "C" 112990-#endif 112991 /* We use char because int might match the return type of a gcc2 112992- builtin and then its argument prototype would still apply. */ 112993-char PQfreemem (); 112994-int 112995-main () 112996-{ 112997-PQfreemem (); 112998- ; 112999- return 0; 113000-} 113001-_ACEOF 113002-rm -f conftest.$ac_objext conftest$ac_exeext 113003-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113004- (eval $ac_link) 2>conftest.er1 113005- ac_status=$? 113006- grep -v '^ *+' conftest.er1 >conftest.err 113007- rm -f conftest.er1 113008- cat conftest.err >&5 113009- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113010- (exit $ac_status); } && 113011- { ac_try='test -z "$ac_c_werror_flag" 113012- || test ! -s conftest.err' 113013- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113014- (eval $ac_try) 2>&5 113015- ac_status=$? 113016- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113017- (exit $ac_status); }; } && 113018- { ac_try='test -s conftest$ac_exeext' 113019- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113020- (eval $ac_try) 2>&5 113021- ac_status=$? 113022- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113023- (exit $ac_status); }; }; then 113024- ac_cv_lib_pq_PQfreemem=yes 113025-else 113026- echo "$as_me: failed program was:" >&5 113027-sed 's/^/| /' conftest.$ac_ext >&5 113028- 113029-ac_cv_lib_pq_PQfreemem=no 113030-fi 113031-rm -f conftest.err conftest.$ac_objext \ 113032- conftest$ac_exeext conftest.$ac_ext 113033-LIBS=$ac_check_lib_save_LIBS 113034-fi 113035-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQfreemem" >&5 113036-echo "${ECHO_T}$ac_cv_lib_pq_PQfreemem" >&6 113037-if test $ac_cv_lib_pq_PQfreemem = yes; then 113038+ builtin and then its argument prototype would still apply. */ 113039+char PQfreemem(); 113040+ 113041+int main() { 113042+PQfreemem() 113043+; return 0; } 113044+EOF 113045+if { (eval echo configure:76040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113046+ rm -rf conftest* 113047+ eval "ac_cv_lib_$ac_lib_var=yes" 113048+else 113049+ echo "configure: failed program was:" >&5 113050+ cat conftest.$ac_ext >&5 113051+ rm -rf conftest* 113052+ eval "ac_cv_lib_$ac_lib_var=no" 113053+fi 113054+rm -f conftest* 113055+LIBS="$ac_save_LIBS" 113056 113057-cat >>confdefs.h <<\_ACEOF 113058+fi 113059+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113060+ echo "$ac_t""yes" 1>&6 113061+ cat >> confdefs.h <<\EOF 113062 #define HAVE_PQFREEMEM 1 113063-_ACEOF 113064+EOF 113065 113066+else 113067+ echo "$ac_t""no" 1>&6 113068 fi 113069 113070- echo "$as_me:$LINENO: checking for PQsetErrorVerbosity in -lpq" >&5 113071-echo $ECHO_N "checking for PQsetErrorVerbosity in -lpq... $ECHO_C" >&6 113072-if test "${ac_cv_lib_pq_PQsetErrorVerbosity+set}" = set; then 113073- echo $ECHO_N "(cached) $ECHO_C" >&6 113074+ echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 113075+echo "configure:76064: checking for PQsetErrorVerbosity in -lpq" >&5 113076+ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` 113077+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113078+ echo $ac_n "(cached) $ac_c" 1>&6 113079 else 113080- ac_check_lib_save_LIBS=$LIBS 113081+ ac_save_LIBS="$LIBS" 113082 LIBS="-lpq $LIBS" 113083-cat >conftest.$ac_ext <<_ACEOF 113084-/* confdefs.h. */ 113085-_ACEOF 113086-cat confdefs.h >>conftest.$ac_ext 113087-cat >>conftest.$ac_ext <<_ACEOF 113088-/* end confdefs.h. */ 113089- 113090+cat > conftest.$ac_ext <<EOF 113091+#line 76072 "configure" 113092+#include "confdefs.h" 113093 /* Override any gcc2 internal prototype to avoid an error. */ 113094-#ifdef __cplusplus 113095-extern "C" 113096-#endif 113097 /* We use char because int might match the return type of a gcc2 113098- builtin and then its argument prototype would still apply. */ 113099-char PQsetErrorVerbosity (); 113100-int 113101-main () 113102-{ 113103-PQsetErrorVerbosity (); 113104- ; 113105- return 0; 113106-} 113107-_ACEOF 113108-rm -f conftest.$ac_objext conftest$ac_exeext 113109-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113110- (eval $ac_link) 2>conftest.er1 113111- ac_status=$? 113112- grep -v '^ *+' conftest.er1 >conftest.err 113113- rm -f conftest.er1 113114- cat conftest.err >&5 113115- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113116- (exit $ac_status); } && 113117- { ac_try='test -z "$ac_c_werror_flag" 113118- || test ! -s conftest.err' 113119- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113120- (eval $ac_try) 2>&5 113121- ac_status=$? 113122- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113123- (exit $ac_status); }; } && 113124- { ac_try='test -s conftest$ac_exeext' 113125- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113126- (eval $ac_try) 2>&5 113127- ac_status=$? 113128- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113129- (exit $ac_status); }; }; then 113130- ac_cv_lib_pq_PQsetErrorVerbosity=yes 113131-else 113132- echo "$as_me: failed program was:" >&5 113133-sed 's/^/| /' conftest.$ac_ext >&5 113134- 113135-ac_cv_lib_pq_PQsetErrorVerbosity=no 113136-fi 113137-rm -f conftest.err conftest.$ac_objext \ 113138- conftest$ac_exeext conftest.$ac_ext 113139-LIBS=$ac_check_lib_save_LIBS 113140-fi 113141-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetErrorVerbosity" >&5 113142-echo "${ECHO_T}$ac_cv_lib_pq_PQsetErrorVerbosity" >&6 113143-if test $ac_cv_lib_pq_PQsetErrorVerbosity = yes; then 113144+ builtin and then its argument prototype would still apply. */ 113145+char PQsetErrorVerbosity(); 113146+ 113147+int main() { 113148+PQsetErrorVerbosity() 113149+; return 0; } 113150+EOF 113151+if { (eval echo configure:76083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113152+ rm -rf conftest* 113153+ eval "ac_cv_lib_$ac_lib_var=yes" 113154+else 113155+ echo "configure: failed program was:" >&5 113156+ cat conftest.$ac_ext >&5 113157+ rm -rf conftest* 113158+ eval "ac_cv_lib_$ac_lib_var=no" 113159+fi 113160+rm -f conftest* 113161+LIBS="$ac_save_LIBS" 113162 113163-cat >>confdefs.h <<\_ACEOF 113164+fi 113165+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113166+ echo "$ac_t""yes" 1>&6 113167+ cat >> confdefs.h <<\EOF 113168 #define HAVE_PQSETERRORVERBOSITY 1 113169-_ACEOF 113170+EOF 113171 113172+else 113173+ echo "$ac_t""no" 1>&6 113174 fi 113175 113176- echo "$as_me:$LINENO: checking for PQftable in -lpq" >&5 113177-echo $ECHO_N "checking for PQftable in -lpq... $ECHO_C" >&6 113178-if test "${ac_cv_lib_pq_PQftable+set}" = set; then 113179- echo $ECHO_N "(cached) $ECHO_C" >&6 113180+ echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 113181+echo "configure:76107: checking for PQftable in -lpq" >&5 113182+ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` 113183+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113184+ echo $ac_n "(cached) $ac_c" 1>&6 113185 else 113186- ac_check_lib_save_LIBS=$LIBS 113187+ ac_save_LIBS="$LIBS" 113188 LIBS="-lpq $LIBS" 113189-cat >conftest.$ac_ext <<_ACEOF 113190-/* confdefs.h. */ 113191-_ACEOF 113192-cat confdefs.h >>conftest.$ac_ext 113193-cat >>conftest.$ac_ext <<_ACEOF 113194-/* end confdefs.h. */ 113195- 113196+cat > conftest.$ac_ext <<EOF 113197+#line 76115 "configure" 113198+#include "confdefs.h" 113199 /* Override any gcc2 internal prototype to avoid an error. */ 113200-#ifdef __cplusplus 113201-extern "C" 113202-#endif 113203 /* We use char because int might match the return type of a gcc2 113204- builtin and then its argument prototype would still apply. */ 113205-char PQftable (); 113206-int 113207-main () 113208-{ 113209-PQftable (); 113210- ; 113211- return 0; 113212-} 113213-_ACEOF 113214-rm -f conftest.$ac_objext conftest$ac_exeext 113215-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113216- (eval $ac_link) 2>conftest.er1 113217- ac_status=$? 113218- grep -v '^ *+' conftest.er1 >conftest.err 113219- rm -f conftest.er1 113220- cat conftest.err >&5 113221- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113222- (exit $ac_status); } && 113223- { ac_try='test -z "$ac_c_werror_flag" 113224- || test ! -s conftest.err' 113225- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113226- (eval $ac_try) 2>&5 113227- ac_status=$? 113228- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113229- (exit $ac_status); }; } && 113230- { ac_try='test -s conftest$ac_exeext' 113231- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113232- (eval $ac_try) 2>&5 113233- ac_status=$? 113234- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113235- (exit $ac_status); }; }; then 113236- ac_cv_lib_pq_PQftable=yes 113237-else 113238- echo "$as_me: failed program was:" >&5 113239-sed 's/^/| /' conftest.$ac_ext >&5 113240- 113241-ac_cv_lib_pq_PQftable=no 113242-fi 113243-rm -f conftest.err conftest.$ac_objext \ 113244- conftest$ac_exeext conftest.$ac_ext 113245-LIBS=$ac_check_lib_save_LIBS 113246-fi 113247-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQftable" >&5 113248-echo "${ECHO_T}$ac_cv_lib_pq_PQftable" >&6 113249-if test $ac_cv_lib_pq_PQftable = yes; then 113250+ builtin and then its argument prototype would still apply. */ 113251+char PQftable(); 113252+ 113253+int main() { 113254+PQftable() 113255+; return 0; } 113256+EOF 113257+if { (eval echo configure:76126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113258+ rm -rf conftest* 113259+ eval "ac_cv_lib_$ac_lib_var=yes" 113260+else 113261+ echo "configure: failed program was:" >&5 113262+ cat conftest.$ac_ext >&5 113263+ rm -rf conftest* 113264+ eval "ac_cv_lib_$ac_lib_var=no" 113265+fi 113266+rm -f conftest* 113267+LIBS="$ac_save_LIBS" 113268 113269-cat >>confdefs.h <<\_ACEOF 113270+fi 113271+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113272+ echo "$ac_t""yes" 1>&6 113273+ cat >> confdefs.h <<\EOF 113274 #define HAVE_PQFTABLE 1 113275-_ACEOF 113276+EOF 113277 113278+else 113279+ echo "$ac_t""no" 1>&6 113280 fi 113281 113282- echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5 113283-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6 113284-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then 113285- echo $ECHO_N "(cached) $ECHO_C" >&6 113286+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 113287+echo "configure:76150: checking for PQescapeStringConn in -lpq" >&5 113288+ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` 113289+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113290+ echo $ac_n "(cached) $ac_c" 1>&6 113291 else 113292- ac_check_lib_save_LIBS=$LIBS 113293+ ac_save_LIBS="$LIBS" 113294 LIBS="-lpq $LIBS" 113295-cat >conftest.$ac_ext <<_ACEOF 113296-/* confdefs.h. */ 113297-_ACEOF 113298-cat confdefs.h >>conftest.$ac_ext 113299-cat >>conftest.$ac_ext <<_ACEOF 113300-/* end confdefs.h. */ 113301- 113302+cat > conftest.$ac_ext <<EOF 113303+#line 76158 "configure" 113304+#include "confdefs.h" 113305 /* Override any gcc2 internal prototype to avoid an error. */ 113306-#ifdef __cplusplus 113307-extern "C" 113308-#endif 113309 /* We use char because int might match the return type of a gcc2 113310- builtin and then its argument prototype would still apply. */ 113311-char PQescapeStringConn (); 113312-int 113313-main () 113314-{ 113315-PQescapeStringConn (); 113316- ; 113317- return 0; 113318-} 113319-_ACEOF 113320-rm -f conftest.$ac_objext conftest$ac_exeext 113321-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113322- (eval $ac_link) 2>conftest.er1 113323- ac_status=$? 113324- grep -v '^ *+' conftest.er1 >conftest.err 113325- rm -f conftest.er1 113326- cat conftest.err >&5 113327- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113328- (exit $ac_status); } && 113329- { ac_try='test -z "$ac_c_werror_flag" 113330- || test ! -s conftest.err' 113331- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113332- (eval $ac_try) 2>&5 113333- ac_status=$? 113334- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113335- (exit $ac_status); }; } && 113336- { ac_try='test -s conftest$ac_exeext' 113337- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113338- (eval $ac_try) 2>&5 113339- ac_status=$? 113340- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113341- (exit $ac_status); }; }; then 113342- ac_cv_lib_pq_PQescapeStringConn=yes 113343-else 113344- echo "$as_me: failed program was:" >&5 113345-sed 's/^/| /' conftest.$ac_ext >&5 113346- 113347-ac_cv_lib_pq_PQescapeStringConn=no 113348-fi 113349-rm -f conftest.err conftest.$ac_objext \ 113350- conftest$ac_exeext conftest.$ac_ext 113351-LIBS=$ac_check_lib_save_LIBS 113352-fi 113353-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5 113354-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6 113355-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then 113356+ builtin and then its argument prototype would still apply. */ 113357+char PQescapeStringConn(); 113358+ 113359+int main() { 113360+PQescapeStringConn() 113361+; return 0; } 113362+EOF 113363+if { (eval echo configure:76169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113364+ rm -rf conftest* 113365+ eval "ac_cv_lib_$ac_lib_var=yes" 113366+else 113367+ echo "configure: failed program was:" >&5 113368+ cat conftest.$ac_ext >&5 113369+ rm -rf conftest* 113370+ eval "ac_cv_lib_$ac_lib_var=no" 113371+fi 113372+rm -f conftest* 113373+LIBS="$ac_save_LIBS" 113374 113375-cat >>confdefs.h <<\_ACEOF 113376+fi 113377+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113378+ echo "$ac_t""yes" 1>&6 113379+ cat >> confdefs.h <<\EOF 113380 #define HAVE_PQESCAPE_CONN 1 113381-_ACEOF 113382+EOF 113383 113384+else 113385+ echo "$ac_t""no" 1>&6 113386 fi 113387 113388- echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5 113389-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6 113390-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then 113391- echo $ECHO_N "(cached) $ECHO_C" >&6 113392+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 113393+echo "configure:76193: checking for PQescapeByteaConn in -lpq" >&5 113394+ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` 113395+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113396+ echo $ac_n "(cached) $ac_c" 1>&6 113397 else 113398- ac_check_lib_save_LIBS=$LIBS 113399+ ac_save_LIBS="$LIBS" 113400 LIBS="-lpq $LIBS" 113401-cat >conftest.$ac_ext <<_ACEOF 113402-/* confdefs.h. */ 113403-_ACEOF 113404-cat confdefs.h >>conftest.$ac_ext 113405-cat >>conftest.$ac_ext <<_ACEOF 113406-/* end confdefs.h. */ 113407- 113408+cat > conftest.$ac_ext <<EOF 113409+#line 76201 "configure" 113410+#include "confdefs.h" 113411 /* Override any gcc2 internal prototype to avoid an error. */ 113412-#ifdef __cplusplus 113413-extern "C" 113414-#endif 113415 /* We use char because int might match the return type of a gcc2 113416- builtin and then its argument prototype would still apply. */ 113417-char PQescapeByteaConn (); 113418-int 113419-main () 113420-{ 113421-PQescapeByteaConn (); 113422- ; 113423- return 0; 113424-} 113425-_ACEOF 113426-rm -f conftest.$ac_objext conftest$ac_exeext 113427-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113428- (eval $ac_link) 2>conftest.er1 113429- ac_status=$? 113430- grep -v '^ *+' conftest.er1 >conftest.err 113431- rm -f conftest.er1 113432- cat conftest.err >&5 113433- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113434- (exit $ac_status); } && 113435- { ac_try='test -z "$ac_c_werror_flag" 113436- || test ! -s conftest.err' 113437- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113438- (eval $ac_try) 2>&5 113439- ac_status=$? 113440- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113441- (exit $ac_status); }; } && 113442- { ac_try='test -s conftest$ac_exeext' 113443- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113444- (eval $ac_try) 2>&5 113445- ac_status=$? 113446- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113447- (exit $ac_status); }; }; then 113448- ac_cv_lib_pq_PQescapeByteaConn=yes 113449-else 113450- echo "$as_me: failed program was:" >&5 113451-sed 's/^/| /' conftest.$ac_ext >&5 113452- 113453-ac_cv_lib_pq_PQescapeByteaConn=no 113454-fi 113455-rm -f conftest.err conftest.$ac_objext \ 113456- conftest$ac_exeext conftest.$ac_ext 113457-LIBS=$ac_check_lib_save_LIBS 113458-fi 113459-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5 113460-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6 113461-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then 113462+ builtin and then its argument prototype would still apply. */ 113463+char PQescapeByteaConn(); 113464+ 113465+int main() { 113466+PQescapeByteaConn() 113467+; return 0; } 113468+EOF 113469+if { (eval echo configure:76212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113470+ rm -rf conftest* 113471+ eval "ac_cv_lib_$ac_lib_var=yes" 113472+else 113473+ echo "configure: failed program was:" >&5 113474+ cat conftest.$ac_ext >&5 113475+ rm -rf conftest* 113476+ eval "ac_cv_lib_$ac_lib_var=no" 113477+fi 113478+rm -f conftest* 113479+LIBS="$ac_save_LIBS" 113480 113481-cat >>confdefs.h <<\_ACEOF 113482+fi 113483+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113484+ echo "$ac_t""yes" 1>&6 113485+ cat >> confdefs.h <<\EOF 113486 #define HAVE_PQESCAPE_BYTEA_CONN 1 113487-_ACEOF 113488+EOF 113489 113490+else 113491+ echo "$ac_t""no" 1>&6 113492 fi 113493 113494- echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5 113495-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6 113496-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then 113497- echo $ECHO_N "(cached) $ECHO_C" >&6 113498+ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 113499+echo "configure:76236: checking for pg_encoding_to_char in -lpq" >&5 113500+ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` 113501+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113502+ echo $ac_n "(cached) $ac_c" 1>&6 113503 else 113504- ac_check_lib_save_LIBS=$LIBS 113505+ ac_save_LIBS="$LIBS" 113506 LIBS="-lpq $LIBS" 113507-cat >conftest.$ac_ext <<_ACEOF 113508-/* confdefs.h. */ 113509-_ACEOF 113510-cat confdefs.h >>conftest.$ac_ext 113511-cat >>conftest.$ac_ext <<_ACEOF 113512-/* end confdefs.h. */ 113513- 113514+cat > conftest.$ac_ext <<EOF 113515+#line 76244 "configure" 113516+#include "confdefs.h" 113517 /* Override any gcc2 internal prototype to avoid an error. */ 113518-#ifdef __cplusplus 113519-extern "C" 113520-#endif 113521 /* We use char because int might match the return type of a gcc2 113522- builtin and then its argument prototype would still apply. */ 113523-char pg_encoding_to_char (); 113524-int 113525-main () 113526-{ 113527-pg_encoding_to_char (); 113528- ; 113529- return 0; 113530-} 113531-_ACEOF 113532-rm -f conftest.$ac_objext conftest$ac_exeext 113533-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113534- (eval $ac_link) 2>conftest.er1 113535- ac_status=$? 113536- grep -v '^ *+' conftest.er1 >conftest.err 113537- rm -f conftest.er1 113538- cat conftest.err >&5 113539- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113540- (exit $ac_status); } && 113541- { ac_try='test -z "$ac_c_werror_flag" 113542- || test ! -s conftest.err' 113543- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113544- (eval $ac_try) 2>&5 113545- ac_status=$? 113546- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113547- (exit $ac_status); }; } && 113548- { ac_try='test -s conftest$ac_exeext' 113549- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113550- (eval $ac_try) 2>&5 113551- ac_status=$? 113552- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113553- (exit $ac_status); }; }; then 113554- ac_cv_lib_pq_pg_encoding_to_char=yes 113555-else 113556- echo "$as_me: failed program was:" >&5 113557-sed 's/^/| /' conftest.$ac_ext >&5 113558- 113559-ac_cv_lib_pq_pg_encoding_to_char=no 113560-fi 113561-rm -f conftest.err conftest.$ac_objext \ 113562- conftest$ac_exeext conftest.$ac_ext 113563-LIBS=$ac_check_lib_save_LIBS 113564-fi 113565-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5 113566-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6 113567-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then 113568+ builtin and then its argument prototype would still apply. */ 113569+char pg_encoding_to_char(); 113570+ 113571+int main() { 113572+pg_encoding_to_char() 113573+; return 0; } 113574+EOF 113575+if { (eval echo configure:76255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113576+ rm -rf conftest* 113577+ eval "ac_cv_lib_$ac_lib_var=yes" 113578+else 113579+ echo "configure: failed program was:" >&5 113580+ cat conftest.$ac_ext >&5 113581+ rm -rf conftest* 113582+ eval "ac_cv_lib_$ac_lib_var=no" 113583+fi 113584+rm -f conftest* 113585+LIBS="$ac_save_LIBS" 113586 113587-cat >>confdefs.h <<\_ACEOF 113588+fi 113589+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113590+ echo "$ac_t""yes" 1>&6 113591+ cat >> confdefs.h <<\EOF 113592 #define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 113593-_ACEOF 113594+EOF 113595 113596+else 113597+ echo "$ac_t""no" 1>&6 113598 fi 113599 113600- echo "$as_me:$LINENO: checking for lo_create in -lpq" >&5 113601-echo $ECHO_N "checking for lo_create in -lpq... $ECHO_C" >&6 113602-if test "${ac_cv_lib_pq_lo_create+set}" = set; then 113603- echo $ECHO_N "(cached) $ECHO_C" >&6 113604+ echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 113605+echo "configure:76279: checking for lo_create in -lpq" >&5 113606+ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` 113607+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113608+ echo $ac_n "(cached) $ac_c" 1>&6 113609 else 113610- ac_check_lib_save_LIBS=$LIBS 113611+ ac_save_LIBS="$LIBS" 113612 LIBS="-lpq $LIBS" 113613-cat >conftest.$ac_ext <<_ACEOF 113614-/* confdefs.h. */ 113615-_ACEOF 113616-cat confdefs.h >>conftest.$ac_ext 113617-cat >>conftest.$ac_ext <<_ACEOF 113618-/* end confdefs.h. */ 113619- 113620+cat > conftest.$ac_ext <<EOF 113621+#line 76287 "configure" 113622+#include "confdefs.h" 113623 /* Override any gcc2 internal prototype to avoid an error. */ 113624-#ifdef __cplusplus 113625-extern "C" 113626-#endif 113627 /* We use char because int might match the return type of a gcc2 113628- builtin and then its argument prototype would still apply. */ 113629-char lo_create (); 113630-int 113631-main () 113632-{ 113633-lo_create (); 113634- ; 113635- return 0; 113636-} 113637-_ACEOF 113638-rm -f conftest.$ac_objext conftest$ac_exeext 113639-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113640- (eval $ac_link) 2>conftest.er1 113641- ac_status=$? 113642- grep -v '^ *+' conftest.er1 >conftest.err 113643- rm -f conftest.er1 113644- cat conftest.err >&5 113645- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113646- (exit $ac_status); } && 113647- { ac_try='test -z "$ac_c_werror_flag" 113648- || test ! -s conftest.err' 113649- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113650- (eval $ac_try) 2>&5 113651- ac_status=$? 113652- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113653- (exit $ac_status); }; } && 113654- { ac_try='test -s conftest$ac_exeext' 113655- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113656- (eval $ac_try) 2>&5 113657- ac_status=$? 113658- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113659- (exit $ac_status); }; }; then 113660- ac_cv_lib_pq_lo_create=yes 113661-else 113662- echo "$as_me: failed program was:" >&5 113663-sed 's/^/| /' conftest.$ac_ext >&5 113664- 113665-ac_cv_lib_pq_lo_create=no 113666-fi 113667-rm -f conftest.err conftest.$ac_objext \ 113668- conftest$ac_exeext conftest.$ac_ext 113669-LIBS=$ac_check_lib_save_LIBS 113670-fi 113671-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_create" >&5 113672-echo "${ECHO_T}$ac_cv_lib_pq_lo_create" >&6 113673-if test $ac_cv_lib_pq_lo_create = yes; then 113674+ builtin and then its argument prototype would still apply. */ 113675+char lo_create(); 113676+ 113677+int main() { 113678+lo_create() 113679+; return 0; } 113680+EOF 113681+if { (eval echo configure:76298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113682+ rm -rf conftest* 113683+ eval "ac_cv_lib_$ac_lib_var=yes" 113684+else 113685+ echo "configure: failed program was:" >&5 113686+ cat conftest.$ac_ext >&5 113687+ rm -rf conftest* 113688+ eval "ac_cv_lib_$ac_lib_var=no" 113689+fi 113690+rm -f conftest* 113691+LIBS="$ac_save_LIBS" 113692 113693-cat >>confdefs.h <<\_ACEOF 113694+fi 113695+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113696+ echo "$ac_t""yes" 1>&6 113697+ cat >> confdefs.h <<\EOF 113698 #define HAVE_PG_LO_CREATE 1 113699-_ACEOF 113700+EOF 113701 113702+else 113703+ echo "$ac_t""no" 1>&6 113704 fi 113705 113706- echo "$as_me:$LINENO: checking for lo_import_with_oid in -lpq" >&5 113707-echo $ECHO_N "checking for lo_import_with_oid in -lpq... $ECHO_C" >&6 113708-if test "${ac_cv_lib_pq_lo_import_with_oid+set}" = set; then 113709- echo $ECHO_N "(cached) $ECHO_C" >&6 113710+ echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 113711+echo "configure:76322: checking for lo_import_with_oid in -lpq" >&5 113712+ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` 113713+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 113714+ echo $ac_n "(cached) $ac_c" 1>&6 113715 else 113716- ac_check_lib_save_LIBS=$LIBS 113717+ ac_save_LIBS="$LIBS" 113718 LIBS="-lpq $LIBS" 113719-cat >conftest.$ac_ext <<_ACEOF 113720-/* confdefs.h. */ 113721-_ACEOF 113722-cat confdefs.h >>conftest.$ac_ext 113723-cat >>conftest.$ac_ext <<_ACEOF 113724-/* end confdefs.h. */ 113725- 113726+cat > conftest.$ac_ext <<EOF 113727+#line 76330 "configure" 113728+#include "confdefs.h" 113729 /* Override any gcc2 internal prototype to avoid an error. */ 113730-#ifdef __cplusplus 113731-extern "C" 113732-#endif 113733 /* We use char because int might match the return type of a gcc2 113734- builtin and then its argument prototype would still apply. */ 113735-char lo_import_with_oid (); 113736-int 113737-main () 113738-{ 113739-lo_import_with_oid (); 113740- ; 113741- return 0; 113742-} 113743-_ACEOF 113744-rm -f conftest.$ac_objext conftest$ac_exeext 113745-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 113746- (eval $ac_link) 2>conftest.er1 113747- ac_status=$? 113748- grep -v '^ *+' conftest.er1 >conftest.err 113749- rm -f conftest.er1 113750- cat conftest.err >&5 113751- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113752- (exit $ac_status); } && 113753- { ac_try='test -z "$ac_c_werror_flag" 113754- || test ! -s conftest.err' 113755- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113756- (eval $ac_try) 2>&5 113757- ac_status=$? 113758- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113759- (exit $ac_status); }; } && 113760- { ac_try='test -s conftest$ac_exeext' 113761- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 113762- (eval $ac_try) 2>&5 113763- ac_status=$? 113764- echo "$as_me:$LINENO: \$? = $ac_status" >&5 113765- (exit $ac_status); }; }; then 113766- ac_cv_lib_pq_lo_import_with_oid=yes 113767-else 113768- echo "$as_me: failed program was:" >&5 113769-sed 's/^/| /' conftest.$ac_ext >&5 113770- 113771-ac_cv_lib_pq_lo_import_with_oid=no 113772-fi 113773-rm -f conftest.err conftest.$ac_objext \ 113774- conftest$ac_exeext conftest.$ac_ext 113775-LIBS=$ac_check_lib_save_LIBS 113776-fi 113777-echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_import_with_oid" >&5 113778-echo "${ECHO_T}$ac_cv_lib_pq_lo_import_with_oid" >&6 113779-if test $ac_cv_lib_pq_lo_import_with_oid = yes; then 113780+ builtin and then its argument prototype would still apply. */ 113781+char lo_import_with_oid(); 113782 113783-cat >>confdefs.h <<\_ACEOF 113784+int main() { 113785+lo_import_with_oid() 113786+; return 0; } 113787+EOF 113788+if { (eval echo configure:76341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 113789+ rm -rf conftest* 113790+ eval "ac_cv_lib_$ac_lib_var=yes" 113791+else 113792+ echo "configure: failed program was:" >&5 113793+ cat conftest.$ac_ext >&5 113794+ rm -rf conftest* 113795+ eval "ac_cv_lib_$ac_lib_var=no" 113796+fi 113797+rm -f conftest* 113798+LIBS="$ac_save_LIBS" 113799+ 113800+fi 113801+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 113802+ echo "$ac_t""yes" 1>&6 113803+ cat >> confdefs.h <<\EOF 113804 #define HAVE_PG_LO_IMPORT_WITH_OID 1 113805-_ACEOF 113806+EOF 113807 113808+else 113809+ echo "$ac_t""no" 1>&6 113810 fi 113811 113812 LIBS=$old_LIBS 113813 LDFLAGS=$old_LDFLAGS 113814 113815- 113816+ 113817 113818 if test "$ext_shared" = "yes"; then 113819 PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" 113820 if test -n "$PGSQL_LIBDIR"; then 113821- 113822+ 113823 if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then 113824- 113825+ 113826 if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then 113827 ai_p=$PGSQL_LIBDIR 113828 else 113829- 113830+ 113831 ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 113832- 113833+ 113834 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 113835 ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" 113836 fi 113837 113838- 113839+ 113840 if test "$ext_shared" = "yes"; then 113841 PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" 113842 test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD" 113843 else 113844- 113845- 113846- 113847+ 113848+ 113849+ 113850 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 113851- 113852+ 113853 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 113854 if test -n "$unique" && test "`eval $cmd`" = "" ; then 113855 eval "LIBPATH$unique=set" 113856- 113857+ 113858 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 113859 LDFLAGS="$LDFLAGS -L$ai_p" 113860 PHP_RPATHS="$PHP_RPATHS $ai_p" 113861- 113862+ 113863 fi 113864 113865 113866 fi 113867- 113868+ 113869 fi 113870 113871 fi 113872 else 113873- 113874+ 113875 113876 if test -n "$PGSQL_LIBDIR"; then 113877- 113878+ 113879 if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then 113880- 113881+ 113882 if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then 113883 ai_p=$PGSQL_LIBDIR 113884 else 113885- 113886+ 113887 ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 113888- 113889+ 113890 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 113891 ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" 113892 fi 113893 113894- 113895- 113896- 113897- 113898+ 113899+ 113900+ 113901+ 113902 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 113903- 113904+ 113905 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 113906 if test -n "$unique" && test "`eval $cmd`" = "" ; then 113907 eval "LIBPATH$unique=set" 113908- 113909+ 113910 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 113911 LDFLAGS="$LDFLAGS -L$ai_p" 113912 PHP_RPATHS="$PHP_RPATHS $ai_p" 113913- 113914+ 113915 fi 113916 113917 113918- 113919+ 113920 fi 113921 113922 fi 113923- 113924- 113925+ 113926+ 113927 case pq in 113928 c|c_r|pthread*) ;; 113929- *) 113930- LIBS="-lpq $LIBS" 113931+ *) 113932+ LIBS="-lpq $LIBS" 113933 ;; 113934 esac 113935 113936@@ -98786,43 +76460,43 @@ 113937 fi 113938 113939 113940- 113941+ 113942 PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" 113943 113944 113945- 113946+ 113947 if test "$PGSQL_INCLUDE" != "/usr/include"; then 113948- 113949+ 113950 if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then 113951 ai_p=$PGSQL_INCLUDE 113952 else 113953- 113954+ 113955 ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" 113956- 113957+ 113958 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 113959 ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" 113960 fi 113961 113962- 113963- 113964+ 113965+ 113966 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 113967- 113968+ 113969 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 113970 if test -n "$unique" && test "`eval $cmd`" = "" ; then 113971 eval "INCLUDEPATH$unique=set" 113972- 113973+ 113974 if test ""; then 113975 INCLUDES="-I$ai_p $INCLUDES" 113976 else 113977 INCLUDES="$INCLUDES -I$ai_p" 113978 fi 113979- 113980+ 113981 fi 113982 113983 fi 113984 113985 113986- 113987+ 113988 ext_builddir=ext/pgsql 113989 ext_srcdir=$abs_srcdir/ext/pgsql 113990 113991@@ -98830,15 +76504,15 @@ 113992 113993 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 113994 PHP_PGSQL_SHARED=no 113995- 113996- 113997+ 113998+ 113999 case ext/pgsql in 114000 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114001 /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114002 *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114003 esac 114004- 114005- 114006+ 114007+ 114008 114009 b_c_pre=$php_c_pre 114010 b_cxx_pre=$php_cxx_pre 114011@@ -98851,12 +76525,12 @@ 114012 114013 old_IFS=$IFS 114014 for ac_src in pgsql.c; do 114015- 114016+ 114017 IFS=. 114018 set $ac_src 114019 ac_obj=$1 114020 IFS=$old_IFS 114021- 114022+ 114023 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114024 114025 case $ac_src in 114026@@ -98880,14 +76554,14 @@ 114027 else 114028 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 114029 PHP_PGSQL_SHARED=yes 114030- 114031+ 114032 case ext/pgsql in 114033 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114034 /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114035 *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114036 esac 114037- 114038- 114039+ 114040+ 114041 114042 b_c_pre=$shared_c_pre 114043 b_cxx_pre=$shared_cxx_pre 114044@@ -98900,12 +76574,12 @@ 114045 114046 old_IFS=$IFS 114047 for ac_src in pgsql.c; do 114048- 114049+ 114050 IFS=. 114051 set $ac_src 114052 ac_obj=$1 114053 IFS=$old_IFS 114054- 114055+ 114056 shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo" 114057 114058 case $ac_src in 114059@@ -98923,7 +76597,7 @@ 114060 114061 case $host_alias in 114062 *netware*) 114063- 114064+ 114065 install_modules="install-modules" 114066 114067 case $host_alias in 114068@@ -98933,7 +76607,7 @@ 114069 ;; 114070 *netware*) 114071 suffix=nlm 114072- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(PGSQL_SHARED_LIBADD)' 114073+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)' 114074 ;; 114075 *) 114076 suffix=la 114077@@ -98946,7 +76620,7 @@ 114078 else 114079 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix" 114080 fi 114081- 114082+ 114083 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql" 114084 114085 cat >>Makefile.objects<<EOF 114086@@ -98960,7 +76634,7 @@ 114087 114088 ;; 114089 *) 114090- 114091+ 114092 install_modules="install-modules" 114093 114094 case $host_alias in 114095@@ -98970,7 +76644,7 @@ 114096 ;; 114097 *netware*) 114098 suffix=nlm 114099- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(QL_SHARED_LIBADD)' 114100+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PGSQL, 3)_SHARED_LIBADD)' 114101 ;; 114102 *) 114103 suffix=la 114104@@ -98983,7 +76657,7 @@ 114105 else 114106 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix" 114107 fi 114108- 114109+ 114110 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql" 114111 114112 cat >>Makefile.objects<<EOF 114113@@ -98997,10 +76671,9 @@ 114114 114115 ;; 114116 esac 114117- 114118-cat >>confdefs.h <<_ACEOF 114119+ cat >> confdefs.h <<EOF 114120 #define COMPILE_DL_PGSQL 1 114121-_ACEOF 114122+EOF 114123 114124 fi 114125 fi 114126@@ -99009,15 +76682,15 @@ 114127 PHP_PGSQL_SHARED=no 114128 case "$PHP_SAPI" in 114129 cgi|embed) 114130- 114131- 114132+ 114133+ 114134 case ext/pgsql in 114135 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114136 /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114137 *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114138 esac 114139- 114140- 114141+ 114142+ 114143 114144 b_c_pre=$php_c_pre 114145 b_cxx_pre=$php_cxx_pre 114146@@ -99030,12 +76703,12 @@ 114147 114148 old_IFS=$IFS 114149 for ac_src in pgsql.c; do 114150- 114151+ 114152 IFS=. 114153 set $ac_src 114154 ac_obj=$1 114155 IFS=$old_IFS 114156- 114157+ 114158 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114159 114160 case $ac_src in 114161@@ -99055,15 +76728,15 @@ 114162 EXT_STATIC="$EXT_STATIC pgsql" 114163 ;; 114164 *) 114165- 114166- 114167+ 114168+ 114169 case ext/pgsql in 114170 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114171 /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114172 *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114173 esac 114174- 114175- 114176+ 114177+ 114178 114179 b_c_pre=$php_c_pre 114180 b_cxx_pre=$php_cxx_pre 114181@@ -99076,13 +76749,13 @@ 114182 114183 old_IFS=$IFS 114184 for ac_src in pgsql.c; do 114185- 114186+ 114187 IFS=. 114188 set $ac_src 114189 ac_obj=$1 114190 IFS=$old_IFS 114191- 114192- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 114193+ 114194+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114195 114196 case $ac_src in 114197 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 114198@@ -99102,15 +76775,15 @@ 114199 esac 114200 EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql" 114201 fi 114202- 114203- 114204+ 114205+ 114206 BUILD_DIR="$BUILD_DIR $ext_builddir" 114207- 114208+ 114209 114210 114211 if test "$ext_builddir" = "."; then 114212 PHP_PECL_EXTENSION=pgsql 114213- 114214+ 114215 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 114216 114217 fi 114218@@ -99123,18 +76796,19 @@ 114219 114220 php_enable_phar=yes 114221 114222-echo "$as_me:$LINENO: checking for phar archive support" >&5 114223-echo $ECHO_N "checking for phar archive support... $ECHO_C" >&6 114224+echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 114225+echo "configure:76801: checking for phar archive support" >&5 114226 # Check whether --enable-phar or --disable-phar was given. 114227 if test "${enable_phar+set}" = set; then 114228 enableval="$enable_phar" 114229 PHP_PHAR=$enableval 114230 else 114231- 114232+ 114233 PHP_PHAR=yes 114234 test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL 114235 114236-fi; 114237+fi 114238+ 114239 114240 114241 ext_output="yes, shared" 114242@@ -99158,14 +76832,13 @@ 114243 114244 114245 114246-echo "$as_me:$LINENO: result: $ext_output" >&5 114247-echo "${ECHO_T}$ext_output" >&6 114248+echo "$ac_t""$ext_output" 1>&6 114249 114250 114251 114252 114253 if test "$PHP_PHAR" != "no"; then 114254- 114255+ 114256 ext_builddir=ext/phar 114257 ext_srcdir=$abs_srcdir/ext/phar 114258 114259@@ -99173,15 +76846,15 @@ 114260 114261 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 114262 PHP_PHAR_SHARED=no 114263- 114264- 114265+ 114266+ 114267 case ext/phar in 114268 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114269 /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114270 *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114271 esac 114272- 114273- 114274+ 114275+ 114276 114277 b_c_pre=$php_c_pre 114278 b_cxx_pre=$php_cxx_pre 114279@@ -99194,12 +76867,12 @@ 114280 114281 old_IFS=$IFS 114282 for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do 114283- 114284+ 114285 IFS=. 114286 set $ac_src 114287 ac_obj=$1 114288 IFS=$old_IFS 114289- 114290+ 114291 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114292 114293 case $ac_src in 114294@@ -99223,14 +76896,14 @@ 114295 else 114296 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 114297 PHP_PHAR_SHARED=yes 114298- 114299+ 114300 case ext/phar in 114301 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114302 /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114303 *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114304 esac 114305- 114306- 114307+ 114308+ 114309 114310 b_c_pre=$shared_c_pre 114311 b_cxx_pre=$shared_cxx_pre 114312@@ -99243,12 +76916,12 @@ 114313 114314 old_IFS=$IFS 114315 for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do 114316- 114317+ 114318 IFS=. 114319 set $ac_src 114320 ac_obj=$1 114321 IFS=$old_IFS 114322- 114323+ 114324 shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo" 114325 114326 case $ac_src in 114327@@ -99266,7 +76939,7 @@ 114328 114329 case $host_alias in 114330 *netware*) 114331- 114332+ 114333 install_modules="install-modules" 114334 114335 case $host_alias in 114336@@ -99276,7 +76949,7 @@ 114337 ;; 114338 *netware*) 114339 suffix=nlm 114340- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(PHAR_SHARED_LIBADD)' 114341+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPHAR, 3)_SHARED_LIBADD)' 114342 ;; 114343 *) 114344 suffix=la 114345@@ -99289,7 +76962,7 @@ 114346 else 114347 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix" 114348 fi 114349- 114350+ 114351 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" 114352 114353 cat >>Makefile.objects<<EOF 114354@@ -99303,7 +76976,7 @@ 114355 114356 ;; 114357 *) 114358- 114359+ 114360 install_modules="install-modules" 114361 114362 case $host_alias in 114363@@ -99313,7 +76986,7 @@ 114364 ;; 114365 *netware*) 114366 suffix=nlm 114367- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(R_SHARED_LIBADD)' 114368+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)' 114369 ;; 114370 *) 114371 suffix=la 114372@@ -99326,7 +76999,7 @@ 114373 else 114374 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix" 114375 fi 114376- 114377+ 114378 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" 114379 114380 cat >>Makefile.objects<<EOF 114381@@ -99340,10 +77013,9 @@ 114382 114383 ;; 114384 esac 114385- 114386-cat >>confdefs.h <<_ACEOF 114387+ cat >> confdefs.h <<EOF 114388 #define COMPILE_DL_PHAR 1 114389-_ACEOF 114390+EOF 114391 114392 fi 114393 fi 114394@@ -99352,15 +77024,15 @@ 114395 PHP_PHAR_SHARED=no 114396 case "$PHP_SAPI" in 114397 cgi|embed) 114398- 114399- 114400+ 114401+ 114402 case ext/phar in 114403 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114404 /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114405 *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114406 esac 114407- 114408- 114409+ 114410+ 114411 114412 b_c_pre=$php_c_pre 114413 b_cxx_pre=$php_cxx_pre 114414@@ -99373,12 +77045,12 @@ 114415 114416 old_IFS=$IFS 114417 for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do 114418- 114419+ 114420 IFS=. 114421 set $ac_src 114422 ac_obj=$1 114423 IFS=$old_IFS 114424- 114425+ 114426 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114427 114428 case $ac_src in 114429@@ -99398,15 +77070,15 @@ 114430 EXT_STATIC="$EXT_STATIC phar" 114431 ;; 114432 *) 114433- 114434- 114435+ 114436+ 114437 case ext/phar in 114438 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114439 /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114440 *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114441 esac 114442- 114443- 114444+ 114445+ 114446 114447 b_c_pre=$php_c_pre 114448 b_cxx_pre=$php_cxx_pre 114449@@ -99419,13 +77091,13 @@ 114450 114451 old_IFS=$IFS 114452 for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do 114453- 114454+ 114455 IFS=. 114456 set $ac_src 114457 ac_obj=$1 114458 IFS=$old_IFS 114459- 114460- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 114461+ 114462+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114463 114464 case $ac_src in 114465 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 114466@@ -99445,113 +77117,83 @@ 114467 esac 114468 EXT_CLI_STATIC="$EXT_CLI_STATIC phar" 114469 fi 114470- 114471- 114472+ 114473+ 114474 BUILD_DIR="$BUILD_DIR $ext_builddir" 114475- 114476+ 114477 114478 114479 if test "$ext_builddir" = "."; then 114480 PHP_PECL_EXTENSION=phar 114481- 114482+ 114483 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 114484 114485 fi 114486 114487- echo "$as_me:$LINENO: checking for phar openssl support" >&5 114488-echo $ECHO_N "checking for phar openssl support... $ECHO_C" >&6 114489+ echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 114490+echo "configure:77135: checking for phar openssl support" >&5 114491 if test "$PHP_HASH_SHARED" != "yes"; then 114492 if test "$PHP_HASH" != "no"; then 114493- 114494-cat >>confdefs.h <<\_ACEOF 114495+ cat >> confdefs.h <<\EOF 114496 #define PHAR_HASH_OK 1 114497-_ACEOF 114498+EOF 114499 114500 fi 114501 else 114502- { echo "$as_me:$LINENO: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&5 114503-echo "$as_me: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&2;} 114504+ echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 114505 fi 114506 if test "$PHP_OPENSSL_SHARED" = "yes"; then 114507- echo "$as_me:$LINENO: result: no (shared openssl)" >&5 114508-echo "${ECHO_T}no (shared openssl)" >&6 114509+ echo "$ac_t""no (shared openssl)" 1>&6 114510 else 114511 if test "$PHP_OPENSSL" = "yes"; then 114512- echo "$as_me:$LINENO: result: yes" >&5 114513-echo "${ECHO_T}yes" >&6 114514- 114515-cat >>confdefs.h <<\_ACEOF 114516+ echo "$ac_t""yes" 1>&6 114517+ cat >> confdefs.h <<\EOF 114518 #define PHAR_HAVE_OPENSSL 1 114519-_ACEOF 114520+EOF 114521 114522 else 114523- echo "$as_me:$LINENO: result: no" >&5 114524-echo "${ECHO_T}no" >&6 114525+ echo "$ac_t""no" 1>&6 114526 fi 114527 fi 114528- 114529+ 114530 am_i_shared=$PHP_PHAR_SHARED 114531 is_it_shared=$PHP_HASH_SHARED 114532 is_it_enabled=$PHP_HASH 114533 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 114534- { { echo "$as_me:$LINENO: error: 114535-You've configured extension phar to build statically, but it 114536-depends on extension hash, which you've configured to build shared. 114537-You either need to build phar shared or build hash statically for the 114538-build to be successful. 114539-" >&5 114540-echo "$as_me: error: 114541+ { echo "configure: error: 114542 You've configured extension phar to build statically, but it 114543 depends on extension hash, which you've configured to build shared. 114544 You either need to build phar shared or build hash statically for the 114545 build to be successful. 114546-" >&2;} 114547- { (exit 1); exit 1; }; } 114548+" 1>&2; exit 1; } 114549 fi 114550 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 114551- { { echo "$as_me:$LINENO: error: 114552-You've configured extension phar, which depends on extension hash, 114553-but you've either not enabled hash, or have disabled it. 114554-" >&5 114555-echo "$as_me: error: 114556+ { echo "configure: error: 114557 You've configured extension phar, which depends on extension hash, 114558 but you've either not enabled hash, or have disabled it. 114559-" >&2;} 114560- { (exit 1); exit 1; }; } 114561+" 1>&2; exit 1; } 114562 fi 114563- 114564- 114565+ 114566+ 114567 am_i_shared=$PHP_PHAR_SHARED 114568 is_it_shared=$PHP_SPL_SHARED 114569 is_it_enabled=$PHP_SPL 114570 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 114571- { { echo "$as_me:$LINENO: error: 114572-You've configured extension phar to build statically, but it 114573-depends on extension spl, which you've configured to build shared. 114574-You either need to build phar shared or build spl statically for the 114575-build to be successful. 114576-" >&5 114577-echo "$as_me: error: 114578+ { echo "configure: error: 114579 You've configured extension phar to build statically, but it 114580 depends on extension spl, which you've configured to build shared. 114581 You either need to build phar shared or build spl statically for the 114582 build to be successful. 114583-" >&2;} 114584- { (exit 1); exit 1; }; } 114585+" 1>&2; exit 1; } 114586 fi 114587 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 114588- { { echo "$as_me:$LINENO: error: 114589-You've configured extension phar, which depends on extension spl, 114590-but you've either not enabled spl, or have disabled it. 114591-" >&5 114592-echo "$as_me: error: 114593+ { echo "configure: error: 114594 You've configured extension phar, which depends on extension spl, 114595 but you've either not enabled spl, or have disabled it. 114596-" >&2;} 114597- { (exit 1); exit 1; }; } 114598+" 1>&2; exit 1; } 114599 fi 114600- 114601- 114602+ 114603+ 114604 src=$ext_srcdir/Makefile.frag 114605 ac_srcdir=$ext_srcdir 114606 ac_builddir=$ext_builddir 114607@@ -99563,18 +77205,19 @@ 114608 114609 php_enable_posix=yes 114610 114611-echo "$as_me:$LINENO: checking whether to enable POSIX-like functions" >&5 114612-echo $ECHO_N "checking whether to enable POSIX-like functions... $ECHO_C" >&6 114613+echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 114614+echo "configure:77210: checking whether to enable POSIX-like functions" >&5 114615 # Check whether --enable-posix or --disable-posix was given. 114616 if test "${enable_posix+set}" = set; then 114617 enableval="$enable_posix" 114618 PHP_POSIX=$enableval 114619 else 114620- 114621+ 114622 PHP_POSIX=yes 114623 test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL 114624 114625-fi; 114626+fi 114627+ 114628 114629 114630 ext_output="yes, shared" 114631@@ -99598,19 +77241,17 @@ 114632 114633 114634 114635-echo "$as_me:$LINENO: result: $ext_output" >&5 114636-echo "${ECHO_T}$ext_output" >&6 114637+echo "$ac_t""$ext_output" 1>&6 114638 114639 114640 114641 114642 if test "$PHP_POSIX" = "yes"; then 114643- 114644-cat >>confdefs.h <<\_ACEOF 114645+ cat >> confdefs.h <<\EOF 114646 #define HAVE_POSIX 1 114647-_ACEOF 114648- 114649+EOF 114650 114651+ 114652 ext_builddir=ext/posix 114653 ext_srcdir=$abs_srcdir/ext/posix 114654 114655@@ -99618,15 +77259,15 @@ 114656 114657 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 114658 PHP_POSIX_SHARED=no 114659- 114660- 114661+ 114662+ 114663 case ext/posix in 114664 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114665 /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114666 *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114667 esac 114668- 114669- 114670+ 114671+ 114672 114673 b_c_pre=$php_c_pre 114674 b_cxx_pre=$php_cxx_pre 114675@@ -99639,12 +77280,12 @@ 114676 114677 old_IFS=$IFS 114678 for ac_src in posix.c; do 114679- 114680+ 114681 IFS=. 114682 set $ac_src 114683 ac_obj=$1 114684 IFS=$old_IFS 114685- 114686+ 114687 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114688 114689 case $ac_src in 114690@@ -99668,14 +77309,14 @@ 114691 else 114692 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 114693 PHP_POSIX_SHARED=yes 114694- 114695+ 114696 case ext/posix in 114697 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114698 /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114699 *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114700 esac 114701- 114702- 114703+ 114704+ 114705 114706 b_c_pre=$shared_c_pre 114707 b_cxx_pre=$shared_cxx_pre 114708@@ -99688,12 +77329,12 @@ 114709 114710 old_IFS=$IFS 114711 for ac_src in posix.c; do 114712- 114713+ 114714 IFS=. 114715 set $ac_src 114716 ac_obj=$1 114717 IFS=$old_IFS 114718- 114719+ 114720 shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" 114721 114722 case $ac_src in 114723@@ -99711,7 +77352,7 @@ 114724 114725 case $host_alias in 114726 *netware*) 114727- 114728+ 114729 install_modules="install-modules" 114730 114731 case $host_alias in 114732@@ -99721,7 +77362,7 @@ 114733 ;; 114734 *netware*) 114735 suffix=nlm 114736- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(POSIX_SHARED_LIBADD)' 114737+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)' 114738 ;; 114739 *) 114740 suffix=la 114741@@ -99734,7 +77375,7 @@ 114742 else 114743 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix" 114744 fi 114745- 114746+ 114747 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" 114748 114749 cat >>Makefile.objects<<EOF 114750@@ -99748,7 +77389,7 @@ 114751 114752 ;; 114753 *) 114754- 114755+ 114756 install_modules="install-modules" 114757 114758 case $host_alias in 114759@@ -99758,7 +77399,7 @@ 114760 ;; 114761 *netware*) 114762 suffix=nlm 114763- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(IX_SHARED_LIBADD)' 114764+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(POSIX, 3)_SHARED_LIBADD)' 114765 ;; 114766 *) 114767 suffix=la 114768@@ -99771,7 +77412,7 @@ 114769 else 114770 PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix" 114771 fi 114772- 114773+ 114774 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" 114775 114776 cat >>Makefile.objects<<EOF 114777@@ -99785,10 +77426,9 @@ 114778 114779 ;; 114780 esac 114781- 114782-cat >>confdefs.h <<_ACEOF 114783+ cat >> confdefs.h <<EOF 114784 #define COMPILE_DL_POSIX 1 114785-_ACEOF 114786+EOF 114787 114788 fi 114789 fi 114790@@ -99797,15 +77437,15 @@ 114791 PHP_POSIX_SHARED=no 114792 case "$PHP_SAPI" in 114793 cgi|embed) 114794- 114795- 114796+ 114797+ 114798 case ext/posix in 114799 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114800 /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114801 *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114802 esac 114803- 114804- 114805+ 114806+ 114807 114808 b_c_pre=$php_c_pre 114809 b_cxx_pre=$php_cxx_pre 114810@@ -99818,12 +77458,12 @@ 114811 114812 old_IFS=$IFS 114813 for ac_src in posix.c; do 114814- 114815+ 114816 IFS=. 114817 set $ac_src 114818 ac_obj=$1 114819 IFS=$old_IFS 114820- 114821+ 114822 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114823 114824 case $ac_src in 114825@@ -99843,15 +77483,15 @@ 114826 EXT_STATIC="$EXT_STATIC posix" 114827 ;; 114828 *) 114829- 114830- 114831+ 114832+ 114833 case ext/posix in 114834 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 114835 /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 114836 *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 114837 esac 114838- 114839- 114840+ 114841+ 114842 114843 b_c_pre=$php_c_pre 114844 b_cxx_pre=$php_cxx_pre 114845@@ -99864,13 +77504,13 @@ 114846 114847 old_IFS=$IFS 114848 for ac_src in posix.c; do 114849- 114850+ 114851 IFS=. 114852 set $ac_src 114853 ac_obj=$1 114854 IFS=$old_IFS 114855- 114856- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 114857+ 114858+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 114859 114860 case $ac_src in 114861 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 114862@@ -99890,303 +77530,127 @@ 114863 esac 114864 EXT_CLI_STATIC="$EXT_CLI_STATIC posix" 114865 fi 114866- 114867- 114868+ 114869+ 114870 BUILD_DIR="$BUILD_DIR $ext_builddir" 114871- 114872+ 114873 114874 114875 if test "$ext_builddir" = "."; then 114876 PHP_PECL_EXTENSION=posix 114877- 114878+ 114879 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 114880 114881 fi 114882 114883 114884- 114885-for ac_header in sys/mkdev.h 114886+ for ac_hdr in sys/mkdev.h 114887 do 114888-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 114889-if eval "test \"\${$as_ac_Header+set}\" = set"; then 114890- echo "$as_me:$LINENO: checking for $ac_header" >&5 114891-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 114892-if eval "test \"\${$as_ac_Header+set}\" = set"; then 114893- echo $ECHO_N "(cached) $ECHO_C" >&6 114894-fi 114895-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 114896-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 114897-else 114898- # Is the header compilable? 114899-echo "$as_me:$LINENO: checking $ac_header usability" >&5 114900-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 114901-cat >conftest.$ac_ext <<_ACEOF 114902-/* confdefs.h. */ 114903-_ACEOF 114904-cat confdefs.h >>conftest.$ac_ext 114905-cat >>conftest.$ac_ext <<_ACEOF 114906-/* end confdefs.h. */ 114907-$ac_includes_default 114908-#include <$ac_header> 114909-_ACEOF 114910-rm -f conftest.$ac_objext 114911-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 114912- (eval $ac_compile) 2>conftest.er1 114913- ac_status=$? 114914- grep -v '^ *+' conftest.er1 >conftest.err 114915- rm -f conftest.er1 114916- cat conftest.err >&5 114917- echo "$as_me:$LINENO: \$? = $ac_status" >&5 114918- (exit $ac_status); } && 114919- { ac_try='test -z "$ac_c_werror_flag" 114920- || test ! -s conftest.err' 114921- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 114922- (eval $ac_try) 2>&5 114923- ac_status=$? 114924- echo "$as_me:$LINENO: \$? = $ac_status" >&5 114925- (exit $ac_status); }; } && 114926- { ac_try='test -s conftest.$ac_objext' 114927- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 114928- (eval $ac_try) 2>&5 114929- ac_status=$? 114930- echo "$as_me:$LINENO: \$? = $ac_status" >&5 114931- (exit $ac_status); }; }; then 114932- ac_header_compiler=yes 114933-else 114934- echo "$as_me: failed program was:" >&5 114935-sed 's/^/| /' conftest.$ac_ext >&5 114936- 114937-ac_header_compiler=no 114938-fi 114939-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 114940-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 114941-echo "${ECHO_T}$ac_header_compiler" >&6 114942- 114943-# Is the header present? 114944-echo "$as_me:$LINENO: checking $ac_header presence" >&5 114945-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 114946-cat >conftest.$ac_ext <<_ACEOF 114947-/* confdefs.h. */ 114948-_ACEOF 114949-cat confdefs.h >>conftest.$ac_ext 114950-cat >>conftest.$ac_ext <<_ACEOF 114951-/* end confdefs.h. */ 114952-#include <$ac_header> 114953-_ACEOF 114954-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 114955- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 114956- ac_status=$? 114957- grep -v '^ *+' conftest.er1 >conftest.err 114958- rm -f conftest.er1 114959- cat conftest.err >&5 114960- echo "$as_me:$LINENO: \$? = $ac_status" >&5 114961- (exit $ac_status); } >/dev/null; then 114962- if test -s conftest.err; then 114963- ac_cpp_err=$ac_c_preproc_warn_flag 114964- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 114965- else 114966- ac_cpp_err= 114967- fi 114968-else 114969- ac_cpp_err=yes 114970-fi 114971-if test -z "$ac_cpp_err"; then 114972- ac_header_preproc=yes 114973-else 114974- echo "$as_me: failed program was:" >&5 114975-sed 's/^/| /' conftest.$ac_ext >&5 114976- 114977- ac_header_preproc=no 114978-fi 114979-rm -f conftest.err conftest.$ac_ext 114980-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 114981-echo "${ECHO_T}$ac_header_preproc" >&6 114982- 114983-# So? What about this header? 114984-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 114985- yes:no: ) 114986- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 114987-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 114988- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 114989-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 114990- ac_header_preproc=yes 114991- ;; 114992- no:yes:* ) 114993- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 114994-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 114995- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 114996-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 114997- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 114998-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 114999- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 115000-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 115001- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 115002-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 115003- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 115004-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 115005- ( 115006- cat <<\_ASBOX 115007-## ------------------------------------------ ## 115008-## Report this to the AC_PACKAGE_NAME lists. ## 115009-## ------------------------------------------ ## 115010-_ASBOX 115011- ) | 115012- sed "s/^/$as_me: WARNING: /" >&2 115013- ;; 115014-esac 115015-echo "$as_me:$LINENO: checking for $ac_header" >&5 115016-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 115017-if eval "test \"\${$as_ac_Header+set}\" = set"; then 115018- echo $ECHO_N "(cached) $ECHO_C" >&6 115019+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 115020+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 115021+echo "configure:77552: checking for $ac_hdr" >&5 115022+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 115023+ echo $ac_n "(cached) $ac_c" 1>&6 115024+else 115025+ cat > conftest.$ac_ext <<EOF 115026+#line 77557 "configure" 115027+#include "confdefs.h" 115028+#include <$ac_hdr> 115029+EOF 115030+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 115031+{ (eval echo configure:77562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 115032+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 115033+if test -z "$ac_err"; then 115034+ rm -rf conftest* 115035+ eval "ac_cv_header_$ac_safe=yes" 115036 else 115037- eval "$as_ac_Header=\$ac_header_preproc" 115038+ echo "$ac_err" >&5 115039+ echo "configure: failed program was:" >&5 115040+ cat conftest.$ac_ext >&5 115041+ rm -rf conftest* 115042+ eval "ac_cv_header_$ac_safe=no" 115043 fi 115044-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 115045-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 115046- 115047+rm -f conftest* 115048 fi 115049-if test `eval echo '${'$as_ac_Header'}'` = yes; then 115050- cat >>confdefs.h <<_ACEOF 115051-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 115052-_ACEOF 115053- 115054+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 115055+ echo "$ac_t""yes" 1>&6 115056+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 115057+ cat >> confdefs.h <<EOF 115058+#define $ac_tr_hdr 1 115059+EOF 115060+ 115061+else 115062+ echo "$ac_t""no" 1>&6 115063 fi 115064- 115065 done 115066 115067 115068- 115069- 115070- 115071- 115072- 115073- 115074- 115075- 115076- 115077- 115078- 115079- 115080- 115081- 115082- 115083- 115084-for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r 115085+ for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r 115086 do 115087-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 115088-echo "$as_me:$LINENO: checking for $ac_func" >&5 115089-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 115090-if eval "test \"\${$as_ac_var+set}\" = set"; then 115091- echo $ECHO_N "(cached) $ECHO_C" >&6 115092-else 115093- cat >conftest.$ac_ext <<_ACEOF 115094-/* confdefs.h. */ 115095-_ACEOF 115096-cat confdefs.h >>conftest.$ac_ext 115097-cat >>conftest.$ac_ext <<_ACEOF 115098-/* end confdefs.h. */ 115099-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 115100- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 115101-#define $ac_func innocuous_$ac_func 115102- 115103+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 115104+echo "configure:77592: checking for $ac_func" >&5 115105+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 115106+ echo $ac_n "(cached) $ac_c" 1>&6 115107+else 115108+ cat > conftest.$ac_ext <<EOF 115109+#line 77597 "configure" 115110+#include "confdefs.h" 115111 /* System header to define __stub macros and hopefully few prototypes, 115112- which can conflict with char $ac_func (); below. 115113- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 115114- <limits.h> exists even on freestanding compilers. */ 115115- 115116-#ifdef __STDC__ 115117-# include <limits.h> 115118-#else 115119-# include <assert.h> 115120-#endif 115121- 115122-#undef $ac_func 115123- 115124+ which can conflict with char $ac_func(); below. */ 115125+#include <assert.h> 115126 /* Override any gcc2 internal prototype to avoid an error. */ 115127-#ifdef __cplusplus 115128-extern "C" 115129-{ 115130-#endif 115131 /* We use char because int might match the return type of a gcc2 115132- builtin and then its argument prototype would still apply. */ 115133-char $ac_func (); 115134+ builtin and then its argument prototype would still apply. */ 115135+char $ac_func(); 115136+ 115137+int main() { 115138+ 115139 /* The GNU C library defines this for functions which it implements 115140 to always fail with ENOSYS. Some functions are actually named 115141 something starting with __ and the normal name is an alias. */ 115142 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 115143 choke me 115144 #else 115145-char (*f) () = $ac_func; 115146-#endif 115147-#ifdef __cplusplus 115148-} 115149+$ac_func(); 115150 #endif 115151 115152-int 115153-main () 115154-{ 115155-return f != $ac_func; 115156- ; 115157- return 0; 115158-} 115159-_ACEOF 115160-rm -f conftest.$ac_objext conftest$ac_exeext 115161-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 115162- (eval $ac_link) 2>conftest.er1 115163- ac_status=$? 115164- grep -v '^ *+' conftest.er1 >conftest.err 115165- rm -f conftest.er1 115166- cat conftest.err >&5 115167- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115168- (exit $ac_status); } && 115169- { ac_try='test -z "$ac_c_werror_flag" 115170- || test ! -s conftest.err' 115171- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115172- (eval $ac_try) 2>&5 115173- ac_status=$? 115174- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115175- (exit $ac_status); }; } && 115176- { ac_try='test -s conftest$ac_exeext' 115177- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115178- (eval $ac_try) 2>&5 115179- ac_status=$? 115180- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115181- (exit $ac_status); }; }; then 115182- eval "$as_ac_var=yes" 115183-else 115184- echo "$as_me: failed program was:" >&5 115185-sed 's/^/| /' conftest.$ac_ext >&5 115186- 115187-eval "$as_ac_var=no" 115188-fi 115189-rm -f conftest.err conftest.$ac_objext \ 115190- conftest$ac_exeext conftest.$ac_ext 115191-fi 115192-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 115193-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 115194-if test `eval echo '${'$as_ac_var'}'` = yes; then 115195- cat >>confdefs.h <<_ACEOF 115196-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 115197-_ACEOF 115198+; return 0; } 115199+EOF 115200+if { (eval echo configure:77620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 115201+ rm -rf conftest* 115202+ eval "ac_cv_func_$ac_func=yes" 115203+else 115204+ echo "configure: failed program was:" >&5 115205+ cat conftest.$ac_ext >&5 115206+ rm -rf conftest* 115207+ eval "ac_cv_func_$ac_func=no" 115208+fi 115209+rm -f conftest* 115210+fi 115211 115212+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 115213+ echo "$ac_t""yes" 1>&6 115214+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 115215+ cat >> confdefs.h <<EOF 115216+#define $ac_tr_func 1 115217+EOF 115218+ 115219+else 115220+ echo "$ac_t""no" 1>&6 115221 fi 115222 done 115223 115224 115225- echo "$as_me:$LINENO: checking for working ttyname_r() implementation" >&5 115226-echo $ECHO_N "checking for working ttyname_r() implementation... $ECHO_C" >&6 115227+ echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 115228+echo "configure:77646: checking for working ttyname_r() implementation" >&5 115229 if test "$cross_compiling" = yes; then 115230- 115231- echo "$as_me:$LINENO: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5 115232-echo "${ECHO_T}no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6 115233- 115234+ 115235+ echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 115236+ 115237 else 115238- cat >conftest.$ac_ext <<_ACEOF 115239-/* confdefs.h. */ 115240-_ACEOF 115241-cat confdefs.h >>conftest.$ac_ext 115242-cat >>conftest.$ac_ext <<_ACEOF 115243-/* end confdefs.h. */ 115244+ cat > conftest.$ac_ext <<EOF 115245+#line 77653 "configure" 115246+#include "confdefs.h" 115247 115248 #include <unistd.h> 115249 115250@@ -100196,111 +77660,70 @@ 115251 115252 return ttyname_r(0, buf, 64) ? 1 : 0; 115253 } 115254- 115255-_ACEOF 115256-rm -f conftest$ac_exeext 115257-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 115258- (eval $ac_link) 2>&5 115259- ac_status=$? 115260- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115261- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 115262- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115263- (eval $ac_try) 2>&5 115264- ac_status=$? 115265- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115266- (exit $ac_status); }; }; then 115267- 115268- echo "$as_me:$LINENO: result: yes" >&5 115269-echo "${ECHO_T}yes" >&6 115270- 115271-cat >>confdefs.h <<\_ACEOF 115272+ 115273+EOF 115274+if { (eval echo configure:77666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 115275+then 115276+ 115277+ echo "$ac_t""yes" 1>&6 115278+ cat >> confdefs.h <<\EOF 115279 #define HAVE_TTYNAME_R 1 115280-_ACEOF 115281- 115282+EOF 115283 115284+ 115285 else 115286- echo "$as_me: program exited with status $ac_status" >&5 115287-echo "$as_me: failed program was:" >&5 115288-sed 's/^/| /' conftest.$ac_ext >&5 115289- 115290-( exit $ac_status ) 115291- 115292- echo "$as_me:$LINENO: result: no, posix_ttyname() will be thread-unsafe" >&5 115293-echo "${ECHO_T}no, posix_ttyname() will be thread-unsafe" >&6 115294- 115295+ echo "configure: failed program was:" >&5 115296+ cat conftest.$ac_ext >&5 115297+ rm -fr conftest* 115298+ 115299+ echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 115300+ 115301 fi 115302-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 115303+rm -fr conftest* 115304 fi 115305 115306- echo "$as_me:$LINENO: checking for utsname.domainname" >&5 115307-echo $ECHO_N "checking for utsname.domainname... $ECHO_C" >&6 115308-if test "${ac_cv_have_utsname_domainname+set}" = set; then 115309- echo $ECHO_N "(cached) $ECHO_C" >&6 115310-else 115311 115312- cat >conftest.$ac_ext <<_ACEOF 115313-/* confdefs.h. */ 115314-_ACEOF 115315-cat confdefs.h >>conftest.$ac_ext 115316-cat >>conftest.$ac_ext <<_ACEOF 115317-/* end confdefs.h. */ 115318+ echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 115319+echo "configure:77688: checking for utsname.domainname" >&5 115320+if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then 115321+ echo $ac_n "(cached) $ac_c" 1>&6 115322+else 115323+ 115324+ cat > conftest.$ac_ext <<EOF 115325+#line 77694 "configure" 115326+#include "confdefs.h" 115327 115328 #define _GNU_SOURCE 115329 #include <sys/utsname.h> 115330- 115331-int 115332-main () 115333-{ 115334+ 115335+int main() { 115336 115337 return sizeof(((struct utsname *)0)->domainname); 115338- 115339- ; 115340- return 0; 115341-} 115342-_ACEOF 115343-rm -f conftest.$ac_objext 115344-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 115345- (eval $ac_compile) 2>conftest.er1 115346- ac_status=$? 115347- grep -v '^ *+' conftest.er1 >conftest.err 115348- rm -f conftest.er1 115349- cat conftest.err >&5 115350- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115351- (exit $ac_status); } && 115352- { ac_try='test -z "$ac_c_werror_flag" 115353- || test ! -s conftest.err' 115354- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115355- (eval $ac_try) 2>&5 115356- ac_status=$? 115357- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115358- (exit $ac_status); }; } && 115359- { ac_try='test -s conftest.$ac_objext' 115360- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115361- (eval $ac_try) 2>&5 115362- ac_status=$? 115363- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115364- (exit $ac_status); }; }; then 115365- 115366+ 115367+; return 0; } 115368+EOF 115369+if { (eval echo configure:77706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 115370+ rm -rf conftest* 115371+ 115372 ac_cv_have_utsname_domainname=yes 115373- 115374+ 115375 else 115376- echo "$as_me: failed program was:" >&5 115377-sed 's/^/| /' conftest.$ac_ext >&5 115378- 115379- 115380+ echo "configure: failed program was:" >&5 115381+ cat conftest.$ac_ext >&5 115382+ rm -rf conftest* 115383+ 115384 ac_cv_have_utsname_domainname=no 115385- 115386+ 115387 fi 115388-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 115389- 115390+rm -f conftest* 115391+ 115392 fi 115393-echo "$as_me:$LINENO: result: $ac_cv_have_utsname_domainname" >&5 115394-echo "${ECHO_T}$ac_cv_have_utsname_domainname" >&6 115395- if test "$ac_cv_have_utsname_domainname" = yes; then 115396 115397-cat >>confdefs.h <<\_ACEOF 115398+echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 115399+ if test "$ac_cv_have_utsname_domainname" = yes; then 115400+ cat >> confdefs.h <<\EOF 115401 #define HAVE_UTSNAME_DOMAINNAME 1 115402-_ACEOF 115403+EOF 115404 115405 fi 115406 fi 115407@@ -100309,19 +77732,19 @@ 115408 115409 php_with_pspell=no 115410 115411-echo "$as_me:$LINENO: checking for PSPELL support" >&5 115412-echo $ECHO_N "checking for PSPELL support... $ECHO_C" >&6 115413- 115414+echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 115415+echo "configure:77737: checking for PSPELL support" >&5 115416 # Check whether --with-pspell or --without-pspell was given. 115417 if test "${with_pspell+set}" = set; then 115418 withval="$with_pspell" 115419 PHP_PSPELL=$withval 115420 else 115421- 115422+ 115423 PHP_PSPELL=no 115424 test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL 115425 115426-fi; 115427+fi 115428+ 115429 115430 115431 ext_output="yes, shared" 115432@@ -100345,14 +77768,13 @@ 115433 115434 115435 115436-echo "$as_me:$LINENO: result: $ext_output" >&5 115437-echo "${ECHO_T}$ext_output" >&6 115438+echo "$ac_t""$ext_output" 1>&6 115439 115440 115441 115442 115443 if test "$PHP_PSPELL" != "no"; then 115444- 115445+ 115446 ext_builddir=ext/pspell 115447 ext_srcdir=$abs_srcdir/ext/pspell 115448 115449@@ -100360,15 +77782,15 @@ 115450 115451 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 115452 PHP_PSPELL_SHARED=no 115453- 115454- 115455+ 115456+ 115457 case ext/pspell in 115458 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 115459 /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 115460 *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 115461 esac 115462- 115463- 115464+ 115465+ 115466 115467 b_c_pre=$php_c_pre 115468 b_cxx_pre=$php_cxx_pre 115469@@ -100381,12 +77803,12 @@ 115470 115471 old_IFS=$IFS 115472 for ac_src in pspell.c; do 115473- 115474+ 115475 IFS=. 115476 set $ac_src 115477 ac_obj=$1 115478 IFS=$old_IFS 115479- 115480+ 115481 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 115482 115483 case $ac_src in 115484@@ -100410,14 +77832,14 @@ 115485 else 115486 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 115487 PHP_PSPELL_SHARED=yes 115488- 115489+ 115490 case ext/pspell in 115491 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 115492 /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 115493 *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 115494 esac 115495- 115496- 115497+ 115498+ 115499 115500 b_c_pre=$shared_c_pre 115501 b_cxx_pre=$shared_cxx_pre 115502@@ -100430,12 +77852,12 @@ 115503 115504 old_IFS=$IFS 115505 for ac_src in pspell.c; do 115506- 115507+ 115508 IFS=. 115509 set $ac_src 115510 ac_obj=$1 115511 IFS=$old_IFS 115512- 115513+ 115514 shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" 115515 115516 case $ac_src in 115517@@ -100453,7 +77875,7 @@ 115518 115519 case $host_alias in 115520 *netware*) 115521- 115522+ 115523 install_modules="install-modules" 115524 115525 case $host_alias in 115526@@ -100463,7 +77885,7 @@ 115527 ;; 115528 *netware*) 115529 suffix=nlm 115530- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(PSPELL_SHARED_LIBADD)' 115531+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' 115532 ;; 115533 *) 115534 suffix=la 115535@@ -100476,7 +77898,7 @@ 115536 else 115537 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" 115538 fi 115539- 115540+ 115541 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" 115542 115543 cat >>Makefile.objects<<EOF 115544@@ -100490,7 +77912,7 @@ 115545 115546 ;; 115547 *) 115548- 115549+ 115550 install_modules="install-modules" 115551 115552 case $host_alias in 115553@@ -100500,7 +77922,7 @@ 115554 ;; 115555 *netware*) 115556 suffix=nlm 115557- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(ELL_SHARED_LIBADD)' 115558+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PSPELL, 3)_SHARED_LIBADD)' 115559 ;; 115560 *) 115561 suffix=la 115562@@ -100513,7 +77935,7 @@ 115563 else 115564 PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix" 115565 fi 115566- 115567+ 115568 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" 115569 115570 cat >>Makefile.objects<<EOF 115571@@ -100527,10 +77949,9 @@ 115572 115573 ;; 115574 esac 115575- 115576-cat >>confdefs.h <<_ACEOF 115577+ cat >> confdefs.h <<EOF 115578 #define COMPILE_DL_PSPELL 1 115579-_ACEOF 115580+EOF 115581 115582 fi 115583 fi 115584@@ -100539,15 +77960,15 @@ 115585 PHP_PSPELL_SHARED=no 115586 case "$PHP_SAPI" in 115587 cgi|embed) 115588- 115589- 115590+ 115591+ 115592 case ext/pspell in 115593 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 115594 /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 115595 *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 115596 esac 115597- 115598- 115599+ 115600+ 115601 115602 b_c_pre=$php_c_pre 115603 b_cxx_pre=$php_cxx_pre 115604@@ -100560,12 +77981,12 @@ 115605 115606 old_IFS=$IFS 115607 for ac_src in pspell.c; do 115608- 115609+ 115610 IFS=. 115611 set $ac_src 115612 ac_obj=$1 115613 IFS=$old_IFS 115614- 115615+ 115616 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 115617 115618 case $ac_src in 115619@@ -100585,15 +78006,15 @@ 115620 EXT_STATIC="$EXT_STATIC pspell" 115621 ;; 115622 *) 115623- 115624- 115625+ 115626+ 115627 case ext/pspell in 115628 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 115629 /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 115630 *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 115631 esac 115632- 115633- 115634+ 115635+ 115636 115637 b_c_pre=$php_c_pre 115638 b_cxx_pre=$php_cxx_pre 115639@@ -100606,13 +78027,13 @@ 115640 115641 old_IFS=$IFS 115642 for ac_src in pspell.c; do 115643- 115644+ 115645 IFS=. 115646 set $ac_src 115647 ac_obj=$1 115648 IFS=$old_IFS 115649- 115650- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 115651+ 115652+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 115653 115654 case $ac_src in 115655 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 115656@@ -100632,15 +78053,15 @@ 115657 esac 115658 EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" 115659 fi 115660- 115661- 115662+ 115663+ 115664 BUILD_DIR="$BUILD_DIR $ext_builddir" 115665- 115666+ 115667 115668 115669 if test "$ext_builddir" = "."; then 115670 PHP_PECL_EXTENSION=pspell 115671- 115672+ 115673 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 115674 115675 fi 115676@@ -100661,101 +78082,99 @@ 115677 done 115678 115679 if test -z "$PSPELL_DIR"; then 115680- { { echo "$as_me:$LINENO: error: Cannot find pspell" >&5 115681-echo "$as_me: error: Cannot find pspell" >&2;} 115682- { (exit 1); exit 1; }; } 115683+ { echo "configure: error: Cannot find pspell" 1>&2; exit 1; } 115684 fi 115685 115686 PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR 115687 115688- 115689+ 115690 115691 if test "$ext_shared" = "yes"; then 115692 PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" 115693 if test -n "$PSPELL_LIBDIR"; then 115694- 115695+ 115696 if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then 115697- 115698+ 115699 if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then 115700 ai_p=$PSPELL_LIBDIR 115701 else 115702- 115703+ 115704 ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 115705- 115706+ 115707 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 115708 ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" 115709 fi 115710 115711- 115712+ 115713 if test "$ext_shared" = "yes"; then 115714 PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" 115715 test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" 115716 else 115717- 115718- 115719- 115720+ 115721+ 115722+ 115723 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 115724- 115725+ 115726 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 115727 if test -n "$unique" && test "`eval $cmd`" = "" ; then 115728 eval "LIBPATH$unique=set" 115729- 115730+ 115731 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 115732 LDFLAGS="$LDFLAGS -L$ai_p" 115733 PHP_RPATHS="$PHP_RPATHS $ai_p" 115734- 115735+ 115736 fi 115737 115738 115739 fi 115740- 115741+ 115742 fi 115743 115744 fi 115745 else 115746- 115747+ 115748 115749 if test -n "$PSPELL_LIBDIR"; then 115750- 115751+ 115752 if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then 115753- 115754+ 115755 if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then 115756 ai_p=$PSPELL_LIBDIR 115757 else 115758- 115759+ 115760 ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 115761- 115762+ 115763 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 115764 ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" 115765 fi 115766 115767- 115768- 115769- 115770- 115771+ 115772+ 115773+ 115774+ 115775 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 115776- 115777+ 115778 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 115779 if test -n "$unique" && test "`eval $cmd`" = "" ; then 115780 eval "LIBPATH$unique=set" 115781- 115782+ 115783 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 115784 LDFLAGS="$LDFLAGS -L$ai_p" 115785 PHP_RPATHS="$PHP_RPATHS $ai_p" 115786- 115787+ 115788 fi 115789 115790 115791- 115792+ 115793 fi 115794 115795 fi 115796- 115797- 115798+ 115799+ 115800 case pspell in 115801 c|c_r|pthread*) ;; 115802- *) 115803- LIBS="-lpspell $LIBS" 115804+ *) 115805+ LIBS="-lpspell $LIBS" 115806 ;; 115807 esac 115808 115809@@ -100766,25 +78185,25 @@ 115810 115811 115812 115813- 115814+ 115815 save_old_LDFLAGS=$LDFLAGS 115816 ac_stuff=" 115817 -L$PSPELL_LIBDIR 115818 " 115819- 115820+ 115821 save_ext_shared=$ext_shared 115822 ext_shared=yes 115823- 115824+ 115825 for ac_i in $ac_stuff; do 115826 case $ac_i in 115827 -pthread) 115828 if test "$ext_shared" = "yes"; then 115829 LDFLAGS="$LDFLAGS -pthread" 115830 else 115831- 115832- 115833+ 115834+ 115835 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 115836- 115837+ 115838 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 115839 if test -n "$unique" && test "`eval $cmd`" = "" ; then 115840 eval "EXTRA_LDFLAGS$unique=set" 115841@@ -100795,20 +78214,20 @@ 115842 ;; 115843 -l*) 115844 ac_ii=`echo $ac_i|cut -c 3-` 115845- 115846- 115847+ 115848+ 115849 case $ac_ii in 115850 c|c_r|pthread*) ;; 115851- *) 115852+ *) 115853 if test "$ext_shared" = "yes"; then 115854- LDFLAGS="$LDFLAGS -l$ac_ii" 115855+ LDFLAGS="$LDFLAGS -l$ac_ii" 115856 else 115857- 115858- 115859+ 115860+ 115861 case $ac_ii in 115862 c|c_r|pthread*) ;; 115863- *) 115864- LIBS="$LIBS -l$ac_ii" 115865+ *) 115866+ LIBS="$LIBS -l$ac_ii" 115867 ;; 115868 esac 115869 115870@@ -100821,205 +78240,175 @@ 115871 ;; 115872 -L*) 115873 ac_ii=`echo $ac_i|cut -c 3-` 115874- 115875+ 115876 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 115877- 115878+ 115879 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 115880 ai_p=$ac_ii 115881 else 115882- 115883+ 115884 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 115885- 115886+ 115887 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 115888 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 115889 fi 115890 115891- 115892+ 115893 if test "$ext_shared" = "yes"; then 115894 LDFLAGS="-L$ai_p $LDFLAGS" 115895 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 115896 else 115897- 115898- 115899- 115900+ 115901+ 115902+ 115903 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 115904- 115905+ 115906 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 115907 if test -n "$unique" && test "`eval $cmd`" = "" ; then 115908 eval "LIBPATH$unique=set" 115909- 115910+ 115911 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 115912 LDFLAGS="$LDFLAGS -L$ai_p" 115913 PHP_RPATHS="$PHP_RPATHS $ai_p" 115914- 115915+ 115916 fi 115917 115918 115919 fi 115920- 115921+ 115922 fi 115923 115924 ;; 115925 esac 115926 done 115927 115928- echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5 115929-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6 115930-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then 115931- echo $ECHO_N "(cached) $ECHO_C" >&6 115932+ echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 115933+echo "configure:78287: checking for new_aspell_config in -laspell" >&5 115934+ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` 115935+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 115936+ echo $ac_n "(cached) $ac_c" 1>&6 115937 else 115938- ac_check_lib_save_LIBS=$LIBS 115939+ ac_save_LIBS="$LIBS" 115940 LIBS="-laspell $LIBS" 115941-cat >conftest.$ac_ext <<_ACEOF 115942-/* confdefs.h. */ 115943-_ACEOF 115944-cat confdefs.h >>conftest.$ac_ext 115945-cat >>conftest.$ac_ext <<_ACEOF 115946-/* end confdefs.h. */ 115947- 115948+cat > conftest.$ac_ext <<EOF 115949+#line 78295 "configure" 115950+#include "confdefs.h" 115951 /* Override any gcc2 internal prototype to avoid an error. */ 115952-#ifdef __cplusplus 115953-extern "C" 115954-#endif 115955 /* We use char because int might match the return type of a gcc2 115956- builtin and then its argument prototype would still apply. */ 115957-char new_aspell_config (); 115958-int 115959-main () 115960-{ 115961-new_aspell_config (); 115962- ; 115963- return 0; 115964-} 115965-_ACEOF 115966-rm -f conftest.$ac_objext conftest$ac_exeext 115967-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 115968- (eval $ac_link) 2>conftest.er1 115969- ac_status=$? 115970- grep -v '^ *+' conftest.er1 >conftest.err 115971- rm -f conftest.er1 115972- cat conftest.err >&5 115973- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115974- (exit $ac_status); } && 115975- { ac_try='test -z "$ac_c_werror_flag" 115976- || test ! -s conftest.err' 115977- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115978- (eval $ac_try) 2>&5 115979- ac_status=$? 115980- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115981- (exit $ac_status); }; } && 115982- { ac_try='test -s conftest$ac_exeext' 115983- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 115984- (eval $ac_try) 2>&5 115985- ac_status=$? 115986- echo "$as_me:$LINENO: \$? = $ac_status" >&5 115987- (exit $ac_status); }; }; then 115988- ac_cv_lib_aspell_new_aspell_config=yes 115989-else 115990- echo "$as_me: failed program was:" >&5 115991-sed 's/^/| /' conftest.$ac_ext >&5 115992- 115993-ac_cv_lib_aspell_new_aspell_config=no 115994-fi 115995-rm -f conftest.err conftest.$ac_objext \ 115996- conftest$ac_exeext conftest.$ac_ext 115997-LIBS=$ac_check_lib_save_LIBS 115998-fi 115999-echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5 116000-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6 116001-if test $ac_cv_lib_aspell_new_aspell_config = yes; then 116002+ builtin and then its argument prototype would still apply. */ 116003+char new_aspell_config(); 116004 116005+int main() { 116006+new_aspell_config() 116007+; return 0; } 116008+EOF 116009+if { (eval echo configure:78306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 116010+ rm -rf conftest* 116011+ eval "ac_cv_lib_$ac_lib_var=yes" 116012+else 116013+ echo "configure: failed program was:" >&5 116014+ cat conftest.$ac_ext >&5 116015+ rm -rf conftest* 116016+ eval "ac_cv_lib_$ac_lib_var=no" 116017+fi 116018+rm -f conftest* 116019+LIBS="$ac_save_LIBS" 116020+ 116021+fi 116022+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 116023+ echo "$ac_t""yes" 1>&6 116024+ 116025 LDFLAGS=$save_old_LDFLAGS 116026 ext_shared=$save_ext_shared 116027- 116028- 116029+ 116030+ 116031 116032 if test "$ext_shared" = "yes"; then 116033 PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" 116034 if test -n "$PSPELL_LIBDIR"; then 116035- 116036+ 116037 if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then 116038- 116039+ 116040 if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then 116041 ai_p=$PSPELL_LIBDIR 116042 else 116043- 116044+ 116045 ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 116046- 116047+ 116048 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116049 ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" 116050 fi 116051 116052- 116053+ 116054 if test "$ext_shared" = "yes"; then 116055 PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" 116056 test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" 116057 else 116058- 116059- 116060- 116061+ 116062+ 116063+ 116064 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116065- 116066+ 116067 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 116068 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116069 eval "LIBPATH$unique=set" 116070- 116071+ 116072 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 116073 LDFLAGS="$LDFLAGS -L$ai_p" 116074 PHP_RPATHS="$PHP_RPATHS $ai_p" 116075- 116076+ 116077 fi 116078 116079 116080 fi 116081- 116082+ 116083 fi 116084 116085 fi 116086 else 116087- 116088+ 116089 116090 if test -n "$PSPELL_LIBDIR"; then 116091- 116092+ 116093 if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then 116094- 116095+ 116096 if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then 116097 ai_p=$PSPELL_LIBDIR 116098 else 116099- 116100+ 116101 ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 116102- 116103+ 116104 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116105 ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" 116106 fi 116107 116108- 116109- 116110- 116111- 116112+ 116113+ 116114+ 116115+ 116116 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116117- 116118+ 116119 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 116120 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116121 eval "LIBPATH$unique=set" 116122- 116123+ 116124 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 116125 LDFLAGS="$LDFLAGS -L$ai_p" 116126 PHP_RPATHS="$PHP_RPATHS $ai_p" 116127- 116128+ 116129 fi 116130 116131 116132- 116133+ 116134 fi 116135 116136 fi 116137- 116138- 116139+ 116140+ 116141 case aspell in 116142 c|c_r|pthread*) ;; 116143- *) 116144- LIBS="-laspell $LIBS" 116145+ *) 116146+ LIBS="-laspell $LIBS" 116147 ;; 116148 esac 116149 116150@@ -101029,56 +78418,56 @@ 116151 fi 116152 116153 116154- 116155- 116156+ 116157+ 116158 else 116159+ echo "$ac_t""no" 1>&6 116160 116161 LDFLAGS=$save_old_LDFLAGS 116162 ext_shared=$save_ext_shared 116163 unset ac_cv_lib_aspell_new_aspell_config 116164- 116165- 116166+ 116167+ 116168 fi 116169 116170 116171- 116172+ 116173 if test "$PSPELL_INCDIR" != "/usr/include"; then 116174- 116175+ 116176 if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then 116177 ai_p=$PSPELL_INCDIR 116178 else 116179- 116180+ 116181 ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 116182- 116183+ 116184 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116185 ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" 116186 fi 116187 116188- 116189- 116190+ 116191+ 116192 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116193- 116194+ 116195 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 116196 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116197 eval "INCLUDEPATH$unique=set" 116198- 116199+ 116200 if test ""; then 116201 INCLUDES="-I$ai_p $INCLUDES" 116202 else 116203 INCLUDES="$INCLUDES -I$ai_p" 116204 fi 116205- 116206+ 116207 fi 116208 116209 fi 116210 116211- 116212+ 116213 PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" 116214 116215- 116216-cat >>confdefs.h <<\_ACEOF 116217+ cat >> confdefs.h <<\EOF 116218 #define HAVE_PSPELL 1 116219-_ACEOF 116220+EOF 116221 116222 fi 116223 116224@@ -101086,19 +78475,19 @@ 116225 116226 php_with_libedit=no 116227 116228-echo "$as_me:$LINENO: checking for libedit readline replacement" >&5 116229-echo $ECHO_N "checking for libedit readline replacement... $ECHO_C" >&6 116230- 116231+echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 116232+echo "configure:78480: checking for libedit readline replacement" >&5 116233 # Check whether --with-libedit or --without-libedit was given. 116234 if test "${with_libedit+set}" = set; then 116235 withval="$with_libedit" 116236 PHP_LIBEDIT=$withval 116237 else 116238- 116239+ 116240 PHP_LIBEDIT=no 116241 test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL 116242 116243-fi; 116244+fi 116245+ 116246 116247 116248 ext_output="yes, shared" 116249@@ -101122,29 +78511,28 @@ 116250 116251 116252 116253-echo "$as_me:$LINENO: result: $ext_output" >&5 116254-echo "${ECHO_T}$ext_output" >&6 116255+echo "$ac_t""$ext_output" 1>&6 116256 116257 116258 116259 116260 if test "$PHP_LIBEDIT" = "no"; then 116261- 116262+ 116263 php_with_readline=no 116264 116265-echo "$as_me:$LINENO: checking for readline support" >&5 116266-echo $ECHO_N "checking for readline support... $ECHO_C" >&6 116267- 116268+echo $ac_n "checking for readline support""... $ac_c" 1>&6 116269+echo "configure:78525: checking for readline support" >&5 116270 # Check whether --with-readline or --without-readline was given. 116271 if test "${with_readline+set}" = set; then 116272 withval="$with_readline" 116273 PHP_READLINE=$withval 116274 else 116275- 116276+ 116277 PHP_READLINE=no 116278 test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL 116279 116280-fi; 116281+fi 116282+ 116283 116284 116285 ext_output="yes, shared" 116286@@ -101168,8 +78556,7 @@ 116287 116288 116289 116290-echo "$as_me:$LINENO: result: $ext_output" >&5 116291-echo "${ECHO_T}$ext_output" >&6 116292+echo "$ac_t""$ext_output" 1>&6 116293 116294 116295 116296@@ -101183,124 +78570,92 @@ 116297 done 116298 116299 if test -z "$READLINE_DIR"; then 116300- { { echo "$as_me:$LINENO: error: Please reinstall readline - I cannot find readline.h" >&5 116301-echo "$as_me: error: Please reinstall readline - I cannot find readline.h" >&2;} 116302- { (exit 1); exit 1; }; } 116303+ { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } 116304 fi 116305 116306- 116307+ 116308 if test "$READLINE_DIR/include" != "/usr/include"; then 116309- 116310+ 116311 if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then 116312 ai_p=$READLINE_DIR/include 116313 else 116314- 116315+ 116316 ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 116317- 116318+ 116319 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116320 ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" 116321 fi 116322 116323- 116324- 116325+ 116326+ 116327 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116328- 116329+ 116330 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 116331 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116332 eval "INCLUDEPATH$unique=set" 116333- 116334+ 116335 if test ""; then 116336 INCLUDES="-I$ai_p $INCLUDES" 116337 else 116338 INCLUDES="$INCLUDES -I$ai_p" 116339 fi 116340- 116341+ 116342 fi 116343 116344 fi 116345 116346 116347 PHP_READLINE_LIBS="" 116348- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 116349-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 116350-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then 116351- echo $ECHO_N "(cached) $ECHO_C" >&6 116352+ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 116353+echo "configure:78611: checking for tgetent in -lncurses" >&5 116354+ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` 116355+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 116356+ echo $ac_n "(cached) $ac_c" 1>&6 116357 else 116358- ac_check_lib_save_LIBS=$LIBS 116359+ ac_save_LIBS="$LIBS" 116360 LIBS="-lncurses $LIBS" 116361-cat >conftest.$ac_ext <<_ACEOF 116362-/* confdefs.h. */ 116363-_ACEOF 116364-cat confdefs.h >>conftest.$ac_ext 116365-cat >>conftest.$ac_ext <<_ACEOF 116366-/* end confdefs.h. */ 116367- 116368+cat > conftest.$ac_ext <<EOF 116369+#line 78619 "configure" 116370+#include "confdefs.h" 116371 /* Override any gcc2 internal prototype to avoid an error. */ 116372-#ifdef __cplusplus 116373-extern "C" 116374-#endif 116375 /* We use char because int might match the return type of a gcc2 116376- builtin and then its argument prototype would still apply. */ 116377-char tgetent (); 116378-int 116379-main () 116380-{ 116381-tgetent (); 116382- ; 116383- return 0; 116384-} 116385-_ACEOF 116386-rm -f conftest.$ac_objext conftest$ac_exeext 116387-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 116388- (eval $ac_link) 2>conftest.er1 116389- ac_status=$? 116390- grep -v '^ *+' conftest.er1 >conftest.err 116391- rm -f conftest.er1 116392- cat conftest.err >&5 116393- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116394- (exit $ac_status); } && 116395- { ac_try='test -z "$ac_c_werror_flag" 116396- || test ! -s conftest.err' 116397- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116398- (eval $ac_try) 2>&5 116399- ac_status=$? 116400- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116401- (exit $ac_status); }; } && 116402- { ac_try='test -s conftest$ac_exeext' 116403- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116404- (eval $ac_try) 2>&5 116405- ac_status=$? 116406- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116407- (exit $ac_status); }; }; then 116408- ac_cv_lib_ncurses_tgetent=yes 116409-else 116410- echo "$as_me: failed program was:" >&5 116411-sed 's/^/| /' conftest.$ac_ext >&5 116412- 116413-ac_cv_lib_ncurses_tgetent=no 116414-fi 116415-rm -f conftest.err conftest.$ac_objext \ 116416- conftest$ac_exeext conftest.$ac_ext 116417-LIBS=$ac_check_lib_save_LIBS 116418-fi 116419-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 116420-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 116421-if test $ac_cv_lib_ncurses_tgetent = yes; then 116422- 116423+ builtin and then its argument prototype would still apply. */ 116424+char tgetent(); 116425 116426+int main() { 116427+tgetent() 116428+; return 0; } 116429+EOF 116430+if { (eval echo configure:78630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 116431+ rm -rf conftest* 116432+ eval "ac_cv_lib_$ac_lib_var=yes" 116433+else 116434+ echo "configure: failed program was:" >&5 116435+ cat conftest.$ac_ext >&5 116436+ rm -rf conftest* 116437+ eval "ac_cv_lib_$ac_lib_var=no" 116438+fi 116439+rm -f conftest* 116440+LIBS="$ac_save_LIBS" 116441 116442+fi 116443+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 116444+ echo "$ac_t""yes" 1>&6 116445+ 116446+ 116447+ 116448 case ncurses in 116449 c|c_r|pthread*) ;; 116450- *) 116451+ *) 116452 if test "$ext_shared" = "yes"; then 116453- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 116454+ READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 116455 else 116456- 116457- 116458+ 116459+ 116460 case ncurses in 116461 c|c_r|pthread*) ;; 116462- *) 116463- LIBS="-lncurses $LIBS" 116464+ *) 116465+ LIBS="-lncurses $LIBS" 116466 ;; 116467 esac 116468 116469@@ -101311,89 +78666,60 @@ 116470 116471 116472 PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" 116473- 116474+ 116475 else 116476+ echo "$ac_t""no" 1>&6 116477 116478- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 116479-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 116480-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then 116481- echo $ECHO_N "(cached) $ECHO_C" >&6 116482+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 116483+echo "configure:78675: checking for tgetent in -ltermcap" >&5 116484+ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` 116485+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 116486+ echo $ac_n "(cached) $ac_c" 1>&6 116487 else 116488- ac_check_lib_save_LIBS=$LIBS 116489+ ac_save_LIBS="$LIBS" 116490 LIBS="-ltermcap $LIBS" 116491-cat >conftest.$ac_ext <<_ACEOF 116492-/* confdefs.h. */ 116493-_ACEOF 116494-cat confdefs.h >>conftest.$ac_ext 116495-cat >>conftest.$ac_ext <<_ACEOF 116496-/* end confdefs.h. */ 116497- 116498+cat > conftest.$ac_ext <<EOF 116499+#line 78683 "configure" 116500+#include "confdefs.h" 116501 /* Override any gcc2 internal prototype to avoid an error. */ 116502-#ifdef __cplusplus 116503-extern "C" 116504-#endif 116505 /* We use char because int might match the return type of a gcc2 116506- builtin and then its argument prototype would still apply. */ 116507-char tgetent (); 116508-int 116509-main () 116510-{ 116511-tgetent (); 116512- ; 116513- return 0; 116514-} 116515-_ACEOF 116516-rm -f conftest.$ac_objext conftest$ac_exeext 116517-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 116518- (eval $ac_link) 2>conftest.er1 116519- ac_status=$? 116520- grep -v '^ *+' conftest.er1 >conftest.err 116521- rm -f conftest.er1 116522- cat conftest.err >&5 116523- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116524- (exit $ac_status); } && 116525- { ac_try='test -z "$ac_c_werror_flag" 116526- || test ! -s conftest.err' 116527- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116528- (eval $ac_try) 2>&5 116529- ac_status=$? 116530- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116531- (exit $ac_status); }; } && 116532- { ac_try='test -s conftest$ac_exeext' 116533- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116534- (eval $ac_try) 2>&5 116535- ac_status=$? 116536- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116537- (exit $ac_status); }; }; then 116538- ac_cv_lib_termcap_tgetent=yes 116539-else 116540- echo "$as_me: failed program was:" >&5 116541-sed 's/^/| /' conftest.$ac_ext >&5 116542- 116543-ac_cv_lib_termcap_tgetent=no 116544-fi 116545-rm -f conftest.err conftest.$ac_objext \ 116546- conftest$ac_exeext conftest.$ac_ext 116547-LIBS=$ac_check_lib_save_LIBS 116548-fi 116549-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 116550-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 116551-if test $ac_cv_lib_termcap_tgetent = yes; then 116552- 116553+ builtin and then its argument prototype would still apply. */ 116554+char tgetent(); 116555 116556+int main() { 116557+tgetent() 116558+; return 0; } 116559+EOF 116560+if { (eval echo configure:78694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 116561+ rm -rf conftest* 116562+ eval "ac_cv_lib_$ac_lib_var=yes" 116563+else 116564+ echo "configure: failed program was:" >&5 116565+ cat conftest.$ac_ext >&5 116566+ rm -rf conftest* 116567+ eval "ac_cv_lib_$ac_lib_var=no" 116568+fi 116569+rm -f conftest* 116570+LIBS="$ac_save_LIBS" 116571 116572+fi 116573+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 116574+ echo "$ac_t""yes" 1>&6 116575+ 116576+ 116577+ 116578 case termcap in 116579 c|c_r|pthread*) ;; 116580- *) 116581+ *) 116582 if test "$ext_shared" = "yes"; then 116583- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 116584+ READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 116585 else 116586- 116587- 116588+ 116589+ 116590 case termcap in 116591 c|c_r|pthread*) ;; 116592- *) 116593- LIBS="-ltermcap $LIBS" 116594+ *) 116595+ LIBS="-ltermcap $LIBS" 116596 ;; 116597 esac 116598 116599@@ -101404,32 +78730,34 @@ 116600 116601 116602 PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" 116603- 116604+ 116605+else 116606+ echo "$ac_t""no" 1>&6 116607 fi 116608 116609- 116610+ 116611 fi 116612 116613 116614- 116615+ 116616 save_old_LDFLAGS=$LDFLAGS 116617 ac_stuff=" 116618 -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS 116619 " 116620- 116621+ 116622 save_ext_shared=$ext_shared 116623 ext_shared=yes 116624- 116625+ 116626 for ac_i in $ac_stuff; do 116627 case $ac_i in 116628 -pthread) 116629 if test "$ext_shared" = "yes"; then 116630 LDFLAGS="$LDFLAGS -pthread" 116631 else 116632- 116633- 116634+ 116635+ 116636 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 116637- 116638+ 116639 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 116640 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116641 eval "EXTRA_LDFLAGS$unique=set" 116642@@ -101440,20 +78768,20 @@ 116643 ;; 116644 -l*) 116645 ac_ii=`echo $ac_i|cut -c 3-` 116646- 116647- 116648+ 116649+ 116650 case $ac_ii in 116651 c|c_r|pthread*) ;; 116652- *) 116653+ *) 116654 if test "$ext_shared" = "yes"; then 116655- LDFLAGS="$LDFLAGS -l$ac_ii" 116656+ LDFLAGS="$LDFLAGS -l$ac_ii" 116657 else 116658- 116659- 116660+ 116661+ 116662 case $ac_ii in 116663 c|c_r|pthread*) ;; 116664- *) 116665- LIBS="$LIBS -l$ac_ii" 116666+ *) 116667+ LIBS="$LIBS -l$ac_ii" 116668 ;; 116669 esac 116670 116671@@ -101466,205 +78794,175 @@ 116672 ;; 116673 -L*) 116674 ac_ii=`echo $ac_i|cut -c 3-` 116675- 116676+ 116677 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 116678- 116679+ 116680 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 116681 ai_p=$ac_ii 116682 else 116683- 116684+ 116685 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 116686- 116687+ 116688 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116689 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 116690 fi 116691 116692- 116693+ 116694 if test "$ext_shared" = "yes"; then 116695 LDFLAGS="-L$ai_p $LDFLAGS" 116696 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 116697 else 116698- 116699- 116700- 116701+ 116702+ 116703+ 116704 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116705- 116706+ 116707 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 116708 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116709 eval "LIBPATH$unique=set" 116710- 116711+ 116712 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 116713 LDFLAGS="$LDFLAGS -L$ai_p" 116714 PHP_RPATHS="$PHP_RPATHS $ai_p" 116715- 116716+ 116717 fi 116718 116719 116720 fi 116721- 116722+ 116723 fi 116724 116725 ;; 116726 esac 116727 done 116728 116729- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 116730-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 116731-if test "${ac_cv_lib_readline_readline+set}" = set; then 116732- echo $ECHO_N "(cached) $ECHO_C" >&6 116733+ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 116734+echo "configure:78841: checking for readline in -lreadline" >&5 116735+ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` 116736+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 116737+ echo $ac_n "(cached) $ac_c" 1>&6 116738 else 116739- ac_check_lib_save_LIBS=$LIBS 116740+ ac_save_LIBS="$LIBS" 116741 LIBS="-lreadline $LIBS" 116742-cat >conftest.$ac_ext <<_ACEOF 116743-/* confdefs.h. */ 116744-_ACEOF 116745-cat confdefs.h >>conftest.$ac_ext 116746-cat >>conftest.$ac_ext <<_ACEOF 116747-/* end confdefs.h. */ 116748- 116749+cat > conftest.$ac_ext <<EOF 116750+#line 78849 "configure" 116751+#include "confdefs.h" 116752 /* Override any gcc2 internal prototype to avoid an error. */ 116753-#ifdef __cplusplus 116754-extern "C" 116755-#endif 116756 /* We use char because int might match the return type of a gcc2 116757- builtin and then its argument prototype would still apply. */ 116758-char readline (); 116759-int 116760-main () 116761-{ 116762-readline (); 116763- ; 116764- return 0; 116765-} 116766-_ACEOF 116767-rm -f conftest.$ac_objext conftest$ac_exeext 116768-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 116769- (eval $ac_link) 2>conftest.er1 116770- ac_status=$? 116771- grep -v '^ *+' conftest.er1 >conftest.err 116772- rm -f conftest.er1 116773- cat conftest.err >&5 116774- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116775- (exit $ac_status); } && 116776- { ac_try='test -z "$ac_c_werror_flag" 116777- || test ! -s conftest.err' 116778- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116779- (eval $ac_try) 2>&5 116780- ac_status=$? 116781- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116782- (exit $ac_status); }; } && 116783- { ac_try='test -s conftest$ac_exeext' 116784- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 116785- (eval $ac_try) 2>&5 116786- ac_status=$? 116787- echo "$as_me:$LINENO: \$? = $ac_status" >&5 116788- (exit $ac_status); }; }; then 116789- ac_cv_lib_readline_readline=yes 116790-else 116791- echo "$as_me: failed program was:" >&5 116792-sed 's/^/| /' conftest.$ac_ext >&5 116793- 116794-ac_cv_lib_readline_readline=no 116795-fi 116796-rm -f conftest.err conftest.$ac_objext \ 116797- conftest$ac_exeext conftest.$ac_ext 116798-LIBS=$ac_check_lib_save_LIBS 116799-fi 116800-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 116801-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 116802-if test $ac_cv_lib_readline_readline = yes; then 116803+ builtin and then its argument prototype would still apply. */ 116804+char readline(); 116805+ 116806+int main() { 116807+readline() 116808+; return 0; } 116809+EOF 116810+if { (eval echo configure:78860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 116811+ rm -rf conftest* 116812+ eval "ac_cv_lib_$ac_lib_var=yes" 116813+else 116814+ echo "configure: failed program was:" >&5 116815+ cat conftest.$ac_ext >&5 116816+ rm -rf conftest* 116817+ eval "ac_cv_lib_$ac_lib_var=no" 116818+fi 116819+rm -f conftest* 116820+LIBS="$ac_save_LIBS" 116821 116822+fi 116823+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 116824+ echo "$ac_t""yes" 1>&6 116825+ 116826 LDFLAGS=$save_old_LDFLAGS 116827 ext_shared=$save_ext_shared 116828- 116829- 116830+ 116831+ 116832 116833 if test "$ext_shared" = "yes"; then 116834 READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" 116835 if test -n "$READLINE_DIR/$PHP_LIBDIR"; then 116836- 116837+ 116838 if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 116839- 116840+ 116841 if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 116842 ai_p=$READLINE_DIR/$PHP_LIBDIR 116843 else 116844- 116845+ 116846 ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 116847- 116848+ 116849 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116850 ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" 116851 fi 116852 116853- 116854+ 116855 if test "$ext_shared" = "yes"; then 116856 READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" 116857 test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" 116858 else 116859- 116860- 116861- 116862+ 116863+ 116864+ 116865 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116866- 116867+ 116868 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 116869 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116870 eval "LIBPATH$unique=set" 116871- 116872+ 116873 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 116874 LDFLAGS="$LDFLAGS -L$ai_p" 116875 PHP_RPATHS="$PHP_RPATHS $ai_p" 116876- 116877+ 116878 fi 116879 116880 116881 fi 116882- 116883+ 116884 fi 116885 116886 fi 116887 else 116888- 116889+ 116890 116891 if test -n "$READLINE_DIR/$PHP_LIBDIR"; then 116892- 116893+ 116894 if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 116895- 116896+ 116897 if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 116898 ai_p=$READLINE_DIR/$PHP_LIBDIR 116899 else 116900- 116901+ 116902 ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 116903- 116904+ 116905 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 116906 ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" 116907 fi 116908 116909- 116910- 116911- 116912- 116913+ 116914+ 116915+ 116916+ 116917 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 116918- 116919+ 116920 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 116921 if test -n "$unique" && test "`eval $cmd`" = "" ; then 116922 eval "LIBPATH$unique=set" 116923- 116924+ 116925 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 116926 LDFLAGS="$LDFLAGS -L$ai_p" 116927 PHP_RPATHS="$PHP_RPATHS $ai_p" 116928- 116929+ 116930 fi 116931 116932 116933- 116934+ 116935 fi 116936 116937 fi 116938- 116939- 116940+ 116941+ 116942 case readline in 116943 c|c_r|pthread*) ;; 116944- *) 116945- LIBS="-lreadline $LIBS" 116946+ *) 116947+ LIBS="-lreadline $LIBS" 116948 ;; 116949 esac 116950 116951@@ -101674,41 +78972,40 @@ 116952 fi 116953 116954 116955- 116956- 116957+ 116958+ 116959 else 116960+ echo "$ac_t""no" 1>&6 116961 116962 LDFLAGS=$save_old_LDFLAGS 116963 ext_shared=$save_ext_shared 116964 unset ac_cv_lib_readline_readline 116965- 116966- { { echo "$as_me:$LINENO: error: readline library not found" >&5 116967-echo "$as_me: error: readline library not found" >&2;} 116968- { (exit 1); exit 1; }; } 116969- 116970- 116971+ 116972+ { echo "configure: error: readline library not found" 1>&2; exit 1; } 116973+ 116974+ 116975 fi 116976 116977 116978- 116979+ 116980 save_old_LDFLAGS=$LDFLAGS 116981 ac_stuff=" 116982 -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS 116983 " 116984- 116985+ 116986 save_ext_shared=$ext_shared 116987 ext_shared=yes 116988- 116989+ 116990 for ac_i in $ac_stuff; do 116991 case $ac_i in 116992 -pthread) 116993 if test "$ext_shared" = "yes"; then 116994 LDFLAGS="$LDFLAGS -pthread" 116995 else 116996- 116997- 116998+ 116999+ 117000 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 117001- 117002+ 117003 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 117004 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117005 eval "EXTRA_LDFLAGS$unique=set" 117006@@ -101719,20 +79016,20 @@ 117007 ;; 117008 -l*) 117009 ac_ii=`echo $ac_i|cut -c 3-` 117010- 117011- 117012+ 117013+ 117014 case $ac_ii in 117015 c|c_r|pthread*) ;; 117016- *) 117017+ *) 117018 if test "$ext_shared" = "yes"; then 117019- LDFLAGS="$LDFLAGS -l$ac_ii" 117020+ LDFLAGS="$LDFLAGS -l$ac_ii" 117021 else 117022- 117023- 117024+ 117025+ 117026 case $ac_ii in 117027 c|c_r|pthread*) ;; 117028- *) 117029- LIBS="$LIBS -l$ac_ii" 117030+ *) 117031+ LIBS="$LIBS -l$ac_ii" 117032 ;; 117033 esac 117034 117035@@ -101745,151 +79042,120 @@ 117036 ;; 117037 -L*) 117038 ac_ii=`echo $ac_i|cut -c 3-` 117039- 117040+ 117041 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 117042- 117043+ 117044 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 117045 ai_p=$ac_ii 117046 else 117047- 117048+ 117049 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 117050- 117051+ 117052 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 117053 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 117054 fi 117055 117056- 117057+ 117058 if test "$ext_shared" = "yes"; then 117059 LDFLAGS="-L$ai_p $LDFLAGS" 117060 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 117061 else 117062- 117063- 117064- 117065+ 117066+ 117067+ 117068 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 117069- 117070+ 117071 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 117072 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117073 eval "LIBPATH$unique=set" 117074- 117075+ 117076 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 117077 LDFLAGS="$LDFLAGS -L$ai_p" 117078 PHP_RPATHS="$PHP_RPATHS $ai_p" 117079- 117080+ 117081 fi 117082 117083 117084 fi 117085- 117086+ 117087 fi 117088 117089 ;; 117090 esac 117091 done 117092 117093- echo "$as_me:$LINENO: checking for rl_pending_input in -lreadline" >&5 117094-echo $ECHO_N "checking for rl_pending_input in -lreadline... $ECHO_C" >&6 117095-if test "${ac_cv_lib_readline_rl_pending_input+set}" = set; then 117096- echo $ECHO_N "(cached) $ECHO_C" >&6 117097+ echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 117098+echo "configure:79089: checking for rl_pending_input in -lreadline" >&5 117099+ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` 117100+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 117101+ echo $ac_n "(cached) $ac_c" 1>&6 117102 else 117103- ac_check_lib_save_LIBS=$LIBS 117104+ ac_save_LIBS="$LIBS" 117105 LIBS="-lreadline $LIBS" 117106-cat >conftest.$ac_ext <<_ACEOF 117107-/* confdefs.h. */ 117108-_ACEOF 117109-cat confdefs.h >>conftest.$ac_ext 117110-cat >>conftest.$ac_ext <<_ACEOF 117111-/* end confdefs.h. */ 117112- 117113+cat > conftest.$ac_ext <<EOF 117114+#line 79097 "configure" 117115+#include "confdefs.h" 117116 /* Override any gcc2 internal prototype to avoid an error. */ 117117-#ifdef __cplusplus 117118-extern "C" 117119-#endif 117120 /* We use char because int might match the return type of a gcc2 117121- builtin and then its argument prototype would still apply. */ 117122-char rl_pending_input (); 117123-int 117124-main () 117125-{ 117126-rl_pending_input (); 117127- ; 117128- return 0; 117129-} 117130-_ACEOF 117131-rm -f conftest.$ac_objext conftest$ac_exeext 117132-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 117133- (eval $ac_link) 2>conftest.er1 117134- ac_status=$? 117135- grep -v '^ *+' conftest.er1 >conftest.err 117136- rm -f conftest.er1 117137- cat conftest.err >&5 117138- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117139- (exit $ac_status); } && 117140- { ac_try='test -z "$ac_c_werror_flag" 117141- || test ! -s conftest.err' 117142- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117143- (eval $ac_try) 2>&5 117144- ac_status=$? 117145- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117146- (exit $ac_status); }; } && 117147- { ac_try='test -s conftest$ac_exeext' 117148- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117149- (eval $ac_try) 2>&5 117150- ac_status=$? 117151- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117152- (exit $ac_status); }; }; then 117153- ac_cv_lib_readline_rl_pending_input=yes 117154-else 117155- echo "$as_me: failed program was:" >&5 117156-sed 's/^/| /' conftest.$ac_ext >&5 117157- 117158-ac_cv_lib_readline_rl_pending_input=no 117159-fi 117160-rm -f conftest.err conftest.$ac_objext \ 117161- conftest$ac_exeext conftest.$ac_ext 117162-LIBS=$ac_check_lib_save_LIBS 117163-fi 117164-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_pending_input" >&5 117165-echo "${ECHO_T}$ac_cv_lib_readline_rl_pending_input" >&6 117166-if test $ac_cv_lib_readline_rl_pending_input = yes; then 117167+ builtin and then its argument prototype would still apply. */ 117168+char rl_pending_input(); 117169+ 117170+int main() { 117171+rl_pending_input() 117172+; return 0; } 117173+EOF 117174+if { (eval echo configure:79108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 117175+ rm -rf conftest* 117176+ eval "ac_cv_lib_$ac_lib_var=yes" 117177+else 117178+ echo "configure: failed program was:" >&5 117179+ cat conftest.$ac_ext >&5 117180+ rm -rf conftest* 117181+ eval "ac_cv_lib_$ac_lib_var=no" 117182+fi 117183+rm -f conftest* 117184+LIBS="$ac_save_LIBS" 117185 117186+fi 117187+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 117188+ echo "$ac_t""yes" 1>&6 117189+ 117190 LDFLAGS=$save_old_LDFLAGS 117191 ext_shared=$save_ext_shared 117192- 117193- 117194+ 117195+ 117196 else 117197+ echo "$ac_t""no" 1>&6 117198 117199 LDFLAGS=$save_old_LDFLAGS 117200 ext_shared=$save_ext_shared 117201 unset ac_cv_lib_readline_rl_pending_input 117202- 117203- { { echo "$as_me:$LINENO: error: invalid readline installation detected. Try --with-libedit instead." >&5 117204-echo "$as_me: error: invalid readline installation detected. Try --with-libedit instead." >&2;} 117205- { (exit 1); exit 1; }; } 117206- 117207- 117208+ 117209+ { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } 117210+ 117211+ 117212 fi 117213 117214 117215- 117216+ 117217 save_old_LDFLAGS=$LDFLAGS 117218 ac_stuff=" 117219 -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS 117220 " 117221- 117222+ 117223 save_ext_shared=$ext_shared 117224 ext_shared=yes 117225- 117226+ 117227 for ac_i in $ac_stuff; do 117228 case $ac_i in 117229 -pthread) 117230 if test "$ext_shared" = "yes"; then 117231 LDFLAGS="$LDFLAGS -pthread" 117232 else 117233- 117234- 117235+ 117236+ 117237 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 117238- 117239+ 117240 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 117241 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117242 eval "EXTRA_LDFLAGS$unique=set" 117243@@ -101900,20 +79166,20 @@ 117244 ;; 117245 -l*) 117246 ac_ii=`echo $ac_i|cut -c 3-` 117247- 117248- 117249+ 117250+ 117251 case $ac_ii in 117252 c|c_r|pthread*) ;; 117253- *) 117254+ *) 117255 if test "$ext_shared" = "yes"; then 117256- LDFLAGS="$LDFLAGS -l$ac_ii" 117257+ LDFLAGS="$LDFLAGS -l$ac_ii" 117258 else 117259- 117260- 117261+ 117262+ 117263 case $ac_ii in 117264 c|c_r|pthread*) ;; 117265- *) 117266- LIBS="$LIBS -l$ac_ii" 117267+ *) 117268+ LIBS="$LIBS -l$ac_ii" 117269 ;; 117270 esac 117271 117272@@ -101926,138 +79192,107 @@ 117273 ;; 117274 -L*) 117275 ac_ii=`echo $ac_i|cut -c 3-` 117276- 117277+ 117278 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 117279- 117280+ 117281 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 117282 ai_p=$ac_ii 117283 else 117284- 117285+ 117286 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 117287- 117288+ 117289 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 117290 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 117291 fi 117292 117293- 117294+ 117295 if test "$ext_shared" = "yes"; then 117296 LDFLAGS="-L$ai_p $LDFLAGS" 117297 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 117298 else 117299- 117300- 117301- 117302+ 117303+ 117304+ 117305 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 117306- 117307+ 117308 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 117309 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117310 eval "LIBPATH$unique=set" 117311- 117312+ 117313 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 117314 LDFLAGS="$LDFLAGS -L$ai_p" 117315 PHP_RPATHS="$PHP_RPATHS $ai_p" 117316- 117317+ 117318 fi 117319 117320 117321 fi 117322- 117323+ 117324 fi 117325 117326 ;; 117327 esac 117328 done 117329 117330- echo "$as_me:$LINENO: checking for rl_callback_read_char in -lreadline" >&5 117331-echo $ECHO_N "checking for rl_callback_read_char in -lreadline... $ECHO_C" >&6 117332-if test "${ac_cv_lib_readline_rl_callback_read_char+set}" = set; then 117333- echo $ECHO_N "(cached) $ECHO_C" >&6 117334+ echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 117335+echo "configure:79239: checking for rl_callback_read_char in -lreadline" >&5 117336+ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` 117337+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 117338+ echo $ac_n "(cached) $ac_c" 1>&6 117339 else 117340- ac_check_lib_save_LIBS=$LIBS 117341+ ac_save_LIBS="$LIBS" 117342 LIBS="-lreadline $LIBS" 117343-cat >conftest.$ac_ext <<_ACEOF 117344-/* confdefs.h. */ 117345-_ACEOF 117346-cat confdefs.h >>conftest.$ac_ext 117347-cat >>conftest.$ac_ext <<_ACEOF 117348-/* end confdefs.h. */ 117349- 117350+cat > conftest.$ac_ext <<EOF 117351+#line 79247 "configure" 117352+#include "confdefs.h" 117353 /* Override any gcc2 internal prototype to avoid an error. */ 117354-#ifdef __cplusplus 117355-extern "C" 117356-#endif 117357 /* We use char because int might match the return type of a gcc2 117358- builtin and then its argument prototype would still apply. */ 117359-char rl_callback_read_char (); 117360-int 117361-main () 117362-{ 117363-rl_callback_read_char (); 117364- ; 117365- return 0; 117366-} 117367-_ACEOF 117368-rm -f conftest.$ac_objext conftest$ac_exeext 117369-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 117370- (eval $ac_link) 2>conftest.er1 117371- ac_status=$? 117372- grep -v '^ *+' conftest.er1 >conftest.err 117373- rm -f conftest.er1 117374- cat conftest.err >&5 117375- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117376- (exit $ac_status); } && 117377- { ac_try='test -z "$ac_c_werror_flag" 117378- || test ! -s conftest.err' 117379- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117380- (eval $ac_try) 2>&5 117381- ac_status=$? 117382- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117383- (exit $ac_status); }; } && 117384- { ac_try='test -s conftest$ac_exeext' 117385- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117386- (eval $ac_try) 2>&5 117387- ac_status=$? 117388- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117389- (exit $ac_status); }; }; then 117390- ac_cv_lib_readline_rl_callback_read_char=yes 117391-else 117392- echo "$as_me: failed program was:" >&5 117393-sed 's/^/| /' conftest.$ac_ext >&5 117394- 117395-ac_cv_lib_readline_rl_callback_read_char=no 117396-fi 117397-rm -f conftest.err conftest.$ac_objext \ 117398- conftest$ac_exeext conftest.$ac_ext 117399-LIBS=$ac_check_lib_save_LIBS 117400-fi 117401-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_read_char" >&5 117402-echo "${ECHO_T}$ac_cv_lib_readline_rl_callback_read_char" >&6 117403-if test $ac_cv_lib_readline_rl_callback_read_char = yes; then 117404+ builtin and then its argument prototype would still apply. */ 117405+char rl_callback_read_char(); 117406+ 117407+int main() { 117408+rl_callback_read_char() 117409+; return 0; } 117410+EOF 117411+if { (eval echo configure:79258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 117412+ rm -rf conftest* 117413+ eval "ac_cv_lib_$ac_lib_var=yes" 117414+else 117415+ echo "configure: failed program was:" >&5 117416+ cat conftest.$ac_ext >&5 117417+ rm -rf conftest* 117418+ eval "ac_cv_lib_$ac_lib_var=no" 117419+fi 117420+rm -f conftest* 117421+LIBS="$ac_save_LIBS" 117422 117423+fi 117424+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 117425+ echo "$ac_t""yes" 1>&6 117426+ 117427 LDFLAGS=$save_old_LDFLAGS 117428 ext_shared=$save_ext_shared 117429- 117430- 117431-cat >>confdefs.h <<\_ACEOF 117432+ 117433+ cat >> confdefs.h <<\EOF 117434 #define HAVE_RL_CALLBACK_READ_CHAR 1 117435-_ACEOF 117436- 117437- 117438+EOF 117439 117440+ 117441+ 117442 else 117443+ echo "$ac_t""no" 1>&6 117444 117445 LDFLAGS=$save_old_LDFLAGS 117446 ext_shared=$save_ext_shared 117447 unset ac_cv_lib_readline_rl_callback_read_char 117448- 117449- 117450+ 117451+ 117452 fi 117453 117454 117455- 117456-cat >>confdefs.h <<\_ACEOF 117457+ cat >> confdefs.h <<\EOF 117458 #define HAVE_LIBREADLINE 1 117459-_ACEOF 117460+EOF 117461 117462 117463 elif test "$PHP_LIBEDIT" != "no"; then 117464@@ -102067,123 +79302,91 @@ 117465 done 117466 117467 if test -z "$LIBEDIT_DIR"; then 117468- { { echo "$as_me:$LINENO: error: Please reinstall libedit - I cannot find readline.h" >&5 117469-echo "$as_me: error: Please reinstall libedit - I cannot find readline.h" >&2;} 117470- { (exit 1); exit 1; }; } 117471+ { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } 117472 fi 117473 117474- 117475+ 117476 if test "$LIBEDIT_DIR/include" != "/usr/include"; then 117477- 117478+ 117479 if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then 117480 ai_p=$LIBEDIT_DIR/include 117481 else 117482- 117483+ 117484 ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 117485- 117486+ 117487 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 117488 ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" 117489 fi 117490 117491- 117492- 117493+ 117494+ 117495 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 117496- 117497+ 117498 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 117499 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117500 eval "INCLUDEPATH$unique=set" 117501- 117502+ 117503 if test ""; then 117504 INCLUDES="-I$ai_p $INCLUDES" 117505 else 117506 INCLUDES="$INCLUDES -I$ai_p" 117507 fi 117508- 117509+ 117510 fi 117511 117512 fi 117513 117514 117515- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 117516-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 117517-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then 117518- echo $ECHO_N "(cached) $ECHO_C" >&6 117519+ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 117520+echo "configure:79342: checking for tgetent in -lncurses" >&5 117521+ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` 117522+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 117523+ echo $ac_n "(cached) $ac_c" 1>&6 117524 else 117525- ac_check_lib_save_LIBS=$LIBS 117526+ ac_save_LIBS="$LIBS" 117527 LIBS="-lncurses $LIBS" 117528-cat >conftest.$ac_ext <<_ACEOF 117529-/* confdefs.h. */ 117530-_ACEOF 117531-cat confdefs.h >>conftest.$ac_ext 117532-cat >>conftest.$ac_ext <<_ACEOF 117533-/* end confdefs.h. */ 117534- 117535+cat > conftest.$ac_ext <<EOF 117536+#line 79350 "configure" 117537+#include "confdefs.h" 117538 /* Override any gcc2 internal prototype to avoid an error. */ 117539-#ifdef __cplusplus 117540-extern "C" 117541-#endif 117542 /* We use char because int might match the return type of a gcc2 117543- builtin and then its argument prototype would still apply. */ 117544-char tgetent (); 117545-int 117546-main () 117547-{ 117548-tgetent (); 117549- ; 117550- return 0; 117551-} 117552-_ACEOF 117553-rm -f conftest.$ac_objext conftest$ac_exeext 117554-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 117555- (eval $ac_link) 2>conftest.er1 117556- ac_status=$? 117557- grep -v '^ *+' conftest.er1 >conftest.err 117558- rm -f conftest.er1 117559- cat conftest.err >&5 117560- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117561- (exit $ac_status); } && 117562- { ac_try='test -z "$ac_c_werror_flag" 117563- || test ! -s conftest.err' 117564- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117565- (eval $ac_try) 2>&5 117566- ac_status=$? 117567- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117568- (exit $ac_status); }; } && 117569- { ac_try='test -s conftest$ac_exeext' 117570- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117571- (eval $ac_try) 2>&5 117572- ac_status=$? 117573- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117574- (exit $ac_status); }; }; then 117575- ac_cv_lib_ncurses_tgetent=yes 117576-else 117577- echo "$as_me: failed program was:" >&5 117578-sed 's/^/| /' conftest.$ac_ext >&5 117579- 117580-ac_cv_lib_ncurses_tgetent=no 117581-fi 117582-rm -f conftest.err conftest.$ac_objext \ 117583- conftest$ac_exeext conftest.$ac_ext 117584-LIBS=$ac_check_lib_save_LIBS 117585-fi 117586-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 117587-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 117588-if test $ac_cv_lib_ncurses_tgetent = yes; then 117589- 117590+ builtin and then its argument prototype would still apply. */ 117591+char tgetent(); 117592 117593+int main() { 117594+tgetent() 117595+; return 0; } 117596+EOF 117597+if { (eval echo configure:79361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 117598+ rm -rf conftest* 117599+ eval "ac_cv_lib_$ac_lib_var=yes" 117600+else 117601+ echo "configure: failed program was:" >&5 117602+ cat conftest.$ac_ext >&5 117603+ rm -rf conftest* 117604+ eval "ac_cv_lib_$ac_lib_var=no" 117605+fi 117606+rm -f conftest* 117607+LIBS="$ac_save_LIBS" 117608 117609+fi 117610+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 117611+ echo "$ac_t""yes" 1>&6 117612+ 117613+ 117614+ 117615 case ncurses in 117616 c|c_r|pthread*) ;; 117617- *) 117618+ *) 117619 if test "$ext_shared" = "yes"; then 117620- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 117621+ READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" 117622 else 117623- 117624- 117625+ 117626+ 117627 case ncurses in 117628 c|c_r|pthread*) ;; 117629- *) 117630- LIBS="-lncurses $LIBS" 117631+ *) 117632+ LIBS="-lncurses $LIBS" 117633 ;; 117634 esac 117635 117636@@ -102193,89 +79396,60 @@ 117637 esac 117638 117639 117640- 117641+ 117642 else 117643+ echo "$ac_t""no" 1>&6 117644 117645- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 117646-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 117647-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then 117648- echo $ECHO_N "(cached) $ECHO_C" >&6 117649+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 117650+echo "configure:79405: checking for tgetent in -ltermcap" >&5 117651+ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` 117652+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 117653+ echo $ac_n "(cached) $ac_c" 1>&6 117654 else 117655- ac_check_lib_save_LIBS=$LIBS 117656+ ac_save_LIBS="$LIBS" 117657 LIBS="-ltermcap $LIBS" 117658-cat >conftest.$ac_ext <<_ACEOF 117659-/* confdefs.h. */ 117660-_ACEOF 117661-cat confdefs.h >>conftest.$ac_ext 117662-cat >>conftest.$ac_ext <<_ACEOF 117663-/* end confdefs.h. */ 117664- 117665+cat > conftest.$ac_ext <<EOF 117666+#line 79413 "configure" 117667+#include "confdefs.h" 117668 /* Override any gcc2 internal prototype to avoid an error. */ 117669-#ifdef __cplusplus 117670-extern "C" 117671-#endif 117672 /* We use char because int might match the return type of a gcc2 117673- builtin and then its argument prototype would still apply. */ 117674-char tgetent (); 117675-int 117676-main () 117677-{ 117678-tgetent (); 117679- ; 117680- return 0; 117681-} 117682-_ACEOF 117683-rm -f conftest.$ac_objext conftest$ac_exeext 117684-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 117685- (eval $ac_link) 2>conftest.er1 117686- ac_status=$? 117687- grep -v '^ *+' conftest.er1 >conftest.err 117688- rm -f conftest.er1 117689- cat conftest.err >&5 117690- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117691- (exit $ac_status); } && 117692- { ac_try='test -z "$ac_c_werror_flag" 117693- || test ! -s conftest.err' 117694- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117695- (eval $ac_try) 2>&5 117696- ac_status=$? 117697- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117698- (exit $ac_status); }; } && 117699- { ac_try='test -s conftest$ac_exeext' 117700- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117701- (eval $ac_try) 2>&5 117702- ac_status=$? 117703- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117704- (exit $ac_status); }; }; then 117705- ac_cv_lib_termcap_tgetent=yes 117706-else 117707- echo "$as_me: failed program was:" >&5 117708-sed 's/^/| /' conftest.$ac_ext >&5 117709- 117710-ac_cv_lib_termcap_tgetent=no 117711-fi 117712-rm -f conftest.err conftest.$ac_objext \ 117713- conftest$ac_exeext conftest.$ac_ext 117714-LIBS=$ac_check_lib_save_LIBS 117715-fi 117716-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 117717-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 117718-if test $ac_cv_lib_termcap_tgetent = yes; then 117719- 117720+ builtin and then its argument prototype would still apply. */ 117721+char tgetent(); 117722 117723+int main() { 117724+tgetent() 117725+; return 0; } 117726+EOF 117727+if { (eval echo configure:79424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 117728+ rm -rf conftest* 117729+ eval "ac_cv_lib_$ac_lib_var=yes" 117730+else 117731+ echo "configure: failed program was:" >&5 117732+ cat conftest.$ac_ext >&5 117733+ rm -rf conftest* 117734+ eval "ac_cv_lib_$ac_lib_var=no" 117735+fi 117736+rm -f conftest* 117737+LIBS="$ac_save_LIBS" 117738 117739+fi 117740+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 117741+ echo "$ac_t""yes" 1>&6 117742+ 117743+ 117744+ 117745 case termcap in 117746 c|c_r|pthread*) ;; 117747- *) 117748+ *) 117749 if test "$ext_shared" = "yes"; then 117750- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 117751+ READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" 117752 else 117753- 117754- 117755+ 117756+ 117757 case termcap in 117758 c|c_r|pthread*) ;; 117759- *) 117760- LIBS="-ltermcap $LIBS" 117761+ *) 117762+ LIBS="-ltermcap $LIBS" 117763 ;; 117764 esac 117765 117766@@ -102285,32 +79459,34 @@ 117767 esac 117768 117769 117770- 117771+ 117772+else 117773+ echo "$ac_t""no" 1>&6 117774 fi 117775 117776- 117777+ 117778 fi 117779 117780 117781- 117782+ 117783 save_old_LDFLAGS=$LDFLAGS 117784 ac_stuff=" 117785- -L$READLINE_DIR/$PHP_LIBDIR 117786+ -L$READLINE_DIR/$PHP_LIBDIR 117787 " 117788- 117789+ 117790 save_ext_shared=$ext_shared 117791 ext_shared=yes 117792- 117793+ 117794 for ac_i in $ac_stuff; do 117795 case $ac_i in 117796 -pthread) 117797 if test "$ext_shared" = "yes"; then 117798 LDFLAGS="$LDFLAGS -pthread" 117799 else 117800- 117801- 117802+ 117803+ 117804 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 117805- 117806+ 117807 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 117808 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117809 eval "EXTRA_LDFLAGS$unique=set" 117810@@ -102321,20 +79497,20 @@ 117811 ;; 117812 -l*) 117813 ac_ii=`echo $ac_i|cut -c 3-` 117814- 117815- 117816+ 117817+ 117818 case $ac_ii in 117819 c|c_r|pthread*) ;; 117820- *) 117821+ *) 117822 if test "$ext_shared" = "yes"; then 117823- LDFLAGS="$LDFLAGS -l$ac_ii" 117824+ LDFLAGS="$LDFLAGS -l$ac_ii" 117825 else 117826- 117827- 117828+ 117829+ 117830 case $ac_ii in 117831 c|c_r|pthread*) ;; 117832- *) 117833- LIBS="$LIBS -l$ac_ii" 117834+ *) 117835+ LIBS="$LIBS -l$ac_ii" 117836 ;; 117837 esac 117838 117839@@ -102347,205 +79523,175 @@ 117840 ;; 117841 -L*) 117842 ac_ii=`echo $ac_i|cut -c 3-` 117843- 117844+ 117845 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 117846- 117847+ 117848 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 117849 ai_p=$ac_ii 117850 else 117851- 117852+ 117853 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 117854- 117855+ 117856 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 117857 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 117858 fi 117859 117860- 117861+ 117862 if test "$ext_shared" = "yes"; then 117863 LDFLAGS="-L$ai_p $LDFLAGS" 117864 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 117865 else 117866- 117867- 117868- 117869+ 117870+ 117871+ 117872 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 117873- 117874+ 117875 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 117876 if test -n "$unique" && test "`eval $cmd`" = "" ; then 117877 eval "LIBPATH$unique=set" 117878- 117879+ 117880 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 117881 LDFLAGS="$LDFLAGS -L$ai_p" 117882 PHP_RPATHS="$PHP_RPATHS $ai_p" 117883- 117884+ 117885 fi 117886 117887 117888 fi 117889- 117890+ 117891 fi 117892 117893 ;; 117894 esac 117895 done 117896 117897- echo "$as_me:$LINENO: checking for readline in -ledit" >&5 117898-echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6 117899-if test "${ac_cv_lib_edit_readline+set}" = set; then 117900- echo $ECHO_N "(cached) $ECHO_C" >&6 117901+ echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 117902+echo "configure:79570: checking for readline in -ledit" >&5 117903+ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` 117904+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 117905+ echo $ac_n "(cached) $ac_c" 1>&6 117906 else 117907- ac_check_lib_save_LIBS=$LIBS 117908+ ac_save_LIBS="$LIBS" 117909 LIBS="-ledit $LIBS" 117910-cat >conftest.$ac_ext <<_ACEOF 117911-/* confdefs.h. */ 117912-_ACEOF 117913-cat confdefs.h >>conftest.$ac_ext 117914-cat >>conftest.$ac_ext <<_ACEOF 117915-/* end confdefs.h. */ 117916- 117917+cat > conftest.$ac_ext <<EOF 117918+#line 79578 "configure" 117919+#include "confdefs.h" 117920 /* Override any gcc2 internal prototype to avoid an error. */ 117921-#ifdef __cplusplus 117922-extern "C" 117923-#endif 117924 /* We use char because int might match the return type of a gcc2 117925- builtin and then its argument prototype would still apply. */ 117926-char readline (); 117927-int 117928-main () 117929-{ 117930-readline (); 117931- ; 117932- return 0; 117933-} 117934-_ACEOF 117935-rm -f conftest.$ac_objext conftest$ac_exeext 117936-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 117937- (eval $ac_link) 2>conftest.er1 117938- ac_status=$? 117939- grep -v '^ *+' conftest.er1 >conftest.err 117940- rm -f conftest.er1 117941- cat conftest.err >&5 117942- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117943- (exit $ac_status); } && 117944- { ac_try='test -z "$ac_c_werror_flag" 117945- || test ! -s conftest.err' 117946- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117947- (eval $ac_try) 2>&5 117948- ac_status=$? 117949- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117950- (exit $ac_status); }; } && 117951- { ac_try='test -s conftest$ac_exeext' 117952- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 117953- (eval $ac_try) 2>&5 117954- ac_status=$? 117955- echo "$as_me:$LINENO: \$? = $ac_status" >&5 117956- (exit $ac_status); }; }; then 117957- ac_cv_lib_edit_readline=yes 117958-else 117959- echo "$as_me: failed program was:" >&5 117960-sed 's/^/| /' conftest.$ac_ext >&5 117961- 117962-ac_cv_lib_edit_readline=no 117963-fi 117964-rm -f conftest.err conftest.$ac_objext \ 117965- conftest$ac_exeext conftest.$ac_ext 117966-LIBS=$ac_check_lib_save_LIBS 117967-fi 117968-echo "$as_me:$LINENO: result: $ac_cv_lib_edit_readline" >&5 117969-echo "${ECHO_T}$ac_cv_lib_edit_readline" >&6 117970-if test $ac_cv_lib_edit_readline = yes; then 117971+ builtin and then its argument prototype would still apply. */ 117972+char readline(); 117973+ 117974+int main() { 117975+readline() 117976+; return 0; } 117977+EOF 117978+if { (eval echo configure:79589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 117979+ rm -rf conftest* 117980+ eval "ac_cv_lib_$ac_lib_var=yes" 117981+else 117982+ echo "configure: failed program was:" >&5 117983+ cat conftest.$ac_ext >&5 117984+ rm -rf conftest* 117985+ eval "ac_cv_lib_$ac_lib_var=no" 117986+fi 117987+rm -f conftest* 117988+LIBS="$ac_save_LIBS" 117989 117990+fi 117991+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 117992+ echo "$ac_t""yes" 1>&6 117993+ 117994 LDFLAGS=$save_old_LDFLAGS 117995 ext_shared=$save_ext_shared 117996- 117997- 117998+ 117999+ 118000 118001 if test "$ext_shared" = "yes"; then 118002 READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" 118003 if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then 118004- 118005+ 118006 if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 118007- 118008+ 118009 if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 118010 ai_p=$LIBEDIT_DIR/$PHP_LIBDIR 118011 else 118012- 118013+ 118014 ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 118015- 118016+ 118017 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 118018 ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" 118019 fi 118020 118021- 118022+ 118023 if test "$ext_shared" = "yes"; then 118024 READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" 118025 test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" 118026 else 118027- 118028- 118029- 118030+ 118031+ 118032+ 118033 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 118034- 118035+ 118036 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 118037 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118038 eval "LIBPATH$unique=set" 118039- 118040+ 118041 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 118042 LDFLAGS="$LDFLAGS -L$ai_p" 118043 PHP_RPATHS="$PHP_RPATHS $ai_p" 118044- 118045+ 118046 fi 118047 118048 118049 fi 118050- 118051+ 118052 fi 118053 118054 fi 118055 else 118056- 118057+ 118058 118059 if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then 118060- 118061+ 118062 if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 118063- 118064+ 118065 if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 118066 ai_p=$LIBEDIT_DIR/$PHP_LIBDIR 118067 else 118068- 118069+ 118070 ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 118071- 118072+ 118073 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 118074 ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" 118075 fi 118076 118077- 118078- 118079- 118080- 118081+ 118082+ 118083+ 118084+ 118085 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 118086- 118087+ 118088 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 118089 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118090 eval "LIBPATH$unique=set" 118091- 118092+ 118093 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 118094 LDFLAGS="$LDFLAGS -L$ai_p" 118095 PHP_RPATHS="$PHP_RPATHS $ai_p" 118096- 118097+ 118098 fi 118099 118100 118101- 118102+ 118103 fi 118104 118105 fi 118106- 118107- 118108+ 118109+ 118110 case edit in 118111 c|c_r|pthread*) ;; 118112- *) 118113- LIBS="-ledit $LIBS" 118114+ *) 118115+ LIBS="-ledit $LIBS" 118116 ;; 118117 esac 118118 118119@@ -102554,134 +79700,85 @@ 118120 118121 fi 118122 118123- 118124- 118125- 118126+ 118127+ 118128+ 118129 else 118130+ echo "$ac_t""no" 1>&6 118131 118132 LDFLAGS=$save_old_LDFLAGS 118133 ext_shared=$save_ext_shared 118134 unset ac_cv_lib_edit_readline 118135- 118136- { { echo "$as_me:$LINENO: error: edit library required by readline not found" >&5 118137-echo "$as_me: error: edit library required by readline not found" >&2;} 118138- { (exit 1); exit 1; }; } 118139- 118140- 118141+ 118142+ { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } 118143+ 118144+ 118145 fi 118146 118147 118148- 118149-cat >>confdefs.h <<\_ACEOF 118150+ cat >> confdefs.h <<\EOF 118151 #define HAVE_LIBEDIT 1 118152-_ACEOF 118153+EOF 118154 118155 fi 118156 118157 if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then 118158- 118159-for ac_func in rl_completion_matches 118160+ for ac_func in rl_completion_matches 118161 do 118162-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 118163-echo "$as_me:$LINENO: checking for $ac_func" >&5 118164-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 118165-if eval "test \"\${$as_ac_var+set}\" = set"; then 118166- echo $ECHO_N "(cached) $ECHO_C" >&6 118167-else 118168- cat >conftest.$ac_ext <<_ACEOF 118169-/* confdefs.h. */ 118170-_ACEOF 118171-cat confdefs.h >>conftest.$ac_ext 118172-cat >>conftest.$ac_ext <<_ACEOF 118173-/* end confdefs.h. */ 118174-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 118175- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 118176-#define $ac_func innocuous_$ac_func 118177- 118178+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 118179+echo "configure:79730: checking for $ac_func" >&5 118180+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 118181+ echo $ac_n "(cached) $ac_c" 1>&6 118182+else 118183+ cat > conftest.$ac_ext <<EOF 118184+#line 79735 "configure" 118185+#include "confdefs.h" 118186 /* System header to define __stub macros and hopefully few prototypes, 118187- which can conflict with char $ac_func (); below. 118188- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 118189- <limits.h> exists even on freestanding compilers. */ 118190- 118191-#ifdef __STDC__ 118192-# include <limits.h> 118193-#else 118194-# include <assert.h> 118195-#endif 118196- 118197-#undef $ac_func 118198- 118199+ which can conflict with char $ac_func(); below. */ 118200+#include <assert.h> 118201 /* Override any gcc2 internal prototype to avoid an error. */ 118202-#ifdef __cplusplus 118203-extern "C" 118204-{ 118205-#endif 118206 /* We use char because int might match the return type of a gcc2 118207- builtin and then its argument prototype would still apply. */ 118208-char $ac_func (); 118209+ builtin and then its argument prototype would still apply. */ 118210+char $ac_func(); 118211+ 118212+int main() { 118213+ 118214 /* The GNU C library defines this for functions which it implements 118215 to always fail with ENOSYS. Some functions are actually named 118216 something starting with __ and the normal name is an alias. */ 118217 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 118218 choke me 118219 #else 118220-char (*f) () = $ac_func; 118221-#endif 118222-#ifdef __cplusplus 118223-} 118224+$ac_func(); 118225 #endif 118226 118227-int 118228-main () 118229-{ 118230-return f != $ac_func; 118231- ; 118232- return 0; 118233-} 118234-_ACEOF 118235-rm -f conftest.$ac_objext conftest$ac_exeext 118236-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 118237- (eval $ac_link) 2>conftest.er1 118238- ac_status=$? 118239- grep -v '^ *+' conftest.er1 >conftest.err 118240- rm -f conftest.er1 118241- cat conftest.err >&5 118242- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118243- (exit $ac_status); } && 118244- { ac_try='test -z "$ac_c_werror_flag" 118245- || test ! -s conftest.err' 118246- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118247- (eval $ac_try) 2>&5 118248- ac_status=$? 118249- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118250- (exit $ac_status); }; } && 118251- { ac_try='test -s conftest$ac_exeext' 118252- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118253- (eval $ac_try) 2>&5 118254- ac_status=$? 118255- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118256- (exit $ac_status); }; }; then 118257- eval "$as_ac_var=yes" 118258-else 118259- echo "$as_me: failed program was:" >&5 118260-sed 's/^/| /' conftest.$ac_ext >&5 118261- 118262-eval "$as_ac_var=no" 118263-fi 118264-rm -f conftest.err conftest.$ac_objext \ 118265- conftest$ac_exeext conftest.$ac_ext 118266-fi 118267-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 118268-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 118269-if test `eval echo '${'$as_ac_var'}'` = yes; then 118270- cat >>confdefs.h <<_ACEOF 118271-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 118272-_ACEOF 118273+; return 0; } 118274+EOF 118275+if { (eval echo configure:79758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 118276+ rm -rf conftest* 118277+ eval "ac_cv_func_$ac_func=yes" 118278+else 118279+ echo "configure: failed program was:" >&5 118280+ cat conftest.$ac_ext >&5 118281+ rm -rf conftest* 118282+ eval "ac_cv_func_$ac_func=no" 118283+fi 118284+rm -f conftest* 118285+fi 118286 118287+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 118288+ echo "$ac_t""yes" 1>&6 118289+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 118290+ cat >> confdefs.h <<EOF 118291+#define $ac_tr_func 1 118292+EOF 118293+ 118294+else 118295+ echo "$ac_t""no" 1>&6 118296 fi 118297 done 118298 118299- 118300+ 118301 ext_builddir=ext/readline 118302 ext_srcdir=$abs_srcdir/ext/readline 118303 118304@@ -102689,15 +79786,15 @@ 118305 118306 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then 118307 PHP_READLINE_SHARED=no 118308- 118309- 118310+ 118311+ 118312 case ext/readline in 118313 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 118314 /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 118315 *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 118316 esac 118317- 118318- 118319+ 118320+ 118321 118322 b_c_pre=$php_c_pre 118323 b_cxx_pre=$php_cxx_pre 118324@@ -102710,12 +79807,12 @@ 118325 118326 old_IFS=$IFS 118327 for ac_src in readline.c; do 118328- 118329+ 118330 IFS=. 118331 set $ac_src 118332 ac_obj=$1 118333 IFS=$old_IFS 118334- 118335+ 118336 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 118337 118338 case $ac_src in 118339@@ -102739,14 +79836,14 @@ 118340 else 118341 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 118342 PHP_READLINE_SHARED=yes 118343- 118344+ 118345 case ext/readline in 118346 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 118347 /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 118348 *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 118349 esac 118350- 118351- 118352+ 118353+ 118354 118355 b_c_pre=$shared_c_pre 118356 b_cxx_pre=$shared_cxx_pre 118357@@ -102759,12 +79856,12 @@ 118358 118359 old_IFS=$IFS 118360 for ac_src in readline.c; do 118361- 118362+ 118363 IFS=. 118364 set $ac_src 118365 ac_obj=$1 118366 IFS=$old_IFS 118367- 118368+ 118369 shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" 118370 118371 case $ac_src in 118372@@ -102782,7 +79879,7 @@ 118373 118374 case $host_alias in 118375 *netware*) 118376- 118377+ 118378 install_modules="install-modules" 118379 118380 case $host_alias in 118381@@ -102792,7 +79889,7 @@ 118382 ;; 118383 *netware*) 118384 suffix=nlm 118385- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(READLINE_SHARED_LIBADD)' 118386+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' 118387 ;; 118388 *) 118389 suffix=la 118390@@ -102805,7 +79902,7 @@ 118391 else 118392 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" 118393 fi 118394- 118395+ 118396 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" 118397 118398 cat >>Makefile.objects<<EOF 118399@@ -102819,7 +79916,7 @@ 118400 118401 ;; 118402 *) 118403- 118404+ 118405 install_modules="install-modules" 118406 118407 case $host_alias in 118408@@ -102829,7 +79926,7 @@ 118409 ;; 118410 *netware*) 118411 suffix=nlm 118412- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(DLINE_SHARED_LIBADD)' 118413+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(READLINE, 3)_SHARED_LIBADD)' 118414 ;; 118415 *) 118416 suffix=la 118417@@ -102842,7 +79939,7 @@ 118418 else 118419 PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix" 118420 fi 118421- 118422+ 118423 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" 118424 118425 cat >>Makefile.objects<<EOF 118426@@ -102856,10 +79953,9 @@ 118427 118428 ;; 118429 esac 118430- 118431-cat >>confdefs.h <<_ACEOF 118432+ cat >> confdefs.h <<EOF 118433 #define COMPILE_DL_READLINE 1 118434-_ACEOF 118435+EOF 118436 118437 fi 118438 fi 118439@@ -102868,15 +79964,15 @@ 118440 PHP_READLINE_SHARED=no 118441 case "$PHP_SAPI" in 118442 cgi|embed) 118443- 118444- 118445+ 118446+ 118447 case ext/readline in 118448 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 118449 /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 118450 *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 118451 esac 118452- 118453- 118454+ 118455+ 118456 118457 b_c_pre=$php_c_pre 118458 b_cxx_pre=$php_cxx_pre 118459@@ -102889,12 +79985,12 @@ 118460 118461 old_IFS=$IFS 118462 for ac_src in readline.c; do 118463- 118464+ 118465 IFS=. 118466 set $ac_src 118467 ac_obj=$1 118468 IFS=$old_IFS 118469- 118470+ 118471 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 118472 118473 case $ac_src in 118474@@ -102914,15 +80010,15 @@ 118475 EXT_STATIC="$EXT_STATIC readline" 118476 ;; 118477 *) 118478- 118479- 118480+ 118481+ 118482 case ext/readline in 118483 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 118484 /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 118485 *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 118486 esac 118487- 118488- 118489+ 118490+ 118491 118492 b_c_pre=$php_c_pre 118493 b_cxx_pre=$php_cxx_pre 118494@@ -102935,13 +80031,13 @@ 118495 118496 old_IFS=$IFS 118497 for ac_src in readline.c; do 118498- 118499+ 118500 IFS=. 118501 set $ac_src 118502 ac_obj=$1 118503 IFS=$old_IFS 118504- 118505- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 118506+ 118507+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 118508 118509 case $ac_src in 118510 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 118511@@ -102961,20 +80057,20 @@ 118512 esac 118513 EXT_CLI_STATIC="$EXT_CLI_STATIC readline" 118514 fi 118515- 118516- 118517+ 118518+ 118519 BUILD_DIR="$BUILD_DIR $ext_builddir" 118520- 118521+ 118522 118523 118524 if test "$ext_builddir" = "."; then 118525 PHP_PECL_EXTENSION=readline 118526- 118527+ 118528 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 118529 118530 fi 118531 118532- 118533+ 118534 PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD" 118535 118536 fi 118537@@ -102983,19 +80079,19 @@ 118538 118539 php_with_recode=no 118540 118541-echo "$as_me:$LINENO: checking for recode support" >&5 118542-echo $ECHO_N "checking for recode support... $ECHO_C" >&6 118543- 118544+echo $ac_n "checking for recode support""... $ac_c" 1>&6 118545+echo "configure:80084: checking for recode support" >&5 118546 # Check whether --with-recode or --without-recode was given. 118547 if test "${with_recode+set}" = set; then 118548 withval="$with_recode" 118549 PHP_RECODE=$withval 118550 else 118551- 118552+ 118553 PHP_RECODE=no 118554 test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL 118555 118556-fi; 118557+fi 118558+ 118559 118560 118561 ext_output="yes, shared" 118562@@ -103019,8 +80115,7 @@ 118563 118564 118565 118566-echo "$as_me:$LINENO: result: $ext_output" >&5 118567-echo "${ECHO_T}$ext_output" >&6 118568+echo "$ac_t""$ext_output" 1>&6 118569 118570 118571 118572@@ -103048,30 +80143,28 @@ 118573 done 118574 118575 if test -z "$RECODE_DIR"; then 118576- { { echo "$as_me:$LINENO: error: Can not find recode.h anywhere under $RECODE_LIST." >&5 118577-echo "$as_me: error: Can not find recode.h anywhere under $RECODE_LIST." >&2;} 118578- { (exit 1); exit 1; }; } 118579+ { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } 118580 fi 118581 118582- 118583+ 118584 save_old_LDFLAGS=$LDFLAGS 118585 ac_stuff=" 118586 -L$RECODE_DIR/$RECODE_LIB 118587 " 118588- 118589+ 118590 save_ext_shared=$ext_shared 118591 ext_shared=yes 118592- 118593+ 118594 for ac_i in $ac_stuff; do 118595 case $ac_i in 118596 -pthread) 118597 if test "$ext_shared" = "yes"; then 118598 LDFLAGS="$LDFLAGS -pthread" 118599 else 118600- 118601- 118602+ 118603+ 118604 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 118605- 118606+ 118607 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 118608 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118609 eval "EXTRA_LDFLAGS$unique=set" 118610@@ -103082,20 +80175,20 @@ 118611 ;; 118612 -l*) 118613 ac_ii=`echo $ac_i|cut -c 3-` 118614- 118615- 118616+ 118617+ 118618 case $ac_ii in 118619 c|c_r|pthread*) ;; 118620- *) 118621+ *) 118622 if test "$ext_shared" = "yes"; then 118623- LDFLAGS="$LDFLAGS -l$ac_ii" 118624+ LDFLAGS="$LDFLAGS -l$ac_ii" 118625 else 118626- 118627- 118628+ 118629+ 118630 case $ac_ii in 118631 c|c_r|pthread*) ;; 118632- *) 118633- LIBS="$LIBS -l$ac_ii" 118634+ *) 118635+ LIBS="$LIBS -l$ac_ii" 118636 ;; 118637 esac 118638 118639@@ -103108,205 +80201,175 @@ 118640 ;; 118641 -L*) 118642 ac_ii=`echo $ac_i|cut -c 3-` 118643- 118644+ 118645 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 118646- 118647+ 118648 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 118649 ai_p=$ac_ii 118650 else 118651- 118652+ 118653 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 118654- 118655+ 118656 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 118657 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 118658 fi 118659 118660- 118661+ 118662 if test "$ext_shared" = "yes"; then 118663 LDFLAGS="-L$ai_p $LDFLAGS" 118664 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 118665 else 118666- 118667- 118668- 118669+ 118670+ 118671+ 118672 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 118673- 118674+ 118675 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 118676 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118677 eval "LIBPATH$unique=set" 118678- 118679+ 118680 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 118681 LDFLAGS="$LDFLAGS -L$ai_p" 118682 PHP_RPATHS="$PHP_RPATHS $ai_p" 118683- 118684+ 118685 fi 118686 118687 118688 fi 118689- 118690+ 118691 fi 118692 118693 ;; 118694 esac 118695 done 118696 118697- echo "$as_me:$LINENO: checking for recode_format_table in -lrecode" >&5 118698-echo $ECHO_N "checking for recode_format_table in -lrecode... $ECHO_C" >&6 118699-if test "${ac_cv_lib_recode_recode_format_table+set}" = set; then 118700- echo $ECHO_N "(cached) $ECHO_C" >&6 118701+ echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 118702+echo "configure:80248: checking for recode_format_table in -lrecode" >&5 118703+ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` 118704+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 118705+ echo $ac_n "(cached) $ac_c" 1>&6 118706 else 118707- ac_check_lib_save_LIBS=$LIBS 118708+ ac_save_LIBS="$LIBS" 118709 LIBS="-lrecode $LIBS" 118710-cat >conftest.$ac_ext <<_ACEOF 118711-/* confdefs.h. */ 118712-_ACEOF 118713-cat confdefs.h >>conftest.$ac_ext 118714-cat >>conftest.$ac_ext <<_ACEOF 118715-/* end confdefs.h. */ 118716- 118717+cat > conftest.$ac_ext <<EOF 118718+#line 80256 "configure" 118719+#include "confdefs.h" 118720 /* Override any gcc2 internal prototype to avoid an error. */ 118721-#ifdef __cplusplus 118722-extern "C" 118723-#endif 118724 /* We use char because int might match the return type of a gcc2 118725- builtin and then its argument prototype would still apply. */ 118726-char recode_format_table (); 118727-int 118728-main () 118729-{ 118730-recode_format_table (); 118731- ; 118732- return 0; 118733-} 118734-_ACEOF 118735-rm -f conftest.$ac_objext conftest$ac_exeext 118736-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 118737- (eval $ac_link) 2>conftest.er1 118738- ac_status=$? 118739- grep -v '^ *+' conftest.er1 >conftest.err 118740- rm -f conftest.er1 118741- cat conftest.err >&5 118742- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118743- (exit $ac_status); } && 118744- { ac_try='test -z "$ac_c_werror_flag" 118745- || test ! -s conftest.err' 118746- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118747- (eval $ac_try) 2>&5 118748- ac_status=$? 118749- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118750- (exit $ac_status); }; } && 118751- { ac_try='test -s conftest$ac_exeext' 118752- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118753- (eval $ac_try) 2>&5 118754- ac_status=$? 118755- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118756- (exit $ac_status); }; }; then 118757- ac_cv_lib_recode_recode_format_table=yes 118758-else 118759- echo "$as_me: failed program was:" >&5 118760-sed 's/^/| /' conftest.$ac_ext >&5 118761- 118762-ac_cv_lib_recode_recode_format_table=no 118763-fi 118764-rm -f conftest.err conftest.$ac_objext \ 118765- conftest$ac_exeext conftest.$ac_ext 118766-LIBS=$ac_check_lib_save_LIBS 118767-fi 118768-echo "$as_me:$LINENO: result: $ac_cv_lib_recode_recode_format_table" >&5 118769-echo "${ECHO_T}$ac_cv_lib_recode_recode_format_table" >&6 118770-if test $ac_cv_lib_recode_recode_format_table = yes; then 118771+ builtin and then its argument prototype would still apply. */ 118772+char recode_format_table(); 118773+ 118774+int main() { 118775+recode_format_table() 118776+; return 0; } 118777+EOF 118778+if { (eval echo configure:80267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 118779+ rm -rf conftest* 118780+ eval "ac_cv_lib_$ac_lib_var=yes" 118781+else 118782+ echo "configure: failed program was:" >&5 118783+ cat conftest.$ac_ext >&5 118784+ rm -rf conftest* 118785+ eval "ac_cv_lib_$ac_lib_var=no" 118786+fi 118787+rm -f conftest* 118788+LIBS="$ac_save_LIBS" 118789 118790+fi 118791+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 118792+ echo "$ac_t""yes" 1>&6 118793+ 118794 LDFLAGS=$save_old_LDFLAGS 118795 ext_shared=$save_ext_shared 118796- 118797- 118798+ 118799+ 118800 118801 if test "$ext_shared" = "yes"; then 118802 RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" 118803 if test -n "$RECODE_DIR/$RECODE_LIB"; then 118804- 118805+ 118806 if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then 118807- 118808+ 118809 if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then 118810 ai_p=$RECODE_DIR/$RECODE_LIB 118811 else 118812- 118813+ 118814 ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 118815- 118816+ 118817 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 118818 ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 118819 fi 118820 118821- 118822+ 118823 if test "$ext_shared" = "yes"; then 118824 RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" 118825 test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" 118826 else 118827- 118828- 118829- 118830+ 118831+ 118832+ 118833 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 118834- 118835+ 118836 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 118837 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118838 eval "LIBPATH$unique=set" 118839- 118840+ 118841 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 118842 LDFLAGS="$LDFLAGS -L$ai_p" 118843 PHP_RPATHS="$PHP_RPATHS $ai_p" 118844- 118845+ 118846 fi 118847 118848 118849 fi 118850- 118851+ 118852 fi 118853 118854 fi 118855 else 118856- 118857+ 118858 118859 if test -n "$RECODE_DIR/$RECODE_LIB"; then 118860- 118861+ 118862 if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then 118863- 118864+ 118865 if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then 118866 ai_p=$RECODE_DIR/$RECODE_LIB 118867 else 118868- 118869+ 118870 ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 118871- 118872+ 118873 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 118874 ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 118875 fi 118876 118877- 118878- 118879- 118880- 118881+ 118882+ 118883+ 118884+ 118885 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 118886- 118887+ 118888 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 118889 if test -n "$unique" && test "`eval $cmd`" = "" ; then 118890 eval "LIBPATH$unique=set" 118891- 118892+ 118893 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 118894 LDFLAGS="$LDFLAGS -L$ai_p" 118895 PHP_RPATHS="$PHP_RPATHS $ai_p" 118896- 118897+ 118898 fi 118899 118900 118901- 118902+ 118903 fi 118904 118905 fi 118906- 118907- 118908+ 118909+ 118910 case recode in 118911 c|c_r|pthread*) ;; 118912- *) 118913- LIBS="-lrecode $LIBS" 118914+ *) 118915+ LIBS="-lrecode $LIBS" 118916 ;; 118917 esac 118918 118919@@ -103316,148 +80379,122 @@ 118920 fi 118921 118922 118923- 118924- 118925+ 118926+ 118927 else 118928+ echo "$ac_t""no" 1>&6 118929 118930 LDFLAGS=$save_old_LDFLAGS 118931 ext_shared=$save_ext_shared 118932 unset ac_cv_lib_recode_recode_format_table 118933- 118934+ 118935 old_LDFLAGS=$LDFLAGS 118936 old_LIBS=$LIBS 118937 LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" 118938 LIBS="$LIBS -lrecode" 118939- cat >conftest.$ac_ext <<_ACEOF 118940-/* confdefs.h. */ 118941-_ACEOF 118942-cat confdefs.h >>conftest.$ac_ext 118943-cat >>conftest.$ac_ext <<_ACEOF 118944-/* end confdefs.h. */ 118945+ cat > conftest.$ac_ext <<EOF 118946+#line 80397 "configure" 118947+#include "confdefs.h" 118948 118949 char *program_name; 118950- 118951-int 118952-main () 118953-{ 118954+ 118955+int main() { 118956 118957 recode_format_table(); 118958- 118959- ; 118960- return 0; 118961-} 118962-_ACEOF 118963-rm -f conftest.$ac_objext conftest$ac_exeext 118964-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 118965- (eval $ac_link) 2>conftest.er1 118966- ac_status=$? 118967- grep -v '^ *+' conftest.er1 >conftest.err 118968- rm -f conftest.er1 118969- cat conftest.err >&5 118970- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118971- (exit $ac_status); } && 118972- { ac_try='test -z "$ac_c_werror_flag" 118973- || test ! -s conftest.err' 118974- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118975- (eval $ac_try) 2>&5 118976- ac_status=$? 118977- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118978- (exit $ac_status); }; } && 118979- { ac_try='test -s conftest$ac_exeext' 118980- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 118981- (eval $ac_try) 2>&5 118982- ac_status=$? 118983- echo "$as_me:$LINENO: \$? = $ac_status" >&5 118984- (exit $ac_status); }; }; then 118985- 118986- 118987+ 118988+; return 0; } 118989+EOF 118990+if { (eval echo configure:80408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 118991+ rm -rf conftest* 118992+ 118993+ 118994 118995 if test "$ext_shared" = "yes"; then 118996 RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" 118997 if test -n "$RECODE_DIR/$RECODE_LIB"; then 118998- 118999+ 119000 if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then 119001- 119002+ 119003 if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then 119004 ai_p=$RECODE_DIR/$RECODE_LIB 119005 else 119006- 119007+ 119008 ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 119009- 119010+ 119011 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 119012 ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 119013 fi 119014 119015- 119016+ 119017 if test "$ext_shared" = "yes"; then 119018 RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" 119019 test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" 119020 else 119021- 119022- 119023- 119024+ 119025+ 119026+ 119027 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 119028- 119029+ 119030 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 119031 if test -n "$unique" && test "`eval $cmd`" = "" ; then 119032 eval "LIBPATH$unique=set" 119033- 119034+ 119035 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 119036 LDFLAGS="$LDFLAGS -L$ai_p" 119037 PHP_RPATHS="$PHP_RPATHS $ai_p" 119038- 119039+ 119040 fi 119041 119042 119043 fi 119044- 119045+ 119046 fi 119047 119048 fi 119049 else 119050- 119051+ 119052 119053 if test -n "$RECODE_DIR/$RECODE_LIB"; then 119054- 119055+ 119056 if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then 119057- 119058+ 119059 if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then 119060 ai_p=$RECODE_DIR/$RECODE_LIB 119061 else 119062- 119063+ 119064 ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" 119065- 119066+ 119067 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 119068 ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" 119069 fi 119070 119071- 119072- 119073- 119074- 119075+ 119076+ 119077+ 119078+ 119079 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 119080- 119081+ 119082 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 119083 if test -n "$unique" && test "`eval $cmd`" = "" ; then 119084 eval "LIBPATH$unique=set" 119085- 119086+ 119087 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 119088 LDFLAGS="$LDFLAGS -L$ai_p" 119089 PHP_RPATHS="$PHP_RPATHS $ai_p" 119090- 119091+ 119092 fi 119093 119094 119095- 119096+ 119097 fi 119098 119099 fi 119100- 119101- 119102+ 119103+ 119104 case recode in 119105 c|c_r|pthread*) ;; 119106- *) 119107- DLIBS="-lrecode $DLIBS" 119108+ *) 119109+ DLIBS="-lrecode $DLIBS" 119110 ;; 119111 esac 119112 119113@@ -103467,221 +80504,106 @@ 119114 fi 119115 119116 119117- 119118-cat >>confdefs.h <<\_ACEOF 119119+ cat >> confdefs.h <<\EOF 119120 #define HAVE_BROKEN_RECODE 1 119121-_ACEOF 119122- 119123+EOF 119124 119125+ 119126 else 119127- echo "$as_me: failed program was:" >&5 119128-sed 's/^/| /' conftest.$ac_ext >&5 119129- 119130- 119131- { { echo "$as_me:$LINENO: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&5 119132-echo "$as_me: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&2;} 119133- { (exit 1); exit 1; }; } 119134- 119135+ echo "configure: failed program was:" >&5 119136+ cat conftest.$ac_ext >&5 119137+ rm -rf conftest* 119138+ 119139+ { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } 119140+ 119141 fi 119142-rm -f conftest.err conftest.$ac_objext \ 119143- conftest$ac_exeext conftest.$ac_ext 119144+rm -f conftest* 119145 LIBS=$old_LIBS 119146 LDFLAGS=$old_LDFLAGS 119147- 119148- 119149+ 119150+ 119151 fi 119152 119153 119154- 119155-cat >>confdefs.h <<\_ACEOF 119156+ cat >> confdefs.h <<\EOF 119157 #define HAVE_LIBRECODE 1 119158-_ACEOF 119159- 119160+EOF 119161 119162+ 119163 if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then 119164- 119165+ 119166 if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then 119167 ai_p=$RECODE_DIR/$RECODE_INC 119168 else 119169- 119170+ 119171 ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" 119172- 119173+ 119174 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 119175 ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" 119176 fi 119177 119178- 119179- 119180+ 119181+ 119182 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 119183- 119184+ 119185 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 119186 if test -n "$unique" && test "`eval $cmd`" = "" ; then 119187 eval "INCLUDEPATH$unique=set" 119188- 119189+ 119190 if test ""; then 119191 INCLUDES="-I$ai_p $INCLUDES" 119192 else 119193 INCLUDES="$INCLUDES -I$ai_p" 119194 fi 119195- 119196+ 119197 fi 119198 119199 fi 119200 119201- 119202+ 119203 PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" 119204 119205- 119206-for ac_header in stdbool.h 119207+ for ac_hdr in stdbool.h 119208 do 119209-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 119210-if eval "test \"\${$as_ac_Header+set}\" = set"; then 119211- echo "$as_me:$LINENO: checking for $ac_header" >&5 119212-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 119213-if eval "test \"\${$as_ac_Header+set}\" = set"; then 119214- echo $ECHO_N "(cached) $ECHO_C" >&6 119215-fi 119216-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 119217-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 119218-else 119219- # Is the header compilable? 119220-echo "$as_me:$LINENO: checking $ac_header usability" >&5 119221-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 119222-cat >conftest.$ac_ext <<_ACEOF 119223-/* confdefs.h. */ 119224-_ACEOF 119225-cat confdefs.h >>conftest.$ac_ext 119226-cat >>conftest.$ac_ext <<_ACEOF 119227-/* end confdefs.h. */ 119228-$ac_includes_default 119229-#include <$ac_header> 119230-_ACEOF 119231-rm -f conftest.$ac_objext 119232-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 119233- (eval $ac_compile) 2>conftest.er1 119234- ac_status=$? 119235- grep -v '^ *+' conftest.er1 >conftest.err 119236- rm -f conftest.er1 119237- cat conftest.err >&5 119238- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119239- (exit $ac_status); } && 119240- { ac_try='test -z "$ac_c_werror_flag" 119241- || test ! -s conftest.err' 119242- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 119243- (eval $ac_try) 2>&5 119244- ac_status=$? 119245- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119246- (exit $ac_status); }; } && 119247- { ac_try='test -s conftest.$ac_objext' 119248- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 119249- (eval $ac_try) 2>&5 119250- ac_status=$? 119251- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119252- (exit $ac_status); }; }; then 119253- ac_header_compiler=yes 119254-else 119255- echo "$as_me: failed program was:" >&5 119256-sed 's/^/| /' conftest.$ac_ext >&5 119257- 119258-ac_header_compiler=no 119259-fi 119260-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 119261-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 119262-echo "${ECHO_T}$ac_header_compiler" >&6 119263- 119264-# Is the header present? 119265-echo "$as_me:$LINENO: checking $ac_header presence" >&5 119266-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 119267-cat >conftest.$ac_ext <<_ACEOF 119268-/* confdefs.h. */ 119269-_ACEOF 119270-cat confdefs.h >>conftest.$ac_ext 119271-cat >>conftest.$ac_ext <<_ACEOF 119272-/* end confdefs.h. */ 119273-#include <$ac_header> 119274-_ACEOF 119275-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 119276- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 119277- ac_status=$? 119278- grep -v '^ *+' conftest.er1 >conftest.err 119279- rm -f conftest.er1 119280- cat conftest.err >&5 119281- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119282- (exit $ac_status); } >/dev/null; then 119283- if test -s conftest.err; then 119284- ac_cpp_err=$ac_c_preproc_warn_flag 119285- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 119286- else 119287- ac_cpp_err= 119288- fi 119289-else 119290- ac_cpp_err=yes 119291-fi 119292-if test -z "$ac_cpp_err"; then 119293- ac_header_preproc=yes 119294-else 119295- echo "$as_me: failed program was:" >&5 119296-sed 's/^/| /' conftest.$ac_ext >&5 119297- 119298- ac_header_preproc=no 119299-fi 119300-rm -f conftest.err conftest.$ac_ext 119301-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 119302-echo "${ECHO_T}$ac_header_preproc" >&6 119303- 119304-# So? What about this header? 119305-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 119306- yes:no: ) 119307- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 119308-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 119309- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 119310-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 119311- ac_header_preproc=yes 119312- ;; 119313- no:yes:* ) 119314- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 119315-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 119316- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 119317-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 119318- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 119319-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 119320- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 119321-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 119322- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 119323-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 119324- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 119325-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 119326- ( 119327- cat <<\_ASBOX 119328-## ------------------------------------------ ## 119329-## Report this to the AC_PACKAGE_NAME lists. ## 119330-## ------------------------------------------ ## 119331-_ASBOX 119332- ) | 119333- sed "s/^/$as_me: WARNING: /" >&2 119334- ;; 119335-esac 119336-echo "$as_me:$LINENO: checking for $ac_header" >&5 119337-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 119338-if eval "test \"\${$as_ac_Header+set}\" = set"; then 119339- echo $ECHO_N "(cached) $ECHO_C" >&6 119340+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 119341+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 119342+echo "configure:80571: checking for $ac_hdr" >&5 119343+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 119344+ echo $ac_n "(cached) $ac_c" 1>&6 119345+else 119346+ cat > conftest.$ac_ext <<EOF 119347+#line 80576 "configure" 119348+#include "confdefs.h" 119349+#include <$ac_hdr> 119350+EOF 119351+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 119352+{ (eval echo configure:80581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 119353+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 119354+if test -z "$ac_err"; then 119355+ rm -rf conftest* 119356+ eval "ac_cv_header_$ac_safe=yes" 119357 else 119358- eval "$as_ac_Header=\$ac_header_preproc" 119359+ echo "$ac_err" >&5 119360+ echo "configure: failed program was:" >&5 119361+ cat conftest.$ac_ext >&5 119362+ rm -rf conftest* 119363+ eval "ac_cv_header_$ac_safe=no" 119364 fi 119365-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 119366-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 119367- 119368+rm -f conftest* 119369 fi 119370-if test `eval echo '${'$as_ac_Header'}'` = yes; then 119371- cat >>confdefs.h <<_ACEOF 119372-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 119373-_ACEOF 119374- 119375+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 119376+ echo "$ac_t""yes" 1>&6 119377+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 119378+ cat >> confdefs.h <<EOF 119379+#define $ac_tr_hdr 1 119380+EOF 119381+ 119382+else 119383+ echo "$ac_t""no" 1>&6 119384 fi 119385- 119386 done 119387 119388- 119389+ 119390 ext_builddir=ext/recode 119391 ext_srcdir=$abs_srcdir/ext/recode 119392 119393@@ -103689,15 +80611,15 @@ 119394 119395 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 119396 PHP_RECODE_SHARED=no 119397- 119398- 119399+ 119400+ 119401 case ext/recode in 119402 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119403 /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119404 *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119405 esac 119406- 119407- 119408+ 119409+ 119410 119411 b_c_pre=$php_c_pre 119412 b_cxx_pre=$php_cxx_pre 119413@@ -103710,12 +80632,12 @@ 119414 119415 old_IFS=$IFS 119416 for ac_src in recode.c; do 119417- 119418+ 119419 IFS=. 119420 set $ac_src 119421 ac_obj=$1 119422 IFS=$old_IFS 119423- 119424+ 119425 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119426 119427 case $ac_src in 119428@@ -103739,14 +80661,14 @@ 119429 else 119430 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 119431 PHP_RECODE_SHARED=yes 119432- 119433+ 119434 case ext/recode in 119435 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119436 /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119437 *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119438 esac 119439- 119440- 119441+ 119442+ 119443 119444 b_c_pre=$shared_c_pre 119445 b_cxx_pre=$shared_cxx_pre 119446@@ -103759,12 +80681,12 @@ 119447 119448 old_IFS=$IFS 119449 for ac_src in recode.c; do 119450- 119451+ 119452 IFS=. 119453 set $ac_src 119454 ac_obj=$1 119455 IFS=$old_IFS 119456- 119457+ 119458 shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" 119459 119460 case $ac_src in 119461@@ -103782,7 +80704,7 @@ 119462 119463 case $host_alias in 119464 *netware*) 119465- 119466+ 119467 install_modules="install-modules" 119468 119469 case $host_alias in 119470@@ -103792,7 +80714,7 @@ 119471 ;; 119472 *netware*) 119473 suffix=nlm 119474- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(RECODE_SHARED_LIBADD)' 119475+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' 119476 ;; 119477 *) 119478 suffix=la 119479@@ -103805,7 +80727,7 @@ 119480 else 119481 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" 119482 fi 119483- 119484+ 119485 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" 119486 119487 cat >>Makefile.objects<<EOF 119488@@ -103819,7 +80741,7 @@ 119489 119490 ;; 119491 *) 119492- 119493+ 119494 install_modules="install-modules" 119495 119496 case $host_alias in 119497@@ -103829,7 +80751,7 @@ 119498 ;; 119499 *netware*) 119500 suffix=nlm 119501- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(ODE_SHARED_LIBADD)' 119502+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(RECODE, 3)_SHARED_LIBADD)' 119503 ;; 119504 *) 119505 suffix=la 119506@@ -103842,7 +80764,7 @@ 119507 else 119508 PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix" 119509 fi 119510- 119511+ 119512 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" 119513 119514 cat >>Makefile.objects<<EOF 119515@@ -103856,10 +80778,9 @@ 119516 119517 ;; 119518 esac 119519- 119520-cat >>confdefs.h <<_ACEOF 119521+ cat >> confdefs.h <<EOF 119522 #define COMPILE_DL_RECODE 1 119523-_ACEOF 119524+EOF 119525 119526 fi 119527 fi 119528@@ -103868,15 +80789,15 @@ 119529 PHP_RECODE_SHARED=no 119530 case "$PHP_SAPI" in 119531 cgi|embed) 119532- 119533- 119534+ 119535+ 119536 case ext/recode in 119537 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119538 /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119539 *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119540 esac 119541- 119542- 119543+ 119544+ 119545 119546 b_c_pre=$php_c_pre 119547 b_cxx_pre=$php_cxx_pre 119548@@ -103889,12 +80810,12 @@ 119549 119550 old_IFS=$IFS 119551 for ac_src in recode.c; do 119552- 119553+ 119554 IFS=. 119555 set $ac_src 119556 ac_obj=$1 119557 IFS=$old_IFS 119558- 119559+ 119560 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119561 119562 case $ac_src in 119563@@ -103914,15 +80835,15 @@ 119564 EXT_STATIC="$EXT_STATIC recode" 119565 ;; 119566 *) 119567- 119568- 119569+ 119570+ 119571 case ext/recode in 119572 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119573 /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119574 *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119575 esac 119576- 119577- 119578+ 119579+ 119580 119581 b_c_pre=$php_c_pre 119582 b_cxx_pre=$php_cxx_pre 119583@@ -103935,13 +80856,13 @@ 119584 119585 old_IFS=$IFS 119586 for ac_src in recode.c; do 119587- 119588+ 119589 IFS=. 119590 set $ac_src 119591 ac_obj=$1 119592 IFS=$old_IFS 119593- 119594- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 119595+ 119596+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119597 119598 case $ac_src in 119599 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 119600@@ -103961,15 +80882,15 @@ 119601 esac 119602 EXT_CLI_STATIC="$EXT_CLI_STATIC recode" 119603 fi 119604- 119605- 119606+ 119607+ 119608 BUILD_DIR="$BUILD_DIR $ext_builddir" 119609- 119610+ 119611 119612 119613 if test "$ext_builddir" = "."; then 119614 PHP_PECL_EXTENSION=recode 119615- 119616+ 119617 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 119618 119619 fi 119620@@ -103977,10 +80898,9 @@ 119621 fi 119622 119623 119624- 119625-cat >>confdefs.h <<\_ACEOF 119626+cat >> confdefs.h <<\EOF 119627 #define HAVE_REFLECTION 1 119628-_ACEOF 119629+EOF 119630 119631 119632 ext_builddir=ext/reflection 119633@@ -103990,15 +80910,15 @@ 119634 119635 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 119636 PHP_REFLECTION_SHARED=no 119637- 119638- 119639+ 119640+ 119641 case ext/reflection in 119642 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119643 /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119644 *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119645 esac 119646- 119647- 119648+ 119649+ 119650 119651 b_c_pre=$php_c_pre 119652 b_cxx_pre=$php_cxx_pre 119653@@ -104011,12 +80931,12 @@ 119654 119655 old_IFS=$IFS 119656 for ac_src in php_reflection.c; do 119657- 119658+ 119659 IFS=. 119660 set $ac_src 119661 ac_obj=$1 119662 IFS=$old_IFS 119663- 119664+ 119665 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119666 119667 case $ac_src in 119668@@ -104040,14 +80960,14 @@ 119669 else 119670 if test "no" = "shared" || test "no" = "yes"; then 119671 PHP_REFLECTION_SHARED=yes 119672- 119673+ 119674 case ext/reflection in 119675 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119676 /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119677 *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119678 esac 119679- 119680- 119681+ 119682+ 119683 119684 b_c_pre=$shared_c_pre 119685 b_cxx_pre=$shared_cxx_pre 119686@@ -104060,12 +80980,12 @@ 119687 119688 old_IFS=$IFS 119689 for ac_src in php_reflection.c; do 119690- 119691+ 119692 IFS=. 119693 set $ac_src 119694 ac_obj=$1 119695 IFS=$old_IFS 119696- 119697+ 119698 shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" 119699 119700 case $ac_src in 119701@@ -104083,7 +81003,7 @@ 119702 119703 case $host_alias in 119704 *netware*) 119705- 119706+ 119707 install_modules="install-modules" 119708 119709 case $host_alias in 119710@@ -104093,7 +81013,7 @@ 119711 ;; 119712 *netware*) 119713 suffix=nlm 119714- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(REFLECTION_SHARED_LIBADD)' 119715+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' 119716 ;; 119717 *) 119718 suffix=la 119719@@ -104106,7 +81026,7 @@ 119720 else 119721 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" 119722 fi 119723- 119724+ 119725 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" 119726 119727 cat >>Makefile.objects<<EOF 119728@@ -104120,7 +81040,7 @@ 119729 119730 ;; 119731 *) 119732- 119733+ 119734 install_modules="install-modules" 119735 119736 case $host_alias in 119737@@ -104130,7 +81050,7 @@ 119738 ;; 119739 *netware*) 119740 suffix=nlm 119741- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(LECTION_SHARED_LIBADD)' 119742+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)' 119743 ;; 119744 *) 119745 suffix=la 119746@@ -104143,7 +81063,7 @@ 119747 else 119748 PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix" 119749 fi 119750- 119751+ 119752 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" 119753 119754 cat >>Makefile.objects<<EOF 119755@@ -104157,10 +81077,9 @@ 119756 119757 ;; 119758 esac 119759- 119760-cat >>confdefs.h <<_ACEOF 119761+ cat >> confdefs.h <<EOF 119762 #define COMPILE_DL_REFLECTION 1 119763-_ACEOF 119764+EOF 119765 119766 fi 119767 fi 119768@@ -104169,15 +81088,15 @@ 119769 PHP_REFLECTION_SHARED=no 119770 case "$PHP_SAPI" in 119771 cgi|embed) 119772- 119773- 119774+ 119775+ 119776 case ext/reflection in 119777 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119778 /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119779 *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119780 esac 119781- 119782- 119783+ 119784+ 119785 119786 b_c_pre=$php_c_pre 119787 b_cxx_pre=$php_cxx_pre 119788@@ -104190,12 +81109,12 @@ 119789 119790 old_IFS=$IFS 119791 for ac_src in php_reflection.c; do 119792- 119793+ 119794 IFS=. 119795 set $ac_src 119796 ac_obj=$1 119797 IFS=$old_IFS 119798- 119799+ 119800 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119801 119802 case $ac_src in 119803@@ -104215,15 +81134,15 @@ 119804 EXT_STATIC="$EXT_STATIC reflection" 119805 ;; 119806 *) 119807- 119808- 119809+ 119810+ 119811 case ext/reflection in 119812 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 119813 /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 119814 *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 119815 esac 119816- 119817- 119818+ 119819+ 119820 119821 b_c_pre=$php_c_pre 119822 b_cxx_pre=$php_cxx_pre 119823@@ -104236,13 +81155,13 @@ 119824 119825 old_IFS=$IFS 119826 for ac_src in php_reflection.c; do 119827- 119828+ 119829 IFS=. 119830 set $ac_src 119831 ac_obj=$1 119832 IFS=$old_IFS 119833- 119834- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 119835+ 119836+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 119837 119838 case $ac_src in 119839 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 119840@@ -104262,15 +81181,15 @@ 119841 esac 119842 EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" 119843 fi 119844- 119845- 119846+ 119847+ 119848 BUILD_DIR="$BUILD_DIR $ext_builddir" 119849- 119850+ 119851 119852 119853 if test "$ext_builddir" = "."; then 119854 PHP_PECL_EXTENSION=reflection 119855- 119856+ 119857 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 119858 119859 fi 119860@@ -104280,18 +81199,19 @@ 119861 119862 php_enable_session=yes 119863 119864-echo "$as_me:$LINENO: checking whether to enable PHP sessions" >&5 119865-echo $ECHO_N "checking whether to enable PHP sessions... $ECHO_C" >&6 119866+echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 119867+echo "configure:81204: checking whether to enable PHP sessions" >&5 119868 # Check whether --enable-session or --disable-session was given. 119869 if test "${enable_session+set}" = set; then 119870 enableval="$enable_session" 119871 PHP_SESSION=$enableval 119872 else 119873- 119874+ 119875 PHP_SESSION=yes 119876 test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL 119877 119878-fi; 119879+fi 119880+ 119881 119882 119883 ext_output="yes, shared" 119884@@ -104315,8 +81235,7 @@ 119885 119886 119887 119888-echo "$as_me:$LINENO: result: $ext_output" >&5 119889-echo "${ECHO_T}$ext_output" >&6 119890+echo "$ac_t""$ext_output" 1>&6 119891 119892 119893 119894@@ -104324,47 +81243,43 @@ 119895 119896 php_with_mm=no 119897 119898-echo "$as_me:$LINENO: checking for mm support" >&5 119899-echo $ECHO_N "checking for mm support... $ECHO_C" >&6 119900- 119901+echo $ac_n "checking for mm support""... $ac_c" 1>&6 119902+echo "configure:81248: checking for mm support" >&5 119903 # Check whether --with-mm or --without-mm was given. 119904 if test "${with_mm+set}" = set; then 119905 withval="$with_mm" 119906 PHP_MM=$withval 119907 else 119908- 119909+ 119910 PHP_MM=no 119911+ 119912 119913+fi 119914 119915-fi; 119916 119917 ext_output=$PHP_MM 119918-echo "$as_me:$LINENO: result: $ext_output" >&5 119919-echo "${ECHO_T}$ext_output" >&6 119920+echo "$ac_t""$ext_output" 1>&6 119921 119922 119923 119924 119925 if test "$PHP_SESSION" != "no"; then 119926- 119927- echo "$as_me:$LINENO: checking whether pwrite works" >&5 119928-echo $ECHO_N "checking whether pwrite works... $ECHO_C" >&6 119929-if test "${ac_cv_pwrite+set}" = set; then 119930- echo $ECHO_N "(cached) $ECHO_C" >&6 119931+ 119932+ echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 119933+echo "configure:81270: checking whether pwrite works" >&5 119934+if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then 119935+ echo $ac_n "(cached) $ac_c" 1>&6 119936 else 119937- 119938- 119939+ 119940+ 119941 if test "$cross_compiling" = yes; then 119942- 119943+ 119944 ac_cv_pwrite=no 119945- 119946+ 119947 else 119948- cat >conftest.$ac_ext <<_ACEOF 119949-/* confdefs.h. */ 119950-_ACEOF 119951-cat confdefs.h >>conftest.$ac_ext 119952-cat >>conftest.$ac_ext <<_ACEOF 119953-/* end confdefs.h. */ 119954+ cat > conftest.$ac_ext <<EOF 119955+#line 81282 "configure" 119956+#include "confdefs.h" 119957 119958 #include <sys/types.h> 119959 #include <sys/stat.h> 119960@@ -104382,48 +81297,35 @@ 119961 exit(0); 119962 } 119963 119964- 119965-_ACEOF 119966-rm -f conftest$ac_exeext 119967-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 119968- (eval $ac_link) 2>&5 119969- ac_status=$? 119970- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119971- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 119972- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 119973- (eval $ac_try) 2>&5 119974- ac_status=$? 119975- echo "$as_me:$LINENO: \$? = $ac_status" >&5 119976- (exit $ac_status); }; }; then 119977- 119978+ 119979+EOF 119980+if { (eval echo configure:81303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 119981+then 119982+ 119983 ac_cv_pwrite=yes 119984- 119985+ 119986 else 119987- echo "$as_me: program exited with status $ac_status" >&5 119988-echo "$as_me: failed program was:" >&5 119989-sed 's/^/| /' conftest.$ac_ext >&5 119990- 119991-( exit $ac_status ) 119992- 119993+ echo "configure: failed program was:" >&5 119994+ cat conftest.$ac_ext >&5 119995+ rm -fr conftest* 119996+ 119997 ac_cv_pwrite=no 119998- 119999+ 120000 fi 120001-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 120002+rm -fr conftest* 120003 fi 120004 120005- if test "$ac_cv_pwrite" = "no"; then 120006 120007+ if test "$ac_cv_pwrite" = "no"; then 120008+ 120009 if test "$cross_compiling" = yes; then 120010- 120011+ 120012 ac_cv_pwrite=no 120013- 120014+ 120015 else 120016- cat >conftest.$ac_ext <<_ACEOF 120017-/* confdefs.h. */ 120018-_ACEOF 120019-cat confdefs.h >>conftest.$ac_ext 120020-cat >>conftest.$ac_ext <<_ACEOF 120021-/* end confdefs.h. */ 120022+ cat > conftest.$ac_ext <<EOF 120023+#line 81328 "configure" 120024+#include "confdefs.h" 120025 120026 #include <sys/types.h> 120027 #include <sys/stat.h> 120028@@ -104441,79 +81343,64 @@ 120029 exit(0); 120030 } 120031 120032- 120033-_ACEOF 120034-rm -f conftest$ac_exeext 120035-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 120036- (eval $ac_link) 2>&5 120037- ac_status=$? 120038- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120039- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 120040- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 120041- (eval $ac_try) 2>&5 120042- ac_status=$? 120043- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120044- (exit $ac_status); }; }; then 120045- 120046+ 120047+EOF 120048+if { (eval echo configure:81349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 120049+then 120050+ 120051 ac_cv_pwrite=yes 120052- 120053+ 120054 else 120055- echo "$as_me: program exited with status $ac_status" >&5 120056-echo "$as_me: failed program was:" >&5 120057-sed 's/^/| /' conftest.$ac_ext >&5 120058- 120059-( exit $ac_status ) 120060- 120061+ echo "configure: failed program was:" >&5 120062+ cat conftest.$ac_ext >&5 120063+ rm -fr conftest* 120064+ 120065 ac_cv_pwrite=no 120066- 120067+ 120068 fi 120069-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 120070+rm -fr conftest* 120071 fi 120072 120073+ 120074 if test "$ac_cv_pwrite" = "yes"; then 120075 ac_cv_pwrite=64 120076 fi 120077 fi 120078- 120079+ 120080 fi 120081-echo "$as_me:$LINENO: result: $ac_cv_pwrite" >&5 120082-echo "${ECHO_T}$ac_cv_pwrite" >&6 120083 120084- if test "$ac_cv_pwrite" != "no"; then 120085+echo "$ac_t""$ac_cv_pwrite" 1>&6 120086 120087-cat >>confdefs.h <<\_ACEOF 120088+ if test "$ac_cv_pwrite" != "no"; then 120089+ cat >> confdefs.h <<\EOF 120090 #define HAVE_PWRITE 1 120091-_ACEOF 120092+EOF 120093 120094 if test "$ac_cv_pwrite" = "64"; then 120095- 120096-cat >>confdefs.h <<\_ACEOF 120097+ cat >> confdefs.h <<\EOF 120098 #define PHP_PWRITE_64 1 120099-_ACEOF 120100+EOF 120101 120102 fi 120103- fi 120104+ fi 120105 120106- 120107- echo "$as_me:$LINENO: checking whether pread works" >&5 120108-echo $ECHO_N "checking whether pread works... $ECHO_C" >&6 120109-if test "${ac_cv_pread+set}" = set; then 120110- echo $ECHO_N "(cached) $ECHO_C" >&6 120111+ 120112+ echo $ac_n "checking whether pread works""... $ac_c" 1>&6 120113+echo "configure:81390: checking whether pread works" >&5 120114+if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then 120115+ echo $ac_n "(cached) $ac_c" 1>&6 120116 else 120117- 120118- 120119+ 120120+ 120121 echo test > conftest_in 120122 if test "$cross_compiling" = yes; then 120123- 120124+ 120125 ac_cv_pread=no 120126- 120127+ 120128 else 120129- cat >conftest.$ac_ext <<_ACEOF 120130-/* confdefs.h. */ 120131-_ACEOF 120132-cat confdefs.h >>conftest.$ac_ext 120133-cat >>conftest.$ac_ext <<_ACEOF 120134-/* end confdefs.h. */ 120135+ cat > conftest.$ac_ext <<EOF 120136+#line 81403 "configure" 120137+#include "confdefs.h" 120138 120139 #include <sys/types.h> 120140 #include <sys/stat.h> 120141@@ -104522,7 +81409,7 @@ 120142 #include <errno.h> 120143 120144 main() { 120145- char buf[3]; 120146+ char buf[3]; 120147 int fd = open("conftest_in", O_RDONLY); 120148 if (fd < 0) exit(1); 120149 if (pread(fd, buf, 2, 0) != 2) exit(1); 120150@@ -104530,50 +81417,37 @@ 120151 if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); 120152 exit(0); 120153 } 120154- 120155-_ACEOF 120156-rm -f conftest$ac_exeext 120157-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 120158- (eval $ac_link) 2>&5 120159- ac_status=$? 120160- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120161- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 120162- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 120163- (eval $ac_try) 2>&5 120164- ac_status=$? 120165- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120166- (exit $ac_status); }; }; then 120167- 120168+ 120169+EOF 120170+if { (eval echo configure:81423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 120171+then 120172+ 120173 ac_cv_pread=yes 120174- 120175+ 120176 else 120177- echo "$as_me: program exited with status $ac_status" >&5 120178-echo "$as_me: failed program was:" >&5 120179-sed 's/^/| /' conftest.$ac_ext >&5 120180- 120181-( exit $ac_status ) 120182- 120183+ echo "configure: failed program was:" >&5 120184+ cat conftest.$ac_ext >&5 120185+ rm -fr conftest* 120186+ 120187 ac_cv_pread=no 120188- 120189+ 120190 fi 120191-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 120192+rm -fr conftest* 120193 fi 120194+ 120195 rm -f conftest_in 120196 120197 if test "$ac_cv_pread" = "no"; then 120198- 120199+ 120200 echo test > conftest_in 120201 if test "$cross_compiling" = yes; then 120202- 120203+ 120204 ac_cv_pread=no 120205- 120206+ 120207 else 120208- cat >conftest.$ac_ext <<_ACEOF 120209-/* confdefs.h. */ 120210-_ACEOF 120211-cat confdefs.h >>conftest.$ac_ext 120212-cat >>conftest.$ac_ext <<_ACEOF 120213-/* end confdefs.h. */ 120214+ cat > conftest.$ac_ext <<EOF 120215+#line 81450 "configure" 120216+#include "confdefs.h" 120217 120218 #include <sys/types.h> 120219 #include <sys/stat.h> 120220@@ -104582,7 +81456,7 @@ 120221 #include <errno.h> 120222 ssize_t pread(int, void *, size_t, off64_t); 120223 main() { 120224- char buf[3]; 120225+ char buf[3]; 120226 int fd = open("conftest_in", O_RDONLY); 120227 if (fd < 0) exit(1); 120228 if (pread(fd, buf, 2, 0) != 2) exit(1); 120229@@ -104590,61 +81464,49 @@ 120230 if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); 120231 exit(0); 120232 } 120233- 120234-_ACEOF 120235-rm -f conftest$ac_exeext 120236-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 120237- (eval $ac_link) 2>&5 120238- ac_status=$? 120239- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120240- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 120241- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 120242- (eval $ac_try) 2>&5 120243- ac_status=$? 120244- echo "$as_me:$LINENO: \$? = $ac_status" >&5 120245- (exit $ac_status); }; }; then 120246- 120247+ 120248+EOF 120249+if { (eval echo configure:81470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 120250+then 120251+ 120252 ac_cv_pread=yes 120253- 120254+ 120255 else 120256- echo "$as_me: program exited with status $ac_status" >&5 120257-echo "$as_me: failed program was:" >&5 120258-sed 's/^/| /' conftest.$ac_ext >&5 120259- 120260-( exit $ac_status ) 120261- 120262+ echo "configure: failed program was:" >&5 120263+ cat conftest.$ac_ext >&5 120264+ rm -fr conftest* 120265+ 120266 ac_cv_pread=no 120267- 120268+ 120269 fi 120270-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 120271+rm -fr conftest* 120272 fi 120273+ 120274 rm -f conftest_in 120275 120276 if test "$ac_cv_pread" = "yes"; then 120277 ac_cv_pread=64 120278 fi 120279 fi 120280- 120281+ 120282 fi 120283-echo "$as_me:$LINENO: result: $ac_cv_pread" >&5 120284-echo "${ECHO_T}$ac_cv_pread" >&6 120285 120286- if test "$ac_cv_pread" != "no"; then 120287+echo "$ac_t""$ac_cv_pread" 1>&6 120288 120289-cat >>confdefs.h <<\_ACEOF 120290+ if test "$ac_cv_pread" != "no"; then 120291+ cat >> confdefs.h <<\EOF 120292 #define HAVE_PREAD 1 120293-_ACEOF 120294+EOF 120295 120296 if test "$ac_cv_pread" = "64"; then 120297- 120298-cat >>confdefs.h <<\_ACEOF 120299+ cat >> confdefs.h <<\EOF 120300 #define PHP_PREAD_64 1 120301-_ACEOF 120302+EOF 120303 120304 fi 120305- fi 120306- 120307+ fi 120308 120309+ 120310 ext_builddir=ext/session 120311 ext_srcdir=$abs_srcdir/ext/session 120312 120313@@ -104652,15 +81514,15 @@ 120314 120315 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 120316 PHP_SESSION_SHARED=no 120317- 120318- 120319+ 120320+ 120321 case ext/session in 120322 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120323 /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120324 *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120325 esac 120326- 120327- 120328+ 120329+ 120330 120331 b_c_pre=$php_c_pre 120332 b_cxx_pre=$php_cxx_pre 120333@@ -104673,12 +81535,12 @@ 120334 120335 old_IFS=$IFS 120336 for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do 120337- 120338+ 120339 IFS=. 120340 set $ac_src 120341 ac_obj=$1 120342 IFS=$old_IFS 120343- 120344+ 120345 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 120346 120347 case $ac_src in 120348@@ -104702,14 +81564,14 @@ 120349 else 120350 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 120351 PHP_SESSION_SHARED=yes 120352- 120353+ 120354 case ext/session in 120355 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120356 /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120357 *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120358 esac 120359- 120360- 120361+ 120362+ 120363 120364 b_c_pre=$shared_c_pre 120365 b_cxx_pre=$shared_cxx_pre 120366@@ -104722,12 +81584,12 @@ 120367 120368 old_IFS=$IFS 120369 for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do 120370- 120371+ 120372 IFS=. 120373 set $ac_src 120374 ac_obj=$1 120375 IFS=$old_IFS 120376- 120377+ 120378 shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" 120379 120380 case $ac_src in 120381@@ -104745,7 +81607,7 @@ 120382 120383 case $host_alias in 120384 *netware*) 120385- 120386+ 120387 install_modules="install-modules" 120388 120389 case $host_alias in 120390@@ -104755,7 +81617,7 @@ 120391 ;; 120392 *netware*) 120393 suffix=nlm 120394- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(SESSION_SHARED_LIBADD)' 120395+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' 120396 ;; 120397 *) 120398 suffix=la 120399@@ -104768,7 +81630,7 @@ 120400 else 120401 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" 120402 fi 120403- 120404+ 120405 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" 120406 120407 cat >>Makefile.objects<<EOF 120408@@ -104782,7 +81644,7 @@ 120409 120410 ;; 120411 *) 120412- 120413+ 120414 install_modules="install-modules" 120415 120416 case $host_alias in 120417@@ -104792,7 +81654,7 @@ 120418 ;; 120419 *netware*) 120420 suffix=nlm 120421- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(SION_SHARED_LIBADD)' 120422+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SESSION, 3)_SHARED_LIBADD)' 120423 ;; 120424 *) 120425 suffix=la 120426@@ -104805,7 +81667,7 @@ 120427 else 120428 PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix" 120429 fi 120430- 120431+ 120432 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" 120433 120434 cat >>Makefile.objects<<EOF 120435@@ -104819,10 +81681,9 @@ 120436 120437 ;; 120438 esac 120439- 120440-cat >>confdefs.h <<_ACEOF 120441+ cat >> confdefs.h <<EOF 120442 #define COMPILE_DL_SESSION 1 120443-_ACEOF 120444+EOF 120445 120446 fi 120447 fi 120448@@ -104831,15 +81692,15 @@ 120449 PHP_SESSION_SHARED=no 120450 case "$PHP_SAPI" in 120451 cgi|embed) 120452- 120453- 120454+ 120455+ 120456 case ext/session in 120457 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120458 /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120459 *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120460 esac 120461- 120462- 120463+ 120464+ 120465 120466 b_c_pre=$php_c_pre 120467 b_cxx_pre=$php_cxx_pre 120468@@ -104852,12 +81713,12 @@ 120469 120470 old_IFS=$IFS 120471 for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do 120472- 120473+ 120474 IFS=. 120475 set $ac_src 120476 ac_obj=$1 120477 IFS=$old_IFS 120478- 120479+ 120480 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 120481 120482 case $ac_src in 120483@@ -104877,15 +81738,15 @@ 120484 EXT_STATIC="$EXT_STATIC session" 120485 ;; 120486 *) 120487- 120488- 120489+ 120490+ 120491 case ext/session in 120492 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120493 /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120494 *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120495 esac 120496- 120497- 120498+ 120499+ 120500 120501 b_c_pre=$php_c_pre 120502 b_cxx_pre=$php_cxx_pre 120503@@ -104898,13 +81759,13 @@ 120504 120505 old_IFS=$IFS 120506 for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do 120507- 120508+ 120509 IFS=. 120510 set $ac_src 120511 ac_obj=$1 120512 IFS=$old_IFS 120513- 120514- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 120515+ 120516+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 120517 120518 case $ac_src in 120519 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 120520@@ -104924,108 +81785,83 @@ 120521 esac 120522 EXT_CLI_STATIC="$EXT_CLI_STATIC session" 120523 fi 120524- 120525- 120526+ 120527+ 120528 BUILD_DIR="$BUILD_DIR $ext_builddir" 120529- 120530+ 120531 120532 120533 if test "$ext_builddir" = "."; then 120534 PHP_PECL_EXTENSION=session 120535- 120536+ 120537 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 120538 120539 fi 120540 120541- 120542+ 120543 am_i_shared=$PHP_SESSION_SHARED 120544 is_it_shared=$PHP_HASH_SHARED 120545 is_it_enabled=$PHP_HASH 120546 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 120547- { { echo "$as_me:$LINENO: error: 120548+ { echo "configure: error: 120549 You've configured extension session to build statically, but it 120550 depends on extension hash, which you've configured to build shared. 120551 You either need to build session shared or build hash statically for the 120552 build to be successful. 120553-" >&5 120554-echo "$as_me: error: 120555-You've configured extension session to build statically, but it 120556-depends on extension hash, which you've configured to build shared. 120557-You either need to build session shared or build hash statically for the 120558-build to be successful. 120559-" >&2;} 120560- { (exit 1); exit 1; }; } 120561+" 1>&2; exit 1; } 120562 fi 120563 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 120564- { { echo "$as_me:$LINENO: error: 120565+ { echo "configure: error: 120566 You've configured extension session, which depends on extension hash, 120567 but you've either not enabled hash, or have disabled it. 120568-" >&5 120569-echo "$as_me: error: 120570-You've configured extension session, which depends on extension hash, 120571-but you've either not enabled hash, or have disabled it. 120572-" >&2;} 120573- { (exit 1); exit 1; }; } 120574+" 1>&2; exit 1; } 120575 fi 120576- 120577- 120578+ 120579+ 120580 am_i_shared=$PHP_SESSION_SHARED 120581 is_it_shared=$PHP_SPL_SHARED 120582 is_it_enabled=$PHP_SPL 120583 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 120584- { { echo "$as_me:$LINENO: error: 120585+ { echo "configure: error: 120586 You've configured extension session to build statically, but it 120587 depends on extension spl, which you've configured to build shared. 120588 You either need to build session shared or build spl statically for the 120589 build to be successful. 120590-" >&5 120591-echo "$as_me: error: 120592-You've configured extension session to build statically, but it 120593-depends on extension spl, which you've configured to build shared. 120594-You either need to build session shared or build spl statically for the 120595-build to be successful. 120596-" >&2;} 120597- { (exit 1); exit 1; }; } 120598+" 1>&2; exit 1; } 120599 fi 120600 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 120601- { { echo "$as_me:$LINENO: error: 120602+ { echo "configure: error: 120603 You've configured extension session, which depends on extension spl, 120604 but you've either not enabled spl, or have disabled it. 120605-" >&5 120606-echo "$as_me: error: 120607-You've configured extension session, which depends on extension spl, 120608-but you've either not enabled spl, or have disabled it. 120609-" >&2;} 120610- { (exit 1); exit 1; }; } 120611+" 1>&2; exit 1; } 120612 fi 120613- 120614- 120615+ 120616+ 120617 PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" 120618 120619- 120620- 120621+ 120622+ 120623 header_path=ext/session 120624 for header_file in php_session.h mod_files.h mod_user.h; do 120625 hp_hf="$header_path/$header_file" 120626- 120627- 120628+ 120629+ 120630 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 120631- 120632+ 120633 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 120634 if test -n "$unique" && test "`eval $cmd`" = "" ; then 120635 eval "INSTALLHEADERS$unique=set" 120636- 120637+ 120638 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 120639- 120640+ 120641 fi 120642 120643- done 120644- 120645- 120646+ done 120647+ 120648 120649-cat >>confdefs.h <<\_ACEOF 120650+ cat >> confdefs.h <<\EOF 120651 #define HAVE_PHP_SESSION 1 120652-_ACEOF 120653+EOF 120654 120655 fi 120656 120657@@ -105035,99 +81871,97 @@ 120658 done 120659 120660 if test -z "$MM_DIR" ; then 120661- { { echo "$as_me:$LINENO: error: cannot find mm library" >&5 120662-echo "$as_me: error: cannot find mm library" >&2;} 120663- { (exit 1); exit 1; }; } 120664+ { echo "configure: error: cannot find mm library" 1>&2; exit 1; } 120665 fi 120666- 120667- 120668+ 120669+ 120670 120671 if test "$ext_shared" = "yes"; then 120672 SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" 120673 if test -n "$MM_DIR/$PHP_LIBDIR"; then 120674- 120675+ 120676 if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 120677- 120678+ 120679 if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 120680 ai_p=$MM_DIR/$PHP_LIBDIR 120681 else 120682- 120683+ 120684 ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 120685- 120686+ 120687 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 120688 ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" 120689 fi 120690 120691- 120692+ 120693 if test "$ext_shared" = "yes"; then 120694 SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" 120695 test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" 120696 else 120697- 120698- 120699- 120700+ 120701+ 120702+ 120703 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 120704- 120705+ 120706 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 120707 if test -n "$unique" && test "`eval $cmd`" = "" ; then 120708 eval "LIBPATH$unique=set" 120709- 120710+ 120711 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 120712 LDFLAGS="$LDFLAGS -L$ai_p" 120713 PHP_RPATHS="$PHP_RPATHS $ai_p" 120714- 120715+ 120716 fi 120717 120718 120719 fi 120720- 120721+ 120722 fi 120723 120724 fi 120725 else 120726- 120727+ 120728 120729 if test -n "$MM_DIR/$PHP_LIBDIR"; then 120730- 120731+ 120732 if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then 120733- 120734+ 120735 if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 120736 ai_p=$MM_DIR/$PHP_LIBDIR 120737 else 120738- 120739+ 120740 ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 120741- 120742+ 120743 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 120744 ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" 120745 fi 120746 120747- 120748- 120749- 120750- 120751+ 120752+ 120753+ 120754+ 120755 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 120756- 120757+ 120758 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 120759 if test -n "$unique" && test "`eval $cmd`" = "" ; then 120760 eval "LIBPATH$unique=set" 120761- 120762+ 120763 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 120764 LDFLAGS="$LDFLAGS -L$ai_p" 120765 PHP_RPATHS="$PHP_RPATHS $ai_p" 120766- 120767+ 120768 fi 120769 120770 120771- 120772+ 120773 fi 120774 120775 fi 120776- 120777- 120778+ 120779+ 120780 case mm in 120781 c|c_r|pthread*) ;; 120782- *) 120783- LIBS="-lmm $LIBS" 120784+ *) 120785+ LIBS="-lmm $LIBS" 120786 ;; 120787 esac 120788 120789@@ -105137,77 +81971,77 @@ 120790 fi 120791 120792 120793- 120794+ 120795 if test "$MM_DIR/include" != "/usr/include"; then 120796- 120797+ 120798 if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then 120799 ai_p=$MM_DIR/include 120800 else 120801- 120802+ 120803 ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 120804- 120805+ 120806 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 120807 ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" 120808 fi 120809 120810- 120811- 120812+ 120813+ 120814 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 120815- 120816+ 120817 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 120818 if test -n "$unique" && test "`eval $cmd`" = "" ; then 120819 eval "INCLUDEPATH$unique=set" 120820- 120821+ 120822 if test ""; then 120823 INCLUDES="-I$ai_p $INCLUDES" 120824 else 120825 INCLUDES="$INCLUDES -I$ai_p" 120826 fi 120827- 120828+ 120829 fi 120830 120831 fi 120832 120833- 120834- 120835+ 120836+ 120837 for header_file in ext/session/mod_mm.h; do 120838- 120839- 120840+ 120841+ 120842 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 120843- 120844+ 120845 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 120846 if test -n "$unique" && test "`eval $cmd`" = "" ; then 120847 eval "INSTALLHEADERS$unique=set" 120848- 120849+ 120850 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 120851- 120852+ 120853 fi 120854 120855- done 120856- 120857- 120858+ done 120859+ 120860 120861-cat >>confdefs.h <<\_ACEOF 120862+ cat >> confdefs.h <<\EOF 120863 #define HAVE_LIBMM 1 120864-_ACEOF 120865+EOF 120866 120867 fi 120868 120869 120870 php_enable_shmop=no 120871 120872-echo "$as_me:$LINENO: checking whether to enable shmop support" >&5 120873-echo $ECHO_N "checking whether to enable shmop support... $ECHO_C" >&6 120874+echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 120875+echo "configure:82034: checking whether to enable shmop support" >&5 120876 # Check whether --enable-shmop or --disable-shmop was given. 120877 if test "${enable_shmop+set}" = set; then 120878 enableval="$enable_shmop" 120879 PHP_SHMOP=$enableval 120880 else 120881- 120882+ 120883 PHP_SHMOP=no 120884 test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL 120885 120886-fi; 120887+fi 120888+ 120889 120890 120891 ext_output="yes, shared" 120892@@ -105231,19 +82065,17 @@ 120893 120894 120895 120896-echo "$as_me:$LINENO: result: $ext_output" >&5 120897-echo "${ECHO_T}$ext_output" >&6 120898+echo "$ac_t""$ext_output" 1>&6 120899 120900 120901 120902 120903 if test "$PHP_SHMOP" != "no"; then 120904- 120905-cat >>confdefs.h <<\_ACEOF 120906+ cat >> confdefs.h <<\EOF 120907 #define HAVE_SHMOP 1 120908-_ACEOF 120909- 120910+EOF 120911 120912+ 120913 ext_builddir=ext/shmop 120914 ext_srcdir=$abs_srcdir/ext/shmop 120915 120916@@ -105251,15 +82083,15 @@ 120917 120918 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 120919 PHP_SHMOP_SHARED=no 120920- 120921- 120922+ 120923+ 120924 case ext/shmop in 120925 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120926 /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120927 *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120928 esac 120929- 120930- 120931+ 120932+ 120933 120934 b_c_pre=$php_c_pre 120935 b_cxx_pre=$php_cxx_pre 120936@@ -105272,12 +82104,12 @@ 120937 120938 old_IFS=$IFS 120939 for ac_src in shmop.c; do 120940- 120941+ 120942 IFS=. 120943 set $ac_src 120944 ac_obj=$1 120945 IFS=$old_IFS 120946- 120947+ 120948 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 120949 120950 case $ac_src in 120951@@ -105301,14 +82133,14 @@ 120952 else 120953 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 120954 PHP_SHMOP_SHARED=yes 120955- 120956+ 120957 case ext/shmop in 120958 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 120959 /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 120960 *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 120961 esac 120962- 120963- 120964+ 120965+ 120966 120967 b_c_pre=$shared_c_pre 120968 b_cxx_pre=$shared_cxx_pre 120969@@ -105321,12 +82153,12 @@ 120970 120971 old_IFS=$IFS 120972 for ac_src in shmop.c; do 120973- 120974+ 120975 IFS=. 120976 set $ac_src 120977 ac_obj=$1 120978 IFS=$old_IFS 120979- 120980+ 120981 shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" 120982 120983 case $ac_src in 120984@@ -105344,7 +82176,7 @@ 120985 120986 case $host_alias in 120987 *netware*) 120988- 120989+ 120990 install_modules="install-modules" 120991 120992 case $host_alias in 120993@@ -105354,7 +82186,7 @@ 120994 ;; 120995 *netware*) 120996 suffix=nlm 120997- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(SHMOP_SHARED_LIBADD)' 120998+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' 120999 ;; 121000 *) 121001 suffix=la 121002@@ -105367,7 +82199,7 @@ 121003 else 121004 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" 121005 fi 121006- 121007+ 121008 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" 121009 121010 cat >>Makefile.objects<<EOF 121011@@ -105381,7 +82213,7 @@ 121012 121013 ;; 121014 *) 121015- 121016+ 121017 install_modules="install-modules" 121018 121019 case $host_alias in 121020@@ -105391,7 +82223,7 @@ 121021 ;; 121022 *netware*) 121023 suffix=nlm 121024- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(OP_SHARED_LIBADD)' 121025+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SHMOP, 3)_SHARED_LIBADD)' 121026 ;; 121027 *) 121028 suffix=la 121029@@ -105404,7 +82236,7 @@ 121030 else 121031 PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix" 121032 fi 121033- 121034+ 121035 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" 121036 121037 cat >>Makefile.objects<<EOF 121038@@ -105418,10 +82250,9 @@ 121039 121040 ;; 121041 esac 121042- 121043-cat >>confdefs.h <<_ACEOF 121044+ cat >> confdefs.h <<EOF 121045 #define COMPILE_DL_SHMOP 1 121046-_ACEOF 121047+EOF 121048 121049 fi 121050 fi 121051@@ -105430,15 +82261,15 @@ 121052 PHP_SHMOP_SHARED=no 121053 case "$PHP_SAPI" in 121054 cgi|embed) 121055- 121056- 121057+ 121058+ 121059 case ext/shmop in 121060 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121061 /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121062 *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121063 esac 121064- 121065- 121066+ 121067+ 121068 121069 b_c_pre=$php_c_pre 121070 b_cxx_pre=$php_cxx_pre 121071@@ -105451,12 +82282,12 @@ 121072 121073 old_IFS=$IFS 121074 for ac_src in shmop.c; do 121075- 121076+ 121077 IFS=. 121078 set $ac_src 121079 ac_obj=$1 121080 IFS=$old_IFS 121081- 121082+ 121083 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 121084 121085 case $ac_src in 121086@@ -105476,15 +82307,15 @@ 121087 EXT_STATIC="$EXT_STATIC shmop" 121088 ;; 121089 *) 121090- 121091- 121092+ 121093+ 121094 case ext/shmop in 121095 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121096 /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121097 *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121098 esac 121099- 121100- 121101+ 121102+ 121103 121104 b_c_pre=$php_c_pre 121105 b_cxx_pre=$php_cxx_pre 121106@@ -105497,13 +82328,13 @@ 121107 121108 old_IFS=$IFS 121109 for ac_src in shmop.c; do 121110- 121111+ 121112 IFS=. 121113 set $ac_src 121114 ac_obj=$1 121115 IFS=$old_IFS 121116- 121117- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 121118+ 121119+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 121120 121121 case $ac_src in 121122 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 121123@@ -105523,15 +82354,15 @@ 121124 esac 121125 EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" 121126 fi 121127- 121128- 121129+ 121130+ 121131 BUILD_DIR="$BUILD_DIR $ext_builddir" 121132- 121133+ 121134 121135 121136 if test "$ext_builddir" = "."; then 121137 PHP_PECL_EXTENSION=shmop 121138- 121139+ 121140 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 121141 121142 fi 121143@@ -105542,18 +82373,19 @@ 121144 121145 php_enable_simplexml=yes 121146 121147-echo "$as_me:$LINENO: checking whether to enable SimpleXML support" >&5 121148-echo $ECHO_N "checking whether to enable SimpleXML support... $ECHO_C" >&6 121149+echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 121150+echo "configure:82378: checking whether to enable SimpleXML support" >&5 121151 # Check whether --enable-simplexml or --disable-simplexml was given. 121152 if test "${enable_simplexml+set}" = set; then 121153 enableval="$enable_simplexml" 121154 PHP_SIMPLEXML=$enableval 121155 else 121156- 121157+ 121158 PHP_SIMPLEXML=yes 121159 test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL 121160 121161-fi; 121162+fi 121163+ 121164 121165 121166 ext_output="yes, shared" 121167@@ -105577,33 +82409,31 @@ 121168 121169 121170 121171-echo "$as_me:$LINENO: result: $ext_output" >&5 121172-echo "${ECHO_T}$ext_output" >&6 121173+echo "$ac_t""$ext_output" 1>&6 121174 121175 121176 121177 121178 if test -z "$PHP_LIBXML_DIR"; then 121179- 121180+ 121181 php_with_libxml_dir=no 121182 121183-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 121184-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 121185- 121186+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 121187+echo "configure:82423: checking libxml2 install dir" >&5 121188 # Check whether --with-libxml-dir or --without-libxml-dir was given. 121189 if test "${with_libxml_dir+set}" = set; then 121190 withval="$with_libxml_dir" 121191 PHP_LIBXML_DIR=$withval 121192 else 121193- 121194+ 121195 PHP_LIBXML_DIR=no 121196+ 121197 121198+fi 121199 121200-fi; 121201 121202 ext_output=$PHP_LIBXML_DIR 121203-echo "$as_me:$LINENO: result: $ext_output" >&5 121204-echo "${ECHO_T}$ext_output" >&6 121205+echo "$ac_t""$ext_output" 1>&6 121206 121207 121208 121209@@ -105611,19 +82441,17 @@ 121210 121211 if test "$PHP_SIMPLEXML" != "no"; then 121212 121213- if test "$PHP_LIBXML" = "no"; then 121214- { { echo "$as_me:$LINENO: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&5 121215-echo "$as_me: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&2;} 121216- { (exit 1); exit 1; }; } 121217+ if test "$PHP_LIBXML" = "no"; then 121218+ { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 121219 fi 121220 121221- 121222-echo "$as_me:$LINENO: checking for xml2-config path" >&5 121223-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 121224-if test "${ac_cv_php_xml2_config_path+set}" = set; then 121225- echo $ECHO_N "(cached) $ECHO_C" >&6 121226+ 121227+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 121228+echo "configure:82451: checking for xml2-config path" >&5 121229+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 121230+ echo $ac_n "(cached) $ac_c" 1>&6 121231 else 121232- 121233+ 121234 for i in $PHP_LIBXML_DIR /usr/local /usr; do 121235 if test -x "$i/bin/xml2-config"; then 121236 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 121237@@ -105632,8 +82460,8 @@ 121238 done 121239 121240 fi 121241-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 121242-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 121243+ 121244+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 121245 121246 if test -x "$ac_cv_php_xml2_config_path"; then 121247 XML2_CONFIG="$ac_cv_php_xml2_config_path" 121248@@ -105646,17 +82474,17 @@ 121249 if test "$LIBXML_VERSION" -ge "2006011"; then 121250 LIBXML_LIBS=`$XML2_CONFIG --libs` 121251 LIBXML_INCS=`$XML2_CONFIG --cflags` 121252- 121253+ 121254 for ac_i in $LIBXML_LIBS; do 121255 case $ac_i in 121256 -pthread) 121257 if test "$ext_shared" = "yes"; then 121258 SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" 121259 else 121260- 121261- 121262+ 121263+ 121264 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 121265- 121266+ 121267 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 121268 if test -n "$unique" && test "`eval $cmd`" = "" ; then 121269 eval "EXTRA_LDFLAGS$unique=set" 121270@@ -105667,20 +82495,20 @@ 121271 ;; 121272 -l*) 121273 ac_ii=`echo $ac_i|cut -c 3-` 121274- 121275- 121276+ 121277+ 121278 case $ac_ii in 121279 c|c_r|pthread*) ;; 121280- *) 121281+ *) 121282 if test "$ext_shared" = "yes"; then 121283- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" 121284+ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" 121285 else 121286- 121287- 121288+ 121289+ 121290 case $ac_ii in 121291 c|c_r|pthread*) ;; 121292- *) 121293- LIBS="$LIBS -l$ac_ii" 121294+ *) 121295+ LIBS="$LIBS -l$ac_ii" 121296 ;; 121297 esac 121298 121299@@ -105693,80 +82521,80 @@ 121300 ;; 121301 -L*) 121302 ac_ii=`echo $ac_i|cut -c 3-` 121303- 121304+ 121305 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 121306- 121307+ 121308 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 121309 ai_p=$ac_ii 121310 else 121311- 121312+ 121313 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 121314- 121315+ 121316 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 121317 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 121318 fi 121319 121320- 121321+ 121322 if test "$ext_shared" = "yes"; then 121323 SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" 121324 test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" 121325 else 121326- 121327- 121328- 121329+ 121330+ 121331+ 121332 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 121333- 121334+ 121335 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 121336 if test -n "$unique" && test "`eval $cmd`" = "" ; then 121337 eval "LIBPATH$unique=set" 121338- 121339+ 121340 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 121341 LDFLAGS="$LDFLAGS -L$ai_p" 121342 PHP_RPATHS="$PHP_RPATHS $ai_p" 121343- 121344+ 121345 fi 121346 121347 121348 fi 121349- 121350+ 121351 fi 121352 121353 ;; 121354 esac 121355 done 121356 121357- 121358+ 121359 for ac_i in $LIBXML_INCS; do 121360 case $ac_i in 121361 -I*) 121362 ac_ii=`echo $ac_i|cut -c 3-` 121363- 121364+ 121365 if test "$ac_ii" != "/usr/include"; then 121366- 121367+ 121368 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 121369 ai_p=$ac_ii 121370 else 121371- 121372+ 121373 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 121374- 121375+ 121376 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 121377 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 121378 fi 121379 121380- 121381- 121382+ 121383+ 121384 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 121385- 121386+ 121387 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 121388 if test -n "$unique" && test "`eval $cmd`" = "" ; then 121389 eval "INCLUDEPATH$unique=set" 121390- 121391+ 121392 if test ""; then 121393 INCLUDES="-I$ai_p $INCLUDES" 121394 else 121395 INCLUDES="$INCLUDES -I$ai_p" 121396 fi 121397- 121398+ 121399 fi 121400 121401 fi 121402@@ -105776,92 +82604,74 @@ 121403 done 121404 121405 121406- echo "$as_me:$LINENO: checking whether libxml build works" >&5 121407-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 121408-if test "${php_cv_libxml_build_works+set}" = set; then 121409- echo $ECHO_N "(cached) $ECHO_C" >&6 121410+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 121411+echo "configure:82609: checking whether libxml build works" >&5 121412+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 121413+ echo $ac_n "(cached) $ac_c" 1>&6 121414 else 121415- 121416- 121417+ 121418+ 121419 old_LIBS=$LIBS 121420 LIBS=" 121421 $SIMPLEXML_SHARED_LIBADD 121422 $LIBS" 121423 if test "$cross_compiling" = yes; then 121424- 121425+ 121426 LIBS=$old_LIBS 121427- 121428+ 121429 else 121430- cat >conftest.$ac_ext <<_ACEOF 121431-/* confdefs.h. */ 121432-_ACEOF 121433-cat confdefs.h >>conftest.$ac_ext 121434-cat >>conftest.$ac_ext <<_ACEOF 121435-/* end confdefs.h. */ 121436- 121437+ cat > conftest.$ac_ext <<EOF 121438+#line 82625 "configure" 121439+#include "confdefs.h" 121440 121441+ 121442 char xmlInitParser(); 121443 int main() { 121444 xmlInitParser(); 121445 return 0; 121446 } 121447- 121448-_ACEOF 121449-rm -f conftest$ac_exeext 121450-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 121451- (eval $ac_link) 2>&5 121452- ac_status=$? 121453- echo "$as_me:$LINENO: \$? = $ac_status" >&5 121454- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 121455- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 121456- (eval $ac_try) 2>&5 121457- ac_status=$? 121458- echo "$as_me:$LINENO: \$? = $ac_status" >&5 121459- (exit $ac_status); }; }; then 121460- 121461+ 121462+EOF 121463+if { (eval echo configure:82636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 121464+then 121465+ 121466 LIBS=$old_LIBS 121467- 121468+ 121469 php_cv_libxml_build_works=yes 121470- 121471- 121472+ 121473+ 121474 else 121475- echo "$as_me: program exited with status $ac_status" >&5 121476-echo "$as_me: failed program was:" >&5 121477-sed 's/^/| /' conftest.$ac_ext >&5 121478- 121479-( exit $ac_status ) 121480- 121481+ echo "configure: failed program was:" >&5 121482+ cat conftest.$ac_ext >&5 121483+ rm -fr conftest* 121484+ 121485 LIBS=$old_LIBS 121486- 121487- echo "$as_me:$LINENO: result: no" >&5 121488-echo "${ECHO_T}no" >&6 121489- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 121490-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 121491- { (exit 1); exit 1; }; } 121492- 121493- 121494+ 121495+ echo "$ac_t""no" 1>&6 121496+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 121497+ 121498+ 121499 fi 121500-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 121501+rm -fr conftest* 121502 fi 121503 121504 121505+ 121506 fi 121507-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 121508-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 121509- if test "$php_cv_libxml_build_works" = "yes"; then 121510 121511-cat >>confdefs.h <<\_ACEOF 121512+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 121513+ if test "$php_cv_libxml_build_works" = "yes"; then 121514+ cat >> confdefs.h <<\EOF 121515 #define HAVE_LIBXML 1 121516-_ACEOF 121517+EOF 121518 121519 fi 121520- 121521- 121522-cat >>confdefs.h <<\_ACEOF 121523+ 121524+ cat >> confdefs.h <<\EOF 121525 #define HAVE_SIMPLEXML 1 121526-_ACEOF 121527- 121528+EOF 121529 121530+ 121531 ext_builddir=ext/simplexml 121532 ext_srcdir=$abs_srcdir/ext/simplexml 121533 121534@@ -105869,15 +82679,15 @@ 121535 121536 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 121537 PHP_SIMPLEXML_SHARED=no 121538- 121539- 121540+ 121541+ 121542 case ext/simplexml in 121543 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121544 /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121545 *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121546 esac 121547- 121548- 121549+ 121550+ 121551 121552 b_c_pre=$php_c_pre 121553 b_cxx_pre=$php_cxx_pre 121554@@ -105890,12 +82700,12 @@ 121555 121556 old_IFS=$IFS 121557 for ac_src in simplexml.c sxe.c; do 121558- 121559+ 121560 IFS=. 121561 set $ac_src 121562 ac_obj=$1 121563 IFS=$old_IFS 121564- 121565+ 121566 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 121567 121568 case $ac_src in 121569@@ -105919,14 +82729,14 @@ 121570 else 121571 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 121572 PHP_SIMPLEXML_SHARED=yes 121573- 121574+ 121575 case ext/simplexml in 121576 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121577 /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121578 *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121579 esac 121580- 121581- 121582+ 121583+ 121584 121585 b_c_pre=$shared_c_pre 121586 b_cxx_pre=$shared_cxx_pre 121587@@ -105939,12 +82749,12 @@ 121588 121589 old_IFS=$IFS 121590 for ac_src in simplexml.c sxe.c; do 121591- 121592+ 121593 IFS=. 121594 set $ac_src 121595 ac_obj=$1 121596 IFS=$old_IFS 121597- 121598+ 121599 shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" 121600 121601 case $ac_src in 121602@@ -105962,7 +82772,7 @@ 121603 121604 case $host_alias in 121605 *netware*) 121606- 121607+ 121608 install_modules="install-modules" 121609 121610 case $host_alias in 121611@@ -105972,7 +82782,7 @@ 121612 ;; 121613 *netware*) 121614 suffix=nlm 121615- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(SIMPLEXML_SHARED_LIBADD)' 121616+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' 121617 ;; 121618 *) 121619 suffix=la 121620@@ -105985,7 +82795,7 @@ 121621 else 121622 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" 121623 fi 121624- 121625+ 121626 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" 121627 121628 cat >>Makefile.objects<<EOF 121629@@ -105999,7 +82809,7 @@ 121630 121631 ;; 121632 *) 121633- 121634+ 121635 install_modules="install-modules" 121636 121637 case $host_alias in 121638@@ -106009,7 +82819,7 @@ 121639 ;; 121640 *netware*) 121641 suffix=nlm 121642- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(PLEXML_SHARED_LIBADD)' 121643+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SIMPLEXML, 3)_SHARED_LIBADD)' 121644 ;; 121645 *) 121646 suffix=la 121647@@ -106022,7 +82832,7 @@ 121648 else 121649 PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix" 121650 fi 121651- 121652+ 121653 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" 121654 121655 cat >>Makefile.objects<<EOF 121656@@ -106036,10 +82846,9 @@ 121657 121658 ;; 121659 esac 121660- 121661-cat >>confdefs.h <<_ACEOF 121662+ cat >> confdefs.h <<EOF 121663 #define COMPILE_DL_SIMPLEXML 1 121664-_ACEOF 121665+EOF 121666 121667 fi 121668 fi 121669@@ -106048,15 +82857,15 @@ 121670 PHP_SIMPLEXML_SHARED=no 121671 case "$PHP_SAPI" in 121672 cgi|embed) 121673- 121674- 121675+ 121676+ 121677 case ext/simplexml in 121678 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121679 /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121680 *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121681 esac 121682- 121683- 121684+ 121685+ 121686 121687 b_c_pre=$php_c_pre 121688 b_cxx_pre=$php_cxx_pre 121689@@ -106069,12 +82878,12 @@ 121690 121691 old_IFS=$IFS 121692 for ac_src in simplexml.c sxe.c; do 121693- 121694+ 121695 IFS=. 121696 set $ac_src 121697 ac_obj=$1 121698 IFS=$old_IFS 121699- 121700+ 121701 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 121702 121703 case $ac_src in 121704@@ -106094,15 +82903,15 @@ 121705 EXT_STATIC="$EXT_STATIC simplexml" 121706 ;; 121707 *) 121708- 121709- 121710+ 121711+ 121712 case ext/simplexml in 121713 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 121714 /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 121715 *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 121716 esac 121717- 121718- 121719+ 121720+ 121721 121722 b_c_pre=$php_c_pre 121723 b_cxx_pre=$php_cxx_pre 121724@@ -106115,13 +82924,13 @@ 121725 121726 old_IFS=$IFS 121727 for ac_src in simplexml.c sxe.c; do 121728- 121729+ 121730 IFS=. 121731 set $ac_src 121732 ac_obj=$1 121733 IFS=$old_IFS 121734- 121735- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 121736+ 121737+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 121738 121739 case $ac_src in 121740 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 121741@@ -106141,116 +82950,88 @@ 121742 esac 121743 EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" 121744 fi 121745- 121746- 121747+ 121748+ 121749 BUILD_DIR="$BUILD_DIR $ext_builddir" 121750- 121751+ 121752 121753 121754 if test "$ext_builddir" = "."; then 121755 PHP_PECL_EXTENSION=simplexml 121756- 121757+ 121758 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 121759 121760 fi 121761 121762- 121763+ 121764 PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD" 121765 121766- 121767+ 121768 else 121769- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 121770-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 121771- { (exit 1); exit 1; }; } 121772+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 121773 fi 121774-else 121775- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 121776-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 121777- { (exit 1); exit 1; }; } 121778- 121779+else 121780+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 121781+ 121782 fi 121783 121784- 121785+ 121786 am_i_shared=$PHP_SIMPLEXML_SHARED 121787 is_it_shared=$PHP_LIBXML_SHARED 121788 is_it_enabled=$PHP_LIBXML 121789 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 121790- { { echo "$as_me:$LINENO: error: 121791+ { echo "configure: error: 121792 You've configured extension simplexml to build statically, but it 121793 depends on extension libxml, which you've configured to build shared. 121794 You either need to build simplexml shared or build libxml statically for the 121795 build to be successful. 121796-" >&5 121797-echo "$as_me: error: 121798-You've configured extension simplexml to build statically, but it 121799-depends on extension libxml, which you've configured to build shared. 121800-You either need to build simplexml shared or build libxml statically for the 121801-build to be successful. 121802-" >&2;} 121803- { (exit 1); exit 1; }; } 121804+" 1>&2; exit 1; } 121805 fi 121806 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 121807- { { echo "$as_me:$LINENO: error: 121808+ { echo "configure: error: 121809 You've configured extension simplexml, which depends on extension libxml, 121810 but you've either not enabled libxml, or have disabled it. 121811-" >&5 121812-echo "$as_me: error: 121813-You've configured extension simplexml, which depends on extension libxml, 121814-but you've either not enabled libxml, or have disabled it. 121815-" >&2;} 121816- { (exit 1); exit 1; }; } 121817+" 1>&2; exit 1; } 121818 fi 121819- 121820- 121821+ 121822+ 121823 am_i_shared=$PHP_SIMPLEXML_SHARED 121824 is_it_shared=$PHP_SPL_SHARED 121825 is_it_enabled=$PHP_SPL 121826 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 121827- { { echo "$as_me:$LINENO: error: 121828+ { echo "configure: error: 121829 You've configured extension simplexml to build statically, but it 121830 depends on extension spl, which you've configured to build shared. 121831 You either need to build simplexml shared or build spl statically for the 121832 build to be successful. 121833-" >&5 121834-echo "$as_me: error: 121835-You've configured extension simplexml to build statically, but it 121836-depends on extension spl, which you've configured to build shared. 121837-You either need to build simplexml shared or build spl statically for the 121838-build to be successful. 121839-" >&2;} 121840- { (exit 1); exit 1; }; } 121841+" 1>&2; exit 1; } 121842 fi 121843 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 121844- { { echo "$as_me:$LINENO: error: 121845+ { echo "configure: error: 121846 You've configured extension simplexml, which depends on extension spl, 121847 but you've either not enabled spl, or have disabled it. 121848-" >&5 121849-echo "$as_me: error: 121850-You've configured extension simplexml, which depends on extension spl, 121851-but you've either not enabled spl, or have disabled it. 121852-" >&2;} 121853- { (exit 1); exit 1; }; } 121854+" 1>&2; exit 1; } 121855 fi 121856- 121857+ 121858 fi 121859 121860 121861 121862 php_with_snmp=no 121863 121864-echo "$as_me:$LINENO: checking for SNMP support" >&5 121865-echo $ECHO_N "checking for SNMP support... $ECHO_C" >&6 121866- 121867+echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 121868+echo "configure:83024: checking for SNMP support" >&5 121869 # Check whether --with-snmp or --without-snmp was given. 121870 if test "${with_snmp+set}" = set; then 121871 withval="$with_snmp" 121872 PHP_SNMP=$withval 121873 else 121874- 121875+ 121876 PHP_SNMP=no 121877 test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL 121878 121879-fi; 121880+fi 121881+ 121882 121883 121884 ext_output="yes, shared" 121885@@ -106274,8 +83055,7 @@ 121886 121887 121888 121889-echo "$as_me:$LINENO: result: $ext_output" >&5 121890-echo "${ECHO_T}$ext_output" >&6 121891+echo "$ac_t""$ext_output" 1>&6 121892 121893 121894 121895@@ -106283,23 +83063,22 @@ 121896 121897 php_with_openssl_dir=no 121898 121899-echo "$as_me:$LINENO: checking OpenSSL dir for SNMP" >&5 121900-echo $ECHO_N "checking OpenSSL dir for SNMP... $ECHO_C" >&6 121901- 121902+echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 121903+echo "configure:83068: checking OpenSSL dir for SNMP" >&5 121904 # Check whether --with-openssl-dir or --without-openssl-dir was given. 121905 if test "${with_openssl_dir+set}" = set; then 121906 withval="$with_openssl_dir" 121907 PHP_OPENSSL_DIR=$withval 121908 else 121909- 121910+ 121911 PHP_OPENSSL_DIR=no 121912+ 121913 121914+fi 121915 121916-fi; 121917 121918 ext_output=$PHP_OPENSSL_DIR 121919-echo "$as_me:$LINENO: result: $ext_output" >&5 121920-echo "${ECHO_T}$ext_output" >&6 121921+echo "$ac_t""$ext_output" 1>&6 121922 121923 121924 121925@@ -106307,22 +83086,22 @@ 121926 121927 php_enable_ucd_snmp_hack=no 121928 121929-echo "$as_me:$LINENO: checking whether to enable UCD SNMP hack" >&5 121930-echo $ECHO_N "checking whether to enable UCD SNMP hack... $ECHO_C" >&6 121931+echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 121932+echo "configure:83091: checking whether to enable UCD SNMP hack" >&5 121933 # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. 121934 if test "${enable_ucd_snmp_hack+set}" = set; then 121935 enableval="$enable_ucd_snmp_hack" 121936 PHP_UCD_SNMP_HACK=$enableval 121937 else 121938- 121939+ 121940 PHP_UCD_SNMP_HACK=no 121941+ 121942 121943+fi 121944 121945-fi; 121946 121947 ext_output=$PHP_UCD_SNMP_HACK 121948-echo "$as_me:$LINENO: result: $ext_output" >&5 121949-echo "${ECHO_T}$ext_output" >&6 121950+echo "$ac_t""$ext_output" 1>&6 121951 121952 121953 121954@@ -106332,42 +83111,37 @@ 121955 if test "$PHP_SNMP" = "yes"; then 121956 # Extract the first word of "net-snmp-config", so it can be a program name with args. 121957 set dummy net-snmp-config; ac_word=$2 121958-echo "$as_me:$LINENO: checking for $ac_word" >&5 121959-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 121960-if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then 121961- echo $ECHO_N "(cached) $ECHO_C" >&6 121962+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 121963+echo "configure:83116: checking for $ac_word" >&5 121964+if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then 121965+ echo $ac_n "(cached) $ac_c" 1>&6 121966 else 121967- case $SNMP_CONFIG in 121968- [\\/]* | ?:[\\/]*) 121969+ case "$SNMP_CONFIG" in 121970+ /*) 121971 ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. 121972 ;; 121973+ ?:/*) 121974+ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. 121975+ ;; 121976 *) 121977- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 121978-as_dummy="/usr/local/bin:$PATH" 121979-for as_dir in $as_dummy 121980-do 121981- IFS=$as_save_IFS 121982- test -z "$as_dir" && as_dir=. 121983- for ac_exec_ext in '' $ac_executable_extensions; do 121984- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 121985- ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext" 121986- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 121987- break 2 121988- fi 121989-done 121990-done 121991- 121992+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 121993+ ac_dummy="/usr/local/bin:$PATH" 121994+ for ac_dir in $ac_dummy; do 121995+ test -z "$ac_dir" && ac_dir=. 121996+ if test -f $ac_dir/$ac_word; then 121997+ ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" 121998+ break 121999+ fi 122000+ done 122001+ IFS="$ac_save_ifs" 122002 ;; 122003 esac 122004 fi 122005-SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG 122006- 122007+SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG" 122008 if test -n "$SNMP_CONFIG"; then 122009- echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5 122010-echo "${ECHO_T}$SNMP_CONFIG" >&6 122011+ echo "$ac_t""$SNMP_CONFIG" 1>&6 122012 else 122013- echo "$as_me:$LINENO: result: no" >&5 122014-echo "${ECHO_T}no" >&6 122015+ echo "$ac_t""no" 1>&6 122016 fi 122017 122018 else 122019@@ -106380,48 +83154,48 @@ 122020 SNMP_PREFIX=`$SNMP_CONFIG --prefix` 122021 122022 if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then 122023- 122024+ 122025 if test "${SNMP_PREFIX}/include" != "/usr/include"; then 122026- 122027+ 122028 if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then 122029 ai_p=${SNMP_PREFIX}/include 122030 else 122031- 122032+ 122033 ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" 122034- 122035+ 122036 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122037 ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" 122038 fi 122039 122040- 122041- 122042+ 122043+ 122044 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122045- 122046+ 122047 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 122048 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122049 eval "INCLUDEPATH$unique=set" 122050- 122051+ 122052 if test ""; then 122053 INCLUDES="-I$ai_p $INCLUDES" 122054 else 122055 INCLUDES="$INCLUDES -I$ai_p" 122056 fi 122057- 122058+ 122059 fi 122060 122061 fi 122062 122063- 122064+ 122065 for ac_i in $SNMP_LIBS; do 122066 case $ac_i in 122067 -pthread) 122068 if test "$ext_shared" = "yes"; then 122069 SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" 122070 else 122071- 122072- 122073+ 122074+ 122075 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 122076- 122077+ 122078 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 122079 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122080 eval "EXTRA_LDFLAGS$unique=set" 122081@@ -106432,20 +83206,20 @@ 122082 ;; 122083 -l*) 122084 ac_ii=`echo $ac_i|cut -c 3-` 122085- 122086- 122087+ 122088+ 122089 case $ac_ii in 122090 c|c_r|pthread*) ;; 122091- *) 122092+ *) 122093 if test "$ext_shared" = "yes"; then 122094- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 122095+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 122096 else 122097- 122098- 122099+ 122100+ 122101 case $ac_ii in 122102 c|c_r|pthread*) ;; 122103- *) 122104- LIBS="$LIBS -l$ac_ii" 122105+ *) 122106+ LIBS="$LIBS -l$ac_ii" 122107 ;; 122108 esac 122109 122110@@ -106458,62 +83232,59 @@ 122111 ;; 122112 -L*) 122113 ac_ii=`echo $ac_i|cut -c 3-` 122114- 122115+ 122116 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 122117- 122118+ 122119 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 122120 ai_p=$ac_ii 122121 else 122122- 122123+ 122124 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 122125- 122126+ 122127 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122128 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 122129 fi 122130 122131- 122132+ 122133 if test "$ext_shared" = "yes"; then 122134 SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" 122135 test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" 122136 else 122137- 122138- 122139- 122140+ 122141+ 122142+ 122143 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122144- 122145+ 122146 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 122147 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122148 eval "LIBPATH$unique=set" 122149- 122150+ 122151 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 122152 LDFLAGS="$LDFLAGS -L$ai_p" 122153 PHP_RPATHS="$PHP_RPATHS $ai_p" 122154- 122155+ 122156 fi 122157 122158 122159 fi 122160- 122161+ 122162 fi 122163 122164 ;; 122165 esac 122166 done 122167 122168- 122169-cat >>confdefs.h <<\_ACEOF 122170+ cat >> confdefs.h <<\EOF 122171 #define HAVE_NET_SNMP 1 122172-_ACEOF 122173+EOF 122174 122175 SNMP_LIBNAME=netsnmp 122176 else 122177- { { echo "$as_me:$LINENO: error: Could not find the required paths. Please check your net-snmp installation." >&5 122178-echo "$as_me: error: Could not find the required paths. Please check your net-snmp installation." >&2;} 122179- { (exit 1); exit 1; }; } 122180+ { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } 122181 fi 122182- else 122183- 122184+ else 122185 122186+ 122187 if test "$PHP_SNMP" = "yes"; then 122188 for i in /usr/include /usr/local/include; do 122189 test -f $i/snmp.h && SNMP_INCDIR=$i 122190@@ -106531,215 +83302,95 @@ 122191 fi 122192 122193 if test -z "$SNMP_INCDIR"; then 122194- { { echo "$as_me:$LINENO: error: snmp.h not found. Check your SNMP installation." >&5 122195-echo "$as_me: error: snmp.h not found. Check your SNMP installation." >&2;} 122196- { (exit 1); exit 1; }; } 122197+ { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } 122198 elif test -z "$SNMP_LIBDIR"; then 122199- { { echo "$as_me:$LINENO: error: libsnmp not found. Check your SNMP installation." >&5 122200-echo "$as_me: error: libsnmp not found. Check your SNMP installation." >&2;} 122201- { (exit 1); exit 1; }; } 122202+ { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } 122203 fi 122204 122205 old_CPPFLAGS=$CPPFLAGS 122206 CPPFLAGS=-I$SNMP_INCDIR 122207- 122208-for ac_header in default_store.h 122209+ for ac_hdr in default_store.h 122210 do 122211-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 122212-if eval "test \"\${$as_ac_Header+set}\" = set"; then 122213- echo "$as_me:$LINENO: checking for $ac_header" >&5 122214-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 122215-if eval "test \"\${$as_ac_Header+set}\" = set"; then 122216- echo $ECHO_N "(cached) $ECHO_C" >&6 122217-fi 122218-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 122219-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 122220-else 122221- # Is the header compilable? 122222-echo "$as_me:$LINENO: checking $ac_header usability" >&5 122223-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 122224-cat >conftest.$ac_ext <<_ACEOF 122225-/* confdefs.h. */ 122226-_ACEOF 122227-cat confdefs.h >>conftest.$ac_ext 122228-cat >>conftest.$ac_ext <<_ACEOF 122229-/* end confdefs.h. */ 122230-$ac_includes_default 122231-#include <$ac_header> 122232-_ACEOF 122233-rm -f conftest.$ac_objext 122234-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 122235- (eval $ac_compile) 2>conftest.er1 122236- ac_status=$? 122237- grep -v '^ *+' conftest.er1 >conftest.err 122238- rm -f conftest.er1 122239- cat conftest.err >&5 122240- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122241- (exit $ac_status); } && 122242- { ac_try='test -z "$ac_c_werror_flag" 122243- || test ! -s conftest.err' 122244- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 122245- (eval $ac_try) 2>&5 122246- ac_status=$? 122247- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122248- (exit $ac_status); }; } && 122249- { ac_try='test -s conftest.$ac_objext' 122250- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 122251- (eval $ac_try) 2>&5 122252- ac_status=$? 122253- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122254- (exit $ac_status); }; }; then 122255- ac_header_compiler=yes 122256-else 122257- echo "$as_me: failed program was:" >&5 122258-sed 's/^/| /' conftest.$ac_ext >&5 122259- 122260-ac_header_compiler=no 122261-fi 122262-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 122263-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 122264-echo "${ECHO_T}$ac_header_compiler" >&6 122265- 122266-# Is the header present? 122267-echo "$as_me:$LINENO: checking $ac_header presence" >&5 122268-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 122269-cat >conftest.$ac_ext <<_ACEOF 122270-/* confdefs.h. */ 122271-_ACEOF 122272-cat confdefs.h >>conftest.$ac_ext 122273-cat >>conftest.$ac_ext <<_ACEOF 122274-/* end confdefs.h. */ 122275-#include <$ac_header> 122276-_ACEOF 122277-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 122278- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 122279- ac_status=$? 122280- grep -v '^ *+' conftest.er1 >conftest.err 122281- rm -f conftest.er1 122282- cat conftest.err >&5 122283- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122284- (exit $ac_status); } >/dev/null; then 122285- if test -s conftest.err; then 122286- ac_cpp_err=$ac_c_preproc_warn_flag 122287- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 122288- else 122289- ac_cpp_err= 122290- fi 122291-else 122292- ac_cpp_err=yes 122293-fi 122294-if test -z "$ac_cpp_err"; then 122295- ac_header_preproc=yes 122296-else 122297- echo "$as_me: failed program was:" >&5 122298-sed 's/^/| /' conftest.$ac_ext >&5 122299- 122300- ac_header_preproc=no 122301-fi 122302-rm -f conftest.err conftest.$ac_ext 122303-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 122304-echo "${ECHO_T}$ac_header_preproc" >&6 122305- 122306-# So? What about this header? 122307-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 122308- yes:no: ) 122309- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 122310-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 122311- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 122312-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 122313- ac_header_preproc=yes 122314- ;; 122315- no:yes:* ) 122316- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 122317-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 122318- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 122319-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 122320- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 122321-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 122322- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 122323-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 122324- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 122325-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 122326- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 122327-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 122328- ( 122329- cat <<\_ASBOX 122330-## ------------------------------------------ ## 122331-## Report this to the AC_PACKAGE_NAME lists. ## 122332-## ------------------------------------------ ## 122333-_ASBOX 122334- ) | 122335- sed "s/^/$as_me: WARNING: /" >&2 122336- ;; 122337-esac 122338-echo "$as_me:$LINENO: checking for $ac_header" >&5 122339-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 122340-if eval "test \"\${$as_ac_Header+set}\" = set"; then 122341- echo $ECHO_N "(cached) $ECHO_C" >&6 122342+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 122343+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 122344+echo "configure:83317: checking for $ac_hdr" >&5 122345+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 122346+ echo $ac_n "(cached) $ac_c" 1>&6 122347+else 122348+ cat > conftest.$ac_ext <<EOF 122349+#line 83322 "configure" 122350+#include "confdefs.h" 122351+#include <$ac_hdr> 122352+EOF 122353+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 122354+{ (eval echo configure:83327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 122355+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 122356+if test -z "$ac_err"; then 122357+ rm -rf conftest* 122358+ eval "ac_cv_header_$ac_safe=yes" 122359 else 122360- eval "$as_ac_Header=\$ac_header_preproc" 122361+ echo "$ac_err" >&5 122362+ echo "configure: failed program was:" >&5 122363+ cat conftest.$ac_ext >&5 122364+ rm -rf conftest* 122365+ eval "ac_cv_header_$ac_safe=no" 122366 fi 122367-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 122368-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 122369- 122370+rm -f conftest* 122371 fi 122372-if test `eval echo '${'$as_ac_Header'}'` = yes; then 122373- cat >>confdefs.h <<_ACEOF 122374-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 122375-_ACEOF 122376- 122377+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 122378+ echo "$ac_t""yes" 1>&6 122379+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 122380+ cat >> confdefs.h <<EOF 122381+#define $ac_tr_hdr 1 122382+EOF 122383+ 122384+else 122385+ echo "$ac_t""no" 1>&6 122386 fi 122387- 122388 done 122389 122390 if test "$ac_cv_header_default_store_h" = "yes"; then 122391- echo "$as_me:$LINENO: checking for OpenSSL support in SNMP libraries" >&5 122392-echo $ECHO_N "checking for OpenSSL support in SNMP libraries... $ECHO_C" >&6 122393- cat >conftest.$ac_ext <<_ACEOF 122394-/* confdefs.h. */ 122395-_ACEOF 122396-cat confdefs.h >>conftest.$ac_ext 122397-cat >>conftest.$ac_ext <<_ACEOF 122398-/* end confdefs.h. */ 122399+ echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 122400+echo "configure:83355: checking for OpenSSL support in SNMP libraries" >&5 122401+ cat > conftest.$ac_ext <<EOF 122402+#line 83357 "configure" 122403+#include "confdefs.h" 122404 122405 #include <ucd-snmp-config.h> 122406 #if USE_OPENSSL 122407 yes 122408 #endif 122409- 122410-_ACEOF 122411+ 122412+EOF 122413 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 122414- $EGREP "yes" >/dev/null 2>&1; then 122415- 122416+ egrep "yes" >/dev/null 2>&1; then 122417+ rm -rf conftest* 122418+ 122419 SNMP_SSL=yes 122420- 122421+ 122422 else 122423- 122424+ rm -rf conftest* 122425+ 122426 SNMP_SSL=no 122427- 122428+ 122429 fi 122430 rm -f conftest* 122431 122432 fi 122433 CPPFLAGS=$old_CPPFLAGS 122434- echo "$as_me:$LINENO: result: $SNMP_SSL" >&5 122435-echo "${ECHO_T}$SNMP_SSL" >&6 122436- 122437+ echo "$ac_t""$SNMP_SSL" 1>&6 122438+ 122439 if test "$SNMP_SSL" = "yes"; then 122440 if test "$PHP_OPENSSL_DIR" != "no"; then 122441 PHP_OPENSSL=$PHP_OPENSSL_DIR 122442 fi 122443- 122444+ 122445 if test "$PHP_OPENSSL" = "no"; then 122446- { { echo "$as_me:$LINENO: error: The UCD-SNMP in this system is built with SSL support. 122447- 122448- Add --with-openssl-dir=DIR to your configure line." >&5 122449-echo "$as_me: error: The UCD-SNMP in this system is built with SSL support. 122450+ { echo "configure: error: The UCD-SNMP in this system is built with SSL support. 122451 122452- Add --with-openssl-dir=DIR to your configure line." >&2;} 122453- { (exit 1); exit 1; }; } 122454+ Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } 122455 else 122456- 122457+ 122458 found_openssl=no 122459 unset OPENSSL_INCDIR 122460 unset OPENSSL_LIBDIR 122461@@ -106756,42 +83407,38 @@ 122462 if test -z "$PKG_CONFIG"; then 122463 # Extract the first word of "pkg-config", so it can be a program name with args. 122464 set dummy pkg-config; ac_word=$2 122465-echo "$as_me:$LINENO: checking for $ac_word" >&5 122466-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 122467-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then 122468- echo $ECHO_N "(cached) $ECHO_C" >&6 122469+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 122470+echo "configure:83412: checking for $ac_word" >&5 122471+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then 122472+ echo $ac_n "(cached) $ac_c" 1>&6 122473 else 122474- case $PKG_CONFIG in 122475- [\\/]* | ?:[\\/]*) 122476+ case "$PKG_CONFIG" in 122477+ /*) 122478 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 122479 ;; 122480+ ?:/*) 122481+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. 122482+ ;; 122483 *) 122484- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 122485-for as_dir in $PATH 122486-do 122487- IFS=$as_save_IFS 122488- test -z "$as_dir" && as_dir=. 122489- for ac_exec_ext in '' $ac_executable_extensions; do 122490- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 122491- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 122492- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 122493- break 2 122494- fi 122495-done 122496-done 122497- 122498+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 122499+ ac_dummy="$PATH" 122500+ for ac_dir in $ac_dummy; do 122501+ test -z "$ac_dir" && ac_dir=. 122502+ if test -f $ac_dir/$ac_word; then 122503+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" 122504+ break 122505+ fi 122506+ done 122507+ IFS="$ac_save_ifs" 122508 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" 122509 ;; 122510 esac 122511 fi 122512-PKG_CONFIG=$ac_cv_path_PKG_CONFIG 122513- 122514+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" 122515 if test -n "$PKG_CONFIG"; then 122516- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 122517-echo "${ECHO_T}$PKG_CONFIG" >&6 122518+ echo "$ac_t""$PKG_CONFIG" 1>&6 122519 else 122520- echo "$as_me:$LINENO: result: no" >&5 122521-echo "${ECHO_T}no" >&6 122522+ echo "$ac_t""no" 1>&6 122523 fi 122524 122525 fi 122526@@ -106803,23 +83450,21 @@ 122527 OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` 122528 OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` 122529 else 122530- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 122531-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 122532- { (exit 1); exit 1; }; } 122533+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 122534 fi 122535 122536 if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then 122537- 122538+ 122539 for ac_i in $OPENSSL_LIBS; do 122540 case $ac_i in 122541 -pthread) 122542 if test "$ext_shared" = "yes"; then 122543 SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" 122544 else 122545- 122546- 122547+ 122548+ 122549 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 122550- 122551+ 122552 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 122553 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122554 eval "EXTRA_LDFLAGS$unique=set" 122555@@ -106830,20 +83475,20 @@ 122556 ;; 122557 -l*) 122558 ac_ii=`echo $ac_i|cut -c 3-` 122559- 122560- 122561+ 122562+ 122563 case $ac_ii in 122564 c|c_r|pthread*) ;; 122565- *) 122566+ *) 122567 if test "$ext_shared" = "yes"; then 122568- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 122569+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" 122570 else 122571- 122572- 122573+ 122574+ 122575 case $ac_ii in 122576 c|c_r|pthread*) ;; 122577- *) 122578- LIBS="$LIBS -l$ac_ii" 122579+ *) 122580+ LIBS="$LIBS -l$ac_ii" 122581 ;; 122582 esac 122583 122584@@ -106856,80 +83501,80 @@ 122585 ;; 122586 -L*) 122587 ac_ii=`echo $ac_i|cut -c 3-` 122588- 122589+ 122590 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 122591- 122592+ 122593 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 122594 ai_p=$ac_ii 122595 else 122596- 122597+ 122598 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 122599- 122600+ 122601 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122602 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 122603 fi 122604 122605- 122606+ 122607 if test "$ext_shared" = "yes"; then 122608 SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" 122609 test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" 122610 else 122611- 122612- 122613- 122614+ 122615+ 122616+ 122617 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122618- 122619+ 122620 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 122621 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122622 eval "LIBPATH$unique=set" 122623- 122624+ 122625 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 122626 LDFLAGS="$LDFLAGS -L$ai_p" 122627 PHP_RPATHS="$PHP_RPATHS $ai_p" 122628- 122629+ 122630 fi 122631 122632 122633 fi 122634- 122635+ 122636 fi 122637 122638 ;; 122639 esac 122640 done 122641 122642- 122643+ 122644 for ac_i in $OPENSSL_INCS; do 122645 case $ac_i in 122646 -I*) 122647 ac_ii=`echo $ac_i|cut -c 3-` 122648- 122649+ 122650 if test "$ac_ii" != "/usr/include"; then 122651- 122652+ 122653 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 122654 ai_p=$ac_ii 122655 else 122656- 122657+ 122658 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 122659- 122660+ 122661 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122662 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 122663 fi 122664 122665- 122666- 122667+ 122668+ 122669 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122670- 122671+ 122672 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 122673 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122674 eval "INCLUDEPATH$unique=set" 122675- 122676+ 122677 if test ""; then 122678 INCLUDES="-I$ai_p $INCLUDES" 122679 else 122680 INCLUDES="$INCLUDES -I$ai_p" 122681 fi 122682- 122683+ 122684 fi 122685 122686 fi 122687@@ -106942,7 +83587,7 @@ 122688 fi 122689 122690 if test "$found_openssl" = "no"; then 122691- 122692+ 122693 if test "$PHP_OPENSSL_DIR" = "yes"; then 122694 PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" 122695 fi 122696@@ -106958,102 +83603,94 @@ 122697 done 122698 122699 if test -z "$OPENSSL_INCDIR"; then 122700- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5 122701-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;} 122702- { (exit 1); exit 1; }; } 122703+ { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; } 122704 fi 122705 122706 if test -z "$OPENSSL_LIBDIR"; then 122707- { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5 122708-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;} 122709- { (exit 1); exit 1; }; } 122710+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } 122711 fi 122712 122713 old_CPPFLAGS=$CPPFLAGS 122714 CPPFLAGS=-I$OPENSSL_INCDIR 122715- echo "$as_me:$LINENO: checking for OpenSSL version" >&5 122716-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6 122717- cat >conftest.$ac_ext <<_ACEOF 122718-/* confdefs.h. */ 122719-_ACEOF 122720-cat confdefs.h >>conftest.$ac_ext 122721-cat >>conftest.$ac_ext <<_ACEOF 122722-/* end confdefs.h. */ 122723+ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 122724+echo "configure:83617: checking for OpenSSL version" >&5 122725+ cat > conftest.$ac_ext <<EOF 122726+#line 83619 "configure" 122727+#include "confdefs.h" 122728 122729 #include <openssl/opensslv.h> 122730 #if OPENSSL_VERSION_NUMBER >= 0x0090600fL 122731 yes 122732 #endif 122733- 122734-_ACEOF 122735+ 122736+EOF 122737 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 122738- $EGREP "yes" >/dev/null 2>&1; then 122739- 122740- echo "$as_me:$LINENO: result: >= 0.9.6" >&5 122741-echo "${ECHO_T}>= 0.9.6" >&6 122742- 122743+ egrep "yes" >/dev/null 2>&1; then 122744+ rm -rf conftest* 122745+ 122746+ echo "$ac_t"">= 0.9.6" 1>&6 122747+ 122748 else 122749- 122750- { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5 122751-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;} 122752- { (exit 1); exit 1; }; } 122753- 122754+ rm -rf conftest* 122755+ 122756+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } 122757+ 122758 fi 122759 rm -f conftest* 122760 122761 CPPFLAGS=$old_CPPFLAGS 122762 122763- 122764+ 122765 if test "$OPENSSL_INCDIR" != "/usr/include"; then 122766- 122767+ 122768 if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then 122769 ai_p=$OPENSSL_INCDIR 122770 else 122771- 122772+ 122773 ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 122774- 122775+ 122776 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122777 ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" 122778 fi 122779 122780- 122781- 122782+ 122783+ 122784 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122785- 122786+ 122787 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 122788 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122789 eval "INCLUDEPATH$unique=set" 122790- 122791+ 122792 if test ""; then 122793 INCLUDES="-I$ai_p $INCLUDES" 122794 else 122795 INCLUDES="$INCLUDES -I$ai_p" 122796 fi 122797- 122798+ 122799 fi 122800 122801 fi 122802 122803- 122804- 122805+ 122806+ 122807 save_old_LDFLAGS=$LDFLAGS 122808 ac_stuff=" 122809 -L$OPENSSL_LIBDIR 122810 " 122811- 122812+ 122813 save_ext_shared=$ext_shared 122814 ext_shared=yes 122815- 122816+ 122817 for ac_i in $ac_stuff; do 122818 case $ac_i in 122819 -pthread) 122820 if test "$ext_shared" = "yes"; then 122821 LDFLAGS="$LDFLAGS -pthread" 122822 else 122823- 122824- 122825+ 122826+ 122827 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 122828- 122829+ 122830 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 122831 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122832 eval "EXTRA_LDFLAGS$unique=set" 122833@@ -107064,20 +83701,20 @@ 122834 ;; 122835 -l*) 122836 ac_ii=`echo $ac_i|cut -c 3-` 122837- 122838- 122839+ 122840+ 122841 case $ac_ii in 122842 c|c_r|pthread*) ;; 122843- *) 122844+ *) 122845 if test "$ext_shared" = "yes"; then 122846- LDFLAGS="$LDFLAGS -l$ac_ii" 122847+ LDFLAGS="$LDFLAGS -l$ac_ii" 122848 else 122849- 122850- 122851+ 122852+ 122853 case $ac_ii in 122854 c|c_r|pthread*) ;; 122855- *) 122856- LIBS="$LIBS -l$ac_ii" 122857+ *) 122858+ LIBS="$LIBS -l$ac_ii" 122859 ;; 122860 esac 122861 122862@@ -107090,131 +83727,101 @@ 122863 ;; 122864 -L*) 122865 ac_ii=`echo $ac_i|cut -c 3-` 122866- 122867+ 122868 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 122869- 122870+ 122871 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 122872 ai_p=$ac_ii 122873 else 122874- 122875+ 122876 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 122877- 122878+ 122879 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 122880 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 122881 fi 122882 122883- 122884+ 122885 if test "$ext_shared" = "yes"; then 122886 LDFLAGS="-L$ai_p $LDFLAGS" 122887 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 122888 else 122889- 122890- 122891- 122892+ 122893+ 122894+ 122895 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 122896- 122897+ 122898 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 122899 if test -n "$unique" && test "`eval $cmd`" = "" ; then 122900 eval "LIBPATH$unique=set" 122901- 122902+ 122903 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 122904 LDFLAGS="$LDFLAGS -L$ai_p" 122905 PHP_RPATHS="$PHP_RPATHS $ai_p" 122906- 122907+ 122908 fi 122909 122910 122911 fi 122912- 122913+ 122914 fi 122915 122916 ;; 122917 esac 122918 done 122919 122920- echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5 122921-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6 122922-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then 122923- echo $ECHO_N "(cached) $ECHO_C" >&6 122924+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 122925+echo "configure:83774: checking for CRYPTO_free in -lcrypto" >&5 122926+ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` 122927+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 122928+ echo $ac_n "(cached) $ac_c" 1>&6 122929 else 122930- ac_check_lib_save_LIBS=$LIBS 122931+ ac_save_LIBS="$LIBS" 122932 LIBS="-lcrypto $LIBS" 122933-cat >conftest.$ac_ext <<_ACEOF 122934-/* confdefs.h. */ 122935-_ACEOF 122936-cat confdefs.h >>conftest.$ac_ext 122937-cat >>conftest.$ac_ext <<_ACEOF 122938-/* end confdefs.h. */ 122939- 122940+cat > conftest.$ac_ext <<EOF 122941+#line 83782 "configure" 122942+#include "confdefs.h" 122943 /* Override any gcc2 internal prototype to avoid an error. */ 122944-#ifdef __cplusplus 122945-extern "C" 122946-#endif 122947 /* We use char because int might match the return type of a gcc2 122948- builtin and then its argument prototype would still apply. */ 122949-char CRYPTO_free (); 122950-int 122951-main () 122952-{ 122953-CRYPTO_free (); 122954- ; 122955- return 0; 122956-} 122957-_ACEOF 122958-rm -f conftest.$ac_objext conftest$ac_exeext 122959-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 122960- (eval $ac_link) 2>conftest.er1 122961- ac_status=$? 122962- grep -v '^ *+' conftest.er1 >conftest.err 122963- rm -f conftest.er1 122964- cat conftest.err >&5 122965- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122966- (exit $ac_status); } && 122967- { ac_try='test -z "$ac_c_werror_flag" 122968- || test ! -s conftest.err' 122969- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 122970- (eval $ac_try) 2>&5 122971- ac_status=$? 122972- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122973- (exit $ac_status); }; } && 122974- { ac_try='test -s conftest$ac_exeext' 122975- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 122976- (eval $ac_try) 2>&5 122977- ac_status=$? 122978- echo "$as_me:$LINENO: \$? = $ac_status" >&5 122979- (exit $ac_status); }; }; then 122980- ac_cv_lib_crypto_CRYPTO_free=yes 122981-else 122982- echo "$as_me: failed program was:" >&5 122983-sed 's/^/| /' conftest.$ac_ext >&5 122984- 122985-ac_cv_lib_crypto_CRYPTO_free=no 122986-fi 122987-rm -f conftest.err conftest.$ac_objext \ 122988- conftest$ac_exeext conftest.$ac_ext 122989-LIBS=$ac_check_lib_save_LIBS 122990-fi 122991-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 122992-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6 122993-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then 122994+ builtin and then its argument prototype would still apply. */ 122995+char CRYPTO_free(); 122996+ 122997+int main() { 122998+CRYPTO_free() 122999+; return 0; } 123000+EOF 123001+if { (eval echo configure:83793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 123002+ rm -rf conftest* 123003+ eval "ac_cv_lib_$ac_lib_var=yes" 123004+else 123005+ echo "configure: failed program was:" >&5 123006+ cat conftest.$ac_ext >&5 123007+ rm -rf conftest* 123008+ eval "ac_cv_lib_$ac_lib_var=no" 123009+fi 123010+rm -f conftest* 123011+LIBS="$ac_save_LIBS" 123012 123013+fi 123014+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 123015+ echo "$ac_t""yes" 1>&6 123016+ 123017 LDFLAGS=$save_old_LDFLAGS 123018 ext_shared=$save_ext_shared 123019- 123020- 123021- 123022+ 123023+ 123024+ 123025 case crypto in 123026 c|c_r|pthread*) ;; 123027- *) 123028+ *) 123029 if test "$ext_shared" = "yes"; then 123030- SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 123031+ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 123032 else 123033- 123034- 123035+ 123036+ 123037 case crypto in 123038 c|c_r|pthread*) ;; 123039- *) 123040- LIBS="-lcrypto $LIBS" 123041+ *) 123042+ LIBS="-lcrypto $LIBS" 123043 ;; 123044 esac 123045 123046@@ -107224,43 +83831,42 @@ 123047 esac 123048 123049 123050- 123051- 123052+ 123053+ 123054 else 123055+ echo "$ac_t""no" 1>&6 123056 123057 LDFLAGS=$save_old_LDFLAGS 123058 ext_shared=$save_ext_shared 123059 unset ac_cv_lib_crypto_CRYPTO_free 123060- 123061- { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5 123062-echo "$as_me: error: libcrypto not found!" >&2;} 123063- { (exit 1); exit 1; }; } 123064- 123065- 123066+ 123067+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } 123068+ 123069+ 123070 fi 123071 123072 123073 old_LIBS=$LIBS 123074 LIBS="$LIBS -lcrypto" 123075- 123076+ 123077 save_old_LDFLAGS=$LDFLAGS 123078 ac_stuff=" 123079 -L$OPENSSL_LIBDIR 123080 " 123081- 123082+ 123083 save_ext_shared=$ext_shared 123084 ext_shared=yes 123085- 123086+ 123087 for ac_i in $ac_stuff; do 123088 case $ac_i in 123089 -pthread) 123090 if test "$ext_shared" = "yes"; then 123091 LDFLAGS="$LDFLAGS -pthread" 123092 else 123093- 123094- 123095+ 123096+ 123097 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 123098- 123099+ 123100 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 123101 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123102 eval "EXTRA_LDFLAGS$unique=set" 123103@@ -107271,20 +83877,20 @@ 123104 ;; 123105 -l*) 123106 ac_ii=`echo $ac_i|cut -c 3-` 123107- 123108- 123109+ 123110+ 123111 case $ac_ii in 123112 c|c_r|pthread*) ;; 123113- *) 123114+ *) 123115 if test "$ext_shared" = "yes"; then 123116- LDFLAGS="$LDFLAGS -l$ac_ii" 123117+ LDFLAGS="$LDFLAGS -l$ac_ii" 123118 else 123119- 123120- 123121+ 123122+ 123123 case $ac_ii in 123124 c|c_r|pthread*) ;; 123125- *) 123126- LIBS="$LIBS -l$ac_ii" 123127+ *) 123128+ LIBS="$LIBS -l$ac_ii" 123129 ;; 123130 esac 123131 123132@@ -107297,148 +83903,117 @@ 123133 ;; 123134 -L*) 123135 ac_ii=`echo $ac_i|cut -c 3-` 123136- 123137+ 123138 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 123139- 123140+ 123141 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 123142 ai_p=$ac_ii 123143 else 123144- 123145+ 123146 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 123147- 123148+ 123149 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123150 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 123151 fi 123152 123153- 123154+ 123155 if test "$ext_shared" = "yes"; then 123156 LDFLAGS="-L$ai_p $LDFLAGS" 123157 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 123158 else 123159- 123160- 123161- 123162+ 123163+ 123164+ 123165 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123166- 123167+ 123168 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 123169 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123170 eval "LIBPATH$unique=set" 123171- 123172+ 123173 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 123174 LDFLAGS="$LDFLAGS -L$ai_p" 123175 PHP_RPATHS="$PHP_RPATHS $ai_p" 123176- 123177+ 123178 fi 123179 123180 123181 fi 123182- 123183+ 123184 fi 123185 123186 ;; 123187 esac 123188 done 123189 123190- echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5 123191-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6 123192-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then 123193- echo $ECHO_N "(cached) $ECHO_C" >&6 123194+ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 123195+echo "configure:83950: checking for SSL_CTX_set_ssl_version in -lssl" >&5 123196+ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` 123197+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 123198+ echo $ac_n "(cached) $ac_c" 1>&6 123199 else 123200- ac_check_lib_save_LIBS=$LIBS 123201+ ac_save_LIBS="$LIBS" 123202 LIBS="-lssl $LIBS" 123203-cat >conftest.$ac_ext <<_ACEOF 123204-/* confdefs.h. */ 123205-_ACEOF 123206-cat confdefs.h >>conftest.$ac_ext 123207-cat >>conftest.$ac_ext <<_ACEOF 123208-/* end confdefs.h. */ 123209- 123210+cat > conftest.$ac_ext <<EOF 123211+#line 83958 "configure" 123212+#include "confdefs.h" 123213 /* Override any gcc2 internal prototype to avoid an error. */ 123214-#ifdef __cplusplus 123215-extern "C" 123216-#endif 123217 /* We use char because int might match the return type of a gcc2 123218- builtin and then its argument prototype would still apply. */ 123219-char SSL_CTX_set_ssl_version (); 123220-int 123221-main () 123222-{ 123223-SSL_CTX_set_ssl_version (); 123224- ; 123225- return 0; 123226-} 123227-_ACEOF 123228-rm -f conftest.$ac_objext conftest$ac_exeext 123229-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 123230- (eval $ac_link) 2>conftest.er1 123231- ac_status=$? 123232- grep -v '^ *+' conftest.er1 >conftest.err 123233- rm -f conftest.er1 123234- cat conftest.err >&5 123235- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123236- (exit $ac_status); } && 123237- { ac_try='test -z "$ac_c_werror_flag" 123238- || test ! -s conftest.err' 123239- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123240- (eval $ac_try) 2>&5 123241- ac_status=$? 123242- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123243- (exit $ac_status); }; } && 123244- { ac_try='test -s conftest$ac_exeext' 123245- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123246- (eval $ac_try) 2>&5 123247- ac_status=$? 123248- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123249- (exit $ac_status); }; }; then 123250- ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes 123251-else 123252- echo "$as_me: failed program was:" >&5 123253-sed 's/^/| /' conftest.$ac_ext >&5 123254- 123255-ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no 123256-fi 123257-rm -f conftest.err conftest.$ac_objext \ 123258- conftest$ac_exeext conftest.$ac_ext 123259-LIBS=$ac_check_lib_save_LIBS 123260-fi 123261-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5 123262-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6 123263-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then 123264+ builtin and then its argument prototype would still apply. */ 123265+char SSL_CTX_set_ssl_version(); 123266+ 123267+int main() { 123268+SSL_CTX_set_ssl_version() 123269+; return 0; } 123270+EOF 123271+if { (eval echo configure:83969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 123272+ rm -rf conftest* 123273+ eval "ac_cv_lib_$ac_lib_var=yes" 123274+else 123275+ echo "configure: failed program was:" >&5 123276+ cat conftest.$ac_ext >&5 123277+ rm -rf conftest* 123278+ eval "ac_cv_lib_$ac_lib_var=no" 123279+fi 123280+rm -f conftest* 123281+LIBS="$ac_save_LIBS" 123282 123283+fi 123284+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 123285+ echo "$ac_t""yes" 1>&6 123286+ 123287 LDFLAGS=$save_old_LDFLAGS 123288 ext_shared=$save_ext_shared 123289- 123290+ 123291 found_openssl=yes 123292- 123293- 123294+ 123295+ 123296 else 123297+ echo "$ac_t""no" 1>&6 123298 123299 LDFLAGS=$save_old_LDFLAGS 123300 ext_shared=$save_ext_shared 123301 unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version 123302- 123303- { { echo "$as_me:$LINENO: error: libssl not found!" >&5 123304-echo "$as_me: error: libssl not found!" >&2;} 123305- { (exit 1); exit 1; }; } 123306- 123307- 123308+ 123309+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } 123310+ 123311+ 123312 fi 123313 123314 LIBS=$old_LIBS 123315- 123316- 123317+ 123318+ 123319 case ssl in 123320 c|c_r|pthread*) ;; 123321- *) 123322+ *) 123323 if test "$ext_shared" = "yes"; then 123324- SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" 123325+ SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" 123326 else 123327- 123328- 123329+ 123330+ 123331 case ssl in 123332 c|c_r|pthread*) ;; 123333- *) 123334- LIBS="-lssl $LIBS" 123335+ *) 123336+ LIBS="-lssl $LIBS" 123337 ;; 123338 esac 123339 123340@@ -107448,20 +84023,20 @@ 123341 esac 123342 123343 123344- 123345- 123346+ 123347+ 123348 case crypto in 123349 c|c_r|pthread*) ;; 123350- *) 123351+ *) 123352 if test "$ext_shared" = "yes"; then 123353- SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 123354+ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" 123355 else 123356- 123357- 123358+ 123359+ 123360 case crypto in 123361 c|c_r|pthread*) ;; 123362- *) 123363- LIBS="-lcrypto $LIBS" 123364+ *) 123365+ LIBS="-lcrypto $LIBS" 123366 ;; 123367 esac 123368 123369@@ -107472,140 +84047,108 @@ 123370 123371 123372 123373- 123374+ 123375 if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then 123376- 123377+ 123378 if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then 123379 ai_p=$OPENSSL_LIBDIR 123380 else 123381- 123382+ 123383 ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 123384- 123385+ 123386 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123387 ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" 123388 fi 123389 123390- 123391+ 123392 if test "$ext_shared" = "yes"; then 123393 SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" 123394 test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" 123395 else 123396- 123397- 123398- 123399+ 123400+ 123401+ 123402 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123403- 123404+ 123405 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 123406 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123407 eval "LIBPATH$unique=set" 123408- 123409+ 123410 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 123411 LDFLAGS="$LDFLAGS -L$ai_p" 123412 PHP_RPATHS="$PHP_RPATHS $ai_p" 123413- 123414+ 123415 fi 123416 123417 123418 fi 123419- 123420+ 123421 fi 123422 123423 fi 123424 123425 if test "$found_openssl" = "yes"; then 123426 OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR 123427- 123428+ 123429 123430 : 123431-else 123432- { { echo "$as_me:$LINENO: error: SNMP: OpenSSL check failed. Please check config.log for more information." >&5 123433-echo "$as_me: error: SNMP: OpenSSL check failed. Please check config.log for more information." >&2;} 123434- { (exit 1); exit 1; }; } 123435- 123436+else 123437+ { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } 123438+ 123439 fi 123440 123441 fi 123442 fi 123443 123444- echo "$as_me:$LINENO: checking for kstat_read in -lkstat" >&5 123445-echo $ECHO_N "checking for kstat_read in -lkstat... $ECHO_C" >&6 123446-if test "${ac_cv_lib_kstat_kstat_read+set}" = set; then 123447- echo $ECHO_N "(cached) $ECHO_C" >&6 123448+ echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 123449+echo "configure:84105: checking for kstat_read in -lkstat" >&5 123450+ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` 123451+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 123452+ echo $ac_n "(cached) $ac_c" 1>&6 123453 else 123454- ac_check_lib_save_LIBS=$LIBS 123455+ ac_save_LIBS="$LIBS" 123456 LIBS="-lkstat $LIBS" 123457-cat >conftest.$ac_ext <<_ACEOF 123458-/* confdefs.h. */ 123459-_ACEOF 123460-cat confdefs.h >>conftest.$ac_ext 123461-cat >>conftest.$ac_ext <<_ACEOF 123462-/* end confdefs.h. */ 123463- 123464+cat > conftest.$ac_ext <<EOF 123465+#line 84113 "configure" 123466+#include "confdefs.h" 123467 /* Override any gcc2 internal prototype to avoid an error. */ 123468-#ifdef __cplusplus 123469-extern "C" 123470-#endif 123471 /* We use char because int might match the return type of a gcc2 123472- builtin and then its argument prototype would still apply. */ 123473-char kstat_read (); 123474-int 123475-main () 123476-{ 123477-kstat_read (); 123478- ; 123479- return 0; 123480-} 123481-_ACEOF 123482-rm -f conftest.$ac_objext conftest$ac_exeext 123483-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 123484- (eval $ac_link) 2>conftest.er1 123485- ac_status=$? 123486- grep -v '^ *+' conftest.er1 >conftest.err 123487- rm -f conftest.er1 123488- cat conftest.err >&5 123489- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123490- (exit $ac_status); } && 123491- { ac_try='test -z "$ac_c_werror_flag" 123492- || test ! -s conftest.err' 123493- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123494- (eval $ac_try) 2>&5 123495- ac_status=$? 123496- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123497- (exit $ac_status); }; } && 123498- { ac_try='test -s conftest$ac_exeext' 123499- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123500- (eval $ac_try) 2>&5 123501- ac_status=$? 123502- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123503- (exit $ac_status); }; }; then 123504- ac_cv_lib_kstat_kstat_read=yes 123505-else 123506- echo "$as_me: failed program was:" >&5 123507-sed 's/^/| /' conftest.$ac_ext >&5 123508- 123509-ac_cv_lib_kstat_kstat_read=no 123510-fi 123511-rm -f conftest.err conftest.$ac_objext \ 123512- conftest$ac_exeext conftest.$ac_ext 123513-LIBS=$ac_check_lib_save_LIBS 123514-fi 123515-echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_read" >&5 123516-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_read" >&6 123517-if test $ac_cv_lib_kstat_kstat_read = yes; then 123518+ builtin and then its argument prototype would still apply. */ 123519+char kstat_read(); 123520 123521+int main() { 123522+kstat_read() 123523+; return 0; } 123524+EOF 123525+if { (eval echo configure:84124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 123526+ rm -rf conftest* 123527+ eval "ac_cv_lib_$ac_lib_var=yes" 123528+else 123529+ echo "configure: failed program was:" >&5 123530+ cat conftest.$ac_ext >&5 123531+ rm -rf conftest* 123532+ eval "ac_cv_lib_$ac_lib_var=no" 123533+fi 123534+rm -f conftest* 123535+LIBS="$ac_save_LIBS" 123536 123537+fi 123538+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 123539+ echo "$ac_t""yes" 1>&6 123540+ 123541+ 123542 case kstat in 123543 c|c_r|pthread*) ;; 123544- *) 123545+ *) 123546 if test "$ext_shared" = "yes"; then 123547- SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" 123548+ SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" 123549 else 123550- 123551- 123552+ 123553+ 123554 case kstat in 123555 c|c_r|pthread*) ;; 123556- *) 123557- LIBS="-lkstat $LIBS" 123558+ *) 123559+ LIBS="-lkstat $LIBS" 123560 ;; 123561 esac 123562 123563@@ -107614,128 +84157,130 @@ 123564 ;; 123565 esac 123566 123567- 123568+ 123569+else 123570+ echo "$ac_t""no" 1>&6 123571 fi 123572 123573- 123574+ 123575 if test "$SNMP_INCDIR" != "/usr/include"; then 123576- 123577+ 123578 if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then 123579 ai_p=$SNMP_INCDIR 123580 else 123581- 123582+ 123583 ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 123584- 123585+ 123586 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123587 ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" 123588 fi 123589 123590- 123591- 123592+ 123593+ 123594 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123595- 123596+ 123597 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 123598 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123599 eval "INCLUDEPATH$unique=set" 123600- 123601+ 123602 if test ""; then 123603 INCLUDES="-I$ai_p $INCLUDES" 123604 else 123605 INCLUDES="$INCLUDES -I$ai_p" 123606 fi 123607- 123608+ 123609 fi 123610 123611 fi 123612 123613- 123614+ 123615 123616 if test "$ext_shared" = "yes"; then 123617 SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" 123618 if test -n "$SNMP_LIBDIR"; then 123619- 123620+ 123621 if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then 123622- 123623+ 123624 if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then 123625 ai_p=$SNMP_LIBDIR 123626 else 123627- 123628+ 123629 ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 123630- 123631+ 123632 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123633 ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" 123634 fi 123635 123636- 123637+ 123638 if test "$ext_shared" = "yes"; then 123639 SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" 123640 test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" 123641 else 123642- 123643- 123644- 123645+ 123646+ 123647+ 123648 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123649- 123650+ 123651 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 123652 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123653 eval "LIBPATH$unique=set" 123654- 123655+ 123656 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 123657 LDFLAGS="$LDFLAGS -L$ai_p" 123658 PHP_RPATHS="$PHP_RPATHS $ai_p" 123659- 123660+ 123661 fi 123662 123663 123664 fi 123665- 123666+ 123667 fi 123668 123669 fi 123670 else 123671- 123672+ 123673 123674 if test -n "$SNMP_LIBDIR"; then 123675- 123676+ 123677 if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then 123678- 123679+ 123680 if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then 123681 ai_p=$SNMP_LIBDIR 123682 else 123683- 123684+ 123685 ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 123686- 123687+ 123688 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123689 ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" 123690 fi 123691 123692- 123693- 123694- 123695- 123696+ 123697+ 123698+ 123699+ 123700 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123701- 123702+ 123703 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 123704 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123705 eval "LIBPATH$unique=set" 123706- 123707+ 123708 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 123709 LDFLAGS="$LDFLAGS -L$ai_p" 123710 PHP_RPATHS="$PHP_RPATHS $ai_p" 123711- 123712+ 123713 fi 123714 123715 123716- 123717+ 123718 fi 123719 123720 fi 123721- 123722- 123723+ 123724+ 123725 case snmp in 123726 c|c_r|pthread*) ;; 123727- *) 123728- LIBS="-lsnmp $LIBS" 123729+ *) 123730+ LIBS="-lsnmp $LIBS" 123731 ;; 123732 esac 123733 123734@@ -107748,25 +84293,25 @@ 123735 SNMP_LIBNAME=snmp 123736 fi 123737 123738- 123739+ 123740 save_old_LDFLAGS=$LDFLAGS 123741 ac_stuff=" 123742 $SNMP_SHARED_LIBADD 123743 " 123744- 123745+ 123746 save_ext_shared=$ext_shared 123747 ext_shared=yes 123748- 123749+ 123750 for ac_i in $ac_stuff; do 123751 case $ac_i in 123752 -pthread) 123753 if test "$ext_shared" = "yes"; then 123754 LDFLAGS="$LDFLAGS -pthread" 123755 else 123756- 123757- 123758+ 123759+ 123760 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 123761- 123762+ 123763 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 123764 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123765 eval "EXTRA_LDFLAGS$unique=set" 123766@@ -107777,20 +84322,20 @@ 123767 ;; 123768 -l*) 123769 ac_ii=`echo $ac_i|cut -c 3-` 123770- 123771- 123772+ 123773+ 123774 case $ac_ii in 123775 c|c_r|pthread*) ;; 123776- *) 123777+ *) 123778 if test "$ext_shared" = "yes"; then 123779- LDFLAGS="$LDFLAGS -l$ac_ii" 123780+ LDFLAGS="$LDFLAGS -l$ac_ii" 123781 else 123782- 123783- 123784+ 123785+ 123786 case $ac_ii in 123787 c|c_r|pthread*) ;; 123788- *) 123789- LIBS="$LIBS -l$ac_ii" 123790+ *) 123791+ LIBS="$LIBS -l$ac_ii" 123792 ;; 123793 esac 123794 123795@@ -107803,154 +84348,123 @@ 123796 ;; 123797 -L*) 123798 ac_ii=`echo $ac_i|cut -c 3-` 123799- 123800+ 123801 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 123802- 123803+ 123804 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 123805 ai_p=$ac_ii 123806 else 123807- 123808+ 123809 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 123810- 123811+ 123812 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 123813 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 123814 fi 123815 123816- 123817+ 123818 if test "$ext_shared" = "yes"; then 123819 LDFLAGS="-L$ai_p $LDFLAGS" 123820 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 123821 else 123822- 123823- 123824- 123825+ 123826+ 123827+ 123828 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 123829- 123830+ 123831 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 123832 if test -n "$unique" && test "`eval $cmd`" = "" ; then 123833 eval "LIBPATH$unique=set" 123834- 123835+ 123836 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 123837 LDFLAGS="$LDFLAGS -L$ai_p" 123838 PHP_RPATHS="$PHP_RPATHS $ai_p" 123839- 123840+ 123841 fi 123842 123843 123844 fi 123845- 123846+ 123847 fi 123848 123849 ;; 123850 esac 123851 done 123852 123853- as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_snmp_parse_oid" | $as_tr_sh` 123854-echo "$as_me:$LINENO: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 123855-echo $ECHO_N "checking for snmp_parse_oid in -l$SNMP_LIBNAME... $ECHO_C" >&6 123856-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 123857- echo $ECHO_N "(cached) $ECHO_C" >&6 123858+ echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 123859+echo "configure:84395: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 123860+ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` 123861+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 123862+ echo $ac_n "(cached) $ac_c" 1>&6 123863 else 123864- ac_check_lib_save_LIBS=$LIBS 123865+ ac_save_LIBS="$LIBS" 123866 LIBS="-l$SNMP_LIBNAME $LIBS" 123867-cat >conftest.$ac_ext <<_ACEOF 123868-/* confdefs.h. */ 123869-_ACEOF 123870-cat confdefs.h >>conftest.$ac_ext 123871-cat >>conftest.$ac_ext <<_ACEOF 123872-/* end confdefs.h. */ 123873- 123874+cat > conftest.$ac_ext <<EOF 123875+#line 84403 "configure" 123876+#include "confdefs.h" 123877 /* Override any gcc2 internal prototype to avoid an error. */ 123878-#ifdef __cplusplus 123879-extern "C" 123880-#endif 123881 /* We use char because int might match the return type of a gcc2 123882- builtin and then its argument prototype would still apply. */ 123883-char snmp_parse_oid (); 123884-int 123885-main () 123886-{ 123887-snmp_parse_oid (); 123888- ; 123889- return 0; 123890-} 123891-_ACEOF 123892-rm -f conftest.$ac_objext conftest$ac_exeext 123893-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 123894- (eval $ac_link) 2>conftest.er1 123895- ac_status=$? 123896- grep -v '^ *+' conftest.er1 >conftest.err 123897- rm -f conftest.er1 123898- cat conftest.err >&5 123899- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123900- (exit $ac_status); } && 123901- { ac_try='test -z "$ac_c_werror_flag" 123902- || test ! -s conftest.err' 123903- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123904- (eval $ac_try) 2>&5 123905- ac_status=$? 123906- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123907- (exit $ac_status); }; } && 123908- { ac_try='test -s conftest$ac_exeext' 123909- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 123910- (eval $ac_try) 2>&5 123911- ac_status=$? 123912- echo "$as_me:$LINENO: \$? = $ac_status" >&5 123913- (exit $ac_status); }; }; then 123914- eval "$as_ac_Lib=yes" 123915-else 123916- echo "$as_me: failed program was:" >&5 123917-sed 's/^/| /' conftest.$ac_ext >&5 123918- 123919-eval "$as_ac_Lib=no" 123920-fi 123921-rm -f conftest.err conftest.$ac_objext \ 123922- conftest$ac_exeext conftest.$ac_ext 123923-LIBS=$ac_check_lib_save_LIBS 123924-fi 123925-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 123926-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 123927-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 123928+ builtin and then its argument prototype would still apply. */ 123929+char snmp_parse_oid(); 123930 123931+int main() { 123932+snmp_parse_oid() 123933+; return 0; } 123934+EOF 123935+if { (eval echo configure:84414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 123936+ rm -rf conftest* 123937+ eval "ac_cv_lib_$ac_lib_var=yes" 123938+else 123939+ echo "configure: failed program was:" >&5 123940+ cat conftest.$ac_ext >&5 123941+ rm -rf conftest* 123942+ eval "ac_cv_lib_$ac_lib_var=no" 123943+fi 123944+rm -f conftest* 123945+LIBS="$ac_save_LIBS" 123946+ 123947+fi 123948+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 123949+ echo "$ac_t""yes" 1>&6 123950+ 123951 LDFLAGS=$save_old_LDFLAGS 123952 ext_shared=$save_ext_shared 123953- 123954- 123955-cat >>confdefs.h <<\_ACEOF 123956+ 123957+ cat >> confdefs.h <<\EOF 123958 #define HAVE_SNMP_PARSE_OID 1 123959-_ACEOF 123960- 123961- 123962+EOF 123963 123964+ 123965+ 123966 else 123967+ echo "$ac_t""no" 1>&6 123968 123969 LDFLAGS=$save_old_LDFLAGS 123970 ext_shared=$save_ext_shared 123971 unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid 123972- 123973- 123974+ 123975+ 123976 fi 123977 123978 123979- 123980+ 123981 save_old_LDFLAGS=$LDFLAGS 123982 ac_stuff=" 123983 $SNMP_SHARED_LIBADD 123984 " 123985- 123986+ 123987 save_ext_shared=$ext_shared 123988 ext_shared=yes 123989- 123990+ 123991 for ac_i in $ac_stuff; do 123992 case $ac_i in 123993 -pthread) 123994 if test "$ext_shared" = "yes"; then 123995 LDFLAGS="$LDFLAGS -pthread" 123996 else 123997- 123998- 123999+ 124000+ 124001 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 124002- 124003+ 124004 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 124005 if test -n "$unique" && test "`eval $cmd`" = "" ; then 124006 eval "EXTRA_LDFLAGS$unique=set" 124007@@ -107961,20 +84475,20 @@ 124008 ;; 124009 -l*) 124010 ac_ii=`echo $ac_i|cut -c 3-` 124011- 124012- 124013+ 124014+ 124015 case $ac_ii in 124016 c|c_r|pthread*) ;; 124017- *) 124018+ *) 124019 if test "$ext_shared" = "yes"; then 124020- LDFLAGS="$LDFLAGS -l$ac_ii" 124021+ LDFLAGS="$LDFLAGS -l$ac_ii" 124022 else 124023- 124024- 124025+ 124026+ 124027 case $ac_ii in 124028 c|c_r|pthread*) ;; 124029- *) 124030- LIBS="$LIBS -l$ac_ii" 124031+ *) 124032+ LIBS="$LIBS -l$ac_ii" 124033 ;; 124034 esac 124035 124036@@ -107987,148 +84501,114 @@ 124037 ;; 124038 -L*) 124039 ac_ii=`echo $ac_i|cut -c 3-` 124040- 124041+ 124042 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 124043- 124044+ 124045 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 124046 ai_p=$ac_ii 124047 else 124048- 124049+ 124050 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 124051- 124052+ 124053 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 124054 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 124055 fi 124056 124057- 124058+ 124059 if test "$ext_shared" = "yes"; then 124060 LDFLAGS="-L$ai_p $LDFLAGS" 124061 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 124062 else 124063- 124064- 124065- 124066+ 124067+ 124068+ 124069 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 124070- 124071+ 124072 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 124073 if test -n "$unique" && test "`eval $cmd`" = "" ; then 124074 eval "LIBPATH$unique=set" 124075- 124076+ 124077 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 124078 LDFLAGS="$LDFLAGS -L$ai_p" 124079 PHP_RPATHS="$PHP_RPATHS $ai_p" 124080- 124081+ 124082 fi 124083 124084 124085 fi 124086- 124087+ 124088 fi 124089 124090 ;; 124091 esac 124092 done 124093 124094- as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh` 124095-echo "$as_me:$LINENO: checking for init_snmp in -l$SNMP_LIBNAME" >&5 124096-echo $ECHO_N "checking for init_snmp in -l$SNMP_LIBNAME... $ECHO_C" >&6 124097-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 124098- echo $ECHO_N "(cached) $ECHO_C" >&6 124099+ echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 124100+echo "configure:84548: checking for init_snmp in -l$SNMP_LIBNAME" >&5 124101+ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` 124102+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 124103+ echo $ac_n "(cached) $ac_c" 1>&6 124104 else 124105- ac_check_lib_save_LIBS=$LIBS 124106+ ac_save_LIBS="$LIBS" 124107 LIBS="-l$SNMP_LIBNAME $LIBS" 124108-cat >conftest.$ac_ext <<_ACEOF 124109-/* confdefs.h. */ 124110-_ACEOF 124111-cat confdefs.h >>conftest.$ac_ext 124112-cat >>conftest.$ac_ext <<_ACEOF 124113-/* end confdefs.h. */ 124114- 124115+cat > conftest.$ac_ext <<EOF 124116+#line 84556 "configure" 124117+#include "confdefs.h" 124118 /* Override any gcc2 internal prototype to avoid an error. */ 124119-#ifdef __cplusplus 124120-extern "C" 124121-#endif 124122 /* We use char because int might match the return type of a gcc2 124123- builtin and then its argument prototype would still apply. */ 124124-char init_snmp (); 124125-int 124126-main () 124127-{ 124128-init_snmp (); 124129- ; 124130- return 0; 124131-} 124132-_ACEOF 124133-rm -f conftest.$ac_objext conftest$ac_exeext 124134-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 124135- (eval $ac_link) 2>conftest.er1 124136- ac_status=$? 124137- grep -v '^ *+' conftest.er1 >conftest.err 124138- rm -f conftest.er1 124139- cat conftest.err >&5 124140- echo "$as_me:$LINENO: \$? = $ac_status" >&5 124141- (exit $ac_status); } && 124142- { ac_try='test -z "$ac_c_werror_flag" 124143- || test ! -s conftest.err' 124144- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 124145- (eval $ac_try) 2>&5 124146- ac_status=$? 124147- echo "$as_me:$LINENO: \$? = $ac_status" >&5 124148- (exit $ac_status); }; } && 124149- { ac_try='test -s conftest$ac_exeext' 124150- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 124151- (eval $ac_try) 2>&5 124152- ac_status=$? 124153- echo "$as_me:$LINENO: \$? = $ac_status" >&5 124154- (exit $ac_status); }; }; then 124155- eval "$as_ac_Lib=yes" 124156-else 124157- echo "$as_me: failed program was:" >&5 124158-sed 's/^/| /' conftest.$ac_ext >&5 124159- 124160-eval "$as_ac_Lib=no" 124161-fi 124162-rm -f conftest.err conftest.$ac_objext \ 124163- conftest$ac_exeext conftest.$ac_ext 124164-LIBS=$ac_check_lib_save_LIBS 124165-fi 124166-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 124167-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 124168-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 124169+ builtin and then its argument prototype would still apply. */ 124170+char init_snmp(); 124171+ 124172+int main() { 124173+init_snmp() 124174+; return 0; } 124175+EOF 124176+if { (eval echo configure:84567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 124177+ rm -rf conftest* 124178+ eval "ac_cv_lib_$ac_lib_var=yes" 124179+else 124180+ echo "configure: failed program was:" >&5 124181+ cat conftest.$ac_ext >&5 124182+ rm -rf conftest* 124183+ eval "ac_cv_lib_$ac_lib_var=no" 124184+fi 124185+rm -f conftest* 124186+LIBS="$ac_save_LIBS" 124187 124188+fi 124189+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 124190+ echo "$ac_t""yes" 1>&6 124191+ 124192 LDFLAGS=$save_old_LDFLAGS 124193 ext_shared=$save_ext_shared 124194- 124195- 124196-cat >>confdefs.h <<\_ACEOF 124197+ 124198+ cat >> confdefs.h <<\EOF 124199 #define HAVE_SNMP 1 124200-_ACEOF 124201- 124202- 124203+EOF 124204 124205+ 124206+ 124207 else 124208+ echo "$ac_t""no" 1>&6 124209 124210 LDFLAGS=$save_old_LDFLAGS 124211 ext_shared=$save_ext_shared 124212 unset ac_cv_lib_$SNMP_LIBNAME_init_snmp 124213- 124214- { { echo "$as_me:$LINENO: error: SNMP sanity check failed. Please check config.log for more information." >&5 124215-echo "$as_me: error: SNMP sanity check failed. Please check config.log for more information." >&2;} 124216- { (exit 1); exit 1; }; } 124217- 124218- 124219+ 124220+ { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } 124221+ 124222+ 124223 fi 124224 124225 124226 if test "$PHP_UCD_SNMP_HACK" = "yes" ; then 124227- 124228-cat >>confdefs.h <<\_ACEOF 124229+ cat >> confdefs.h <<\EOF 124230 #define UCD_SNMP_HACK 1 124231-_ACEOF 124232+EOF 124233 124234 fi 124235- 124236- 124237+ 124238+ 124239 ext_builddir=ext/snmp 124240 ext_srcdir=$abs_srcdir/ext/snmp 124241 124242@@ -108136,15 +84616,15 @@ 124243 124244 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 124245 PHP_SNMP_SHARED=no 124246- 124247- 124248+ 124249+ 124250 case ext/snmp in 124251 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124252 /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124253 *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124254 esac 124255- 124256- 124257+ 124258+ 124259 124260 b_c_pre=$php_c_pre 124261 b_cxx_pre=$php_cxx_pre 124262@@ -108157,12 +84637,12 @@ 124263 124264 old_IFS=$IFS 124265 for ac_src in snmp.c; do 124266- 124267+ 124268 IFS=. 124269 set $ac_src 124270 ac_obj=$1 124271 IFS=$old_IFS 124272- 124273+ 124274 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 124275 124276 case $ac_src in 124277@@ -108186,14 +84666,14 @@ 124278 else 124279 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 124280 PHP_SNMP_SHARED=yes 124281- 124282+ 124283 case ext/snmp in 124284 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124285 /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124286 *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124287 esac 124288- 124289- 124290+ 124291+ 124292 124293 b_c_pre=$shared_c_pre 124294 b_cxx_pre=$shared_cxx_pre 124295@@ -108206,12 +84686,12 @@ 124296 124297 old_IFS=$IFS 124298 for ac_src in snmp.c; do 124299- 124300+ 124301 IFS=. 124302 set $ac_src 124303 ac_obj=$1 124304 IFS=$old_IFS 124305- 124306+ 124307 shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" 124308 124309 case $ac_src in 124310@@ -108229,7 +84709,7 @@ 124311 124312 case $host_alias in 124313 *netware*) 124314- 124315+ 124316 install_modules="install-modules" 124317 124318 case $host_alias in 124319@@ -108239,7 +84719,7 @@ 124320 ;; 124321 *netware*) 124322 suffix=nlm 124323- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(SNMP_SHARED_LIBADD)' 124324+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' 124325 ;; 124326 *) 124327 suffix=la 124328@@ -108252,7 +84732,7 @@ 124329 else 124330 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" 124331 fi 124332- 124333+ 124334 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" 124335 124336 cat >>Makefile.objects<<EOF 124337@@ -108266,7 +84746,7 @@ 124338 124339 ;; 124340 *) 124341- 124342+ 124343 install_modules="install-modules" 124344 124345 case $host_alias in 124346@@ -108276,7 +84756,7 @@ 124347 ;; 124348 *netware*) 124349 suffix=nlm 124350- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(P_SHARED_LIBADD)' 124351+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SNMP, 3)_SHARED_LIBADD)' 124352 ;; 124353 *) 124354 suffix=la 124355@@ -108289,7 +84769,7 @@ 124356 else 124357 PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix" 124358 fi 124359- 124360+ 124361 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" 124362 124363 cat >>Makefile.objects<<EOF 124364@@ -108303,10 +84783,9 @@ 124365 124366 ;; 124367 esac 124368- 124369-cat >>confdefs.h <<_ACEOF 124370+ cat >> confdefs.h <<EOF 124371 #define COMPILE_DL_SNMP 1 124372-_ACEOF 124373+EOF 124374 124375 fi 124376 fi 124377@@ -108315,15 +84794,15 @@ 124378 PHP_SNMP_SHARED=no 124379 case "$PHP_SAPI" in 124380 cgi|embed) 124381- 124382- 124383+ 124384+ 124385 case ext/snmp in 124386 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124387 /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124388 *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124389 esac 124390- 124391- 124392+ 124393+ 124394 124395 b_c_pre=$php_c_pre 124396 b_cxx_pre=$php_cxx_pre 124397@@ -108336,12 +84815,12 @@ 124398 124399 old_IFS=$IFS 124400 for ac_src in snmp.c; do 124401- 124402+ 124403 IFS=. 124404 set $ac_src 124405 ac_obj=$1 124406 IFS=$old_IFS 124407- 124408+ 124409 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 124410 124411 case $ac_src in 124412@@ -108361,15 +84840,15 @@ 124413 EXT_STATIC="$EXT_STATIC snmp" 124414 ;; 124415 *) 124416- 124417- 124418+ 124419+ 124420 case ext/snmp in 124421 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124422 /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124423 *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124424 esac 124425- 124426- 124427+ 124428+ 124429 124430 b_c_pre=$php_c_pre 124431 b_cxx_pre=$php_cxx_pre 124432@@ -108382,13 +84861,13 @@ 124433 124434 old_IFS=$IFS 124435 for ac_src in snmp.c; do 124436- 124437+ 124438 IFS=. 124439 set $ac_src 124440 ac_obj=$1 124441 IFS=$old_IFS 124442- 124443- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 124444+ 124445+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 124446 124447 case $ac_src in 124448 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 124449@@ -108408,20 +84887,20 @@ 124450 esac 124451 EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" 124452 fi 124453- 124454- 124455+ 124456+ 124457 BUILD_DIR="$BUILD_DIR $ext_builddir" 124458- 124459+ 124460 124461 124462 if test "$ext_builddir" = "."; then 124463 PHP_PECL_EXTENSION=snmp 124464- 124465+ 124466 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 124467 124468 fi 124469 124470- 124471+ 124472 PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD" 124473 124474 fi 124475@@ -108430,18 +84909,19 @@ 124476 124477 php_enable_soap=no 124478 124479-echo "$as_me:$LINENO: checking whether to enable SOAP support" >&5 124480-echo $ECHO_N "checking whether to enable SOAP support... $ECHO_C" >&6 124481+echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 124482+echo "configure:84914: checking whether to enable SOAP support" >&5 124483 # Check whether --enable-soap or --disable-soap was given. 124484 if test "${enable_soap+set}" = set; then 124485 enableval="$enable_soap" 124486 PHP_SOAP=$enableval 124487 else 124488- 124489+ 124490 PHP_SOAP=no 124491 test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL 124492 124493-fi; 124494+fi 124495+ 124496 124497 124498 ext_output="yes, shared" 124499@@ -108465,33 +84945,31 @@ 124500 124501 124502 124503-echo "$as_me:$LINENO: result: $ext_output" >&5 124504-echo "${ECHO_T}$ext_output" >&6 124505+echo "$ac_t""$ext_output" 1>&6 124506 124507 124508 124509 124510 if test -z "$PHP_LIBXML_DIR"; then 124511- 124512+ 124513 php_with_libxml_dir=no 124514 124515-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 124516-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 124517- 124518+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 124519+echo "configure:84959: checking libxml2 install dir" >&5 124520 # Check whether --with-libxml-dir or --without-libxml-dir was given. 124521 if test "${with_libxml_dir+set}" = set; then 124522 withval="$with_libxml_dir" 124523 PHP_LIBXML_DIR=$withval 124524 else 124525- 124526+ 124527 PHP_LIBXML_DIR=no 124528+ 124529 124530+fi 124531 124532-fi; 124533 124534 ext_output=$PHP_LIBXML_DIR 124535-echo "$as_me:$LINENO: result: $ext_output" >&5 124536-echo "${ECHO_T}$ext_output" >&6 124537+echo "$ac_t""$ext_output" 1>&6 124538 124539 124540 124541@@ -108499,19 +84977,17 @@ 124542 124543 if test "$PHP_SOAP" != "no"; then 124544 124545- if test "$PHP_LIBXML" = "no"; then 124546- { { echo "$as_me:$LINENO: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&5 124547-echo "$as_me: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&2;} 124548- { (exit 1); exit 1; }; } 124549+ if test "$PHP_LIBXML" = "no"; then 124550+ { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 124551 fi 124552 124553- 124554-echo "$as_me:$LINENO: checking for xml2-config path" >&5 124555-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 124556-if test "${ac_cv_php_xml2_config_path+set}" = set; then 124557- echo $ECHO_N "(cached) $ECHO_C" >&6 124558+ 124559+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 124560+echo "configure:84987: checking for xml2-config path" >&5 124561+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 124562+ echo $ac_n "(cached) $ac_c" 1>&6 124563 else 124564- 124565+ 124566 for i in $PHP_LIBXML_DIR /usr/local /usr; do 124567 if test -x "$i/bin/xml2-config"; then 124568 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 124569@@ -108520,8 +84996,8 @@ 124570 done 124571 124572 fi 124573-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 124574-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 124575+ 124576+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 124577 124578 if test -x "$ac_cv_php_xml2_config_path"; then 124579 XML2_CONFIG="$ac_cv_php_xml2_config_path" 124580@@ -108534,17 +85010,17 @@ 124581 if test "$LIBXML_VERSION" -ge "2006011"; then 124582 LIBXML_LIBS=`$XML2_CONFIG --libs` 124583 LIBXML_INCS=`$XML2_CONFIG --cflags` 124584- 124585+ 124586 for ac_i in $LIBXML_LIBS; do 124587 case $ac_i in 124588 -pthread) 124589 if test "$ext_shared" = "yes"; then 124590 SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" 124591 else 124592- 124593- 124594+ 124595+ 124596 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 124597- 124598+ 124599 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 124600 if test -n "$unique" && test "`eval $cmd`" = "" ; then 124601 eval "EXTRA_LDFLAGS$unique=set" 124602@@ -108555,20 +85031,20 @@ 124603 ;; 124604 -l*) 124605 ac_ii=`echo $ac_i|cut -c 3-` 124606- 124607- 124608+ 124609+ 124610 case $ac_ii in 124611 c|c_r|pthread*) ;; 124612- *) 124613+ *) 124614 if test "$ext_shared" = "yes"; then 124615- SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" 124616+ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" 124617 else 124618- 124619- 124620+ 124621+ 124622 case $ac_ii in 124623 c|c_r|pthread*) ;; 124624- *) 124625- LIBS="$LIBS -l$ac_ii" 124626+ *) 124627+ LIBS="$LIBS -l$ac_ii" 124628 ;; 124629 esac 124630 124631@@ -108581,80 +85057,80 @@ 124632 ;; 124633 -L*) 124634 ac_ii=`echo $ac_i|cut -c 3-` 124635- 124636+ 124637 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 124638- 124639+ 124640 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 124641 ai_p=$ac_ii 124642 else 124643- 124644+ 124645 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 124646- 124647+ 124648 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 124649 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 124650 fi 124651 124652- 124653+ 124654 if test "$ext_shared" = "yes"; then 124655 SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" 124656 test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" 124657 else 124658- 124659- 124660- 124661+ 124662+ 124663+ 124664 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 124665- 124666+ 124667 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 124668 if test -n "$unique" && test "`eval $cmd`" = "" ; then 124669 eval "LIBPATH$unique=set" 124670- 124671+ 124672 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 124673 LDFLAGS="$LDFLAGS -L$ai_p" 124674 PHP_RPATHS="$PHP_RPATHS $ai_p" 124675- 124676+ 124677 fi 124678 124679 124680 fi 124681- 124682+ 124683 fi 124684 124685 ;; 124686 esac 124687 done 124688 124689- 124690+ 124691 for ac_i in $LIBXML_INCS; do 124692 case $ac_i in 124693 -I*) 124694 ac_ii=`echo $ac_i|cut -c 3-` 124695- 124696+ 124697 if test "$ac_ii" != "/usr/include"; then 124698- 124699+ 124700 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 124701 ai_p=$ac_ii 124702 else 124703- 124704+ 124705 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 124706- 124707+ 124708 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 124709 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 124710 fi 124711 124712- 124713- 124714+ 124715+ 124716 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 124717- 124718+ 124719 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 124720 if test -n "$unique" && test "`eval $cmd`" = "" ; then 124721 eval "INCLUDEPATH$unique=set" 124722- 124723+ 124724 if test ""; then 124725 INCLUDES="-I$ai_p $INCLUDES" 124726 else 124727 INCLUDES="$INCLUDES -I$ai_p" 124728 fi 124729- 124730+ 124731 fi 124732 124733 fi 124734@@ -108664,92 +85140,74 @@ 124735 done 124736 124737 124738- echo "$as_me:$LINENO: checking whether libxml build works" >&5 124739-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 124740-if test "${php_cv_libxml_build_works+set}" = set; then 124741- echo $ECHO_N "(cached) $ECHO_C" >&6 124742+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 124743+echo "configure:85145: checking whether libxml build works" >&5 124744+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 124745+ echo $ac_n "(cached) $ac_c" 1>&6 124746 else 124747- 124748- 124749+ 124750+ 124751 old_LIBS=$LIBS 124752 LIBS=" 124753 $SOAP_SHARED_LIBADD 124754 $LIBS" 124755 if test "$cross_compiling" = yes; then 124756- 124757+ 124758 LIBS=$old_LIBS 124759- 124760+ 124761 else 124762- cat >conftest.$ac_ext <<_ACEOF 124763-/* confdefs.h. */ 124764-_ACEOF 124765-cat confdefs.h >>conftest.$ac_ext 124766-cat >>conftest.$ac_ext <<_ACEOF 124767-/* end confdefs.h. */ 124768- 124769+ cat > conftest.$ac_ext <<EOF 124770+#line 85161 "configure" 124771+#include "confdefs.h" 124772 124773+ 124774 char xmlInitParser(); 124775 int main() { 124776 xmlInitParser(); 124777 return 0; 124778 } 124779- 124780-_ACEOF 124781-rm -f conftest$ac_exeext 124782-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 124783- (eval $ac_link) 2>&5 124784- ac_status=$? 124785- echo "$as_me:$LINENO: \$? = $ac_status" >&5 124786- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 124787- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 124788- (eval $ac_try) 2>&5 124789- ac_status=$? 124790- echo "$as_me:$LINENO: \$? = $ac_status" >&5 124791- (exit $ac_status); }; }; then 124792- 124793+ 124794+EOF 124795+if { (eval echo configure:85172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 124796+then 124797+ 124798 LIBS=$old_LIBS 124799- 124800+ 124801 php_cv_libxml_build_works=yes 124802- 124803- 124804+ 124805+ 124806 else 124807- echo "$as_me: program exited with status $ac_status" >&5 124808-echo "$as_me: failed program was:" >&5 124809-sed 's/^/| /' conftest.$ac_ext >&5 124810- 124811-( exit $ac_status ) 124812- 124813+ echo "configure: failed program was:" >&5 124814+ cat conftest.$ac_ext >&5 124815+ rm -fr conftest* 124816+ 124817 LIBS=$old_LIBS 124818- 124819- echo "$as_me:$LINENO: result: no" >&5 124820-echo "${ECHO_T}no" >&6 124821- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 124822-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 124823- { (exit 1); exit 1; }; } 124824- 124825- 124826+ 124827+ echo "$ac_t""no" 1>&6 124828+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 124829+ 124830+ 124831 fi 124832-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 124833+rm -fr conftest* 124834 fi 124835 124836 124837+ 124838 fi 124839-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 124840-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 124841- if test "$php_cv_libxml_build_works" = "yes"; then 124842 124843-cat >>confdefs.h <<\_ACEOF 124844+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 124845+ if test "$php_cv_libxml_build_works" = "yes"; then 124846+ cat >> confdefs.h <<\EOF 124847 #define HAVE_LIBXML 1 124848-_ACEOF 124849+EOF 124850 124851 fi 124852- 124853- 124854-cat >>confdefs.h <<\_ACEOF 124855+ 124856+ cat >> confdefs.h <<\EOF 124857 #define HAVE_SOAP 1 124858-_ACEOF 124859- 124860+EOF 124861 124862+ 124863 ext_builddir=ext/soap 124864 ext_srcdir=$abs_srcdir/ext/soap 124865 124866@@ -108757,15 +85215,15 @@ 124867 124868 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 124869 PHP_SOAP_SHARED=no 124870- 124871- 124872+ 124873+ 124874 case ext/soap in 124875 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124876 /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124877 *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124878 esac 124879- 124880- 124881+ 124882+ 124883 124884 b_c_pre=$php_c_pre 124885 b_cxx_pre=$php_cxx_pre 124886@@ -108778,12 +85236,12 @@ 124887 124888 old_IFS=$IFS 124889 for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do 124890- 124891+ 124892 IFS=. 124893 set $ac_src 124894 ac_obj=$1 124895 IFS=$old_IFS 124896- 124897+ 124898 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 124899 124900 case $ac_src in 124901@@ -108807,14 +85265,14 @@ 124902 else 124903 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 124904 PHP_SOAP_SHARED=yes 124905- 124906+ 124907 case ext/soap in 124908 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 124909 /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 124910 *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 124911 esac 124912- 124913- 124914+ 124915+ 124916 124917 b_c_pre=$shared_c_pre 124918 b_cxx_pre=$shared_cxx_pre 124919@@ -108827,12 +85285,12 @@ 124920 124921 old_IFS=$IFS 124922 for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do 124923- 124924+ 124925 IFS=. 124926 set $ac_src 124927 ac_obj=$1 124928 IFS=$old_IFS 124929- 124930+ 124931 shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" 124932 124933 case $ac_src in 124934@@ -108850,7 +85308,7 @@ 124935 124936 case $host_alias in 124937 *netware*) 124938- 124939+ 124940 install_modules="install-modules" 124941 124942 case $host_alias in 124943@@ -108860,7 +85318,7 @@ 124944 ;; 124945 *netware*) 124946 suffix=nlm 124947- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(SOAP_SHARED_LIBADD)' 124948+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)' 124949 ;; 124950 *) 124951 suffix=la 124952@@ -108873,7 +85331,7 @@ 124953 else 124954 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" 124955 fi 124956- 124957+ 124958 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" 124959 124960 cat >>Makefile.objects<<EOF 124961@@ -108887,7 +85345,7 @@ 124962 124963 ;; 124964 *) 124965- 124966+ 124967 install_modules="install-modules" 124968 124969 case $host_alias in 124970@@ -108897,7 +85355,7 @@ 124971 ;; 124972 *netware*) 124973 suffix=nlm 124974- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(P_SHARED_LIBADD)' 124975+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)' 124976 ;; 124977 *) 124978 suffix=la 124979@@ -108910,7 +85368,7 @@ 124980 else 124981 PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix" 124982 fi 124983- 124984+ 124985 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" 124986 124987 cat >>Makefile.objects<<EOF 124988@@ -108924,10 +85382,9 @@ 124989 124990 ;; 124991 esac 124992- 124993-cat >>confdefs.h <<_ACEOF 124994+ cat >> confdefs.h <<EOF 124995 #define COMPILE_DL_SOAP 1 124996-_ACEOF 124997+EOF 124998 124999 fi 125000 fi 125001@@ -108936,15 +85393,15 @@ 125002 PHP_SOAP_SHARED=no 125003 case "$PHP_SAPI" in 125004 cgi|embed) 125005- 125006- 125007+ 125008+ 125009 case ext/soap in 125010 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125011 /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125012 *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125013 esac 125014- 125015- 125016+ 125017+ 125018 125019 b_c_pre=$php_c_pre 125020 b_cxx_pre=$php_cxx_pre 125021@@ -108957,12 +85414,12 @@ 125022 125023 old_IFS=$IFS 125024 for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do 125025- 125026+ 125027 IFS=. 125028 set $ac_src 125029 ac_obj=$1 125030 IFS=$old_IFS 125031- 125032+ 125033 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 125034 125035 case $ac_src in 125036@@ -108982,15 +85439,15 @@ 125037 EXT_STATIC="$EXT_STATIC soap" 125038 ;; 125039 *) 125040- 125041- 125042+ 125043+ 125044 case ext/soap in 125045 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125046 /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125047 *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125048 esac 125049- 125050- 125051+ 125052+ 125053 125054 b_c_pre=$php_c_pre 125055 b_cxx_pre=$php_cxx_pre 125056@@ -109003,13 +85460,13 @@ 125057 125058 old_IFS=$IFS 125059 for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do 125060- 125061+ 125062 IFS=. 125063 set $ac_src 125064 ac_obj=$1 125065 IFS=$old_IFS 125066- 125067- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 125068+ 125069+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 125070 125071 case $ac_src in 125072 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 125073@@ -109029,33 +85486,29 @@ 125074 esac 125075 EXT_CLI_STATIC="$EXT_CLI_STATIC soap" 125076 fi 125077- 125078- 125079+ 125080+ 125081 BUILD_DIR="$BUILD_DIR $ext_builddir" 125082- 125083+ 125084 125085 125086 if test "$ext_builddir" = "."; then 125087 PHP_PECL_EXTENSION=soap 125088- 125089+ 125090 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 125091 125092 fi 125093 125094- 125095+ 125096 PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD" 125097 125098- 125099+ 125100 else 125101- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 125102-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 125103- { (exit 1); exit 1; }; } 125104+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 125105 fi 125106-else 125107- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 125108-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 125109- { (exit 1); exit 1; }; } 125110- 125111+else 125112+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 125113+ 125114 fi 125115 125116 fi 125117@@ -109064,18 +85517,19 @@ 125118 125119 php_enable_sockets=no 125120 125121-echo "$as_me:$LINENO: checking whether to enable sockets support" >&5 125122-echo $ECHO_N "checking whether to enable sockets support... $ECHO_C" >&6 125123+echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 125124+echo "configure:85522: checking whether to enable sockets support" >&5 125125 # Check whether --enable-sockets or --disable-sockets was given. 125126 if test "${enable_sockets+set}" = set; then 125127 enableval="$enable_sockets" 125128 PHP_SOCKETS=$enableval 125129 else 125130- 125131+ 125132 PHP_SOCKETS=no 125133 test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL 125134 125135-fi; 125136+fi 125137+ 125138 125139 125140 ext_output="yes, shared" 125141@@ -109099,395 +85553,175 @@ 125142 125143 125144 125145-echo "$as_me:$LINENO: result: $ext_output" >&5 125146-echo "${ECHO_T}$ext_output" >&6 125147+echo "$ac_t""$ext_output" 1>&6 125148 125149 125150 125151 125152 if test "$PHP_SOCKETS" != "no"; then 125153- echo "$as_me:$LINENO: checking for struct cmsghdr" >&5 125154-echo $ECHO_N "checking for struct cmsghdr... $ECHO_C" >&6 125155-if test "${ac_cv_cmsghdr+set}" = set; then 125156- echo $ECHO_N "(cached) $ECHO_C" >&6 125157-else 125158- 125159- cat >conftest.$ac_ext <<_ACEOF 125160-/* confdefs.h. */ 125161-_ACEOF 125162-cat confdefs.h >>conftest.$ac_ext 125163-cat >>conftest.$ac_ext <<_ACEOF 125164-/* end confdefs.h. */ 125165+ echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 125166+echo "configure:85564: checking for struct cmsghdr" >&5 125167+if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then 125168+ echo $ac_n "(cached) $ac_c" 1>&6 125169+else 125170+ 125171+ cat > conftest.$ac_ext <<EOF 125172+#line 85570 "configure" 125173+#include "confdefs.h" 125174 125175 #include <sys/types.h> 125176 #include <sys/socket.h> 125177-int 125178-main () 125179-{ 125180+int main() { 125181 struct cmsghdr s; s 125182- ; 125183- return 0; 125184-} 125185-_ACEOF 125186-rm -f conftest.$ac_objext 125187-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 125188- (eval $ac_compile) 2>conftest.er1 125189- ac_status=$? 125190- grep -v '^ *+' conftest.er1 >conftest.err 125191- rm -f conftest.er1 125192- cat conftest.err >&5 125193- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125194- (exit $ac_status); } && 125195- { ac_try='test -z "$ac_c_werror_flag" 125196- || test ! -s conftest.err' 125197- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125198- (eval $ac_try) 2>&5 125199- ac_status=$? 125200- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125201- (exit $ac_status); }; } && 125202- { ac_try='test -s conftest.$ac_objext' 125203- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125204- (eval $ac_try) 2>&5 125205- ac_status=$? 125206- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125207- (exit $ac_status); }; }; then 125208+; return 0; } 125209+EOF 125210+if { (eval echo configure:85579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 125211+ rm -rf conftest* 125212 ac_cv_cmsghdr=yes 125213 else 125214- echo "$as_me: failed program was:" >&5 125215-sed 's/^/| /' conftest.$ac_ext >&5 125216- 125217-ac_cv_cmsghdr=no 125218+ echo "configure: failed program was:" >&5 125219+ cat conftest.$ac_ext >&5 125220+ rm -rf conftest* 125221+ ac_cv_cmsghdr=no 125222 fi 125223-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 125224- 125225+rm -f conftest* 125226+ 125227 fi 125228-echo "$as_me:$LINENO: result: $ac_cv_cmsghdr" >&5 125229-echo "${ECHO_T}$ac_cv_cmsghdr" >&6 125230 125231- if test "$ac_cv_cmsghdr" = yes; then 125232+echo "$ac_t""$ac_cv_cmsghdr" 1>&6 125233 125234-cat >>confdefs.h <<\_ACEOF 125235+ if test "$ac_cv_cmsghdr" = yes; then 125236+ cat >> confdefs.h <<\EOF 125237 #define HAVE_CMSGHDR 1 125238-_ACEOF 125239- 125240- fi 125241- 125242+EOF 125243 125244+ fi 125245 125246-for ac_func in hstrerror socketpair 125247+ for ac_func in hstrerror socketpair 125248 do 125249-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 125250-echo "$as_me:$LINENO: checking for $ac_func" >&5 125251-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 125252-if eval "test \"\${$as_ac_var+set}\" = set"; then 125253- echo $ECHO_N "(cached) $ECHO_C" >&6 125254-else 125255- cat >conftest.$ac_ext <<_ACEOF 125256-/* confdefs.h. */ 125257-_ACEOF 125258-cat confdefs.h >>conftest.$ac_ext 125259-cat >>conftest.$ac_ext <<_ACEOF 125260-/* end confdefs.h. */ 125261-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 125262- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 125263-#define $ac_func innocuous_$ac_func 125264- 125265+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 125266+echo "configure:85604: checking for $ac_func" >&5 125267+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 125268+ echo $ac_n "(cached) $ac_c" 1>&6 125269+else 125270+ cat > conftest.$ac_ext <<EOF 125271+#line 85609 "configure" 125272+#include "confdefs.h" 125273 /* System header to define __stub macros and hopefully few prototypes, 125274- which can conflict with char $ac_func (); below. 125275- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 125276- <limits.h> exists even on freestanding compilers. */ 125277- 125278-#ifdef __STDC__ 125279-# include <limits.h> 125280-#else 125281-# include <assert.h> 125282-#endif 125283- 125284-#undef $ac_func 125285- 125286+ which can conflict with char $ac_func(); below. */ 125287+#include <assert.h> 125288 /* Override any gcc2 internal prototype to avoid an error. */ 125289-#ifdef __cplusplus 125290-extern "C" 125291-{ 125292-#endif 125293 /* We use char because int might match the return type of a gcc2 125294- builtin and then its argument prototype would still apply. */ 125295-char $ac_func (); 125296+ builtin and then its argument prototype would still apply. */ 125297+char $ac_func(); 125298+ 125299+int main() { 125300+ 125301 /* The GNU C library defines this for functions which it implements 125302 to always fail with ENOSYS. Some functions are actually named 125303 something starting with __ and the normal name is an alias. */ 125304 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 125305 choke me 125306 #else 125307-char (*f) () = $ac_func; 125308-#endif 125309-#ifdef __cplusplus 125310-} 125311+$ac_func(); 125312 #endif 125313 125314-int 125315-main () 125316-{ 125317-return f != $ac_func; 125318- ; 125319- return 0; 125320-} 125321-_ACEOF 125322-rm -f conftest.$ac_objext conftest$ac_exeext 125323-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 125324- (eval $ac_link) 2>conftest.er1 125325- ac_status=$? 125326- grep -v '^ *+' conftest.er1 >conftest.err 125327- rm -f conftest.er1 125328- cat conftest.err >&5 125329- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125330- (exit $ac_status); } && 125331- { ac_try='test -z "$ac_c_werror_flag" 125332- || test ! -s conftest.err' 125333- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125334- (eval $ac_try) 2>&5 125335- ac_status=$? 125336- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125337- (exit $ac_status); }; } && 125338- { ac_try='test -s conftest$ac_exeext' 125339- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125340- (eval $ac_try) 2>&5 125341- ac_status=$? 125342- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125343- (exit $ac_status); }; }; then 125344- eval "$as_ac_var=yes" 125345-else 125346- echo "$as_me: failed program was:" >&5 125347-sed 's/^/| /' conftest.$ac_ext >&5 125348- 125349-eval "$as_ac_var=no" 125350-fi 125351-rm -f conftest.err conftest.$ac_objext \ 125352- conftest$ac_exeext conftest.$ac_ext 125353-fi 125354-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 125355-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 125356-if test `eval echo '${'$as_ac_var'}'` = yes; then 125357- cat >>confdefs.h <<_ACEOF 125358-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 125359-_ACEOF 125360+; return 0; } 125361+EOF 125362+if { (eval echo configure:85632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 125363+ rm -rf conftest* 125364+ eval "ac_cv_func_$ac_func=yes" 125365+else 125366+ echo "configure: failed program was:" >&5 125367+ cat conftest.$ac_ext >&5 125368+ rm -rf conftest* 125369+ eval "ac_cv_func_$ac_func=no" 125370+fi 125371+rm -f conftest* 125372+fi 125373 125374+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 125375+ echo "$ac_t""yes" 1>&6 125376+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 125377+ cat >> confdefs.h <<EOF 125378+#define $ac_tr_func 1 125379+EOF 125380+ 125381+else 125382+ echo "$ac_t""no" 1>&6 125383 fi 125384 done 125385 125386- 125387- 125388- 125389- 125390-for ac_header in netdb.h netinet/tcp.h sys/un.h errno.h 125391+ for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h 125392 do 125393-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 125394-if eval "test \"\${$as_ac_Header+set}\" = set"; then 125395- echo "$as_me:$LINENO: checking for $ac_header" >&5 125396-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 125397-if eval "test \"\${$as_ac_Header+set}\" = set"; then 125398- echo $ECHO_N "(cached) $ECHO_C" >&6 125399-fi 125400-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 125401-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 125402-else 125403- # Is the header compilable? 125404-echo "$as_me:$LINENO: checking $ac_header usability" >&5 125405-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 125406-cat >conftest.$ac_ext <<_ACEOF 125407-/* confdefs.h. */ 125408-_ACEOF 125409-cat confdefs.h >>conftest.$ac_ext 125410-cat >>conftest.$ac_ext <<_ACEOF 125411-/* end confdefs.h. */ 125412-$ac_includes_default 125413-#include <$ac_header> 125414-_ACEOF 125415-rm -f conftest.$ac_objext 125416-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 125417- (eval $ac_compile) 2>conftest.er1 125418- ac_status=$? 125419- grep -v '^ *+' conftest.er1 >conftest.err 125420- rm -f conftest.er1 125421- cat conftest.err >&5 125422- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125423- (exit $ac_status); } && 125424- { ac_try='test -z "$ac_c_werror_flag" 125425- || test ! -s conftest.err' 125426- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125427- (eval $ac_try) 2>&5 125428- ac_status=$? 125429- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125430- (exit $ac_status); }; } && 125431- { ac_try='test -s conftest.$ac_objext' 125432- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125433- (eval $ac_try) 2>&5 125434- ac_status=$? 125435- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125436- (exit $ac_status); }; }; then 125437- ac_header_compiler=yes 125438-else 125439- echo "$as_me: failed program was:" >&5 125440-sed 's/^/| /' conftest.$ac_ext >&5 125441- 125442-ac_header_compiler=no 125443-fi 125444-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 125445-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 125446-echo "${ECHO_T}$ac_header_compiler" >&6 125447- 125448-# Is the header present? 125449-echo "$as_me:$LINENO: checking $ac_header presence" >&5 125450-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 125451-cat >conftest.$ac_ext <<_ACEOF 125452-/* confdefs.h. */ 125453-_ACEOF 125454-cat confdefs.h >>conftest.$ac_ext 125455-cat >>conftest.$ac_ext <<_ACEOF 125456-/* end confdefs.h. */ 125457-#include <$ac_header> 125458-_ACEOF 125459-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 125460- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 125461- ac_status=$? 125462- grep -v '^ *+' conftest.er1 >conftest.err 125463- rm -f conftest.er1 125464- cat conftest.err >&5 125465- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125466- (exit $ac_status); } >/dev/null; then 125467- if test -s conftest.err; then 125468- ac_cpp_err=$ac_c_preproc_warn_flag 125469- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 125470- else 125471- ac_cpp_err= 125472- fi 125473-else 125474- ac_cpp_err=yes 125475-fi 125476-if test -z "$ac_cpp_err"; then 125477- ac_header_preproc=yes 125478-else 125479- echo "$as_me: failed program was:" >&5 125480-sed 's/^/| /' conftest.$ac_ext >&5 125481- 125482- ac_header_preproc=no 125483-fi 125484-rm -f conftest.err conftest.$ac_ext 125485-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 125486-echo "${ECHO_T}$ac_header_preproc" >&6 125487- 125488-# So? What about this header? 125489-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 125490- yes:no: ) 125491- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 125492-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 125493- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 125494-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 125495- ac_header_preproc=yes 125496- ;; 125497- no:yes:* ) 125498- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 125499-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 125500- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 125501-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 125502- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 125503-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 125504- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 125505-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 125506- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 125507-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 125508- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 125509-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 125510- ( 125511- cat <<\_ASBOX 125512-## ------------------------------------------ ## 125513-## Report this to the AC_PACKAGE_NAME lists. ## 125514-## ------------------------------------------ ## 125515-_ASBOX 125516- ) | 125517- sed "s/^/$as_me: WARNING: /" >&2 125518- ;; 125519-esac 125520-echo "$as_me:$LINENO: checking for $ac_header" >&5 125521-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 125522-if eval "test \"\${$as_ac_Header+set}\" = set"; then 125523- echo $ECHO_N "(cached) $ECHO_C" >&6 125524+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 125525+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 125526+echo "configure:85660: checking for $ac_hdr" >&5 125527+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 125528+ echo $ac_n "(cached) $ac_c" 1>&6 125529+else 125530+ cat > conftest.$ac_ext <<EOF 125531+#line 85665 "configure" 125532+#include "confdefs.h" 125533+#include <$ac_hdr> 125534+EOF 125535+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 125536+{ (eval echo configure:85670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 125537+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 125538+if test -z "$ac_err"; then 125539+ rm -rf conftest* 125540+ eval "ac_cv_header_$ac_safe=yes" 125541 else 125542- eval "$as_ac_Header=\$ac_header_preproc" 125543+ echo "$ac_err" >&5 125544+ echo "configure: failed program was:" >&5 125545+ cat conftest.$ac_ext >&5 125546+ rm -rf conftest* 125547+ eval "ac_cv_header_$ac_safe=no" 125548 fi 125549-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 125550-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 125551- 125552+rm -f conftest* 125553 fi 125554-if test `eval echo '${'$as_ac_Header'}'` = yes; then 125555- cat >>confdefs.h <<_ACEOF 125556-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 125557-_ACEOF 125558- 125559+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 125560+ echo "$ac_t""yes" 1>&6 125561+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 125562+ cat >> confdefs.h <<EOF 125563+#define $ac_tr_hdr 1 125564+EOF 125565+ 125566+else 125567+ echo "$ac_t""no" 1>&6 125568 fi 125569- 125570 done 125571 125572- cat >conftest.$ac_ext <<_ACEOF 125573-/* confdefs.h. */ 125574-_ACEOF 125575-cat confdefs.h >>conftest.$ac_ext 125576-cat >>conftest.$ac_ext <<_ACEOF 125577-/* end confdefs.h. */ 125578+ cat > conftest.$ac_ext <<EOF 125579+#line 85697 "configure" 125580+#include "confdefs.h" 125581 125582 #include <sys/types.h> 125583 #include <sys/socket.h> 125584- 125585-int 125586-main () 125587-{ 125588+ 125589+int main() { 125590 static struct msghdr tp; int n = (int) tp.msg_flags; return n 125591- ; 125592- return 0; 125593-} 125594-_ACEOF 125595-rm -f conftest.$ac_objext 125596-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 125597- (eval $ac_compile) 2>conftest.er1 125598- ac_status=$? 125599- grep -v '^ *+' conftest.er1 >conftest.err 125600- rm -f conftest.er1 125601- cat conftest.err >&5 125602- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125603- (exit $ac_status); } && 125604- { ac_try='test -z "$ac_c_werror_flag" 125605- || test ! -s conftest.err' 125606- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125607- (eval $ac_try) 2>&5 125608- ac_status=$? 125609- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125610- (exit $ac_status); }; } && 125611- { ac_try='test -s conftest.$ac_objext' 125612- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125613- (eval $ac_try) 2>&5 125614- ac_status=$? 125615- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125616- (exit $ac_status); }; }; then 125617+; return 0; } 125618+EOF 125619+if { (eval echo configure:85707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 125620 : 125621 else 125622- echo "$as_me: failed program was:" >&5 125623-sed 's/^/| /' conftest.$ac_ext >&5 125624- 125625- 125626-cat >>confdefs.h <<\_ACEOF 125627+ echo "configure: failed program was:" >&5 125628+ cat conftest.$ac_ext >&5 125629+ rm -rf conftest* 125630+ cat >> confdefs.h <<\EOF 125631 #define MISSING_MSGHDR_MSGFLAGS 1 125632-_ACEOF 125633- 125634+EOF 125635 125636+ 125637 fi 125638-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 125639- 125640-cat >>confdefs.h <<\_ACEOF 125641+rm -f conftest* 125642+ cat >> confdefs.h <<\EOF 125643 #define HAVE_SOCKETS 1 125644-_ACEOF 125645- 125646+EOF 125647 125648 125649+ 125650 ext_builddir=ext/sockets 125651 ext_srcdir=$abs_srcdir/ext/sockets 125652 125653@@ -109495,15 +85729,15 @@ 125654 125655 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 125656 PHP_SOCKETS_SHARED=no 125657- 125658- 125659+ 125660+ 125661 case ext/sockets in 125662 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125663 /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125664 *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125665 esac 125666- 125667- 125668+ 125669+ 125670 125671 b_c_pre=$php_c_pre 125672 b_cxx_pre=$php_cxx_pre 125673@@ -109516,12 +85750,12 @@ 125674 125675 old_IFS=$IFS 125676 for ac_src in sockets.c; do 125677- 125678+ 125679 IFS=. 125680 set $ac_src 125681 ac_obj=$1 125682 IFS=$old_IFS 125683- 125684+ 125685 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 125686 125687 case $ac_src in 125688@@ -109545,14 +85779,14 @@ 125689 else 125690 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 125691 PHP_SOCKETS_SHARED=yes 125692- 125693+ 125694 case ext/sockets in 125695 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125696 /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125697 *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125698 esac 125699- 125700- 125701+ 125702+ 125703 125704 b_c_pre=$shared_c_pre 125705 b_cxx_pre=$shared_cxx_pre 125706@@ -109565,12 +85799,12 @@ 125707 125708 old_IFS=$IFS 125709 for ac_src in sockets.c; do 125710- 125711+ 125712 IFS=. 125713 set $ac_src 125714 ac_obj=$1 125715 IFS=$old_IFS 125716- 125717+ 125718 shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" 125719 125720 case $ac_src in 125721@@ -109588,7 +85822,7 @@ 125722 125723 case $host_alias in 125724 *netware*) 125725- 125726+ 125727 install_modules="install-modules" 125728 125729 case $host_alias in 125730@@ -109598,7 +85832,7 @@ 125731 ;; 125732 *netware*) 125733 suffix=nlm 125734- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(SOCKETS_SHARED_LIBADD)' 125735+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 3)_SHARED_LIBADD)' 125736 ;; 125737 *) 125738 suffix=la 125739@@ -109611,7 +85845,7 @@ 125740 else 125741 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix" 125742 fi 125743- 125744+ 125745 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" 125746 125747 cat >>Makefile.objects<<EOF 125748@@ -109625,7 +85859,7 @@ 125749 125750 ;; 125751 *) 125752- 125753+ 125754 install_modules="install-modules" 125755 125756 case $host_alias in 125757@@ -109635,7 +85869,7 @@ 125758 ;; 125759 *netware*) 125760 suffix=nlm 125761- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(KETS_SHARED_LIBADD)' 125762+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 3)_SHARED_LIBADD)' 125763 ;; 125764 *) 125765 suffix=la 125766@@ -109648,7 +85882,7 @@ 125767 else 125768 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix" 125769 fi 125770- 125771+ 125772 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" 125773 125774 cat >>Makefile.objects<<EOF 125775@@ -109662,10 +85896,9 @@ 125776 125777 ;; 125778 esac 125779- 125780-cat >>confdefs.h <<_ACEOF 125781+ cat >> confdefs.h <<EOF 125782 #define COMPILE_DL_SOCKETS 1 125783-_ACEOF 125784+EOF 125785 125786 fi 125787 fi 125788@@ -109674,15 +85907,15 @@ 125789 PHP_SOCKETS_SHARED=no 125790 case "$PHP_SAPI" in 125791 cgi|embed) 125792- 125793- 125794+ 125795+ 125796 case ext/sockets in 125797 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125798 /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125799 *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125800 esac 125801- 125802- 125803+ 125804+ 125805 125806 b_c_pre=$php_c_pre 125807 b_cxx_pre=$php_cxx_pre 125808@@ -109695,12 +85928,12 @@ 125809 125810 old_IFS=$IFS 125811 for ac_src in sockets.c; do 125812- 125813+ 125814 IFS=. 125815 set $ac_src 125816 ac_obj=$1 125817 IFS=$old_IFS 125818- 125819+ 125820 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 125821 125822 case $ac_src in 125823@@ -109720,15 +85953,15 @@ 125824 EXT_STATIC="$EXT_STATIC sockets" 125825 ;; 125826 *) 125827- 125828- 125829+ 125830+ 125831 case ext/sockets in 125832 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 125833 /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 125834 *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 125835 esac 125836- 125837- 125838+ 125839+ 125840 125841 b_c_pre=$php_c_pre 125842 b_cxx_pre=$php_cxx_pre 125843@@ -109741,13 +85974,13 @@ 125844 125845 old_IFS=$IFS 125846 for ac_src in sockets.c; do 125847- 125848+ 125849 IFS=. 125850 set $ac_src 125851 ac_obj=$1 125852 IFS=$old_IFS 125853- 125854- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 125855+ 125856+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 125857 125858 case $ac_src in 125859 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 125860@@ -109767,108 +86000,90 @@ 125861 esac 125862 EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" 125863 fi 125864- 125865- 125866+ 125867+ 125868 BUILD_DIR="$BUILD_DIR $ext_builddir" 125869- 125870+ 125871 125872 125873 if test "$ext_builddir" = "."; then 125874 PHP_PECL_EXTENSION=sockets 125875- 125876+ 125877 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 125878 125879 fi 125880 125881- 125882- 125883+ 125884+ 125885 header_path=ext/sockets/ 125886 for header_file in php_sockets.h; do 125887 hp_hf="$header_path/$header_file" 125888- 125889- 125890+ 125891+ 125892 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 125893- 125894+ 125895 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 125896 if test -n "$unique" && test "`eval $cmd`" = "" ; then 125897 eval "INSTALLHEADERS$unique=set" 125898- 125899+ 125900 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 125901- 125902+ 125903 fi 125904 125905- done 125906- 125907+ done 125908+ 125909 125910 fi 125911 125912 125913- echo "$as_me:$LINENO: checking whether zend_object_value is packed" >&5 125914-echo $ECHO_N "checking whether zend_object_value is packed... $ECHO_C" >&6 125915+ echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 125916+echo "configure:86041: checking whether zend_object_value is packed" >&5 125917 old_CPPFLAGS=$CPPFLAGS 125918 CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" 125919 if test "$cross_compiling" = yes; then 125920- 125921+ 125922 ac_result=0 125923- echo "$as_me:$LINENO: result: no" >&5 125924-echo "${ECHO_T}no" >&6 125925- 125926+ echo "$ac_t""no" 1>&6 125927+ 125928 else 125929- cat >conftest.$ac_ext <<_ACEOF 125930-/* confdefs.h. */ 125931-_ACEOF 125932-cat confdefs.h >>conftest.$ac_ext 125933-cat >>conftest.$ac_ext <<_ACEOF 125934-/* end confdefs.h. */ 125935+ cat > conftest.$ac_ext <<EOF 125936+#line 86051 "configure" 125937+#include "confdefs.h" 125938 125939 #include "Zend/zend_types.h" 125940 int main(int argc, char **argv) { 125941 return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1; 125942 } 125943- 125944-_ACEOF 125945-rm -f conftest$ac_exeext 125946-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 125947- (eval $ac_link) 2>&5 125948- ac_status=$? 125949- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125950- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 125951- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 125952- (eval $ac_try) 2>&5 125953- ac_status=$? 125954- echo "$as_me:$LINENO: \$? = $ac_status" >&5 125955- (exit $ac_status); }; }; then 125956- 125957+ 125958+EOF 125959+if { (eval echo configure:86060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 125960+then 125961+ 125962 ac_result=1 125963- echo "$as_me:$LINENO: result: yes" >&5 125964-echo "${ECHO_T}yes" >&6 125965- 125966+ echo "$ac_t""yes" 1>&6 125967+ 125968 else 125969- echo "$as_me: program exited with status $ac_status" >&5 125970-echo "$as_me: failed program was:" >&5 125971-sed 's/^/| /' conftest.$ac_ext >&5 125972- 125973-( exit $ac_status ) 125974- 125975+ echo "configure: failed program was:" >&5 125976+ cat conftest.$ac_ext >&5 125977+ rm -fr conftest* 125978+ 125979 ac_result=0 125980- echo "$as_me:$LINENO: result: no" >&5 125981-echo "${ECHO_T}no" >&6 125982- 125983+ echo "$ac_t""no" 1>&6 125984+ 125985 fi 125986-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 125987+rm -fr conftest* 125988 fi 125989- CPPFLAGS=$old_CPPFLAGS 125990 125991-cat >>confdefs.h <<_ACEOF 125992+ CPPFLAGS=$old_CPPFLAGS 125993+ cat >> confdefs.h <<EOF 125994 #define HAVE_PACKED_OBJECT_VALUE $ac_result 125995-_ACEOF 125996- 125997+EOF 125998 125999-cat >>confdefs.h <<\_ACEOF 126000+ cat >> confdefs.h <<\EOF 126001 #define HAVE_SPL 1 126002-_ACEOF 126003- 126004- 126005+EOF 126006+ 126007+ 126008 ext_builddir=ext/spl 126009 ext_srcdir=$abs_srcdir/ext/spl 126010 126011@@ -109876,15 +86091,15 @@ 126012 126013 if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then 126014 PHP_SPL_SHARED=no 126015- 126016- 126017+ 126018+ 126019 case ext/spl in 126020 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 126021 /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 126022 *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 126023 esac 126024- 126025- 126026+ 126027+ 126028 126029 b_c_pre=$php_c_pre 126030 b_cxx_pre=$php_cxx_pre 126031@@ -109897,12 +86112,12 @@ 126032 126033 old_IFS=$IFS 126034 for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do 126035- 126036+ 126037 IFS=. 126038 set $ac_src 126039 ac_obj=$1 126040 IFS=$old_IFS 126041- 126042+ 126043 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 126044 126045 case $ac_src in 126046@@ -109926,14 +86141,14 @@ 126047 else 126048 if test "no" = "shared" || test "no" = "yes"; then 126049 PHP_SPL_SHARED=yes 126050- 126051+ 126052 case ext/spl in 126053 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 126054 /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 126055 *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 126056 esac 126057- 126058- 126059+ 126060+ 126061 126062 b_c_pre=$shared_c_pre 126063 b_cxx_pre=$shared_cxx_pre 126064@@ -109946,12 +86161,12 @@ 126065 126066 old_IFS=$IFS 126067 for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do 126068- 126069+ 126070 IFS=. 126071 set $ac_src 126072 ac_obj=$1 126073 IFS=$old_IFS 126074- 126075+ 126076 shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" 126077 126078 case $ac_src in 126079@@ -109969,7 +86184,7 @@ 126080 126081 case $host_alias in 126082 *netware*) 126083- 126084+ 126085 install_modules="install-modules" 126086 126087 case $host_alias in 126088@@ -109979,7 +86194,7 @@ 126089 ;; 126090 *netware*) 126091 suffix=nlm 126092- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(SPL_SHARED_LIBADD)' 126093+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)' 126094 ;; 126095 *) 126096 suffix=la 126097@@ -109992,7 +86207,7 @@ 126098 else 126099 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" 126100 fi 126101- 126102+ 126103 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" 126104 126105 cat >>Makefile.objects<<EOF 126106@@ -110006,7 +86221,7 @@ 126107 126108 ;; 126109 *) 126110- 126111+ 126112 install_modules="install-modules" 126113 126114 case $host_alias in 126115@@ -110016,7 +86231,7 @@ 126116 ;; 126117 *netware*) 126118 suffix=nlm 126119- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 126120+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' 126121 ;; 126122 *) 126123 suffix=la 126124@@ -110029,7 +86244,7 @@ 126125 else 126126 PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" 126127 fi 126128- 126129+ 126130 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" 126131 126132 cat >>Makefile.objects<<EOF 126133@@ -110043,10 +86258,9 @@ 126134 126135 ;; 126136 esac 126137- 126138-cat >>confdefs.h <<_ACEOF 126139+ cat >> confdefs.h <<EOF 126140 #define COMPILE_DL_SPL 1 126141-_ACEOF 126142+EOF 126143 126144 fi 126145 fi 126146@@ -110055,15 +86269,15 @@ 126147 PHP_SPL_SHARED=no 126148 case "$PHP_SAPI" in 126149 cgi|embed) 126150- 126151- 126152+ 126153+ 126154 case ext/spl in 126155 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 126156 /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 126157 *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 126158 esac 126159- 126160- 126161+ 126162+ 126163 126164 b_c_pre=$php_c_pre 126165 b_cxx_pre=$php_cxx_pre 126166@@ -110076,12 +86290,12 @@ 126167 126168 old_IFS=$IFS 126169 for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do 126170- 126171+ 126172 IFS=. 126173 set $ac_src 126174 ac_obj=$1 126175 IFS=$old_IFS 126176- 126177+ 126178 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 126179 126180 case $ac_src in 126181@@ -110101,15 +86315,15 @@ 126182 EXT_STATIC="$EXT_STATIC spl" 126183 ;; 126184 *) 126185- 126186- 126187+ 126188+ 126189 case ext/spl in 126190 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 126191 /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 126192 *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 126193 esac 126194- 126195- 126196+ 126197+ 126198 126199 b_c_pre=$php_c_pre 126200 b_cxx_pre=$php_cxx_pre 126201@@ -110122,13 +86336,13 @@ 126202 126203 old_IFS=$IFS 126204 for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do 126205- 126206+ 126207 IFS=. 126208 set $ac_src 126209 ac_obj=$1 126210 IFS=$old_IFS 126211- 126212- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 126213+ 126214+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 126215 126216 case $ac_src in 126217 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 126218@@ -110148,88 +86362,76 @@ 126219 esac 126220 EXT_CLI_STATIC="$EXT_CLI_STATIC spl" 126221 fi 126222- 126223- 126224+ 126225+ 126226 BUILD_DIR="$BUILD_DIR $ext_builddir" 126227- 126228+ 126229 126230 126231 if test "$ext_builddir" = "."; then 126232 PHP_PECL_EXTENSION=spl 126233- 126234+ 126235 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 126236 126237 fi 126238 126239- 126240- 126241+ 126242+ 126243 header_path=ext/spl 126244 for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do 126245 hp_hf="$header_path/$header_file" 126246- 126247- 126248+ 126249+ 126250 unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` 126251- 126252+ 126253 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 126254 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126255 eval "INSTALLHEADERS$unique=set" 126256- 126257+ 126258 INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" 126259- 126260+ 126261 fi 126262 126263- done 126264- 126265- 126266+ done 126267+ 126268 126269+ 126270 am_i_shared=$PHP_SPL_SHARED 126271 is_it_shared=$PHP_PCRE_SHARED 126272 is_it_enabled=$PHP_PCRE 126273 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 126274- { { echo "$as_me:$LINENO: error: 126275-You've configured extension spl to build statically, but it 126276-depends on extension pcre, which you've configured to build shared. 126277-You either need to build spl shared or build pcre statically for the 126278-build to be successful. 126279-" >&5 126280-echo "$as_me: error: 126281+ { echo "configure: error: 126282 You've configured extension spl to build statically, but it 126283 depends on extension pcre, which you've configured to build shared. 126284 You either need to build spl shared or build pcre statically for the 126285 build to be successful. 126286-" >&2;} 126287- { (exit 1); exit 1; }; } 126288+" 1>&2; exit 1; } 126289 fi 126290 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 126291- { { echo "$as_me:$LINENO: error: 126292-You've configured extension spl, which depends on extension pcre, 126293-but you've either not enabled pcre, or have disabled it. 126294-" >&5 126295-echo "$as_me: error: 126296+ { echo "configure: error: 126297 You've configured extension spl, which depends on extension pcre, 126298 but you've either not enabled pcre, or have disabled it. 126299-" >&2;} 126300- { (exit 1); exit 1; }; } 126301+" 1>&2; exit 1; } 126302 fi 126303- 126304+ 126305 126306 126307 126308 php_with_sqlite=yes 126309 126310-echo "$as_me:$LINENO: checking for sqlite support" >&5 126311-echo $ECHO_N "checking for sqlite support... $ECHO_C" >&6 126312- 126313+echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 126314+echo "configure:86424: checking for sqlite support" >&5 126315 # Check whether --with-sqlite or --without-sqlite was given. 126316 if test "${with_sqlite+set}" = set; then 126317 withval="$with_sqlite" 126318 PHP_SQLITE=$withval 126319 else 126320- 126321+ 126322 PHP_SQLITE=yes 126323 test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL 126324 126325-fi; 126326+fi 126327+ 126328 126329 126330 ext_output="yes, shared" 126331@@ -110253,8 +86455,7 @@ 126332 126333 126334 126335-echo "$as_me:$LINENO: result: $ext_output" >&5 126336-echo "${ECHO_T}$ext_output" >&6 126337+echo "$ac_t""$ext_output" 1>&6 126338 126339 126340 126341@@ -110262,22 +86463,22 @@ 126342 126343 php_enable_sqlite_utf8=no 126344 126345-echo "$as_me:$LINENO: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 126346-echo $ECHO_N "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)... $ECHO_C" >&6 126347+echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 126348+echo "configure:86468: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 126349 # Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. 126350 if test "${enable_sqlite_utf8+set}" = set; then 126351 enableval="$enable_sqlite_utf8" 126352 PHP_SQLITE_UTF8=$enableval 126353 else 126354- 126355+ 126356 PHP_SQLITE_UTF8=no 126357+ 126358 126359+fi 126360 126361-fi; 126362 126363 ext_output=$PHP_SQLITE_UTF8 126364-echo "$as_me:$LINENO: result: $ext_output" >&5 126365-echo "${ECHO_T}$ext_output" >&6 126366+echo "$ac_t""$ext_output" 1>&6 126367 126368 126369 126370@@ -110289,15 +86490,15 @@ 126371 126372 if test "$PHP_SQLITE" != "no"; then 126373 if test "$PHP_PDO" != "no"; then 126374- 126375- echo "$as_me:$LINENO: checking for PDO includes" >&5 126376-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 126377-if test "${pdo_inc_path+set}" = set; then 126378- echo $ECHO_N "(cached) $ECHO_C" >&6 126379-else 126380- 126381- echo "$as_me:$LINENO: checking for PDO includes" >&5 126382-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6 126383+ 126384+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 126385+echo "configure:86496: checking for PDO includes" >&5 126386+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then 126387+ echo $ac_n "(cached) $ac_c" 1>&6 126388+else 126389+ 126390+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 126391+echo "configure:86502: checking for PDO includes" >&5 126392 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then 126393 pdo_inc_path=$abs_srcdir/ext 126394 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then 126395@@ -110305,26 +86506,24 @@ 126396 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then 126397 pdo_inc_path=$prefix/include/php/ext 126398 fi 126399- 126400+ 126401 fi 126402-echo "$as_me:$LINENO: result: $pdo_inc_path" >&5 126403-echo "${ECHO_T}$pdo_inc_path" >&6 126404+ 126405+echo "$ac_t""$pdo_inc_path" 1>&6 126406 if test -n "$pdo_inc_path"; then 126407 : 126408 else 126409-{ echo "$as_me:$LINENO: WARNING: Cannot find php_pdo_driver.h." >&5 126410-echo "$as_me: WARNING: Cannot find php_pdo_driver.h." >&2;} 126411+echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 126412 fi 126413 126414 if test -n "$pdo_inc_path"; then 126415- 126416-cat >>confdefs.h <<\_ACEOF 126417+ cat >> confdefs.h <<\EOF 126418 #define PHP_SQLITE2_HAVE_PDO 1 126419-_ACEOF 126420+EOF 126421 126422 pdo_inc_path="-I$pdo_inc_path" 126423 fi 126424- fi 126425+ fi 126426 126427 if test "$PHP_SQLITE" != "yes"; then 126428 SEARCH_PATH="/usr/local /usr" 126429@@ -110332,44 +86531,40 @@ 126430 if test -r $PHP_SQLITE/; then # path given as parameter 126431 SQLITE_DIR=$PHP_SQLITE 126432 else # search default path list 126433- echo "$as_me:$LINENO: checking for sqlite files in default path" >&5 126434-echo $ECHO_N "checking for sqlite files in default path... $ECHO_C" >&6 126435+ echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 126436+echo "configure:86536: checking for sqlite files in default path" >&5 126437 for i in $SEARCH_PATH ; do 126438 if test -r $i/$SEARCH_FOR; then 126439 SQLITE_DIR=$i 126440- echo "$as_me:$LINENO: result: found in $i" >&5 126441-echo "${ECHO_T}found in $i" >&6 126442+ echo "$ac_t""found in $i" 1>&6 126443 fi 126444 done 126445 fi 126446- 126447+ 126448 if test -z "$SQLITE_DIR"; then 126449- echo "$as_me:$LINENO: result: not found" >&5 126450-echo "${ECHO_T}not found" >&6 126451- { { echo "$as_me:$LINENO: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&5 126452-echo "$as_me: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&2;} 126453- { (exit 1); exit 1; }; } 126454+ echo "$ac_t""not found" 1>&6 126455+ { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } 126456 fi 126457 126458- 126459+ 126460 save_old_LDFLAGS=$LDFLAGS 126461 ac_stuff=" 126462 -L$SQLITE_DIR/$PHP_LIBDIR -lm 126463 " 126464- 126465+ 126466 save_ext_shared=$ext_shared 126467 ext_shared=yes 126468- 126469+ 126470 for ac_i in $ac_stuff; do 126471 case $ac_i in 126472 -pthread) 126473 if test "$ext_shared" = "yes"; then 126474 LDFLAGS="$LDFLAGS -pthread" 126475 else 126476- 126477- 126478+ 126479+ 126480 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 126481- 126482+ 126483 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 126484 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126485 eval "EXTRA_LDFLAGS$unique=set" 126486@@ -110380,20 +86575,20 @@ 126487 ;; 126488 -l*) 126489 ac_ii=`echo $ac_i|cut -c 3-` 126490- 126491- 126492+ 126493+ 126494 case $ac_ii in 126495 c|c_r|pthread*) ;; 126496- *) 126497+ *) 126498 if test "$ext_shared" = "yes"; then 126499- LDFLAGS="$LDFLAGS -l$ac_ii" 126500+ LDFLAGS="$LDFLAGS -l$ac_ii" 126501 else 126502- 126503- 126504+ 126505+ 126506 case $ac_ii in 126507 c|c_r|pthread*) ;; 126508- *) 126509- LIBS="$LIBS -l$ac_ii" 126510+ *) 126511+ LIBS="$LIBS -l$ac_ii" 126512 ;; 126513 esac 126514 126515@@ -110406,205 +86601,175 @@ 126516 ;; 126517 -L*) 126518 ac_ii=`echo $ac_i|cut -c 3-` 126519- 126520+ 126521 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 126522- 126523+ 126524 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 126525 ai_p=$ac_ii 126526 else 126527- 126528+ 126529 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 126530- 126531+ 126532 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 126533 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 126534 fi 126535 126536- 126537+ 126538 if test "$ext_shared" = "yes"; then 126539 LDFLAGS="-L$ai_p $LDFLAGS" 126540 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 126541 else 126542- 126543- 126544- 126545+ 126546+ 126547+ 126548 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 126549- 126550+ 126551 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 126552 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126553 eval "LIBPATH$unique=set" 126554- 126555+ 126556 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 126557 LDFLAGS="$LDFLAGS -L$ai_p" 126558 PHP_RPATHS="$PHP_RPATHS $ai_p" 126559- 126560+ 126561 fi 126562 126563 126564 fi 126565- 126566+ 126567 fi 126568 126569 ;; 126570 esac 126571 done 126572 126573- echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5 126574-echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6 126575-if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then 126576- echo $ECHO_N "(cached) $ECHO_C" >&6 126577+ echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 126578+echo "configure:86648: checking for sqlite_open in -lsqlite" >&5 126579+ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` 126580+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 126581+ echo $ac_n "(cached) $ac_c" 1>&6 126582 else 126583- ac_check_lib_save_LIBS=$LIBS 126584+ ac_save_LIBS="$LIBS" 126585 LIBS="-lsqlite $LIBS" 126586-cat >conftest.$ac_ext <<_ACEOF 126587-/* confdefs.h. */ 126588-_ACEOF 126589-cat confdefs.h >>conftest.$ac_ext 126590-cat >>conftest.$ac_ext <<_ACEOF 126591-/* end confdefs.h. */ 126592- 126593+cat > conftest.$ac_ext <<EOF 126594+#line 86656 "configure" 126595+#include "confdefs.h" 126596 /* Override any gcc2 internal prototype to avoid an error. */ 126597-#ifdef __cplusplus 126598-extern "C" 126599-#endif 126600 /* We use char because int might match the return type of a gcc2 126601- builtin and then its argument prototype would still apply. */ 126602-char sqlite_open (); 126603-int 126604-main () 126605-{ 126606-sqlite_open (); 126607- ; 126608- return 0; 126609-} 126610-_ACEOF 126611-rm -f conftest.$ac_objext conftest$ac_exeext 126612-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 126613- (eval $ac_link) 2>conftest.er1 126614- ac_status=$? 126615- grep -v '^ *+' conftest.er1 >conftest.err 126616- rm -f conftest.er1 126617- cat conftest.err >&5 126618- echo "$as_me:$LINENO: \$? = $ac_status" >&5 126619- (exit $ac_status); } && 126620- { ac_try='test -z "$ac_c_werror_flag" 126621- || test ! -s conftest.err' 126622- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 126623- (eval $ac_try) 2>&5 126624- ac_status=$? 126625- echo "$as_me:$LINENO: \$? = $ac_status" >&5 126626- (exit $ac_status); }; } && 126627- { ac_try='test -s conftest$ac_exeext' 126628- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 126629- (eval $ac_try) 2>&5 126630- ac_status=$? 126631- echo "$as_me:$LINENO: \$? = $ac_status" >&5 126632- (exit $ac_status); }; }; then 126633- ac_cv_lib_sqlite_sqlite_open=yes 126634-else 126635- echo "$as_me: failed program was:" >&5 126636-sed 's/^/| /' conftest.$ac_ext >&5 126637- 126638-ac_cv_lib_sqlite_sqlite_open=no 126639-fi 126640-rm -f conftest.err conftest.$ac_objext \ 126641- conftest$ac_exeext conftest.$ac_ext 126642-LIBS=$ac_check_lib_save_LIBS 126643-fi 126644-echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5 126645-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open" >&6 126646-if test $ac_cv_lib_sqlite_sqlite_open = yes; then 126647+ builtin and then its argument prototype would still apply. */ 126648+char sqlite_open(); 126649+ 126650+int main() { 126651+sqlite_open() 126652+; return 0; } 126653+EOF 126654+if { (eval echo configure:86667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 126655+ rm -rf conftest* 126656+ eval "ac_cv_lib_$ac_lib_var=yes" 126657+else 126658+ echo "configure: failed program was:" >&5 126659+ cat conftest.$ac_ext >&5 126660+ rm -rf conftest* 126661+ eval "ac_cv_lib_$ac_lib_var=no" 126662+fi 126663+rm -f conftest* 126664+LIBS="$ac_save_LIBS" 126665 126666+fi 126667+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 126668+ echo "$ac_t""yes" 1>&6 126669+ 126670 LDFLAGS=$save_old_LDFLAGS 126671 ext_shared=$save_ext_shared 126672- 126673- 126674+ 126675+ 126676 126677 if test "$ext_shared" = "yes"; then 126678 SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" 126679 if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then 126680- 126681+ 126682 if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 126683- 126684+ 126685 if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 126686 ai_p=$SQLITE_DIR/$PHP_LIBDIR 126687 else 126688- 126689+ 126690 ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 126691- 126692+ 126693 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 126694 ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" 126695 fi 126696 126697- 126698+ 126699 if test "$ext_shared" = "yes"; then 126700 SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" 126701 test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" 126702 else 126703- 126704- 126705- 126706+ 126707+ 126708+ 126709 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 126710- 126711+ 126712 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 126713 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126714 eval "LIBPATH$unique=set" 126715- 126716+ 126717 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 126718 LDFLAGS="$LDFLAGS -L$ai_p" 126719 PHP_RPATHS="$PHP_RPATHS $ai_p" 126720- 126721+ 126722 fi 126723 126724 126725 fi 126726- 126727+ 126728 fi 126729 126730 fi 126731 else 126732- 126733+ 126734 126735 if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then 126736- 126737+ 126738 if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then 126739- 126740+ 126741 if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 126742 ai_p=$SQLITE_DIR/$PHP_LIBDIR 126743 else 126744- 126745+ 126746 ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 126747- 126748+ 126749 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 126750 ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" 126751 fi 126752 126753- 126754- 126755- 126756- 126757+ 126758+ 126759+ 126760+ 126761 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 126762- 126763+ 126764 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 126765 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126766 eval "LIBPATH$unique=set" 126767- 126768+ 126769 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 126770 LDFLAGS="$LDFLAGS -L$ai_p" 126771 PHP_RPATHS="$PHP_RPATHS $ai_p" 126772- 126773+ 126774 fi 126775 126776 126777- 126778+ 126779 fi 126780 126781 fi 126782- 126783- 126784+ 126785+ 126786 case sqlite in 126787 c|c_r|pthread*) ;; 126788- *) 126789- LIBS="-lsqlite $LIBS" 126790+ *) 126791+ LIBS="-lsqlite $LIBS" 126792 ;; 126793 esac 126794 126795@@ -110614,50 +86779,49 @@ 126796 fi 126797 126798 126799- 126800+ 126801 if test "$SQLITE_DIR/include" != "/usr/include"; then 126802- 126803+ 126804 if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then 126805 ai_p=$SQLITE_DIR/include 126806 else 126807- 126808+ 126809 ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 126810- 126811+ 126812 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 126813 ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" 126814 fi 126815 126816- 126817- 126818+ 126819+ 126820 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 126821- 126822+ 126823 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 126824 if test -n "$unique" && test "`eval $cmd`" = "" ; then 126825 eval "INCLUDEPATH$unique=set" 126826- 126827+ 126828 if test ""; then 126829 INCLUDES="-I$ai_p $INCLUDES" 126830 else 126831 INCLUDES="$INCLUDES -I$ai_p" 126832 fi 126833- 126834+ 126835 fi 126836 126837 fi 126838 126839- 126840- 126841+ 126842+ 126843 else 126844+ echo "$ac_t""no" 1>&6 126845 126846 LDFLAGS=$save_old_LDFLAGS 126847 ext_shared=$save_ext_shared 126848 unset ac_cv_lib_sqlite_sqlite_open 126849- 126850- { { echo "$as_me:$LINENO: error: wrong sqlite lib version or lib not found" >&5 126851-echo "$as_me: error: wrong sqlite lib version or lib not found" >&2;} 126852- { (exit 1); exit 1; }; } 126853- 126854- 126855+ 126856+ { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } 126857+ 126858+ 126859 fi 126860 126861 SQLITE_MODULE_TYPE=external 126862@@ -110665,52 +86829,46 @@ 126863 sqlite_extra_sources="libsqlite/src/encode.c" 126864 else 126865 # use bundled library 126866- 126867+ 126868 # we only support certain lemon versions 126869 lemon_version_list="1.0" 126870 126871 # Extract the first word of "lemon", so it can be a program name with args. 126872 set dummy lemon; ac_word=$2 126873-echo "$as_me:$LINENO: checking for $ac_word" >&5 126874-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 126875-if test "${ac_cv_prog_LEMON+set}" = set; then 126876- echo $ECHO_N "(cached) $ECHO_C" >&6 126877+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 126878+echo "configure:86840: checking for $ac_word" >&5 126879+if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then 126880+ echo $ac_n "(cached) $ac_c" 1>&6 126881 else 126882 if test -n "$LEMON"; then 126883 ac_cv_prog_LEMON="$LEMON" # Let the user override the test. 126884 else 126885-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 126886-for as_dir in $PATH 126887-do 126888- IFS=$as_save_IFS 126889- test -z "$as_dir" && as_dir=. 126890- for ac_exec_ext in '' $ac_executable_extensions; do 126891- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 126892- ac_cv_prog_LEMON="lemon" 126893- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 126894- break 2 126895- fi 126896-done 126897-done 126898- 126899+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 126900+ ac_dummy="$PATH" 126901+ for ac_dir in $ac_dummy; do 126902+ test -z "$ac_dir" && ac_dir=. 126903+ if test -f $ac_dir/$ac_word; then 126904+ ac_cv_prog_LEMON="lemon" 126905+ break 126906+ fi 126907+ done 126908+ IFS="$ac_save_ifs" 126909 fi 126910 fi 126911-LEMON=$ac_cv_prog_LEMON 126912+LEMON="$ac_cv_prog_LEMON" 126913 if test -n "$LEMON"; then 126914- echo "$as_me:$LINENO: result: $LEMON" >&5 126915-echo "${ECHO_T}$LEMON" >&6 126916+ echo "$ac_t""$LEMON" 1>&6 126917 else 126918- echo "$as_me:$LINENO: result: no" >&5 126919-echo "${ECHO_T}no" >&6 126920+ echo "$ac_t""no" 1>&6 126921 fi 126922 126923 if test "$LEMON"; then 126924- echo "$as_me:$LINENO: checking for lemon version" >&5 126925-echo $ECHO_N "checking for lemon version... $ECHO_C" >&6 126926-if test "${php_cv_lemon_version+set}" = set; then 126927- echo $ECHO_N "(cached) $ECHO_C" >&6 126928+ echo $ac_n "checking for lemon version""... $ac_c" 1>&6 126929+echo "configure:86868: checking for lemon version" >&5 126930+if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then 126931+ echo $ac_n "(cached) $ac_c" 1>&6 126932 else 126933- 126934+ 126935 lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` 126936 php_cv_lemon_version=invalid 126937 for lemon_check_version in $lemon_version_list; do 126938@@ -110718,22 +86876,21 @@ 126939 php_cv_lemon_version="$lemon_check_version (ok)" 126940 fi 126941 done 126942- 126943+ 126944 fi 126945-echo "$as_me:$LINENO: result: $php_cv_lemon_version" >&5 126946-echo "${ECHO_T}$php_cv_lemon_version" >&6 126947+ 126948+echo "$ac_t""$php_cv_lemon_version" 1>&6 126949 else 126950 lemon_version=none 126951 fi 126952 case $php_cv_lemon_version in 126953 ""|invalid) 126954 lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." 126955- { echo "$as_me:$LINENO: WARNING: $lemon_msg" >&5 126956-echo "$as_me: WARNING: $lemon_msg" >&2;} 126957+ echo "configure: warning: $lemon_msg" 1>&2 126958 LEMON="exit 0;" 126959 ;; 126960 esac 126961- 126962+ 126963 PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" 126964 126965 126966@@ -110753,8 +86910,8 @@ 126967 libsqlite/src/vdbeaux.c libsqlite/src/date.c \ 126968 libsqlite/src/where.c libsqlite/src/trigger.c" 126969 fi 126970- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 126971- 126972+ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 126973+ 126974 ext_builddir=ext/sqlite 126975 ext_srcdir=$abs_srcdir/ext/sqlite 126976 126977@@ -110762,15 +86919,15 @@ 126978 126979 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 126980 PHP_SQLITE_SHARED=no 126981- 126982- 126983+ 126984+ 126985 case ext/sqlite in 126986 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 126987 /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 126988 *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 126989 esac 126990- 126991- 126992+ 126993+ 126994 126995 b_c_pre=$php_c_pre 126996 b_cxx_pre=$php_cxx_pre 126997@@ -110783,12 +86940,12 @@ 126998 126999 old_IFS=$IFS 127000 for ac_src in $sqlite_sources; do 127001- 127002+ 127003 IFS=. 127004 set $ac_src 127005 ac_obj=$1 127006 IFS=$old_IFS 127007- 127008+ 127009 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 127010 127011 case $ac_src in 127012@@ -110812,14 +86969,14 @@ 127013 else 127014 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 127015 PHP_SQLITE_SHARED=yes 127016- 127017+ 127018 case ext/sqlite in 127019 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 127020 /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 127021 *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 127022 esac 127023- 127024- 127025+ 127026+ 127027 127028 b_c_pre=$shared_c_pre 127029 b_cxx_pre=$shared_cxx_pre 127030@@ -110832,12 +86989,12 @@ 127031 127032 old_IFS=$IFS 127033 for ac_src in $sqlite_sources; do 127034- 127035+ 127036 IFS=. 127037 set $ac_src 127038 ac_obj=$1 127039 IFS=$old_IFS 127040- 127041+ 127042 shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" 127043 127044 case $ac_src in 127045@@ -110855,7 +87012,7 @@ 127046 127047 case $host_alias in 127048 *netware*) 127049- 127050+ 127051 install_modules="install-modules" 127052 127053 case $host_alias in 127054@@ -110865,7 +87022,7 @@ 127055 ;; 127056 *netware*) 127057 suffix=nlm 127058- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(SQLITE_SHARED_LIBADD)' 127059+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' 127060 ;; 127061 *) 127062 suffix=la 127063@@ -110878,7 +87035,7 @@ 127064 else 127065 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" 127066 fi 127067- 127068+ 127069 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" 127070 127071 cat >>Makefile.objects<<EOF 127072@@ -110892,7 +87049,7 @@ 127073 127074 ;; 127075 *) 127076- 127077+ 127078 install_modules="install-modules" 127079 127080 case $host_alias in 127081@@ -110902,7 +87059,7 @@ 127082 ;; 127083 *netware*) 127084 suffix=nlm 127085- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(ITE_SHARED_LIBADD)' 127086+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)' 127087 ;; 127088 *) 127089 suffix=la 127090@@ -110915,7 +87072,7 @@ 127091 else 127092 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix" 127093 fi 127094- 127095+ 127096 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" 127097 127098 cat >>Makefile.objects<<EOF 127099@@ -110929,10 +87086,9 @@ 127100 127101 ;; 127102 esac 127103- 127104-cat >>confdefs.h <<_ACEOF 127105+ cat >> confdefs.h <<EOF 127106 #define COMPILE_DL_SQLITE 1 127107-_ACEOF 127108+EOF 127109 127110 fi 127111 fi 127112@@ -110941,15 +87097,15 @@ 127113 PHP_SQLITE_SHARED=no 127114 case "$PHP_SAPI" in 127115 cgi|embed) 127116- 127117- 127118+ 127119+ 127120 case ext/sqlite in 127121 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 127122 /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 127123 *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 127124 esac 127125- 127126- 127127+ 127128+ 127129 127130 b_c_pre=$php_c_pre 127131 b_cxx_pre=$php_cxx_pre 127132@@ -110962,12 +87118,12 @@ 127133 127134 old_IFS=$IFS 127135 for ac_src in $sqlite_sources; do 127136- 127137+ 127138 IFS=. 127139 set $ac_src 127140 ac_obj=$1 127141 IFS=$old_IFS 127142- 127143+ 127144 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 127145 127146 case $ac_src in 127147@@ -110987,15 +87143,15 @@ 127148 EXT_STATIC="$EXT_STATIC sqlite" 127149 ;; 127150 *) 127151- 127152- 127153+ 127154+ 127155 case ext/sqlite in 127156 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 127157 /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 127158 *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 127159 esac 127160- 127161- 127162+ 127163+ 127164 127165 b_c_pre=$php_c_pre 127166 b_cxx_pre=$php_cxx_pre 127167@@ -111008,13 +87164,13 @@ 127168 127169 old_IFS=$IFS 127170 for ac_src in $sqlite_sources; do 127171- 127172+ 127173 IFS=. 127174 set $ac_src 127175 ac_obj=$1 127176 IFS=$old_IFS 127177- 127178- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 127179+ 127180+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 127181 127182 case $ac_src in 127183 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 127184@@ -111034,551 +87190,150 @@ 127185 esac 127186 EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" 127187 fi 127188- 127189- 127190+ 127191+ 127192 BUILD_DIR="$BUILD_DIR $ext_builddir" 127193- 127194+ 127195 127196 127197 if test "$ext_builddir" = "."; then 127198 PHP_PECL_EXTENSION=sqlite 127199- 127200+ 127201 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 127202 127203 fi 127204 127205- 127206+ 127207 am_i_shared=$PHP_SQLITE_SHARED 127208 is_it_shared=$PHP_SPL_SHARED 127209 is_it_enabled=$PHP_SPL 127210 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 127211- { { echo "$as_me:$LINENO: error: 127212-You've configured extension sqlite to build statically, but it 127213-depends on extension spl, which you've configured to build shared. 127214-You either need to build sqlite shared or build spl statically for the 127215-build to be successful. 127216-" >&5 127217-echo "$as_me: error: 127218+ { echo "configure: error: 127219 You've configured extension sqlite to build statically, but it 127220 depends on extension spl, which you've configured to build shared. 127221 You either need to build sqlite shared or build spl statically for the 127222 build to be successful. 127223-" >&2;} 127224- { (exit 1); exit 1; }; } 127225+" 1>&2; exit 1; } 127226 fi 127227 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 127228- { { echo "$as_me:$LINENO: error: 127229-You've configured extension sqlite, which depends on extension spl, 127230-but you've either not enabled spl, or have disabled it. 127231-" >&5 127232-echo "$as_me: error: 127233+ { echo "configure: error: 127234 You've configured extension sqlite, which depends on extension spl, 127235 but you've either not enabled spl, or have disabled it. 127236-" >&2;} 127237- { (exit 1); exit 1; }; } 127238+" 1>&2; exit 1; } 127239 fi 127240- 127241- 127242+ 127243+ 127244 am_i_shared=$PHP_SQLITE_SHARED 127245 is_it_shared=$PHP_PDO_SHARED 127246 is_it_enabled=$PHP_PDO 127247 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 127248- { { echo "$as_me:$LINENO: error: 127249-You've configured extension sqlite to build statically, but it 127250-depends on extension pdo, which you've configured to build shared. 127251-You either need to build sqlite shared or build pdo statically for the 127252-build to be successful. 127253-" >&5 127254-echo "$as_me: error: 127255+ { echo "configure: error: 127256 You've configured extension sqlite to build statically, but it 127257 depends on extension pdo, which you've configured to build shared. 127258 You either need to build sqlite shared or build pdo statically for the 127259 build to be successful. 127260-" >&2;} 127261- { (exit 1); exit 1; }; } 127262+" 1>&2; exit 1; } 127263 fi 127264 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 127265- { { echo "$as_me:$LINENO: error: 127266-You've configured extension sqlite, which depends on extension pdo, 127267-but you've either not enabled pdo, or have disabled it. 127268-" >&5 127269-echo "$as_me: error: 127270+ { echo "configure: error: 127271 You've configured extension sqlite, which depends on extension pdo, 127272 but you've either not enabled pdo, or have disabled it. 127273-" >&2;} 127274- { (exit 1); exit 1; }; } 127275+" 1>&2; exit 1; } 127276 fi 127277+ 127278 127279- 127280- 127281+ 127282 src=$ext_srcdir/Makefile.frag 127283 ac_srcdir=$ext_srcdir 127284 ac_builddir=$ext_builddir 127285 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 127286 127287- 127288+ 127289 PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" 127290 127291- 127292- 127293+ 127294+ 127295 for header_file in $ext_builddir/libsqlite/src/sqlite.h; do 127296- 127297- 127298+ 127299+ 127300 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 127301- 127302+ 127303 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 127304 if test -n "$unique" && test "`eval $cmd`" = "" ; then 127305 eval "INSTALLHEADERS$unique=set" 127306- 127307+ 127308 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 127309- 127310+ 127311 fi 127312 127313- done 127314- 127315- 127316+ done 127317+ 127318 127319+ 127320 if test "$SQLITE_MODULE_TYPE" = "builtin"; then 127321- 127322- 127323+ 127324+ 127325 $php_shtool mkdir -p $ext_builddir/libsqlite/src 127326+ 127327 127328- 127329- echo "$as_me:$LINENO: checking for char *" >&5 127330-echo $ECHO_N "checking for char *... $ECHO_C" >&6 127331-if test "${ac_cv_type_char_p+set}" = set; then 127332- echo $ECHO_N "(cached) $ECHO_C" >&6 127333-else 127334- cat >conftest.$ac_ext <<_ACEOF 127335-/* confdefs.h. */ 127336-_ACEOF 127337-cat confdefs.h >>conftest.$ac_ext 127338-cat >>conftest.$ac_ext <<_ACEOF 127339-/* end confdefs.h. */ 127340-$ac_includes_default 127341-int 127342-main () 127343-{ 127344-if ((char * *) 0) 127345- return 0; 127346-if (sizeof (char *)) 127347- return 0; 127348- ; 127349- return 0; 127350-} 127351-_ACEOF 127352-rm -f conftest.$ac_objext 127353-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127354- (eval $ac_compile) 2>conftest.er1 127355- ac_status=$? 127356- grep -v '^ *+' conftest.er1 >conftest.err 127357- rm -f conftest.er1 127358- cat conftest.err >&5 127359- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127360- (exit $ac_status); } && 127361- { ac_try='test -z "$ac_c_werror_flag" 127362- || test ! -s conftest.err' 127363- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127364- (eval $ac_try) 2>&5 127365- ac_status=$? 127366- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127367- (exit $ac_status); }; } && 127368- { ac_try='test -s conftest.$ac_objext' 127369- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127370- (eval $ac_try) 2>&5 127371- ac_status=$? 127372- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127373- (exit $ac_status); }; }; then 127374- ac_cv_type_char_p=yes 127375-else 127376- echo "$as_me: failed program was:" >&5 127377-sed 's/^/| /' conftest.$ac_ext >&5 127378- 127379-ac_cv_type_char_p=no 127380-fi 127381-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127382-fi 127383-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 127384-echo "${ECHO_T}$ac_cv_type_char_p" >&6 127385- 127386-echo "$as_me:$LINENO: checking size of char *" >&5 127387-echo $ECHO_N "checking size of char *... $ECHO_C" >&6 127388-if test "${ac_cv_sizeof_char_p+set}" = set; then 127389- echo $ECHO_N "(cached) $ECHO_C" >&6 127390-else 127391- if test "$ac_cv_type_char_p" = yes; then 127392- # The cast to unsigned long works around a bug in the HP C Compiler 127393- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 127394- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 127395- # This bug is HP SR number 8606223364. 127396- if test "$cross_compiling" = yes; then 127397- # Depending upon the size, compute the lo and hi bounds. 127398-cat >conftest.$ac_ext <<_ACEOF 127399-/* confdefs.h. */ 127400-_ACEOF 127401-cat confdefs.h >>conftest.$ac_ext 127402-cat >>conftest.$ac_ext <<_ACEOF 127403-/* end confdefs.h. */ 127404-$ac_includes_default 127405-int 127406-main () 127407-{ 127408-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; 127409-test_array [0] = 0 127410- 127411- ; 127412- return 0; 127413-} 127414-_ACEOF 127415-rm -f conftest.$ac_objext 127416-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127417- (eval $ac_compile) 2>conftest.er1 127418- ac_status=$? 127419- grep -v '^ *+' conftest.er1 >conftest.err 127420- rm -f conftest.er1 127421- cat conftest.err >&5 127422- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127423- (exit $ac_status); } && 127424- { ac_try='test -z "$ac_c_werror_flag" 127425- || test ! -s conftest.err' 127426- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127427- (eval $ac_try) 2>&5 127428- ac_status=$? 127429- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127430- (exit $ac_status); }; } && 127431- { ac_try='test -s conftest.$ac_objext' 127432- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127433- (eval $ac_try) 2>&5 127434- ac_status=$? 127435- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127436- (exit $ac_status); }; }; then 127437- ac_lo=0 ac_mid=0 127438- while :; do 127439- cat >conftest.$ac_ext <<_ACEOF 127440-/* confdefs.h. */ 127441-_ACEOF 127442-cat confdefs.h >>conftest.$ac_ext 127443-cat >>conftest.$ac_ext <<_ACEOF 127444-/* end confdefs.h. */ 127445-$ac_includes_default 127446-int 127447-main () 127448-{ 127449-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; 127450-test_array [0] = 0 127451- 127452- ; 127453- return 0; 127454-} 127455-_ACEOF 127456-rm -f conftest.$ac_objext 127457-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127458- (eval $ac_compile) 2>conftest.er1 127459- ac_status=$? 127460- grep -v '^ *+' conftest.er1 >conftest.err 127461- rm -f conftest.er1 127462- cat conftest.err >&5 127463- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127464- (exit $ac_status); } && 127465- { ac_try='test -z "$ac_c_werror_flag" 127466- || test ! -s conftest.err' 127467- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127468- (eval $ac_try) 2>&5 127469- ac_status=$? 127470- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127471- (exit $ac_status); }; } && 127472- { ac_try='test -s conftest.$ac_objext' 127473- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127474- (eval $ac_try) 2>&5 127475- ac_status=$? 127476- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127477- (exit $ac_status); }; }; then 127478- ac_hi=$ac_mid; break 127479-else 127480- echo "$as_me: failed program was:" >&5 127481-sed 's/^/| /' conftest.$ac_ext >&5 127482- 127483-ac_lo=`expr $ac_mid + 1` 127484- if test $ac_lo -le $ac_mid; then 127485- ac_lo= ac_hi= 127486- break 127487- fi 127488- ac_mid=`expr 2 '*' $ac_mid + 1` 127489-fi 127490-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127491- done 127492-else 127493- echo "$as_me: failed program was:" >&5 127494-sed 's/^/| /' conftest.$ac_ext >&5 127495- 127496-cat >conftest.$ac_ext <<_ACEOF 127497-/* confdefs.h. */ 127498-_ACEOF 127499-cat confdefs.h >>conftest.$ac_ext 127500-cat >>conftest.$ac_ext <<_ACEOF 127501-/* end confdefs.h. */ 127502-$ac_includes_default 127503-int 127504-main () 127505-{ 127506-static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; 127507-test_array [0] = 0 127508- 127509- ; 127510- return 0; 127511-} 127512-_ACEOF 127513-rm -f conftest.$ac_objext 127514-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127515- (eval $ac_compile) 2>conftest.er1 127516- ac_status=$? 127517- grep -v '^ *+' conftest.er1 >conftest.err 127518- rm -f conftest.er1 127519- cat conftest.err >&5 127520- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127521- (exit $ac_status); } && 127522- { ac_try='test -z "$ac_c_werror_flag" 127523- || test ! -s conftest.err' 127524- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127525- (eval $ac_try) 2>&5 127526- ac_status=$? 127527- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127528- (exit $ac_status); }; } && 127529- { ac_try='test -s conftest.$ac_objext' 127530- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127531- (eval $ac_try) 2>&5 127532- ac_status=$? 127533- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127534- (exit $ac_status); }; }; then 127535- ac_hi=-1 ac_mid=-1 127536- while :; do 127537- cat >conftest.$ac_ext <<_ACEOF 127538-/* confdefs.h. */ 127539-_ACEOF 127540-cat confdefs.h >>conftest.$ac_ext 127541-cat >>conftest.$ac_ext <<_ACEOF 127542-/* end confdefs.h. */ 127543-$ac_includes_default 127544-int 127545-main () 127546-{ 127547-static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; 127548-test_array [0] = 0 127549- 127550- ; 127551- return 0; 127552-} 127553-_ACEOF 127554-rm -f conftest.$ac_objext 127555-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127556- (eval $ac_compile) 2>conftest.er1 127557- ac_status=$? 127558- grep -v '^ *+' conftest.er1 >conftest.err 127559- rm -f conftest.er1 127560- cat conftest.err >&5 127561- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127562- (exit $ac_status); } && 127563- { ac_try='test -z "$ac_c_werror_flag" 127564- || test ! -s conftest.err' 127565- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127566- (eval $ac_try) 2>&5 127567- ac_status=$? 127568- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127569- (exit $ac_status); }; } && 127570- { ac_try='test -s conftest.$ac_objext' 127571- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127572- (eval $ac_try) 2>&5 127573- ac_status=$? 127574- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127575- (exit $ac_status); }; }; then 127576- ac_lo=$ac_mid; break 127577-else 127578- echo "$as_me: failed program was:" >&5 127579-sed 's/^/| /' conftest.$ac_ext >&5 127580- 127581-ac_hi=`expr '(' $ac_mid ')' - 1` 127582- if test $ac_mid -le $ac_hi; then 127583- ac_lo= ac_hi= 127584- break 127585- fi 127586- ac_mid=`expr 2 '*' $ac_mid` 127587-fi 127588-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127589- done 127590-else 127591- echo "$as_me: failed program was:" >&5 127592-sed 's/^/| /' conftest.$ac_ext >&5 127593- 127594-ac_lo= ac_hi= 127595-fi 127596-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127597-fi 127598-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127599-# Binary search between lo and hi bounds. 127600-while test "x$ac_lo" != "x$ac_hi"; do 127601- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 127602- cat >conftest.$ac_ext <<_ACEOF 127603-/* confdefs.h. */ 127604-_ACEOF 127605-cat confdefs.h >>conftest.$ac_ext 127606-cat >>conftest.$ac_ext <<_ACEOF 127607-/* end confdefs.h. */ 127608-$ac_includes_default 127609-int 127610-main () 127611-{ 127612-static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; 127613-test_array [0] = 0 127614- 127615- ; 127616- return 0; 127617-} 127618-_ACEOF 127619-rm -f conftest.$ac_objext 127620-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127621- (eval $ac_compile) 2>conftest.er1 127622- ac_status=$? 127623- grep -v '^ *+' conftest.er1 >conftest.err 127624- rm -f conftest.er1 127625- cat conftest.err >&5 127626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127627- (exit $ac_status); } && 127628- { ac_try='test -z "$ac_c_werror_flag" 127629- || test ! -s conftest.err' 127630- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127631- (eval $ac_try) 2>&5 127632- ac_status=$? 127633- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127634- (exit $ac_status); }; } && 127635- { ac_try='test -s conftest.$ac_objext' 127636- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127637- (eval $ac_try) 2>&5 127638- ac_status=$? 127639- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127640- (exit $ac_status); }; }; then 127641- ac_hi=$ac_mid 127642-else 127643- echo "$as_me: failed program was:" >&5 127644-sed 's/^/| /' conftest.$ac_ext >&5 127645- 127646-ac_lo=`expr '(' $ac_mid ')' + 1` 127647-fi 127648-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 127649-done 127650-case $ac_lo in 127651-?*) ac_cv_sizeof_char_p=$ac_lo;; 127652-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 127653-See \`config.log' for more details." >&5 127654-echo "$as_me: error: cannot compute sizeof (char *), 77 127655-See \`config.log' for more details." >&2;} 127656- { (exit 1); exit 1; }; } ;; 127657-esac 127658+ echo $ac_n "checking size of char *""... $ac_c" 1>&6 127659+echo "configure:87281: checking size of char *" >&5 127660+if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then 127661+ echo $ac_n "(cached) $ac_c" 1>&6 127662 else 127663 if test "$cross_compiling" = yes; then 127664- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 127665-See \`config.log' for more details." >&5 127666-echo "$as_me: error: cannot run test program while cross compiling 127667-See \`config.log' for more details." >&2;} 127668- { (exit 1); exit 1; }; } 127669-else 127670- cat >conftest.$ac_ext <<_ACEOF 127671-/* confdefs.h. */ 127672-_ACEOF 127673-cat confdefs.h >>conftest.$ac_ext 127674-cat >>conftest.$ac_ext <<_ACEOF 127675-/* end confdefs.h. */ 127676-$ac_includes_default 127677-long longval () { return (long) (sizeof (char *)); } 127678-unsigned long ulongval () { return (long) (sizeof (char *)); } 127679+ ac_cv_sizeof_char_p=4 127680+else 127681+ cat > conftest.$ac_ext <<EOF 127682+#line 87289 "configure" 127683+#include "confdefs.h" 127684 #include <stdio.h> 127685-#include <stdlib.h> 127686-int 127687-main () 127688+main() 127689 { 127690- 127691- FILE *f = fopen ("conftest.val", "w"); 127692- if (! f) 127693- exit (1); 127694- if (((long) (sizeof (char *))) < 0) 127695- { 127696- long i = longval (); 127697- if (i != ((long) (sizeof (char *)))) 127698- exit (1); 127699- fprintf (f, "%ld\n", i); 127700- } 127701- else 127702- { 127703- unsigned long i = ulongval (); 127704- if (i != ((long) (sizeof (char *)))) 127705- exit (1); 127706- fprintf (f, "%lu\n", i); 127707- } 127708- exit (ferror (f) || fclose (f) != 0); 127709- 127710- ; 127711- return 0; 127712+ FILE *f=fopen("conftestval", "w"); 127713+ if (!f) exit(1); 127714+ fprintf(f, "%d\n", sizeof(char *)); 127715+ exit(0); 127716 } 127717-_ACEOF 127718-rm -f conftest$ac_exeext 127719-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 127720- (eval $ac_link) 2>&5 127721- ac_status=$? 127722- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127723- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 127724- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127725- (eval $ac_try) 2>&5 127726- ac_status=$? 127727- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127728- (exit $ac_status); }; }; then 127729- ac_cv_sizeof_char_p=`cat conftest.val` 127730-else 127731- echo "$as_me: program exited with status $ac_status" >&5 127732-echo "$as_me: failed program was:" >&5 127733-sed 's/^/| /' conftest.$ac_ext >&5 127734- 127735-( exit $ac_status ) 127736-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 127737-See \`config.log' for more details." >&5 127738-echo "$as_me: error: cannot compute sizeof (char *), 77 127739-See \`config.log' for more details." >&2;} 127740- { (exit 1); exit 1; }; } 127741-fi 127742-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 127743-fi 127744-fi 127745-rm -f conftest.val 127746+EOF 127747+if { (eval echo configure:87300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 127748+then 127749+ ac_cv_sizeof_char_p=`cat conftestval` 127750 else 127751+ echo "configure: failed program was:" >&5 127752+ cat conftest.$ac_ext >&5 127753+ rm -fr conftest* 127754 ac_cv_sizeof_char_p=0 127755 fi 127756+rm -fr conftest* 127757+fi 127758+ 127759 fi 127760-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 127761-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 127762-cat >>confdefs.h <<_ACEOF 127763+echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 127764+cat >> confdefs.h <<EOF 127765 #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p 127766-_ACEOF 127767- 127768+EOF 127769 127770 127771-cat >>confdefs.h <<\_ACEOF 127772+ cat >> confdefs.h <<\EOF 127773 #define SQLITE_PTR_SZ SIZEOF_CHAR_P 127774-_ACEOF 127775+EOF 127776 127777 if test "$PHP_SQLITE_UTF8" = "yes"; then 127778 SQLITE_ENCODING="UTF8" 127779- 127780-cat >>confdefs.h <<\_ACEOF 127781+ cat >> confdefs.h <<\EOF 127782 #define SQLITE_UTF8 1 127783-_ACEOF 127784+EOF 127785 127786 else 127787 SQLITE_ENCODING="ISO8859" 127788 fi 127789- 127790+ 127791 PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" 127792 127793 127794 SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` 127795- 127796+ 127797 PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" 127798 127799 127800@@ -111589,7 +87344,7 @@ 127801 else 127802 echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h 127803 fi 127804- 127805+ 127806 cat >> $ext_builddir/libsqlite/src/config.h <<EOF 127807 #if ZTS 127808 # define THREADSAFE 1 127809@@ -111599,280 +87354,120 @@ 127810 #endif 127811 EOF 127812 fi 127813- 127814- 127815- 127816-for ac_func in usleep nanosleep 127817+ 127818+ for ac_func in usleep nanosleep 127819 do 127820-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 127821-echo "$as_me:$LINENO: checking for $ac_func" >&5 127822-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 127823-if eval "test \"\${$as_ac_var+set}\" = set"; then 127824- echo $ECHO_N "(cached) $ECHO_C" >&6 127825-else 127826- cat >conftest.$ac_ext <<_ACEOF 127827-/* confdefs.h. */ 127828-_ACEOF 127829-cat confdefs.h >>conftest.$ac_ext 127830-cat >>conftest.$ac_ext <<_ACEOF 127831-/* end confdefs.h. */ 127832-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 127833- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 127834-#define $ac_func innocuous_$ac_func 127835- 127836+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 127837+echo "configure:87362: checking for $ac_func" >&5 127838+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 127839+ echo $ac_n "(cached) $ac_c" 1>&6 127840+else 127841+ cat > conftest.$ac_ext <<EOF 127842+#line 87367 "configure" 127843+#include "confdefs.h" 127844 /* System header to define __stub macros and hopefully few prototypes, 127845- which can conflict with char $ac_func (); below. 127846- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 127847- <limits.h> exists even on freestanding compilers. */ 127848- 127849-#ifdef __STDC__ 127850-# include <limits.h> 127851-#else 127852-# include <assert.h> 127853-#endif 127854- 127855-#undef $ac_func 127856- 127857+ which can conflict with char $ac_func(); below. */ 127858+#include <assert.h> 127859 /* Override any gcc2 internal prototype to avoid an error. */ 127860-#ifdef __cplusplus 127861-extern "C" 127862-{ 127863-#endif 127864 /* We use char because int might match the return type of a gcc2 127865- builtin and then its argument prototype would still apply. */ 127866-char $ac_func (); 127867+ builtin and then its argument prototype would still apply. */ 127868+char $ac_func(); 127869+ 127870+int main() { 127871+ 127872 /* The GNU C library defines this for functions which it implements 127873 to always fail with ENOSYS. Some functions are actually named 127874 something starting with __ and the normal name is an alias. */ 127875 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 127876 choke me 127877 #else 127878-char (*f) () = $ac_func; 127879-#endif 127880-#ifdef __cplusplus 127881-} 127882+$ac_func(); 127883 #endif 127884 127885-int 127886-main () 127887-{ 127888-return f != $ac_func; 127889- ; 127890- return 0; 127891-} 127892-_ACEOF 127893-rm -f conftest.$ac_objext conftest$ac_exeext 127894-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 127895- (eval $ac_link) 2>conftest.er1 127896- ac_status=$? 127897- grep -v '^ *+' conftest.er1 >conftest.err 127898- rm -f conftest.er1 127899- cat conftest.err >&5 127900- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127901- (exit $ac_status); } && 127902- { ac_try='test -z "$ac_c_werror_flag" 127903- || test ! -s conftest.err' 127904- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127905- (eval $ac_try) 2>&5 127906- ac_status=$? 127907- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127908- (exit $ac_status); }; } && 127909- { ac_try='test -s conftest$ac_exeext' 127910- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127911- (eval $ac_try) 2>&5 127912- ac_status=$? 127913- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127914- (exit $ac_status); }; }; then 127915- eval "$as_ac_var=yes" 127916-else 127917- echo "$as_me: failed program was:" >&5 127918-sed 's/^/| /' conftest.$ac_ext >&5 127919- 127920-eval "$as_ac_var=no" 127921-fi 127922-rm -f conftest.err conftest.$ac_objext \ 127923- conftest$ac_exeext conftest.$ac_ext 127924-fi 127925-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 127926-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 127927-if test `eval echo '${'$as_ac_var'}'` = yes; then 127928- cat >>confdefs.h <<_ACEOF 127929-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 127930-_ACEOF 127931+; return 0; } 127932+EOF 127933+if { (eval echo configure:87390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 127934+ rm -rf conftest* 127935+ eval "ac_cv_func_$ac_func=yes" 127936+else 127937+ echo "configure: failed program was:" >&5 127938+ cat conftest.$ac_ext >&5 127939+ rm -rf conftest* 127940+ eval "ac_cv_func_$ac_func=no" 127941+fi 127942+rm -f conftest* 127943+fi 127944 127945+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 127946+ echo "$ac_t""yes" 1>&6 127947+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 127948+ cat >> confdefs.h <<EOF 127949+#define $ac_tr_func 1 127950+EOF 127951+ 127952+else 127953+ echo "$ac_t""no" 1>&6 127954 fi 127955 done 127956 127957- 127958-for ac_header in time.h 127959+ for ac_hdr in time.h 127960 do 127961-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 127962-if eval "test \"\${$as_ac_Header+set}\" = set"; then 127963- echo "$as_me:$LINENO: checking for $ac_header" >&5 127964-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 127965-if eval "test \"\${$as_ac_Header+set}\" = set"; then 127966- echo $ECHO_N "(cached) $ECHO_C" >&6 127967-fi 127968-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 127969-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 127970-else 127971- # Is the header compilable? 127972-echo "$as_me:$LINENO: checking $ac_header usability" >&5 127973-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 127974-cat >conftest.$ac_ext <<_ACEOF 127975-/* confdefs.h. */ 127976-_ACEOF 127977-cat confdefs.h >>conftest.$ac_ext 127978-cat >>conftest.$ac_ext <<_ACEOF 127979-/* end confdefs.h. */ 127980-$ac_includes_default 127981-#include <$ac_header> 127982-_ACEOF 127983-rm -f conftest.$ac_objext 127984-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 127985- (eval $ac_compile) 2>conftest.er1 127986- ac_status=$? 127987- grep -v '^ *+' conftest.er1 >conftest.err 127988- rm -f conftest.er1 127989- cat conftest.err >&5 127990- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127991- (exit $ac_status); } && 127992- { ac_try='test -z "$ac_c_werror_flag" 127993- || test ! -s conftest.err' 127994- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 127995- (eval $ac_try) 2>&5 127996- ac_status=$? 127997- echo "$as_me:$LINENO: \$? = $ac_status" >&5 127998- (exit $ac_status); }; } && 127999- { ac_try='test -s conftest.$ac_objext' 128000- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128001- (eval $ac_try) 2>&5 128002- ac_status=$? 128003- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128004- (exit $ac_status); }; }; then 128005- ac_header_compiler=yes 128006-else 128007- echo "$as_me: failed program was:" >&5 128008-sed 's/^/| /' conftest.$ac_ext >&5 128009- 128010-ac_header_compiler=no 128011-fi 128012-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 128013-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 128014-echo "${ECHO_T}$ac_header_compiler" >&6 128015- 128016-# Is the header present? 128017-echo "$as_me:$LINENO: checking $ac_header presence" >&5 128018-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 128019-cat >conftest.$ac_ext <<_ACEOF 128020-/* confdefs.h. */ 128021-_ACEOF 128022-cat confdefs.h >>conftest.$ac_ext 128023-cat >>conftest.$ac_ext <<_ACEOF 128024-/* end confdefs.h. */ 128025-#include <$ac_header> 128026-_ACEOF 128027-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 128028- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 128029- ac_status=$? 128030- grep -v '^ *+' conftest.er1 >conftest.err 128031- rm -f conftest.er1 128032- cat conftest.err >&5 128033- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128034- (exit $ac_status); } >/dev/null; then 128035- if test -s conftest.err; then 128036- ac_cpp_err=$ac_c_preproc_warn_flag 128037- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 128038- else 128039- ac_cpp_err= 128040- fi 128041-else 128042- ac_cpp_err=yes 128043-fi 128044-if test -z "$ac_cpp_err"; then 128045- ac_header_preproc=yes 128046-else 128047- echo "$as_me: failed program was:" >&5 128048-sed 's/^/| /' conftest.$ac_ext >&5 128049- 128050- ac_header_preproc=no 128051-fi 128052-rm -f conftest.err conftest.$ac_ext 128053-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 128054-echo "${ECHO_T}$ac_header_preproc" >&6 128055- 128056-# So? What about this header? 128057-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 128058- yes:no: ) 128059- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 128060-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 128061- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 128062-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 128063- ac_header_preproc=yes 128064- ;; 128065- no:yes:* ) 128066- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 128067-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 128068- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 128069-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 128070- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 128071-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 128072- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 128073-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 128074- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 128075-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 128076- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 128077-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 128078- ( 128079- cat <<\_ASBOX 128080-## ------------------------------------------ ## 128081-## Report this to the AC_PACKAGE_NAME lists. ## 128082-## ------------------------------------------ ## 128083-_ASBOX 128084- ) | 128085- sed "s/^/$as_me: WARNING: /" >&2 128086- ;; 128087-esac 128088-echo "$as_me:$LINENO: checking for $ac_header" >&5 128089-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 128090-if eval "test \"\${$as_ac_Header+set}\" = set"; then 128091- echo $ECHO_N "(cached) $ECHO_C" >&6 128092+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 128093+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 128094+echo "configure:87418: checking for $ac_hdr" >&5 128095+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 128096+ echo $ac_n "(cached) $ac_c" 1>&6 128097+else 128098+ cat > conftest.$ac_ext <<EOF 128099+#line 87423 "configure" 128100+#include "confdefs.h" 128101+#include <$ac_hdr> 128102+EOF 128103+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 128104+{ (eval echo configure:87428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 128105+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 128106+if test -z "$ac_err"; then 128107+ rm -rf conftest* 128108+ eval "ac_cv_header_$ac_safe=yes" 128109 else 128110- eval "$as_ac_Header=\$ac_header_preproc" 128111+ echo "$ac_err" >&5 128112+ echo "configure: failed program was:" >&5 128113+ cat conftest.$ac_ext >&5 128114+ rm -rf conftest* 128115+ eval "ac_cv_header_$ac_safe=no" 128116 fi 128117-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 128118-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 128119- 128120+rm -f conftest* 128121 fi 128122-if test `eval echo '${'$as_ac_Header'}'` = yes; then 128123- cat >>confdefs.h <<_ACEOF 128124-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 128125-_ACEOF 128126- 128127+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 128128+ echo "$ac_t""yes" 1>&6 128129+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 128130+ cat >> confdefs.h <<EOF 128131+#define $ac_tr_hdr 1 128132+EOF 128133+ 128134+else 128135+ echo "$ac_t""no" 1>&6 128136 fi 128137- 128138 done 128139 128140 fi 128141 128142 128143-echo "$as_me:$LINENO: checking whether flush should be called explicitly after a buffered io" >&5 128144-echo $ECHO_N "checking whether flush should be called explicitly after a buffered io... $ECHO_C" >&6 128145-if test "${ac_cv_flush_io+set}" = set; then 128146- echo $ECHO_N "(cached) $ECHO_C" >&6 128147-else 128148 128149+echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 128150+echo "configure:87459: checking whether flush should be called explicitly after a buffered io" >&5 128151+if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then 128152+ echo $ac_n "(cached) $ac_c" 1>&6 128153+else 128154+ 128155 if test "$cross_compiling" = yes; then 128156- 128157+ 128158 ac_cv_flush_io=no 128159 128160 else 128161- cat >conftest.$ac_ext <<_ACEOF 128162-/* confdefs.h. */ 128163-_ACEOF 128164-cat confdefs.h >>conftest.$ac_ext 128165-cat >>conftest.$ac_ext <<_ACEOF 128166-/* end confdefs.h. */ 128167+ cat > conftest.$ac_ext <<EOF 128168+#line 87470 "configure" 128169+#include "confdefs.h" 128170 128171 #include <stdio.h> 128172 #include <stdlib.h> 128173@@ -111882,14 +87477,14 @@ 128174 char *filename = tmpnam(NULL); 128175 char buffer[64]; 128176 int result = 0; 128177- 128178+ 128179 FILE *fp = fopen(filename, "wb"); 128180 if (NULL == fp) 128181 return 0; 128182 fputs("line 1\n", fp); 128183 fputs("line 2\n", fp); 128184 fclose(fp); 128185- 128186+ 128187 fp = fopen(filename, "rb+"); 128188 if (NULL == fp) 128189 return 0; 128190@@ -111908,139 +87503,96 @@ 128191 exit(result); 128192 } 128193 128194-_ACEOF 128195-rm -f conftest$ac_exeext 128196-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128197- (eval $ac_link) 2>&5 128198- ac_status=$? 128199- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128200- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128201- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128202- (eval $ac_try) 2>&5 128203- ac_status=$? 128204- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128205- (exit $ac_status); }; }; then 128206- 128207+EOF 128208+if { (eval echo configure:87508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128209+then 128210+ 128211 ac_cv_flush_io=no 128212 128213 else 128214- echo "$as_me: program exited with status $ac_status" >&5 128215-echo "$as_me: failed program was:" >&5 128216-sed 's/^/| /' conftest.$ac_ext >&5 128217- 128218-( exit $ac_status ) 128219- 128220+ echo "configure: failed program was:" >&5 128221+ cat conftest.$ac_ext >&5 128222+ rm -fr conftest* 128223+ 128224 ac_cv_flush_io=yes 128225 128226 fi 128227-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128228+rm -fr conftest* 128229 fi 128230+ 128231 fi 128232-echo "$as_me:$LINENO: result: $ac_cv_flush_io" >&5 128233-echo "${ECHO_T}$ac_cv_flush_io" >&6 128234-if test "$ac_cv_flush_io" = "yes"; then 128235 128236-cat >>confdefs.h <<\_ACEOF 128237+echo "$ac_t""$ac_cv_flush_io" 1>&6 128238+if test "$ac_cv_flush_io" = "yes"; then 128239+ cat >> confdefs.h <<\EOF 128240 #define HAVE_FLUSHIO 1 128241-_ACEOF 128242+EOF 128243 128244 fi 128245 128246 if test "$ac_cv_func_crypt" = "no"; then 128247- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 128248-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 128249-if test "${ac_cv_lib_crypt_crypt+set}" = set; then 128250- echo $ECHO_N "(cached) $ECHO_C" >&6 128251+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 128252+echo "configure:87536: checking for crypt in -lcrypt" >&5 128253+ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` 128254+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 128255+ echo $ac_n "(cached) $ac_c" 1>&6 128256 else 128257- ac_check_lib_save_LIBS=$LIBS 128258+ ac_save_LIBS="$LIBS" 128259 LIBS="-lcrypt $LIBS" 128260-cat >conftest.$ac_ext <<_ACEOF 128261-/* confdefs.h. */ 128262-_ACEOF 128263-cat confdefs.h >>conftest.$ac_ext 128264-cat >>conftest.$ac_ext <<_ACEOF 128265-/* end confdefs.h. */ 128266- 128267+cat > conftest.$ac_ext <<EOF 128268+#line 87544 "configure" 128269+#include "confdefs.h" 128270 /* Override any gcc2 internal prototype to avoid an error. */ 128271-#ifdef __cplusplus 128272-extern "C" 128273-#endif 128274 /* We use char because int might match the return type of a gcc2 128275- builtin and then its argument prototype would still apply. */ 128276-char crypt (); 128277-int 128278-main () 128279-{ 128280-crypt (); 128281- ; 128282- return 0; 128283-} 128284-_ACEOF 128285-rm -f conftest.$ac_objext conftest$ac_exeext 128286-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128287- (eval $ac_link) 2>conftest.er1 128288- ac_status=$? 128289- grep -v '^ *+' conftest.er1 >conftest.err 128290- rm -f conftest.er1 128291- cat conftest.err >&5 128292- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128293- (exit $ac_status); } && 128294- { ac_try='test -z "$ac_c_werror_flag" 128295- || test ! -s conftest.err' 128296- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128297- (eval $ac_try) 2>&5 128298- ac_status=$? 128299- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128300- (exit $ac_status); }; } && 128301- { ac_try='test -s conftest$ac_exeext' 128302- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128303- (eval $ac_try) 2>&5 128304- ac_status=$? 128305- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128306- (exit $ac_status); }; }; then 128307- ac_cv_lib_crypt_crypt=yes 128308-else 128309- echo "$as_me: failed program was:" >&5 128310-sed 's/^/| /' conftest.$ac_ext >&5 128311- 128312-ac_cv_lib_crypt_crypt=no 128313-fi 128314-rm -f conftest.err conftest.$ac_objext \ 128315- conftest$ac_exeext conftest.$ac_ext 128316-LIBS=$ac_check_lib_save_LIBS 128317-fi 128318-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 128319-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 128320-if test $ac_cv_lib_crypt_crypt = yes; then 128321+ builtin and then its argument prototype would still apply. */ 128322+char crypt(); 128323 128324- LIBS="-lcrypt $LIBS -lcrypt" 128325+int main() { 128326+crypt() 128327+; return 0; } 128328+EOF 128329+if { (eval echo configure:87555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 128330+ rm -rf conftest* 128331+ eval "ac_cv_lib_$ac_lib_var=yes" 128332+else 128333+ echo "configure: failed program was:" >&5 128334+ cat conftest.$ac_ext >&5 128335+ rm -rf conftest* 128336+ eval "ac_cv_lib_$ac_lib_var=no" 128337+fi 128338+rm -f conftest* 128339+LIBS="$ac_save_LIBS" 128340 128341-cat >>confdefs.h <<\_ACEOF 128342+fi 128343+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 128344+ echo "$ac_t""yes" 1>&6 128345+ 128346+ LIBS="-lcrypt $LIBS -lcrypt" 128347+ cat >> confdefs.h <<\EOF 128348 #define HAVE_CRYPT 1 128349-_ACEOF 128350- 128351+EOF 128352 128353+ 128354+else 128355+ echo "$ac_t""no" 1>&6 128356 fi 128357 128358 fi 128359- 128360-echo "$as_me:$LINENO: checking for standard DES crypt" >&5 128361-echo $ECHO_N "checking for standard DES crypt... $ECHO_C" >&6 128362-if test "${ac_cv_crypt_des+set}" = set; then 128363- echo $ECHO_N "(cached) $ECHO_C" >&6 128364+ 128365+echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 128366+echo "configure:87584: checking for standard DES crypt" >&5 128367+if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then 128368+ echo $ac_n "(cached) $ac_c" 1>&6 128369 else 128370- 128371+ 128372 if test "$cross_compiling" = yes; then 128373- 128374+ 128375 ac_cv_crypt_des=yes 128376 128377 else 128378- cat >conftest.$ac_ext <<_ACEOF 128379-/* confdefs.h. */ 128380-_ACEOF 128381-cat confdefs.h >>conftest.$ac_ext 128382-cat >>conftest.$ac_ext <<_ACEOF 128383-/* end confdefs.h. */ 128384+ cat > conftest.$ac_ext <<EOF 128385+#line 87595 "configure" 128386+#include "confdefs.h" 128387 128388 #if HAVE_UNISTD_H 128389 #include <unistd.h> 128390@@ -112057,54 +87609,41 @@ 128391 exit(0); 128392 #endif 128393 } 128394-_ACEOF 128395-rm -f conftest$ac_exeext 128396-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128397- (eval $ac_link) 2>&5 128398- ac_status=$? 128399- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128400- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128401- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128402- (eval $ac_try) 2>&5 128403- ac_status=$? 128404- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128405- (exit $ac_status); }; }; then 128406- 128407+EOF 128408+if { (eval echo configure:87614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128409+then 128410+ 128411 ac_cv_crypt_des=yes 128412 128413 else 128414- echo "$as_me: program exited with status $ac_status" >&5 128415-echo "$as_me: failed program was:" >&5 128416-sed 's/^/| /' conftest.$ac_ext >&5 128417- 128418-( exit $ac_status ) 128419- 128420+ echo "configure: failed program was:" >&5 128421+ cat conftest.$ac_ext >&5 128422+ rm -fr conftest* 128423+ 128424 ac_cv_crypt_des=no 128425 128426 fi 128427-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128428+rm -fr conftest* 128429 fi 128430+ 128431 fi 128432-echo "$as_me:$LINENO: result: $ac_cv_crypt_des" >&5 128433-echo "${ECHO_T}$ac_cv_crypt_des" >&6 128434 128435-echo "$as_me:$LINENO: checking for extended DES crypt" >&5 128436-echo $ECHO_N "checking for extended DES crypt... $ECHO_C" >&6 128437-if test "${ac_cv_crypt_ext_des+set}" = set; then 128438- echo $ECHO_N "(cached) $ECHO_C" >&6 128439-else 128440+echo "$ac_t""$ac_cv_crypt_des" 1>&6 128441 128442+echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 128443+echo "configure:87635: checking for extended DES crypt" >&5 128444+if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then 128445+ echo $ac_n "(cached) $ac_c" 1>&6 128446+else 128447+ 128448 if test "$cross_compiling" = yes; then 128449- 128450+ 128451 ac_cv_crypt_ext_des=no 128452 128453 else 128454- cat >conftest.$ac_ext <<_ACEOF 128455-/* confdefs.h. */ 128456-_ACEOF 128457-cat confdefs.h >>conftest.$ac_ext 128458-cat >>conftest.$ac_ext <<_ACEOF 128459-/* end confdefs.h. */ 128460+ cat > conftest.$ac_ext <<EOF 128461+#line 87646 "configure" 128462+#include "confdefs.h" 128463 128464 #if HAVE_UNISTD_H 128465 #include <unistd.h> 128466@@ -112121,54 +87660,41 @@ 128467 exit(0); 128468 #endif 128469 } 128470-_ACEOF 128471-rm -f conftest$ac_exeext 128472-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128473- (eval $ac_link) 2>&5 128474- ac_status=$? 128475- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128476- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128477- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128478- (eval $ac_try) 2>&5 128479- ac_status=$? 128480- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128481- (exit $ac_status); }; }; then 128482- 128483+EOF 128484+if { (eval echo configure:87665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128485+then 128486+ 128487 ac_cv_crypt_ext_des=yes 128488 128489 else 128490- echo "$as_me: program exited with status $ac_status" >&5 128491-echo "$as_me: failed program was:" >&5 128492-sed 's/^/| /' conftest.$ac_ext >&5 128493- 128494-( exit $ac_status ) 128495- 128496+ echo "configure: failed program was:" >&5 128497+ cat conftest.$ac_ext >&5 128498+ rm -fr conftest* 128499+ 128500 ac_cv_crypt_ext_des=no 128501 128502 fi 128503-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128504+rm -fr conftest* 128505 fi 128506+ 128507 fi 128508-echo "$as_me:$LINENO: result: $ac_cv_crypt_ext_des" >&5 128509-echo "${ECHO_T}$ac_cv_crypt_ext_des" >&6 128510 128511-echo "$as_me:$LINENO: checking for MD5 crypt" >&5 128512-echo $ECHO_N "checking for MD5 crypt... $ECHO_C" >&6 128513-if test "${ac_cv_crypt_md5+set}" = set; then 128514- echo $ECHO_N "(cached) $ECHO_C" >&6 128515-else 128516+echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 128517 128518+echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 128519+echo "configure:87686: checking for MD5 crypt" >&5 128520+if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then 128521+ echo $ac_n "(cached) $ac_c" 1>&6 128522+else 128523+ 128524 if test "$cross_compiling" = yes; then 128525- 128526+ 128527 ac_cv_crypt_md5=no 128528 128529 else 128530- cat >conftest.$ac_ext <<_ACEOF 128531-/* confdefs.h. */ 128532-_ACEOF 128533-cat confdefs.h >>conftest.$ac_ext 128534-cat >>conftest.$ac_ext <<_ACEOF 128535-/* end confdefs.h. */ 128536+ cat > conftest.$ac_ext <<EOF 128537+#line 87697 "configure" 128538+#include "confdefs.h" 128539 128540 #if HAVE_UNISTD_H 128541 #include <unistd.h> 128542@@ -112182,7 +87708,7 @@ 128543 #if HAVE_CRYPT 128544 char salt[15], answer[40]; 128545 128546- salt[0]='$'; salt[1]='1'; salt[2]='$'; 128547+ salt[0]='$'; salt[1]='1'; salt[2]='$'; 128548 salt[3]='r'; salt[4]='a'; salt[5]='s'; 128549 salt[6]='m'; salt[7]='u'; salt[8]='s'; 128550 salt[9]='l'; salt[10]='e'; salt[11]='$'; 128551@@ -112194,54 +87720,41 @@ 128552 exit(0); 128553 #endif 128554 } 128555-_ACEOF 128556-rm -f conftest$ac_exeext 128557-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128558- (eval $ac_link) 2>&5 128559- ac_status=$? 128560- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128561- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128562- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128563- (eval $ac_try) 2>&5 128564- ac_status=$? 128565- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128566- (exit $ac_status); }; }; then 128567- 128568+EOF 128569+if { (eval echo configure:87725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128570+then 128571+ 128572 ac_cv_crypt_md5=yes 128573 128574 else 128575- echo "$as_me: program exited with status $ac_status" >&5 128576-echo "$as_me: failed program was:" >&5 128577-sed 's/^/| /' conftest.$ac_ext >&5 128578- 128579-( exit $ac_status ) 128580- 128581+ echo "configure: failed program was:" >&5 128582+ cat conftest.$ac_ext >&5 128583+ rm -fr conftest* 128584+ 128585 ac_cv_crypt_md5=no 128586 128587 fi 128588-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128589+rm -fr conftest* 128590 fi 128591+ 128592 fi 128593-echo "$as_me:$LINENO: result: $ac_cv_crypt_md5" >&5 128594-echo "${ECHO_T}$ac_cv_crypt_md5" >&6 128595 128596-echo "$as_me:$LINENO: checking for Blowfish crypt" >&5 128597-echo $ECHO_N "checking for Blowfish crypt... $ECHO_C" >&6 128598-if test "${ac_cv_crypt_blowfish+set}" = set; then 128599- echo $ECHO_N "(cached) $ECHO_C" >&6 128600-else 128601+echo "$ac_t""$ac_cv_crypt_md5" 1>&6 128602 128603+echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 128604+echo "configure:87746: checking for Blowfish crypt" >&5 128605+if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then 128606+ echo $ac_n "(cached) $ac_c" 1>&6 128607+else 128608+ 128609 if test "$cross_compiling" = yes; then 128610- 128611+ 128612 ac_cv_crypt_blowfish=no 128613 128614 else 128615- cat >conftest.$ac_ext <<_ACEOF 128616-/* confdefs.h. */ 128617-_ACEOF 128618-cat confdefs.h >>conftest.$ac_ext 128619-cat >>conftest.$ac_ext <<_ACEOF 128620-/* end confdefs.h. */ 128621+ cat > conftest.$ac_ext <<EOF 128622+#line 87757 "configure" 128623+#include "confdefs.h" 128624 128625 #if HAVE_UNISTD_H 128626 #include <unistd.h> 128627@@ -112254,7 +87767,7 @@ 128628 main() { 128629 #if HAVE_CRYPT 128630 char salt[30], answer[70]; 128631- 128632+ 128633 salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; 128634 strcat(salt,"rasmuslerd............"); 128635 strcpy(answer,salt); 128636@@ -112264,54 +87777,41 @@ 128637 exit(0); 128638 #endif 128639 } 128640-_ACEOF 128641-rm -f conftest$ac_exeext 128642-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128643- (eval $ac_link) 2>&5 128644- ac_status=$? 128645- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128646- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128647- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128648- (eval $ac_try) 2>&5 128649- ac_status=$? 128650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128651- (exit $ac_status); }; }; then 128652- 128653+EOF 128654+if { (eval echo configure:87782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128655+then 128656+ 128657 ac_cv_crypt_blowfish=yes 128658 128659 else 128660- echo "$as_me: program exited with status $ac_status" >&5 128661-echo "$as_me: failed program was:" >&5 128662-sed 's/^/| /' conftest.$ac_ext >&5 128663- 128664-( exit $ac_status ) 128665- 128666+ echo "configure: failed program was:" >&5 128667+ cat conftest.$ac_ext >&5 128668+ rm -fr conftest* 128669+ 128670 ac_cv_crypt_blowfish=no 128671 128672 fi 128673-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128674+rm -fr conftest* 128675 fi 128676+ 128677 fi 128678-echo "$as_me:$LINENO: result: $ac_cv_crypt_blowfish" >&5 128679-echo "${ECHO_T}$ac_cv_crypt_blowfish" >&6 128680 128681-echo "$as_me:$LINENO: checking for SHA512 crypt" >&5 128682-echo $ECHO_N "checking for SHA512 crypt... $ECHO_C" >&6 128683-if test "${ac_cv_crypt_SHA512+set}" = set; then 128684- echo $ECHO_N "(cached) $ECHO_C" >&6 128685-else 128686+echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 128687 128688+echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 128689+echo "configure:87803: checking for SHA512 crypt" >&5 128690+if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then 128691+ echo $ac_n "(cached) $ac_c" 1>&6 128692+else 128693+ 128694 if test "$cross_compiling" = yes; then 128695- 128696+ 128697 ac_cv_crypt_SHA512=no 128698 128699 else 128700- cat >conftest.$ac_ext <<_ACEOF 128701-/* confdefs.h. */ 128702-_ACEOF 128703-cat confdefs.h >>conftest.$ac_ext 128704-cat >>conftest.$ac_ext <<_ACEOF 128705-/* end confdefs.h. */ 128706+ cat > conftest.$ac_ext <<EOF 128707+#line 87814 "configure" 128708+#include "confdefs.h" 128709 128710 #if HAVE_UNISTD_H 128711 #include <unistd.h> 128712@@ -112324,7 +87824,7 @@ 128713 main() { 128714 #if HAVE_CRYPT 128715 char salt[30], answer[80]; 128716- 128717+ 128718 salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; 128719 strcpy(answer, salt); 128720 strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); 128721@@ -112333,54 +87833,41 @@ 128722 exit(0); 128723 #endif 128724 } 128725-_ACEOF 128726-rm -f conftest$ac_exeext 128727-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128728- (eval $ac_link) 2>&5 128729- ac_status=$? 128730- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128731- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128732- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128733- (eval $ac_try) 2>&5 128734- ac_status=$? 128735- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128736- (exit $ac_status); }; }; then 128737- 128738+EOF 128739+if { (eval echo configure:87838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128740+then 128741+ 128742 ac_cv_crypt_SHA512=yes 128743 128744 else 128745- echo "$as_me: program exited with status $ac_status" >&5 128746-echo "$as_me: failed program was:" >&5 128747-sed 's/^/| /' conftest.$ac_ext >&5 128748- 128749-( exit $ac_status ) 128750- 128751+ echo "configure: failed program was:" >&5 128752+ cat conftest.$ac_ext >&5 128753+ rm -fr conftest* 128754+ 128755 ac_cv_crypt_SHA512=no 128756 128757 fi 128758-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128759+rm -fr conftest* 128760 fi 128761+ 128762 fi 128763-echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA512" >&5 128764-echo "${ECHO_T}$ac_cv_crypt_SHA512" >&6 128765 128766-echo "$as_me:$LINENO: checking for SHA256 crypt" >&5 128767-echo $ECHO_N "checking for SHA256 crypt... $ECHO_C" >&6 128768-if test "${ac_cv_crypt_SHA256+set}" = set; then 128769- echo $ECHO_N "(cached) $ECHO_C" >&6 128770-else 128771+echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 128772 128773+echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 128774+echo "configure:87859: checking for SHA256 crypt" >&5 128775+if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then 128776+ echo $ac_n "(cached) $ac_c" 1>&6 128777+else 128778+ 128779 if test "$cross_compiling" = yes; then 128780- 128781+ 128782 ac_cv_crypt_SHA256=no 128783 128784 else 128785- cat >conftest.$ac_ext <<_ACEOF 128786-/* confdefs.h. */ 128787-_ACEOF 128788-cat confdefs.h >>conftest.$ac_ext 128789-cat >>conftest.$ac_ext <<_ACEOF 128790-/* end confdefs.h. */ 128791+ cat > conftest.$ac_ext <<EOF 128792+#line 87870 "configure" 128793+#include "confdefs.h" 128794 128795 #if HAVE_UNISTD_H 128796 #include <unistd.h> 128797@@ -112393,7 +87880,7 @@ 128798 main() { 128799 #if HAVE_CRYPT 128800 char salt[30], answer[80]; 128801- salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; 128802+ salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; 128803 strcat(salt,""); 128804 strcpy(answer, salt); 128805 strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); 128806@@ -112402,224 +87889,151 @@ 128807 exit(0); 128808 #endif 128809 } 128810-_ACEOF 128811-rm -f conftest$ac_exeext 128812-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 128813- (eval $ac_link) 2>&5 128814- ac_status=$? 128815- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128816- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 128817- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128818- (eval $ac_try) 2>&5 128819- ac_status=$? 128820- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128821- (exit $ac_status); }; }; then 128822- 128823+EOF 128824+if { (eval echo configure:87894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 128825+then 128826+ 128827 ac_cv_crypt_SHA256=yes 128828 128829 else 128830- echo "$as_me: program exited with status $ac_status" >&5 128831-echo "$as_me: failed program was:" >&5 128832-sed 's/^/| /' conftest.$ac_ext >&5 128833- 128834-( exit $ac_status ) 128835- 128836+ echo "configure: failed program was:" >&5 128837+ cat conftest.$ac_ext >&5 128838+ rm -fr conftest* 128839+ 128840 ac_cv_crypt_SHA256=no 128841 128842 fi 128843-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 128844+rm -fr conftest* 128845 fi 128846+ 128847 fi 128848-echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA256" >&5 128849-echo "${ECHO_T}$ac_cv_crypt_SHA256" >&6 128850+ 128851+echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 128852 128853 128854 if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then 128855 128856- echo "$as_me:$LINENO: checking whether the compiler supports __alignof__" >&5 128857-echo $ECHO_N "checking whether the compiler supports __alignof__... $ECHO_C" >&6 128858-if test "${ac_cv_alignof_exists+set}" = set; then 128859- echo $ECHO_N "(cached) $ECHO_C" >&6 128860+ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 128861+echo "configure:87918: checking whether the compiler supports __alignof__" >&5 128862+if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then 128863+ echo $ac_n "(cached) $ac_c" 1>&6 128864 else 128865+ 128866+ cat > conftest.$ac_ext <<EOF 128867+#line 87924 "configure" 128868+#include "confdefs.h" 128869 128870- cat >conftest.$ac_ext <<_ACEOF 128871-/* confdefs.h. */ 128872-_ACEOF 128873-cat confdefs.h >>conftest.$ac_ext 128874-cat >>conftest.$ac_ext <<_ACEOF 128875-/* end confdefs.h. */ 128876- 128877- 128878-int 128879-main () 128880-{ 128881+ 128882+int main() { 128883 128884 int align = __alignof__(int); 128885- 128886- ; 128887- return 0; 128888-} 128889-_ACEOF 128890-rm -f conftest.$ac_objext 128891-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 128892- (eval $ac_compile) 2>conftest.er1 128893- ac_status=$? 128894- grep -v '^ *+' conftest.er1 >conftest.err 128895- rm -f conftest.er1 128896- cat conftest.err >&5 128897- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128898- (exit $ac_status); } && 128899- { ac_try='test -z "$ac_c_werror_flag" 128900- || test ! -s conftest.err' 128901- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128902- (eval $ac_try) 2>&5 128903- ac_status=$? 128904- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128905- (exit $ac_status); }; } && 128906- { ac_try='test -s conftest.$ac_objext' 128907- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128908- (eval $ac_try) 2>&5 128909- ac_status=$? 128910- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128911- (exit $ac_status); }; }; then 128912- 128913+ 128914+; return 0; } 128915+EOF 128916+if { (eval echo configure:87934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 128917+ rm -rf conftest* 128918+ 128919 ac_cv_alignof_exists=yes 128920- 128921+ 128922 else 128923- echo "$as_me: failed program was:" >&5 128924-sed 's/^/| /' conftest.$ac_ext >&5 128925- 128926- 128927+ echo "configure: failed program was:" >&5 128928+ cat conftest.$ac_ext >&5 128929+ rm -rf conftest* 128930+ 128931 ac_cv_alignof_exists=no 128932- 128933+ 128934 fi 128935-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 128936+rm -f conftest* 128937 fi 128938-echo "$as_me:$LINENO: result: $ac_cv_alignof_exists" >&5 128939-echo "${ECHO_T}$ac_cv_alignof_exists" >&6 128940- if test "$ac_cv_alignof_exists" = "yes"; then 128941 128942-cat >>confdefs.h <<\_ACEOF 128943+echo "$ac_t""$ac_cv_alignof_exists" 1>&6 128944+ if test "$ac_cv_alignof_exists" = "yes"; then 128945+ cat >> confdefs.h <<\EOF 128946 #define HAVE_ALIGNOF 1 128947-_ACEOF 128948+EOF 128949 128950 fi 128951 128952- echo "$as_me:$LINENO: checking whether the compiler supports aligned attribute" >&5 128953-echo $ECHO_N "checking whether the compiler supports aligned attribute... $ECHO_C" >&6 128954-if test "${ac_cv_attribute_aligned+set}" = set; then 128955- echo $ECHO_N "(cached) $ECHO_C" >&6 128956+ echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 128957+echo "configure:87959: checking whether the compiler supports aligned attribute" >&5 128958+if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then 128959+ echo $ac_n "(cached) $ac_c" 1>&6 128960 else 128961+ 128962+ cat > conftest.$ac_ext <<EOF 128963+#line 87965 "configure" 128964+#include "confdefs.h" 128965 128966- cat >conftest.$ac_ext <<_ACEOF 128967-/* confdefs.h. */ 128968-_ACEOF 128969-cat confdefs.h >>conftest.$ac_ext 128970-cat >>conftest.$ac_ext <<_ACEOF 128971-/* end confdefs.h. */ 128972- 128973- 128974-int 128975-main () 128976-{ 128977+ 128978+int main() { 128979 128980 unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int)))); 128981- 128982- ; 128983- return 0; 128984-} 128985-_ACEOF 128986-rm -f conftest.$ac_objext 128987-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 128988- (eval $ac_compile) 2>conftest.er1 128989- ac_status=$? 128990- grep -v '^ *+' conftest.er1 >conftest.err 128991- rm -f conftest.er1 128992- cat conftest.err >&5 128993- echo "$as_me:$LINENO: \$? = $ac_status" >&5 128994- (exit $ac_status); } && 128995- { ac_try='test -z "$ac_c_werror_flag" 128996- || test ! -s conftest.err' 128997- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 128998- (eval $ac_try) 2>&5 128999- ac_status=$? 129000- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129001- (exit $ac_status); }; } && 129002- { ac_try='test -s conftest.$ac_objext' 129003- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129004- (eval $ac_try) 2>&5 129005- ac_status=$? 129006- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129007- (exit $ac_status); }; }; then 129008- 129009+ 129010+; return 0; } 129011+EOF 129012+if { (eval echo configure:87975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 129013+ rm -rf conftest* 129014+ 129015 ac_cv_attribute_aligned=yes 129016- 129017+ 129018 else 129019- echo "$as_me: failed program was:" >&5 129020-sed 's/^/| /' conftest.$ac_ext >&5 129021- 129022- 129023+ echo "configure: failed program was:" >&5 129024+ cat conftest.$ac_ext >&5 129025+ rm -rf conftest* 129026+ 129027 ac_cv_attribute_aligned=no 129028- 129029+ 129030 fi 129031-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 129032+rm -f conftest* 129033 fi 129034-echo "$as_me:$LINENO: result: $ac_cv_attribute_aligned" >&5 129035-echo "${ECHO_T}$ac_cv_attribute_aligned" >&6 129036- if test "$ac_cv_attribute_aligned" = "yes"; then 129037 129038-cat >>confdefs.h <<\_ACEOF 129039+echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 129040+ if test "$ac_cv_attribute_aligned" = "yes"; then 129041+ cat >> confdefs.h <<\EOF 129042 #define HAVE_ATTRIBUTE_ALIGNED 1 129043-_ACEOF 129044+EOF 129045 129046 fi 129047+ 129048 129049- 129050- 129051-cat >>confdefs.h <<_ACEOF 129052+ cat >> confdefs.h <<EOF 129053 #define PHP_USE_PHP_CRYPT_R 1 129054-_ACEOF 129055- 129056+EOF 129057 129058-cat >>confdefs.h <<_ACEOF 129059+ cat >> confdefs.h <<EOF 129060 #define PHP_STD_DES_CRYPT 1 129061-_ACEOF 129062- 129063+EOF 129064 129065-cat >>confdefs.h <<_ACEOF 129066+ cat >> confdefs.h <<EOF 129067 #define PHP_BLOWFISH_CRYPT 1 129068-_ACEOF 129069- 129070+EOF 129071 129072-cat >>confdefs.h <<_ACEOF 129073+ cat >> confdefs.h <<EOF 129074 #define PHP_EXT_DES_CRYPT 1 129075-_ACEOF 129076- 129077+EOF 129078 129079-cat >>confdefs.h <<_ACEOF 129080+ cat >> confdefs.h <<EOF 129081 #define PHP_MD5_CRYPT 1 129082-_ACEOF 129083- 129084+EOF 129085 129086-cat >>confdefs.h <<_ACEOF 129087+ cat >> confdefs.h <<EOF 129088 #define PHP_SHA512_CRYPT 1 129089-_ACEOF 129090- 129091+EOF 129092 129093-cat >>confdefs.h <<_ACEOF 129094+ cat >> confdefs.h <<EOF 129095 #define PHP_SHA256_CRYPT 1 129096-_ACEOF 129097- 129098- 129099+EOF 129100 129101 129102+ 129103+ 129104 case ext/standard in 129105 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 129106 /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 129107 *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 129108 esac 129109- 129110- 129111+ 129112+ 129113 129114 b_c_pre=$php_c_pre 129115 b_cxx_pre=$php_cxx_pre 129116@@ -112632,12 +88046,12 @@ 129117 129118 old_IFS=$IFS 129119 for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do 129120- 129121+ 129122 IFS=. 129123 set $ac_src 129124 ac_obj=$1 129125 IFS=$old_IFS 129126- 129127+ 129128 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 129129 129130 case $ac_src in 129131@@ -112662,10 +88076,9 @@ 129132 ac_result=0 129133 ac_crypt_des=0 129134 fi 129135- 129136-cat >>confdefs.h <<_ACEOF 129137+ cat >> confdefs.h <<EOF 129138 #define PHP_STD_DES_CRYPT $ac_result 129139-_ACEOF 129140+EOF 129141 129142 129143 if test "$ac_cv_crypt_blowfish" = "yes"; then 129144@@ -112675,10 +88088,9 @@ 129145 ac_result=0 129146 ac_crypt_blowfish=0 129147 fi 129148- 129149-cat >>confdefs.h <<_ACEOF 129150+ cat >> confdefs.h <<EOF 129151 #define PHP_BLOWFISH_CRYPT $ac_result 129152-_ACEOF 129153+EOF 129154 129155 129156 if test "$ac_cv_crypt_ext_des" = "yes"; then 129157@@ -112688,10 +88100,9 @@ 129158 ac_result=0 129159 ac_crypt_edes=0 129160 fi 129161- 129162-cat >>confdefs.h <<_ACEOF 129163+ cat >> confdefs.h <<EOF 129164 #define PHP_EXT_DES_CRYPT $ac_result 129165-_ACEOF 129166+EOF 129167 129168 129169 if test "$ac_cv_crypt_md5" = "yes"; then 129170@@ -112701,12 +88112,11 @@ 129171 ac_result=0 129172 ac_crypt_md5=0 129173 fi 129174- 129175-cat >>confdefs.h <<_ACEOF 129176+ cat >> confdefs.h <<EOF 129177 #define PHP_MD5_CRYPT $ac_result 129178-_ACEOF 129179- 129180- 129181+EOF 129182+ 129183+ 129184 if test "$ac_cv_crypt_sha512" = "yes"; then 129185 ac_result=1 129186 ac_crypt_sha512=1 129187@@ -112714,10 +88124,9 @@ 129188 ac_result=0 129189 ac_crypt_sha512=0 129190 fi 129191- 129192-cat >>confdefs.h <<_ACEOF 129193+ cat >> confdefs.h <<EOF 129194 #define PHP_SHA512_CRYPT $ac_result 129195-_ACEOF 129196+EOF 129197 129198 129199 if test "$ac_cv_crypt_sha256" = "yes"; then 129200@@ -112727,338 +88136,188 @@ 129201 ac_result=0 129202 ac_crypt_sha256=0 129203 fi 129204- 129205-cat >>confdefs.h <<_ACEOF 129206+ cat >> confdefs.h <<EOF 129207 #define PHP_SHA256_CRYPT $ac_result 129208-_ACEOF 129209- 129210+EOF 129211 129212 129213-cat >>confdefs.h <<_ACEOF 129214+ cat >> confdefs.h <<EOF 129215 #define PHP_USE_PHP_CRYPT_R 0 129216-_ACEOF 129217+EOF 129218 129219 fi 129220 129221- 129222- 129223- 129224- 129225- 129226- 129227- 129228- 129229- 129230- 129231- 129232- 129233- 129234- 129235- 129236 for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy 129237 do 129238-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 129239-echo "$as_me:$LINENO: checking for $ac_func" >&5 129240-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 129241-if eval "test \"\${$as_ac_var+set}\" = set"; then 129242- echo $ECHO_N "(cached) $ECHO_C" >&6 129243-else 129244- cat >conftest.$ac_ext <<_ACEOF 129245-/* confdefs.h. */ 129246-_ACEOF 129247-cat confdefs.h >>conftest.$ac_ext 129248-cat >>conftest.$ac_ext <<_ACEOF 129249-/* end confdefs.h. */ 129250-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 129251- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 129252-#define $ac_func innocuous_$ac_func 129253- 129254+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 129255+echo "configure:88154: checking for $ac_func" >&5 129256+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 129257+ echo $ac_n "(cached) $ac_c" 1>&6 129258+else 129259+ cat > conftest.$ac_ext <<EOF 129260+#line 88159 "configure" 129261+#include "confdefs.h" 129262 /* System header to define __stub macros and hopefully few prototypes, 129263- which can conflict with char $ac_func (); below. 129264- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 129265- <limits.h> exists even on freestanding compilers. */ 129266- 129267-#ifdef __STDC__ 129268-# include <limits.h> 129269-#else 129270-# include <assert.h> 129271-#endif 129272- 129273-#undef $ac_func 129274- 129275+ which can conflict with char $ac_func(); below. */ 129276+#include <assert.h> 129277 /* Override any gcc2 internal prototype to avoid an error. */ 129278-#ifdef __cplusplus 129279-extern "C" 129280-{ 129281-#endif 129282 /* We use char because int might match the return type of a gcc2 129283- builtin and then its argument prototype would still apply. */ 129284-char $ac_func (); 129285+ builtin and then its argument prototype would still apply. */ 129286+char $ac_func(); 129287+ 129288+int main() { 129289+ 129290 /* The GNU C library defines this for functions which it implements 129291 to always fail with ENOSYS. Some functions are actually named 129292 something starting with __ and the normal name is an alias. */ 129293 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 129294 choke me 129295 #else 129296-char (*f) () = $ac_func; 129297-#endif 129298-#ifdef __cplusplus 129299-} 129300+$ac_func(); 129301 #endif 129302 129303-int 129304-main () 129305-{ 129306-return f != $ac_func; 129307- ; 129308- return 0; 129309-} 129310-_ACEOF 129311-rm -f conftest.$ac_objext conftest$ac_exeext 129312-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129313- (eval $ac_link) 2>conftest.er1 129314- ac_status=$? 129315- grep -v '^ *+' conftest.er1 >conftest.err 129316- rm -f conftest.er1 129317- cat conftest.err >&5 129318- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129319- (exit $ac_status); } && 129320- { ac_try='test -z "$ac_c_werror_flag" 129321- || test ! -s conftest.err' 129322- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129323- (eval $ac_try) 2>&5 129324- ac_status=$? 129325- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129326- (exit $ac_status); }; } && 129327- { ac_try='test -s conftest$ac_exeext' 129328- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129329- (eval $ac_try) 2>&5 129330- ac_status=$? 129331- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129332- (exit $ac_status); }; }; then 129333- eval "$as_ac_var=yes" 129334-else 129335- echo "$as_me: failed program was:" >&5 129336-sed 's/^/| /' conftest.$ac_ext >&5 129337- 129338-eval "$as_ac_var=no" 129339-fi 129340-rm -f conftest.err conftest.$ac_objext \ 129341- conftest$ac_exeext conftest.$ac_ext 129342-fi 129343-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 129344-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 129345-if test `eval echo '${'$as_ac_var'}'` = yes; then 129346- cat >>confdefs.h <<_ACEOF 129347-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 129348-_ACEOF 129349+; return 0; } 129350+EOF 129351+if { (eval echo configure:88182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129352+ rm -rf conftest* 129353+ eval "ac_cv_func_$ac_func=yes" 129354+else 129355+ echo "configure: failed program was:" >&5 129356+ cat conftest.$ac_ext >&5 129357+ rm -rf conftest* 129358+ eval "ac_cv_func_$ac_func=no" 129359+fi 129360+rm -f conftest* 129361+fi 129362 129363+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 129364+ echo "$ac_t""yes" 1>&6 129365+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 129366+ cat >> confdefs.h <<EOF 129367+#define $ac_tr_func 1 129368+EOF 129369+ 129370+else 129371+ echo "$ac_t""no" 1>&6 129372 fi 129373 done 129374 129375-echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5 129376-echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6 129377-if test "${ac_cv_func_fnmatch_works+set}" = set; then 129378- echo $ECHO_N "(cached) $ECHO_C" >&6 129379-else 129380- # Some versions of Solaris, SCO, and the GNU C Library 129381- # have a broken or incompatible fnmatch. 129382- # So we run a test program. If we are cross-compiling, take no chance. 129383- # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test. 129384- if test "$cross_compiling" = yes; then 129385- ac_cv_func_fnmatch_works=cross 129386-else 129387- cat >conftest.$ac_ext <<_ACEOF 129388-/* confdefs.h. */ 129389-_ACEOF 129390-cat confdefs.h >>conftest.$ac_ext 129391-cat >>conftest.$ac_ext <<_ACEOF 129392-/* end confdefs.h. */ 129393-#include <fnmatch.h> 129394-# define y(a, b, c) (fnmatch (a, b, c) == 0) 129395-# define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH) 129396- 129397-int 129398-main () 129399-{ 129400-exit 129401- (!(y ("a*", "abc", 0) 129402- && n ("d*/*1", "d/s/1", FNM_PATHNAME) 129403- && y ("a\\\\bc", "abc", 0) 129404- && n ("a\\\\bc", "abc", FNM_NOESCAPE) 129405- && y ("*x", ".x", 0) 129406- && n ("*x", ".x", FNM_PERIOD) 129407- && 1)); 129408- ; 129409- return 0; 129410-} 129411-_ACEOF 129412-rm -f conftest$ac_exeext 129413-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129414- (eval $ac_link) 2>&5 129415- ac_status=$? 129416- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129417- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 129418- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129419- (eval $ac_try) 2>&5 129420- ac_status=$? 129421- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129422- (exit $ac_status); }; }; then 129423+echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 129424+echo "configure:88207: checking for working fnmatch" >&5 129425+if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then 129426+ echo $ac_n "(cached) $ac_c" 1>&6 129427+else 129428+ # Some versions of Solaris or SCO have a broken fnmatch function. 129429+# So we run a test program. If we are cross-compiling, take no chance. 129430+# Thanks to John Oleynick and Franc,ois Pinard for this test. 129431+if test "$cross_compiling" = yes; then 129432+ ac_cv_func_fnmatch_works=no 129433+else 129434+ cat > conftest.$ac_ext <<EOF 129435+#line 88218 "configure" 129436+#include "confdefs.h" 129437+main() { exit (fnmatch ("a*", "abc", 0) != 0); } 129438+EOF 129439+if { (eval echo configure:88222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 129440+then 129441 ac_cv_func_fnmatch_works=yes 129442 else 129443- echo "$as_me: program exited with status $ac_status" >&5 129444-echo "$as_me: failed program was:" >&5 129445-sed 's/^/| /' conftest.$ac_ext >&5 129446- 129447-( exit $ac_status ) 129448-ac_cv_func_fnmatch_works=no 129449+ echo "configure: failed program was:" >&5 129450+ cat conftest.$ac_ext >&5 129451+ rm -fr conftest* 129452+ ac_cv_func_fnmatch_works=no 129453 fi 129454-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 129455+rm -fr conftest* 129456 fi 129457+ 129458 fi 129459-echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_works" >&5 129460-echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6 129461-if test $ac_cv_func_fnmatch_works = yes; then 129462 129463-cat >>confdefs.h <<\_ACEOF 129464+echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 129465+if test $ac_cv_func_fnmatch_works = yes; then 129466+ cat >> confdefs.h <<\EOF 129467 #define HAVE_FNMATCH 1 129468-_ACEOF 129469+EOF 129470 129471 fi 129472- 129473- 129474- 129475- 129476+ 129477 129478 129479 for ac_func in fork CreateProcess 129480 do 129481-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 129482-echo "$as_me:$LINENO: checking for $ac_func" >&5 129483-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 129484-if eval "test \"\${$as_ac_var+set}\" = set"; then 129485- echo $ECHO_N "(cached) $ECHO_C" >&6 129486-else 129487- cat >conftest.$ac_ext <<_ACEOF 129488-/* confdefs.h. */ 129489-_ACEOF 129490-cat confdefs.h >>conftest.$ac_ext 129491-cat >>conftest.$ac_ext <<_ACEOF 129492-/* end confdefs.h. */ 129493-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 129494- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 129495-#define $ac_func innocuous_$ac_func 129496- 129497+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 129498+echo "configure:88249: checking for $ac_func" >&5 129499+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 129500+ echo $ac_n "(cached) $ac_c" 1>&6 129501+else 129502+ cat > conftest.$ac_ext <<EOF 129503+#line 88254 "configure" 129504+#include "confdefs.h" 129505 /* System header to define __stub macros and hopefully few prototypes, 129506- which can conflict with char $ac_func (); below. 129507- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 129508- <limits.h> exists even on freestanding compilers. */ 129509- 129510-#ifdef __STDC__ 129511-# include <limits.h> 129512-#else 129513-# include <assert.h> 129514-#endif 129515- 129516-#undef $ac_func 129517- 129518+ which can conflict with char $ac_func(); below. */ 129519+#include <assert.h> 129520 /* Override any gcc2 internal prototype to avoid an error. */ 129521-#ifdef __cplusplus 129522-extern "C" 129523-{ 129524-#endif 129525 /* We use char because int might match the return type of a gcc2 129526- builtin and then its argument prototype would still apply. */ 129527-char $ac_func (); 129528+ builtin and then its argument prototype would still apply. */ 129529+char $ac_func(); 129530+ 129531+int main() { 129532+ 129533 /* The GNU C library defines this for functions which it implements 129534 to always fail with ENOSYS. Some functions are actually named 129535 something starting with __ and the normal name is an alias. */ 129536 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 129537 choke me 129538 #else 129539-char (*f) () = $ac_func; 129540-#endif 129541-#ifdef __cplusplus 129542-} 129543+$ac_func(); 129544 #endif 129545 129546-int 129547-main () 129548-{ 129549-return f != $ac_func; 129550- ; 129551- return 0; 129552-} 129553-_ACEOF 129554-rm -f conftest.$ac_objext conftest$ac_exeext 129555-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129556- (eval $ac_link) 2>conftest.er1 129557- ac_status=$? 129558- grep -v '^ *+' conftest.er1 >conftest.err 129559- rm -f conftest.er1 129560- cat conftest.err >&5 129561- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129562- (exit $ac_status); } && 129563- { ac_try='test -z "$ac_c_werror_flag" 129564- || test ! -s conftest.err' 129565- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129566- (eval $ac_try) 2>&5 129567- ac_status=$? 129568- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129569- (exit $ac_status); }; } && 129570- { ac_try='test -s conftest$ac_exeext' 129571- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129572- (eval $ac_try) 2>&5 129573- ac_status=$? 129574- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129575- (exit $ac_status); }; }; then 129576- eval "$as_ac_var=yes" 129577-else 129578- echo "$as_me: failed program was:" >&5 129579-sed 's/^/| /' conftest.$ac_ext >&5 129580- 129581-eval "$as_ac_var=no" 129582-fi 129583-rm -f conftest.err conftest.$ac_objext \ 129584- conftest$ac_exeext conftest.$ac_ext 129585-fi 129586-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 129587-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 129588-if test `eval echo '${'$as_ac_var'}'` = yes; then 129589- cat >>confdefs.h <<_ACEOF 129590-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 129591-_ACEOF 129592+; return 0; } 129593+EOF 129594+if { (eval echo configure:88277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129595+ rm -rf conftest* 129596+ eval "ac_cv_func_$ac_func=yes" 129597+else 129598+ echo "configure: failed program was:" >&5 129599+ cat conftest.$ac_ext >&5 129600+ rm -rf conftest* 129601+ eval "ac_cv_func_$ac_func=no" 129602+fi 129603+rm -f conftest* 129604+fi 129605 129606+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 129607+ echo "$ac_t""yes" 1>&6 129608+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 129609+ cat >> confdefs.h <<EOF 129610+#define $ac_tr_func 1 129611+EOF 129612+ 129613 php_can_support_proc_open=yes 129614 break 129615 129616 else 129617- 129618- php_can_support_proc_open=no 129619+ echo "$ac_t""no" 1>&6 129620+php_can_support_proc_open=no 129621 129622 fi 129623 done 129624 129625-echo "$as_me:$LINENO: checking if your OS can spawn processes with inherited handles" >&5 129626-echo $ECHO_N "checking if your OS can spawn processes with inherited handles... $ECHO_C" >&6 129627+echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 129628+echo "configure:88307: checking if your OS can spawn processes with inherited handles" >&5 129629 if test "$php_can_support_proc_open" = "yes"; then 129630- echo "$as_me:$LINENO: result: yes" >&5 129631-echo "${ECHO_T}yes" >&6 129632- 129633-cat >>confdefs.h <<\_ACEOF 129634+ echo "$ac_t""yes" 1>&6 129635+ cat >> confdefs.h <<\EOF 129636 #define PHP_CAN_SUPPORT_PROC_OPEN 1 129637-_ACEOF 129638+EOF 129639 129640 else 129641- echo "$as_me:$LINENO: result: no" >&5 129642-echo "${ECHO_T}no" >&6 129643+ echo "$ac_t""no" 1>&6 129644 fi 129645 129646 if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then 129647- 129648-cat >>confdefs.h <<\_ACEOF 129649+ cat >> confdefs.h <<\EOF 129650 #define ENABLE_CHROOT_FUNC 1 129651-_ACEOF 129652+EOF 129653 129654 fi 129655 129656@@ -113066,353 +88325,200 @@ 129657 unset ac_cv_func_res_nsearch 129658 unset ac_cv_func___res_nsearch 129659 unset found 129660- 129661- echo "$as_me:$LINENO: checking for res_nsearch" >&5 129662-echo $ECHO_N "checking for res_nsearch... $ECHO_C" >&6 129663-if test "${ac_cv_func_res_nsearch+set}" = set; then 129664- echo $ECHO_N "(cached) $ECHO_C" >&6 129665-else 129666- cat >conftest.$ac_ext <<_ACEOF 129667-/* confdefs.h. */ 129668-_ACEOF 129669-cat confdefs.h >>conftest.$ac_ext 129670-cat >>conftest.$ac_ext <<_ACEOF 129671-/* end confdefs.h. */ 129672-/* Define res_nsearch to an innocuous variant, in case <limits.h> declares res_nsearch. 129673- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 129674-#define res_nsearch innocuous_res_nsearch 129675- 129676+ 129677+ echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 129678+echo "configure:88331: checking for res_nsearch" >&5 129679+if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then 129680+ echo $ac_n "(cached) $ac_c" 1>&6 129681+else 129682+ cat > conftest.$ac_ext <<EOF 129683+#line 88336 "configure" 129684+#include "confdefs.h" 129685 /* System header to define __stub macros and hopefully few prototypes, 129686- which can conflict with char res_nsearch (); below. 129687- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 129688- <limits.h> exists even on freestanding compilers. */ 129689- 129690-#ifdef __STDC__ 129691-# include <limits.h> 129692-#else 129693-# include <assert.h> 129694-#endif 129695- 129696-#undef res_nsearch 129697- 129698+ which can conflict with char res_nsearch(); below. */ 129699+#include <assert.h> 129700 /* Override any gcc2 internal prototype to avoid an error. */ 129701-#ifdef __cplusplus 129702-extern "C" 129703-{ 129704-#endif 129705 /* We use char because int might match the return type of a gcc2 129706- builtin and then its argument prototype would still apply. */ 129707-char res_nsearch (); 129708+ builtin and then its argument prototype would still apply. */ 129709+char res_nsearch(); 129710+ 129711+int main() { 129712+ 129713 /* The GNU C library defines this for functions which it implements 129714 to always fail with ENOSYS. Some functions are actually named 129715 something starting with __ and the normal name is an alias. */ 129716 #if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) 129717 choke me 129718 #else 129719-char (*f) () = res_nsearch; 129720-#endif 129721-#ifdef __cplusplus 129722-} 129723+res_nsearch(); 129724 #endif 129725 129726-int 129727-main () 129728-{ 129729-return f != res_nsearch; 129730- ; 129731- return 0; 129732-} 129733-_ACEOF 129734-rm -f conftest.$ac_objext conftest$ac_exeext 129735-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129736- (eval $ac_link) 2>conftest.er1 129737- ac_status=$? 129738- grep -v '^ *+' conftest.er1 >conftest.err 129739- rm -f conftest.er1 129740- cat conftest.err >&5 129741- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129742- (exit $ac_status); } && 129743- { ac_try='test -z "$ac_c_werror_flag" 129744- || test ! -s conftest.err' 129745- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129746- (eval $ac_try) 2>&5 129747- ac_status=$? 129748- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129749- (exit $ac_status); }; } && 129750- { ac_try='test -s conftest$ac_exeext' 129751- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129752- (eval $ac_try) 2>&5 129753- ac_status=$? 129754- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129755- (exit $ac_status); }; }; then 129756- ac_cv_func_res_nsearch=yes 129757-else 129758- echo "$as_me: failed program was:" >&5 129759-sed 's/^/| /' conftest.$ac_ext >&5 129760- 129761-ac_cv_func_res_nsearch=no 129762-fi 129763-rm -f conftest.err conftest.$ac_objext \ 129764- conftest$ac_exeext conftest.$ac_ext 129765-fi 129766-echo "$as_me:$LINENO: result: $ac_cv_func_res_nsearch" >&5 129767-echo "${ECHO_T}$ac_cv_func_res_nsearch" >&6 129768-if test $ac_cv_func_res_nsearch = yes; then 129769- found=yes 129770+; return 0; } 129771+EOF 129772+if { (eval echo configure:88359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129773+ rm -rf conftest* 129774+ eval "ac_cv_func_res_nsearch=yes" 129775 else 129776- echo "$as_me:$LINENO: checking for __res_nsearch" >&5 129777-echo $ECHO_N "checking for __res_nsearch... $ECHO_C" >&6 129778-if test "${ac_cv_func___res_nsearch+set}" = set; then 129779- echo $ECHO_N "(cached) $ECHO_C" >&6 129780-else 129781- cat >conftest.$ac_ext <<_ACEOF 129782-/* confdefs.h. */ 129783-_ACEOF 129784-cat confdefs.h >>conftest.$ac_ext 129785-cat >>conftest.$ac_ext <<_ACEOF 129786-/* end confdefs.h. */ 129787-/* Define __res_nsearch to an innocuous variant, in case <limits.h> declares __res_nsearch. 129788- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 129789-#define __res_nsearch innocuous___res_nsearch 129790+ echo "configure: failed program was:" >&5 129791+ cat conftest.$ac_ext >&5 129792+ rm -rf conftest* 129793+ eval "ac_cv_func_res_nsearch=no" 129794+fi 129795+rm -f conftest* 129796+fi 129797 129798+if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then 129799+ echo "$ac_t""yes" 1>&6 129800+ found=yes 129801+else 129802+ echo "$ac_t""no" 1>&6 129803+ echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 129804+echo "configure:88377: checking for __res_nsearch" >&5 129805+if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then 129806+ echo $ac_n "(cached) $ac_c" 1>&6 129807+else 129808+ cat > conftest.$ac_ext <<EOF 129809+#line 88382 "configure" 129810+#include "confdefs.h" 129811 /* System header to define __stub macros and hopefully few prototypes, 129812- which can conflict with char __res_nsearch (); below. 129813- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 129814- <limits.h> exists even on freestanding compilers. */ 129815- 129816-#ifdef __STDC__ 129817-# include <limits.h> 129818-#else 129819-# include <assert.h> 129820-#endif 129821- 129822-#undef __res_nsearch 129823- 129824+ which can conflict with char __res_nsearch(); below. */ 129825+#include <assert.h> 129826 /* Override any gcc2 internal prototype to avoid an error. */ 129827-#ifdef __cplusplus 129828-extern "C" 129829-{ 129830-#endif 129831 /* We use char because int might match the return type of a gcc2 129832- builtin and then its argument prototype would still apply. */ 129833-char __res_nsearch (); 129834+ builtin and then its argument prototype would still apply. */ 129835+char __res_nsearch(); 129836+ 129837+int main() { 129838+ 129839 /* The GNU C library defines this for functions which it implements 129840 to always fail with ENOSYS. Some functions are actually named 129841 something starting with __ and the normal name is an alias. */ 129842 #if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) 129843 choke me 129844 #else 129845-char (*f) () = __res_nsearch; 129846-#endif 129847-#ifdef __cplusplus 129848-} 129849+__res_nsearch(); 129850 #endif 129851 129852-int 129853-main () 129854-{ 129855-return f != __res_nsearch; 129856- ; 129857- return 0; 129858-} 129859-_ACEOF 129860-rm -f conftest.$ac_objext conftest$ac_exeext 129861-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129862- (eval $ac_link) 2>conftest.er1 129863- ac_status=$? 129864- grep -v '^ *+' conftest.er1 >conftest.err 129865- rm -f conftest.er1 129866- cat conftest.err >&5 129867- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129868- (exit $ac_status); } && 129869- { ac_try='test -z "$ac_c_werror_flag" 129870- || test ! -s conftest.err' 129871- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129872- (eval $ac_try) 2>&5 129873- ac_status=$? 129874- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129875- (exit $ac_status); }; } && 129876- { ac_try='test -s conftest$ac_exeext' 129877- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129878- (eval $ac_try) 2>&5 129879- ac_status=$? 129880- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129881- (exit $ac_status); }; }; then 129882- ac_cv_func___res_nsearch=yes 129883-else 129884- echo "$as_me: failed program was:" >&5 129885-sed 's/^/| /' conftest.$ac_ext >&5 129886- 129887-ac_cv_func___res_nsearch=no 129888-fi 129889-rm -f conftest.err conftest.$ac_objext \ 129890- conftest$ac_exeext conftest.$ac_ext 129891-fi 129892-echo "$as_me:$LINENO: result: $ac_cv_func___res_nsearch" >&5 129893-echo "${ECHO_T}$ac_cv_func___res_nsearch" >&6 129894-if test $ac_cv_func___res_nsearch = yes; then 129895- found=yes 129896+; return 0; } 129897+EOF 129898+if { (eval echo configure:88405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 129899+ rm -rf conftest* 129900+ eval "ac_cv_func___res_nsearch=yes" 129901 else 129902- found=no 129903+ echo "configure: failed program was:" >&5 129904+ cat conftest.$ac_ext >&5 129905+ rm -rf conftest* 129906+ eval "ac_cv_func___res_nsearch=no" 129907+fi 129908+rm -f conftest* 129909 fi 129910 129911+if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then 129912+ echo "$ac_t""yes" 1>&6 129913+ found=yes 129914+else 129915+ echo "$ac_t""no" 1>&6 129916+found=no 129917+fi 129918+ 129919 fi 129920 129921 129922 case $found in 129923- yes) 129924- 129925-cat >>confdefs.h <<\_ACEOF 129926+ yes) 129927+ cat >> confdefs.h <<\EOF 129928 #define HAVE_RES_NSEARCH 1 129929-_ACEOF 129930+EOF 129931 129932 ac_cv_func_res_nsearch=yes 129933 ;; 129934- 129935- *) 129936- 129937+ 129938+ *) 129939+ 129940 unset ac_cv_lib_resolv_res_nsearch 129941 unset ac_cv_lib_resolv___res_nsearch 129942 unset found 129943- echo "$as_me:$LINENO: checking for res_nsearch in -lresolv" >&5 129944-echo $ECHO_N "checking for res_nsearch in -lresolv... $ECHO_C" >&6 129945-if test "${ac_cv_lib_resolv_res_nsearch+set}" = set; then 129946- echo $ECHO_N "(cached) $ECHO_C" >&6 129947+ echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 129948+echo "configure:88443: checking for res_nsearch in -lresolv" >&5 129949+ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` 129950+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 129951+ echo $ac_n "(cached) $ac_c" 1>&6 129952 else 129953- ac_check_lib_save_LIBS=$LIBS 129954+ ac_save_LIBS="$LIBS" 129955 LIBS="-lresolv $LIBS" 129956-cat >conftest.$ac_ext <<_ACEOF 129957-/* confdefs.h. */ 129958-_ACEOF 129959-cat confdefs.h >>conftest.$ac_ext 129960-cat >>conftest.$ac_ext <<_ACEOF 129961-/* end confdefs.h. */ 129962- 129963+cat > conftest.$ac_ext <<EOF 129964+#line 88451 "configure" 129965+#include "confdefs.h" 129966 /* Override any gcc2 internal prototype to avoid an error. */ 129967-#ifdef __cplusplus 129968-extern "C" 129969-#endif 129970 /* We use char because int might match the return type of a gcc2 129971- builtin and then its argument prototype would still apply. */ 129972-char res_nsearch (); 129973-int 129974-main () 129975-{ 129976-res_nsearch (); 129977- ; 129978- return 0; 129979-} 129980-_ACEOF 129981-rm -f conftest.$ac_objext conftest$ac_exeext 129982-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 129983- (eval $ac_link) 2>conftest.er1 129984- ac_status=$? 129985- grep -v '^ *+' conftest.er1 >conftest.err 129986- rm -f conftest.er1 129987- cat conftest.err >&5 129988- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129989- (exit $ac_status); } && 129990- { ac_try='test -z "$ac_c_werror_flag" 129991- || test ! -s conftest.err' 129992- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129993- (eval $ac_try) 2>&5 129994- ac_status=$? 129995- echo "$as_me:$LINENO: \$? = $ac_status" >&5 129996- (exit $ac_status); }; } && 129997- { ac_try='test -s conftest$ac_exeext' 129998- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 129999- (eval $ac_try) 2>&5 130000- ac_status=$? 130001- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130002- (exit $ac_status); }; }; then 130003- ac_cv_lib_resolv_res_nsearch=yes 130004-else 130005- echo "$as_me: failed program was:" >&5 130006-sed 's/^/| /' conftest.$ac_ext >&5 130007- 130008-ac_cv_lib_resolv_res_nsearch=no 130009-fi 130010-rm -f conftest.err conftest.$ac_objext \ 130011- conftest$ac_exeext conftest.$ac_ext 130012-LIBS=$ac_check_lib_save_LIBS 130013-fi 130014-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_nsearch" >&5 130015-echo "${ECHO_T}$ac_cv_lib_resolv_res_nsearch" >&6 130016-if test $ac_cv_lib_resolv_res_nsearch = yes; then 130017+ builtin and then its argument prototype would still apply. */ 130018+char res_nsearch(); 130019+ 130020+int main() { 130021+res_nsearch() 130022+; return 0; } 130023+EOF 130024+if { (eval echo configure:88462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130025+ rm -rf conftest* 130026+ eval "ac_cv_lib_$ac_lib_var=yes" 130027+else 130028+ echo "configure: failed program was:" >&5 130029+ cat conftest.$ac_ext >&5 130030+ rm -rf conftest* 130031+ eval "ac_cv_lib_$ac_lib_var=no" 130032+fi 130033+rm -f conftest* 130034+LIBS="$ac_save_LIBS" 130035+ 130036+fi 130037+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130038+ echo "$ac_t""yes" 1>&6 130039 found=yes 130040 else 130041+ echo "$ac_t""no" 1>&6 130042 130043- echo "$as_me:$LINENO: checking for __res_nsearch in -lresolv" >&5 130044-echo $ECHO_N "checking for __res_nsearch in -lresolv... $ECHO_C" >&6 130045-if test "${ac_cv_lib_resolv___res_nsearch+set}" = set; then 130046- echo $ECHO_N "(cached) $ECHO_C" >&6 130047+ echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 130048+echo "configure:88482: checking for __res_nsearch in -lresolv" >&5 130049+ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` 130050+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130051+ echo $ac_n "(cached) $ac_c" 1>&6 130052 else 130053- ac_check_lib_save_LIBS=$LIBS 130054+ ac_save_LIBS="$LIBS" 130055 LIBS="-lresolv $LIBS" 130056-cat >conftest.$ac_ext <<_ACEOF 130057-/* confdefs.h. */ 130058-_ACEOF 130059-cat confdefs.h >>conftest.$ac_ext 130060-cat >>conftest.$ac_ext <<_ACEOF 130061-/* end confdefs.h. */ 130062- 130063+cat > conftest.$ac_ext <<EOF 130064+#line 88490 "configure" 130065+#include "confdefs.h" 130066 /* Override any gcc2 internal prototype to avoid an error. */ 130067-#ifdef __cplusplus 130068-extern "C" 130069-#endif 130070 /* We use char because int might match the return type of a gcc2 130071- builtin and then its argument prototype would still apply. */ 130072-char __res_nsearch (); 130073-int 130074-main () 130075-{ 130076-__res_nsearch (); 130077- ; 130078- return 0; 130079-} 130080-_ACEOF 130081-rm -f conftest.$ac_objext conftest$ac_exeext 130082-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130083- (eval $ac_link) 2>conftest.er1 130084- ac_status=$? 130085- grep -v '^ *+' conftest.er1 >conftest.err 130086- rm -f conftest.er1 130087- cat conftest.err >&5 130088- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130089- (exit $ac_status); } && 130090- { ac_try='test -z "$ac_c_werror_flag" 130091- || test ! -s conftest.err' 130092- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130093- (eval $ac_try) 2>&5 130094- ac_status=$? 130095- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130096- (exit $ac_status); }; } && 130097- { ac_try='test -s conftest$ac_exeext' 130098- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130099- (eval $ac_try) 2>&5 130100- ac_status=$? 130101- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130102- (exit $ac_status); }; }; then 130103- ac_cv_lib_resolv___res_nsearch=yes 130104-else 130105- echo "$as_me: failed program was:" >&5 130106-sed 's/^/| /' conftest.$ac_ext >&5 130107- 130108-ac_cv_lib_resolv___res_nsearch=no 130109-fi 130110-rm -f conftest.err conftest.$ac_objext \ 130111- conftest$ac_exeext conftest.$ac_ext 130112-LIBS=$ac_check_lib_save_LIBS 130113-fi 130114-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_nsearch" >&5 130115-echo "${ECHO_T}$ac_cv_lib_resolv___res_nsearch" >&6 130116-if test $ac_cv_lib_resolv___res_nsearch = yes; then 130117- found=yes 130118+ builtin and then its argument prototype would still apply. */ 130119+char __res_nsearch(); 130120+ 130121+int main() { 130122+__res_nsearch() 130123+; return 0; } 130124+EOF 130125+if { (eval echo configure:88501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130126+ rm -rf conftest* 130127+ eval "ac_cv_lib_$ac_lib_var=yes" 130128 else 130129- found=no 130130+ echo "configure: failed program was:" >&5 130131+ cat conftest.$ac_ext >&5 130132+ rm -rf conftest* 130133+ eval "ac_cv_lib_$ac_lib_var=no" 130134 fi 130135+rm -f conftest* 130136+LIBS="$ac_save_LIBS" 130137 130138+fi 130139+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130140+ echo "$ac_t""yes" 1>&6 130141+ found=yes 130142+else 130143+ echo "$ac_t""no" 1>&6 130144+found=no 130145+fi 130146 130147+ 130148 fi 130149 130150 130151@@ -113422,206 +88528,133 @@ 130152 if test "$cross_compiling" = yes; then 130153 found=no 130154 else 130155- cat >conftest.$ac_ext <<_ACEOF 130156-/* confdefs.h. */ 130157-_ACEOF 130158-cat confdefs.h >>conftest.$ac_ext 130159-cat >>conftest.$ac_ext <<_ACEOF 130160-/* end confdefs.h. */ 130161+ cat > conftest.$ac_ext <<EOF 130162+#line 88533 "configure" 130163+#include "confdefs.h" 130164 main() { return (0); } 130165-_ACEOF 130166-rm -f conftest$ac_exeext 130167-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130168- (eval $ac_link) 2>&5 130169- ac_status=$? 130170- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130171- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 130172- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130173- (eval $ac_try) 2>&5 130174- ac_status=$? 130175- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130176- (exit $ac_status); }; }; then 130177+EOF 130178+if { (eval echo configure:88537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 130179+then 130180 found=yes 130181 else 130182- echo "$as_me: program exited with status $ac_status" >&5 130183-echo "$as_me: failed program was:" >&5 130184-sed 's/^/| /' conftest.$ac_ext >&5 130185- 130186-( exit $ac_status ) 130187-found=no 130188+ echo "configure: failed program was:" >&5 130189+ cat conftest.$ac_ext >&5 130190+ rm -fr conftest* 130191+ found=no 130192 fi 130193-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 130194+rm -fr conftest* 130195 fi 130196+ 130197 LIBS=$ac_libs 130198 fi 130199 130200 if test "$found" = "yes"; then 130201- 130202- 130203+ 130204+ 130205 case resolv in 130206 c|c_r|pthread*) ;; 130207- *) 130208- LIBS="-lresolv $LIBS" 130209+ *) 130210+ LIBS="-lresolv $LIBS" 130211 ;; 130212 esac 130213 130214 130215- 130216-cat >>confdefs.h <<\_ACEOF 130217+ cat >> confdefs.h <<\EOF 130218 #define HAVE_RES_NSEARCH 1 130219-_ACEOF 130220- 130221+EOF 130222 130223-cat >>confdefs.h <<\_ACEOF 130224+ cat >> confdefs.h <<\EOF 130225 #define HAVE_LIBRESOLV 1 130226-_ACEOF 130227+EOF 130228 130229 ac_cv_func_res_nsearch=yes 130230 else 130231- 130232- 130233+ 130234+ 130235 unset ac_cv_lib_bind_res_nsearch 130236 unset ac_cv_lib_bind___res_nsearch 130237 unset found 130238- echo "$as_me:$LINENO: checking for res_nsearch in -lbind" >&5 130239-echo $ECHO_N "checking for res_nsearch in -lbind... $ECHO_C" >&6 130240-if test "${ac_cv_lib_bind_res_nsearch+set}" = set; then 130241- echo $ECHO_N "(cached) $ECHO_C" >&6 130242+ echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 130243+echo "configure:88579: checking for res_nsearch in -lbind" >&5 130244+ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` 130245+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130246+ echo $ac_n "(cached) $ac_c" 1>&6 130247 else 130248- ac_check_lib_save_LIBS=$LIBS 130249+ ac_save_LIBS="$LIBS" 130250 LIBS="-lbind $LIBS" 130251-cat >conftest.$ac_ext <<_ACEOF 130252-/* confdefs.h. */ 130253-_ACEOF 130254-cat confdefs.h >>conftest.$ac_ext 130255-cat >>conftest.$ac_ext <<_ACEOF 130256-/* end confdefs.h. */ 130257- 130258+cat > conftest.$ac_ext <<EOF 130259+#line 88587 "configure" 130260+#include "confdefs.h" 130261 /* Override any gcc2 internal prototype to avoid an error. */ 130262-#ifdef __cplusplus 130263-extern "C" 130264-#endif 130265 /* We use char because int might match the return type of a gcc2 130266- builtin and then its argument prototype would still apply. */ 130267-char res_nsearch (); 130268-int 130269-main () 130270-{ 130271-res_nsearch (); 130272- ; 130273- return 0; 130274-} 130275-_ACEOF 130276-rm -f conftest.$ac_objext conftest$ac_exeext 130277-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130278- (eval $ac_link) 2>conftest.er1 130279- ac_status=$? 130280- grep -v '^ *+' conftest.er1 >conftest.err 130281- rm -f conftest.er1 130282- cat conftest.err >&5 130283- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130284- (exit $ac_status); } && 130285- { ac_try='test -z "$ac_c_werror_flag" 130286- || test ! -s conftest.err' 130287- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130288- (eval $ac_try) 2>&5 130289- ac_status=$? 130290- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130291- (exit $ac_status); }; } && 130292- { ac_try='test -s conftest$ac_exeext' 130293- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130294- (eval $ac_try) 2>&5 130295- ac_status=$? 130296- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130297- (exit $ac_status); }; }; then 130298- ac_cv_lib_bind_res_nsearch=yes 130299-else 130300- echo "$as_me: failed program was:" >&5 130301-sed 's/^/| /' conftest.$ac_ext >&5 130302- 130303-ac_cv_lib_bind_res_nsearch=no 130304-fi 130305-rm -f conftest.err conftest.$ac_objext \ 130306- conftest$ac_exeext conftest.$ac_ext 130307-LIBS=$ac_check_lib_save_LIBS 130308-fi 130309-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_nsearch" >&5 130310-echo "${ECHO_T}$ac_cv_lib_bind_res_nsearch" >&6 130311-if test $ac_cv_lib_bind_res_nsearch = yes; then 130312+ builtin and then its argument prototype would still apply. */ 130313+char res_nsearch(); 130314+ 130315+int main() { 130316+res_nsearch() 130317+; return 0; } 130318+EOF 130319+if { (eval echo configure:88598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130320+ rm -rf conftest* 130321+ eval "ac_cv_lib_$ac_lib_var=yes" 130322+else 130323+ echo "configure: failed program was:" >&5 130324+ cat conftest.$ac_ext >&5 130325+ rm -rf conftest* 130326+ eval "ac_cv_lib_$ac_lib_var=no" 130327+fi 130328+rm -f conftest* 130329+LIBS="$ac_save_LIBS" 130330+ 130331+fi 130332+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130333+ echo "$ac_t""yes" 1>&6 130334 found=yes 130335 else 130336+ echo "$ac_t""no" 1>&6 130337 130338- echo "$as_me:$LINENO: checking for __res_nsearch in -lbind" >&5 130339-echo $ECHO_N "checking for __res_nsearch in -lbind... $ECHO_C" >&6 130340-if test "${ac_cv_lib_bind___res_nsearch+set}" = set; then 130341- echo $ECHO_N "(cached) $ECHO_C" >&6 130342+ echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 130343+echo "configure:88618: checking for __res_nsearch in -lbind" >&5 130344+ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` 130345+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130346+ echo $ac_n "(cached) $ac_c" 1>&6 130347 else 130348- ac_check_lib_save_LIBS=$LIBS 130349+ ac_save_LIBS="$LIBS" 130350 LIBS="-lbind $LIBS" 130351-cat >conftest.$ac_ext <<_ACEOF 130352-/* confdefs.h. */ 130353-_ACEOF 130354-cat confdefs.h >>conftest.$ac_ext 130355-cat >>conftest.$ac_ext <<_ACEOF 130356-/* end confdefs.h. */ 130357- 130358+cat > conftest.$ac_ext <<EOF 130359+#line 88626 "configure" 130360+#include "confdefs.h" 130361 /* Override any gcc2 internal prototype to avoid an error. */ 130362-#ifdef __cplusplus 130363-extern "C" 130364-#endif 130365 /* We use char because int might match the return type of a gcc2 130366- builtin and then its argument prototype would still apply. */ 130367-char __res_nsearch (); 130368-int 130369-main () 130370-{ 130371-__res_nsearch (); 130372- ; 130373- return 0; 130374-} 130375-_ACEOF 130376-rm -f conftest.$ac_objext conftest$ac_exeext 130377-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130378- (eval $ac_link) 2>conftest.er1 130379- ac_status=$? 130380- grep -v '^ *+' conftest.er1 >conftest.err 130381- rm -f conftest.er1 130382- cat conftest.err >&5 130383- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130384- (exit $ac_status); } && 130385- { ac_try='test -z "$ac_c_werror_flag" 130386- || test ! -s conftest.err' 130387- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130388- (eval $ac_try) 2>&5 130389- ac_status=$? 130390- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130391- (exit $ac_status); }; } && 130392- { ac_try='test -s conftest$ac_exeext' 130393- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130394- (eval $ac_try) 2>&5 130395- ac_status=$? 130396- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130397- (exit $ac_status); }; }; then 130398- ac_cv_lib_bind___res_nsearch=yes 130399-else 130400- echo "$as_me: failed program was:" >&5 130401-sed 's/^/| /' conftest.$ac_ext >&5 130402- 130403-ac_cv_lib_bind___res_nsearch=no 130404-fi 130405-rm -f conftest.err conftest.$ac_objext \ 130406- conftest$ac_exeext conftest.$ac_ext 130407-LIBS=$ac_check_lib_save_LIBS 130408-fi 130409-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_nsearch" >&5 130410-echo "${ECHO_T}$ac_cv_lib_bind___res_nsearch" >&6 130411-if test $ac_cv_lib_bind___res_nsearch = yes; then 130412- found=yes 130413+ builtin and then its argument prototype would still apply. */ 130414+char __res_nsearch(); 130415+ 130416+int main() { 130417+__res_nsearch() 130418+; return 0; } 130419+EOF 130420+if { (eval echo configure:88637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130421+ rm -rf conftest* 130422+ eval "ac_cv_lib_$ac_lib_var=yes" 130423 else 130424- found=no 130425+ echo "configure: failed program was:" >&5 130426+ cat conftest.$ac_ext >&5 130427+ rm -rf conftest* 130428+ eval "ac_cv_lib_$ac_lib_var=no" 130429 fi 130430+rm -f conftest* 130431+LIBS="$ac_save_LIBS" 130432 130433+fi 130434+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130435+ echo "$ac_t""yes" 1>&6 130436+ found=yes 130437+else 130438+ echo "$ac_t""no" 1>&6 130439+found=no 130440+fi 130441 130442+ 130443 fi 130444 130445 130446@@ -113631,206 +88664,133 @@ 130447 if test "$cross_compiling" = yes; then 130448 found=no 130449 else 130450- cat >conftest.$ac_ext <<_ACEOF 130451-/* confdefs.h. */ 130452-_ACEOF 130453-cat confdefs.h >>conftest.$ac_ext 130454-cat >>conftest.$ac_ext <<_ACEOF 130455-/* end confdefs.h. */ 130456+ cat > conftest.$ac_ext <<EOF 130457+#line 88669 "configure" 130458+#include "confdefs.h" 130459 main() { return (0); } 130460-_ACEOF 130461-rm -f conftest$ac_exeext 130462-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130463- (eval $ac_link) 2>&5 130464- ac_status=$? 130465- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130466- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 130467- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130468- (eval $ac_try) 2>&5 130469- ac_status=$? 130470- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130471- (exit $ac_status); }; }; then 130472+EOF 130473+if { (eval echo configure:88673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 130474+then 130475 found=yes 130476 else 130477- echo "$as_me: program exited with status $ac_status" >&5 130478-echo "$as_me: failed program was:" >&5 130479-sed 's/^/| /' conftest.$ac_ext >&5 130480- 130481-( exit $ac_status ) 130482-found=no 130483+ echo "configure: failed program was:" >&5 130484+ cat conftest.$ac_ext >&5 130485+ rm -fr conftest* 130486+ found=no 130487 fi 130488-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 130489+rm -fr conftest* 130490 fi 130491+ 130492 LIBS=$ac_libs 130493 fi 130494 130495 if test "$found" = "yes"; then 130496- 130497- 130498+ 130499+ 130500 case bind in 130501 c|c_r|pthread*) ;; 130502- *) 130503- LIBS="-lbind $LIBS" 130504+ *) 130505+ LIBS="-lbind $LIBS" 130506 ;; 130507 esac 130508 130509 130510- 130511-cat >>confdefs.h <<\_ACEOF 130512+ cat >> confdefs.h <<\EOF 130513 #define HAVE_RES_NSEARCH 1 130514-_ACEOF 130515- 130516+EOF 130517 130518-cat >>confdefs.h <<\_ACEOF 130519+ cat >> confdefs.h <<\EOF 130520 #define HAVE_LIBBIND 1 130521-_ACEOF 130522+EOF 130523 130524 ac_cv_func_res_nsearch=yes 130525 else 130526- 130527- 130528+ 130529+ 130530 unset ac_cv_lib_socket_res_nsearch 130531 unset ac_cv_lib_socket___res_nsearch 130532 unset found 130533- echo "$as_me:$LINENO: checking for res_nsearch in -lsocket" >&5 130534-echo $ECHO_N "checking for res_nsearch in -lsocket... $ECHO_C" >&6 130535-if test "${ac_cv_lib_socket_res_nsearch+set}" = set; then 130536- echo $ECHO_N "(cached) $ECHO_C" >&6 130537+ echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 130538+echo "configure:88715: checking for res_nsearch in -lsocket" >&5 130539+ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` 130540+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130541+ echo $ac_n "(cached) $ac_c" 1>&6 130542 else 130543- ac_check_lib_save_LIBS=$LIBS 130544+ ac_save_LIBS="$LIBS" 130545 LIBS="-lsocket $LIBS" 130546-cat >conftest.$ac_ext <<_ACEOF 130547-/* confdefs.h. */ 130548-_ACEOF 130549-cat confdefs.h >>conftest.$ac_ext 130550-cat >>conftest.$ac_ext <<_ACEOF 130551-/* end confdefs.h. */ 130552- 130553+cat > conftest.$ac_ext <<EOF 130554+#line 88723 "configure" 130555+#include "confdefs.h" 130556 /* Override any gcc2 internal prototype to avoid an error. */ 130557-#ifdef __cplusplus 130558-extern "C" 130559-#endif 130560 /* We use char because int might match the return type of a gcc2 130561- builtin and then its argument prototype would still apply. */ 130562-char res_nsearch (); 130563-int 130564-main () 130565-{ 130566-res_nsearch (); 130567- ; 130568- return 0; 130569-} 130570-_ACEOF 130571-rm -f conftest.$ac_objext conftest$ac_exeext 130572-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130573- (eval $ac_link) 2>conftest.er1 130574- ac_status=$? 130575- grep -v '^ *+' conftest.er1 >conftest.err 130576- rm -f conftest.er1 130577- cat conftest.err >&5 130578- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130579- (exit $ac_status); } && 130580- { ac_try='test -z "$ac_c_werror_flag" 130581- || test ! -s conftest.err' 130582- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130583- (eval $ac_try) 2>&5 130584- ac_status=$? 130585- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130586- (exit $ac_status); }; } && 130587- { ac_try='test -s conftest$ac_exeext' 130588- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130589- (eval $ac_try) 2>&5 130590- ac_status=$? 130591- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130592- (exit $ac_status); }; }; then 130593- ac_cv_lib_socket_res_nsearch=yes 130594-else 130595- echo "$as_me: failed program was:" >&5 130596-sed 's/^/| /' conftest.$ac_ext >&5 130597- 130598-ac_cv_lib_socket_res_nsearch=no 130599-fi 130600-rm -f conftest.err conftest.$ac_objext \ 130601- conftest$ac_exeext conftest.$ac_ext 130602-LIBS=$ac_check_lib_save_LIBS 130603-fi 130604-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_nsearch" >&5 130605-echo "${ECHO_T}$ac_cv_lib_socket_res_nsearch" >&6 130606-if test $ac_cv_lib_socket_res_nsearch = yes; then 130607+ builtin and then its argument prototype would still apply. */ 130608+char res_nsearch(); 130609+ 130610+int main() { 130611+res_nsearch() 130612+; return 0; } 130613+EOF 130614+if { (eval echo configure:88734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130615+ rm -rf conftest* 130616+ eval "ac_cv_lib_$ac_lib_var=yes" 130617+else 130618+ echo "configure: failed program was:" >&5 130619+ cat conftest.$ac_ext >&5 130620+ rm -rf conftest* 130621+ eval "ac_cv_lib_$ac_lib_var=no" 130622+fi 130623+rm -f conftest* 130624+LIBS="$ac_save_LIBS" 130625+ 130626+fi 130627+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130628+ echo "$ac_t""yes" 1>&6 130629 found=yes 130630 else 130631+ echo "$ac_t""no" 1>&6 130632 130633- echo "$as_me:$LINENO: checking for __res_nsearch in -lsocket" >&5 130634-echo $ECHO_N "checking for __res_nsearch in -lsocket... $ECHO_C" >&6 130635-if test "${ac_cv_lib_socket___res_nsearch+set}" = set; then 130636- echo $ECHO_N "(cached) $ECHO_C" >&6 130637+ echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 130638+echo "configure:88754: checking for __res_nsearch in -lsocket" >&5 130639+ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` 130640+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 130641+ echo $ac_n "(cached) $ac_c" 1>&6 130642 else 130643- ac_check_lib_save_LIBS=$LIBS 130644+ ac_save_LIBS="$LIBS" 130645 LIBS="-lsocket $LIBS" 130646-cat >conftest.$ac_ext <<_ACEOF 130647-/* confdefs.h. */ 130648-_ACEOF 130649-cat confdefs.h >>conftest.$ac_ext 130650-cat >>conftest.$ac_ext <<_ACEOF 130651-/* end confdefs.h. */ 130652- 130653+cat > conftest.$ac_ext <<EOF 130654+#line 88762 "configure" 130655+#include "confdefs.h" 130656 /* Override any gcc2 internal prototype to avoid an error. */ 130657-#ifdef __cplusplus 130658-extern "C" 130659-#endif 130660 /* We use char because int might match the return type of a gcc2 130661- builtin and then its argument prototype would still apply. */ 130662-char __res_nsearch (); 130663-int 130664-main () 130665-{ 130666-__res_nsearch (); 130667- ; 130668- return 0; 130669-} 130670-_ACEOF 130671-rm -f conftest.$ac_objext conftest$ac_exeext 130672-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130673- (eval $ac_link) 2>conftest.er1 130674- ac_status=$? 130675- grep -v '^ *+' conftest.er1 >conftest.err 130676- rm -f conftest.er1 130677- cat conftest.err >&5 130678- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130679- (exit $ac_status); } && 130680- { ac_try='test -z "$ac_c_werror_flag" 130681- || test ! -s conftest.err' 130682- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130683- (eval $ac_try) 2>&5 130684- ac_status=$? 130685- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130686- (exit $ac_status); }; } && 130687- { ac_try='test -s conftest$ac_exeext' 130688- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130689- (eval $ac_try) 2>&5 130690- ac_status=$? 130691- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130692- (exit $ac_status); }; }; then 130693- ac_cv_lib_socket___res_nsearch=yes 130694-else 130695- echo "$as_me: failed program was:" >&5 130696-sed 's/^/| /' conftest.$ac_ext >&5 130697- 130698-ac_cv_lib_socket___res_nsearch=no 130699-fi 130700-rm -f conftest.err conftest.$ac_objext \ 130701- conftest$ac_exeext conftest.$ac_ext 130702-LIBS=$ac_check_lib_save_LIBS 130703-fi 130704-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_nsearch" >&5 130705-echo "${ECHO_T}$ac_cv_lib_socket___res_nsearch" >&6 130706-if test $ac_cv_lib_socket___res_nsearch = yes; then 130707+ builtin and then its argument prototype would still apply. */ 130708+char __res_nsearch(); 130709+ 130710+int main() { 130711+__res_nsearch() 130712+; return 0; } 130713+EOF 130714+if { (eval echo configure:88773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130715+ rm -rf conftest* 130716+ eval "ac_cv_lib_$ac_lib_var=yes" 130717+else 130718+ echo "configure: failed program was:" >&5 130719+ cat conftest.$ac_ext >&5 130720+ rm -rf conftest* 130721+ eval "ac_cv_lib_$ac_lib_var=no" 130722+fi 130723+rm -f conftest* 130724+LIBS="$ac_save_LIBS" 130725+ 130726+fi 130727+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 130728+ echo "$ac_t""yes" 1>&6 130729 found=yes 130730 else 130731- found=no 130732+ echo "$ac_t""no" 1>&6 130733+found=no 130734 fi 130735 130736- 130737+ 130738 fi 130739 130740 130741@@ -113840,428 +88800,260 @@ 130742 if test "$cross_compiling" = yes; then 130743 found=no 130744 else 130745- cat >conftest.$ac_ext <<_ACEOF 130746-/* confdefs.h. */ 130747-_ACEOF 130748-cat confdefs.h >>conftest.$ac_ext 130749-cat >>conftest.$ac_ext <<_ACEOF 130750-/* end confdefs.h. */ 130751+ cat > conftest.$ac_ext <<EOF 130752+#line 88805 "configure" 130753+#include "confdefs.h" 130754 main() { return (0); } 130755-_ACEOF 130756-rm -f conftest$ac_exeext 130757-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130758- (eval $ac_link) 2>&5 130759- ac_status=$? 130760- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130761- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 130762- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130763- (eval $ac_try) 2>&5 130764- ac_status=$? 130765- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130766- (exit $ac_status); }; }; then 130767+EOF 130768+if { (eval echo configure:88809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 130769+then 130770 found=yes 130771 else 130772- echo "$as_me: program exited with status $ac_status" >&5 130773-echo "$as_me: failed program was:" >&5 130774-sed 's/^/| /' conftest.$ac_ext >&5 130775- 130776-( exit $ac_status ) 130777-found=no 130778+ echo "configure: failed program was:" >&5 130779+ cat conftest.$ac_ext >&5 130780+ rm -fr conftest* 130781+ found=no 130782 fi 130783-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 130784+rm -fr conftest* 130785 fi 130786+ 130787 LIBS=$ac_libs 130788 fi 130789 130790 if test "$found" = "yes"; then 130791- 130792- 130793+ 130794+ 130795 case socket in 130796 c|c_r|pthread*) ;; 130797- *) 130798- LIBS="-lsocket $LIBS" 130799+ *) 130800+ LIBS="-lsocket $LIBS" 130801 ;; 130802 esac 130803 130804 130805- 130806-cat >>confdefs.h <<\_ACEOF 130807+ cat >> confdefs.h <<\EOF 130808 #define HAVE_RES_NSEARCH 1 130809-_ACEOF 130810- 130811+EOF 130812 130813-cat >>confdefs.h <<\_ACEOF 130814+ cat >> confdefs.h <<\EOF 130815 #define HAVE_LIBSOCKET 1 130816-_ACEOF 130817+EOF 130818 130819 ac_cv_func_res_nsearch=yes 130820 else 130821- 130822+ 130823 : 130824 130825 fi 130826- 130827+ 130828 130829 fi 130830- 130831+ 130832 130833 fi 130834- 130835+ 130836 ;; 130837- 130838+ 130839 esac 130840 130841 130842 unset ac_cv_func_dns_search 130843 unset ac_cv_func___dns_search 130844 unset found 130845- 130846- echo "$as_me:$LINENO: checking for dns_search" >&5 130847-echo $ECHO_N "checking for dns_search... $ECHO_C" >&6 130848-if test "${ac_cv_func_dns_search+set}" = set; then 130849- echo $ECHO_N "(cached) $ECHO_C" >&6 130850-else 130851- cat >conftest.$ac_ext <<_ACEOF 130852-/* confdefs.h. */ 130853-_ACEOF 130854-cat confdefs.h >>conftest.$ac_ext 130855-cat >>conftest.$ac_ext <<_ACEOF 130856-/* end confdefs.h. */ 130857-/* Define dns_search to an innocuous variant, in case <limits.h> declares dns_search. 130858- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 130859-#define dns_search innocuous_dns_search 130860- 130861+ 130862+ echo $ac_n "checking for dns_search""... $ac_c" 1>&6 130863+echo "configure:88866: checking for dns_search" >&5 130864+if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then 130865+ echo $ac_n "(cached) $ac_c" 1>&6 130866+else 130867+ cat > conftest.$ac_ext <<EOF 130868+#line 88871 "configure" 130869+#include "confdefs.h" 130870 /* System header to define __stub macros and hopefully few prototypes, 130871- which can conflict with char dns_search (); below. 130872- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 130873- <limits.h> exists even on freestanding compilers. */ 130874- 130875-#ifdef __STDC__ 130876-# include <limits.h> 130877-#else 130878-# include <assert.h> 130879-#endif 130880- 130881-#undef dns_search 130882- 130883+ which can conflict with char dns_search(); below. */ 130884+#include <assert.h> 130885 /* Override any gcc2 internal prototype to avoid an error. */ 130886-#ifdef __cplusplus 130887-extern "C" 130888-{ 130889-#endif 130890 /* We use char because int might match the return type of a gcc2 130891- builtin and then its argument prototype would still apply. */ 130892-char dns_search (); 130893+ builtin and then its argument prototype would still apply. */ 130894+char dns_search(); 130895+ 130896+int main() { 130897+ 130898 /* The GNU C library defines this for functions which it implements 130899 to always fail with ENOSYS. Some functions are actually named 130900 something starting with __ and the normal name is an alias. */ 130901 #if defined (__stub_dns_search) || defined (__stub___dns_search) 130902 choke me 130903 #else 130904-char (*f) () = dns_search; 130905-#endif 130906-#ifdef __cplusplus 130907-} 130908+dns_search(); 130909 #endif 130910 130911-int 130912-main () 130913-{ 130914-return f != dns_search; 130915- ; 130916- return 0; 130917-} 130918-_ACEOF 130919-rm -f conftest.$ac_objext conftest$ac_exeext 130920-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 130921- (eval $ac_link) 2>conftest.er1 130922- ac_status=$? 130923- grep -v '^ *+' conftest.er1 >conftest.err 130924- rm -f conftest.er1 130925- cat conftest.err >&5 130926- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130927- (exit $ac_status); } && 130928- { ac_try='test -z "$ac_c_werror_flag" 130929- || test ! -s conftest.err' 130930- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130931- (eval $ac_try) 2>&5 130932- ac_status=$? 130933- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130934- (exit $ac_status); }; } && 130935- { ac_try='test -s conftest$ac_exeext' 130936- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 130937- (eval $ac_try) 2>&5 130938- ac_status=$? 130939- echo "$as_me:$LINENO: \$? = $ac_status" >&5 130940- (exit $ac_status); }; }; then 130941- ac_cv_func_dns_search=yes 130942-else 130943- echo "$as_me: failed program was:" >&5 130944-sed 's/^/| /' conftest.$ac_ext >&5 130945- 130946-ac_cv_func_dns_search=no 130947-fi 130948-rm -f conftest.err conftest.$ac_objext \ 130949- conftest$ac_exeext conftest.$ac_ext 130950-fi 130951-echo "$as_me:$LINENO: result: $ac_cv_func_dns_search" >&5 130952-echo "${ECHO_T}$ac_cv_func_dns_search" >&6 130953-if test $ac_cv_func_dns_search = yes; then 130954- found=yes 130955+; return 0; } 130956+EOF 130957+if { (eval echo configure:88894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 130958+ rm -rf conftest* 130959+ eval "ac_cv_func_dns_search=yes" 130960 else 130961- echo "$as_me:$LINENO: checking for __dns_search" >&5 130962-echo $ECHO_N "checking for __dns_search... $ECHO_C" >&6 130963-if test "${ac_cv_func___dns_search+set}" = set; then 130964- echo $ECHO_N "(cached) $ECHO_C" >&6 130965-else 130966- cat >conftest.$ac_ext <<_ACEOF 130967-/* confdefs.h. */ 130968-_ACEOF 130969-cat confdefs.h >>conftest.$ac_ext 130970-cat >>conftest.$ac_ext <<_ACEOF 130971-/* end confdefs.h. */ 130972-/* Define __dns_search to an innocuous variant, in case <limits.h> declares __dns_search. 130973- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 130974-#define __dns_search innocuous___dns_search 130975+ echo "configure: failed program was:" >&5 130976+ cat conftest.$ac_ext >&5 130977+ rm -rf conftest* 130978+ eval "ac_cv_func_dns_search=no" 130979+fi 130980+rm -f conftest* 130981+fi 130982 130983+if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then 130984+ echo "$ac_t""yes" 1>&6 130985+ found=yes 130986+else 130987+ echo "$ac_t""no" 1>&6 130988+ echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 130989+echo "configure:88912: checking for __dns_search" >&5 130990+if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then 130991+ echo $ac_n "(cached) $ac_c" 1>&6 130992+else 130993+ cat > conftest.$ac_ext <<EOF 130994+#line 88917 "configure" 130995+#include "confdefs.h" 130996 /* System header to define __stub macros and hopefully few prototypes, 130997- which can conflict with char __dns_search (); below. 130998- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 130999- <limits.h> exists even on freestanding compilers. */ 131000- 131001-#ifdef __STDC__ 131002-# include <limits.h> 131003-#else 131004-# include <assert.h> 131005-#endif 131006- 131007-#undef __dns_search 131008- 131009+ which can conflict with char __dns_search(); below. */ 131010+#include <assert.h> 131011 /* Override any gcc2 internal prototype to avoid an error. */ 131012-#ifdef __cplusplus 131013-extern "C" 131014-{ 131015-#endif 131016 /* We use char because int might match the return type of a gcc2 131017- builtin and then its argument prototype would still apply. */ 131018-char __dns_search (); 131019+ builtin and then its argument prototype would still apply. */ 131020+char __dns_search(); 131021+ 131022+int main() { 131023+ 131024 /* The GNU C library defines this for functions which it implements 131025 to always fail with ENOSYS. Some functions are actually named 131026 something starting with __ and the normal name is an alias. */ 131027 #if defined (__stub___dns_search) || defined (__stub_____dns_search) 131028 choke me 131029 #else 131030-char (*f) () = __dns_search; 131031-#endif 131032-#ifdef __cplusplus 131033-} 131034+__dns_search(); 131035 #endif 131036 131037-int 131038-main () 131039-{ 131040-return f != __dns_search; 131041- ; 131042- return 0; 131043-} 131044-_ACEOF 131045-rm -f conftest.$ac_objext conftest$ac_exeext 131046-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131047- (eval $ac_link) 2>conftest.er1 131048- ac_status=$? 131049- grep -v '^ *+' conftest.er1 >conftest.err 131050- rm -f conftest.er1 131051- cat conftest.err >&5 131052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131053- (exit $ac_status); } && 131054- { ac_try='test -z "$ac_c_werror_flag" 131055- || test ! -s conftest.err' 131056- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131057- (eval $ac_try) 2>&5 131058- ac_status=$? 131059- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131060- (exit $ac_status); }; } && 131061- { ac_try='test -s conftest$ac_exeext' 131062- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131063- (eval $ac_try) 2>&5 131064- ac_status=$? 131065- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131066- (exit $ac_status); }; }; then 131067- ac_cv_func___dns_search=yes 131068-else 131069- echo "$as_me: failed program was:" >&5 131070-sed 's/^/| /' conftest.$ac_ext >&5 131071- 131072-ac_cv_func___dns_search=no 131073-fi 131074-rm -f conftest.err conftest.$ac_objext \ 131075- conftest$ac_exeext conftest.$ac_ext 131076-fi 131077-echo "$as_me:$LINENO: result: $ac_cv_func___dns_search" >&5 131078-echo "${ECHO_T}$ac_cv_func___dns_search" >&6 131079-if test $ac_cv_func___dns_search = yes; then 131080- found=yes 131081+; return 0; } 131082+EOF 131083+if { (eval echo configure:88940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131084+ rm -rf conftest* 131085+ eval "ac_cv_func___dns_search=yes" 131086 else 131087- found=no 131088+ echo "configure: failed program was:" >&5 131089+ cat conftest.$ac_ext >&5 131090+ rm -rf conftest* 131091+ eval "ac_cv_func___dns_search=no" 131092+fi 131093+rm -f conftest* 131094 fi 131095 131096+if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then 131097+ echo "$ac_t""yes" 1>&6 131098+ found=yes 131099+else 131100+ echo "$ac_t""no" 1>&6 131101+found=no 131102+fi 131103+ 131104 fi 131105 131106 131107 case $found in 131108- yes) 131109- 131110-cat >>confdefs.h <<\_ACEOF 131111+ yes) 131112+ cat >> confdefs.h <<\EOF 131113 #define HAVE_DNS_SEARCH 1 131114-_ACEOF 131115+EOF 131116 131117 ac_cv_func_dns_search=yes 131118 ;; 131119- 131120- *) 131121- 131122+ 131123+ *) 131124+ 131125 unset ac_cv_lib_resolv_dns_search 131126 unset ac_cv_lib_resolv___dns_search 131127 unset found 131128- echo "$as_me:$LINENO: checking for dns_search in -lresolv" >&5 131129-echo $ECHO_N "checking for dns_search in -lresolv... $ECHO_C" >&6 131130-if test "${ac_cv_lib_resolv_dns_search+set}" = set; then 131131- echo $ECHO_N "(cached) $ECHO_C" >&6 131132+ echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 131133+echo "configure:88978: checking for dns_search in -lresolv" >&5 131134+ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'` 131135+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131136+ echo $ac_n "(cached) $ac_c" 1>&6 131137 else 131138- ac_check_lib_save_LIBS=$LIBS 131139+ ac_save_LIBS="$LIBS" 131140 LIBS="-lresolv $LIBS" 131141-cat >conftest.$ac_ext <<_ACEOF 131142-/* confdefs.h. */ 131143-_ACEOF 131144-cat confdefs.h >>conftest.$ac_ext 131145-cat >>conftest.$ac_ext <<_ACEOF 131146-/* end confdefs.h. */ 131147- 131148+cat > conftest.$ac_ext <<EOF 131149+#line 88986 "configure" 131150+#include "confdefs.h" 131151 /* Override any gcc2 internal prototype to avoid an error. */ 131152-#ifdef __cplusplus 131153-extern "C" 131154-#endif 131155 /* We use char because int might match the return type of a gcc2 131156- builtin and then its argument prototype would still apply. */ 131157-char dns_search (); 131158-int 131159-main () 131160-{ 131161-dns_search (); 131162- ; 131163- return 0; 131164-} 131165-_ACEOF 131166-rm -f conftest.$ac_objext conftest$ac_exeext 131167-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131168- (eval $ac_link) 2>conftest.er1 131169- ac_status=$? 131170- grep -v '^ *+' conftest.er1 >conftest.err 131171- rm -f conftest.er1 131172- cat conftest.err >&5 131173- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131174- (exit $ac_status); } && 131175- { ac_try='test -z "$ac_c_werror_flag" 131176- || test ! -s conftest.err' 131177- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131178- (eval $ac_try) 2>&5 131179- ac_status=$? 131180- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131181- (exit $ac_status); }; } && 131182- { ac_try='test -s conftest$ac_exeext' 131183- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131184- (eval $ac_try) 2>&5 131185- ac_status=$? 131186- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131187- (exit $ac_status); }; }; then 131188- ac_cv_lib_resolv_dns_search=yes 131189-else 131190- echo "$as_me: failed program was:" >&5 131191-sed 's/^/| /' conftest.$ac_ext >&5 131192- 131193-ac_cv_lib_resolv_dns_search=no 131194-fi 131195-rm -f conftest.err conftest.$ac_objext \ 131196- conftest$ac_exeext conftest.$ac_ext 131197-LIBS=$ac_check_lib_save_LIBS 131198-fi 131199-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dns_search" >&5 131200-echo "${ECHO_T}$ac_cv_lib_resolv_dns_search" >&6 131201-if test $ac_cv_lib_resolv_dns_search = yes; then 131202+ builtin and then its argument prototype would still apply. */ 131203+char dns_search(); 131204+ 131205+int main() { 131206+dns_search() 131207+; return 0; } 131208+EOF 131209+if { (eval echo configure:88997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131210+ rm -rf conftest* 131211+ eval "ac_cv_lib_$ac_lib_var=yes" 131212+else 131213+ echo "configure: failed program was:" >&5 131214+ cat conftest.$ac_ext >&5 131215+ rm -rf conftest* 131216+ eval "ac_cv_lib_$ac_lib_var=no" 131217+fi 131218+rm -f conftest* 131219+LIBS="$ac_save_LIBS" 131220+ 131221+fi 131222+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131223+ echo "$ac_t""yes" 1>&6 131224 found=yes 131225 else 131226+ echo "$ac_t""no" 1>&6 131227 131228- echo "$as_me:$LINENO: checking for __dns_search in -lresolv" >&5 131229-echo $ECHO_N "checking for __dns_search in -lresolv... $ECHO_C" >&6 131230-if test "${ac_cv_lib_resolv___dns_search+set}" = set; then 131231- echo $ECHO_N "(cached) $ECHO_C" >&6 131232+ echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 131233+echo "configure:89017: checking for __dns_search in -lresolv" >&5 131234+ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'` 131235+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131236+ echo $ac_n "(cached) $ac_c" 1>&6 131237 else 131238- ac_check_lib_save_LIBS=$LIBS 131239+ ac_save_LIBS="$LIBS" 131240 LIBS="-lresolv $LIBS" 131241-cat >conftest.$ac_ext <<_ACEOF 131242-/* confdefs.h. */ 131243-_ACEOF 131244-cat confdefs.h >>conftest.$ac_ext 131245-cat >>conftest.$ac_ext <<_ACEOF 131246-/* end confdefs.h. */ 131247- 131248+cat > conftest.$ac_ext <<EOF 131249+#line 89025 "configure" 131250+#include "confdefs.h" 131251 /* Override any gcc2 internal prototype to avoid an error. */ 131252-#ifdef __cplusplus 131253-extern "C" 131254-#endif 131255 /* We use char because int might match the return type of a gcc2 131256- builtin and then its argument prototype would still apply. */ 131257-char __dns_search (); 131258-int 131259-main () 131260-{ 131261-__dns_search (); 131262- ; 131263- return 0; 131264-} 131265-_ACEOF 131266-rm -f conftest.$ac_objext conftest$ac_exeext 131267-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131268- (eval $ac_link) 2>conftest.er1 131269- ac_status=$? 131270- grep -v '^ *+' conftest.er1 >conftest.err 131271- rm -f conftest.er1 131272- cat conftest.err >&5 131273- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131274- (exit $ac_status); } && 131275- { ac_try='test -z "$ac_c_werror_flag" 131276- || test ! -s conftest.err' 131277- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131278- (eval $ac_try) 2>&5 131279- ac_status=$? 131280- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131281- (exit $ac_status); }; } && 131282- { ac_try='test -s conftest$ac_exeext' 131283- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131284- (eval $ac_try) 2>&5 131285- ac_status=$? 131286- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131287- (exit $ac_status); }; }; then 131288- ac_cv_lib_resolv___dns_search=yes 131289-else 131290- echo "$as_me: failed program was:" >&5 131291-sed 's/^/| /' conftest.$ac_ext >&5 131292- 131293-ac_cv_lib_resolv___dns_search=no 131294-fi 131295-rm -f conftest.err conftest.$ac_objext \ 131296- conftest$ac_exeext conftest.$ac_ext 131297-LIBS=$ac_check_lib_save_LIBS 131298-fi 131299-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dns_search" >&5 131300-echo "${ECHO_T}$ac_cv_lib_resolv___dns_search" >&6 131301-if test $ac_cv_lib_resolv___dns_search = yes; then 131302- found=yes 131303+ builtin and then its argument prototype would still apply. */ 131304+char __dns_search(); 131305+ 131306+int main() { 131307+__dns_search() 131308+; return 0; } 131309+EOF 131310+if { (eval echo configure:89036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131311+ rm -rf conftest* 131312+ eval "ac_cv_lib_$ac_lib_var=yes" 131313 else 131314- found=no 131315+ echo "configure: failed program was:" >&5 131316+ cat conftest.$ac_ext >&5 131317+ rm -rf conftest* 131318+ eval "ac_cv_lib_$ac_lib_var=no" 131319 fi 131320+rm -f conftest* 131321+LIBS="$ac_save_LIBS" 131322 131323+fi 131324+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131325+ echo "$ac_t""yes" 1>&6 131326+ found=yes 131327+else 131328+ echo "$ac_t""no" 1>&6 131329+found=no 131330+fi 131331 131332+ 131333 fi 131334 131335 131336@@ -114271,206 +89063,133 @@ 131337 if test "$cross_compiling" = yes; then 131338 found=no 131339 else 131340- cat >conftest.$ac_ext <<_ACEOF 131341-/* confdefs.h. */ 131342-_ACEOF 131343-cat confdefs.h >>conftest.$ac_ext 131344-cat >>conftest.$ac_ext <<_ACEOF 131345-/* end confdefs.h. */ 131346+ cat > conftest.$ac_ext <<EOF 131347+#line 89068 "configure" 131348+#include "confdefs.h" 131349 main() { return (0); } 131350-_ACEOF 131351-rm -f conftest$ac_exeext 131352-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131353- (eval $ac_link) 2>&5 131354- ac_status=$? 131355- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131356- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 131357- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131358- (eval $ac_try) 2>&5 131359- ac_status=$? 131360- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131361- (exit $ac_status); }; }; then 131362+EOF 131363+if { (eval echo configure:89072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131364+then 131365 found=yes 131366 else 131367- echo "$as_me: program exited with status $ac_status" >&5 131368-echo "$as_me: failed program was:" >&5 131369-sed 's/^/| /' conftest.$ac_ext >&5 131370- 131371-( exit $ac_status ) 131372-found=no 131373+ echo "configure: failed program was:" >&5 131374+ cat conftest.$ac_ext >&5 131375+ rm -fr conftest* 131376+ found=no 131377 fi 131378-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 131379+rm -fr conftest* 131380 fi 131381+ 131382 LIBS=$ac_libs 131383 fi 131384 131385 if test "$found" = "yes"; then 131386- 131387- 131388+ 131389+ 131390 case resolv in 131391 c|c_r|pthread*) ;; 131392- *) 131393- LIBS="-lresolv $LIBS" 131394+ *) 131395+ LIBS="-lresolv $LIBS" 131396 ;; 131397 esac 131398 131399 131400- 131401-cat >>confdefs.h <<\_ACEOF 131402+ cat >> confdefs.h <<\EOF 131403 #define HAVE_DNS_SEARCH 1 131404-_ACEOF 131405- 131406+EOF 131407 131408-cat >>confdefs.h <<\_ACEOF 131409+ cat >> confdefs.h <<\EOF 131410 #define HAVE_LIBRESOLV 1 131411-_ACEOF 131412+EOF 131413 131414 ac_cv_func_dns_search=yes 131415 else 131416- 131417- 131418+ 131419+ 131420 unset ac_cv_lib_bind_dns_search 131421 unset ac_cv_lib_bind___dns_search 131422 unset found 131423- echo "$as_me:$LINENO: checking for dns_search in -lbind" >&5 131424-echo $ECHO_N "checking for dns_search in -lbind... $ECHO_C" >&6 131425-if test "${ac_cv_lib_bind_dns_search+set}" = set; then 131426- echo $ECHO_N "(cached) $ECHO_C" >&6 131427+ echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 131428+echo "configure:89114: checking for dns_search in -lbind" >&5 131429+ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'` 131430+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131431+ echo $ac_n "(cached) $ac_c" 1>&6 131432 else 131433- ac_check_lib_save_LIBS=$LIBS 131434+ ac_save_LIBS="$LIBS" 131435 LIBS="-lbind $LIBS" 131436-cat >conftest.$ac_ext <<_ACEOF 131437-/* confdefs.h. */ 131438-_ACEOF 131439-cat confdefs.h >>conftest.$ac_ext 131440-cat >>conftest.$ac_ext <<_ACEOF 131441-/* end confdefs.h. */ 131442- 131443+cat > conftest.$ac_ext <<EOF 131444+#line 89122 "configure" 131445+#include "confdefs.h" 131446 /* Override any gcc2 internal prototype to avoid an error. */ 131447-#ifdef __cplusplus 131448-extern "C" 131449-#endif 131450 /* We use char because int might match the return type of a gcc2 131451- builtin and then its argument prototype would still apply. */ 131452-char dns_search (); 131453-int 131454-main () 131455-{ 131456-dns_search (); 131457- ; 131458- return 0; 131459-} 131460-_ACEOF 131461-rm -f conftest.$ac_objext conftest$ac_exeext 131462-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131463- (eval $ac_link) 2>conftest.er1 131464- ac_status=$? 131465- grep -v '^ *+' conftest.er1 >conftest.err 131466- rm -f conftest.er1 131467- cat conftest.err >&5 131468- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131469- (exit $ac_status); } && 131470- { ac_try='test -z "$ac_c_werror_flag" 131471- || test ! -s conftest.err' 131472- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131473- (eval $ac_try) 2>&5 131474- ac_status=$? 131475- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131476- (exit $ac_status); }; } && 131477- { ac_try='test -s conftest$ac_exeext' 131478- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131479- (eval $ac_try) 2>&5 131480- ac_status=$? 131481- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131482- (exit $ac_status); }; }; then 131483- ac_cv_lib_bind_dns_search=yes 131484-else 131485- echo "$as_me: failed program was:" >&5 131486-sed 's/^/| /' conftest.$ac_ext >&5 131487- 131488-ac_cv_lib_bind_dns_search=no 131489-fi 131490-rm -f conftest.err conftest.$ac_objext \ 131491- conftest$ac_exeext conftest.$ac_ext 131492-LIBS=$ac_check_lib_save_LIBS 131493-fi 131494-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dns_search" >&5 131495-echo "${ECHO_T}$ac_cv_lib_bind_dns_search" >&6 131496-if test $ac_cv_lib_bind_dns_search = yes; then 131497+ builtin and then its argument prototype would still apply. */ 131498+char dns_search(); 131499+ 131500+int main() { 131501+dns_search() 131502+; return 0; } 131503+EOF 131504+if { (eval echo configure:89133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131505+ rm -rf conftest* 131506+ eval "ac_cv_lib_$ac_lib_var=yes" 131507+else 131508+ echo "configure: failed program was:" >&5 131509+ cat conftest.$ac_ext >&5 131510+ rm -rf conftest* 131511+ eval "ac_cv_lib_$ac_lib_var=no" 131512+fi 131513+rm -f conftest* 131514+LIBS="$ac_save_LIBS" 131515+ 131516+fi 131517+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131518+ echo "$ac_t""yes" 1>&6 131519 found=yes 131520 else 131521+ echo "$ac_t""no" 1>&6 131522 131523- echo "$as_me:$LINENO: checking for __dns_search in -lbind" >&5 131524-echo $ECHO_N "checking for __dns_search in -lbind... $ECHO_C" >&6 131525-if test "${ac_cv_lib_bind___dns_search+set}" = set; then 131526- echo $ECHO_N "(cached) $ECHO_C" >&6 131527+ echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 131528+echo "configure:89153: checking for __dns_search in -lbind" >&5 131529+ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` 131530+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131531+ echo $ac_n "(cached) $ac_c" 1>&6 131532 else 131533- ac_check_lib_save_LIBS=$LIBS 131534+ ac_save_LIBS="$LIBS" 131535 LIBS="-lbind $LIBS" 131536-cat >conftest.$ac_ext <<_ACEOF 131537-/* confdefs.h. */ 131538-_ACEOF 131539-cat confdefs.h >>conftest.$ac_ext 131540-cat >>conftest.$ac_ext <<_ACEOF 131541-/* end confdefs.h. */ 131542- 131543+cat > conftest.$ac_ext <<EOF 131544+#line 89161 "configure" 131545+#include "confdefs.h" 131546 /* Override any gcc2 internal prototype to avoid an error. */ 131547-#ifdef __cplusplus 131548-extern "C" 131549-#endif 131550 /* We use char because int might match the return type of a gcc2 131551- builtin and then its argument prototype would still apply. */ 131552-char __dns_search (); 131553-int 131554-main () 131555-{ 131556-__dns_search (); 131557- ; 131558- return 0; 131559-} 131560-_ACEOF 131561-rm -f conftest.$ac_objext conftest$ac_exeext 131562-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131563- (eval $ac_link) 2>conftest.er1 131564- ac_status=$? 131565- grep -v '^ *+' conftest.er1 >conftest.err 131566- rm -f conftest.er1 131567- cat conftest.err >&5 131568- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131569- (exit $ac_status); } && 131570- { ac_try='test -z "$ac_c_werror_flag" 131571- || test ! -s conftest.err' 131572- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131573- (eval $ac_try) 2>&5 131574- ac_status=$? 131575- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131576- (exit $ac_status); }; } && 131577- { ac_try='test -s conftest$ac_exeext' 131578- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131579- (eval $ac_try) 2>&5 131580- ac_status=$? 131581- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131582- (exit $ac_status); }; }; then 131583- ac_cv_lib_bind___dns_search=yes 131584-else 131585- echo "$as_me: failed program was:" >&5 131586-sed 's/^/| /' conftest.$ac_ext >&5 131587- 131588-ac_cv_lib_bind___dns_search=no 131589-fi 131590-rm -f conftest.err conftest.$ac_objext \ 131591- conftest$ac_exeext conftest.$ac_ext 131592-LIBS=$ac_check_lib_save_LIBS 131593-fi 131594-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dns_search" >&5 131595-echo "${ECHO_T}$ac_cv_lib_bind___dns_search" >&6 131596-if test $ac_cv_lib_bind___dns_search = yes; then 131597- found=yes 131598+ builtin and then its argument prototype would still apply. */ 131599+char __dns_search(); 131600+ 131601+int main() { 131602+__dns_search() 131603+; return 0; } 131604+EOF 131605+if { (eval echo configure:89172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131606+ rm -rf conftest* 131607+ eval "ac_cv_lib_$ac_lib_var=yes" 131608 else 131609- found=no 131610+ echo "configure: failed program was:" >&5 131611+ cat conftest.$ac_ext >&5 131612+ rm -rf conftest* 131613+ eval "ac_cv_lib_$ac_lib_var=no" 131614 fi 131615+rm -f conftest* 131616+LIBS="$ac_save_LIBS" 131617 131618+fi 131619+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131620+ echo "$ac_t""yes" 1>&6 131621+ found=yes 131622+else 131623+ echo "$ac_t""no" 1>&6 131624+found=no 131625+fi 131626 131627+ 131628 fi 131629 131630 131631@@ -114480,206 +89199,133 @@ 131632 if test "$cross_compiling" = yes; then 131633 found=no 131634 else 131635- cat >conftest.$ac_ext <<_ACEOF 131636-/* confdefs.h. */ 131637-_ACEOF 131638-cat confdefs.h >>conftest.$ac_ext 131639-cat >>conftest.$ac_ext <<_ACEOF 131640-/* end confdefs.h. */ 131641+ cat > conftest.$ac_ext <<EOF 131642+#line 89204 "configure" 131643+#include "confdefs.h" 131644 main() { return (0); } 131645-_ACEOF 131646-rm -f conftest$ac_exeext 131647-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131648- (eval $ac_link) 2>&5 131649- ac_status=$? 131650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131651- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 131652- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131653- (eval $ac_try) 2>&5 131654- ac_status=$? 131655- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131656- (exit $ac_status); }; }; then 131657+EOF 131658+if { (eval echo configure:89208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131659+then 131660 found=yes 131661 else 131662- echo "$as_me: program exited with status $ac_status" >&5 131663-echo "$as_me: failed program was:" >&5 131664-sed 's/^/| /' conftest.$ac_ext >&5 131665- 131666-( exit $ac_status ) 131667-found=no 131668+ echo "configure: failed program was:" >&5 131669+ cat conftest.$ac_ext >&5 131670+ rm -fr conftest* 131671+ found=no 131672 fi 131673-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 131674+rm -fr conftest* 131675 fi 131676+ 131677 LIBS=$ac_libs 131678 fi 131679 131680 if test "$found" = "yes"; then 131681- 131682- 131683+ 131684+ 131685 case bind in 131686 c|c_r|pthread*) ;; 131687- *) 131688- LIBS="-lbind $LIBS" 131689+ *) 131690+ LIBS="-lbind $LIBS" 131691 ;; 131692 esac 131693 131694 131695- 131696-cat >>confdefs.h <<\_ACEOF 131697+ cat >> confdefs.h <<\EOF 131698 #define HAVE_DNS_SEARCH 1 131699-_ACEOF 131700- 131701+EOF 131702 131703-cat >>confdefs.h <<\_ACEOF 131704+ cat >> confdefs.h <<\EOF 131705 #define HAVE_LIBBIND 1 131706-_ACEOF 131707+EOF 131708 131709 ac_cv_func_dns_search=yes 131710 else 131711- 131712- 131713+ 131714+ 131715 unset ac_cv_lib_socket_dns_search 131716 unset ac_cv_lib_socket___dns_search 131717 unset found 131718- echo "$as_me:$LINENO: checking for dns_search in -lsocket" >&5 131719-echo $ECHO_N "checking for dns_search in -lsocket... $ECHO_C" >&6 131720-if test "${ac_cv_lib_socket_dns_search+set}" = set; then 131721- echo $ECHO_N "(cached) $ECHO_C" >&6 131722+ echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 131723+echo "configure:89250: checking for dns_search in -lsocket" >&5 131724+ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'` 131725+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131726+ echo $ac_n "(cached) $ac_c" 1>&6 131727 else 131728- ac_check_lib_save_LIBS=$LIBS 131729+ ac_save_LIBS="$LIBS" 131730 LIBS="-lsocket $LIBS" 131731-cat >conftest.$ac_ext <<_ACEOF 131732-/* confdefs.h. */ 131733-_ACEOF 131734-cat confdefs.h >>conftest.$ac_ext 131735-cat >>conftest.$ac_ext <<_ACEOF 131736-/* end confdefs.h. */ 131737- 131738+cat > conftest.$ac_ext <<EOF 131739+#line 89258 "configure" 131740+#include "confdefs.h" 131741 /* Override any gcc2 internal prototype to avoid an error. */ 131742-#ifdef __cplusplus 131743-extern "C" 131744-#endif 131745 /* We use char because int might match the return type of a gcc2 131746- builtin and then its argument prototype would still apply. */ 131747-char dns_search (); 131748-int 131749-main () 131750-{ 131751-dns_search (); 131752- ; 131753- return 0; 131754-} 131755-_ACEOF 131756-rm -f conftest.$ac_objext conftest$ac_exeext 131757-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131758- (eval $ac_link) 2>conftest.er1 131759- ac_status=$? 131760- grep -v '^ *+' conftest.er1 >conftest.err 131761- rm -f conftest.er1 131762- cat conftest.err >&5 131763- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131764- (exit $ac_status); } && 131765- { ac_try='test -z "$ac_c_werror_flag" 131766- || test ! -s conftest.err' 131767- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131768- (eval $ac_try) 2>&5 131769- ac_status=$? 131770- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131771- (exit $ac_status); }; } && 131772- { ac_try='test -s conftest$ac_exeext' 131773- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131774- (eval $ac_try) 2>&5 131775- ac_status=$? 131776- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131777- (exit $ac_status); }; }; then 131778- ac_cv_lib_socket_dns_search=yes 131779-else 131780- echo "$as_me: failed program was:" >&5 131781-sed 's/^/| /' conftest.$ac_ext >&5 131782- 131783-ac_cv_lib_socket_dns_search=no 131784-fi 131785-rm -f conftest.err conftest.$ac_objext \ 131786- conftest$ac_exeext conftest.$ac_ext 131787-LIBS=$ac_check_lib_save_LIBS 131788-fi 131789-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dns_search" >&5 131790-echo "${ECHO_T}$ac_cv_lib_socket_dns_search" >&6 131791-if test $ac_cv_lib_socket_dns_search = yes; then 131792+ builtin and then its argument prototype would still apply. */ 131793+char dns_search(); 131794+ 131795+int main() { 131796+dns_search() 131797+; return 0; } 131798+EOF 131799+if { (eval echo configure:89269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131800+ rm -rf conftest* 131801+ eval "ac_cv_lib_$ac_lib_var=yes" 131802+else 131803+ echo "configure: failed program was:" >&5 131804+ cat conftest.$ac_ext >&5 131805+ rm -rf conftest* 131806+ eval "ac_cv_lib_$ac_lib_var=no" 131807+fi 131808+rm -f conftest* 131809+LIBS="$ac_save_LIBS" 131810+ 131811+fi 131812+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131813+ echo "$ac_t""yes" 1>&6 131814 found=yes 131815 else 131816+ echo "$ac_t""no" 1>&6 131817 131818- echo "$as_me:$LINENO: checking for __dns_search in -lsocket" >&5 131819-echo $ECHO_N "checking for __dns_search in -lsocket... $ECHO_C" >&6 131820-if test "${ac_cv_lib_socket___dns_search+set}" = set; then 131821- echo $ECHO_N "(cached) $ECHO_C" >&6 131822+ echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 131823+echo "configure:89289: checking for __dns_search in -lsocket" >&5 131824+ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'` 131825+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 131826+ echo $ac_n "(cached) $ac_c" 1>&6 131827 else 131828- ac_check_lib_save_LIBS=$LIBS 131829+ ac_save_LIBS="$LIBS" 131830 LIBS="-lsocket $LIBS" 131831-cat >conftest.$ac_ext <<_ACEOF 131832-/* confdefs.h. */ 131833-_ACEOF 131834-cat confdefs.h >>conftest.$ac_ext 131835-cat >>conftest.$ac_ext <<_ACEOF 131836-/* end confdefs.h. */ 131837- 131838+cat > conftest.$ac_ext <<EOF 131839+#line 89297 "configure" 131840+#include "confdefs.h" 131841 /* Override any gcc2 internal prototype to avoid an error. */ 131842-#ifdef __cplusplus 131843-extern "C" 131844-#endif 131845 /* We use char because int might match the return type of a gcc2 131846- builtin and then its argument prototype would still apply. */ 131847-char __dns_search (); 131848-int 131849-main () 131850-{ 131851-__dns_search (); 131852- ; 131853- return 0; 131854-} 131855-_ACEOF 131856-rm -f conftest.$ac_objext conftest$ac_exeext 131857-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131858- (eval $ac_link) 2>conftest.er1 131859- ac_status=$? 131860- grep -v '^ *+' conftest.er1 >conftest.err 131861- rm -f conftest.er1 131862- cat conftest.err >&5 131863- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131864- (exit $ac_status); } && 131865- { ac_try='test -z "$ac_c_werror_flag" 131866- || test ! -s conftest.err' 131867- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131868- (eval $ac_try) 2>&5 131869- ac_status=$? 131870- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131871- (exit $ac_status); }; } && 131872- { ac_try='test -s conftest$ac_exeext' 131873- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131874- (eval $ac_try) 2>&5 131875- ac_status=$? 131876- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131877- (exit $ac_status); }; }; then 131878- ac_cv_lib_socket___dns_search=yes 131879-else 131880- echo "$as_me: failed program was:" >&5 131881-sed 's/^/| /' conftest.$ac_ext >&5 131882- 131883-ac_cv_lib_socket___dns_search=no 131884-fi 131885-rm -f conftest.err conftest.$ac_objext \ 131886- conftest$ac_exeext conftest.$ac_ext 131887-LIBS=$ac_check_lib_save_LIBS 131888-fi 131889-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dns_search" >&5 131890-echo "${ECHO_T}$ac_cv_lib_socket___dns_search" >&6 131891-if test $ac_cv_lib_socket___dns_search = yes; then 131892- found=yes 131893+ builtin and then its argument prototype would still apply. */ 131894+char __dns_search(); 131895+ 131896+int main() { 131897+__dns_search() 131898+; return 0; } 131899+EOF 131900+if { (eval echo configure:89308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 131901+ rm -rf conftest* 131902+ eval "ac_cv_lib_$ac_lib_var=yes" 131903 else 131904- found=no 131905+ echo "configure: failed program was:" >&5 131906+ cat conftest.$ac_ext >&5 131907+ rm -rf conftest* 131908+ eval "ac_cv_lib_$ac_lib_var=no" 131909 fi 131910+rm -f conftest* 131911+LIBS="$ac_save_LIBS" 131912 131913+fi 131914+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 131915+ echo "$ac_t""yes" 1>&6 131916+ found=yes 131917+else 131918+ echo "$ac_t""no" 1>&6 131919+found=no 131920+fi 131921 131922+ 131923 fi 131924 131925 131926@@ -114689,428 +89335,260 @@ 131927 if test "$cross_compiling" = yes; then 131928 found=no 131929 else 131930- cat >conftest.$ac_ext <<_ACEOF 131931-/* confdefs.h. */ 131932-_ACEOF 131933-cat confdefs.h >>conftest.$ac_ext 131934-cat >>conftest.$ac_ext <<_ACEOF 131935-/* end confdefs.h. */ 131936+ cat > conftest.$ac_ext <<EOF 131937+#line 89340 "configure" 131938+#include "confdefs.h" 131939 main() { return (0); } 131940-_ACEOF 131941-rm -f conftest$ac_exeext 131942-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 131943- (eval $ac_link) 2>&5 131944- ac_status=$? 131945- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131946- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 131947- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 131948- (eval $ac_try) 2>&5 131949- ac_status=$? 131950- echo "$as_me:$LINENO: \$? = $ac_status" >&5 131951- (exit $ac_status); }; }; then 131952+EOF 131953+if { (eval echo configure:89344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 131954+then 131955 found=yes 131956 else 131957- echo "$as_me: program exited with status $ac_status" >&5 131958-echo "$as_me: failed program was:" >&5 131959-sed 's/^/| /' conftest.$ac_ext >&5 131960- 131961-( exit $ac_status ) 131962-found=no 131963+ echo "configure: failed program was:" >&5 131964+ cat conftest.$ac_ext >&5 131965+ rm -fr conftest* 131966+ found=no 131967 fi 131968-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 131969+rm -fr conftest* 131970 fi 131971+ 131972 LIBS=$ac_libs 131973 fi 131974 131975 if test "$found" = "yes"; then 131976- 131977- 131978+ 131979+ 131980 case socket in 131981 c|c_r|pthread*) ;; 131982- *) 131983- LIBS="-lsocket $LIBS" 131984+ *) 131985+ LIBS="-lsocket $LIBS" 131986 ;; 131987 esac 131988 131989 131990- 131991-cat >>confdefs.h <<\_ACEOF 131992+ cat >> confdefs.h <<\EOF 131993 #define HAVE_DNS_SEARCH 1 131994-_ACEOF 131995- 131996+EOF 131997 131998-cat >>confdefs.h <<\_ACEOF 131999+ cat >> confdefs.h <<\EOF 132000 #define HAVE_LIBSOCKET 1 132001-_ACEOF 132002+EOF 132003 132004 ac_cv_func_dns_search=yes 132005 else 132006- 132007+ 132008 : 132009 132010 fi 132011- 132012+ 132013 132014 fi 132015- 132016+ 132017 132018 fi 132019- 132020+ 132021 ;; 132022- 132023+ 132024 esac 132025 132026 132027 unset ac_cv_func_dn_expand 132028 unset ac_cv_func___dn_expand 132029 unset found 132030- 132031- echo "$as_me:$LINENO: checking for dn_expand" >&5 132032-echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6 132033-if test "${ac_cv_func_dn_expand+set}" = set; then 132034- echo $ECHO_N "(cached) $ECHO_C" >&6 132035-else 132036- cat >conftest.$ac_ext <<_ACEOF 132037-/* confdefs.h. */ 132038-_ACEOF 132039-cat confdefs.h >>conftest.$ac_ext 132040-cat >>conftest.$ac_ext <<_ACEOF 132041-/* end confdefs.h. */ 132042-/* Define dn_expand to an innocuous variant, in case <limits.h> declares dn_expand. 132043- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 132044-#define dn_expand innocuous_dn_expand 132045- 132046+ 132047+ echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 132048+echo "configure:89401: checking for dn_expand" >&5 132049+if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then 132050+ echo $ac_n "(cached) $ac_c" 1>&6 132051+else 132052+ cat > conftest.$ac_ext <<EOF 132053+#line 89406 "configure" 132054+#include "confdefs.h" 132055 /* System header to define __stub macros and hopefully few prototypes, 132056- which can conflict with char dn_expand (); below. 132057- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 132058- <limits.h> exists even on freestanding compilers. */ 132059- 132060-#ifdef __STDC__ 132061-# include <limits.h> 132062-#else 132063-# include <assert.h> 132064-#endif 132065- 132066-#undef dn_expand 132067- 132068+ which can conflict with char dn_expand(); below. */ 132069+#include <assert.h> 132070 /* Override any gcc2 internal prototype to avoid an error. */ 132071-#ifdef __cplusplus 132072-extern "C" 132073-{ 132074-#endif 132075 /* We use char because int might match the return type of a gcc2 132076- builtin and then its argument prototype would still apply. */ 132077-char dn_expand (); 132078+ builtin and then its argument prototype would still apply. */ 132079+char dn_expand(); 132080+ 132081+int main() { 132082+ 132083 /* The GNU C library defines this for functions which it implements 132084 to always fail with ENOSYS. Some functions are actually named 132085 something starting with __ and the normal name is an alias. */ 132086 #if defined (__stub_dn_expand) || defined (__stub___dn_expand) 132087 choke me 132088 #else 132089-char (*f) () = dn_expand; 132090-#endif 132091-#ifdef __cplusplus 132092-} 132093+dn_expand(); 132094 #endif 132095 132096-int 132097-main () 132098-{ 132099-return f != dn_expand; 132100- ; 132101- return 0; 132102-} 132103-_ACEOF 132104-rm -f conftest.$ac_objext conftest$ac_exeext 132105-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132106- (eval $ac_link) 2>conftest.er1 132107- ac_status=$? 132108- grep -v '^ *+' conftest.er1 >conftest.err 132109- rm -f conftest.er1 132110- cat conftest.err >&5 132111- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132112- (exit $ac_status); } && 132113- { ac_try='test -z "$ac_c_werror_flag" 132114- || test ! -s conftest.err' 132115- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132116- (eval $ac_try) 2>&5 132117- ac_status=$? 132118- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132119- (exit $ac_status); }; } && 132120- { ac_try='test -s conftest$ac_exeext' 132121- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132122- (eval $ac_try) 2>&5 132123- ac_status=$? 132124- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132125- (exit $ac_status); }; }; then 132126- ac_cv_func_dn_expand=yes 132127-else 132128- echo "$as_me: failed program was:" >&5 132129-sed 's/^/| /' conftest.$ac_ext >&5 132130- 132131-ac_cv_func_dn_expand=no 132132-fi 132133-rm -f conftest.err conftest.$ac_objext \ 132134- conftest$ac_exeext conftest.$ac_ext 132135-fi 132136-echo "$as_me:$LINENO: result: $ac_cv_func_dn_expand" >&5 132137-echo "${ECHO_T}$ac_cv_func_dn_expand" >&6 132138-if test $ac_cv_func_dn_expand = yes; then 132139- found=yes 132140+; return 0; } 132141+EOF 132142+if { (eval echo configure:89429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132143+ rm -rf conftest* 132144+ eval "ac_cv_func_dn_expand=yes" 132145 else 132146- echo "$as_me:$LINENO: checking for __dn_expand" >&5 132147-echo $ECHO_N "checking for __dn_expand... $ECHO_C" >&6 132148-if test "${ac_cv_func___dn_expand+set}" = set; then 132149- echo $ECHO_N "(cached) $ECHO_C" >&6 132150-else 132151- cat >conftest.$ac_ext <<_ACEOF 132152-/* confdefs.h. */ 132153-_ACEOF 132154-cat confdefs.h >>conftest.$ac_ext 132155-cat >>conftest.$ac_ext <<_ACEOF 132156-/* end confdefs.h. */ 132157-/* Define __dn_expand to an innocuous variant, in case <limits.h> declares __dn_expand. 132158- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 132159-#define __dn_expand innocuous___dn_expand 132160+ echo "configure: failed program was:" >&5 132161+ cat conftest.$ac_ext >&5 132162+ rm -rf conftest* 132163+ eval "ac_cv_func_dn_expand=no" 132164+fi 132165+rm -f conftest* 132166+fi 132167 132168+if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then 132169+ echo "$ac_t""yes" 1>&6 132170+ found=yes 132171+else 132172+ echo "$ac_t""no" 1>&6 132173+ echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 132174+echo "configure:89447: checking for __dn_expand" >&5 132175+if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then 132176+ echo $ac_n "(cached) $ac_c" 1>&6 132177+else 132178+ cat > conftest.$ac_ext <<EOF 132179+#line 89452 "configure" 132180+#include "confdefs.h" 132181 /* System header to define __stub macros and hopefully few prototypes, 132182- which can conflict with char __dn_expand (); below. 132183- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 132184- <limits.h> exists even on freestanding compilers. */ 132185- 132186-#ifdef __STDC__ 132187-# include <limits.h> 132188-#else 132189-# include <assert.h> 132190-#endif 132191- 132192-#undef __dn_expand 132193- 132194+ which can conflict with char __dn_expand(); below. */ 132195+#include <assert.h> 132196 /* Override any gcc2 internal prototype to avoid an error. */ 132197-#ifdef __cplusplus 132198-extern "C" 132199-{ 132200-#endif 132201 /* We use char because int might match the return type of a gcc2 132202- builtin and then its argument prototype would still apply. */ 132203-char __dn_expand (); 132204+ builtin and then its argument prototype would still apply. */ 132205+char __dn_expand(); 132206+ 132207+int main() { 132208+ 132209 /* The GNU C library defines this for functions which it implements 132210 to always fail with ENOSYS. Some functions are actually named 132211 something starting with __ and the normal name is an alias. */ 132212 #if defined (__stub___dn_expand) || defined (__stub_____dn_expand) 132213 choke me 132214 #else 132215-char (*f) () = __dn_expand; 132216-#endif 132217-#ifdef __cplusplus 132218-} 132219+__dn_expand(); 132220 #endif 132221 132222-int 132223-main () 132224-{ 132225-return f != __dn_expand; 132226- ; 132227- return 0; 132228-} 132229-_ACEOF 132230-rm -f conftest.$ac_objext conftest$ac_exeext 132231-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132232- (eval $ac_link) 2>conftest.er1 132233- ac_status=$? 132234- grep -v '^ *+' conftest.er1 >conftest.err 132235- rm -f conftest.er1 132236- cat conftest.err >&5 132237- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132238- (exit $ac_status); } && 132239- { ac_try='test -z "$ac_c_werror_flag" 132240- || test ! -s conftest.err' 132241- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132242- (eval $ac_try) 2>&5 132243- ac_status=$? 132244- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132245- (exit $ac_status); }; } && 132246- { ac_try='test -s conftest$ac_exeext' 132247- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132248- (eval $ac_try) 2>&5 132249- ac_status=$? 132250- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132251- (exit $ac_status); }; }; then 132252- ac_cv_func___dn_expand=yes 132253-else 132254- echo "$as_me: failed program was:" >&5 132255-sed 's/^/| /' conftest.$ac_ext >&5 132256- 132257-ac_cv_func___dn_expand=no 132258-fi 132259-rm -f conftest.err conftest.$ac_objext \ 132260- conftest$ac_exeext conftest.$ac_ext 132261-fi 132262-echo "$as_me:$LINENO: result: $ac_cv_func___dn_expand" >&5 132263-echo "${ECHO_T}$ac_cv_func___dn_expand" >&6 132264-if test $ac_cv_func___dn_expand = yes; then 132265- found=yes 132266+; return 0; } 132267+EOF 132268+if { (eval echo configure:89475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132269+ rm -rf conftest* 132270+ eval "ac_cv_func___dn_expand=yes" 132271 else 132272- found=no 132273+ echo "configure: failed program was:" >&5 132274+ cat conftest.$ac_ext >&5 132275+ rm -rf conftest* 132276+ eval "ac_cv_func___dn_expand=no" 132277+fi 132278+rm -f conftest* 132279 fi 132280 132281+if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then 132282+ echo "$ac_t""yes" 1>&6 132283+ found=yes 132284+else 132285+ echo "$ac_t""no" 1>&6 132286+found=no 132287+fi 132288+ 132289 fi 132290 132291 132292 case $found in 132293- yes) 132294- 132295-cat >>confdefs.h <<\_ACEOF 132296+ yes) 132297+ cat >> confdefs.h <<\EOF 132298 #define HAVE_DN_EXPAND 1 132299-_ACEOF 132300+EOF 132301 132302 ac_cv_func_dn_expand=yes 132303 ;; 132304- 132305- *) 132306- 132307+ 132308+ *) 132309+ 132310 unset ac_cv_lib_resolv_dn_expand 132311 unset ac_cv_lib_resolv___dn_expand 132312 unset found 132313- echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5 132314-echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 132315-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then 132316- echo $ECHO_N "(cached) $ECHO_C" >&6 132317+ echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 132318+echo "configure:89513: checking for dn_expand in -lresolv" >&5 132319+ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` 132320+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 132321+ echo $ac_n "(cached) $ac_c" 1>&6 132322 else 132323- ac_check_lib_save_LIBS=$LIBS 132324+ ac_save_LIBS="$LIBS" 132325 LIBS="-lresolv $LIBS" 132326-cat >conftest.$ac_ext <<_ACEOF 132327-/* confdefs.h. */ 132328-_ACEOF 132329-cat confdefs.h >>conftest.$ac_ext 132330-cat >>conftest.$ac_ext <<_ACEOF 132331-/* end confdefs.h. */ 132332- 132333+cat > conftest.$ac_ext <<EOF 132334+#line 89521 "configure" 132335+#include "confdefs.h" 132336 /* Override any gcc2 internal prototype to avoid an error. */ 132337-#ifdef __cplusplus 132338-extern "C" 132339-#endif 132340 /* We use char because int might match the return type of a gcc2 132341- builtin and then its argument prototype would still apply. */ 132342-char dn_expand (); 132343-int 132344-main () 132345-{ 132346-dn_expand (); 132347- ; 132348- return 0; 132349-} 132350-_ACEOF 132351-rm -f conftest.$ac_objext conftest$ac_exeext 132352-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132353- (eval $ac_link) 2>conftest.er1 132354- ac_status=$? 132355- grep -v '^ *+' conftest.er1 >conftest.err 132356- rm -f conftest.er1 132357- cat conftest.err >&5 132358- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132359- (exit $ac_status); } && 132360- { ac_try='test -z "$ac_c_werror_flag" 132361- || test ! -s conftest.err' 132362- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132363- (eval $ac_try) 2>&5 132364- ac_status=$? 132365- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132366- (exit $ac_status); }; } && 132367- { ac_try='test -s conftest$ac_exeext' 132368- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132369- (eval $ac_try) 2>&5 132370- ac_status=$? 132371- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132372- (exit $ac_status); }; }; then 132373- ac_cv_lib_resolv_dn_expand=yes 132374-else 132375- echo "$as_me: failed program was:" >&5 132376-sed 's/^/| /' conftest.$ac_ext >&5 132377- 132378-ac_cv_lib_resolv_dn_expand=no 132379-fi 132380-rm -f conftest.err conftest.$ac_objext \ 132381- conftest$ac_exeext conftest.$ac_ext 132382-LIBS=$ac_check_lib_save_LIBS 132383-fi 132384-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5 132385-echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 132386-if test $ac_cv_lib_resolv_dn_expand = yes; then 132387+ builtin and then its argument prototype would still apply. */ 132388+char dn_expand(); 132389+ 132390+int main() { 132391+dn_expand() 132392+; return 0; } 132393+EOF 132394+if { (eval echo configure:89532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132395+ rm -rf conftest* 132396+ eval "ac_cv_lib_$ac_lib_var=yes" 132397+else 132398+ echo "configure: failed program was:" >&5 132399+ cat conftest.$ac_ext >&5 132400+ rm -rf conftest* 132401+ eval "ac_cv_lib_$ac_lib_var=no" 132402+fi 132403+rm -f conftest* 132404+LIBS="$ac_save_LIBS" 132405+ 132406+fi 132407+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 132408+ echo "$ac_t""yes" 1>&6 132409 found=yes 132410 else 132411+ echo "$ac_t""no" 1>&6 132412 132413- echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5 132414-echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6 132415-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then 132416- echo $ECHO_N "(cached) $ECHO_C" >&6 132417+ echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 132418+echo "configure:89552: checking for __dn_expand in -lresolv" >&5 132419+ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` 132420+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 132421+ echo $ac_n "(cached) $ac_c" 1>&6 132422 else 132423- ac_check_lib_save_LIBS=$LIBS 132424+ ac_save_LIBS="$LIBS" 132425 LIBS="-lresolv $LIBS" 132426-cat >conftest.$ac_ext <<_ACEOF 132427-/* confdefs.h. */ 132428-_ACEOF 132429-cat confdefs.h >>conftest.$ac_ext 132430-cat >>conftest.$ac_ext <<_ACEOF 132431-/* end confdefs.h. */ 132432- 132433+cat > conftest.$ac_ext <<EOF 132434+#line 89560 "configure" 132435+#include "confdefs.h" 132436 /* Override any gcc2 internal prototype to avoid an error. */ 132437-#ifdef __cplusplus 132438-extern "C" 132439-#endif 132440 /* We use char because int might match the return type of a gcc2 132441- builtin and then its argument prototype would still apply. */ 132442-char __dn_expand (); 132443-int 132444-main () 132445-{ 132446-__dn_expand (); 132447- ; 132448- return 0; 132449-} 132450-_ACEOF 132451-rm -f conftest.$ac_objext conftest$ac_exeext 132452-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132453- (eval $ac_link) 2>conftest.er1 132454- ac_status=$? 132455- grep -v '^ *+' conftest.er1 >conftest.err 132456- rm -f conftest.er1 132457- cat conftest.err >&5 132458- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132459- (exit $ac_status); } && 132460- { ac_try='test -z "$ac_c_werror_flag" 132461- || test ! -s conftest.err' 132462- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132463- (eval $ac_try) 2>&5 132464- ac_status=$? 132465- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132466- (exit $ac_status); }; } && 132467- { ac_try='test -s conftest$ac_exeext' 132468- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132469- (eval $ac_try) 2>&5 132470- ac_status=$? 132471- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132472- (exit $ac_status); }; }; then 132473- ac_cv_lib_resolv___dn_expand=yes 132474-else 132475- echo "$as_me: failed program was:" >&5 132476-sed 's/^/| /' conftest.$ac_ext >&5 132477- 132478-ac_cv_lib_resolv___dn_expand=no 132479-fi 132480-rm -f conftest.err conftest.$ac_objext \ 132481- conftest$ac_exeext conftest.$ac_ext 132482-LIBS=$ac_check_lib_save_LIBS 132483-fi 132484-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5 132485-echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6 132486-if test $ac_cv_lib_resolv___dn_expand = yes; then 132487- found=yes 132488+ builtin and then its argument prototype would still apply. */ 132489+char __dn_expand(); 132490+ 132491+int main() { 132492+__dn_expand() 132493+; return 0; } 132494+EOF 132495+if { (eval echo configure:89571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132496+ rm -rf conftest* 132497+ eval "ac_cv_lib_$ac_lib_var=yes" 132498 else 132499- found=no 132500+ echo "configure: failed program was:" >&5 132501+ cat conftest.$ac_ext >&5 132502+ rm -rf conftest* 132503+ eval "ac_cv_lib_$ac_lib_var=no" 132504 fi 132505+rm -f conftest* 132506+LIBS="$ac_save_LIBS" 132507 132508+fi 132509+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 132510+ echo "$ac_t""yes" 1>&6 132511+ found=yes 132512+else 132513+ echo "$ac_t""no" 1>&6 132514+found=no 132515+fi 132516 132517+ 132518 fi 132519 132520 132521@@ -115120,206 +89598,133 @@ 132522 if test "$cross_compiling" = yes; then 132523 found=no 132524 else 132525- cat >conftest.$ac_ext <<_ACEOF 132526-/* confdefs.h. */ 132527-_ACEOF 132528-cat confdefs.h >>conftest.$ac_ext 132529-cat >>conftest.$ac_ext <<_ACEOF 132530-/* end confdefs.h. */ 132531+ cat > conftest.$ac_ext <<EOF 132532+#line 89603 "configure" 132533+#include "confdefs.h" 132534 main() { return (0); } 132535-_ACEOF 132536-rm -f conftest$ac_exeext 132537-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132538- (eval $ac_link) 2>&5 132539- ac_status=$? 132540- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132541- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 132542- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132543- (eval $ac_try) 2>&5 132544- ac_status=$? 132545- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132546- (exit $ac_status); }; }; then 132547+EOF 132548+if { (eval echo configure:89607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 132549+then 132550 found=yes 132551 else 132552- echo "$as_me: program exited with status $ac_status" >&5 132553-echo "$as_me: failed program was:" >&5 132554-sed 's/^/| /' conftest.$ac_ext >&5 132555- 132556-( exit $ac_status ) 132557-found=no 132558+ echo "configure: failed program was:" >&5 132559+ cat conftest.$ac_ext >&5 132560+ rm -fr conftest* 132561+ found=no 132562 fi 132563-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 132564+rm -fr conftest* 132565 fi 132566+ 132567 LIBS=$ac_libs 132568 fi 132569 132570 if test "$found" = "yes"; then 132571- 132572- 132573+ 132574+ 132575 case resolv in 132576 c|c_r|pthread*) ;; 132577- *) 132578- LIBS="-lresolv $LIBS" 132579+ *) 132580+ LIBS="-lresolv $LIBS" 132581 ;; 132582 esac 132583 132584 132585- 132586-cat >>confdefs.h <<\_ACEOF 132587+ cat >> confdefs.h <<\EOF 132588 #define HAVE_DN_EXPAND 1 132589-_ACEOF 132590- 132591+EOF 132592 132593-cat >>confdefs.h <<\_ACEOF 132594+ cat >> confdefs.h <<\EOF 132595 #define HAVE_LIBRESOLV 1 132596-_ACEOF 132597+EOF 132598 132599 ac_cv_func_dn_expand=yes 132600 else 132601- 132602- 132603+ 132604+ 132605 unset ac_cv_lib_bind_dn_expand 132606 unset ac_cv_lib_bind___dn_expand 132607 unset found 132608- echo "$as_me:$LINENO: checking for dn_expand in -lbind" >&5 132609-echo $ECHO_N "checking for dn_expand in -lbind... $ECHO_C" >&6 132610-if test "${ac_cv_lib_bind_dn_expand+set}" = set; then 132611- echo $ECHO_N "(cached) $ECHO_C" >&6 132612+ echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 132613+echo "configure:89649: checking for dn_expand in -lbind" >&5 132614+ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` 132615+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 132616+ echo $ac_n "(cached) $ac_c" 1>&6 132617 else 132618- ac_check_lib_save_LIBS=$LIBS 132619+ ac_save_LIBS="$LIBS" 132620 LIBS="-lbind $LIBS" 132621-cat >conftest.$ac_ext <<_ACEOF 132622-/* confdefs.h. */ 132623-_ACEOF 132624-cat confdefs.h >>conftest.$ac_ext 132625-cat >>conftest.$ac_ext <<_ACEOF 132626-/* end confdefs.h. */ 132627- 132628+cat > conftest.$ac_ext <<EOF 132629+#line 89657 "configure" 132630+#include "confdefs.h" 132631 /* Override any gcc2 internal prototype to avoid an error. */ 132632-#ifdef __cplusplus 132633-extern "C" 132634-#endif 132635 /* We use char because int might match the return type of a gcc2 132636- builtin and then its argument prototype would still apply. */ 132637-char dn_expand (); 132638-int 132639-main () 132640-{ 132641-dn_expand (); 132642- ; 132643- return 0; 132644-} 132645-_ACEOF 132646-rm -f conftest.$ac_objext conftest$ac_exeext 132647-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132648- (eval $ac_link) 2>conftest.er1 132649- ac_status=$? 132650- grep -v '^ *+' conftest.er1 >conftest.err 132651- rm -f conftest.er1 132652- cat conftest.err >&5 132653- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132654- (exit $ac_status); } && 132655- { ac_try='test -z "$ac_c_werror_flag" 132656- || test ! -s conftest.err' 132657- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132658- (eval $ac_try) 2>&5 132659- ac_status=$? 132660- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132661- (exit $ac_status); }; } && 132662- { ac_try='test -s conftest$ac_exeext' 132663- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132664- (eval $ac_try) 2>&5 132665- ac_status=$? 132666- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132667- (exit $ac_status); }; }; then 132668- ac_cv_lib_bind_dn_expand=yes 132669-else 132670- echo "$as_me: failed program was:" >&5 132671-sed 's/^/| /' conftest.$ac_ext >&5 132672- 132673-ac_cv_lib_bind_dn_expand=no 132674-fi 132675-rm -f conftest.err conftest.$ac_objext \ 132676- conftest$ac_exeext conftest.$ac_ext 132677-LIBS=$ac_check_lib_save_LIBS 132678-fi 132679-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_expand" >&5 132680-echo "${ECHO_T}$ac_cv_lib_bind_dn_expand" >&6 132681-if test $ac_cv_lib_bind_dn_expand = yes; then 132682+ builtin and then its argument prototype would still apply. */ 132683+char dn_expand(); 132684+ 132685+int main() { 132686+dn_expand() 132687+; return 0; } 132688+EOF 132689+if { (eval echo configure:89668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132690+ rm -rf conftest* 132691+ eval "ac_cv_lib_$ac_lib_var=yes" 132692+else 132693+ echo "configure: failed program was:" >&5 132694+ cat conftest.$ac_ext >&5 132695+ rm -rf conftest* 132696+ eval "ac_cv_lib_$ac_lib_var=no" 132697+fi 132698+rm -f conftest* 132699+LIBS="$ac_save_LIBS" 132700+ 132701+fi 132702+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 132703+ echo "$ac_t""yes" 1>&6 132704 found=yes 132705 else 132706+ echo "$ac_t""no" 1>&6 132707 132708- echo "$as_me:$LINENO: checking for __dn_expand in -lbind" >&5 132709-echo $ECHO_N "checking for __dn_expand in -lbind... $ECHO_C" >&6 132710-if test "${ac_cv_lib_bind___dn_expand+set}" = set; then 132711- echo $ECHO_N "(cached) $ECHO_C" >&6 132712+ echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 132713+echo "configure:89688: checking for __dn_expand in -lbind" >&5 132714+ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` 132715+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 132716+ echo $ac_n "(cached) $ac_c" 1>&6 132717 else 132718- ac_check_lib_save_LIBS=$LIBS 132719+ ac_save_LIBS="$LIBS" 132720 LIBS="-lbind $LIBS" 132721-cat >conftest.$ac_ext <<_ACEOF 132722-/* confdefs.h. */ 132723-_ACEOF 132724-cat confdefs.h >>conftest.$ac_ext 132725-cat >>conftest.$ac_ext <<_ACEOF 132726-/* end confdefs.h. */ 132727- 132728+cat > conftest.$ac_ext <<EOF 132729+#line 89696 "configure" 132730+#include "confdefs.h" 132731 /* Override any gcc2 internal prototype to avoid an error. */ 132732-#ifdef __cplusplus 132733-extern "C" 132734-#endif 132735 /* We use char because int might match the return type of a gcc2 132736- builtin and then its argument prototype would still apply. */ 132737-char __dn_expand (); 132738-int 132739-main () 132740-{ 132741-__dn_expand (); 132742- ; 132743- return 0; 132744-} 132745-_ACEOF 132746-rm -f conftest.$ac_objext conftest$ac_exeext 132747-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132748- (eval $ac_link) 2>conftest.er1 132749- ac_status=$? 132750- grep -v '^ *+' conftest.er1 >conftest.err 132751- rm -f conftest.er1 132752- cat conftest.err >&5 132753- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132754- (exit $ac_status); } && 132755- { ac_try='test -z "$ac_c_werror_flag" 132756- || test ! -s conftest.err' 132757- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132758- (eval $ac_try) 2>&5 132759- ac_status=$? 132760- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132761- (exit $ac_status); }; } && 132762- { ac_try='test -s conftest$ac_exeext' 132763- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132764- (eval $ac_try) 2>&5 132765- ac_status=$? 132766- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132767- (exit $ac_status); }; }; then 132768- ac_cv_lib_bind___dn_expand=yes 132769-else 132770- echo "$as_me: failed program was:" >&5 132771-sed 's/^/| /' conftest.$ac_ext >&5 132772- 132773-ac_cv_lib_bind___dn_expand=no 132774-fi 132775-rm -f conftest.err conftest.$ac_objext \ 132776- conftest$ac_exeext conftest.$ac_ext 132777-LIBS=$ac_check_lib_save_LIBS 132778-fi 132779-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_expand" >&5 132780-echo "${ECHO_T}$ac_cv_lib_bind___dn_expand" >&6 132781-if test $ac_cv_lib_bind___dn_expand = yes; then 132782- found=yes 132783+ builtin and then its argument prototype would still apply. */ 132784+char __dn_expand(); 132785+ 132786+int main() { 132787+__dn_expand() 132788+; return 0; } 132789+EOF 132790+if { (eval echo configure:89707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132791+ rm -rf conftest* 132792+ eval "ac_cv_lib_$ac_lib_var=yes" 132793 else 132794- found=no 132795+ echo "configure: failed program was:" >&5 132796+ cat conftest.$ac_ext >&5 132797+ rm -rf conftest* 132798+ eval "ac_cv_lib_$ac_lib_var=no" 132799 fi 132800+rm -f conftest* 132801+LIBS="$ac_save_LIBS" 132802 132803+fi 132804+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 132805+ echo "$ac_t""yes" 1>&6 132806+ found=yes 132807+else 132808+ echo "$ac_t""no" 1>&6 132809+found=no 132810+fi 132811 132812+ 132813 fi 132814 132815 132816@@ -115329,206 +89734,133 @@ 132817 if test "$cross_compiling" = yes; then 132818 found=no 132819 else 132820- cat >conftest.$ac_ext <<_ACEOF 132821-/* confdefs.h. */ 132822-_ACEOF 132823-cat confdefs.h >>conftest.$ac_ext 132824-cat >>conftest.$ac_ext <<_ACEOF 132825-/* end confdefs.h. */ 132826+ cat > conftest.$ac_ext <<EOF 132827+#line 89739 "configure" 132828+#include "confdefs.h" 132829 main() { return (0); } 132830-_ACEOF 132831-rm -f conftest$ac_exeext 132832-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132833- (eval $ac_link) 2>&5 132834- ac_status=$? 132835- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132836- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 132837- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132838- (eval $ac_try) 2>&5 132839- ac_status=$? 132840- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132841- (exit $ac_status); }; }; then 132842+EOF 132843+if { (eval echo configure:89743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 132844+then 132845 found=yes 132846 else 132847- echo "$as_me: program exited with status $ac_status" >&5 132848-echo "$as_me: failed program was:" >&5 132849-sed 's/^/| /' conftest.$ac_ext >&5 132850- 132851-( exit $ac_status ) 132852-found=no 132853+ echo "configure: failed program was:" >&5 132854+ cat conftest.$ac_ext >&5 132855+ rm -fr conftest* 132856+ found=no 132857 fi 132858-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 132859+rm -fr conftest* 132860 fi 132861+ 132862 LIBS=$ac_libs 132863 fi 132864 132865 if test "$found" = "yes"; then 132866- 132867- 132868+ 132869+ 132870 case bind in 132871 c|c_r|pthread*) ;; 132872- *) 132873- LIBS="-lbind $LIBS" 132874+ *) 132875+ LIBS="-lbind $LIBS" 132876 ;; 132877 esac 132878 132879 132880- 132881-cat >>confdefs.h <<\_ACEOF 132882+ cat >> confdefs.h <<\EOF 132883 #define HAVE_DN_EXPAND 1 132884-_ACEOF 132885- 132886+EOF 132887 132888-cat >>confdefs.h <<\_ACEOF 132889+ cat >> confdefs.h <<\EOF 132890 #define HAVE_LIBBIND 1 132891-_ACEOF 132892+EOF 132893 132894 ac_cv_func_dn_expand=yes 132895 else 132896- 132897- 132898+ 132899+ 132900 unset ac_cv_lib_socket_dn_expand 132901 unset ac_cv_lib_socket___dn_expand 132902 unset found 132903- echo "$as_me:$LINENO: checking for dn_expand in -lsocket" >&5 132904-echo $ECHO_N "checking for dn_expand in -lsocket... $ECHO_C" >&6 132905-if test "${ac_cv_lib_socket_dn_expand+set}" = set; then 132906- echo $ECHO_N "(cached) $ECHO_C" >&6 132907+ echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 132908+echo "configure:89785: checking for dn_expand in -lsocket" >&5 132909+ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` 132910+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 132911+ echo $ac_n "(cached) $ac_c" 1>&6 132912 else 132913- ac_check_lib_save_LIBS=$LIBS 132914+ ac_save_LIBS="$LIBS" 132915 LIBS="-lsocket $LIBS" 132916-cat >conftest.$ac_ext <<_ACEOF 132917-/* confdefs.h. */ 132918-_ACEOF 132919-cat confdefs.h >>conftest.$ac_ext 132920-cat >>conftest.$ac_ext <<_ACEOF 132921-/* end confdefs.h. */ 132922- 132923+cat > conftest.$ac_ext <<EOF 132924+#line 89793 "configure" 132925+#include "confdefs.h" 132926 /* Override any gcc2 internal prototype to avoid an error. */ 132927-#ifdef __cplusplus 132928-extern "C" 132929-#endif 132930 /* We use char because int might match the return type of a gcc2 132931- builtin and then its argument prototype would still apply. */ 132932-char dn_expand (); 132933-int 132934-main () 132935-{ 132936-dn_expand (); 132937- ; 132938- return 0; 132939-} 132940-_ACEOF 132941-rm -f conftest.$ac_objext conftest$ac_exeext 132942-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 132943- (eval $ac_link) 2>conftest.er1 132944- ac_status=$? 132945- grep -v '^ *+' conftest.er1 >conftest.err 132946- rm -f conftest.er1 132947- cat conftest.err >&5 132948- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132949- (exit $ac_status); } && 132950- { ac_try='test -z "$ac_c_werror_flag" 132951- || test ! -s conftest.err' 132952- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132953- (eval $ac_try) 2>&5 132954- ac_status=$? 132955- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132956- (exit $ac_status); }; } && 132957- { ac_try='test -s conftest$ac_exeext' 132958- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 132959- (eval $ac_try) 2>&5 132960- ac_status=$? 132961- echo "$as_me:$LINENO: \$? = $ac_status" >&5 132962- (exit $ac_status); }; }; then 132963- ac_cv_lib_socket_dn_expand=yes 132964-else 132965- echo "$as_me: failed program was:" >&5 132966-sed 's/^/| /' conftest.$ac_ext >&5 132967- 132968-ac_cv_lib_socket_dn_expand=no 132969-fi 132970-rm -f conftest.err conftest.$ac_objext \ 132971- conftest$ac_exeext conftest.$ac_ext 132972-LIBS=$ac_check_lib_save_LIBS 132973-fi 132974-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_expand" >&5 132975-echo "${ECHO_T}$ac_cv_lib_socket_dn_expand" >&6 132976-if test $ac_cv_lib_socket_dn_expand = yes; then 132977+ builtin and then its argument prototype would still apply. */ 132978+char dn_expand(); 132979+ 132980+int main() { 132981+dn_expand() 132982+; return 0; } 132983+EOF 132984+if { (eval echo configure:89804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 132985+ rm -rf conftest* 132986+ eval "ac_cv_lib_$ac_lib_var=yes" 132987+else 132988+ echo "configure: failed program was:" >&5 132989+ cat conftest.$ac_ext >&5 132990+ rm -rf conftest* 132991+ eval "ac_cv_lib_$ac_lib_var=no" 132992+fi 132993+rm -f conftest* 132994+LIBS="$ac_save_LIBS" 132995+ 132996+fi 132997+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 132998+ echo "$ac_t""yes" 1>&6 132999 found=yes 133000 else 133001+ echo "$ac_t""no" 1>&6 133002 133003- echo "$as_me:$LINENO: checking for __dn_expand in -lsocket" >&5 133004-echo $ECHO_N "checking for __dn_expand in -lsocket... $ECHO_C" >&6 133005-if test "${ac_cv_lib_socket___dn_expand+set}" = set; then 133006- echo $ECHO_N "(cached) $ECHO_C" >&6 133007+ echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 133008+echo "configure:89824: checking for __dn_expand in -lsocket" >&5 133009+ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` 133010+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 133011+ echo $ac_n "(cached) $ac_c" 1>&6 133012 else 133013- ac_check_lib_save_LIBS=$LIBS 133014+ ac_save_LIBS="$LIBS" 133015 LIBS="-lsocket $LIBS" 133016-cat >conftest.$ac_ext <<_ACEOF 133017-/* confdefs.h. */ 133018-_ACEOF 133019-cat confdefs.h >>conftest.$ac_ext 133020-cat >>conftest.$ac_ext <<_ACEOF 133021-/* end confdefs.h. */ 133022- 133023+cat > conftest.$ac_ext <<EOF 133024+#line 89832 "configure" 133025+#include "confdefs.h" 133026 /* Override any gcc2 internal prototype to avoid an error. */ 133027-#ifdef __cplusplus 133028-extern "C" 133029-#endif 133030 /* We use char because int might match the return type of a gcc2 133031- builtin and then its argument prototype would still apply. */ 133032-char __dn_expand (); 133033-int 133034-main () 133035-{ 133036-__dn_expand (); 133037- ; 133038- return 0; 133039-} 133040-_ACEOF 133041-rm -f conftest.$ac_objext conftest$ac_exeext 133042-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133043- (eval $ac_link) 2>conftest.er1 133044- ac_status=$? 133045- grep -v '^ *+' conftest.er1 >conftest.err 133046- rm -f conftest.er1 133047- cat conftest.err >&5 133048- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133049- (exit $ac_status); } && 133050- { ac_try='test -z "$ac_c_werror_flag" 133051- || test ! -s conftest.err' 133052- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133053- (eval $ac_try) 2>&5 133054- ac_status=$? 133055- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133056- (exit $ac_status); }; } && 133057- { ac_try='test -s conftest$ac_exeext' 133058- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133059- (eval $ac_try) 2>&5 133060- ac_status=$? 133061- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133062- (exit $ac_status); }; }; then 133063- ac_cv_lib_socket___dn_expand=yes 133064-else 133065- echo "$as_me: failed program was:" >&5 133066-sed 's/^/| /' conftest.$ac_ext >&5 133067- 133068-ac_cv_lib_socket___dn_expand=no 133069-fi 133070-rm -f conftest.err conftest.$ac_objext \ 133071- conftest$ac_exeext conftest.$ac_ext 133072-LIBS=$ac_check_lib_save_LIBS 133073-fi 133074-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_expand" >&5 133075-echo "${ECHO_T}$ac_cv_lib_socket___dn_expand" >&6 133076-if test $ac_cv_lib_socket___dn_expand = yes; then 133077- found=yes 133078+ builtin and then its argument prototype would still apply. */ 133079+char __dn_expand(); 133080+ 133081+int main() { 133082+__dn_expand() 133083+; return 0; } 133084+EOF 133085+if { (eval echo configure:89843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133086+ rm -rf conftest* 133087+ eval "ac_cv_lib_$ac_lib_var=yes" 133088 else 133089- found=no 133090+ echo "configure: failed program was:" >&5 133091+ cat conftest.$ac_ext >&5 133092+ rm -rf conftest* 133093+ eval "ac_cv_lib_$ac_lib_var=no" 133094 fi 133095+rm -f conftest* 133096+LIBS="$ac_save_LIBS" 133097 133098+fi 133099+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 133100+ echo "$ac_t""yes" 1>&6 133101+ found=yes 133102+else 133103+ echo "$ac_t""no" 1>&6 133104+found=no 133105+fi 133106 133107+ 133108 fi 133109 133110 133111@@ -115538,428 +89870,260 @@ 133112 if test "$cross_compiling" = yes; then 133113 found=no 133114 else 133115- cat >conftest.$ac_ext <<_ACEOF 133116-/* confdefs.h. */ 133117-_ACEOF 133118-cat confdefs.h >>conftest.$ac_ext 133119-cat >>conftest.$ac_ext <<_ACEOF 133120-/* end confdefs.h. */ 133121+ cat > conftest.$ac_ext <<EOF 133122+#line 89875 "configure" 133123+#include "confdefs.h" 133124 main() { return (0); } 133125-_ACEOF 133126-rm -f conftest$ac_exeext 133127-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133128- (eval $ac_link) 2>&5 133129- ac_status=$? 133130- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133131- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 133132- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133133- (eval $ac_try) 2>&5 133134- ac_status=$? 133135- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133136- (exit $ac_status); }; }; then 133137+EOF 133138+if { (eval echo configure:89879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 133139+then 133140 found=yes 133141 else 133142- echo "$as_me: program exited with status $ac_status" >&5 133143-echo "$as_me: failed program was:" >&5 133144-sed 's/^/| /' conftest.$ac_ext >&5 133145- 133146-( exit $ac_status ) 133147-found=no 133148+ echo "configure: failed program was:" >&5 133149+ cat conftest.$ac_ext >&5 133150+ rm -fr conftest* 133151+ found=no 133152 fi 133153-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 133154+rm -fr conftest* 133155 fi 133156+ 133157 LIBS=$ac_libs 133158 fi 133159 133160 if test "$found" = "yes"; then 133161- 133162- 133163+ 133164+ 133165 case socket in 133166 c|c_r|pthread*) ;; 133167- *) 133168- LIBS="-lsocket $LIBS" 133169+ *) 133170+ LIBS="-lsocket $LIBS" 133171 ;; 133172 esac 133173 133174 133175- 133176-cat >>confdefs.h <<\_ACEOF 133177+ cat >> confdefs.h <<\EOF 133178 #define HAVE_DN_EXPAND 1 133179-_ACEOF 133180- 133181+EOF 133182 133183-cat >>confdefs.h <<\_ACEOF 133184+ cat >> confdefs.h <<\EOF 133185 #define HAVE_LIBSOCKET 1 133186-_ACEOF 133187+EOF 133188 133189 ac_cv_func_dn_expand=yes 133190 else 133191- 133192+ 133193 : 133194 133195 fi 133196- 133197+ 133198 133199 fi 133200- 133201+ 133202 133203 fi 133204- 133205+ 133206 ;; 133207- 133208+ 133209 esac 133210 133211 133212 unset ac_cv_func_dn_skipname 133213 unset ac_cv_func___dn_skipname 133214 unset found 133215- 133216- echo "$as_me:$LINENO: checking for dn_skipname" >&5 133217-echo $ECHO_N "checking for dn_skipname... $ECHO_C" >&6 133218-if test "${ac_cv_func_dn_skipname+set}" = set; then 133219- echo $ECHO_N "(cached) $ECHO_C" >&6 133220-else 133221- cat >conftest.$ac_ext <<_ACEOF 133222-/* confdefs.h. */ 133223-_ACEOF 133224-cat confdefs.h >>conftest.$ac_ext 133225-cat >>conftest.$ac_ext <<_ACEOF 133226-/* end confdefs.h. */ 133227-/* Define dn_skipname to an innocuous variant, in case <limits.h> declares dn_skipname. 133228- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 133229-#define dn_skipname innocuous_dn_skipname 133230- 133231+ 133232+ echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 133233+echo "configure:89936: checking for dn_skipname" >&5 133234+if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then 133235+ echo $ac_n "(cached) $ac_c" 1>&6 133236+else 133237+ cat > conftest.$ac_ext <<EOF 133238+#line 89941 "configure" 133239+#include "confdefs.h" 133240 /* System header to define __stub macros and hopefully few prototypes, 133241- which can conflict with char dn_skipname (); below. 133242- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 133243- <limits.h> exists even on freestanding compilers. */ 133244- 133245-#ifdef __STDC__ 133246-# include <limits.h> 133247-#else 133248-# include <assert.h> 133249-#endif 133250- 133251-#undef dn_skipname 133252- 133253+ which can conflict with char dn_skipname(); below. */ 133254+#include <assert.h> 133255 /* Override any gcc2 internal prototype to avoid an error. */ 133256-#ifdef __cplusplus 133257-extern "C" 133258-{ 133259-#endif 133260 /* We use char because int might match the return type of a gcc2 133261- builtin and then its argument prototype would still apply. */ 133262-char dn_skipname (); 133263+ builtin and then its argument prototype would still apply. */ 133264+char dn_skipname(); 133265+ 133266+int main() { 133267+ 133268 /* The GNU C library defines this for functions which it implements 133269 to always fail with ENOSYS. Some functions are actually named 133270 something starting with __ and the normal name is an alias. */ 133271 #if defined (__stub_dn_skipname) || defined (__stub___dn_skipname) 133272 choke me 133273 #else 133274-char (*f) () = dn_skipname; 133275-#endif 133276-#ifdef __cplusplus 133277-} 133278+dn_skipname(); 133279 #endif 133280 133281-int 133282-main () 133283-{ 133284-return f != dn_skipname; 133285- ; 133286- return 0; 133287-} 133288-_ACEOF 133289-rm -f conftest.$ac_objext conftest$ac_exeext 133290-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133291- (eval $ac_link) 2>conftest.er1 133292- ac_status=$? 133293- grep -v '^ *+' conftest.er1 >conftest.err 133294- rm -f conftest.er1 133295- cat conftest.err >&5 133296- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133297- (exit $ac_status); } && 133298- { ac_try='test -z "$ac_c_werror_flag" 133299- || test ! -s conftest.err' 133300- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133301- (eval $ac_try) 2>&5 133302- ac_status=$? 133303- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133304- (exit $ac_status); }; } && 133305- { ac_try='test -s conftest$ac_exeext' 133306- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133307- (eval $ac_try) 2>&5 133308- ac_status=$? 133309- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133310- (exit $ac_status); }; }; then 133311- ac_cv_func_dn_skipname=yes 133312-else 133313- echo "$as_me: failed program was:" >&5 133314-sed 's/^/| /' conftest.$ac_ext >&5 133315- 133316-ac_cv_func_dn_skipname=no 133317-fi 133318-rm -f conftest.err conftest.$ac_objext \ 133319- conftest$ac_exeext conftest.$ac_ext 133320-fi 133321-echo "$as_me:$LINENO: result: $ac_cv_func_dn_skipname" >&5 133322-echo "${ECHO_T}$ac_cv_func_dn_skipname" >&6 133323-if test $ac_cv_func_dn_skipname = yes; then 133324- found=yes 133325+; return 0; } 133326+EOF 133327+if { (eval echo configure:89964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133328+ rm -rf conftest* 133329+ eval "ac_cv_func_dn_skipname=yes" 133330 else 133331- echo "$as_me:$LINENO: checking for __dn_skipname" >&5 133332-echo $ECHO_N "checking for __dn_skipname... $ECHO_C" >&6 133333-if test "${ac_cv_func___dn_skipname+set}" = set; then 133334- echo $ECHO_N "(cached) $ECHO_C" >&6 133335-else 133336- cat >conftest.$ac_ext <<_ACEOF 133337-/* confdefs.h. */ 133338-_ACEOF 133339-cat confdefs.h >>conftest.$ac_ext 133340-cat >>conftest.$ac_ext <<_ACEOF 133341-/* end confdefs.h. */ 133342-/* Define __dn_skipname to an innocuous variant, in case <limits.h> declares __dn_skipname. 133343- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 133344-#define __dn_skipname innocuous___dn_skipname 133345+ echo "configure: failed program was:" >&5 133346+ cat conftest.$ac_ext >&5 133347+ rm -rf conftest* 133348+ eval "ac_cv_func_dn_skipname=no" 133349+fi 133350+rm -f conftest* 133351+fi 133352 133353+if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then 133354+ echo "$ac_t""yes" 1>&6 133355+ found=yes 133356+else 133357+ echo "$ac_t""no" 1>&6 133358+ echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 133359+echo "configure:89982: checking for __dn_skipname" >&5 133360+if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then 133361+ echo $ac_n "(cached) $ac_c" 1>&6 133362+else 133363+ cat > conftest.$ac_ext <<EOF 133364+#line 89987 "configure" 133365+#include "confdefs.h" 133366 /* System header to define __stub macros and hopefully few prototypes, 133367- which can conflict with char __dn_skipname (); below. 133368- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 133369- <limits.h> exists even on freestanding compilers. */ 133370- 133371-#ifdef __STDC__ 133372-# include <limits.h> 133373-#else 133374-# include <assert.h> 133375-#endif 133376- 133377-#undef __dn_skipname 133378- 133379+ which can conflict with char __dn_skipname(); below. */ 133380+#include <assert.h> 133381 /* Override any gcc2 internal prototype to avoid an error. */ 133382-#ifdef __cplusplus 133383-extern "C" 133384-{ 133385-#endif 133386 /* We use char because int might match the return type of a gcc2 133387- builtin and then its argument prototype would still apply. */ 133388-char __dn_skipname (); 133389+ builtin and then its argument prototype would still apply. */ 133390+char __dn_skipname(); 133391+ 133392+int main() { 133393+ 133394 /* The GNU C library defines this for functions which it implements 133395 to always fail with ENOSYS. Some functions are actually named 133396 something starting with __ and the normal name is an alias. */ 133397 #if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) 133398 choke me 133399 #else 133400-char (*f) () = __dn_skipname; 133401-#endif 133402-#ifdef __cplusplus 133403-} 133404+__dn_skipname(); 133405 #endif 133406 133407-int 133408-main () 133409-{ 133410-return f != __dn_skipname; 133411- ; 133412- return 0; 133413-} 133414-_ACEOF 133415-rm -f conftest.$ac_objext conftest$ac_exeext 133416-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133417- (eval $ac_link) 2>conftest.er1 133418- ac_status=$? 133419- grep -v '^ *+' conftest.er1 >conftest.err 133420- rm -f conftest.er1 133421- cat conftest.err >&5 133422- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133423- (exit $ac_status); } && 133424- { ac_try='test -z "$ac_c_werror_flag" 133425- || test ! -s conftest.err' 133426- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133427- (eval $ac_try) 2>&5 133428- ac_status=$? 133429- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133430- (exit $ac_status); }; } && 133431- { ac_try='test -s conftest$ac_exeext' 133432- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133433- (eval $ac_try) 2>&5 133434- ac_status=$? 133435- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133436- (exit $ac_status); }; }; then 133437- ac_cv_func___dn_skipname=yes 133438-else 133439- echo "$as_me: failed program was:" >&5 133440-sed 's/^/| /' conftest.$ac_ext >&5 133441- 133442-ac_cv_func___dn_skipname=no 133443-fi 133444-rm -f conftest.err conftest.$ac_objext \ 133445- conftest$ac_exeext conftest.$ac_ext 133446-fi 133447-echo "$as_me:$LINENO: result: $ac_cv_func___dn_skipname" >&5 133448-echo "${ECHO_T}$ac_cv_func___dn_skipname" >&6 133449-if test $ac_cv_func___dn_skipname = yes; then 133450- found=yes 133451+; return 0; } 133452+EOF 133453+if { (eval echo configure:90010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133454+ rm -rf conftest* 133455+ eval "ac_cv_func___dn_skipname=yes" 133456 else 133457- found=no 133458+ echo "configure: failed program was:" >&5 133459+ cat conftest.$ac_ext >&5 133460+ rm -rf conftest* 133461+ eval "ac_cv_func___dn_skipname=no" 133462+fi 133463+rm -f conftest* 133464 fi 133465 133466+if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then 133467+ echo "$ac_t""yes" 1>&6 133468+ found=yes 133469+else 133470+ echo "$ac_t""no" 1>&6 133471+found=no 133472+fi 133473+ 133474 fi 133475 133476 133477 case $found in 133478- yes) 133479- 133480-cat >>confdefs.h <<\_ACEOF 133481+ yes) 133482+ cat >> confdefs.h <<\EOF 133483 #define HAVE_DN_SKIPNAME 1 133484-_ACEOF 133485+EOF 133486 133487 ac_cv_func_dn_skipname=yes 133488 ;; 133489- 133490- *) 133491- 133492+ 133493+ *) 133494+ 133495 unset ac_cv_lib_resolv_dn_skipname 133496 unset ac_cv_lib_resolv___dn_skipname 133497 unset found 133498- echo "$as_me:$LINENO: checking for dn_skipname in -lresolv" >&5 133499-echo $ECHO_N "checking for dn_skipname in -lresolv... $ECHO_C" >&6 133500-if test "${ac_cv_lib_resolv_dn_skipname+set}" = set; then 133501- echo $ECHO_N "(cached) $ECHO_C" >&6 133502+ echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 133503+echo "configure:90048: checking for dn_skipname in -lresolv" >&5 133504+ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` 133505+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 133506+ echo $ac_n "(cached) $ac_c" 1>&6 133507 else 133508- ac_check_lib_save_LIBS=$LIBS 133509+ ac_save_LIBS="$LIBS" 133510 LIBS="-lresolv $LIBS" 133511-cat >conftest.$ac_ext <<_ACEOF 133512-/* confdefs.h. */ 133513-_ACEOF 133514-cat confdefs.h >>conftest.$ac_ext 133515-cat >>conftest.$ac_ext <<_ACEOF 133516-/* end confdefs.h. */ 133517- 133518+cat > conftest.$ac_ext <<EOF 133519+#line 90056 "configure" 133520+#include "confdefs.h" 133521 /* Override any gcc2 internal prototype to avoid an error. */ 133522-#ifdef __cplusplus 133523-extern "C" 133524-#endif 133525 /* We use char because int might match the return type of a gcc2 133526- builtin and then its argument prototype would still apply. */ 133527-char dn_skipname (); 133528-int 133529-main () 133530-{ 133531-dn_skipname (); 133532- ; 133533- return 0; 133534-} 133535-_ACEOF 133536-rm -f conftest.$ac_objext conftest$ac_exeext 133537-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133538- (eval $ac_link) 2>conftest.er1 133539- ac_status=$? 133540- grep -v '^ *+' conftest.er1 >conftest.err 133541- rm -f conftest.er1 133542- cat conftest.err >&5 133543- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133544- (exit $ac_status); } && 133545- { ac_try='test -z "$ac_c_werror_flag" 133546- || test ! -s conftest.err' 133547- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133548- (eval $ac_try) 2>&5 133549- ac_status=$? 133550- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133551- (exit $ac_status); }; } && 133552- { ac_try='test -s conftest$ac_exeext' 133553- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133554- (eval $ac_try) 2>&5 133555- ac_status=$? 133556- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133557- (exit $ac_status); }; }; then 133558- ac_cv_lib_resolv_dn_skipname=yes 133559-else 133560- echo "$as_me: failed program was:" >&5 133561-sed 's/^/| /' conftest.$ac_ext >&5 133562- 133563-ac_cv_lib_resolv_dn_skipname=no 133564-fi 133565-rm -f conftest.err conftest.$ac_objext \ 133566- conftest$ac_exeext conftest.$ac_ext 133567-LIBS=$ac_check_lib_save_LIBS 133568-fi 133569-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_skipname" >&5 133570-echo "${ECHO_T}$ac_cv_lib_resolv_dn_skipname" >&6 133571-if test $ac_cv_lib_resolv_dn_skipname = yes; then 133572+ builtin and then its argument prototype would still apply. */ 133573+char dn_skipname(); 133574+ 133575+int main() { 133576+dn_skipname() 133577+; return 0; } 133578+EOF 133579+if { (eval echo configure:90067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133580+ rm -rf conftest* 133581+ eval "ac_cv_lib_$ac_lib_var=yes" 133582+else 133583+ echo "configure: failed program was:" >&5 133584+ cat conftest.$ac_ext >&5 133585+ rm -rf conftest* 133586+ eval "ac_cv_lib_$ac_lib_var=no" 133587+fi 133588+rm -f conftest* 133589+LIBS="$ac_save_LIBS" 133590+ 133591+fi 133592+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 133593+ echo "$ac_t""yes" 1>&6 133594 found=yes 133595 else 133596+ echo "$ac_t""no" 1>&6 133597 133598- echo "$as_me:$LINENO: checking for __dn_skipname in -lresolv" >&5 133599-echo $ECHO_N "checking for __dn_skipname in -lresolv... $ECHO_C" >&6 133600-if test "${ac_cv_lib_resolv___dn_skipname+set}" = set; then 133601- echo $ECHO_N "(cached) $ECHO_C" >&6 133602+ echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 133603+echo "configure:90087: checking for __dn_skipname in -lresolv" >&5 133604+ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` 133605+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 133606+ echo $ac_n "(cached) $ac_c" 1>&6 133607 else 133608- ac_check_lib_save_LIBS=$LIBS 133609+ ac_save_LIBS="$LIBS" 133610 LIBS="-lresolv $LIBS" 133611-cat >conftest.$ac_ext <<_ACEOF 133612-/* confdefs.h. */ 133613-_ACEOF 133614-cat confdefs.h >>conftest.$ac_ext 133615-cat >>conftest.$ac_ext <<_ACEOF 133616-/* end confdefs.h. */ 133617- 133618+cat > conftest.$ac_ext <<EOF 133619+#line 90095 "configure" 133620+#include "confdefs.h" 133621 /* Override any gcc2 internal prototype to avoid an error. */ 133622-#ifdef __cplusplus 133623-extern "C" 133624-#endif 133625 /* We use char because int might match the return type of a gcc2 133626- builtin and then its argument prototype would still apply. */ 133627-char __dn_skipname (); 133628-int 133629-main () 133630-{ 133631-__dn_skipname (); 133632- ; 133633- return 0; 133634-} 133635-_ACEOF 133636-rm -f conftest.$ac_objext conftest$ac_exeext 133637-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133638- (eval $ac_link) 2>conftest.er1 133639- ac_status=$? 133640- grep -v '^ *+' conftest.er1 >conftest.err 133641- rm -f conftest.er1 133642- cat conftest.err >&5 133643- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133644- (exit $ac_status); } && 133645- { ac_try='test -z "$ac_c_werror_flag" 133646- || test ! -s conftest.err' 133647- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133648- (eval $ac_try) 2>&5 133649- ac_status=$? 133650- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133651- (exit $ac_status); }; } && 133652- { ac_try='test -s conftest$ac_exeext' 133653- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133654- (eval $ac_try) 2>&5 133655- ac_status=$? 133656- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133657- (exit $ac_status); }; }; then 133658- ac_cv_lib_resolv___dn_skipname=yes 133659-else 133660- echo "$as_me: failed program was:" >&5 133661-sed 's/^/| /' conftest.$ac_ext >&5 133662- 133663-ac_cv_lib_resolv___dn_skipname=no 133664-fi 133665-rm -f conftest.err conftest.$ac_objext \ 133666- conftest$ac_exeext conftest.$ac_ext 133667-LIBS=$ac_check_lib_save_LIBS 133668-fi 133669-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_skipname" >&5 133670-echo "${ECHO_T}$ac_cv_lib_resolv___dn_skipname" >&6 133671-if test $ac_cv_lib_resolv___dn_skipname = yes; then 133672- found=yes 133673+ builtin and then its argument prototype would still apply. */ 133674+char __dn_skipname(); 133675+ 133676+int main() { 133677+__dn_skipname() 133678+; return 0; } 133679+EOF 133680+if { (eval echo configure:90106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133681+ rm -rf conftest* 133682+ eval "ac_cv_lib_$ac_lib_var=yes" 133683 else 133684- found=no 133685+ echo "configure: failed program was:" >&5 133686+ cat conftest.$ac_ext >&5 133687+ rm -rf conftest* 133688+ eval "ac_cv_lib_$ac_lib_var=no" 133689 fi 133690+rm -f conftest* 133691+LIBS="$ac_save_LIBS" 133692 133693+fi 133694+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 133695+ echo "$ac_t""yes" 1>&6 133696+ found=yes 133697+else 133698+ echo "$ac_t""no" 1>&6 133699+found=no 133700+fi 133701 133702+ 133703 fi 133704 133705 133706@@ -115969,206 +90133,133 @@ 133707 if test "$cross_compiling" = yes; then 133708 found=no 133709 else 133710- cat >conftest.$ac_ext <<_ACEOF 133711-/* confdefs.h. */ 133712-_ACEOF 133713-cat confdefs.h >>conftest.$ac_ext 133714-cat >>conftest.$ac_ext <<_ACEOF 133715-/* end confdefs.h. */ 133716+ cat > conftest.$ac_ext <<EOF 133717+#line 90138 "configure" 133718+#include "confdefs.h" 133719 main() { return (0); } 133720-_ACEOF 133721-rm -f conftest$ac_exeext 133722-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133723- (eval $ac_link) 2>&5 133724- ac_status=$? 133725- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133726- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 133727- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133728- (eval $ac_try) 2>&5 133729- ac_status=$? 133730- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133731- (exit $ac_status); }; }; then 133732+EOF 133733+if { (eval echo configure:90142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 133734+then 133735 found=yes 133736 else 133737- echo "$as_me: program exited with status $ac_status" >&5 133738-echo "$as_me: failed program was:" >&5 133739-sed 's/^/| /' conftest.$ac_ext >&5 133740- 133741-( exit $ac_status ) 133742-found=no 133743+ echo "configure: failed program was:" >&5 133744+ cat conftest.$ac_ext >&5 133745+ rm -fr conftest* 133746+ found=no 133747 fi 133748-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 133749+rm -fr conftest* 133750 fi 133751+ 133752 LIBS=$ac_libs 133753 fi 133754 133755 if test "$found" = "yes"; then 133756- 133757- 133758+ 133759+ 133760 case resolv in 133761 c|c_r|pthread*) ;; 133762- *) 133763- LIBS="-lresolv $LIBS" 133764+ *) 133765+ LIBS="-lresolv $LIBS" 133766 ;; 133767 esac 133768 133769 133770- 133771-cat >>confdefs.h <<\_ACEOF 133772+ cat >> confdefs.h <<\EOF 133773 #define HAVE_DN_SKIPNAME 1 133774-_ACEOF 133775- 133776+EOF 133777 133778-cat >>confdefs.h <<\_ACEOF 133779+ cat >> confdefs.h <<\EOF 133780 #define HAVE_LIBRESOLV 1 133781-_ACEOF 133782+EOF 133783 133784 ac_cv_func_dn_skipname=yes 133785 else 133786- 133787- 133788+ 133789+ 133790 unset ac_cv_lib_bind_dn_skipname 133791 unset ac_cv_lib_bind___dn_skipname 133792 unset found 133793- echo "$as_me:$LINENO: checking for dn_skipname in -lbind" >&5 133794-echo $ECHO_N "checking for dn_skipname in -lbind... $ECHO_C" >&6 133795-if test "${ac_cv_lib_bind_dn_skipname+set}" = set; then 133796- echo $ECHO_N "(cached) $ECHO_C" >&6 133797+ echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 133798+echo "configure:90184: checking for dn_skipname in -lbind" >&5 133799+ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'` 133800+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 133801+ echo $ac_n "(cached) $ac_c" 1>&6 133802 else 133803- ac_check_lib_save_LIBS=$LIBS 133804+ ac_save_LIBS="$LIBS" 133805 LIBS="-lbind $LIBS" 133806-cat >conftest.$ac_ext <<_ACEOF 133807-/* confdefs.h. */ 133808-_ACEOF 133809-cat confdefs.h >>conftest.$ac_ext 133810-cat >>conftest.$ac_ext <<_ACEOF 133811-/* end confdefs.h. */ 133812- 133813+cat > conftest.$ac_ext <<EOF 133814+#line 90192 "configure" 133815+#include "confdefs.h" 133816 /* Override any gcc2 internal prototype to avoid an error. */ 133817-#ifdef __cplusplus 133818-extern "C" 133819-#endif 133820 /* We use char because int might match the return type of a gcc2 133821- builtin and then its argument prototype would still apply. */ 133822-char dn_skipname (); 133823-int 133824-main () 133825-{ 133826-dn_skipname (); 133827- ; 133828- return 0; 133829-} 133830-_ACEOF 133831-rm -f conftest.$ac_objext conftest$ac_exeext 133832-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133833- (eval $ac_link) 2>conftest.er1 133834- ac_status=$? 133835- grep -v '^ *+' conftest.er1 >conftest.err 133836- rm -f conftest.er1 133837- cat conftest.err >&5 133838- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133839- (exit $ac_status); } && 133840- { ac_try='test -z "$ac_c_werror_flag" 133841- || test ! -s conftest.err' 133842- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133843- (eval $ac_try) 2>&5 133844- ac_status=$? 133845- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133846- (exit $ac_status); }; } && 133847- { ac_try='test -s conftest$ac_exeext' 133848- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133849- (eval $ac_try) 2>&5 133850- ac_status=$? 133851- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133852- (exit $ac_status); }; }; then 133853- ac_cv_lib_bind_dn_skipname=yes 133854-else 133855- echo "$as_me: failed program was:" >&5 133856-sed 's/^/| /' conftest.$ac_ext >&5 133857- 133858-ac_cv_lib_bind_dn_skipname=no 133859-fi 133860-rm -f conftest.err conftest.$ac_objext \ 133861- conftest$ac_exeext conftest.$ac_ext 133862-LIBS=$ac_check_lib_save_LIBS 133863-fi 133864-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_skipname" >&5 133865-echo "${ECHO_T}$ac_cv_lib_bind_dn_skipname" >&6 133866-if test $ac_cv_lib_bind_dn_skipname = yes; then 133867+ builtin and then its argument prototype would still apply. */ 133868+char dn_skipname(); 133869+ 133870+int main() { 133871+dn_skipname() 133872+; return 0; } 133873+EOF 133874+if { (eval echo configure:90203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133875+ rm -rf conftest* 133876+ eval "ac_cv_lib_$ac_lib_var=yes" 133877+else 133878+ echo "configure: failed program was:" >&5 133879+ cat conftest.$ac_ext >&5 133880+ rm -rf conftest* 133881+ eval "ac_cv_lib_$ac_lib_var=no" 133882+fi 133883+rm -f conftest* 133884+LIBS="$ac_save_LIBS" 133885+ 133886+fi 133887+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 133888+ echo "$ac_t""yes" 1>&6 133889 found=yes 133890 else 133891+ echo "$ac_t""no" 1>&6 133892 133893- echo "$as_me:$LINENO: checking for __dn_skipname in -lbind" >&5 133894-echo $ECHO_N "checking for __dn_skipname in -lbind... $ECHO_C" >&6 133895-if test "${ac_cv_lib_bind___dn_skipname+set}" = set; then 133896- echo $ECHO_N "(cached) $ECHO_C" >&6 133897+ echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 133898+echo "configure:90223: checking for __dn_skipname in -lbind" >&5 133899+ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` 133900+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 133901+ echo $ac_n "(cached) $ac_c" 1>&6 133902 else 133903- ac_check_lib_save_LIBS=$LIBS 133904+ ac_save_LIBS="$LIBS" 133905 LIBS="-lbind $LIBS" 133906-cat >conftest.$ac_ext <<_ACEOF 133907-/* confdefs.h. */ 133908-_ACEOF 133909-cat confdefs.h >>conftest.$ac_ext 133910-cat >>conftest.$ac_ext <<_ACEOF 133911-/* end confdefs.h. */ 133912- 133913+cat > conftest.$ac_ext <<EOF 133914+#line 90231 "configure" 133915+#include "confdefs.h" 133916 /* Override any gcc2 internal prototype to avoid an error. */ 133917-#ifdef __cplusplus 133918-extern "C" 133919-#endif 133920 /* We use char because int might match the return type of a gcc2 133921- builtin and then its argument prototype would still apply. */ 133922-char __dn_skipname (); 133923-int 133924-main () 133925-{ 133926-__dn_skipname (); 133927- ; 133928- return 0; 133929-} 133930-_ACEOF 133931-rm -f conftest.$ac_objext conftest$ac_exeext 133932-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 133933- (eval $ac_link) 2>conftest.er1 133934- ac_status=$? 133935- grep -v '^ *+' conftest.er1 >conftest.err 133936- rm -f conftest.er1 133937- cat conftest.err >&5 133938- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133939- (exit $ac_status); } && 133940- { ac_try='test -z "$ac_c_werror_flag" 133941- || test ! -s conftest.err' 133942- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133943- (eval $ac_try) 2>&5 133944- ac_status=$? 133945- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133946- (exit $ac_status); }; } && 133947- { ac_try='test -s conftest$ac_exeext' 133948- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 133949- (eval $ac_try) 2>&5 133950- ac_status=$? 133951- echo "$as_me:$LINENO: \$? = $ac_status" >&5 133952- (exit $ac_status); }; }; then 133953- ac_cv_lib_bind___dn_skipname=yes 133954-else 133955- echo "$as_me: failed program was:" >&5 133956-sed 's/^/| /' conftest.$ac_ext >&5 133957- 133958-ac_cv_lib_bind___dn_skipname=no 133959-fi 133960-rm -f conftest.err conftest.$ac_objext \ 133961- conftest$ac_exeext conftest.$ac_ext 133962-LIBS=$ac_check_lib_save_LIBS 133963-fi 133964-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_skipname" >&5 133965-echo "${ECHO_T}$ac_cv_lib_bind___dn_skipname" >&6 133966-if test $ac_cv_lib_bind___dn_skipname = yes; then 133967- found=yes 133968+ builtin and then its argument prototype would still apply. */ 133969+char __dn_skipname(); 133970+ 133971+int main() { 133972+__dn_skipname() 133973+; return 0; } 133974+EOF 133975+if { (eval echo configure:90242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 133976+ rm -rf conftest* 133977+ eval "ac_cv_lib_$ac_lib_var=yes" 133978 else 133979- found=no 133980+ echo "configure: failed program was:" >&5 133981+ cat conftest.$ac_ext >&5 133982+ rm -rf conftest* 133983+ eval "ac_cv_lib_$ac_lib_var=no" 133984 fi 133985+rm -f conftest* 133986+LIBS="$ac_save_LIBS" 133987 133988+fi 133989+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 133990+ echo "$ac_t""yes" 1>&6 133991+ found=yes 133992+else 133993+ echo "$ac_t""no" 1>&6 133994+found=no 133995+fi 133996 133997+ 133998 fi 133999 134000 134001@@ -116178,206 +90269,133 @@ 134002 if test "$cross_compiling" = yes; then 134003 found=no 134004 else 134005- cat >conftest.$ac_ext <<_ACEOF 134006-/* confdefs.h. */ 134007-_ACEOF 134008-cat confdefs.h >>conftest.$ac_ext 134009-cat >>conftest.$ac_ext <<_ACEOF 134010-/* end confdefs.h. */ 134011+ cat > conftest.$ac_ext <<EOF 134012+#line 90274 "configure" 134013+#include "confdefs.h" 134014 main() { return (0); } 134015-_ACEOF 134016-rm -f conftest$ac_exeext 134017-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134018- (eval $ac_link) 2>&5 134019- ac_status=$? 134020- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134021- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 134022- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134023- (eval $ac_try) 2>&5 134024- ac_status=$? 134025- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134026- (exit $ac_status); }; }; then 134027+EOF 134028+if { (eval echo configure:90278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 134029+then 134030 found=yes 134031 else 134032- echo "$as_me: program exited with status $ac_status" >&5 134033-echo "$as_me: failed program was:" >&5 134034-sed 's/^/| /' conftest.$ac_ext >&5 134035- 134036-( exit $ac_status ) 134037-found=no 134038+ echo "configure: failed program was:" >&5 134039+ cat conftest.$ac_ext >&5 134040+ rm -fr conftest* 134041+ found=no 134042 fi 134043-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 134044+rm -fr conftest* 134045 fi 134046+ 134047 LIBS=$ac_libs 134048 fi 134049 134050 if test "$found" = "yes"; then 134051- 134052- 134053+ 134054+ 134055 case bind in 134056 c|c_r|pthread*) ;; 134057- *) 134058- LIBS="-lbind $LIBS" 134059+ *) 134060+ LIBS="-lbind $LIBS" 134061 ;; 134062 esac 134063 134064 134065- 134066-cat >>confdefs.h <<\_ACEOF 134067+ cat >> confdefs.h <<\EOF 134068 #define HAVE_DN_SKIPNAME 1 134069-_ACEOF 134070- 134071+EOF 134072 134073-cat >>confdefs.h <<\_ACEOF 134074+ cat >> confdefs.h <<\EOF 134075 #define HAVE_LIBBIND 1 134076-_ACEOF 134077+EOF 134078 134079 ac_cv_func_dn_skipname=yes 134080 else 134081- 134082- 134083+ 134084+ 134085 unset ac_cv_lib_socket_dn_skipname 134086 unset ac_cv_lib_socket___dn_skipname 134087 unset found 134088- echo "$as_me:$LINENO: checking for dn_skipname in -lsocket" >&5 134089-echo $ECHO_N "checking for dn_skipname in -lsocket... $ECHO_C" >&6 134090-if test "${ac_cv_lib_socket_dn_skipname+set}" = set; then 134091- echo $ECHO_N "(cached) $ECHO_C" >&6 134092+ echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 134093+echo "configure:90320: checking for dn_skipname in -lsocket" >&5 134094+ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'` 134095+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 134096+ echo $ac_n "(cached) $ac_c" 1>&6 134097 else 134098- ac_check_lib_save_LIBS=$LIBS 134099+ ac_save_LIBS="$LIBS" 134100 LIBS="-lsocket $LIBS" 134101-cat >conftest.$ac_ext <<_ACEOF 134102-/* confdefs.h. */ 134103-_ACEOF 134104-cat confdefs.h >>conftest.$ac_ext 134105-cat >>conftest.$ac_ext <<_ACEOF 134106-/* end confdefs.h. */ 134107- 134108+cat > conftest.$ac_ext <<EOF 134109+#line 90328 "configure" 134110+#include "confdefs.h" 134111 /* Override any gcc2 internal prototype to avoid an error. */ 134112-#ifdef __cplusplus 134113-extern "C" 134114-#endif 134115 /* We use char because int might match the return type of a gcc2 134116- builtin and then its argument prototype would still apply. */ 134117-char dn_skipname (); 134118-int 134119-main () 134120-{ 134121-dn_skipname (); 134122- ; 134123- return 0; 134124-} 134125-_ACEOF 134126-rm -f conftest.$ac_objext conftest$ac_exeext 134127-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134128- (eval $ac_link) 2>conftest.er1 134129- ac_status=$? 134130- grep -v '^ *+' conftest.er1 >conftest.err 134131- rm -f conftest.er1 134132- cat conftest.err >&5 134133- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134134- (exit $ac_status); } && 134135- { ac_try='test -z "$ac_c_werror_flag" 134136- || test ! -s conftest.err' 134137- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134138- (eval $ac_try) 2>&5 134139- ac_status=$? 134140- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134141- (exit $ac_status); }; } && 134142- { ac_try='test -s conftest$ac_exeext' 134143- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134144- (eval $ac_try) 2>&5 134145- ac_status=$? 134146- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134147- (exit $ac_status); }; }; then 134148- ac_cv_lib_socket_dn_skipname=yes 134149-else 134150- echo "$as_me: failed program was:" >&5 134151-sed 's/^/| /' conftest.$ac_ext >&5 134152- 134153-ac_cv_lib_socket_dn_skipname=no 134154-fi 134155-rm -f conftest.err conftest.$ac_objext \ 134156- conftest$ac_exeext conftest.$ac_ext 134157-LIBS=$ac_check_lib_save_LIBS 134158-fi 134159-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_skipname" >&5 134160-echo "${ECHO_T}$ac_cv_lib_socket_dn_skipname" >&6 134161-if test $ac_cv_lib_socket_dn_skipname = yes; then 134162+ builtin and then its argument prototype would still apply. */ 134163+char dn_skipname(); 134164+ 134165+int main() { 134166+dn_skipname() 134167+; return 0; } 134168+EOF 134169+if { (eval echo configure:90339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134170+ rm -rf conftest* 134171+ eval "ac_cv_lib_$ac_lib_var=yes" 134172+else 134173+ echo "configure: failed program was:" >&5 134174+ cat conftest.$ac_ext >&5 134175+ rm -rf conftest* 134176+ eval "ac_cv_lib_$ac_lib_var=no" 134177+fi 134178+rm -f conftest* 134179+LIBS="$ac_save_LIBS" 134180+ 134181+fi 134182+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 134183+ echo "$ac_t""yes" 1>&6 134184 found=yes 134185 else 134186+ echo "$ac_t""no" 1>&6 134187 134188- echo "$as_me:$LINENO: checking for __dn_skipname in -lsocket" >&5 134189-echo $ECHO_N "checking for __dn_skipname in -lsocket... $ECHO_C" >&6 134190-if test "${ac_cv_lib_socket___dn_skipname+set}" = set; then 134191- echo $ECHO_N "(cached) $ECHO_C" >&6 134192+ echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 134193+echo "configure:90359: checking for __dn_skipname in -lsocket" >&5 134194+ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` 134195+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 134196+ echo $ac_n "(cached) $ac_c" 1>&6 134197 else 134198- ac_check_lib_save_LIBS=$LIBS 134199+ ac_save_LIBS="$LIBS" 134200 LIBS="-lsocket $LIBS" 134201-cat >conftest.$ac_ext <<_ACEOF 134202-/* confdefs.h. */ 134203-_ACEOF 134204-cat confdefs.h >>conftest.$ac_ext 134205-cat >>conftest.$ac_ext <<_ACEOF 134206-/* end confdefs.h. */ 134207- 134208+cat > conftest.$ac_ext <<EOF 134209+#line 90367 "configure" 134210+#include "confdefs.h" 134211 /* Override any gcc2 internal prototype to avoid an error. */ 134212-#ifdef __cplusplus 134213-extern "C" 134214-#endif 134215 /* We use char because int might match the return type of a gcc2 134216- builtin and then its argument prototype would still apply. */ 134217-char __dn_skipname (); 134218-int 134219-main () 134220-{ 134221-__dn_skipname (); 134222- ; 134223- return 0; 134224-} 134225-_ACEOF 134226-rm -f conftest.$ac_objext conftest$ac_exeext 134227-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134228- (eval $ac_link) 2>conftest.er1 134229- ac_status=$? 134230- grep -v '^ *+' conftest.er1 >conftest.err 134231- rm -f conftest.er1 134232- cat conftest.err >&5 134233- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134234- (exit $ac_status); } && 134235- { ac_try='test -z "$ac_c_werror_flag" 134236- || test ! -s conftest.err' 134237- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134238- (eval $ac_try) 2>&5 134239- ac_status=$? 134240- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134241- (exit $ac_status); }; } && 134242- { ac_try='test -s conftest$ac_exeext' 134243- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134244- (eval $ac_try) 2>&5 134245- ac_status=$? 134246- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134247- (exit $ac_status); }; }; then 134248- ac_cv_lib_socket___dn_skipname=yes 134249-else 134250- echo "$as_me: failed program was:" >&5 134251-sed 's/^/| /' conftest.$ac_ext >&5 134252- 134253-ac_cv_lib_socket___dn_skipname=no 134254-fi 134255-rm -f conftest.err conftest.$ac_objext \ 134256- conftest$ac_exeext conftest.$ac_ext 134257-LIBS=$ac_check_lib_save_LIBS 134258-fi 134259-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_skipname" >&5 134260-echo "${ECHO_T}$ac_cv_lib_socket___dn_skipname" >&6 134261-if test $ac_cv_lib_socket___dn_skipname = yes; then 134262- found=yes 134263+ builtin and then its argument prototype would still apply. */ 134264+char __dn_skipname(); 134265+ 134266+int main() { 134267+__dn_skipname() 134268+; return 0; } 134269+EOF 134270+if { (eval echo configure:90378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134271+ rm -rf conftest* 134272+ eval "ac_cv_lib_$ac_lib_var=yes" 134273 else 134274- found=no 134275+ echo "configure: failed program was:" >&5 134276+ cat conftest.$ac_ext >&5 134277+ rm -rf conftest* 134278+ eval "ac_cv_lib_$ac_lib_var=no" 134279 fi 134280+rm -f conftest* 134281+LIBS="$ac_save_LIBS" 134282 134283+fi 134284+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 134285+ echo "$ac_t""yes" 1>&6 134286+ found=yes 134287+else 134288+ echo "$ac_t""no" 1>&6 134289+found=no 134290+fi 134291 134292+ 134293 fi 134294 134295 134296@@ -116387,75 +90405,60 @@ 134297 if test "$cross_compiling" = yes; then 134298 found=no 134299 else 134300- cat >conftest.$ac_ext <<_ACEOF 134301-/* confdefs.h. */ 134302-_ACEOF 134303-cat confdefs.h >>conftest.$ac_ext 134304-cat >>conftest.$ac_ext <<_ACEOF 134305-/* end confdefs.h. */ 134306+ cat > conftest.$ac_ext <<EOF 134307+#line 90410 "configure" 134308+#include "confdefs.h" 134309 main() { return (0); } 134310-_ACEOF 134311-rm -f conftest$ac_exeext 134312-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134313- (eval $ac_link) 2>&5 134314- ac_status=$? 134315- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134316- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 134317- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134318- (eval $ac_try) 2>&5 134319- ac_status=$? 134320- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134321- (exit $ac_status); }; }; then 134322+EOF 134323+if { (eval echo configure:90414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 134324+then 134325 found=yes 134326 else 134327- echo "$as_me: program exited with status $ac_status" >&5 134328-echo "$as_me: failed program was:" >&5 134329-sed 's/^/| /' conftest.$ac_ext >&5 134330- 134331-( exit $ac_status ) 134332-found=no 134333+ echo "configure: failed program was:" >&5 134334+ cat conftest.$ac_ext >&5 134335+ rm -fr conftest* 134336+ found=no 134337 fi 134338-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 134339+rm -fr conftest* 134340 fi 134341+ 134342 LIBS=$ac_libs 134343 fi 134344 134345 if test "$found" = "yes"; then 134346- 134347- 134348+ 134349+ 134350 case socket in 134351 c|c_r|pthread*) ;; 134352- *) 134353- LIBS="-lsocket $LIBS" 134354+ *) 134355+ LIBS="-lsocket $LIBS" 134356 ;; 134357 esac 134358 134359 134360- 134361-cat >>confdefs.h <<\_ACEOF 134362+ cat >> confdefs.h <<\EOF 134363 #define HAVE_DN_SKIPNAME 1 134364-_ACEOF 134365- 134366+EOF 134367 134368-cat >>confdefs.h <<\_ACEOF 134369+ cat >> confdefs.h <<\EOF 134370 #define HAVE_LIBSOCKET 1 134371-_ACEOF 134372+EOF 134373 134374 ac_cv_func_dn_skipname=yes 134375 else 134376- 134377+ 134378 : 134379 134380 fi 134381- 134382+ 134383 134384 fi 134385- 134386+ 134387 134388 fi 134389- 134390+ 134391 ;; 134392- 134393+ 134394 esac 134395 134396 134397@@ -116464,353 +90467,200 @@ 134398 unset ac_cv_func_res_search 134399 unset ac_cv_func___res_search 134400 unset found 134401- 134402- echo "$as_me:$LINENO: checking for res_search" >&5 134403-echo $ECHO_N "checking for res_search... $ECHO_C" >&6 134404-if test "${ac_cv_func_res_search+set}" = set; then 134405- echo $ECHO_N "(cached) $ECHO_C" >&6 134406-else 134407- cat >conftest.$ac_ext <<_ACEOF 134408-/* confdefs.h. */ 134409-_ACEOF 134410-cat confdefs.h >>conftest.$ac_ext 134411-cat >>conftest.$ac_ext <<_ACEOF 134412-/* end confdefs.h. */ 134413-/* Define res_search to an innocuous variant, in case <limits.h> declares res_search. 134414- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 134415-#define res_search innocuous_res_search 134416- 134417+ 134418+ echo $ac_n "checking for res_search""... $ac_c" 1>&6 134419+echo "configure:90473: checking for res_search" >&5 134420+if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then 134421+ echo $ac_n "(cached) $ac_c" 1>&6 134422+else 134423+ cat > conftest.$ac_ext <<EOF 134424+#line 90478 "configure" 134425+#include "confdefs.h" 134426 /* System header to define __stub macros and hopefully few prototypes, 134427- which can conflict with char res_search (); below. 134428- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 134429- <limits.h> exists even on freestanding compilers. */ 134430- 134431-#ifdef __STDC__ 134432-# include <limits.h> 134433-#else 134434-# include <assert.h> 134435-#endif 134436- 134437-#undef res_search 134438- 134439+ which can conflict with char res_search(); below. */ 134440+#include <assert.h> 134441 /* Override any gcc2 internal prototype to avoid an error. */ 134442-#ifdef __cplusplus 134443-extern "C" 134444-{ 134445-#endif 134446 /* We use char because int might match the return type of a gcc2 134447- builtin and then its argument prototype would still apply. */ 134448-char res_search (); 134449+ builtin and then its argument prototype would still apply. */ 134450+char res_search(); 134451+ 134452+int main() { 134453+ 134454 /* The GNU C library defines this for functions which it implements 134455 to always fail with ENOSYS. Some functions are actually named 134456 something starting with __ and the normal name is an alias. */ 134457 #if defined (__stub_res_search) || defined (__stub___res_search) 134458 choke me 134459 #else 134460-char (*f) () = res_search; 134461-#endif 134462-#ifdef __cplusplus 134463-} 134464+res_search(); 134465 #endif 134466 134467-int 134468-main () 134469-{ 134470-return f != res_search; 134471- ; 134472- return 0; 134473-} 134474-_ACEOF 134475-rm -f conftest.$ac_objext conftest$ac_exeext 134476-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134477- (eval $ac_link) 2>conftest.er1 134478- ac_status=$? 134479- grep -v '^ *+' conftest.er1 >conftest.err 134480- rm -f conftest.er1 134481- cat conftest.err >&5 134482- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134483- (exit $ac_status); } && 134484- { ac_try='test -z "$ac_c_werror_flag" 134485- || test ! -s conftest.err' 134486- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134487- (eval $ac_try) 2>&5 134488- ac_status=$? 134489- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134490- (exit $ac_status); }; } && 134491- { ac_try='test -s conftest$ac_exeext' 134492- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134493- (eval $ac_try) 2>&5 134494- ac_status=$? 134495- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134496- (exit $ac_status); }; }; then 134497- ac_cv_func_res_search=yes 134498-else 134499- echo "$as_me: failed program was:" >&5 134500-sed 's/^/| /' conftest.$ac_ext >&5 134501- 134502-ac_cv_func_res_search=no 134503-fi 134504-rm -f conftest.err conftest.$ac_objext \ 134505- conftest$ac_exeext conftest.$ac_ext 134506-fi 134507-echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5 134508-echo "${ECHO_T}$ac_cv_func_res_search" >&6 134509-if test $ac_cv_func_res_search = yes; then 134510- found=yes 134511+; return 0; } 134512+EOF 134513+if { (eval echo configure:90501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134514+ rm -rf conftest* 134515+ eval "ac_cv_func_res_search=yes" 134516 else 134517- echo "$as_me:$LINENO: checking for __res_search" >&5 134518-echo $ECHO_N "checking for __res_search... $ECHO_C" >&6 134519-if test "${ac_cv_func___res_search+set}" = set; then 134520- echo $ECHO_N "(cached) $ECHO_C" >&6 134521-else 134522- cat >conftest.$ac_ext <<_ACEOF 134523-/* confdefs.h. */ 134524-_ACEOF 134525-cat confdefs.h >>conftest.$ac_ext 134526-cat >>conftest.$ac_ext <<_ACEOF 134527-/* end confdefs.h. */ 134528-/* Define __res_search to an innocuous variant, in case <limits.h> declares __res_search. 134529- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 134530-#define __res_search innocuous___res_search 134531+ echo "configure: failed program was:" >&5 134532+ cat conftest.$ac_ext >&5 134533+ rm -rf conftest* 134534+ eval "ac_cv_func_res_search=no" 134535+fi 134536+rm -f conftest* 134537+fi 134538 134539+if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then 134540+ echo "$ac_t""yes" 1>&6 134541+ found=yes 134542+else 134543+ echo "$ac_t""no" 1>&6 134544+ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 134545+echo "configure:90519: checking for __res_search" >&5 134546+if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then 134547+ echo $ac_n "(cached) $ac_c" 1>&6 134548+else 134549+ cat > conftest.$ac_ext <<EOF 134550+#line 90524 "configure" 134551+#include "confdefs.h" 134552 /* System header to define __stub macros and hopefully few prototypes, 134553- which can conflict with char __res_search (); below. 134554- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 134555- <limits.h> exists even on freestanding compilers. */ 134556- 134557-#ifdef __STDC__ 134558-# include <limits.h> 134559-#else 134560-# include <assert.h> 134561-#endif 134562- 134563-#undef __res_search 134564- 134565+ which can conflict with char __res_search(); below. */ 134566+#include <assert.h> 134567 /* Override any gcc2 internal prototype to avoid an error. */ 134568-#ifdef __cplusplus 134569-extern "C" 134570-{ 134571-#endif 134572 /* We use char because int might match the return type of a gcc2 134573- builtin and then its argument prototype would still apply. */ 134574-char __res_search (); 134575+ builtin and then its argument prototype would still apply. */ 134576+char __res_search(); 134577+ 134578+int main() { 134579+ 134580 /* The GNU C library defines this for functions which it implements 134581 to always fail with ENOSYS. Some functions are actually named 134582 something starting with __ and the normal name is an alias. */ 134583 #if defined (__stub___res_search) || defined (__stub_____res_search) 134584 choke me 134585 #else 134586-char (*f) () = __res_search; 134587-#endif 134588-#ifdef __cplusplus 134589-} 134590+__res_search(); 134591 #endif 134592 134593-int 134594-main () 134595-{ 134596-return f != __res_search; 134597- ; 134598- return 0; 134599-} 134600-_ACEOF 134601-rm -f conftest.$ac_objext conftest$ac_exeext 134602-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134603- (eval $ac_link) 2>conftest.er1 134604- ac_status=$? 134605- grep -v '^ *+' conftest.er1 >conftest.err 134606- rm -f conftest.er1 134607- cat conftest.err >&5 134608- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134609- (exit $ac_status); } && 134610- { ac_try='test -z "$ac_c_werror_flag" 134611- || test ! -s conftest.err' 134612- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134613- (eval $ac_try) 2>&5 134614- ac_status=$? 134615- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134616- (exit $ac_status); }; } && 134617- { ac_try='test -s conftest$ac_exeext' 134618- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134619- (eval $ac_try) 2>&5 134620- ac_status=$? 134621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134622- (exit $ac_status); }; }; then 134623- ac_cv_func___res_search=yes 134624-else 134625- echo "$as_me: failed program was:" >&5 134626-sed 's/^/| /' conftest.$ac_ext >&5 134627- 134628-ac_cv_func___res_search=no 134629-fi 134630-rm -f conftest.err conftest.$ac_objext \ 134631- conftest$ac_exeext conftest.$ac_ext 134632-fi 134633-echo "$as_me:$LINENO: result: $ac_cv_func___res_search" >&5 134634-echo "${ECHO_T}$ac_cv_func___res_search" >&6 134635-if test $ac_cv_func___res_search = yes; then 134636- found=yes 134637+; return 0; } 134638+EOF 134639+if { (eval echo configure:90547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134640+ rm -rf conftest* 134641+ eval "ac_cv_func___res_search=yes" 134642 else 134643- found=no 134644+ echo "configure: failed program was:" >&5 134645+ cat conftest.$ac_ext >&5 134646+ rm -rf conftest* 134647+ eval "ac_cv_func___res_search=no" 134648+fi 134649+rm -f conftest* 134650 fi 134651 134652+if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then 134653+ echo "$ac_t""yes" 1>&6 134654+ found=yes 134655+else 134656+ echo "$ac_t""no" 1>&6 134657+found=no 134658+fi 134659+ 134660 fi 134661 134662 134663 case $found in 134664- yes) 134665- 134666-cat >>confdefs.h <<\_ACEOF 134667+ yes) 134668+ cat >> confdefs.h <<\EOF 134669 #define HAVE_RES_SEARCH 1 134670-_ACEOF 134671+EOF 134672 134673 ac_cv_func_res_search=yes 134674 ;; 134675- 134676- *) 134677- 134678+ 134679+ *) 134680+ 134681 unset ac_cv_lib_resolv_res_search 134682 unset ac_cv_lib_resolv___res_search 134683 unset found 134684- echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5 134685-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6 134686-if test "${ac_cv_lib_resolv_res_search+set}" = set; then 134687- echo $ECHO_N "(cached) $ECHO_C" >&6 134688+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 134689+echo "configure:90585: checking for res_search in -lresolv" >&5 134690+ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` 134691+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 134692+ echo $ac_n "(cached) $ac_c" 1>&6 134693 else 134694- ac_check_lib_save_LIBS=$LIBS 134695+ ac_save_LIBS="$LIBS" 134696 LIBS="-lresolv $LIBS" 134697-cat >conftest.$ac_ext <<_ACEOF 134698-/* confdefs.h. */ 134699-_ACEOF 134700-cat confdefs.h >>conftest.$ac_ext 134701-cat >>conftest.$ac_ext <<_ACEOF 134702-/* end confdefs.h. */ 134703- 134704+cat > conftest.$ac_ext <<EOF 134705+#line 90593 "configure" 134706+#include "confdefs.h" 134707 /* Override any gcc2 internal prototype to avoid an error. */ 134708-#ifdef __cplusplus 134709-extern "C" 134710-#endif 134711 /* We use char because int might match the return type of a gcc2 134712- builtin and then its argument prototype would still apply. */ 134713-char res_search (); 134714-int 134715-main () 134716-{ 134717-res_search (); 134718- ; 134719- return 0; 134720-} 134721-_ACEOF 134722-rm -f conftest.$ac_objext conftest$ac_exeext 134723-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134724- (eval $ac_link) 2>conftest.er1 134725- ac_status=$? 134726- grep -v '^ *+' conftest.er1 >conftest.err 134727- rm -f conftest.er1 134728- cat conftest.err >&5 134729- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134730- (exit $ac_status); } && 134731- { ac_try='test -z "$ac_c_werror_flag" 134732- || test ! -s conftest.err' 134733- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134734- (eval $ac_try) 2>&5 134735- ac_status=$? 134736- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134737- (exit $ac_status); }; } && 134738- { ac_try='test -s conftest$ac_exeext' 134739- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134740- (eval $ac_try) 2>&5 134741- ac_status=$? 134742- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134743- (exit $ac_status); }; }; then 134744- ac_cv_lib_resolv_res_search=yes 134745-else 134746- echo "$as_me: failed program was:" >&5 134747-sed 's/^/| /' conftest.$ac_ext >&5 134748- 134749-ac_cv_lib_resolv_res_search=no 134750-fi 134751-rm -f conftest.err conftest.$ac_objext \ 134752- conftest$ac_exeext conftest.$ac_ext 134753-LIBS=$ac_check_lib_save_LIBS 134754-fi 134755-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5 134756-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6 134757-if test $ac_cv_lib_resolv_res_search = yes; then 134758+ builtin and then its argument prototype would still apply. */ 134759+char res_search(); 134760+ 134761+int main() { 134762+res_search() 134763+; return 0; } 134764+EOF 134765+if { (eval echo configure:90604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134766+ rm -rf conftest* 134767+ eval "ac_cv_lib_$ac_lib_var=yes" 134768+else 134769+ echo "configure: failed program was:" >&5 134770+ cat conftest.$ac_ext >&5 134771+ rm -rf conftest* 134772+ eval "ac_cv_lib_$ac_lib_var=no" 134773+fi 134774+rm -f conftest* 134775+LIBS="$ac_save_LIBS" 134776+ 134777+fi 134778+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 134779+ echo "$ac_t""yes" 1>&6 134780 found=yes 134781 else 134782+ echo "$ac_t""no" 1>&6 134783 134784- echo "$as_me:$LINENO: checking for __res_search in -lresolv" >&5 134785-echo $ECHO_N "checking for __res_search in -lresolv... $ECHO_C" >&6 134786-if test "${ac_cv_lib_resolv___res_search+set}" = set; then 134787- echo $ECHO_N "(cached) $ECHO_C" >&6 134788+ echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 134789+echo "configure:90624: checking for __res_search in -lresolv" >&5 134790+ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` 134791+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 134792+ echo $ac_n "(cached) $ac_c" 1>&6 134793 else 134794- ac_check_lib_save_LIBS=$LIBS 134795+ ac_save_LIBS="$LIBS" 134796 LIBS="-lresolv $LIBS" 134797-cat >conftest.$ac_ext <<_ACEOF 134798-/* confdefs.h. */ 134799-_ACEOF 134800-cat confdefs.h >>conftest.$ac_ext 134801-cat >>conftest.$ac_ext <<_ACEOF 134802-/* end confdefs.h. */ 134803- 134804+cat > conftest.$ac_ext <<EOF 134805+#line 90632 "configure" 134806+#include "confdefs.h" 134807 /* Override any gcc2 internal prototype to avoid an error. */ 134808-#ifdef __cplusplus 134809-extern "C" 134810-#endif 134811 /* We use char because int might match the return type of a gcc2 134812- builtin and then its argument prototype would still apply. */ 134813-char __res_search (); 134814-int 134815-main () 134816-{ 134817-__res_search (); 134818- ; 134819- return 0; 134820-} 134821-_ACEOF 134822-rm -f conftest.$ac_objext conftest$ac_exeext 134823-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134824- (eval $ac_link) 2>conftest.er1 134825- ac_status=$? 134826- grep -v '^ *+' conftest.er1 >conftest.err 134827- rm -f conftest.er1 134828- cat conftest.err >&5 134829- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134830- (exit $ac_status); } && 134831- { ac_try='test -z "$ac_c_werror_flag" 134832- || test ! -s conftest.err' 134833- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134834- (eval $ac_try) 2>&5 134835- ac_status=$? 134836- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134837- (exit $ac_status); }; } && 134838- { ac_try='test -s conftest$ac_exeext' 134839- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134840- (eval $ac_try) 2>&5 134841- ac_status=$? 134842- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134843- (exit $ac_status); }; }; then 134844- ac_cv_lib_resolv___res_search=yes 134845-else 134846- echo "$as_me: failed program was:" >&5 134847-sed 's/^/| /' conftest.$ac_ext >&5 134848- 134849-ac_cv_lib_resolv___res_search=no 134850-fi 134851-rm -f conftest.err conftest.$ac_objext \ 134852- conftest$ac_exeext conftest.$ac_ext 134853-LIBS=$ac_check_lib_save_LIBS 134854-fi 134855-echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_search" >&5 134856-echo "${ECHO_T}$ac_cv_lib_resolv___res_search" >&6 134857-if test $ac_cv_lib_resolv___res_search = yes; then 134858- found=yes 134859+ builtin and then its argument prototype would still apply. */ 134860+char __res_search(); 134861+ 134862+int main() { 134863+__res_search() 134864+; return 0; } 134865+EOF 134866+if { (eval echo configure:90643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 134867+ rm -rf conftest* 134868+ eval "ac_cv_lib_$ac_lib_var=yes" 134869 else 134870- found=no 134871+ echo "configure: failed program was:" >&5 134872+ cat conftest.$ac_ext >&5 134873+ rm -rf conftest* 134874+ eval "ac_cv_lib_$ac_lib_var=no" 134875 fi 134876+rm -f conftest* 134877+LIBS="$ac_save_LIBS" 134878 134879+fi 134880+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 134881+ echo "$ac_t""yes" 1>&6 134882+ found=yes 134883+else 134884+ echo "$ac_t""no" 1>&6 134885+found=no 134886+fi 134887 134888+ 134889 fi 134890 134891 134892@@ -116820,206 +90670,133 @@ 134893 if test "$cross_compiling" = yes; then 134894 found=no 134895 else 134896- cat >conftest.$ac_ext <<_ACEOF 134897-/* confdefs.h. */ 134898-_ACEOF 134899-cat confdefs.h >>conftest.$ac_ext 134900-cat >>conftest.$ac_ext <<_ACEOF 134901-/* end confdefs.h. */ 134902+ cat > conftest.$ac_ext <<EOF 134903+#line 90675 "configure" 134904+#include "confdefs.h" 134905 main() { return (0); } 134906-_ACEOF 134907-rm -f conftest$ac_exeext 134908-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 134909- (eval $ac_link) 2>&5 134910- ac_status=$? 134911- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134912- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 134913- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 134914- (eval $ac_try) 2>&5 134915- ac_status=$? 134916- echo "$as_me:$LINENO: \$? = $ac_status" >&5 134917- (exit $ac_status); }; }; then 134918+EOF 134919+if { (eval echo configure:90679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 134920+then 134921 found=yes 134922 else 134923- echo "$as_me: program exited with status $ac_status" >&5 134924-echo "$as_me: failed program was:" >&5 134925-sed 's/^/| /' conftest.$ac_ext >&5 134926- 134927-( exit $ac_status ) 134928-found=no 134929+ echo "configure: failed program was:" >&5 134930+ cat conftest.$ac_ext >&5 134931+ rm -fr conftest* 134932+ found=no 134933 fi 134934-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 134935+rm -fr conftest* 134936 fi 134937+ 134938 LIBS=$ac_libs 134939 fi 134940 134941 if test "$found" = "yes"; then 134942- 134943- 134944+ 134945+ 134946 case resolv in 134947 c|c_r|pthread*) ;; 134948- *) 134949- LIBS="-lresolv $LIBS" 134950+ *) 134951+ LIBS="-lresolv $LIBS" 134952 ;; 134953 esac 134954 134955 134956- 134957-cat >>confdefs.h <<\_ACEOF 134958+ cat >> confdefs.h <<\EOF 134959 #define HAVE_RES_SEARCH 1 134960-_ACEOF 134961- 134962+EOF 134963 134964-cat >>confdefs.h <<\_ACEOF 134965+ cat >> confdefs.h <<\EOF 134966 #define HAVE_LIBRESOLV 1 134967-_ACEOF 134968+EOF 134969 134970 ac_cv_func_res_search=yes 134971 else 134972- 134973- 134974+ 134975+ 134976 unset ac_cv_lib_bind_res_search 134977 unset ac_cv_lib_bind___res_search 134978 unset found 134979- echo "$as_me:$LINENO: checking for res_search in -lbind" >&5 134980-echo $ECHO_N "checking for res_search in -lbind... $ECHO_C" >&6 134981-if test "${ac_cv_lib_bind_res_search+set}" = set; then 134982- echo $ECHO_N "(cached) $ECHO_C" >&6 134983+ echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 134984+echo "configure:90721: checking for res_search in -lbind" >&5 134985+ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` 134986+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 134987+ echo $ac_n "(cached) $ac_c" 1>&6 134988 else 134989- ac_check_lib_save_LIBS=$LIBS 134990+ ac_save_LIBS="$LIBS" 134991 LIBS="-lbind $LIBS" 134992-cat >conftest.$ac_ext <<_ACEOF 134993-/* confdefs.h. */ 134994-_ACEOF 134995-cat confdefs.h >>conftest.$ac_ext 134996-cat >>conftest.$ac_ext <<_ACEOF 134997-/* end confdefs.h. */ 134998- 134999+cat > conftest.$ac_ext <<EOF 135000+#line 90729 "configure" 135001+#include "confdefs.h" 135002 /* Override any gcc2 internal prototype to avoid an error. */ 135003-#ifdef __cplusplus 135004-extern "C" 135005-#endif 135006 /* We use char because int might match the return type of a gcc2 135007- builtin and then its argument prototype would still apply. */ 135008-char res_search (); 135009-int 135010-main () 135011-{ 135012-res_search (); 135013- ; 135014- return 0; 135015-} 135016-_ACEOF 135017-rm -f conftest.$ac_objext conftest$ac_exeext 135018-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135019- (eval $ac_link) 2>conftest.er1 135020- ac_status=$? 135021- grep -v '^ *+' conftest.er1 >conftest.err 135022- rm -f conftest.er1 135023- cat conftest.err >&5 135024- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135025- (exit $ac_status); } && 135026- { ac_try='test -z "$ac_c_werror_flag" 135027- || test ! -s conftest.err' 135028- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135029- (eval $ac_try) 2>&5 135030- ac_status=$? 135031- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135032- (exit $ac_status); }; } && 135033- { ac_try='test -s conftest$ac_exeext' 135034- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135035- (eval $ac_try) 2>&5 135036- ac_status=$? 135037- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135038- (exit $ac_status); }; }; then 135039- ac_cv_lib_bind_res_search=yes 135040-else 135041- echo "$as_me: failed program was:" >&5 135042-sed 's/^/| /' conftest.$ac_ext >&5 135043- 135044-ac_cv_lib_bind_res_search=no 135045-fi 135046-rm -f conftest.err conftest.$ac_objext \ 135047- conftest$ac_exeext conftest.$ac_ext 135048-LIBS=$ac_check_lib_save_LIBS 135049-fi 135050-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_search" >&5 135051-echo "${ECHO_T}$ac_cv_lib_bind_res_search" >&6 135052-if test $ac_cv_lib_bind_res_search = yes; then 135053+ builtin and then its argument prototype would still apply. */ 135054+char res_search(); 135055+ 135056+int main() { 135057+res_search() 135058+; return 0; } 135059+EOF 135060+if { (eval echo configure:90740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 135061+ rm -rf conftest* 135062+ eval "ac_cv_lib_$ac_lib_var=yes" 135063+else 135064+ echo "configure: failed program was:" >&5 135065+ cat conftest.$ac_ext >&5 135066+ rm -rf conftest* 135067+ eval "ac_cv_lib_$ac_lib_var=no" 135068+fi 135069+rm -f conftest* 135070+LIBS="$ac_save_LIBS" 135071+ 135072+fi 135073+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 135074+ echo "$ac_t""yes" 1>&6 135075 found=yes 135076 else 135077+ echo "$ac_t""no" 1>&6 135078 135079- echo "$as_me:$LINENO: checking for __res_search in -lbind" >&5 135080-echo $ECHO_N "checking for __res_search in -lbind... $ECHO_C" >&6 135081-if test "${ac_cv_lib_bind___res_search+set}" = set; then 135082- echo $ECHO_N "(cached) $ECHO_C" >&6 135083+ echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 135084+echo "configure:90760: checking for __res_search in -lbind" >&5 135085+ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` 135086+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 135087+ echo $ac_n "(cached) $ac_c" 1>&6 135088 else 135089- ac_check_lib_save_LIBS=$LIBS 135090+ ac_save_LIBS="$LIBS" 135091 LIBS="-lbind $LIBS" 135092-cat >conftest.$ac_ext <<_ACEOF 135093-/* confdefs.h. */ 135094-_ACEOF 135095-cat confdefs.h >>conftest.$ac_ext 135096-cat >>conftest.$ac_ext <<_ACEOF 135097-/* end confdefs.h. */ 135098- 135099+cat > conftest.$ac_ext <<EOF 135100+#line 90768 "configure" 135101+#include "confdefs.h" 135102 /* Override any gcc2 internal prototype to avoid an error. */ 135103-#ifdef __cplusplus 135104-extern "C" 135105-#endif 135106 /* We use char because int might match the return type of a gcc2 135107- builtin and then its argument prototype would still apply. */ 135108-char __res_search (); 135109-int 135110-main () 135111-{ 135112-__res_search (); 135113- ; 135114- return 0; 135115-} 135116-_ACEOF 135117-rm -f conftest.$ac_objext conftest$ac_exeext 135118-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135119- (eval $ac_link) 2>conftest.er1 135120- ac_status=$? 135121- grep -v '^ *+' conftest.er1 >conftest.err 135122- rm -f conftest.er1 135123- cat conftest.err >&5 135124- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135125- (exit $ac_status); } && 135126- { ac_try='test -z "$ac_c_werror_flag" 135127- || test ! -s conftest.err' 135128- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135129- (eval $ac_try) 2>&5 135130- ac_status=$? 135131- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135132- (exit $ac_status); }; } && 135133- { ac_try='test -s conftest$ac_exeext' 135134- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135135- (eval $ac_try) 2>&5 135136- ac_status=$? 135137- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135138- (exit $ac_status); }; }; then 135139- ac_cv_lib_bind___res_search=yes 135140-else 135141- echo "$as_me: failed program was:" >&5 135142-sed 's/^/| /' conftest.$ac_ext >&5 135143- 135144-ac_cv_lib_bind___res_search=no 135145-fi 135146-rm -f conftest.err conftest.$ac_objext \ 135147- conftest$ac_exeext conftest.$ac_ext 135148-LIBS=$ac_check_lib_save_LIBS 135149-fi 135150-echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_search" >&5 135151-echo "${ECHO_T}$ac_cv_lib_bind___res_search" >&6 135152-if test $ac_cv_lib_bind___res_search = yes; then 135153- found=yes 135154+ builtin and then its argument prototype would still apply. */ 135155+char __res_search(); 135156+ 135157+int main() { 135158+__res_search() 135159+; return 0; } 135160+EOF 135161+if { (eval echo configure:90779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 135162+ rm -rf conftest* 135163+ eval "ac_cv_lib_$ac_lib_var=yes" 135164 else 135165- found=no 135166+ echo "configure: failed program was:" >&5 135167+ cat conftest.$ac_ext >&5 135168+ rm -rf conftest* 135169+ eval "ac_cv_lib_$ac_lib_var=no" 135170 fi 135171+rm -f conftest* 135172+LIBS="$ac_save_LIBS" 135173 135174+fi 135175+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 135176+ echo "$ac_t""yes" 1>&6 135177+ found=yes 135178+else 135179+ echo "$ac_t""no" 1>&6 135180+found=no 135181+fi 135182 135183+ 135184 fi 135185 135186 135187@@ -117029,206 +90806,133 @@ 135188 if test "$cross_compiling" = yes; then 135189 found=no 135190 else 135191- cat >conftest.$ac_ext <<_ACEOF 135192-/* confdefs.h. */ 135193-_ACEOF 135194-cat confdefs.h >>conftest.$ac_ext 135195-cat >>conftest.$ac_ext <<_ACEOF 135196-/* end confdefs.h. */ 135197+ cat > conftest.$ac_ext <<EOF 135198+#line 90811 "configure" 135199+#include "confdefs.h" 135200 main() { return (0); } 135201-_ACEOF 135202-rm -f conftest$ac_exeext 135203-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135204- (eval $ac_link) 2>&5 135205- ac_status=$? 135206- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135207- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135208- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135209- (eval $ac_try) 2>&5 135210- ac_status=$? 135211- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135212- (exit $ac_status); }; }; then 135213+EOF 135214+if { (eval echo configure:90815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135215+then 135216 found=yes 135217 else 135218- echo "$as_me: program exited with status $ac_status" >&5 135219-echo "$as_me: failed program was:" >&5 135220-sed 's/^/| /' conftest.$ac_ext >&5 135221- 135222-( exit $ac_status ) 135223-found=no 135224+ echo "configure: failed program was:" >&5 135225+ cat conftest.$ac_ext >&5 135226+ rm -fr conftest* 135227+ found=no 135228 fi 135229-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135230+rm -fr conftest* 135231 fi 135232+ 135233 LIBS=$ac_libs 135234 fi 135235 135236 if test "$found" = "yes"; then 135237- 135238- 135239+ 135240+ 135241 case bind in 135242 c|c_r|pthread*) ;; 135243- *) 135244- LIBS="-lbind $LIBS" 135245+ *) 135246+ LIBS="-lbind $LIBS" 135247 ;; 135248 esac 135249 135250 135251- 135252-cat >>confdefs.h <<\_ACEOF 135253+ cat >> confdefs.h <<\EOF 135254 #define HAVE_RES_SEARCH 1 135255-_ACEOF 135256- 135257+EOF 135258 135259-cat >>confdefs.h <<\_ACEOF 135260+ cat >> confdefs.h <<\EOF 135261 #define HAVE_LIBBIND 1 135262-_ACEOF 135263+EOF 135264 135265 ac_cv_func_res_search=yes 135266 else 135267- 135268- 135269+ 135270+ 135271 unset ac_cv_lib_socket_res_search 135272 unset ac_cv_lib_socket___res_search 135273 unset found 135274- echo "$as_me:$LINENO: checking for res_search in -lsocket" >&5 135275-echo $ECHO_N "checking for res_search in -lsocket... $ECHO_C" >&6 135276-if test "${ac_cv_lib_socket_res_search+set}" = set; then 135277- echo $ECHO_N "(cached) $ECHO_C" >&6 135278+ echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 135279+echo "configure:90857: checking for res_search in -lsocket" >&5 135280+ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` 135281+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 135282+ echo $ac_n "(cached) $ac_c" 1>&6 135283 else 135284- ac_check_lib_save_LIBS=$LIBS 135285+ ac_save_LIBS="$LIBS" 135286 LIBS="-lsocket $LIBS" 135287-cat >conftest.$ac_ext <<_ACEOF 135288-/* confdefs.h. */ 135289-_ACEOF 135290-cat confdefs.h >>conftest.$ac_ext 135291-cat >>conftest.$ac_ext <<_ACEOF 135292-/* end confdefs.h. */ 135293- 135294+cat > conftest.$ac_ext <<EOF 135295+#line 90865 "configure" 135296+#include "confdefs.h" 135297 /* Override any gcc2 internal prototype to avoid an error. */ 135298-#ifdef __cplusplus 135299-extern "C" 135300-#endif 135301 /* We use char because int might match the return type of a gcc2 135302- builtin and then its argument prototype would still apply. */ 135303-char res_search (); 135304-int 135305-main () 135306-{ 135307-res_search (); 135308- ; 135309- return 0; 135310-} 135311-_ACEOF 135312-rm -f conftest.$ac_objext conftest$ac_exeext 135313-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135314- (eval $ac_link) 2>conftest.er1 135315- ac_status=$? 135316- grep -v '^ *+' conftest.er1 >conftest.err 135317- rm -f conftest.er1 135318- cat conftest.err >&5 135319- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135320- (exit $ac_status); } && 135321- { ac_try='test -z "$ac_c_werror_flag" 135322- || test ! -s conftest.err' 135323- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135324- (eval $ac_try) 2>&5 135325- ac_status=$? 135326- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135327- (exit $ac_status); }; } && 135328- { ac_try='test -s conftest$ac_exeext' 135329- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135330- (eval $ac_try) 2>&5 135331- ac_status=$? 135332- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135333- (exit $ac_status); }; }; then 135334- ac_cv_lib_socket_res_search=yes 135335-else 135336- echo "$as_me: failed program was:" >&5 135337-sed 's/^/| /' conftest.$ac_ext >&5 135338- 135339-ac_cv_lib_socket_res_search=no 135340-fi 135341-rm -f conftest.err conftest.$ac_objext \ 135342- conftest$ac_exeext conftest.$ac_ext 135343-LIBS=$ac_check_lib_save_LIBS 135344-fi 135345-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_search" >&5 135346-echo "${ECHO_T}$ac_cv_lib_socket_res_search" >&6 135347-if test $ac_cv_lib_socket_res_search = yes; then 135348+ builtin and then its argument prototype would still apply. */ 135349+char res_search(); 135350+ 135351+int main() { 135352+res_search() 135353+; return 0; } 135354+EOF 135355+if { (eval echo configure:90876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 135356+ rm -rf conftest* 135357+ eval "ac_cv_lib_$ac_lib_var=yes" 135358+else 135359+ echo "configure: failed program was:" >&5 135360+ cat conftest.$ac_ext >&5 135361+ rm -rf conftest* 135362+ eval "ac_cv_lib_$ac_lib_var=no" 135363+fi 135364+rm -f conftest* 135365+LIBS="$ac_save_LIBS" 135366+ 135367+fi 135368+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 135369+ echo "$ac_t""yes" 1>&6 135370 found=yes 135371 else 135372+ echo "$ac_t""no" 1>&6 135373 135374- echo "$as_me:$LINENO: checking for __res_search in -lsocket" >&5 135375-echo $ECHO_N "checking for __res_search in -lsocket... $ECHO_C" >&6 135376-if test "${ac_cv_lib_socket___res_search+set}" = set; then 135377- echo $ECHO_N "(cached) $ECHO_C" >&6 135378+ echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 135379+echo "configure:90896: checking for __res_search in -lsocket" >&5 135380+ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` 135381+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 135382+ echo $ac_n "(cached) $ac_c" 1>&6 135383 else 135384- ac_check_lib_save_LIBS=$LIBS 135385+ ac_save_LIBS="$LIBS" 135386 LIBS="-lsocket $LIBS" 135387-cat >conftest.$ac_ext <<_ACEOF 135388-/* confdefs.h. */ 135389-_ACEOF 135390-cat confdefs.h >>conftest.$ac_ext 135391-cat >>conftest.$ac_ext <<_ACEOF 135392-/* end confdefs.h. */ 135393- 135394+cat > conftest.$ac_ext <<EOF 135395+#line 90904 "configure" 135396+#include "confdefs.h" 135397 /* Override any gcc2 internal prototype to avoid an error. */ 135398-#ifdef __cplusplus 135399-extern "C" 135400-#endif 135401 /* We use char because int might match the return type of a gcc2 135402- builtin and then its argument prototype would still apply. */ 135403-char __res_search (); 135404-int 135405-main () 135406-{ 135407-__res_search (); 135408- ; 135409- return 0; 135410-} 135411-_ACEOF 135412-rm -f conftest.$ac_objext conftest$ac_exeext 135413-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135414- (eval $ac_link) 2>conftest.er1 135415- ac_status=$? 135416- grep -v '^ *+' conftest.er1 >conftest.err 135417- rm -f conftest.er1 135418- cat conftest.err >&5 135419- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135420- (exit $ac_status); } && 135421- { ac_try='test -z "$ac_c_werror_flag" 135422- || test ! -s conftest.err' 135423- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135424- (eval $ac_try) 2>&5 135425- ac_status=$? 135426- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135427- (exit $ac_status); }; } && 135428- { ac_try='test -s conftest$ac_exeext' 135429- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135430- (eval $ac_try) 2>&5 135431- ac_status=$? 135432- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135433- (exit $ac_status); }; }; then 135434- ac_cv_lib_socket___res_search=yes 135435-else 135436- echo "$as_me: failed program was:" >&5 135437-sed 's/^/| /' conftest.$ac_ext >&5 135438- 135439-ac_cv_lib_socket___res_search=no 135440-fi 135441-rm -f conftest.err conftest.$ac_objext \ 135442- conftest$ac_exeext conftest.$ac_ext 135443-LIBS=$ac_check_lib_save_LIBS 135444-fi 135445-echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_search" >&5 135446-echo "${ECHO_T}$ac_cv_lib_socket___res_search" >&6 135447-if test $ac_cv_lib_socket___res_search = yes; then 135448- found=yes 135449+ builtin and then its argument prototype would still apply. */ 135450+char __res_search(); 135451+ 135452+int main() { 135453+__res_search() 135454+; return 0; } 135455+EOF 135456+if { (eval echo configure:90915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 135457+ rm -rf conftest* 135458+ eval "ac_cv_lib_$ac_lib_var=yes" 135459 else 135460- found=no 135461+ echo "configure: failed program was:" >&5 135462+ cat conftest.$ac_ext >&5 135463+ rm -rf conftest* 135464+ eval "ac_cv_lib_$ac_lib_var=no" 135465 fi 135466+rm -f conftest* 135467+LIBS="$ac_save_LIBS" 135468 135469+fi 135470+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 135471+ echo "$ac_t""yes" 1>&6 135472+ found=yes 135473+else 135474+ echo "$ac_t""no" 1>&6 135475+found=no 135476+fi 135477 135478+ 135479 fi 135480 135481 135482@@ -117238,95 +90942,77 @@ 135483 if test "$cross_compiling" = yes; then 135484 found=no 135485 else 135486- cat >conftest.$ac_ext <<_ACEOF 135487-/* confdefs.h. */ 135488-_ACEOF 135489-cat confdefs.h >>conftest.$ac_ext 135490-cat >>conftest.$ac_ext <<_ACEOF 135491-/* end confdefs.h. */ 135492+ cat > conftest.$ac_ext <<EOF 135493+#line 90947 "configure" 135494+#include "confdefs.h" 135495 main() { return (0); } 135496-_ACEOF 135497-rm -f conftest$ac_exeext 135498-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135499- (eval $ac_link) 2>&5 135500- ac_status=$? 135501- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135502- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135503- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135504- (eval $ac_try) 2>&5 135505- ac_status=$? 135506- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135507- (exit $ac_status); }; }; then 135508+EOF 135509+if { (eval echo configure:90951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135510+then 135511 found=yes 135512 else 135513- echo "$as_me: program exited with status $ac_status" >&5 135514-echo "$as_me: failed program was:" >&5 135515-sed 's/^/| /' conftest.$ac_ext >&5 135516- 135517-( exit $ac_status ) 135518-found=no 135519+ echo "configure: failed program was:" >&5 135520+ cat conftest.$ac_ext >&5 135521+ rm -fr conftest* 135522+ found=no 135523 fi 135524-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135525+rm -fr conftest* 135526 fi 135527+ 135528 LIBS=$ac_libs 135529 fi 135530 135531 if test "$found" = "yes"; then 135532- 135533- 135534+ 135535+ 135536 case socket in 135537 c|c_r|pthread*) ;; 135538- *) 135539- LIBS="-lsocket $LIBS" 135540+ *) 135541+ LIBS="-lsocket $LIBS" 135542 ;; 135543 esac 135544 135545 135546- 135547-cat >>confdefs.h <<\_ACEOF 135548+ cat >> confdefs.h <<\EOF 135549 #define HAVE_RES_SEARCH 1 135550-_ACEOF 135551- 135552+EOF 135553 135554-cat >>confdefs.h <<\_ACEOF 135555+ cat >> confdefs.h <<\EOF 135556 #define HAVE_LIBSOCKET 1 135557-_ACEOF 135558+EOF 135559 135560 ac_cv_func_res_search=yes 135561 else 135562- 135563+ 135564 : 135565 135566 fi 135567- 135568+ 135569 135570 fi 135571- 135572+ 135573 135574 fi 135575- 135576+ 135577 ;; 135578- 135579+ 135580 esac 135581 135582 135583-echo "$as_me:$LINENO: checking whether atof() accepts NAN" >&5 135584-echo $ECHO_N "checking whether atof() accepts NAN... $ECHO_C" >&6 135585-if test "${ac_cv_atof_accept_nan+set}" = set; then 135586- echo $ECHO_N "(cached) $ECHO_C" >&6 135587+echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 135588+echo "configure:91004: checking whether atof() accepts NAN" >&5 135589+if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then 135590+ echo $ac_n "(cached) $ac_c" 1>&6 135591 else 135592- 135593+ 135594 if test "$cross_compiling" = yes; then 135595- 135596+ 135597 ac_cv_atof_accept_nan=no 135598 135599 else 135600- cat >conftest.$ac_ext <<_ACEOF 135601-/* confdefs.h. */ 135602-_ACEOF 135603-cat confdefs.h >>conftest.$ac_ext 135604-cat >>conftest.$ac_ext <<_ACEOF 135605-/* end confdefs.h. */ 135606+ cat > conftest.$ac_ext <<EOF 135607+#line 91015 "configure" 135608+#include "confdefs.h" 135609 135610 #include <math.h> 135611 #include <stdlib.h> 135612@@ -117344,61 +91030,47 @@ 135613 return zend_isnan(atof("NAN")) ? 0 : 1; 135614 } 135615 135616-_ACEOF 135617-rm -f conftest$ac_exeext 135618-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135619- (eval $ac_link) 2>&5 135620- ac_status=$? 135621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135622- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135623- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135624- (eval $ac_try) 2>&5 135625- ac_status=$? 135626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135627- (exit $ac_status); }; }; then 135628- 135629+EOF 135630+if { (eval echo configure:91035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135631+then 135632+ 135633 ac_cv_atof_accept_nan=yes 135634 135635 else 135636- echo "$as_me: program exited with status $ac_status" >&5 135637-echo "$as_me: failed program was:" >&5 135638-sed 's/^/| /' conftest.$ac_ext >&5 135639- 135640-( exit $ac_status ) 135641- 135642+ echo "configure: failed program was:" >&5 135643+ cat conftest.$ac_ext >&5 135644+ rm -fr conftest* 135645+ 135646 ac_cv_atof_accept_nan=no 135647 135648 fi 135649-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135650+rm -fr conftest* 135651 fi 135652+ 135653 fi 135654-echo "$as_me:$LINENO: result: $ac_cv_atof_accept_nan" >&5 135655-echo "${ECHO_T}$ac_cv_atof_accept_nan" >&6 135656-if test "$ac_cv_atof_accept_nan" = "yes"; then 135657 135658-cat >>confdefs.h <<\_ACEOF 135659+echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 135660+if test "$ac_cv_atof_accept_nan" = "yes"; then 135661+ cat >> confdefs.h <<\EOF 135662 #define HAVE_ATOF_ACCEPTS_NAN 1 135663-_ACEOF 135664+EOF 135665 135666 fi 135667 135668-echo "$as_me:$LINENO: checking whether atof() accepts INF" >&5 135669-echo $ECHO_N "checking whether atof() accepts INF... $ECHO_C" >&6 135670-if test "${ac_cv_atof_accept_inf+set}" = set; then 135671- echo $ECHO_N "(cached) $ECHO_C" >&6 135672+echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 135673+echo "configure:91062: checking whether atof() accepts INF" >&5 135674+if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then 135675+ echo $ac_n "(cached) $ac_c" 1>&6 135676 else 135677- 135678+ 135679 if test "$cross_compiling" = yes; then 135680- 135681+ 135682 ac_cv_atof_accept_inf=no 135683 135684 else 135685- cat >conftest.$ac_ext <<_ACEOF 135686-/* confdefs.h. */ 135687-_ACEOF 135688-cat confdefs.h >>conftest.$ac_ext 135689-cat >>conftest.$ac_ext <<_ACEOF 135690-/* end confdefs.h. */ 135691+ cat > conftest.$ac_ext <<EOF 135692+#line 91073 "configure" 135693+#include "confdefs.h" 135694 135695 #include <math.h> 135696 #include <stdlib.h> 135697@@ -117419,61 +91091,47 @@ 135698 return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; 135699 } 135700 135701-_ACEOF 135702-rm -f conftest$ac_exeext 135703-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135704- (eval $ac_link) 2>&5 135705- ac_status=$? 135706- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135707- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135708- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135709- (eval $ac_try) 2>&5 135710- ac_status=$? 135711- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135712- (exit $ac_status); }; }; then 135713- 135714+EOF 135715+if { (eval echo configure:91096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135716+then 135717+ 135718 ac_cv_atof_accept_inf=yes 135719 135720 else 135721- echo "$as_me: program exited with status $ac_status" >&5 135722-echo "$as_me: failed program was:" >&5 135723-sed 's/^/| /' conftest.$ac_ext >&5 135724- 135725-( exit $ac_status ) 135726- 135727+ echo "configure: failed program was:" >&5 135728+ cat conftest.$ac_ext >&5 135729+ rm -fr conftest* 135730+ 135731 ac_cv_atof_accept_inf=no 135732 135733 fi 135734-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135735+rm -fr conftest* 135736 fi 135737+ 135738 fi 135739-echo "$as_me:$LINENO: result: $ac_cv_atof_accept_inf" >&5 135740-echo "${ECHO_T}$ac_cv_atof_accept_inf" >&6 135741-if test "$ac_cv_atof_accept_inf" = "yes"; then 135742 135743-cat >>confdefs.h <<\_ACEOF 135744+echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 135745+if test "$ac_cv_atof_accept_inf" = "yes"; then 135746+ cat >> confdefs.h <<\EOF 135747 #define HAVE_ATOF_ACCEPTS_INF 1 135748-_ACEOF 135749+EOF 135750 135751 fi 135752 135753-echo "$as_me:$LINENO: checking whether HUGE_VAL == INF" >&5 135754-echo $ECHO_N "checking whether HUGE_VAL == INF... $ECHO_C" >&6 135755-if test "${ac_cv_huge_val_inf+set}" = set; then 135756- echo $ECHO_N "(cached) $ECHO_C" >&6 135757+echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 135758+echo "configure:91123: checking whether HUGE_VAL == INF" >&5 135759+if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then 135760+ echo $ac_n "(cached) $ac_c" 1>&6 135761 else 135762- 135763+ 135764 if test "$cross_compiling" = yes; then 135765- 135766+ 135767 ac_cv_huge_val_inf=yes 135768 135769 else 135770- cat >conftest.$ac_ext <<_ACEOF 135771-/* confdefs.h. */ 135772-_ACEOF 135773-cat confdefs.h >>conftest.$ac_ext 135774-cat >>conftest.$ac_ext <<_ACEOF 135775-/* end confdefs.h. */ 135776+ cat > conftest.$ac_ext <<EOF 135777+#line 91134 "configure" 135778+#include "confdefs.h" 135779 135780 #include <math.h> 135781 #include <stdlib.h> 135782@@ -117494,61 +91152,47 @@ 135783 return zend_isinf(HUGE_VAL) ? 0 : 1; 135784 } 135785 135786-_ACEOF 135787-rm -f conftest$ac_exeext 135788-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135789- (eval $ac_link) 2>&5 135790- ac_status=$? 135791- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135792- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135793- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135794- (eval $ac_try) 2>&5 135795- ac_status=$? 135796- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135797- (exit $ac_status); }; }; then 135798- 135799+EOF 135800+if { (eval echo configure:91157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135801+then 135802+ 135803 ac_cv_huge_val_inf=yes 135804 135805 else 135806- echo "$as_me: program exited with status $ac_status" >&5 135807-echo "$as_me: failed program was:" >&5 135808-sed 's/^/| /' conftest.$ac_ext >&5 135809- 135810-( exit $ac_status ) 135811- 135812+ echo "configure: failed program was:" >&5 135813+ cat conftest.$ac_ext >&5 135814+ rm -fr conftest* 135815+ 135816 ac_cv_huge_val_inf=no 135817 135818 fi 135819-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135820+rm -fr conftest* 135821 fi 135822+ 135823 fi 135824-echo "$as_me:$LINENO: result: $ac_cv_huge_val_inf" >&5 135825-echo "${ECHO_T}$ac_cv_huge_val_inf" >&6 135826-if test "$ac_cv_huge_val_inf" = "yes"; then 135827 135828-cat >>confdefs.h <<\_ACEOF 135829+echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 135830+if test "$ac_cv_huge_val_inf" = "yes"; then 135831+ cat >> confdefs.h <<\EOF 135832 #define HAVE_HUGE_VAL_INF 1 135833-_ACEOF 135834+EOF 135835 135836 fi 135837 135838-echo "$as_me:$LINENO: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 135839-echo $ECHO_N "checking whether HUGE_VAL + -HUGEVAL == NAN... $ECHO_C" >&6 135840-if test "${ac_cv_huge_val_nan+set}" = set; then 135841- echo $ECHO_N "(cached) $ECHO_C" >&6 135842+echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 135843+echo "configure:91184: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 135844+if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then 135845+ echo $ac_n "(cached) $ac_c" 1>&6 135846 else 135847- 135848+ 135849 if test "$cross_compiling" = yes; then 135850- 135851+ 135852 ac_cv_huge_val_nan=yes 135853 135854 else 135855- cat >conftest.$ac_ext <<_ACEOF 135856-/* confdefs.h. */ 135857-_ACEOF 135858-cat confdefs.h >>conftest.$ac_ext 135859-cat >>conftest.$ac_ext <<_ACEOF 135860-/* end confdefs.h. */ 135861+ cat > conftest.$ac_ext <<EOF 135862+#line 91195 "configure" 135863+#include "confdefs.h" 135864 135865 #include <math.h> 135866 #include <stdlib.h> 135867@@ -117571,62 +91215,46 @@ 135868 #endif 135869 } 135870 135871-_ACEOF 135872-rm -f conftest$ac_exeext 135873-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 135874- (eval $ac_link) 2>&5 135875- ac_status=$? 135876- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135877- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 135878- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135879- (eval $ac_try) 2>&5 135880- ac_status=$? 135881- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135882- (exit $ac_status); }; }; then 135883- 135884+EOF 135885+if { (eval echo configure:91220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 135886+then 135887+ 135888 ac_cv_huge_val_nan=yes 135889 135890 else 135891- echo "$as_me: program exited with status $ac_status" >&5 135892-echo "$as_me: failed program was:" >&5 135893-sed 's/^/| /' conftest.$ac_ext >&5 135894- 135895-( exit $ac_status ) 135896- 135897+ echo "configure: failed program was:" >&5 135898+ cat conftest.$ac_ext >&5 135899+ rm -fr conftest* 135900+ 135901 ac_cv_huge_val_nan=no 135902 135903 fi 135904-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 135905+rm -fr conftest* 135906 fi 135907+ 135908 fi 135909-echo "$as_me:$LINENO: result: $ac_cv_huge_val_nan" >&5 135910-echo "${ECHO_T}$ac_cv_huge_val_nan" >&6 135911-if test "$ac_cv_huge_val_nan" = "yes"; then 135912 135913-cat >>confdefs.h <<\_ACEOF 135914+echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 135915+if test "$ac_cv_huge_val_nan" = "yes"; then 135916+ cat >> confdefs.h <<\EOF 135917 #define HAVE_HUGE_VAL_NAN 1 135918-_ACEOF 135919+EOF 135920 135921 fi 135922 135923-echo "$as_me:$LINENO: checking whether strptime() declaration fails" >&5 135924-echo $ECHO_N "checking whether strptime() declaration fails... $ECHO_C" >&6 135925-if test "${ac_cv_strptime_decl_fails+set}" = set; then 135926- echo $ECHO_N "(cached) $ECHO_C" >&6 135927+echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 135928+echo "configure:91247: checking whether strptime() declaration fails" >&5 135929+if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then 135930+ echo $ac_n "(cached) $ac_c" 1>&6 135931 else 135932- 135933-cat >conftest.$ac_ext <<_ACEOF 135934-/* confdefs.h. */ 135935-_ACEOF 135936-cat confdefs.h >>conftest.$ac_ext 135937-cat >>conftest.$ac_ext <<_ACEOF 135938-/* end confdefs.h. */ 135939+ 135940+cat > conftest.$ac_ext <<EOF 135941+#line 91253 "configure" 135942+#include "confdefs.h" 135943 135944 #include <time.h> 135945 135946-int 135947-main () 135948-{ 135949+int main() { 135950 135951 #ifndef HAVE_STRPTIME 135952 #error no strptime() on this platform 135953@@ -117635,630 +91263,264 @@ 135954 int strptime(const char *s, const char *format, struct tm *tm); 135955 #endif 135956 135957- ; 135958- return 0; 135959-} 135960-_ACEOF 135961-rm -f conftest.$ac_objext 135962-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 135963- (eval $ac_compile) 2>conftest.er1 135964- ac_status=$? 135965- grep -v '^ *+' conftest.er1 >conftest.err 135966- rm -f conftest.er1 135967- cat conftest.err >&5 135968- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135969- (exit $ac_status); } && 135970- { ac_try='test -z "$ac_c_werror_flag" 135971- || test ! -s conftest.err' 135972- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135973- (eval $ac_try) 2>&5 135974- ac_status=$? 135975- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135976- (exit $ac_status); }; } && 135977- { ac_try='test -s conftest.$ac_objext' 135978- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 135979- (eval $ac_try) 2>&5 135980- ac_status=$? 135981- echo "$as_me:$LINENO: \$? = $ac_status" >&5 135982- (exit $ac_status); }; }; then 135983- 135984+; return 0; } 135985+EOF 135986+if { (eval echo configure:91269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 135987+ rm -rf conftest* 135988+ 135989 ac_cv_strptime_decl_fails=no 135990 135991 else 135992- echo "$as_me: failed program was:" >&5 135993-sed 's/^/| /' conftest.$ac_ext >&5 135994- 135995- 135996+ echo "configure: failed program was:" >&5 135997+ cat conftest.$ac_ext >&5 135998+ rm -rf conftest* 135999+ 136000 ac_cv_strptime_decl_fails=yes 136001 136002 fi 136003-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 136004+rm -f conftest* 136005 fi 136006-echo "$as_me:$LINENO: result: $ac_cv_strptime_decl_fails" >&5 136007-echo "${ECHO_T}$ac_cv_strptime_decl_fails" >&6 136008-if test "$ac_cv_strptime_decl_fails" = "yes"; then 136009 136010-cat >>confdefs.h <<\_ACEOF 136011+echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 136012+if test "$ac_cv_strptime_decl_fails" = "yes"; then 136013+ cat >> confdefs.h <<\EOF 136014 #define HAVE_STRPTIME_DECL_FAILS 1 136015-_ACEOF 136016+EOF 136017 136018 fi 136019 136020- 136021-for ac_header in wchar.h 136022+for ac_hdr in wchar.h 136023 do 136024-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 136025-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136026- echo "$as_me:$LINENO: checking for $ac_header" >&5 136027-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 136028-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136029- echo $ECHO_N "(cached) $ECHO_C" >&6 136030-fi 136031-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 136032-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 136033-else 136034- # Is the header compilable? 136035-echo "$as_me:$LINENO: checking $ac_header usability" >&5 136036-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 136037-cat >conftest.$ac_ext <<_ACEOF 136038-/* confdefs.h. */ 136039-_ACEOF 136040-cat confdefs.h >>conftest.$ac_ext 136041-cat >>conftest.$ac_ext <<_ACEOF 136042-/* end confdefs.h. */ 136043-$ac_includes_default 136044-#include <$ac_header> 136045-_ACEOF 136046-rm -f conftest.$ac_objext 136047-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 136048- (eval $ac_compile) 2>conftest.er1 136049- ac_status=$? 136050- grep -v '^ *+' conftest.er1 >conftest.err 136051- rm -f conftest.er1 136052- cat conftest.err >&5 136053- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136054- (exit $ac_status); } && 136055- { ac_try='test -z "$ac_c_werror_flag" 136056- || test ! -s conftest.err' 136057- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136058- (eval $ac_try) 2>&5 136059- ac_status=$? 136060- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136061- (exit $ac_status); }; } && 136062- { ac_try='test -s conftest.$ac_objext' 136063- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136064- (eval $ac_try) 2>&5 136065- ac_status=$? 136066- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136067- (exit $ac_status); }; }; then 136068- ac_header_compiler=yes 136069-else 136070- echo "$as_me: failed program was:" >&5 136071-sed 's/^/| /' conftest.$ac_ext >&5 136072- 136073-ac_header_compiler=no 136074-fi 136075-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 136076-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 136077-echo "${ECHO_T}$ac_header_compiler" >&6 136078- 136079-# Is the header present? 136080-echo "$as_me:$LINENO: checking $ac_header presence" >&5 136081-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 136082-cat >conftest.$ac_ext <<_ACEOF 136083-/* confdefs.h. */ 136084-_ACEOF 136085-cat confdefs.h >>conftest.$ac_ext 136086-cat >>conftest.$ac_ext <<_ACEOF 136087-/* end confdefs.h. */ 136088-#include <$ac_header> 136089-_ACEOF 136090-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 136091- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 136092- ac_status=$? 136093- grep -v '^ *+' conftest.er1 >conftest.err 136094- rm -f conftest.er1 136095- cat conftest.err >&5 136096- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136097- (exit $ac_status); } >/dev/null; then 136098- if test -s conftest.err; then 136099- ac_cpp_err=$ac_c_preproc_warn_flag 136100- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 136101- else 136102- ac_cpp_err= 136103- fi 136104-else 136105- ac_cpp_err=yes 136106-fi 136107-if test -z "$ac_cpp_err"; then 136108- ac_header_preproc=yes 136109-else 136110- echo "$as_me: failed program was:" >&5 136111-sed 's/^/| /' conftest.$ac_ext >&5 136112- 136113- ac_header_preproc=no 136114-fi 136115-rm -f conftest.err conftest.$ac_ext 136116-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 136117-echo "${ECHO_T}$ac_header_preproc" >&6 136118- 136119-# So? What about this header? 136120-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 136121- yes:no: ) 136122- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 136123-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 136124- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 136125-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 136126- ac_header_preproc=yes 136127- ;; 136128- no:yes:* ) 136129- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 136130-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 136131- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 136132-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 136133- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 136134-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 136135- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 136136-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 136137- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 136138-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 136139- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 136140-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 136141- ( 136142- cat <<\_ASBOX 136143-## ------------------------------------------ ## 136144-## Report this to the AC_PACKAGE_NAME lists. ## 136145-## ------------------------------------------ ## 136146-_ASBOX 136147- ) | 136148- sed "s/^/$as_me: WARNING: /" >&2 136149- ;; 136150-esac 136151-echo "$as_me:$LINENO: checking for $ac_header" >&5 136152-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 136153-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136154- echo $ECHO_N "(cached) $ECHO_C" >&6 136155+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 136156+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 136157+echo "configure:91297: checking for $ac_hdr" >&5 136158+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 136159+ echo $ac_n "(cached) $ac_c" 1>&6 136160+else 136161+ cat > conftest.$ac_ext <<EOF 136162+#line 91302 "configure" 136163+#include "confdefs.h" 136164+#include <$ac_hdr> 136165+EOF 136166+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 136167+{ (eval echo configure:91307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 136168+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 136169+if test -z "$ac_err"; then 136170+ rm -rf conftest* 136171+ eval "ac_cv_header_$ac_safe=yes" 136172 else 136173- eval "$as_ac_Header=\$ac_header_preproc" 136174+ echo "$ac_err" >&5 136175+ echo "configure: failed program was:" >&5 136176+ cat conftest.$ac_ext >&5 136177+ rm -rf conftest* 136178+ eval "ac_cv_header_$ac_safe=no" 136179 fi 136180-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 136181-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 136182- 136183+rm -f conftest* 136184 fi 136185-if test `eval echo '${'$as_ac_Header'}'` = yes; then 136186- cat >>confdefs.h <<_ACEOF 136187-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 136188-_ACEOF 136189- 136190+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 136191+ echo "$ac_t""yes" 1>&6 136192+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 136193+ cat >> confdefs.h <<EOF 136194+#define $ac_tr_hdr 1 136195+EOF 136196+ 136197+else 136198+ echo "$ac_t""no" 1>&6 136199 fi 136200- 136201 done 136202 136203- 136204 for ac_func in mblen 136205 do 136206-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 136207-echo "$as_me:$LINENO: checking for $ac_func" >&5 136208-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 136209-if eval "test \"\${$as_ac_var+set}\" = set"; then 136210- echo $ECHO_N "(cached) $ECHO_C" >&6 136211-else 136212- cat >conftest.$ac_ext <<_ACEOF 136213-/* confdefs.h. */ 136214-_ACEOF 136215-cat confdefs.h >>conftest.$ac_ext 136216-cat >>conftest.$ac_ext <<_ACEOF 136217-/* end confdefs.h. */ 136218-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 136219- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 136220-#define $ac_func innocuous_$ac_func 136221- 136222+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 136223+echo "configure:91336: checking for $ac_func" >&5 136224+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 136225+ echo $ac_n "(cached) $ac_c" 1>&6 136226+else 136227+ cat > conftest.$ac_ext <<EOF 136228+#line 91341 "configure" 136229+#include "confdefs.h" 136230 /* System header to define __stub macros and hopefully few prototypes, 136231- which can conflict with char $ac_func (); below. 136232- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 136233- <limits.h> exists even on freestanding compilers. */ 136234- 136235-#ifdef __STDC__ 136236-# include <limits.h> 136237-#else 136238-# include <assert.h> 136239-#endif 136240- 136241-#undef $ac_func 136242- 136243+ which can conflict with char $ac_func(); below. */ 136244+#include <assert.h> 136245 /* Override any gcc2 internal prototype to avoid an error. */ 136246-#ifdef __cplusplus 136247-extern "C" 136248-{ 136249-#endif 136250 /* We use char because int might match the return type of a gcc2 136251- builtin and then its argument prototype would still apply. */ 136252-char $ac_func (); 136253+ builtin and then its argument prototype would still apply. */ 136254+char $ac_func(); 136255+ 136256+int main() { 136257+ 136258 /* The GNU C library defines this for functions which it implements 136259 to always fail with ENOSYS. Some functions are actually named 136260 something starting with __ and the normal name is an alias. */ 136261 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 136262 choke me 136263 #else 136264-char (*f) () = $ac_func; 136265-#endif 136266-#ifdef __cplusplus 136267-} 136268+$ac_func(); 136269 #endif 136270 136271-int 136272-main () 136273-{ 136274-return f != $ac_func; 136275- ; 136276- return 0; 136277-} 136278-_ACEOF 136279-rm -f conftest.$ac_objext conftest$ac_exeext 136280-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 136281- (eval $ac_link) 2>conftest.er1 136282- ac_status=$? 136283- grep -v '^ *+' conftest.er1 >conftest.err 136284- rm -f conftest.er1 136285- cat conftest.err >&5 136286- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136287- (exit $ac_status); } && 136288- { ac_try='test -z "$ac_c_werror_flag" 136289- || test ! -s conftest.err' 136290- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136291- (eval $ac_try) 2>&5 136292- ac_status=$? 136293- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136294- (exit $ac_status); }; } && 136295- { ac_try='test -s conftest$ac_exeext' 136296- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136297- (eval $ac_try) 2>&5 136298- ac_status=$? 136299- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136300- (exit $ac_status); }; }; then 136301- eval "$as_ac_var=yes" 136302-else 136303- echo "$as_me: failed program was:" >&5 136304-sed 's/^/| /' conftest.$ac_ext >&5 136305- 136306-eval "$as_ac_var=no" 136307-fi 136308-rm -f conftest.err conftest.$ac_objext \ 136309- conftest$ac_exeext conftest.$ac_ext 136310-fi 136311-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 136312-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 136313-if test `eval echo '${'$as_ac_var'}'` = yes; then 136314- cat >>confdefs.h <<_ACEOF 136315-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 136316-_ACEOF 136317+; return 0; } 136318+EOF 136319+if { (eval echo configure:91364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 136320+ rm -rf conftest* 136321+ eval "ac_cv_func_$ac_func=yes" 136322+else 136323+ echo "configure: failed program was:" >&5 136324+ cat conftest.$ac_ext >&5 136325+ rm -rf conftest* 136326+ eval "ac_cv_func_$ac_func=no" 136327+fi 136328+rm -f conftest* 136329+fi 136330 136331+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 136332+ echo "$ac_t""yes" 1>&6 136333+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 136334+ cat >> confdefs.h <<EOF 136335+#define $ac_tr_func 1 136336+EOF 136337+ 136338+else 136339+ echo "$ac_t""no" 1>&6 136340 fi 136341 done 136342 136343- 136344- 136345 for ac_func in mbrlen mbsinit 136346 do 136347-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 136348-echo "$as_me:$LINENO: checking for $ac_func" >&5 136349-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 136350-if eval "test \"\${$as_ac_var+set}\" = set"; then 136351- echo $ECHO_N "(cached) $ECHO_C" >&6 136352-else 136353- cat >conftest.$ac_ext <<_ACEOF 136354-/* confdefs.h. */ 136355-_ACEOF 136356-cat confdefs.h >>conftest.$ac_ext 136357-cat >>conftest.$ac_ext <<_ACEOF 136358-/* end confdefs.h. */ 136359-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 136360- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 136361-#define $ac_func innocuous_$ac_func 136362- 136363+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 136364+echo "configure:91391: checking for $ac_func" >&5 136365+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 136366+ echo $ac_n "(cached) $ac_c" 1>&6 136367+else 136368+ cat > conftest.$ac_ext <<EOF 136369+#line 91396 "configure" 136370+#include "confdefs.h" 136371 /* System header to define __stub macros and hopefully few prototypes, 136372- which can conflict with char $ac_func (); below. 136373- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 136374- <limits.h> exists even on freestanding compilers. */ 136375- 136376-#ifdef __STDC__ 136377-# include <limits.h> 136378-#else 136379-# include <assert.h> 136380-#endif 136381- 136382-#undef $ac_func 136383- 136384+ which can conflict with char $ac_func(); below. */ 136385+#include <assert.h> 136386 /* Override any gcc2 internal prototype to avoid an error. */ 136387-#ifdef __cplusplus 136388-extern "C" 136389-{ 136390-#endif 136391 /* We use char because int might match the return type of a gcc2 136392- builtin and then its argument prototype would still apply. */ 136393-char $ac_func (); 136394+ builtin and then its argument prototype would still apply. */ 136395+char $ac_func(); 136396+ 136397+int main() { 136398+ 136399 /* The GNU C library defines this for functions which it implements 136400 to always fail with ENOSYS. Some functions are actually named 136401 something starting with __ and the normal name is an alias. */ 136402 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 136403 choke me 136404 #else 136405-char (*f) () = $ac_func; 136406-#endif 136407-#ifdef __cplusplus 136408-} 136409+$ac_func(); 136410 #endif 136411 136412-int 136413-main () 136414-{ 136415-return f != $ac_func; 136416- ; 136417- return 0; 136418-} 136419-_ACEOF 136420-rm -f conftest.$ac_objext conftest$ac_exeext 136421-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 136422- (eval $ac_link) 2>conftest.er1 136423- ac_status=$? 136424- grep -v '^ *+' conftest.er1 >conftest.err 136425- rm -f conftest.er1 136426- cat conftest.err >&5 136427- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136428- (exit $ac_status); } && 136429- { ac_try='test -z "$ac_c_werror_flag" 136430- || test ! -s conftest.err' 136431- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136432- (eval $ac_try) 2>&5 136433- ac_status=$? 136434- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136435- (exit $ac_status); }; } && 136436- { ac_try='test -s conftest$ac_exeext' 136437- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136438- (eval $ac_try) 2>&5 136439- ac_status=$? 136440- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136441- (exit $ac_status); }; }; then 136442- eval "$as_ac_var=yes" 136443-else 136444- echo "$as_me: failed program was:" >&5 136445-sed 's/^/| /' conftest.$ac_ext >&5 136446- 136447-eval "$as_ac_var=no" 136448-fi 136449-rm -f conftest.err conftest.$ac_objext \ 136450- conftest$ac_exeext conftest.$ac_ext 136451-fi 136452-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 136453-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 136454-if test `eval echo '${'$as_ac_var'}'` = yes; then 136455- cat >>confdefs.h <<_ACEOF 136456-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 136457-_ACEOF 136458+; return 0; } 136459+EOF 136460+if { (eval echo configure:91419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 136461+ rm -rf conftest* 136462+ eval "ac_cv_func_$ac_func=yes" 136463+else 136464+ echo "configure: failed program was:" >&5 136465+ cat conftest.$ac_ext >&5 136466+ rm -rf conftest* 136467+ eval "ac_cv_func_$ac_func=no" 136468+fi 136469+rm -f conftest* 136470+fi 136471 136472+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 136473+ echo "$ac_t""yes" 1>&6 136474+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 136475+ cat >> confdefs.h <<EOF 136476+#define $ac_tr_func 1 136477+EOF 136478+ 136479+else 136480+ echo "$ac_t""no" 1>&6 136481 fi 136482 done 136483 136484-echo "$as_me:$LINENO: checking for mbstate_t" >&5 136485-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6 136486-if test "${ac_cv_type_mbstate_t+set}" = set; then 136487- echo $ECHO_N "(cached) $ECHO_C" >&6 136488+echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 136489+echo "configure:91444: checking for mbstate_t" >&5 136490+if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then 136491+ echo $ac_n "(cached) $ac_c" 1>&6 136492 else 136493- 136494-cat >conftest.$ac_ext <<_ACEOF 136495-/* confdefs.h. */ 136496-_ACEOF 136497-cat confdefs.h >>conftest.$ac_ext 136498-cat >>conftest.$ac_ext <<_ACEOF 136499-/* end confdefs.h. */ 136500+ 136501+cat > conftest.$ac_ext <<EOF 136502+#line 91450 "configure" 136503+#include "confdefs.h" 136504 136505 #ifdef HAVE_WCHAR_H 136506 # include <wchar.h> 136507 #endif 136508 136509-int 136510-main () 136511-{ 136512+int main() { 136513 136514 int __tmp__() { mbstate_t a; } 136515 136516- ; 136517- return 0; 136518-} 136519-_ACEOF 136520-rm -f conftest.$ac_objext 136521-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 136522- (eval $ac_compile) 2>conftest.er1 136523- ac_status=$? 136524- grep -v '^ *+' conftest.er1 >conftest.err 136525- rm -f conftest.er1 136526- cat conftest.err >&5 136527- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136528- (exit $ac_status); } && 136529- { ac_try='test -z "$ac_c_werror_flag" 136530- || test ! -s conftest.err' 136531- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136532- (eval $ac_try) 2>&5 136533- ac_status=$? 136534- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136535- (exit $ac_status); }; } && 136536- { ac_try='test -s conftest.$ac_objext' 136537- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136538- (eval $ac_try) 2>&5 136539- ac_status=$? 136540- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136541- (exit $ac_status); }; }; then 136542- 136543+; return 0; } 136544+EOF 136545+if { (eval echo configure:91463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 136546+ rm -rf conftest* 136547+ 136548 ac_cv_type_mbstate_t=yes 136549 136550 else 136551- echo "$as_me: failed program was:" >&5 136552-sed 's/^/| /' conftest.$ac_ext >&5 136553- 136554- 136555+ echo "configure: failed program was:" >&5 136556+ cat conftest.$ac_ext >&5 136557+ rm -rf conftest* 136558+ 136559 ac_cv_type_mbstate_t=no 136560 136561 fi 136562-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 136563+rm -f conftest* 136564 fi 136565-echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 136566-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 136567-if test "$ac_cv_type_mbstate_t" = "yes"; then 136568 136569-cat >>confdefs.h <<\_ACEOF 136570+echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 136571+if test "$ac_cv_type_mbstate_t" = "yes"; then 136572+ cat >> confdefs.h <<\EOF 136573 #define HAVE_MBSTATE_T 1 136574-_ACEOF 136575+EOF 136576 136577 fi 136578 136579- 136580-for ac_header in atomic.h 136581+for ac_hdr in atomic.h 136582 do 136583-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 136584-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136585- echo "$as_me:$LINENO: checking for $ac_header" >&5 136586-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 136587-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136588- echo $ECHO_N "(cached) $ECHO_C" >&6 136589-fi 136590-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 136591-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 136592-else 136593- # Is the header compilable? 136594-echo "$as_me:$LINENO: checking $ac_header usability" >&5 136595-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 136596-cat >conftest.$ac_ext <<_ACEOF 136597-/* confdefs.h. */ 136598-_ACEOF 136599-cat confdefs.h >>conftest.$ac_ext 136600-cat >>conftest.$ac_ext <<_ACEOF 136601-/* end confdefs.h. */ 136602-$ac_includes_default 136603-#include <$ac_header> 136604-_ACEOF 136605-rm -f conftest.$ac_objext 136606-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 136607- (eval $ac_compile) 2>conftest.er1 136608- ac_status=$? 136609- grep -v '^ *+' conftest.er1 >conftest.err 136610- rm -f conftest.er1 136611- cat conftest.err >&5 136612- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136613- (exit $ac_status); } && 136614- { ac_try='test -z "$ac_c_werror_flag" 136615- || test ! -s conftest.err' 136616- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136617- (eval $ac_try) 2>&5 136618- ac_status=$? 136619- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136620- (exit $ac_status); }; } && 136621- { ac_try='test -s conftest.$ac_objext' 136622- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 136623- (eval $ac_try) 2>&5 136624- ac_status=$? 136625- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136626- (exit $ac_status); }; }; then 136627- ac_header_compiler=yes 136628-else 136629- echo "$as_me: failed program was:" >&5 136630-sed 's/^/| /' conftest.$ac_ext >&5 136631- 136632-ac_header_compiler=no 136633-fi 136634-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 136635-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 136636-echo "${ECHO_T}$ac_header_compiler" >&6 136637- 136638-# Is the header present? 136639-echo "$as_me:$LINENO: checking $ac_header presence" >&5 136640-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 136641-cat >conftest.$ac_ext <<_ACEOF 136642-/* confdefs.h. */ 136643-_ACEOF 136644-cat confdefs.h >>conftest.$ac_ext 136645-cat >>conftest.$ac_ext <<_ACEOF 136646-/* end confdefs.h. */ 136647-#include <$ac_header> 136648-_ACEOF 136649-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 136650- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 136651- ac_status=$? 136652- grep -v '^ *+' conftest.er1 >conftest.err 136653- rm -f conftest.er1 136654- cat conftest.err >&5 136655- echo "$as_me:$LINENO: \$? = $ac_status" >&5 136656- (exit $ac_status); } >/dev/null; then 136657- if test -s conftest.err; then 136658- ac_cpp_err=$ac_c_preproc_warn_flag 136659- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 136660- else 136661- ac_cpp_err= 136662- fi 136663-else 136664- ac_cpp_err=yes 136665-fi 136666-if test -z "$ac_cpp_err"; then 136667- ac_header_preproc=yes 136668-else 136669- echo "$as_me: failed program was:" >&5 136670-sed 's/^/| /' conftest.$ac_ext >&5 136671- 136672- ac_header_preproc=no 136673-fi 136674-rm -f conftest.err conftest.$ac_ext 136675-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 136676-echo "${ECHO_T}$ac_header_preproc" >&6 136677- 136678-# So? What about this header? 136679-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 136680- yes:no: ) 136681- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 136682-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 136683- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 136684-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 136685- ac_header_preproc=yes 136686- ;; 136687- no:yes:* ) 136688- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 136689-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 136690- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 136691-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 136692- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 136693-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 136694- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 136695-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 136696- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 136697-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 136698- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 136699-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 136700- ( 136701- cat <<\_ASBOX 136702-## ------------------------------------------ ## 136703-## Report this to the AC_PACKAGE_NAME lists. ## 136704-## ------------------------------------------ ## 136705-_ASBOX 136706- ) | 136707- sed "s/^/$as_me: WARNING: /" >&2 136708- ;; 136709-esac 136710-echo "$as_me:$LINENO: checking for $ac_header" >&5 136711-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 136712-if eval "test \"\${$as_ac_Header+set}\" = set"; then 136713- echo $ECHO_N "(cached) $ECHO_C" >&6 136714+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 136715+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 136716+echo "configure:91491: checking for $ac_hdr" >&5 136717+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 136718+ echo $ac_n "(cached) $ac_c" 1>&6 136719+else 136720+ cat > conftest.$ac_ext <<EOF 136721+#line 91496 "configure" 136722+#include "confdefs.h" 136723+#include <$ac_hdr> 136724+EOF 136725+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 136726+{ (eval echo configure:91501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 136727+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 136728+if test -z "$ac_err"; then 136729+ rm -rf conftest* 136730+ eval "ac_cv_header_$ac_safe=yes" 136731 else 136732- eval "$as_ac_Header=\$ac_header_preproc" 136733+ echo "$ac_err" >&5 136734+ echo "configure: failed program was:" >&5 136735+ cat conftest.$ac_ext >&5 136736+ rm -rf conftest* 136737+ eval "ac_cv_header_$ac_safe=no" 136738 fi 136739-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 136740-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 136741- 136742+rm -f conftest* 136743 fi 136744-if test `eval echo '${'$as_ac_Header'}'` = yes; then 136745- cat >>confdefs.h <<_ACEOF 136746-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 136747-_ACEOF 136748- 136749+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 136750+ echo "$ac_t""yes" 1>&6 136751+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 136752+ cat >> confdefs.h <<EOF 136753+#define $ac_tr_hdr 1 136754+EOF 136755+ 136756+else 136757+ echo "$ac_t""no" 1>&6 136758 fi 136759- 136760 done 136761 136762 136763@@ -118270,15 +91532,15 @@ 136764 136765 if test "" != "shared" && test "" != "yes" && test "" != "cli"; then 136766 PHP_STANDARD_SHARED=no 136767- 136768- 136769+ 136770+ 136771 case ext/standard in 136772 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 136773 /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 136774 *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 136775 esac 136776- 136777- 136778+ 136779+ 136780 136781 b_c_pre=$php_c_pre 136782 b_cxx_pre=$php_cxx_pre 136783@@ -118301,12 +91563,12 @@ 136784 http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ 136785 var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ 136786 filters.c proc_open.c streamsfuncs.c http.c; do 136787- 136788+ 136789 IFS=. 136790 set $ac_src 136791 ac_obj=$1 136792 IFS=$old_IFS 136793- 136794+ 136795 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 136796 136797 case $ac_src in 136798@@ -118330,14 +91592,14 @@ 136799 else 136800 if test "" = "shared" || test "" = "yes"; then 136801 PHP_STANDARD_SHARED=yes 136802- 136803+ 136804 case ext/standard in 136805 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 136806 /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 136807 *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 136808 esac 136809- 136810- 136811+ 136812+ 136813 136814 b_c_pre=$shared_c_pre 136815 b_cxx_pre=$shared_cxx_pre 136816@@ -118360,12 +91622,12 @@ 136817 http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ 136818 var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ 136819 filters.c proc_open.c streamsfuncs.c http.c; do 136820- 136821+ 136822 IFS=. 136823 set $ac_src 136824 ac_obj=$1 136825 IFS=$old_IFS 136826- 136827+ 136828 shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" 136829 136830 case $ac_src in 136831@@ -118383,7 +91645,7 @@ 136832 136833 case $host_alias in 136834 *netware*) 136835- 136836+ 136837 install_modules="install-modules" 136838 136839 case $host_alias in 136840@@ -118393,7 +91655,7 @@ 136841 ;; 136842 *netware*) 136843 suffix=nlm 136844- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(STANDARD_SHARED_LIBADD)' 136845+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' 136846 ;; 136847 *) 136848 suffix=la 136849@@ -118406,7 +91668,7 @@ 136850 else 136851 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" 136852 fi 136853- 136854+ 136855 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" 136856 136857 cat >>Makefile.objects<<EOF 136858@@ -118420,7 +91682,7 @@ 136859 136860 ;; 136861 *) 136862- 136863+ 136864 install_modules="install-modules" 136865 136866 case $host_alias in 136867@@ -118430,7 +91692,7 @@ 136868 ;; 136869 *netware*) 136870 suffix=nlm 136871- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(NDARD_SHARED_LIBADD)' 136872+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(STANDARD, 3)_SHARED_LIBADD)' 136873 ;; 136874 *) 136875 suffix=la 136876@@ -118443,7 +91705,7 @@ 136877 else 136878 PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix" 136879 fi 136880- 136881+ 136882 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" 136883 136884 cat >>Makefile.objects<<EOF 136885@@ -118457,10 +91719,9 @@ 136886 136887 ;; 136888 esac 136889- 136890-cat >>confdefs.h <<_ACEOF 136891+ cat >> confdefs.h <<EOF 136892 #define COMPILE_DL_STANDARD 1 136893-_ACEOF 136894+EOF 136895 136896 fi 136897 fi 136898@@ -118469,15 +91730,15 @@ 136899 PHP_STANDARD_SHARED=no 136900 case "$PHP_SAPI" in 136901 cgi|embed) 136902- 136903- 136904+ 136905+ 136906 case ext/standard in 136907 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 136908 /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 136909 *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 136910 esac 136911- 136912- 136913+ 136914+ 136915 136916 b_c_pre=$php_c_pre 136917 b_cxx_pre=$php_cxx_pre 136918@@ -118500,12 +91761,12 @@ 136919 http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ 136920 var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ 136921 filters.c proc_open.c streamsfuncs.c http.c; do 136922- 136923+ 136924 IFS=. 136925 set $ac_src 136926 ac_obj=$1 136927 IFS=$old_IFS 136928- 136929+ 136930 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 136931 136932 case $ac_src in 136933@@ -118525,15 +91786,15 @@ 136934 EXT_STATIC="$EXT_STATIC standard" 136935 ;; 136936 *) 136937- 136938- 136939+ 136940+ 136941 case ext/standard in 136942 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 136943 /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 136944 *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 136945 esac 136946- 136947- 136948+ 136949+ 136950 136951 b_c_pre=$php_c_pre 136952 b_cxx_pre=$php_cxx_pre 136953@@ -118556,13 +91817,13 @@ 136954 http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ 136955 var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ 136956 filters.c proc_open.c streamsfuncs.c http.c; do 136957- 136958+ 136959 IFS=. 136960 set $ac_src 136961 ac_obj=$1 136962 IFS=$old_IFS 136963- 136964- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 136965+ 136966+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 136967 136968 case $ac_src in 136969 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 136970@@ -118582,15 +91843,15 @@ 136971 esac 136972 EXT_CLI_STATIC="$EXT_CLI_STATIC standard" 136973 fi 136974- 136975- 136976+ 136977+ 136978 BUILD_DIR="$BUILD_DIR $ext_builddir" 136979- 136980+ 136981 136982 136983 if test "$ext_builddir" = "."; then 136984 PHP_PECL_EXTENSION=standard 136985- 136986+ 136987 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 136988 136989 fi 136990@@ -118603,41 +91864,41 @@ 136991 test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments 136992 136993 136994- 136995+ 136996 for header_file in ext/standard/; do 136997- 136998- 136999+ 137000+ 137001 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 137002- 137003+ 137004 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 137005 if test -n "$unique" && test "`eval $cmd`" = "" ; then 137006 eval "INSTALLHEADERS$unique=set" 137007- 137008+ 137009 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 137010- 137011+ 137012 fi 137013 137014- done 137015- 137016+ done 137017+ 137018 137019 137020 137021 137022 php_with_sybase_ct=no 137023 137024-echo "$as_me:$LINENO: checking for Sybase-CT support" >&5 137025-echo $ECHO_N "checking for Sybase-CT support... $ECHO_C" >&6 137026- 137027+echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 137028+echo "configure:91891: checking for Sybase-CT support" >&5 137029 # Check whether --with-sybase-ct or --without-sybase-ct was given. 137030 if test "${with_sybase_ct+set}" = set; then 137031 withval="$with_sybase_ct" 137032 PHP_SYBASE_CT=$withval 137033 else 137034- 137035+ 137036 PHP_SYBASE_CT=no 137037 test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL 137038 137039-fi; 137040+fi 137041+ 137042 137043 137044 ext_output="yes, shared" 137045@@ -118661,8 +91922,7 @@ 137046 137047 137048 137049-echo "$as_me:$LINENO: result: $ext_output" >&5 137050-echo "${ECHO_T}$ext_output" >&6 137051+echo "$ac_t""$ext_output" 1>&6 137052 137053 137054 137055@@ -118670,17 +91930,14 @@ 137056 if test "$PHP_SYBASE_CT" != "no"; then 137057 137058 if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then 137059- { { echo "$as_me:$LINENO: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&5 137060-echo "$as_me: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&2;} 137061- { (exit 1); exit 1; }; } 137062+ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } 137063 fi 137064 137065- 137066-cat >>confdefs.h <<\_ACEOF 137067+ cat >> confdefs.h <<\EOF 137068 #define HAVE_SYBASE_CT 1 137069-_ACEOF 137070- 137071+EOF 137072 137073+ 137074 ext_builddir=ext/sybase_ct 137075 ext_srcdir=$abs_srcdir/ext/sybase_ct 137076 137077@@ -118688,15 +91945,15 @@ 137078 137079 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 137080 PHP_SYBASE_CT_SHARED=no 137081- 137082- 137083+ 137084+ 137085 case ext/sybase_ct in 137086 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 137087 /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 137088 *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 137089 esac 137090- 137091- 137092+ 137093+ 137094 137095 b_c_pre=$php_c_pre 137096 b_cxx_pre=$php_cxx_pre 137097@@ -118709,12 +91966,12 @@ 137098 137099 old_IFS=$IFS 137100 for ac_src in php_sybase_ct.c; do 137101- 137102+ 137103 IFS=. 137104 set $ac_src 137105 ac_obj=$1 137106 IFS=$old_IFS 137107- 137108+ 137109 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 137110 137111 case $ac_src in 137112@@ -118738,14 +91995,14 @@ 137113 else 137114 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 137115 PHP_SYBASE_CT_SHARED=yes 137116- 137117+ 137118 case ext/sybase_ct in 137119 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 137120 /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 137121 *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 137122 esac 137123- 137124- 137125+ 137126+ 137127 137128 b_c_pre=$shared_c_pre 137129 b_cxx_pre=$shared_cxx_pre 137130@@ -118758,12 +92015,12 @@ 137131 137132 old_IFS=$IFS 137133 for ac_src in php_sybase_ct.c; do 137134- 137135+ 137136 IFS=. 137137 set $ac_src 137138 ac_obj=$1 137139 IFS=$old_IFS 137140- 137141+ 137142 shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" 137143 137144 case $ac_src in 137145@@ -118781,7 +92038,7 @@ 137146 137147 case $host_alias in 137148 *netware*) 137149- 137150+ 137151 install_modules="install-modules" 137152 137153 case $host_alias in 137154@@ -118791,7 +92048,7 @@ 137155 ;; 137156 *netware*) 137157 suffix=nlm 137158- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(SYBASE_CT_SHARED_LIBADD)' 137159+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' 137160 ;; 137161 *) 137162 suffix=la 137163@@ -118804,7 +92061,7 @@ 137164 else 137165 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" 137166 fi 137167- 137168+ 137169 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" 137170 137171 cat >>Makefile.objects<<EOF 137172@@ -118818,7 +92075,7 @@ 137173 137174 ;; 137175 *) 137176- 137177+ 137178 install_modules="install-modules" 137179 137180 case $host_alias in 137181@@ -118828,7 +92085,7 @@ 137182 ;; 137183 *netware*) 137184 suffix=nlm 137185- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(ASE_CT_SHARED_LIBADD)' 137186+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)' 137187 ;; 137188 *) 137189 suffix=la 137190@@ -118841,7 +92098,7 @@ 137191 else 137192 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix" 137193 fi 137194- 137195+ 137196 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" 137197 137198 cat >>Makefile.objects<<EOF 137199@@ -118855,10 +92112,9 @@ 137200 137201 ;; 137202 esac 137203- 137204-cat >>confdefs.h <<_ACEOF 137205+ cat >> confdefs.h <<EOF 137206 #define COMPILE_DL_SYBASE_CT 1 137207-_ACEOF 137208+EOF 137209 137210 fi 137211 fi 137212@@ -118867,15 +92123,15 @@ 137213 PHP_SYBASE_CT_SHARED=no 137214 case "$PHP_SAPI" in 137215 cgi|embed) 137216- 137217- 137218+ 137219+ 137220 case ext/sybase_ct in 137221 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 137222 /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 137223 *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 137224 esac 137225- 137226- 137227+ 137228+ 137229 137230 b_c_pre=$php_c_pre 137231 b_cxx_pre=$php_cxx_pre 137232@@ -118888,12 +92144,12 @@ 137233 137234 old_IFS=$IFS 137235 for ac_src in php_sybase_ct.c; do 137236- 137237+ 137238 IFS=. 137239 set $ac_src 137240 ac_obj=$1 137241 IFS=$old_IFS 137242- 137243+ 137244 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 137245 137246 case $ac_src in 137247@@ -118913,15 +92169,15 @@ 137248 EXT_STATIC="$EXT_STATIC sybase_ct" 137249 ;; 137250 *) 137251- 137252- 137253+ 137254+ 137255 case ext/sybase_ct in 137256 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 137257 /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 137258 *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 137259 esac 137260- 137261- 137262+ 137263+ 137264 137265 b_c_pre=$php_c_pre 137266 b_cxx_pre=$php_cxx_pre 137267@@ -118934,13 +92190,13 @@ 137268 137269 old_IFS=$IFS 137270 for ac_src in php_sybase_ct.c; do 137271- 137272+ 137273 IFS=. 137274 set $ac_src 137275 ac_obj=$1 137276 IFS=$old_IFS 137277- 137278- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 137279+ 137280+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 137281 137282 case $ac_src in 137283 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 137284@@ -118960,23 +92216,23 @@ 137285 esac 137286 EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" 137287 fi 137288- 137289- 137290+ 137291+ 137292 BUILD_DIR="$BUILD_DIR $ext_builddir" 137293- 137294+ 137295 137296 137297 if test "$ext_builddir" = "."; then 137298 PHP_PECL_EXTENSION=sybase_ct 137299- 137300+ 137301 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 137302 137303 fi 137304 137305- 137306+ 137307 PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" 137308 137309- 137310+ 137311 if test "$PHP_SYBASE_CT" = "yes"; then 137312 SYBASE_CT_INCDIR=/home/sybase/include 137313 SYBASE_CT_LIBDIR=/home/sybase/lib 137314@@ -118985,536 +92241,155 @@ 137315 SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib 137316 fi 137317 137318- echo "$as_me:$LINENO: checking for long int" >&5 137319-echo $ECHO_N "checking for long int... $ECHO_C" >&6 137320-if test "${ac_cv_type_long_int+set}" = set; then 137321- echo $ECHO_N "(cached) $ECHO_C" >&6 137322-else 137323- cat >conftest.$ac_ext <<_ACEOF 137324-/* confdefs.h. */ 137325-_ACEOF 137326-cat confdefs.h >>conftest.$ac_ext 137327-cat >>conftest.$ac_ext <<_ACEOF 137328-/* end confdefs.h. */ 137329-$ac_includes_default 137330-int 137331-main () 137332-{ 137333-if ((long int *) 0) 137334- return 0; 137335-if (sizeof (long int)) 137336- return 0; 137337- ; 137338- return 0; 137339-} 137340-_ACEOF 137341-rm -f conftest.$ac_objext 137342-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137343- (eval $ac_compile) 2>conftest.er1 137344- ac_status=$? 137345- grep -v '^ *+' conftest.er1 >conftest.err 137346- rm -f conftest.er1 137347- cat conftest.err >&5 137348- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137349- (exit $ac_status); } && 137350- { ac_try='test -z "$ac_c_werror_flag" 137351- || test ! -s conftest.err' 137352- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137353- (eval $ac_try) 2>&5 137354- ac_status=$? 137355- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137356- (exit $ac_status); }; } && 137357- { ac_try='test -s conftest.$ac_objext' 137358- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137359- (eval $ac_try) 2>&5 137360- ac_status=$? 137361- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137362- (exit $ac_status); }; }; then 137363- ac_cv_type_long_int=yes 137364-else 137365- echo "$as_me: failed program was:" >&5 137366-sed 's/^/| /' conftest.$ac_ext >&5 137367- 137368-ac_cv_type_long_int=no 137369-fi 137370-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137371-fi 137372-echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 137373-echo "${ECHO_T}$ac_cv_type_long_int" >&6 137374- 137375-echo "$as_me:$LINENO: checking size of long int" >&5 137376-echo $ECHO_N "checking size of long int... $ECHO_C" >&6 137377-if test "${ac_cv_sizeof_long_int+set}" = set; then 137378- echo $ECHO_N "(cached) $ECHO_C" >&6 137379-else 137380- if test "$ac_cv_type_long_int" = yes; then 137381- # The cast to unsigned long works around a bug in the HP C Compiler 137382- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 137383- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 137384- # This bug is HP SR number 8606223364. 137385- if test "$cross_compiling" = yes; then 137386- # Depending upon the size, compute the lo and hi bounds. 137387-cat >conftest.$ac_ext <<_ACEOF 137388-/* confdefs.h. */ 137389-_ACEOF 137390-cat confdefs.h >>conftest.$ac_ext 137391-cat >>conftest.$ac_ext <<_ACEOF 137392-/* end confdefs.h. */ 137393-$ac_includes_default 137394-int 137395-main () 137396-{ 137397-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; 137398-test_array [0] = 0 137399- 137400- ; 137401- return 0; 137402-} 137403-_ACEOF 137404-rm -f conftest.$ac_objext 137405-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137406- (eval $ac_compile) 2>conftest.er1 137407- ac_status=$? 137408- grep -v '^ *+' conftest.er1 >conftest.err 137409- rm -f conftest.er1 137410- cat conftest.err >&5 137411- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137412- (exit $ac_status); } && 137413- { ac_try='test -z "$ac_c_werror_flag" 137414- || test ! -s conftest.err' 137415- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137416- (eval $ac_try) 2>&5 137417- ac_status=$? 137418- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137419- (exit $ac_status); }; } && 137420- { ac_try='test -s conftest.$ac_objext' 137421- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137422- (eval $ac_try) 2>&5 137423- ac_status=$? 137424- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137425- (exit $ac_status); }; }; then 137426- ac_lo=0 ac_mid=0 137427- while :; do 137428- cat >conftest.$ac_ext <<_ACEOF 137429-/* confdefs.h. */ 137430-_ACEOF 137431-cat confdefs.h >>conftest.$ac_ext 137432-cat >>conftest.$ac_ext <<_ACEOF 137433-/* end confdefs.h. */ 137434-$ac_includes_default 137435-int 137436-main () 137437-{ 137438-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 137439-test_array [0] = 0 137440- 137441- ; 137442- return 0; 137443-} 137444-_ACEOF 137445-rm -f conftest.$ac_objext 137446-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137447- (eval $ac_compile) 2>conftest.er1 137448- ac_status=$? 137449- grep -v '^ *+' conftest.er1 >conftest.err 137450- rm -f conftest.er1 137451- cat conftest.err >&5 137452- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137453- (exit $ac_status); } && 137454- { ac_try='test -z "$ac_c_werror_flag" 137455- || test ! -s conftest.err' 137456- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137457- (eval $ac_try) 2>&5 137458- ac_status=$? 137459- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137460- (exit $ac_status); }; } && 137461- { ac_try='test -s conftest.$ac_objext' 137462- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137463- (eval $ac_try) 2>&5 137464- ac_status=$? 137465- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137466- (exit $ac_status); }; }; then 137467- ac_hi=$ac_mid; break 137468-else 137469- echo "$as_me: failed program was:" >&5 137470-sed 's/^/| /' conftest.$ac_ext >&5 137471- 137472-ac_lo=`expr $ac_mid + 1` 137473- if test $ac_lo -le $ac_mid; then 137474- ac_lo= ac_hi= 137475- break 137476- fi 137477- ac_mid=`expr 2 '*' $ac_mid + 1` 137478-fi 137479-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137480- done 137481-else 137482- echo "$as_me: failed program was:" >&5 137483-sed 's/^/| /' conftest.$ac_ext >&5 137484- 137485-cat >conftest.$ac_ext <<_ACEOF 137486-/* confdefs.h. */ 137487-_ACEOF 137488-cat confdefs.h >>conftest.$ac_ext 137489-cat >>conftest.$ac_ext <<_ACEOF 137490-/* end confdefs.h. */ 137491-$ac_includes_default 137492-int 137493-main () 137494-{ 137495-static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; 137496-test_array [0] = 0 137497- 137498- ; 137499- return 0; 137500-} 137501-_ACEOF 137502-rm -f conftest.$ac_objext 137503-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137504- (eval $ac_compile) 2>conftest.er1 137505- ac_status=$? 137506- grep -v '^ *+' conftest.er1 >conftest.err 137507- rm -f conftest.er1 137508- cat conftest.err >&5 137509- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137510- (exit $ac_status); } && 137511- { ac_try='test -z "$ac_c_werror_flag" 137512- || test ! -s conftest.err' 137513- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137514- (eval $ac_try) 2>&5 137515- ac_status=$? 137516- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137517- (exit $ac_status); }; } && 137518- { ac_try='test -s conftest.$ac_objext' 137519- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137520- (eval $ac_try) 2>&5 137521- ac_status=$? 137522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137523- (exit $ac_status); }; }; then 137524- ac_hi=-1 ac_mid=-1 137525- while :; do 137526- cat >conftest.$ac_ext <<_ACEOF 137527-/* confdefs.h. */ 137528-_ACEOF 137529-cat confdefs.h >>conftest.$ac_ext 137530-cat >>conftest.$ac_ext <<_ACEOF 137531-/* end confdefs.h. */ 137532-$ac_includes_default 137533-int 137534-main () 137535-{ 137536-static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; 137537-test_array [0] = 0 137538- 137539- ; 137540- return 0; 137541-} 137542-_ACEOF 137543-rm -f conftest.$ac_objext 137544-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137545- (eval $ac_compile) 2>conftest.er1 137546- ac_status=$? 137547- grep -v '^ *+' conftest.er1 >conftest.err 137548- rm -f conftest.er1 137549- cat conftest.err >&5 137550- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137551- (exit $ac_status); } && 137552- { ac_try='test -z "$ac_c_werror_flag" 137553- || test ! -s conftest.err' 137554- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137555- (eval $ac_try) 2>&5 137556- ac_status=$? 137557- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137558- (exit $ac_status); }; } && 137559- { ac_try='test -s conftest.$ac_objext' 137560- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137561- (eval $ac_try) 2>&5 137562- ac_status=$? 137563- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137564- (exit $ac_status); }; }; then 137565- ac_lo=$ac_mid; break 137566-else 137567- echo "$as_me: failed program was:" >&5 137568-sed 's/^/| /' conftest.$ac_ext >&5 137569- 137570-ac_hi=`expr '(' $ac_mid ')' - 1` 137571- if test $ac_mid -le $ac_hi; then 137572- ac_lo= ac_hi= 137573- break 137574- fi 137575- ac_mid=`expr 2 '*' $ac_mid` 137576-fi 137577-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137578- done 137579-else 137580- echo "$as_me: failed program was:" >&5 137581-sed 's/^/| /' conftest.$ac_ext >&5 137582- 137583-ac_lo= ac_hi= 137584-fi 137585-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137586-fi 137587-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137588-# Binary search between lo and hi bounds. 137589-while test "x$ac_lo" != "x$ac_hi"; do 137590- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 137591- cat >conftest.$ac_ext <<_ACEOF 137592-/* confdefs.h. */ 137593-_ACEOF 137594-cat confdefs.h >>conftest.$ac_ext 137595-cat >>conftest.$ac_ext <<_ACEOF 137596-/* end confdefs.h. */ 137597-$ac_includes_default 137598-int 137599-main () 137600-{ 137601-static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; 137602-test_array [0] = 0 137603- 137604- ; 137605- return 0; 137606-} 137607-_ACEOF 137608-rm -f conftest.$ac_objext 137609-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 137610- (eval $ac_compile) 2>conftest.er1 137611- ac_status=$? 137612- grep -v '^ *+' conftest.er1 >conftest.err 137613- rm -f conftest.er1 137614- cat conftest.err >&5 137615- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137616- (exit $ac_status); } && 137617- { ac_try='test -z "$ac_c_werror_flag" 137618- || test ! -s conftest.err' 137619- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137620- (eval $ac_try) 2>&5 137621- ac_status=$? 137622- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137623- (exit $ac_status); }; } && 137624- { ac_try='test -s conftest.$ac_objext' 137625- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137626- (eval $ac_try) 2>&5 137627- ac_status=$? 137628- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137629- (exit $ac_status); }; }; then 137630- ac_hi=$ac_mid 137631-else 137632- echo "$as_me: failed program was:" >&5 137633-sed 's/^/| /' conftest.$ac_ext >&5 137634- 137635-ac_lo=`expr '(' $ac_mid ')' + 1` 137636-fi 137637-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 137638-done 137639-case $ac_lo in 137640-?*) ac_cv_sizeof_long_int=$ac_lo;; 137641-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 137642-See \`config.log' for more details." >&5 137643-echo "$as_me: error: cannot compute sizeof (long int), 77 137644-See \`config.log' for more details." >&2;} 137645- { (exit 1); exit 1; }; } ;; 137646-esac 137647+ echo $ac_n "checking size of long int""... $ac_c" 1>&6 137648+echo "configure:92246: checking size of long int" >&5 137649+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then 137650+ echo $ac_n "(cached) $ac_c" 1>&6 137651 else 137652 if test "$cross_compiling" = yes; then 137653- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 137654-See \`config.log' for more details." >&5 137655-echo "$as_me: error: cannot run test program while cross compiling 137656-See \`config.log' for more details." >&2;} 137657- { (exit 1); exit 1; }; } 137658-else 137659- cat >conftest.$ac_ext <<_ACEOF 137660-/* confdefs.h. */ 137661-_ACEOF 137662-cat confdefs.h >>conftest.$ac_ext 137663-cat >>conftest.$ac_ext <<_ACEOF 137664-/* end confdefs.h. */ 137665-$ac_includes_default 137666-long longval () { return (long) (sizeof (long int)); } 137667-unsigned long ulongval () { return (long) (sizeof (long int)); } 137668+ ac_cv_sizeof_long_int=4 137669+else 137670+ cat > conftest.$ac_ext <<EOF 137671+#line 92254 "configure" 137672+#include "confdefs.h" 137673 #include <stdio.h> 137674-#include <stdlib.h> 137675-int 137676-main () 137677+main() 137678 { 137679- 137680- FILE *f = fopen ("conftest.val", "w"); 137681- if (! f) 137682- exit (1); 137683- if (((long) (sizeof (long int))) < 0) 137684- { 137685- long i = longval (); 137686- if (i != ((long) (sizeof (long int)))) 137687- exit (1); 137688- fprintf (f, "%ld\n", i); 137689- } 137690- else 137691- { 137692- unsigned long i = ulongval (); 137693- if (i != ((long) (sizeof (long int)))) 137694- exit (1); 137695- fprintf (f, "%lu\n", i); 137696- } 137697- exit (ferror (f) || fclose (f) != 0); 137698- 137699- ; 137700- return 0; 137701+ FILE *f=fopen("conftestval", "w"); 137702+ if (!f) exit(1); 137703+ fprintf(f, "%d\n", sizeof(long int)); 137704+ exit(0); 137705 } 137706-_ACEOF 137707-rm -f conftest$ac_exeext 137708-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 137709- (eval $ac_link) 2>&5 137710- ac_status=$? 137711- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137712- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 137713- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 137714- (eval $ac_try) 2>&5 137715- ac_status=$? 137716- echo "$as_me:$LINENO: \$? = $ac_status" >&5 137717- (exit $ac_status); }; }; then 137718- ac_cv_sizeof_long_int=`cat conftest.val` 137719-else 137720- echo "$as_me: program exited with status $ac_status" >&5 137721-echo "$as_me: failed program was:" >&5 137722-sed 's/^/| /' conftest.$ac_ext >&5 137723- 137724-( exit $ac_status ) 137725-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77 137726-See \`config.log' for more details." >&5 137727-echo "$as_me: error: cannot compute sizeof (long int), 77 137728-See \`config.log' for more details." >&2;} 137729- { (exit 1); exit 1; }; } 137730-fi 137731-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 137732-fi 137733-fi 137734-rm -f conftest.val 137735+EOF 137736+if { (eval echo configure:92265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 137737+then 137738+ ac_cv_sizeof_long_int=`cat conftestval` 137739 else 137740+ echo "configure: failed program was:" >&5 137741+ cat conftest.$ac_ext >&5 137742+ rm -fr conftest* 137743 ac_cv_sizeof_long_int=0 137744 fi 137745+rm -fr conftest* 137746+fi 137747+ 137748 fi 137749-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 137750-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 137751-cat >>confdefs.h <<_ACEOF 137752+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 137753+cat >> confdefs.h <<EOF 137754 #define SIZEOF_LONG_INT $ac_cv_sizeof_long_int 137755-_ACEOF 137756+EOF 137757 137758 137759- echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5 137760-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6 137761+ echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 137762+echo "configure:92285: checking checking if we're on a 64-bit platform" >&5 137763 if test "$ac_cv_sizeof_long_int" = "4"; then 137764- echo "$as_me:$LINENO: result: no" >&5 137765-echo "${ECHO_T}no" >&6 137766+ echo "$ac_t""no" 1>&6 137767 PHP_SYBASE_64=no 137768 else 137769- echo "$as_me:$LINENO: result: yes" >&5 137770-echo "${ECHO_T}yes" >&6 137771+ echo "$ac_t""yes" 1>&6 137772 PHP_SYBASE_64=yes 137773 fi 137774 137775 137776- echo "$as_me:$LINENO: checking Checking for ctpublic.h" >&5 137777-echo $ECHO_N "checking Checking for ctpublic.h... $ECHO_C" >&6 137778+ echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 137779+echo "configure:92296: checking Checking for ctpublic.h" >&5 137780 if test -f $SYBASE_CT_INCDIR/ctpublic.h; then 137781- echo "$as_me:$LINENO: result: found in $SYBASE_CT_INCDIR" >&5 137782-echo "${ECHO_T}found in $SYBASE_CT_INCDIR" >&6 137783- 137784+ echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 137785+ 137786 if test "$SYBASE_CT_INCDIR" != "/usr/include"; then 137787- 137788+ 137789 if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then 137790 ai_p=$SYBASE_CT_INCDIR 137791 else 137792- 137793+ 137794 ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 137795- 137796+ 137797 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 137798 ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" 137799 fi 137800 137801- 137802- 137803+ 137804+ 137805 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 137806- 137807+ 137808 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 137809 if test -n "$unique" && test "`eval $cmd`" = "" ; then 137810 eval "INCLUDEPATH$unique=set" 137811- 137812+ 137813 if test ""; then 137814 INCLUDES="-I$ai_p $INCLUDES" 137815 else 137816 INCLUDES="$INCLUDES -I$ai_p" 137817 fi 137818- 137819+ 137820 fi 137821 137822 fi 137823 137824 else 137825- { { echo "$as_me:$LINENO: error: ctpublic.h missing!" >&5 137826-echo "$as_me: error: ctpublic.h missing!" >&2;} 137827- { (exit 1); exit 1; }; } 137828+ { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } 137829 fi 137830+ 137831+ echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 137832+echo "configure:92335: checking Checking Sybase libdir" >&5 137833+ echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 137834+ 137835+ echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 137836+echo "configure:92339: checking Checking for Sybase platform libraries" >&5 137837 137838- echo "$as_me:$LINENO: checking Checking Sybase libdir" >&5 137839-echo $ECHO_N "checking Checking Sybase libdir... $ECHO_C" >&6 137840- echo "$as_me:$LINENO: result: Have $SYBASE_CT_LIBDIR" >&5 137841-echo "${ECHO_T}Have $SYBASE_CT_LIBDIR" >&6 137842- 137843- echo "$as_me:$LINENO: checking Checking for Sybase platform libraries" >&5 137844-echo $ECHO_N "checking Checking for Sybase platform libraries... $ECHO_C" >&6 137845- 137846- 137847+ 137848 if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then 137849- 137850+ 137851 if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then 137852 ai_p=$SYBASE_CT_LIBDIR 137853 else 137854- 137855+ 137856 ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 137857- 137858+ 137859 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 137860 ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" 137861 fi 137862 137863- 137864+ 137865 if test "$ext_shared" = "yes"; then 137866 SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" 137867 test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" 137868 else 137869- 137870- 137871- 137872+ 137873+ 137874+ 137875 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 137876- 137877+ 137878 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 137879 if test -n "$unique" && test "`eval $cmd`" = "" ; then 137880 eval "LIBPATH$unique=set" 137881- 137882+ 137883 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 137884 LDFLAGS="$LDFLAGS -L$ai_p" 137885 PHP_RPATHS="$PHP_RPATHS $ai_p" 137886- 137887+ 137888 fi 137889 137890 137891 fi 137892- 137893+ 137894 fi 137895 137896 if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then 137897- 137898- 137899+ 137900+ 137901 case ct in 137902 c|c_r|pthread*) ;; 137903- *) 137904+ *) 137905 if test "$ext_shared" = "yes"; then 137906- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 137907+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 137908 else 137909- 137910- 137911+ 137912+ 137913 case ct in 137914 c|c_r|pthread*) ;; 137915- *) 137916- LIBS="-lct $LIBS" 137917+ *) 137918+ LIBS="-lct $LIBS" 137919 ;; 137920 esac 137921 137922@@ -119525,23 +92400,22 @@ 137923 137924 137925 SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" 137926- echo "$as_me:$LINENO: result: FreeTDS: $SYBASE_CT_LIBS" >&5 137927-echo "${ECHO_T}FreeTDS: $SYBASE_CT_LIBS" >&6 137928+ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 137929 elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then 137930- 137931- 137932+ 137933+ 137934 case sybcs64 in 137935 c|c_r|pthread*) ;; 137936- *) 137937+ *) 137938 if test "$ext_shared" = "yes"; then 137939- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" 137940+ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" 137941 else 137942- 137943- 137944+ 137945+ 137946 case sybcs64 in 137947 c|c_r|pthread*) ;; 137948- *) 137949- LIBS="-lsybcs64 $LIBS" 137950+ *) 137951+ LIBS="-lsybcs64 $LIBS" 137952 ;; 137953 esac 137954 137955@@ -119551,20 +92425,20 @@ 137956 esac 137957 137958 137959- 137960- 137961+ 137962+ 137963 case sybct64 in 137964 c|c_r|pthread*) ;; 137965- *) 137966+ *) 137967 if test "$ext_shared" = "yes"; then 137968- SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" 137969+ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" 137970 else 137971- 137972- 137973+ 137974+ 137975 case sybct64 in 137976 c|c_r|pthread*) ;; 137977- *) 137978- LIBS="-lsybct64 $LIBS" 137979+ *) 137980+ LIBS="-lsybct64 $LIBS" 137981 ;; 137982 esac 137983 137984@@ -119574,20 +92448,20 @@ 137985 esac 137986 137987 137988- 137989- 137990+ 137991+ 137992 case sybcomn64 in 137993 c|c_r|pthread*) ;; 137994- *) 137995+ *) 137996 if test "$ext_shared" = "yes"; then 137997- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" 137998+ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" 137999 else 138000- 138001- 138002+ 138003+ 138004 case sybcomn64 in 138005 c|c_r|pthread*) ;; 138006- *) 138007- LIBS="-lsybcomn64 $LIBS" 138008+ *) 138009+ LIBS="-lsybcomn64 $LIBS" 138010 ;; 138011 esac 138012 138013@@ -119597,20 +92471,20 @@ 138014 esac 138015 138016 138017- 138018- 138019+ 138020+ 138021 case sybintl64 in 138022 c|c_r|pthread*) ;; 138023- *) 138024+ *) 138025 if test "$ext_shared" = "yes"; then 138026- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" 138027+ SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" 138028 else 138029- 138030- 138031+ 138032+ 138033 case sybintl64 in 138034 c|c_r|pthread*) ;; 138035- *) 138036- LIBS="-lsybintl64 $LIBS" 138037+ *) 138038+ LIBS="-lsybintl64 $LIBS" 138039 ;; 138040 esac 138041 138042@@ -119624,31 +92498,30 @@ 138043 ac_solid_uname_s=`uname -s 2>/dev/null` 138044 case $ac_solid_uname_s in 138045 *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define 138046- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # 138047+ *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # 138048 esac 138049 SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" 138050- echo "$as_me:$LINENO: result: Sybase64: $SYBASE_CT_LIBS" >&5 138051-echo "${ECHO_T}Sybase64: $SYBASE_CT_LIBS" >&6 138052- 138053- 138054+ echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 138055+ 138056+ 138057 save_old_LDFLAGS=$LDFLAGS 138058- ac_stuff=" 138059- $SYBASE_CT_LIBS 138060+ ac_stuff=" 138061+ $SYBASE_CT_LIBS 138062 " 138063- 138064+ 138065 save_ext_shared=$ext_shared 138066 ext_shared=yes 138067- 138068+ 138069 for ac_i in $ac_stuff; do 138070 case $ac_i in 138071 -pthread) 138072 if test "$ext_shared" = "yes"; then 138073 LDFLAGS="$LDFLAGS -pthread" 138074 else 138075- 138076- 138077+ 138078+ 138079 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 138080- 138081+ 138082 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 138083 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138084 eval "EXTRA_LDFLAGS$unique=set" 138085@@ -119659,20 +92532,20 @@ 138086 ;; 138087 -l*) 138088 ac_ii=`echo $ac_i|cut -c 3-` 138089- 138090- 138091+ 138092+ 138093 case $ac_ii in 138094 c|c_r|pthread*) ;; 138095- *) 138096+ *) 138097 if test "$ext_shared" = "yes"; then 138098- LDFLAGS="$LDFLAGS -l$ac_ii" 138099+ LDFLAGS="$LDFLAGS -l$ac_ii" 138100 else 138101- 138102- 138103+ 138104+ 138105 case $ac_ii in 138106 c|c_r|pthread*) ;; 138107- *) 138108- LIBS="$LIBS -l$ac_ii" 138109+ *) 138110+ LIBS="$LIBS -l$ac_ii" 138111 ;; 138112 esac 138113 138114@@ -119685,131 +92558,101 @@ 138115 ;; 138116 -L*) 138117 ac_ii=`echo $ac_i|cut -c 3-` 138118- 138119+ 138120 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 138121- 138122+ 138123 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 138124 ai_p=$ac_ii 138125 else 138126- 138127+ 138128 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 138129- 138130+ 138131 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 138132 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 138133 fi 138134 138135- 138136+ 138137 if test "$ext_shared" = "yes"; then 138138 LDFLAGS="-L$ai_p $LDFLAGS" 138139 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 138140 else 138141- 138142- 138143- 138144+ 138145+ 138146+ 138147 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 138148- 138149+ 138150 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 138151 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138152 eval "LIBPATH$unique=set" 138153- 138154+ 138155 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 138156 LDFLAGS="$LDFLAGS -L$ai_p" 138157 PHP_RPATHS="$PHP_RPATHS $ai_p" 138158- 138159+ 138160 fi 138161 138162 138163 fi 138164- 138165+ 138166 fi 138167 138168 ;; 138169 esac 138170 done 138171 138172- echo "$as_me:$LINENO: checking for netg_errstr in -lsybtcl64" >&5 138173-echo $ECHO_N "checking for netg_errstr in -lsybtcl64... $ECHO_C" >&6 138174-if test "${ac_cv_lib_sybtcl64_netg_errstr+set}" = set; then 138175- echo $ECHO_N "(cached) $ECHO_C" >&6 138176+ echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 138177+echo "configure:92605: checking for netg_errstr in -lsybtcl64" >&5 138178+ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'` 138179+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 138180+ echo $ac_n "(cached) $ac_c" 1>&6 138181 else 138182- ac_check_lib_save_LIBS=$LIBS 138183+ ac_save_LIBS="$LIBS" 138184 LIBS="-lsybtcl64 $LIBS" 138185-cat >conftest.$ac_ext <<_ACEOF 138186-/* confdefs.h. */ 138187-_ACEOF 138188-cat confdefs.h >>conftest.$ac_ext 138189-cat >>conftest.$ac_ext <<_ACEOF 138190-/* end confdefs.h. */ 138191- 138192+cat > conftest.$ac_ext <<EOF 138193+#line 92613 "configure" 138194+#include "confdefs.h" 138195 /* Override any gcc2 internal prototype to avoid an error. */ 138196-#ifdef __cplusplus 138197-extern "C" 138198-#endif 138199 /* We use char because int might match the return type of a gcc2 138200- builtin and then its argument prototype would still apply. */ 138201-char netg_errstr (); 138202-int 138203-main () 138204-{ 138205-netg_errstr (); 138206- ; 138207- return 0; 138208-} 138209-_ACEOF 138210-rm -f conftest.$ac_objext conftest$ac_exeext 138211-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 138212- (eval $ac_link) 2>conftest.er1 138213- ac_status=$? 138214- grep -v '^ *+' conftest.er1 >conftest.err 138215- rm -f conftest.er1 138216- cat conftest.err >&5 138217- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138218- (exit $ac_status); } && 138219- { ac_try='test -z "$ac_c_werror_flag" 138220- || test ! -s conftest.err' 138221- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138222- (eval $ac_try) 2>&5 138223- ac_status=$? 138224- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138225- (exit $ac_status); }; } && 138226- { ac_try='test -s conftest$ac_exeext' 138227- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138228- (eval $ac_try) 2>&5 138229- ac_status=$? 138230- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138231- (exit $ac_status); }; }; then 138232- ac_cv_lib_sybtcl64_netg_errstr=yes 138233-else 138234- echo "$as_me: failed program was:" >&5 138235-sed 's/^/| /' conftest.$ac_ext >&5 138236- 138237-ac_cv_lib_sybtcl64_netg_errstr=no 138238-fi 138239-rm -f conftest.err conftest.$ac_objext \ 138240- conftest$ac_exeext conftest.$ac_ext 138241-LIBS=$ac_check_lib_save_LIBS 138242-fi 138243-echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5 138244-echo "${ECHO_T}$ac_cv_lib_sybtcl64_netg_errstr" >&6 138245-if test $ac_cv_lib_sybtcl64_netg_errstr = yes; then 138246+ builtin and then its argument prototype would still apply. */ 138247+char netg_errstr(); 138248 138249+int main() { 138250+netg_errstr() 138251+; return 0; } 138252+EOF 138253+if { (eval echo configure:92624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 138254+ rm -rf conftest* 138255+ eval "ac_cv_lib_$ac_lib_var=yes" 138256+else 138257+ echo "configure: failed program was:" >&5 138258+ cat conftest.$ac_ext >&5 138259+ rm -rf conftest* 138260+ eval "ac_cv_lib_$ac_lib_var=no" 138261+fi 138262+rm -f conftest* 138263+LIBS="$ac_save_LIBS" 138264+ 138265+fi 138266+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 138267+ echo "$ac_t""yes" 1>&6 138268+ 138269 LDFLAGS=$save_old_LDFLAGS 138270 ext_shared=$save_ext_shared 138271- 138272- 138273- 138274+ 138275+ 138276+ 138277 case sybtcl64 in 138278 c|c_r|pthread*) ;; 138279- *) 138280+ *) 138281 if test "$ext_shared" = "yes"; then 138282- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 138283+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 138284 else 138285- 138286- 138287+ 138288+ 138289 case sybtcl64 in 138290 c|c_r|pthread*) ;; 138291- *) 138292- LIBS="-lsybtcl64 $LIBS" 138293+ *) 138294+ LIBS="-lsybtcl64 $LIBS" 138295 ;; 138296 esac 138297 138298@@ -119819,28 +92662,29 @@ 138299 esac 138300 138301 138302- 138303- 138304+ 138305+ 138306 else 138307+ echo "$ac_t""no" 1>&6 138308 138309 LDFLAGS=$save_old_LDFLAGS 138310 ext_shared=$save_ext_shared 138311 unset ac_cv_lib_sybtcl64_netg_errstr 138312- 138313- 138314- 138315+ 138316+ 138317+ 138318 case sybtcl64 in 138319 c|c_r|pthread*) ;; 138320- *) 138321+ *) 138322 if test "$ext_shared" = "yes"; then 138323- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 138324+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" 138325 else 138326- 138327- 138328+ 138329+ 138330 case sybtcl64 in 138331 c|c_r|pthread*) ;; 138332- *) 138333- LIBS="-lsybtcl64 $LIBS" 138334+ *) 138335+ LIBS="-lsybtcl64 $LIBS" 138336 ;; 138337 esac 138338 138339@@ -119850,28 +92694,28 @@ 138340 esac 138341 138342 138343- 138344- 138345+ 138346+ 138347 fi 138348 138349- 138350- 138351+ 138352+ 138353 save_old_LDFLAGS=$LDFLAGS 138354 ac_stuff="-L$SYBASE_CT_LIBDIR" 138355- 138356+ 138357 save_ext_shared=$ext_shared 138358 ext_shared=yes 138359- 138360+ 138361 for ac_i in $ac_stuff; do 138362 case $ac_i in 138363 -pthread) 138364 if test "$ext_shared" = "yes"; then 138365 LDFLAGS="$LDFLAGS -pthread" 138366 else 138367- 138368- 138369+ 138370+ 138371 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 138372- 138373+ 138374 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 138375 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138376 eval "EXTRA_LDFLAGS$unique=set" 138377@@ -119882,20 +92726,20 @@ 138378 ;; 138379 -l*) 138380 ac_ii=`echo $ac_i|cut -c 3-` 138381- 138382- 138383+ 138384+ 138385 case $ac_ii in 138386 c|c_r|pthread*) ;; 138387- *) 138388+ *) 138389 if test "$ext_shared" = "yes"; then 138390- LDFLAGS="$LDFLAGS -l$ac_ii" 138391+ LDFLAGS="$LDFLAGS -l$ac_ii" 138392 else 138393- 138394- 138395+ 138396+ 138397 case $ac_ii in 138398 c|c_r|pthread*) ;; 138399- *) 138400- LIBS="$LIBS -l$ac_ii" 138401+ *) 138402+ LIBS="$LIBS -l$ac_ii" 138403 ;; 138404 esac 138405 138406@@ -119908,130 +92752,100 @@ 138407 ;; 138408 -L*) 138409 ac_ii=`echo $ac_i|cut -c 3-` 138410- 138411+ 138412 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 138413- 138414+ 138415 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 138416 ai_p=$ac_ii 138417 else 138418- 138419+ 138420 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 138421- 138422+ 138423 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 138424 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 138425 fi 138426 138427- 138428+ 138429 if test "$ext_shared" = "yes"; then 138430 LDFLAGS="-L$ai_p $LDFLAGS" 138431 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 138432 else 138433- 138434- 138435- 138436+ 138437+ 138438+ 138439 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 138440- 138441+ 138442 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 138443 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138444 eval "LIBPATH$unique=set" 138445- 138446+ 138447 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 138448 LDFLAGS="$LDFLAGS -L$ai_p" 138449 PHP_RPATHS="$PHP_RPATHS $ai_p" 138450- 138451+ 138452 fi 138453 138454 138455 fi 138456- 138457+ 138458 fi 138459 138460 ;; 138461 esac 138462 done 138463 138464- echo "$as_me:$LINENO: checking for insck__getVdate in -linsck64" >&5 138465-echo $ECHO_N "checking for insck__getVdate in -linsck64... $ECHO_C" >&6 138466-if test "${ac_cv_lib_insck64_insck__getVdate+set}" = set; then 138467- echo $ECHO_N "(cached) $ECHO_C" >&6 138468+ echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 138469+echo "configure:92799: checking for insck__getVdate in -linsck64" >&5 138470+ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'` 138471+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 138472+ echo $ac_n "(cached) $ac_c" 1>&6 138473 else 138474- ac_check_lib_save_LIBS=$LIBS 138475+ ac_save_LIBS="$LIBS" 138476 LIBS="-linsck64 $LIBS" 138477-cat >conftest.$ac_ext <<_ACEOF 138478-/* confdefs.h. */ 138479-_ACEOF 138480-cat confdefs.h >>conftest.$ac_ext 138481-cat >>conftest.$ac_ext <<_ACEOF 138482-/* end confdefs.h. */ 138483- 138484+cat > conftest.$ac_ext <<EOF 138485+#line 92807 "configure" 138486+#include "confdefs.h" 138487 /* Override any gcc2 internal prototype to avoid an error. */ 138488-#ifdef __cplusplus 138489-extern "C" 138490-#endif 138491 /* We use char because int might match the return type of a gcc2 138492- builtin and then its argument prototype would still apply. */ 138493-char insck__getVdate (); 138494-int 138495-main () 138496-{ 138497-insck__getVdate (); 138498- ; 138499- return 0; 138500-} 138501-_ACEOF 138502-rm -f conftest.$ac_objext conftest$ac_exeext 138503-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 138504- (eval $ac_link) 2>conftest.er1 138505- ac_status=$? 138506- grep -v '^ *+' conftest.er1 >conftest.err 138507- rm -f conftest.er1 138508- cat conftest.err >&5 138509- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138510- (exit $ac_status); } && 138511- { ac_try='test -z "$ac_c_werror_flag" 138512- || test ! -s conftest.err' 138513- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138514- (eval $ac_try) 2>&5 138515- ac_status=$? 138516- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138517- (exit $ac_status); }; } && 138518- { ac_try='test -s conftest$ac_exeext' 138519- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138520- (eval $ac_try) 2>&5 138521- ac_status=$? 138522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138523- (exit $ac_status); }; }; then 138524- ac_cv_lib_insck64_insck__getVdate=yes 138525-else 138526- echo "$as_me: failed program was:" >&5 138527-sed 's/^/| /' conftest.$ac_ext >&5 138528- 138529-ac_cv_lib_insck64_insck__getVdate=no 138530-fi 138531-rm -f conftest.err conftest.$ac_objext \ 138532- conftest$ac_exeext conftest.$ac_ext 138533-LIBS=$ac_check_lib_save_LIBS 138534-fi 138535-echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_insck__getVdate" >&5 138536-echo "${ECHO_T}$ac_cv_lib_insck64_insck__getVdate" >&6 138537-if test $ac_cv_lib_insck64_insck__getVdate = yes; then 138538+ builtin and then its argument prototype would still apply. */ 138539+char insck__getVdate(); 138540+ 138541+int main() { 138542+insck__getVdate() 138543+; return 0; } 138544+EOF 138545+if { (eval echo configure:92818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 138546+ rm -rf conftest* 138547+ eval "ac_cv_lib_$ac_lib_var=yes" 138548+else 138549+ echo "configure: failed program was:" >&5 138550+ cat conftest.$ac_ext >&5 138551+ rm -rf conftest* 138552+ eval "ac_cv_lib_$ac_lib_var=no" 138553+fi 138554+rm -f conftest* 138555+LIBS="$ac_save_LIBS" 138556 138557+fi 138558+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 138559+ echo "$ac_t""yes" 1>&6 138560+ 138561 LDFLAGS=$save_old_LDFLAGS 138562 ext_shared=$save_ext_shared 138563- 138564- 138565+ 138566+ 138567 case insck64 in 138568 c|c_r|pthread*) ;; 138569- *) 138570+ *) 138571 if test "$ext_shared" = "yes"; then 138572- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 138573+ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 138574 else 138575- 138576- 138577+ 138578+ 138579 case insck64 in 138580 c|c_r|pthread*) ;; 138581- *) 138582- LIBS="-linsck64 $LIBS" 138583+ *) 138584+ LIBS="-linsck64 $LIBS" 138585 ;; 138586 esac 138587 138588@@ -120041,33 +92855,34 @@ 138589 esac 138590 138591 138592- 138593+ 138594 else 138595+ echo "$ac_t""no" 1>&6 138596 138597 LDFLAGS=$save_old_LDFLAGS 138598 ext_shared=$save_ext_shared 138599 unset ac_cv_lib_insck64_insck__getVdate 138600- 138601- 138602+ 138603+ 138604 fi 138605 138606- 138607+ 138608 save_old_LDFLAGS=$LDFLAGS 138609 ac_stuff="-L$SYBASE_CT_LIBDIR" 138610- 138611+ 138612 save_ext_shared=$ext_shared 138613 ext_shared=yes 138614- 138615+ 138616 for ac_i in $ac_stuff; do 138617 case $ac_i in 138618 -pthread) 138619 if test "$ext_shared" = "yes"; then 138620 LDFLAGS="$LDFLAGS -pthread" 138621 else 138622- 138623- 138624+ 138625+ 138626 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 138627- 138628+ 138629 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 138630 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138631 eval "EXTRA_LDFLAGS$unique=set" 138632@@ -120078,20 +92893,20 @@ 138633 ;; 138634 -l*) 138635 ac_ii=`echo $ac_i|cut -c 3-` 138636- 138637- 138638+ 138639+ 138640 case $ac_ii in 138641 c|c_r|pthread*) ;; 138642- *) 138643+ *) 138644 if test "$ext_shared" = "yes"; then 138645- LDFLAGS="$LDFLAGS -l$ac_ii" 138646+ LDFLAGS="$LDFLAGS -l$ac_ii" 138647 else 138648- 138649- 138650+ 138651+ 138652 case $ac_ii in 138653 c|c_r|pthread*) ;; 138654- *) 138655- LIBS="$LIBS -l$ac_ii" 138656+ *) 138657+ LIBS="$LIBS -l$ac_ii" 138658 ;; 138659 esac 138660 138661@@ -120104,130 +92919,100 @@ 138662 ;; 138663 -L*) 138664 ac_ii=`echo $ac_i|cut -c 3-` 138665- 138666+ 138667 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 138668- 138669+ 138670 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 138671 ai_p=$ac_ii 138672 else 138673- 138674+ 138675 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 138676- 138677+ 138678 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 138679 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 138680 fi 138681 138682- 138683+ 138684 if test "$ext_shared" = "yes"; then 138685 LDFLAGS="-L$ai_p $LDFLAGS" 138686 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 138687 else 138688- 138689- 138690- 138691+ 138692+ 138693+ 138694 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 138695- 138696+ 138697 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 138698 if test -n "$unique" && test "`eval $cmd`" = "" ; then 138699 eval "LIBPATH$unique=set" 138700- 138701+ 138702 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 138703 LDFLAGS="$LDFLAGS -L$ai_p" 138704 PHP_RPATHS="$PHP_RPATHS $ai_p" 138705- 138706+ 138707 fi 138708 138709 138710 fi 138711- 138712+ 138713 fi 138714 138715 ;; 138716 esac 138717 done 138718 138719- echo "$as_me:$LINENO: checking for bsd_tcp in -linsck64" >&5 138720-echo $ECHO_N "checking for bsd_tcp in -linsck64... $ECHO_C" >&6 138721-if test "${ac_cv_lib_insck64_bsd_tcp+set}" = set; then 138722- echo $ECHO_N "(cached) $ECHO_C" >&6 138723+ echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 138724+echo "configure:92966: checking for bsd_tcp in -linsck64" >&5 138725+ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'` 138726+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 138727+ echo $ac_n "(cached) $ac_c" 1>&6 138728 else 138729- ac_check_lib_save_LIBS=$LIBS 138730+ ac_save_LIBS="$LIBS" 138731 LIBS="-linsck64 $LIBS" 138732-cat >conftest.$ac_ext <<_ACEOF 138733-/* confdefs.h. */ 138734-_ACEOF 138735-cat confdefs.h >>conftest.$ac_ext 138736-cat >>conftest.$ac_ext <<_ACEOF 138737-/* end confdefs.h. */ 138738- 138739+cat > conftest.$ac_ext <<EOF 138740+#line 92974 "configure" 138741+#include "confdefs.h" 138742 /* Override any gcc2 internal prototype to avoid an error. */ 138743-#ifdef __cplusplus 138744-extern "C" 138745-#endif 138746 /* We use char because int might match the return type of a gcc2 138747- builtin and then its argument prototype would still apply. */ 138748-char bsd_tcp (); 138749-int 138750-main () 138751-{ 138752-bsd_tcp (); 138753- ; 138754- return 0; 138755-} 138756-_ACEOF 138757-rm -f conftest.$ac_objext conftest$ac_exeext 138758-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 138759- (eval $ac_link) 2>conftest.er1 138760- ac_status=$? 138761- grep -v '^ *+' conftest.er1 >conftest.err 138762- rm -f conftest.er1 138763- cat conftest.err >&5 138764- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138765- (exit $ac_status); } && 138766- { ac_try='test -z "$ac_c_werror_flag" 138767- || test ! -s conftest.err' 138768- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138769- (eval $ac_try) 2>&5 138770- ac_status=$? 138771- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138772- (exit $ac_status); }; } && 138773- { ac_try='test -s conftest$ac_exeext' 138774- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 138775- (eval $ac_try) 2>&5 138776- ac_status=$? 138777- echo "$as_me:$LINENO: \$? = $ac_status" >&5 138778- (exit $ac_status); }; }; then 138779- ac_cv_lib_insck64_bsd_tcp=yes 138780-else 138781- echo "$as_me: failed program was:" >&5 138782-sed 's/^/| /' conftest.$ac_ext >&5 138783- 138784-ac_cv_lib_insck64_bsd_tcp=no 138785-fi 138786-rm -f conftest.err conftest.$ac_objext \ 138787- conftest$ac_exeext conftest.$ac_ext 138788-LIBS=$ac_check_lib_save_LIBS 138789-fi 138790-echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_bsd_tcp" >&5 138791-echo "${ECHO_T}$ac_cv_lib_insck64_bsd_tcp" >&6 138792-if test $ac_cv_lib_insck64_bsd_tcp = yes; then 138793+ builtin and then its argument prototype would still apply. */ 138794+char bsd_tcp(); 138795+ 138796+int main() { 138797+bsd_tcp() 138798+; return 0; } 138799+EOF 138800+if { (eval echo configure:92985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 138801+ rm -rf conftest* 138802+ eval "ac_cv_lib_$ac_lib_var=yes" 138803+else 138804+ echo "configure: failed program was:" >&5 138805+ cat conftest.$ac_ext >&5 138806+ rm -rf conftest* 138807+ eval "ac_cv_lib_$ac_lib_var=no" 138808+fi 138809+rm -f conftest* 138810+LIBS="$ac_save_LIBS" 138811 138812+fi 138813+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 138814+ echo "$ac_t""yes" 1>&6 138815+ 138816 LDFLAGS=$save_old_LDFLAGS 138817 ext_shared=$save_ext_shared 138818- 138819- 138820+ 138821+ 138822 case insck64 in 138823 c|c_r|pthread*) ;; 138824- *) 138825+ *) 138826 if test "$ext_shared" = "yes"; then 138827- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 138828+ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" 138829 else 138830- 138831- 138832+ 138833+ 138834 case insck64 in 138835 c|c_r|pthread*) ;; 138836- *) 138837- LIBS="-linsck64 $LIBS" 138838+ *) 138839+ LIBS="-linsck64 $LIBS" 138840 ;; 138841 esac 138842 138843@@ -120237,31 +93022,32 @@ 138844 esac 138845 138846 138847- 138848+ 138849 else 138850+ echo "$ac_t""no" 1>&6 138851 138852 LDFLAGS=$save_old_LDFLAGS 138853 ext_shared=$save_ext_shared 138854 unset ac_cv_lib_insck64_bsd_tcp 138855- 138856- 138857+ 138858+ 138859 fi 138860 138861 elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then 138862- 138863- 138864+ 138865+ 138866 case sybcs in 138867 c|c_r|pthread*) ;; 138868- *) 138869+ *) 138870 if test "$ext_shared" = "yes"; then 138871- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" 138872+ SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" 138873 else 138874- 138875- 138876+ 138877+ 138878 case sybcs in 138879 c|c_r|pthread*) ;; 138880- *) 138881- LIBS="-lsybcs $LIBS" 138882+ *) 138883+ LIBS="-lsybcs $LIBS" 138884 ;; 138885 esac 138886 138887@@ -120271,20 +93057,20 @@ 138888 esac 138889 138890 138891- 138892- 138893+ 138894+ 138895 case sybct in 138896 c|c_r|pthread*) ;; 138897- *) 138898+ *) 138899 if test "$ext_shared" = "yes"; then 138900- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" 138901+ SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" 138902 else 138903- 138904- 138905+ 138906+ 138907 case sybct in 138908 c|c_r|pthread*) ;; 138909- *) 138910- LIBS="-lsybct $LIBS" 138911+ *) 138912+ LIBS="-lsybct $LIBS" 138913 ;; 138914 esac 138915 138916@@ -120294,20 +93080,20 @@ 138917 esac 138918 138919 138920- 138921- 138922+ 138923+ 138924 case sybcomn in 138925 c|c_r|pthread*) ;; 138926- *) 138927+ *) 138928 if test "$ext_shared" = "yes"; then 138929- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" 138930+ SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" 138931 else 138932- 138933- 138934+ 138935+ 138936 case sybcomn in 138937 c|c_r|pthread*) ;; 138938- *) 138939- LIBS="-lsybcomn $LIBS" 138940+ *) 138941+ LIBS="-lsybcomn $LIBS" 138942 ;; 138943 esac 138944 138945@@ -120317,20 +93103,20 @@ 138946 esac 138947 138948 138949- 138950- 138951+ 138952+ 138953 case sybintl in 138954 c|c_r|pthread*) ;; 138955- *) 138956+ *) 138957 if test "$ext_shared" = "yes"; then 138958- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" 138959+ SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" 138960 else 138961- 138962- 138963+ 138964+ 138965 case sybintl in 138966 c|c_r|pthread*) ;; 138967- *) 138968- LIBS="-lsybintl $LIBS" 138969+ *) 138970+ LIBS="-lsybintl $LIBS" 138971 ;; 138972 esac 138973 138974@@ -120340,30 +93126,29 @@ 138975 esac 138976 138977 138978- 138979+ 138980 SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" 138981- echo "$as_me:$LINENO: result: Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&5 138982-echo "${ECHO_T}Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6 138983- 138984- 138985+ echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 138986+ 138987+ 138988 save_old_LDFLAGS=$LDFLAGS 138989- ac_stuff=" 138990- $SYBASE_CT_LIBS 138991+ ac_stuff=" 138992+ $SYBASE_CT_LIBS 138993 " 138994- 138995+ 138996 save_ext_shared=$ext_shared 138997 ext_shared=yes 138998- 138999+ 139000 for ac_i in $ac_stuff; do 139001 case $ac_i in 139002 -pthread) 139003 if test "$ext_shared" = "yes"; then 139004 LDFLAGS="$LDFLAGS -pthread" 139005 else 139006- 139007- 139008+ 139009+ 139010 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 139011- 139012+ 139013 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 139014 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139015 eval "EXTRA_LDFLAGS$unique=set" 139016@@ -120374,20 +93159,20 @@ 139017 ;; 139018 -l*) 139019 ac_ii=`echo $ac_i|cut -c 3-` 139020- 139021- 139022+ 139023+ 139024 case $ac_ii in 139025 c|c_r|pthread*) ;; 139026- *) 139027+ *) 139028 if test "$ext_shared" = "yes"; then 139029- LDFLAGS="$LDFLAGS -l$ac_ii" 139030+ LDFLAGS="$LDFLAGS -l$ac_ii" 139031 else 139032- 139033- 139034+ 139035+ 139036 case $ac_ii in 139037 c|c_r|pthread*) ;; 139038- *) 139039- LIBS="$LIBS -l$ac_ii" 139040+ *) 139041+ LIBS="$LIBS -l$ac_ii" 139042 ;; 139043 esac 139044 139045@@ -120400,131 +93185,101 @@ 139046 ;; 139047 -L*) 139048 ac_ii=`echo $ac_i|cut -c 3-` 139049- 139050+ 139051 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 139052- 139053+ 139054 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 139055 ai_p=$ac_ii 139056 else 139057- 139058+ 139059 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 139060- 139061+ 139062 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 139063 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 139064 fi 139065 139066- 139067+ 139068 if test "$ext_shared" = "yes"; then 139069 LDFLAGS="-L$ai_p $LDFLAGS" 139070 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 139071 else 139072- 139073- 139074- 139075+ 139076+ 139077+ 139078 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 139079- 139080+ 139081 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 139082 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139083 eval "LIBPATH$unique=set" 139084- 139085+ 139086 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 139087 LDFLAGS="$LDFLAGS -L$ai_p" 139088 PHP_RPATHS="$PHP_RPATHS $ai_p" 139089- 139090+ 139091 fi 139092 139093 139094 fi 139095- 139096+ 139097 fi 139098 139099 ;; 139100 esac 139101 done 139102 139103- echo "$as_me:$LINENO: checking for netg_errstr in -lsybtcl" >&5 139104-echo $ECHO_N "checking for netg_errstr in -lsybtcl... $ECHO_C" >&6 139105-if test "${ac_cv_lib_sybtcl_netg_errstr+set}" = set; then 139106- echo $ECHO_N "(cached) $ECHO_C" >&6 139107+ echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 139108+echo "configure:93232: checking for netg_errstr in -lsybtcl" >&5 139109+ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` 139110+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 139111+ echo $ac_n "(cached) $ac_c" 1>&6 139112 else 139113- ac_check_lib_save_LIBS=$LIBS 139114+ ac_save_LIBS="$LIBS" 139115 LIBS="-lsybtcl $LIBS" 139116-cat >conftest.$ac_ext <<_ACEOF 139117-/* confdefs.h. */ 139118-_ACEOF 139119-cat confdefs.h >>conftest.$ac_ext 139120-cat >>conftest.$ac_ext <<_ACEOF 139121-/* end confdefs.h. */ 139122- 139123+cat > conftest.$ac_ext <<EOF 139124+#line 93240 "configure" 139125+#include "confdefs.h" 139126 /* Override any gcc2 internal prototype to avoid an error. */ 139127-#ifdef __cplusplus 139128-extern "C" 139129-#endif 139130 /* We use char because int might match the return type of a gcc2 139131- builtin and then its argument prototype would still apply. */ 139132-char netg_errstr (); 139133-int 139134-main () 139135-{ 139136-netg_errstr (); 139137- ; 139138- return 0; 139139-} 139140-_ACEOF 139141-rm -f conftest.$ac_objext conftest$ac_exeext 139142-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 139143- (eval $ac_link) 2>conftest.er1 139144- ac_status=$? 139145- grep -v '^ *+' conftest.er1 >conftest.err 139146- rm -f conftest.er1 139147- cat conftest.err >&5 139148- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139149- (exit $ac_status); } && 139150- { ac_try='test -z "$ac_c_werror_flag" 139151- || test ! -s conftest.err' 139152- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139153- (eval $ac_try) 2>&5 139154- ac_status=$? 139155- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139156- (exit $ac_status); }; } && 139157- { ac_try='test -s conftest$ac_exeext' 139158- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139159- (eval $ac_try) 2>&5 139160- ac_status=$? 139161- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139162- (exit $ac_status); }; }; then 139163- ac_cv_lib_sybtcl_netg_errstr=yes 139164-else 139165- echo "$as_me: failed program was:" >&5 139166-sed 's/^/| /' conftest.$ac_ext >&5 139167- 139168-ac_cv_lib_sybtcl_netg_errstr=no 139169-fi 139170-rm -f conftest.err conftest.$ac_objext \ 139171- conftest$ac_exeext conftest.$ac_ext 139172-LIBS=$ac_check_lib_save_LIBS 139173-fi 139174-echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl_netg_errstr" >&5 139175-echo "${ECHO_T}$ac_cv_lib_sybtcl_netg_errstr" >&6 139176-if test $ac_cv_lib_sybtcl_netg_errstr = yes; then 139177+ builtin and then its argument prototype would still apply. */ 139178+char netg_errstr(); 139179+ 139180+int main() { 139181+netg_errstr() 139182+; return 0; } 139183+EOF 139184+if { (eval echo configure:93251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 139185+ rm -rf conftest* 139186+ eval "ac_cv_lib_$ac_lib_var=yes" 139187+else 139188+ echo "configure: failed program was:" >&5 139189+ cat conftest.$ac_ext >&5 139190+ rm -rf conftest* 139191+ eval "ac_cv_lib_$ac_lib_var=no" 139192+fi 139193+rm -f conftest* 139194+LIBS="$ac_save_LIBS" 139195 139196+fi 139197+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 139198+ echo "$ac_t""yes" 1>&6 139199+ 139200 LDFLAGS=$save_old_LDFLAGS 139201 ext_shared=$save_ext_shared 139202- 139203- 139204- 139205+ 139206+ 139207+ 139208 case sybtcl in 139209 c|c_r|pthread*) ;; 139210- *) 139211+ *) 139212 if test "$ext_shared" = "yes"; then 139213- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 139214+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 139215 else 139216- 139217- 139218+ 139219+ 139220 case sybtcl in 139221 c|c_r|pthread*) ;; 139222- *) 139223- LIBS="-lsybtcl $LIBS" 139224+ *) 139225+ LIBS="-lsybtcl $LIBS" 139226 ;; 139227 esac 139228 139229@@ -120534,28 +93289,29 @@ 139230 esac 139231 139232 139233- 139234- 139235+ 139236+ 139237 else 139238+ echo "$ac_t""no" 1>&6 139239 139240 LDFLAGS=$save_old_LDFLAGS 139241 ext_shared=$save_ext_shared 139242 unset ac_cv_lib_sybtcl_netg_errstr 139243- 139244- 139245- 139246+ 139247+ 139248+ 139249 case sybtcl in 139250 c|c_r|pthread*) ;; 139251- *) 139252+ *) 139253 if test "$ext_shared" = "yes"; then 139254- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 139255+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 139256 else 139257- 139258- 139259+ 139260+ 139261 case sybtcl in 139262 c|c_r|pthread*) ;; 139263- *) 139264- LIBS="-lsybtcl $LIBS" 139265+ *) 139266+ LIBS="-lsybtcl $LIBS" 139267 ;; 139268 esac 139269 139270@@ -120565,28 +93321,28 @@ 139271 esac 139272 139273 139274- 139275- 139276+ 139277+ 139278 fi 139279 139280- 139281- 139282+ 139283+ 139284 save_old_LDFLAGS=$LDFLAGS 139285 ac_stuff="-L$SYBASE_CT_LIBDIR" 139286- 139287+ 139288 save_ext_shared=$ext_shared 139289 ext_shared=yes 139290- 139291+ 139292 for ac_i in $ac_stuff; do 139293 case $ac_i in 139294 -pthread) 139295 if test "$ext_shared" = "yes"; then 139296 LDFLAGS="$LDFLAGS -pthread" 139297 else 139298- 139299- 139300+ 139301+ 139302 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 139303- 139304+ 139305 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 139306 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139307 eval "EXTRA_LDFLAGS$unique=set" 139308@@ -120597,20 +93353,20 @@ 139309 ;; 139310 -l*) 139311 ac_ii=`echo $ac_i|cut -c 3-` 139312- 139313- 139314+ 139315+ 139316 case $ac_ii in 139317 c|c_r|pthread*) ;; 139318- *) 139319+ *) 139320 if test "$ext_shared" = "yes"; then 139321- LDFLAGS="$LDFLAGS -l$ac_ii" 139322+ LDFLAGS="$LDFLAGS -l$ac_ii" 139323 else 139324- 139325- 139326+ 139327+ 139328 case $ac_ii in 139329 c|c_r|pthread*) ;; 139330- *) 139331- LIBS="$LIBS -l$ac_ii" 139332+ *) 139333+ LIBS="$LIBS -l$ac_ii" 139334 ;; 139335 esac 139336 139337@@ -120623,130 +93379,100 @@ 139338 ;; 139339 -L*) 139340 ac_ii=`echo $ac_i|cut -c 3-` 139341- 139342+ 139343 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 139344- 139345+ 139346 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 139347 ai_p=$ac_ii 139348 else 139349- 139350+ 139351 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 139352- 139353+ 139354 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 139355 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 139356 fi 139357 139358- 139359+ 139360 if test "$ext_shared" = "yes"; then 139361 LDFLAGS="-L$ai_p $LDFLAGS" 139362 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 139363 else 139364- 139365- 139366- 139367+ 139368+ 139369+ 139370 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 139371- 139372+ 139373 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 139374 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139375 eval "LIBPATH$unique=set" 139376- 139377+ 139378 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 139379 LDFLAGS="$LDFLAGS -L$ai_p" 139380 PHP_RPATHS="$PHP_RPATHS $ai_p" 139381- 139382+ 139383 fi 139384 139385 139386 fi 139387- 139388+ 139389 fi 139390 139391 ;; 139392 esac 139393 done 139394 139395- echo "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5 139396-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6 139397-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then 139398- echo $ECHO_N "(cached) $ECHO_C" >&6 139399+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 139400+echo "configure:93426: checking for insck__getVdate in -linsck" >&5 139401+ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` 139402+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 139403+ echo $ac_n "(cached) $ac_c" 1>&6 139404 else 139405- ac_check_lib_save_LIBS=$LIBS 139406+ ac_save_LIBS="$LIBS" 139407 LIBS="-linsck $LIBS" 139408-cat >conftest.$ac_ext <<_ACEOF 139409-/* confdefs.h. */ 139410-_ACEOF 139411-cat confdefs.h >>conftest.$ac_ext 139412-cat >>conftest.$ac_ext <<_ACEOF 139413-/* end confdefs.h. */ 139414- 139415+cat > conftest.$ac_ext <<EOF 139416+#line 93434 "configure" 139417+#include "confdefs.h" 139418 /* Override any gcc2 internal prototype to avoid an error. */ 139419-#ifdef __cplusplus 139420-extern "C" 139421-#endif 139422 /* We use char because int might match the return type of a gcc2 139423- builtin and then its argument prototype would still apply. */ 139424-char insck__getVdate (); 139425-int 139426-main () 139427-{ 139428-insck__getVdate (); 139429- ; 139430- return 0; 139431-} 139432-_ACEOF 139433-rm -f conftest.$ac_objext conftest$ac_exeext 139434-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 139435- (eval $ac_link) 2>conftest.er1 139436- ac_status=$? 139437- grep -v '^ *+' conftest.er1 >conftest.err 139438- rm -f conftest.er1 139439- cat conftest.err >&5 139440- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139441- (exit $ac_status); } && 139442- { ac_try='test -z "$ac_c_werror_flag" 139443- || test ! -s conftest.err' 139444- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139445- (eval $ac_try) 2>&5 139446- ac_status=$? 139447- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139448- (exit $ac_status); }; } && 139449- { ac_try='test -s conftest$ac_exeext' 139450- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139451- (eval $ac_try) 2>&5 139452- ac_status=$? 139453- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139454- (exit $ac_status); }; }; then 139455- ac_cv_lib_insck_insck__getVdate=yes 139456-else 139457- echo "$as_me: failed program was:" >&5 139458-sed 's/^/| /' conftest.$ac_ext >&5 139459- 139460-ac_cv_lib_insck_insck__getVdate=no 139461-fi 139462-rm -f conftest.err conftest.$ac_objext \ 139463- conftest$ac_exeext conftest.$ac_ext 139464-LIBS=$ac_check_lib_save_LIBS 139465-fi 139466-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5 139467-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6 139468-if test $ac_cv_lib_insck_insck__getVdate = yes; then 139469+ builtin and then its argument prototype would still apply. */ 139470+char insck__getVdate(); 139471+ 139472+int main() { 139473+insck__getVdate() 139474+; return 0; } 139475+EOF 139476+if { (eval echo configure:93445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 139477+ rm -rf conftest* 139478+ eval "ac_cv_lib_$ac_lib_var=yes" 139479+else 139480+ echo "configure: failed program was:" >&5 139481+ cat conftest.$ac_ext >&5 139482+ rm -rf conftest* 139483+ eval "ac_cv_lib_$ac_lib_var=no" 139484+fi 139485+rm -f conftest* 139486+LIBS="$ac_save_LIBS" 139487 139488+fi 139489+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 139490+ echo "$ac_t""yes" 1>&6 139491+ 139492 LDFLAGS=$save_old_LDFLAGS 139493 ext_shared=$save_ext_shared 139494- 139495- 139496+ 139497+ 139498 case insck in 139499 c|c_r|pthread*) ;; 139500- *) 139501+ *) 139502 if test "$ext_shared" = "yes"; then 139503- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 139504+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 139505 else 139506- 139507- 139508+ 139509+ 139510 case insck in 139511 c|c_r|pthread*) ;; 139512- *) 139513- LIBS="-linsck $LIBS" 139514+ *) 139515+ LIBS="-linsck $LIBS" 139516 ;; 139517 esac 139518 139519@@ -120756,33 +93482,34 @@ 139520 esac 139521 139522 139523- 139524+ 139525 else 139526+ echo "$ac_t""no" 1>&6 139527 139528 LDFLAGS=$save_old_LDFLAGS 139529 ext_shared=$save_ext_shared 139530 unset ac_cv_lib_insck_insck__getVdate 139531- 139532- 139533+ 139534+ 139535 fi 139536 139537- 139538+ 139539 save_old_LDFLAGS=$LDFLAGS 139540 ac_stuff="-L$SYBASE_CT_LIBDIR" 139541- 139542+ 139543 save_ext_shared=$ext_shared 139544 ext_shared=yes 139545- 139546+ 139547 for ac_i in $ac_stuff; do 139548 case $ac_i in 139549 -pthread) 139550 if test "$ext_shared" = "yes"; then 139551 LDFLAGS="$LDFLAGS -pthread" 139552 else 139553- 139554- 139555+ 139556+ 139557 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 139558- 139559+ 139560 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 139561 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139562 eval "EXTRA_LDFLAGS$unique=set" 139563@@ -120793,20 +93520,20 @@ 139564 ;; 139565 -l*) 139566 ac_ii=`echo $ac_i|cut -c 3-` 139567- 139568- 139569+ 139570+ 139571 case $ac_ii in 139572 c|c_r|pthread*) ;; 139573- *) 139574+ *) 139575 if test "$ext_shared" = "yes"; then 139576- LDFLAGS="$LDFLAGS -l$ac_ii" 139577+ LDFLAGS="$LDFLAGS -l$ac_ii" 139578 else 139579- 139580- 139581+ 139582+ 139583 case $ac_ii in 139584 c|c_r|pthread*) ;; 139585- *) 139586- LIBS="$LIBS -l$ac_ii" 139587+ *) 139588+ LIBS="$LIBS -l$ac_ii" 139589 ;; 139590 esac 139591 139592@@ -120819,130 +93546,100 @@ 139593 ;; 139594 -L*) 139595 ac_ii=`echo $ac_i|cut -c 3-` 139596- 139597+ 139598 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 139599- 139600+ 139601 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 139602 ai_p=$ac_ii 139603 else 139604- 139605+ 139606 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 139607- 139608+ 139609 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 139610 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 139611 fi 139612 139613- 139614+ 139615 if test "$ext_shared" = "yes"; then 139616 LDFLAGS="-L$ai_p $LDFLAGS" 139617 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 139618 else 139619- 139620- 139621- 139622+ 139623+ 139624+ 139625 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 139626- 139627+ 139628 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 139629 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139630 eval "LIBPATH$unique=set" 139631- 139632+ 139633 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 139634 LDFLAGS="$LDFLAGS -L$ai_p" 139635 PHP_RPATHS="$PHP_RPATHS $ai_p" 139636- 139637+ 139638 fi 139639 139640 139641 fi 139642- 139643+ 139644 fi 139645 139646 ;; 139647 esac 139648 done 139649 139650- echo "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5 139651-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6 139652-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then 139653- echo $ECHO_N "(cached) $ECHO_C" >&6 139654+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 139655+echo "configure:93593: checking for bsd_tcp in -linsck" >&5 139656+ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` 139657+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 139658+ echo $ac_n "(cached) $ac_c" 1>&6 139659 else 139660- ac_check_lib_save_LIBS=$LIBS 139661+ ac_save_LIBS="$LIBS" 139662 LIBS="-linsck $LIBS" 139663-cat >conftest.$ac_ext <<_ACEOF 139664-/* confdefs.h. */ 139665-_ACEOF 139666-cat confdefs.h >>conftest.$ac_ext 139667-cat >>conftest.$ac_ext <<_ACEOF 139668-/* end confdefs.h. */ 139669- 139670+cat > conftest.$ac_ext <<EOF 139671+#line 93601 "configure" 139672+#include "confdefs.h" 139673 /* Override any gcc2 internal prototype to avoid an error. */ 139674-#ifdef __cplusplus 139675-extern "C" 139676-#endif 139677 /* We use char because int might match the return type of a gcc2 139678- builtin and then its argument prototype would still apply. */ 139679-char bsd_tcp (); 139680-int 139681-main () 139682-{ 139683-bsd_tcp (); 139684- ; 139685- return 0; 139686-} 139687-_ACEOF 139688-rm -f conftest.$ac_objext conftest$ac_exeext 139689-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 139690- (eval $ac_link) 2>conftest.er1 139691- ac_status=$? 139692- grep -v '^ *+' conftest.er1 >conftest.err 139693- rm -f conftest.er1 139694- cat conftest.err >&5 139695- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139696- (exit $ac_status); } && 139697- { ac_try='test -z "$ac_c_werror_flag" 139698- || test ! -s conftest.err' 139699- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139700- (eval $ac_try) 2>&5 139701- ac_status=$? 139702- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139703- (exit $ac_status); }; } && 139704- { ac_try='test -s conftest$ac_exeext' 139705- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 139706- (eval $ac_try) 2>&5 139707- ac_status=$? 139708- echo "$as_me:$LINENO: \$? = $ac_status" >&5 139709- (exit $ac_status); }; }; then 139710- ac_cv_lib_insck_bsd_tcp=yes 139711-else 139712- echo "$as_me: failed program was:" >&5 139713-sed 's/^/| /' conftest.$ac_ext >&5 139714- 139715-ac_cv_lib_insck_bsd_tcp=no 139716-fi 139717-rm -f conftest.err conftest.$ac_objext \ 139718- conftest$ac_exeext conftest.$ac_ext 139719-LIBS=$ac_check_lib_save_LIBS 139720-fi 139721-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5 139722-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6 139723-if test $ac_cv_lib_insck_bsd_tcp = yes; then 139724+ builtin and then its argument prototype would still apply. */ 139725+char bsd_tcp(); 139726+ 139727+int main() { 139728+bsd_tcp() 139729+; return 0; } 139730+EOF 139731+if { (eval echo configure:93612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 139732+ rm -rf conftest* 139733+ eval "ac_cv_lib_$ac_lib_var=yes" 139734+else 139735+ echo "configure: failed program was:" >&5 139736+ cat conftest.$ac_ext >&5 139737+ rm -rf conftest* 139738+ eval "ac_cv_lib_$ac_lib_var=no" 139739+fi 139740+rm -f conftest* 139741+LIBS="$ac_save_LIBS" 139742 139743+fi 139744+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 139745+ echo "$ac_t""yes" 1>&6 139746+ 139747 LDFLAGS=$save_old_LDFLAGS 139748 ext_shared=$save_ext_shared 139749- 139750- 139751+ 139752+ 139753 case insck in 139754 c|c_r|pthread*) ;; 139755- *) 139756+ *) 139757 if test "$ext_shared" = "yes"; then 139758- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 139759+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 139760 else 139761- 139762- 139763+ 139764+ 139765 case insck in 139766 c|c_r|pthread*) ;; 139767- *) 139768- LIBS="-linsck $LIBS" 139769+ *) 139770+ LIBS="-linsck $LIBS" 139771 ;; 139772 esac 139773 139774@@ -120952,31 +93649,32 @@ 139775 esac 139776 139777 139778- 139779+ 139780 else 139781+ echo "$ac_t""no" 1>&6 139782 139783 LDFLAGS=$save_old_LDFLAGS 139784 ext_shared=$save_ext_shared 139785 unset ac_cv_lib_insck_bsd_tcp 139786- 139787- 139788+ 139789+ 139790 fi 139791 139792 else 139793- 139794- 139795+ 139796+ 139797 case cs in 139798 c|c_r|pthread*) ;; 139799- *) 139800+ *) 139801 if test "$ext_shared" = "yes"; then 139802- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" 139803+ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" 139804 else 139805- 139806- 139807+ 139808+ 139809 case cs in 139810 c|c_r|pthread*) ;; 139811- *) 139812- LIBS="-lcs $LIBS" 139813+ *) 139814+ LIBS="-lcs $LIBS" 139815 ;; 139816 esac 139817 139818@@ -120986,20 +93684,20 @@ 139819 esac 139820 139821 139822- 139823- 139824+ 139825+ 139826 case ct in 139827 c|c_r|pthread*) ;; 139828- *) 139829+ *) 139830 if test "$ext_shared" = "yes"; then 139831- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 139832+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" 139833 else 139834- 139835- 139836+ 139837+ 139838 case ct in 139839 c|c_r|pthread*) ;; 139840- *) 139841- LIBS="-lct $LIBS" 139842+ *) 139843+ LIBS="-lct $LIBS" 139844 ;; 139845 esac 139846 139847@@ -121009,20 +93707,20 @@ 139848 esac 139849 139850 139851- 139852- 139853+ 139854+ 139855 case comn in 139856 c|c_r|pthread*) ;; 139857- *) 139858+ *) 139859 if test "$ext_shared" = "yes"; then 139860- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" 139861+ SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" 139862 else 139863- 139864- 139865+ 139866+ 139867 case comn in 139868 c|c_r|pthread*) ;; 139869- *) 139870- LIBS="-lcomn $LIBS" 139871+ *) 139872+ LIBS="-lcomn $LIBS" 139873 ;; 139874 esac 139875 139876@@ -121032,20 +93730,20 @@ 139877 esac 139878 139879 139880- 139881- 139882+ 139883+ 139884 case intl in 139885 c|c_r|pthread*) ;; 139886- *) 139887+ *) 139888 if test "$ext_shared" = "yes"; then 139889- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" 139890+ SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" 139891 else 139892- 139893- 139894+ 139895+ 139896 case intl in 139897 c|c_r|pthread*) ;; 139898- *) 139899- LIBS="-lintl $LIBS" 139900+ *) 139901+ LIBS="-lintl $LIBS" 139902 ;; 139903 esac 139904 139905@@ -121055,30 +93753,29 @@ 139906 esac 139907 139908 139909- 139910+ 139911 SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" 139912- echo "$as_me:$LINENO: result: Sybase32 default: $SYBASE_CT_LIBS" >&5 139913-echo "${ECHO_T}Sybase32 default: $SYBASE_CT_LIBS" >&6 139914- 139915- 139916+ echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 139917+ 139918+ 139919 save_old_LDFLAGS=$LDFLAGS 139920- ac_stuff=" 139921- $SYBASE_CT_LIBS 139922+ ac_stuff=" 139923+ $SYBASE_CT_LIBS 139924 " 139925- 139926+ 139927 save_ext_shared=$ext_shared 139928 ext_shared=yes 139929- 139930+ 139931 for ac_i in $ac_stuff; do 139932 case $ac_i in 139933 -pthread) 139934 if test "$ext_shared" = "yes"; then 139935 LDFLAGS="$LDFLAGS -pthread" 139936 else 139937- 139938- 139939+ 139940+ 139941 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 139942- 139943+ 139944 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 139945 if test -n "$unique" && test "`eval $cmd`" = "" ; then 139946 eval "EXTRA_LDFLAGS$unique=set" 139947@@ -121089,20 +93786,20 @@ 139948 ;; 139949 -l*) 139950 ac_ii=`echo $ac_i|cut -c 3-` 139951- 139952- 139953+ 139954+ 139955 case $ac_ii in 139956 c|c_r|pthread*) ;; 139957- *) 139958+ *) 139959 if test "$ext_shared" = "yes"; then 139960- LDFLAGS="$LDFLAGS -l$ac_ii" 139961+ LDFLAGS="$LDFLAGS -l$ac_ii" 139962 else 139963- 139964- 139965+ 139966+ 139967 case $ac_ii in 139968 c|c_r|pthread*) ;; 139969- *) 139970- LIBS="$LIBS -l$ac_ii" 139971+ *) 139972+ LIBS="$LIBS -l$ac_ii" 139973 ;; 139974 esac 139975 139976@@ -121115,131 +93812,101 @@ 139977 ;; 139978 -L*) 139979 ac_ii=`echo $ac_i|cut -c 3-` 139980- 139981+ 139982 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 139983- 139984+ 139985 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 139986 ai_p=$ac_ii 139987 else 139988- 139989+ 139990 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 139991- 139992+ 139993 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 139994 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 139995 fi 139996 139997- 139998+ 139999 if test "$ext_shared" = "yes"; then 140000 LDFLAGS="-L$ai_p $LDFLAGS" 140001 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 140002 else 140003- 140004- 140005- 140006+ 140007+ 140008+ 140009 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 140010- 140011+ 140012 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 140013 if test -n "$unique" && test "`eval $cmd`" = "" ; then 140014 eval "LIBPATH$unique=set" 140015- 140016+ 140017 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 140018 LDFLAGS="$LDFLAGS -L$ai_p" 140019 PHP_RPATHS="$PHP_RPATHS $ai_p" 140020- 140021+ 140022 fi 140023 140024 140025 fi 140026- 140027+ 140028 fi 140029 140030 ;; 140031 esac 140032 done 140033 140034- echo "$as_me:$LINENO: checking for netg_errstr in -ltcl" >&5 140035-echo $ECHO_N "checking for netg_errstr in -ltcl... $ECHO_C" >&6 140036-if test "${ac_cv_lib_tcl_netg_errstr+set}" = set; then 140037- echo $ECHO_N "(cached) $ECHO_C" >&6 140038+ echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 140039+echo "configure:93859: checking for netg_errstr in -ltcl" >&5 140040+ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` 140041+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 140042+ echo $ac_n "(cached) $ac_c" 1>&6 140043 else 140044- ac_check_lib_save_LIBS=$LIBS 140045+ ac_save_LIBS="$LIBS" 140046 LIBS="-ltcl $LIBS" 140047-cat >conftest.$ac_ext <<_ACEOF 140048-/* confdefs.h. */ 140049-_ACEOF 140050-cat confdefs.h >>conftest.$ac_ext 140051-cat >>conftest.$ac_ext <<_ACEOF 140052-/* end confdefs.h. */ 140053- 140054+cat > conftest.$ac_ext <<EOF 140055+#line 93867 "configure" 140056+#include "confdefs.h" 140057 /* Override any gcc2 internal prototype to avoid an error. */ 140058-#ifdef __cplusplus 140059-extern "C" 140060-#endif 140061 /* We use char because int might match the return type of a gcc2 140062- builtin and then its argument prototype would still apply. */ 140063-char netg_errstr (); 140064-int 140065-main () 140066-{ 140067-netg_errstr (); 140068- ; 140069- return 0; 140070-} 140071-_ACEOF 140072-rm -f conftest.$ac_objext conftest$ac_exeext 140073-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 140074- (eval $ac_link) 2>conftest.er1 140075- ac_status=$? 140076- grep -v '^ *+' conftest.er1 >conftest.err 140077- rm -f conftest.er1 140078- cat conftest.err >&5 140079- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140080- (exit $ac_status); } && 140081- { ac_try='test -z "$ac_c_werror_flag" 140082- || test ! -s conftest.err' 140083- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140084- (eval $ac_try) 2>&5 140085- ac_status=$? 140086- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140087- (exit $ac_status); }; } && 140088- { ac_try='test -s conftest$ac_exeext' 140089- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140090- (eval $ac_try) 2>&5 140091- ac_status=$? 140092- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140093- (exit $ac_status); }; }; then 140094- ac_cv_lib_tcl_netg_errstr=yes 140095-else 140096- echo "$as_me: failed program was:" >&5 140097-sed 's/^/| /' conftest.$ac_ext >&5 140098- 140099-ac_cv_lib_tcl_netg_errstr=no 140100-fi 140101-rm -f conftest.err conftest.$ac_objext \ 140102- conftest$ac_exeext conftest.$ac_ext 140103-LIBS=$ac_check_lib_save_LIBS 140104-fi 140105-echo "$as_me:$LINENO: result: $ac_cv_lib_tcl_netg_errstr" >&5 140106-echo "${ECHO_T}$ac_cv_lib_tcl_netg_errstr" >&6 140107-if test $ac_cv_lib_tcl_netg_errstr = yes; then 140108+ builtin and then its argument prototype would still apply. */ 140109+char netg_errstr(); 140110+ 140111+int main() { 140112+netg_errstr() 140113+; return 0; } 140114+EOF 140115+if { (eval echo configure:93878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 140116+ rm -rf conftest* 140117+ eval "ac_cv_lib_$ac_lib_var=yes" 140118+else 140119+ echo "configure: failed program was:" >&5 140120+ cat conftest.$ac_ext >&5 140121+ rm -rf conftest* 140122+ eval "ac_cv_lib_$ac_lib_var=no" 140123+fi 140124+rm -f conftest* 140125+LIBS="$ac_save_LIBS" 140126 140127+fi 140128+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 140129+ echo "$ac_t""yes" 1>&6 140130+ 140131 LDFLAGS=$save_old_LDFLAGS 140132 ext_shared=$save_ext_shared 140133- 140134- 140135- 140136+ 140137+ 140138+ 140139 case tcl in 140140 c|c_r|pthread*) ;; 140141- *) 140142+ *) 140143 if test "$ext_shared" = "yes"; then 140144- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" 140145+ SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" 140146 else 140147- 140148- 140149+ 140150+ 140151 case tcl in 140152 c|c_r|pthread*) ;; 140153- *) 140154- LIBS="-ltcl $LIBS" 140155+ *) 140156+ LIBS="-ltcl $LIBS" 140157 ;; 140158 esac 140159 140160@@ -121249,28 +93916,29 @@ 140161 esac 140162 140163 140164- 140165- 140166+ 140167+ 140168 else 140169+ echo "$ac_t""no" 1>&6 140170 140171 LDFLAGS=$save_old_LDFLAGS 140172 ext_shared=$save_ext_shared 140173 unset ac_cv_lib_tcl_netg_errstr 140174- 140175- 140176- 140177+ 140178+ 140179+ 140180 case sybtcl in 140181 c|c_r|pthread*) ;; 140182- *) 140183+ *) 140184 if test "$ext_shared" = "yes"; then 140185- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 140186+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 140187 else 140188- 140189- 140190+ 140191+ 140192 case sybtcl in 140193 c|c_r|pthread*) ;; 140194- *) 140195- LIBS="-lsybtcl $LIBS" 140196+ *) 140197+ LIBS="-lsybtcl $LIBS" 140198 ;; 140199 esac 140200 140201@@ -121280,28 +93948,28 @@ 140202 esac 140203 140204 140205- 140206- 140207+ 140208+ 140209 fi 140210 140211- 140212- 140213+ 140214+ 140215 save_old_LDFLAGS=$LDFLAGS 140216 ac_stuff="-L$SYBASE_CT_LIBDIR" 140217- 140218+ 140219 save_ext_shared=$ext_shared 140220 ext_shared=yes 140221- 140222+ 140223 for ac_i in $ac_stuff; do 140224 case $ac_i in 140225 -pthread) 140226 if test "$ext_shared" = "yes"; then 140227 LDFLAGS="$LDFLAGS -pthread" 140228 else 140229- 140230- 140231+ 140232+ 140233 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 140234- 140235+ 140236 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 140237 if test -n "$unique" && test "`eval $cmd`" = "" ; then 140238 eval "EXTRA_LDFLAGS$unique=set" 140239@@ -121312,20 +93980,20 @@ 140240 ;; 140241 -l*) 140242 ac_ii=`echo $ac_i|cut -c 3-` 140243- 140244- 140245+ 140246+ 140247 case $ac_ii in 140248 c|c_r|pthread*) ;; 140249- *) 140250+ *) 140251 if test "$ext_shared" = "yes"; then 140252- LDFLAGS="$LDFLAGS -l$ac_ii" 140253+ LDFLAGS="$LDFLAGS -l$ac_ii" 140254 else 140255- 140256- 140257+ 140258+ 140259 case $ac_ii in 140260 c|c_r|pthread*) ;; 140261- *) 140262- LIBS="$LIBS -l$ac_ii" 140263+ *) 140264+ LIBS="$LIBS -l$ac_ii" 140265 ;; 140266 esac 140267 140268@@ -121338,130 +94006,100 @@ 140269 ;; 140270 -L*) 140271 ac_ii=`echo $ac_i|cut -c 3-` 140272- 140273+ 140274 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 140275- 140276+ 140277 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 140278 ai_p=$ac_ii 140279 else 140280- 140281+ 140282 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 140283- 140284+ 140285 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 140286 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 140287 fi 140288 140289- 140290+ 140291 if test "$ext_shared" = "yes"; then 140292 LDFLAGS="-L$ai_p $LDFLAGS" 140293 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 140294 else 140295- 140296- 140297- 140298+ 140299+ 140300+ 140301 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 140302- 140303+ 140304 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 140305 if test -n "$unique" && test "`eval $cmd`" = "" ; then 140306 eval "LIBPATH$unique=set" 140307- 140308+ 140309 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 140310 LDFLAGS="$LDFLAGS -L$ai_p" 140311 PHP_RPATHS="$PHP_RPATHS $ai_p" 140312- 140313+ 140314 fi 140315 140316 140317 fi 140318- 140319+ 140320 fi 140321 140322 ;; 140323 esac 140324 done 140325 140326- echo "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5 140327-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6 140328-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then 140329- echo $ECHO_N "(cached) $ECHO_C" >&6 140330+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 140331+echo "configure:94053: checking for insck__getVdate in -linsck" >&5 140332+ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` 140333+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 140334+ echo $ac_n "(cached) $ac_c" 1>&6 140335 else 140336- ac_check_lib_save_LIBS=$LIBS 140337+ ac_save_LIBS="$LIBS" 140338 LIBS="-linsck $LIBS" 140339-cat >conftest.$ac_ext <<_ACEOF 140340-/* confdefs.h. */ 140341-_ACEOF 140342-cat confdefs.h >>conftest.$ac_ext 140343-cat >>conftest.$ac_ext <<_ACEOF 140344-/* end confdefs.h. */ 140345- 140346+cat > conftest.$ac_ext <<EOF 140347+#line 94061 "configure" 140348+#include "confdefs.h" 140349 /* Override any gcc2 internal prototype to avoid an error. */ 140350-#ifdef __cplusplus 140351-extern "C" 140352-#endif 140353 /* We use char because int might match the return type of a gcc2 140354- builtin and then its argument prototype would still apply. */ 140355-char insck__getVdate (); 140356-int 140357-main () 140358-{ 140359-insck__getVdate (); 140360- ; 140361- return 0; 140362-} 140363-_ACEOF 140364-rm -f conftest.$ac_objext conftest$ac_exeext 140365-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 140366- (eval $ac_link) 2>conftest.er1 140367- ac_status=$? 140368- grep -v '^ *+' conftest.er1 >conftest.err 140369- rm -f conftest.er1 140370- cat conftest.err >&5 140371- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140372- (exit $ac_status); } && 140373- { ac_try='test -z "$ac_c_werror_flag" 140374- || test ! -s conftest.err' 140375- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140376- (eval $ac_try) 2>&5 140377- ac_status=$? 140378- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140379- (exit $ac_status); }; } && 140380- { ac_try='test -s conftest$ac_exeext' 140381- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140382- (eval $ac_try) 2>&5 140383- ac_status=$? 140384- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140385- (exit $ac_status); }; }; then 140386- ac_cv_lib_insck_insck__getVdate=yes 140387-else 140388- echo "$as_me: failed program was:" >&5 140389-sed 's/^/| /' conftest.$ac_ext >&5 140390- 140391-ac_cv_lib_insck_insck__getVdate=no 140392-fi 140393-rm -f conftest.err conftest.$ac_objext \ 140394- conftest$ac_exeext conftest.$ac_ext 140395-LIBS=$ac_check_lib_save_LIBS 140396-fi 140397-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5 140398-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6 140399-if test $ac_cv_lib_insck_insck__getVdate = yes; then 140400+ builtin and then its argument prototype would still apply. */ 140401+char insck__getVdate(); 140402+ 140403+int main() { 140404+insck__getVdate() 140405+; return 0; } 140406+EOF 140407+if { (eval echo configure:94072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 140408+ rm -rf conftest* 140409+ eval "ac_cv_lib_$ac_lib_var=yes" 140410+else 140411+ echo "configure: failed program was:" >&5 140412+ cat conftest.$ac_ext >&5 140413+ rm -rf conftest* 140414+ eval "ac_cv_lib_$ac_lib_var=no" 140415+fi 140416+rm -f conftest* 140417+LIBS="$ac_save_LIBS" 140418 140419+fi 140420+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 140421+ echo "$ac_t""yes" 1>&6 140422+ 140423 LDFLAGS=$save_old_LDFLAGS 140424 ext_shared=$save_ext_shared 140425- 140426- 140427+ 140428+ 140429 case insck in 140430 c|c_r|pthread*) ;; 140431- *) 140432+ *) 140433 if test "$ext_shared" = "yes"; then 140434- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 140435+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 140436 else 140437- 140438- 140439+ 140440+ 140441 case insck in 140442 c|c_r|pthread*) ;; 140443- *) 140444- LIBS="-linsck $LIBS" 140445+ *) 140446+ LIBS="-linsck $LIBS" 140447 ;; 140448 esac 140449 140450@@ -121471,33 +94109,34 @@ 140451 esac 140452 140453 140454- 140455+ 140456 else 140457+ echo "$ac_t""no" 1>&6 140458 140459 LDFLAGS=$save_old_LDFLAGS 140460 ext_shared=$save_ext_shared 140461 unset ac_cv_lib_insck_insck__getVdate 140462- 140463- 140464+ 140465+ 140466 fi 140467 140468- 140469+ 140470 save_old_LDFLAGS=$LDFLAGS 140471 ac_stuff="-L$SYBASE_CT_LIBDIR" 140472- 140473+ 140474 save_ext_shared=$ext_shared 140475 ext_shared=yes 140476- 140477+ 140478 for ac_i in $ac_stuff; do 140479 case $ac_i in 140480 -pthread) 140481 if test "$ext_shared" = "yes"; then 140482 LDFLAGS="$LDFLAGS -pthread" 140483 else 140484- 140485- 140486+ 140487+ 140488 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 140489- 140490+ 140491 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 140492 if test -n "$unique" && test "`eval $cmd`" = "" ; then 140493 eval "EXTRA_LDFLAGS$unique=set" 140494@@ -121508,20 +94147,20 @@ 140495 ;; 140496 -l*) 140497 ac_ii=`echo $ac_i|cut -c 3-` 140498- 140499- 140500+ 140501+ 140502 case $ac_ii in 140503 c|c_r|pthread*) ;; 140504- *) 140505+ *) 140506 if test "$ext_shared" = "yes"; then 140507- LDFLAGS="$LDFLAGS -l$ac_ii" 140508+ LDFLAGS="$LDFLAGS -l$ac_ii" 140509 else 140510- 140511- 140512+ 140513+ 140514 case $ac_ii in 140515 c|c_r|pthread*) ;; 140516- *) 140517- LIBS="$LIBS -l$ac_ii" 140518+ *) 140519+ LIBS="$LIBS -l$ac_ii" 140520 ;; 140521 esac 140522 140523@@ -121534,130 +94173,100 @@ 140524 ;; 140525 -L*) 140526 ac_ii=`echo $ac_i|cut -c 3-` 140527- 140528+ 140529 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 140530- 140531+ 140532 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 140533 ai_p=$ac_ii 140534 else 140535- 140536+ 140537 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 140538- 140539+ 140540 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 140541 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 140542 fi 140543 140544- 140545+ 140546 if test "$ext_shared" = "yes"; then 140547 LDFLAGS="-L$ai_p $LDFLAGS" 140548 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 140549 else 140550- 140551- 140552- 140553+ 140554+ 140555+ 140556 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 140557- 140558+ 140559 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 140560 if test -n "$unique" && test "`eval $cmd`" = "" ; then 140561 eval "LIBPATH$unique=set" 140562- 140563+ 140564 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 140565 LDFLAGS="$LDFLAGS -L$ai_p" 140566 PHP_RPATHS="$PHP_RPATHS $ai_p" 140567- 140568+ 140569 fi 140570 140571 140572 fi 140573- 140574+ 140575 fi 140576 140577 ;; 140578 esac 140579 done 140580 140581- echo "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5 140582-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6 140583-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then 140584- echo $ECHO_N "(cached) $ECHO_C" >&6 140585+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 140586+echo "configure:94220: checking for bsd_tcp in -linsck" >&5 140587+ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` 140588+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 140589+ echo $ac_n "(cached) $ac_c" 1>&6 140590 else 140591- ac_check_lib_save_LIBS=$LIBS 140592+ ac_save_LIBS="$LIBS" 140593 LIBS="-linsck $LIBS" 140594-cat >conftest.$ac_ext <<_ACEOF 140595-/* confdefs.h. */ 140596-_ACEOF 140597-cat confdefs.h >>conftest.$ac_ext 140598-cat >>conftest.$ac_ext <<_ACEOF 140599-/* end confdefs.h. */ 140600- 140601+cat > conftest.$ac_ext <<EOF 140602+#line 94228 "configure" 140603+#include "confdefs.h" 140604 /* Override any gcc2 internal prototype to avoid an error. */ 140605-#ifdef __cplusplus 140606-extern "C" 140607-#endif 140608 /* We use char because int might match the return type of a gcc2 140609- builtin and then its argument prototype would still apply. */ 140610-char bsd_tcp (); 140611-int 140612-main () 140613-{ 140614-bsd_tcp (); 140615- ; 140616- return 0; 140617-} 140618-_ACEOF 140619-rm -f conftest.$ac_objext conftest$ac_exeext 140620-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 140621- (eval $ac_link) 2>conftest.er1 140622- ac_status=$? 140623- grep -v '^ *+' conftest.er1 >conftest.err 140624- rm -f conftest.er1 140625- cat conftest.err >&5 140626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140627- (exit $ac_status); } && 140628- { ac_try='test -z "$ac_c_werror_flag" 140629- || test ! -s conftest.err' 140630- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140631- (eval $ac_try) 2>&5 140632- ac_status=$? 140633- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140634- (exit $ac_status); }; } && 140635- { ac_try='test -s conftest$ac_exeext' 140636- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140637- (eval $ac_try) 2>&5 140638- ac_status=$? 140639- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140640- (exit $ac_status); }; }; then 140641- ac_cv_lib_insck_bsd_tcp=yes 140642-else 140643- echo "$as_me: failed program was:" >&5 140644-sed 's/^/| /' conftest.$ac_ext >&5 140645- 140646-ac_cv_lib_insck_bsd_tcp=no 140647-fi 140648-rm -f conftest.err conftest.$ac_objext \ 140649- conftest$ac_exeext conftest.$ac_ext 140650-LIBS=$ac_check_lib_save_LIBS 140651-fi 140652-echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5 140653-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6 140654-if test $ac_cv_lib_insck_bsd_tcp = yes; then 140655+ builtin and then its argument prototype would still apply. */ 140656+char bsd_tcp(); 140657+ 140658+int main() { 140659+bsd_tcp() 140660+; return 0; } 140661+EOF 140662+if { (eval echo configure:94239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 140663+ rm -rf conftest* 140664+ eval "ac_cv_lib_$ac_lib_var=yes" 140665+else 140666+ echo "configure: failed program was:" >&5 140667+ cat conftest.$ac_ext >&5 140668+ rm -rf conftest* 140669+ eval "ac_cv_lib_$ac_lib_var=no" 140670+fi 140671+rm -f conftest* 140672+LIBS="$ac_save_LIBS" 140673 140674+fi 140675+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 140676+ echo "$ac_t""yes" 1>&6 140677+ 140678 LDFLAGS=$save_old_LDFLAGS 140679 ext_shared=$save_ext_shared 140680- 140681- 140682+ 140683+ 140684 case insck in 140685 c|c_r|pthread*) ;; 140686- *) 140687+ *) 140688 if test "$ext_shared" = "yes"; then 140689- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 140690+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" 140691 else 140692- 140693- 140694+ 140695+ 140696 case insck in 140697 c|c_r|pthread*) ;; 140698- *) 140699- LIBS="-linsck $LIBS" 140700+ *) 140701+ LIBS="-linsck $LIBS" 140702 ;; 140703 esac 140704 140705@@ -121667,14 +94276,15 @@ 140706 esac 140707 140708 140709- 140710+ 140711 else 140712+ echo "$ac_t""no" 1>&6 140713 140714 LDFLAGS=$save_old_LDFLAGS 140715 ext_shared=$save_ext_shared 140716 unset ac_cv_lib_insck_bsd_tcp 140717- 140718- 140719+ 140720+ 140721 fi 140722 140723 fi 140724@@ -121684,18 +94294,19 @@ 140725 140726 php_enable_sysvmsg=no 140727 140728-echo "$as_me:$LINENO: checking whether to enable System V IPC support" >&5 140729-echo $ECHO_N "checking whether to enable System V IPC support... $ECHO_C" >&6 140730+echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 140731+echo "configure:94299: checking whether to enable System V IPC support" >&5 140732 # Check whether --enable-sysvmsg or --disable-sysvmsg was given. 140733 if test "${enable_sysvmsg+set}" = set; then 140734 enableval="$enable_sysvmsg" 140735 PHP_SYSVMSG=$enableval 140736 else 140737- 140738+ 140739 PHP_SYSVMSG=no 140740 test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL 140741 140742-fi; 140743+fi 140744+ 140745 140746 140747 ext_output="yes, shared" 140748@@ -121719,167 +94330,53 @@ 140749 140750 140751 140752-echo "$as_me:$LINENO: result: $ext_output" >&5 140753-echo "${ECHO_T}$ext_output" >&6 140754+echo "$ac_t""$ext_output" 1>&6 140755 140756 140757 140758 140759 if test "$PHP_SYSVMSG" != "no"; then 140760- if test "${ac_cv_header_sys_msg_h+set}" = set; then 140761- echo "$as_me:$LINENO: checking for sys/msg.h" >&5 140762-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6 140763-if test "${ac_cv_header_sys_msg_h+set}" = set; then 140764- echo $ECHO_N "(cached) $ECHO_C" >&6 140765-fi 140766-echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5 140767-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6 140768-else 140769- # Is the header compilable? 140770-echo "$as_me:$LINENO: checking sys/msg.h usability" >&5 140771-echo $ECHO_N "checking sys/msg.h usability... $ECHO_C" >&6 140772-cat >conftest.$ac_ext <<_ACEOF 140773-/* confdefs.h. */ 140774-_ACEOF 140775-cat confdefs.h >>conftest.$ac_ext 140776-cat >>conftest.$ac_ext <<_ACEOF 140777-/* end confdefs.h. */ 140778-$ac_includes_default 140779-#include <sys/msg.h> 140780-_ACEOF 140781-rm -f conftest.$ac_objext 140782-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 140783- (eval $ac_compile) 2>conftest.er1 140784- ac_status=$? 140785- grep -v '^ *+' conftest.er1 >conftest.err 140786- rm -f conftest.er1 140787- cat conftest.err >&5 140788- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140789- (exit $ac_status); } && 140790- { ac_try='test -z "$ac_c_werror_flag" 140791- || test ! -s conftest.err' 140792- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140793- (eval $ac_try) 2>&5 140794- ac_status=$? 140795- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140796- (exit $ac_status); }; } && 140797- { ac_try='test -s conftest.$ac_objext' 140798- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 140799- (eval $ac_try) 2>&5 140800- ac_status=$? 140801- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140802- (exit $ac_status); }; }; then 140803- ac_header_compiler=yes 140804-else 140805- echo "$as_me: failed program was:" >&5 140806-sed 's/^/| /' conftest.$ac_ext >&5 140807- 140808-ac_header_compiler=no 140809-fi 140810-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 140811-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 140812-echo "${ECHO_T}$ac_header_compiler" >&6 140813- 140814-# Is the header present? 140815-echo "$as_me:$LINENO: checking sys/msg.h presence" >&5 140816-echo $ECHO_N "checking sys/msg.h presence... $ECHO_C" >&6 140817-cat >conftest.$ac_ext <<_ACEOF 140818-/* confdefs.h. */ 140819-_ACEOF 140820-cat confdefs.h >>conftest.$ac_ext 140821-cat >>conftest.$ac_ext <<_ACEOF 140822-/* end confdefs.h. */ 140823+ ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` 140824+echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 140825+echo "configure:94342: checking for sys/msg.h" >&5 140826+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 140827+ echo $ac_n "(cached) $ac_c" 1>&6 140828+else 140829+ cat > conftest.$ac_ext <<EOF 140830+#line 94347 "configure" 140831+#include "confdefs.h" 140832 #include <sys/msg.h> 140833-_ACEOF 140834-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 140835- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 140836- ac_status=$? 140837- grep -v '^ *+' conftest.er1 >conftest.err 140838- rm -f conftest.er1 140839- cat conftest.err >&5 140840- echo "$as_me:$LINENO: \$? = $ac_status" >&5 140841- (exit $ac_status); } >/dev/null; then 140842- if test -s conftest.err; then 140843- ac_cpp_err=$ac_c_preproc_warn_flag 140844- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 140845- else 140846- ac_cpp_err= 140847- fi 140848-else 140849- ac_cpp_err=yes 140850-fi 140851-if test -z "$ac_cpp_err"; then 140852- ac_header_preproc=yes 140853-else 140854- echo "$as_me: failed program was:" >&5 140855-sed 's/^/| /' conftest.$ac_ext >&5 140856- 140857- ac_header_preproc=no 140858-fi 140859-rm -f conftest.err conftest.$ac_ext 140860-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 140861-echo "${ECHO_T}$ac_header_preproc" >&6 140862- 140863-# So? What about this header? 140864-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 140865- yes:no: ) 140866- { echo "$as_me:$LINENO: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&5 140867-echo "$as_me: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&2;} 140868- { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the compiler's result" >&5 140869-echo "$as_me: WARNING: sys/msg.h: proceeding with the compiler's result" >&2;} 140870- ac_header_preproc=yes 140871- ;; 140872- no:yes:* ) 140873- { echo "$as_me:$LINENO: WARNING: sys/msg.h: present but cannot be compiled" >&5 140874-echo "$as_me: WARNING: sys/msg.h: present but cannot be compiled" >&2;} 140875- { echo "$as_me:$LINENO: WARNING: sys/msg.h: check for missing prerequisite headers?" >&5 140876-echo "$as_me: WARNING: sys/msg.h: check for missing prerequisite headers?" >&2;} 140877- { echo "$as_me:$LINENO: WARNING: sys/msg.h: see the Autoconf documentation" >&5 140878-echo "$as_me: WARNING: sys/msg.h: see the Autoconf documentation" >&2;} 140879- { echo "$as_me:$LINENO: WARNING: sys/msg.h: section \"Present But Cannot Be Compiled\"" >&5 140880-echo "$as_me: WARNING: sys/msg.h: section \"Present But Cannot Be Compiled\"" >&2;} 140881- { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&5 140882-echo "$as_me: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&2;} 140883- { echo "$as_me:$LINENO: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&5 140884-echo "$as_me: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&2;} 140885- ( 140886- cat <<\_ASBOX 140887-## ------------------------------------------ ## 140888-## Report this to the AC_PACKAGE_NAME lists. ## 140889-## ------------------------------------------ ## 140890-_ASBOX 140891- ) | 140892- sed "s/^/$as_me: WARNING: /" >&2 140893- ;; 140894-esac 140895-echo "$as_me:$LINENO: checking for sys/msg.h" >&5 140896-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6 140897-if test "${ac_cv_header_sys_msg_h+set}" = set; then 140898- echo $ECHO_N "(cached) $ECHO_C" >&6 140899+EOF 140900+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 140901+{ (eval echo configure:94352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 140902+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 140903+if test -z "$ac_err"; then 140904+ rm -rf conftest* 140905+ eval "ac_cv_header_$ac_safe=yes" 140906 else 140907- ac_cv_header_sys_msg_h=$ac_header_preproc 140908+ echo "$ac_err" >&5 140909+ echo "configure: failed program was:" >&5 140910+ cat conftest.$ac_ext >&5 140911+ rm -rf conftest* 140912+ eval "ac_cv_header_$ac_safe=no" 140913 fi 140914-echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5 140915-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6 140916- 140917+rm -f conftest* 140918 fi 140919-if test $ac_cv_header_sys_msg_h = yes; then 140920+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 140921+ echo "$ac_t""yes" 1>&6 140922 : 140923 else 140924- { { echo "$as_me:$LINENO: error: Cannot enable System V IPC support, sys/msg.h is missing" >&5 140925-echo "$as_me: error: Cannot enable System V IPC support, sys/msg.h is missing" >&2;} 140926- { (exit 1); exit 1; }; } 140927- 140928+ echo "$ac_t""no" 1>&6 140929+{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } 140930+ 140931 fi 140932 140933 140934- 140935- 140936-cat >>confdefs.h <<\_ACEOF 140937+ cat >> confdefs.h <<\EOF 140938 #define HAVE_SYSVMSG 1 140939-_ACEOF 140940- 140941+EOF 140942 140943+ 140944 ext_builddir=ext/sysvmsg 140945 ext_srcdir=$abs_srcdir/ext/sysvmsg 140946 140947@@ -121887,15 +94384,15 @@ 140948 140949 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 140950 PHP_SYSVMSG_SHARED=no 140951- 140952- 140953+ 140954+ 140955 case ext/sysvmsg in 140956 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 140957 /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 140958 *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 140959 esac 140960- 140961- 140962+ 140963+ 140964 140965 b_c_pre=$php_c_pre 140966 b_cxx_pre=$php_cxx_pre 140967@@ -121908,12 +94405,12 @@ 140968 140969 old_IFS=$IFS 140970 for ac_src in sysvmsg.c; do 140971- 140972+ 140973 IFS=. 140974 set $ac_src 140975 ac_obj=$1 140976 IFS=$old_IFS 140977- 140978+ 140979 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 140980 140981 case $ac_src in 140982@@ -121937,14 +94434,14 @@ 140983 else 140984 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 140985 PHP_SYSVMSG_SHARED=yes 140986- 140987+ 140988 case ext/sysvmsg in 140989 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 140990 /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 140991 *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 140992 esac 140993- 140994- 140995+ 140996+ 140997 140998 b_c_pre=$shared_c_pre 140999 b_cxx_pre=$shared_cxx_pre 141000@@ -121957,12 +94454,12 @@ 141001 141002 old_IFS=$IFS 141003 for ac_src in sysvmsg.c; do 141004- 141005+ 141006 IFS=. 141007 set $ac_src 141008 ac_obj=$1 141009 IFS=$old_IFS 141010- 141011+ 141012 shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" 141013 141014 case $ac_src in 141015@@ -121980,7 +94477,7 @@ 141016 141017 case $host_alias in 141018 *netware*) 141019- 141020+ 141021 install_modules="install-modules" 141022 141023 case $host_alias in 141024@@ -121990,7 +94487,7 @@ 141025 ;; 141026 *netware*) 141027 suffix=nlm 141028- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(SYSVMSG_SHARED_LIBADD)' 141029+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' 141030 ;; 141031 *) 141032 suffix=la 141033@@ -122003,7 +94500,7 @@ 141034 else 141035 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" 141036 fi 141037- 141038+ 141039 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" 141040 141041 cat >>Makefile.objects<<EOF 141042@@ -122017,7 +94514,7 @@ 141043 141044 ;; 141045 *) 141046- 141047+ 141048 install_modules="install-modules" 141049 141050 case $host_alias in 141051@@ -122027,7 +94524,7 @@ 141052 ;; 141053 *netware*) 141054 suffix=nlm 141055- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(VMSG_SHARED_LIBADD)' 141056+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)' 141057 ;; 141058 *) 141059 suffix=la 141060@@ -122040,7 +94537,7 @@ 141061 else 141062 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" 141063 fi 141064- 141065+ 141066 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" 141067 141068 cat >>Makefile.objects<<EOF 141069@@ -122054,10 +94551,9 @@ 141070 141071 ;; 141072 esac 141073- 141074-cat >>confdefs.h <<_ACEOF 141075+ cat >> confdefs.h <<EOF 141076 #define COMPILE_DL_SYSVMSG 1 141077-_ACEOF 141078+EOF 141079 141080 fi 141081 fi 141082@@ -122066,15 +94562,15 @@ 141083 PHP_SYSVMSG_SHARED=no 141084 case "$PHP_SAPI" in 141085 cgi|embed) 141086- 141087- 141088+ 141089+ 141090 case ext/sysvmsg in 141091 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141092 /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141093 *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141094 esac 141095- 141096- 141097+ 141098+ 141099 141100 b_c_pre=$php_c_pre 141101 b_cxx_pre=$php_cxx_pre 141102@@ -122087,12 +94583,12 @@ 141103 141104 old_IFS=$IFS 141105 for ac_src in sysvmsg.c; do 141106- 141107+ 141108 IFS=. 141109 set $ac_src 141110 ac_obj=$1 141111 IFS=$old_IFS 141112- 141113+ 141114 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141115 141116 case $ac_src in 141117@@ -122112,15 +94608,15 @@ 141118 EXT_STATIC="$EXT_STATIC sysvmsg" 141119 ;; 141120 *) 141121- 141122- 141123+ 141124+ 141125 case ext/sysvmsg in 141126 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141127 /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141128 *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141129 esac 141130- 141131- 141132+ 141133+ 141134 141135 b_c_pre=$php_c_pre 141136 b_cxx_pre=$php_cxx_pre 141137@@ -122133,13 +94629,13 @@ 141138 141139 old_IFS=$IFS 141140 for ac_src in sysvmsg.c; do 141141- 141142+ 141143 IFS=. 141144 set $ac_src 141145 ac_obj=$1 141146 IFS=$old_IFS 141147- 141148- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 141149+ 141150+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141151 141152 case $ac_src in 141153 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 141154@@ -122159,15 +94655,15 @@ 141155 esac 141156 EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" 141157 fi 141158- 141159- 141160+ 141161+ 141162 BUILD_DIR="$BUILD_DIR $ext_builddir" 141163- 141164+ 141165 141166 141167 if test "$ext_builddir" = "."; then 141168 PHP_PECL_EXTENSION=sysvmsg 141169- 141170+ 141171 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 141172 141173 fi 141174@@ -122178,18 +94674,19 @@ 141175 141176 php_enable_sysvsem=no 141177 141178-echo "$as_me:$LINENO: checking whether to enable System V semaphore support" >&5 141179-echo $ECHO_N "checking whether to enable System V semaphore support... $ECHO_C" >&6 141180+echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 141181+echo "configure:94679: checking whether to enable System V semaphore support" >&5 141182 # Check whether --enable-sysvsem or --disable-sysvsem was given. 141183 if test "${enable_sysvsem+set}" = set; then 141184 enableval="$enable_sysvsem" 141185 PHP_SYSVSEM=$enableval 141186 else 141187- 141188+ 141189 PHP_SYSVSEM=no 141190 test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL 141191 141192-fi; 141193+fi 141194+ 141195 141196 141197 ext_output="yes, shared" 141198@@ -122213,14 +94710,13 @@ 141199 141200 141201 141202-echo "$as_me:$LINENO: result: $ext_output" >&5 141203-echo "${ECHO_T}$ext_output" >&6 141204+echo "$ac_t""$ext_output" 1>&6 141205 141206 141207 141208 141209 if test "$PHP_SYSVSEM" != "no"; then 141210- 141211+ 141212 ext_builddir=ext/sysvsem 141213 ext_srcdir=$abs_srcdir/ext/sysvsem 141214 141215@@ -122228,15 +94724,15 @@ 141216 141217 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 141218 PHP_SYSVSEM_SHARED=no 141219- 141220- 141221+ 141222+ 141223 case ext/sysvsem in 141224 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141225 /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141226 *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141227 esac 141228- 141229- 141230+ 141231+ 141232 141233 b_c_pre=$php_c_pre 141234 b_cxx_pre=$php_cxx_pre 141235@@ -122249,12 +94745,12 @@ 141236 141237 old_IFS=$IFS 141238 for ac_src in sysvsem.c; do 141239- 141240+ 141241 IFS=. 141242 set $ac_src 141243 ac_obj=$1 141244 IFS=$old_IFS 141245- 141246+ 141247 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141248 141249 case $ac_src in 141250@@ -122278,14 +94774,14 @@ 141251 else 141252 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 141253 PHP_SYSVSEM_SHARED=yes 141254- 141255+ 141256 case ext/sysvsem in 141257 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141258 /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141259 *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141260 esac 141261- 141262- 141263+ 141264+ 141265 141266 b_c_pre=$shared_c_pre 141267 b_cxx_pre=$shared_cxx_pre 141268@@ -122298,12 +94794,12 @@ 141269 141270 old_IFS=$IFS 141271 for ac_src in sysvsem.c; do 141272- 141273+ 141274 IFS=. 141275 set $ac_src 141276 ac_obj=$1 141277 IFS=$old_IFS 141278- 141279+ 141280 shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" 141281 141282 case $ac_src in 141283@@ -122321,7 +94817,7 @@ 141284 141285 case $host_alias in 141286 *netware*) 141287- 141288+ 141289 install_modules="install-modules" 141290 141291 case $host_alias in 141292@@ -122331,7 +94827,7 @@ 141293 ;; 141294 *netware*) 141295 suffix=nlm 141296- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(SYSVSEM_SHARED_LIBADD)' 141297+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' 141298 ;; 141299 *) 141300 suffix=la 141301@@ -122344,7 +94840,7 @@ 141302 else 141303 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" 141304 fi 141305- 141306+ 141307 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" 141308 141309 cat >>Makefile.objects<<EOF 141310@@ -122358,7 +94854,7 @@ 141311 141312 ;; 141313 *) 141314- 141315+ 141316 install_modules="install-modules" 141317 141318 case $host_alias in 141319@@ -122368,7 +94864,7 @@ 141320 ;; 141321 *netware*) 141322 suffix=nlm 141323- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(VSEM_SHARED_LIBADD)' 141324+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSEM, 3)_SHARED_LIBADD)' 141325 ;; 141326 *) 141327 suffix=la 141328@@ -122381,7 +94877,7 @@ 141329 else 141330 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" 141331 fi 141332- 141333+ 141334 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" 141335 141336 cat >>Makefile.objects<<EOF 141337@@ -122395,10 +94891,9 @@ 141338 141339 ;; 141340 esac 141341- 141342-cat >>confdefs.h <<_ACEOF 141343+ cat >> confdefs.h <<EOF 141344 #define COMPILE_DL_SYSVSEM 1 141345-_ACEOF 141346+EOF 141347 141348 fi 141349 fi 141350@@ -122407,15 +94902,15 @@ 141351 PHP_SYSVSEM_SHARED=no 141352 case "$PHP_SAPI" in 141353 cgi|embed) 141354- 141355- 141356+ 141357+ 141358 case ext/sysvsem in 141359 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141360 /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141361 *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141362 esac 141363- 141364- 141365+ 141366+ 141367 141368 b_c_pre=$php_c_pre 141369 b_cxx_pre=$php_cxx_pre 141370@@ -122428,12 +94923,12 @@ 141371 141372 old_IFS=$IFS 141373 for ac_src in sysvsem.c; do 141374- 141375+ 141376 IFS=. 141377 set $ac_src 141378 ac_obj=$1 141379 IFS=$old_IFS 141380- 141381+ 141382 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141383 141384 case $ac_src in 141385@@ -122453,15 +94948,15 @@ 141386 EXT_STATIC="$EXT_STATIC sysvsem" 141387 ;; 141388 *) 141389- 141390- 141391+ 141392+ 141393 case ext/sysvsem in 141394 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141395 /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141396 *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141397 esac 141398- 141399- 141400+ 141401+ 141402 141403 b_c_pre=$php_c_pre 141404 b_cxx_pre=$php_cxx_pre 141405@@ -122474,13 +94969,13 @@ 141406 141407 old_IFS=$IFS 141408 for ac_src in sysvsem.c; do 141409- 141410+ 141411 IFS=. 141412 set $ac_src 141413 ac_obj=$1 141414 IFS=$old_IFS 141415- 141416- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 141417+ 141418+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141419 141420 case $ac_src in 141421 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 141422@@ -122500,97 +94995,67 @@ 141423 esac 141424 EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" 141425 fi 141426- 141427- 141428+ 141429+ 141430 BUILD_DIR="$BUILD_DIR $ext_builddir" 141431- 141432+ 141433 141434 141435 if test "$ext_builddir" = "."; then 141436 PHP_PECL_EXTENSION=sysvsem 141437- 141438+ 141439 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 141440 141441 fi 141442 141443- 141444-cat >>confdefs.h <<\_ACEOF 141445+ cat >> confdefs.h <<\EOF 141446 #define HAVE_SYSVSEM 1 141447-_ACEOF 141448+EOF 141449 141450- echo "$as_me:$LINENO: checking for union semun" >&5 141451-echo $ECHO_N "checking for union semun... $ECHO_C" >&6 141452-if test "${php_cv_semun+set}" = set; then 141453- echo $ECHO_N "(cached) $ECHO_C" >&6 141454-else 141455- cat >conftest.$ac_ext <<_ACEOF 141456-/* confdefs.h. */ 141457-_ACEOF 141458-cat confdefs.h >>conftest.$ac_ext 141459-cat >>conftest.$ac_ext <<_ACEOF 141460-/* end confdefs.h. */ 141461+ echo $ac_n "checking for union semun""... $ac_c" 1>&6 141462+echo "configure:95017: checking for union semun" >&5 141463+if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then 141464+ echo $ac_n "(cached) $ac_c" 1>&6 141465+else 141466+ cat > conftest.$ac_ext <<EOF 141467+#line 95022 "configure" 141468+#include "confdefs.h" 141469 141470 #include <sys/types.h> 141471 #include <sys/ipc.h> 141472 #include <sys/sem.h> 141473- 141474-int 141475-main () 141476-{ 141477+ 141478+int main() { 141479 union semun x; 141480- ; 141481- return 0; 141482-} 141483-_ACEOF 141484-rm -f conftest.$ac_objext 141485-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 141486- (eval $ac_compile) 2>conftest.er1 141487- ac_status=$? 141488- grep -v '^ *+' conftest.er1 >conftest.err 141489- rm -f conftest.er1 141490- cat conftest.err >&5 141491- echo "$as_me:$LINENO: \$? = $ac_status" >&5 141492- (exit $ac_status); } && 141493- { ac_try='test -z "$ac_c_werror_flag" 141494- || test ! -s conftest.err' 141495- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 141496- (eval $ac_try) 2>&5 141497- ac_status=$? 141498- echo "$as_me:$LINENO: \$? = $ac_status" >&5 141499- (exit $ac_status); }; } && 141500- { ac_try='test -s conftest.$ac_objext' 141501- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 141502- (eval $ac_try) 2>&5 141503- ac_status=$? 141504- echo "$as_me:$LINENO: \$? = $ac_status" >&5 141505- (exit $ac_status); }; }; then 141506- 141507+; return 0; } 141508+EOF 141509+if { (eval echo configure:95033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 141510+ rm -rf conftest* 141511+ 141512 php_cv_semun=yes 141513- 141514+ 141515 else 141516- echo "$as_me: failed program was:" >&5 141517-sed 's/^/| /' conftest.$ac_ext >&5 141518- 141519- 141520+ echo "configure: failed program was:" >&5 141521+ cat conftest.$ac_ext >&5 141522+ rm -rf conftest* 141523+ 141524 php_cv_semun=no 141525- 141526+ 141527 fi 141528-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 141529- 141530+rm -f conftest* 141531+ 141532 fi 141533-echo "$as_me:$LINENO: result: $php_cv_semun" >&5 141534-echo "${ECHO_T}$php_cv_semun" >&6 141535- if test "$php_cv_semun" = "yes"; then 141536 141537-cat >>confdefs.h <<\_ACEOF 141538+echo "$ac_t""$php_cv_semun" 1>&6 141539+ if test "$php_cv_semun" = "yes"; then 141540+ cat >> confdefs.h <<\EOF 141541 #define HAVE_SEMUN 1 141542-_ACEOF 141543+EOF 141544 141545 else 141546- 141547-cat >>confdefs.h <<\_ACEOF 141548+ cat >> confdefs.h <<\EOF 141549 #define HAVE_SEMUN 0 141550-_ACEOF 141551+EOF 141552 141553 fi 141554 fi 141555@@ -122599,18 +95064,19 @@ 141556 141557 php_enable_sysvshm=no 141558 141559-echo "$as_me:$LINENO: checking whether to enable System V shared memory support" >&5 141560-echo $ECHO_N "checking whether to enable System V shared memory support... $ECHO_C" >&6 141561+echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 141562+echo "configure:95069: checking whether to enable System V shared memory support" >&5 141563 # Check whether --enable-sysvshm or --disable-sysvshm was given. 141564 if test "${enable_sysvshm+set}" = set; then 141565 enableval="$enable_sysvshm" 141566 PHP_SYSVSHM=$enableval 141567 else 141568- 141569+ 141570 PHP_SYSVSHM=no 141571 test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL 141572 141573-fi; 141574+fi 141575+ 141576 141577 141578 ext_output="yes, shared" 141579@@ -122634,19 +95100,17 @@ 141580 141581 141582 141583-echo "$as_me:$LINENO: result: $ext_output" >&5 141584-echo "${ECHO_T}$ext_output" >&6 141585+echo "$ac_t""$ext_output" 1>&6 141586 141587 141588 141589 141590 if test "$PHP_SYSVSHM" != "no"; then 141591- 141592-cat >>confdefs.h <<\_ACEOF 141593+ cat >> confdefs.h <<\EOF 141594 #define HAVE_SYSVSHM 1 141595-_ACEOF 141596- 141597+EOF 141598 141599+ 141600 ext_builddir=ext/sysvshm 141601 ext_srcdir=$abs_srcdir/ext/sysvshm 141602 141603@@ -122654,15 +95118,15 @@ 141604 141605 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 141606 PHP_SYSVSHM_SHARED=no 141607- 141608- 141609+ 141610+ 141611 case ext/sysvshm in 141612 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141613 /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141614 *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141615 esac 141616- 141617- 141618+ 141619+ 141620 141621 b_c_pre=$php_c_pre 141622 b_cxx_pre=$php_cxx_pre 141623@@ -122675,12 +95139,12 @@ 141624 141625 old_IFS=$IFS 141626 for ac_src in sysvshm.c; do 141627- 141628+ 141629 IFS=. 141630 set $ac_src 141631 ac_obj=$1 141632 IFS=$old_IFS 141633- 141634+ 141635 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141636 141637 case $ac_src in 141638@@ -122704,14 +95168,14 @@ 141639 else 141640 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 141641 PHP_SYSVSHM_SHARED=yes 141642- 141643+ 141644 case ext/sysvshm in 141645 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141646 /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141647 *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141648 esac 141649- 141650- 141651+ 141652+ 141653 141654 b_c_pre=$shared_c_pre 141655 b_cxx_pre=$shared_cxx_pre 141656@@ -122724,12 +95188,12 @@ 141657 141658 old_IFS=$IFS 141659 for ac_src in sysvshm.c; do 141660- 141661+ 141662 IFS=. 141663 set $ac_src 141664 ac_obj=$1 141665 IFS=$old_IFS 141666- 141667+ 141668 shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" 141669 141670 case $ac_src in 141671@@ -122747,7 +95211,7 @@ 141672 141673 case $host_alias in 141674 *netware*) 141675- 141676+ 141677 install_modules="install-modules" 141678 141679 case $host_alias in 141680@@ -122757,7 +95221,7 @@ 141681 ;; 141682 *netware*) 141683 suffix=nlm 141684- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(SYSVSHM_SHARED_LIBADD)' 141685+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' 141686 ;; 141687 *) 141688 suffix=la 141689@@ -122770,7 +95234,7 @@ 141690 else 141691 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" 141692 fi 141693- 141694+ 141695 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" 141696 141697 cat >>Makefile.objects<<EOF 141698@@ -122784,7 +95248,7 @@ 141699 141700 ;; 141701 *) 141702- 141703+ 141704 install_modules="install-modules" 141705 141706 case $host_alias in 141707@@ -122794,7 +95258,7 @@ 141708 ;; 141709 *netware*) 141710 suffix=nlm 141711- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(VSHM_SHARED_LIBADD)' 141712+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVSHM, 3)_SHARED_LIBADD)' 141713 ;; 141714 *) 141715 suffix=la 141716@@ -122807,7 +95271,7 @@ 141717 else 141718 PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix" 141719 fi 141720- 141721+ 141722 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" 141723 141724 cat >>Makefile.objects<<EOF 141725@@ -122821,10 +95285,9 @@ 141726 141727 ;; 141728 esac 141729- 141730-cat >>confdefs.h <<_ACEOF 141731+ cat >> confdefs.h <<EOF 141732 #define COMPILE_DL_SYSVSHM 1 141733-_ACEOF 141734+EOF 141735 141736 fi 141737 fi 141738@@ -122833,15 +95296,15 @@ 141739 PHP_SYSVSHM_SHARED=no 141740 case "$PHP_SAPI" in 141741 cgi|embed) 141742- 141743- 141744+ 141745+ 141746 case ext/sysvshm in 141747 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141748 /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141749 *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141750 esac 141751- 141752- 141753+ 141754+ 141755 141756 b_c_pre=$php_c_pre 141757 b_cxx_pre=$php_cxx_pre 141758@@ -122854,12 +95317,12 @@ 141759 141760 old_IFS=$IFS 141761 for ac_src in sysvshm.c; do 141762- 141763+ 141764 IFS=. 141765 set $ac_src 141766 ac_obj=$1 141767 IFS=$old_IFS 141768- 141769+ 141770 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141771 141772 case $ac_src in 141773@@ -122879,15 +95342,15 @@ 141774 EXT_STATIC="$EXT_STATIC sysvshm" 141775 ;; 141776 *) 141777- 141778- 141779+ 141780+ 141781 case ext/sysvshm in 141782 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 141783 /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 141784 *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 141785 esac 141786- 141787- 141788+ 141789+ 141790 141791 b_c_pre=$php_c_pre 141792 b_cxx_pre=$php_cxx_pre 141793@@ -122900,13 +95363,13 @@ 141794 141795 old_IFS=$IFS 141796 for ac_src in sysvshm.c; do 141797- 141798+ 141799 IFS=. 141800 set $ac_src 141801 ac_obj=$1 141802 IFS=$old_IFS 141803- 141804- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 141805+ 141806+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 141807 141808 case $ac_src in 141809 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 141810@@ -122926,15 +95389,15 @@ 141811 esac 141812 EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" 141813 fi 141814- 141815- 141816+ 141817+ 141818 BUILD_DIR="$BUILD_DIR $ext_builddir" 141819- 141820+ 141821 141822 141823 if test "$ext_builddir" = "."; then 141824 PHP_PECL_EXTENSION=sysvshm 141825- 141826+ 141827 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 141828 141829 fi 141830@@ -122945,19 +95408,19 @@ 141831 141832 php_with_tidy=no 141833 141834-echo "$as_me:$LINENO: checking for TIDY support" >&5 141835-echo $ECHO_N "checking for TIDY support... $ECHO_C" >&6 141836- 141837+echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 141838+echo "configure:95413: checking for TIDY support" >&5 141839 # Check whether --with-tidy or --without-tidy was given. 141840 if test "${with_tidy+set}" = set; then 141841 withval="$with_tidy" 141842 PHP_TIDY=$withval 141843 else 141844- 141845+ 141846 PHP_TIDY=no 141847 test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL 141848 141849-fi; 141850+fi 141851+ 141852 141853 141854 ext_output="yes, shared" 141855@@ -122981,8 +95444,7 @@ 141856 141857 141858 141859-echo "$as_me:$LINENO: result: $ext_output" >&5 141860-echo "${ECHO_T}$ext_output" >&6 141861+echo "$ac_t""$ext_output" 1>&6 141862 141863 141864 141865@@ -123006,101 +95468,99 @@ 141866 done 141867 141868 if test -z "$TIDY_DIR"; then 141869- { { echo "$as_me:$LINENO: error: Cannot find libtidy" >&5 141870-echo "$as_me: error: Cannot find libtidy" >&2;} 141871- { (exit 1); exit 1; }; } 141872+ { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } 141873 fi 141874 141875 TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR 141876 141877- 141878+ 141879 141880 if test "$ext_shared" = "yes"; then 141881 TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" 141882 if test -n "$TIDY_LIBDIR"; then 141883- 141884+ 141885 if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then 141886- 141887+ 141888 if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then 141889 ai_p=$TIDY_LIBDIR 141890 else 141891- 141892+ 141893 ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 141894- 141895+ 141896 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 141897 ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" 141898 fi 141899 141900- 141901+ 141902 if test "$ext_shared" = "yes"; then 141903 TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" 141904 test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" 141905 else 141906- 141907- 141908- 141909+ 141910+ 141911+ 141912 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 141913- 141914+ 141915 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 141916 if test -n "$unique" && test "`eval $cmd`" = "" ; then 141917 eval "LIBPATH$unique=set" 141918- 141919+ 141920 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 141921 LDFLAGS="$LDFLAGS -L$ai_p" 141922 PHP_RPATHS="$PHP_RPATHS $ai_p" 141923- 141924+ 141925 fi 141926 141927 141928 fi 141929- 141930+ 141931 fi 141932 141933 fi 141934 else 141935- 141936+ 141937 141938 if test -n "$TIDY_LIBDIR"; then 141939- 141940+ 141941 if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then 141942- 141943+ 141944 if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then 141945 ai_p=$TIDY_LIBDIR 141946 else 141947- 141948+ 141949 ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 141950- 141951+ 141952 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 141953 ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" 141954 fi 141955 141956- 141957- 141958- 141959- 141960+ 141961+ 141962+ 141963+ 141964 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 141965- 141966+ 141967 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 141968 if test -n "$unique" && test "`eval $cmd`" = "" ; then 141969 eval "LIBPATH$unique=set" 141970- 141971+ 141972 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 141973 LDFLAGS="$LDFLAGS -L$ai_p" 141974 PHP_RPATHS="$PHP_RPATHS $ai_p" 141975- 141976+ 141977 fi 141978 141979 141980- 141981+ 141982 fi 141983 141984 fi 141985- 141986- 141987+ 141988+ 141989 case tidy in 141990 c|c_r|pthread*) ;; 141991- *) 141992- LIBS="-ltidy $LIBS" 141993+ *) 141994+ LIBS="-ltidy $LIBS" 141995 ;; 141996 esac 141997 141998@@ -123110,55 +95570,55 @@ 141999 fi 142000 142001 142002- 142003+ 142004 if test "$TIDY_INCDIR" != "/usr/include"; then 142005- 142006+ 142007 if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then 142008 ai_p=$TIDY_INCDIR 142009 else 142010- 142011+ 142012 ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 142013- 142014+ 142015 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 142016 ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" 142017 fi 142018 142019- 142020- 142021+ 142022+ 142023 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 142024- 142025+ 142026 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 142027 if test -n "$unique" && test "`eval $cmd`" = "" ; then 142028 eval "INCLUDEPATH$unique=set" 142029- 142030+ 142031 if test ""; then 142032 INCLUDES="-I$ai_p $INCLUDES" 142033 else 142034 INCLUDES="$INCLUDES -I$ai_p" 142035 fi 142036- 142037+ 142038 fi 142039 142040 fi 142041 142042 142043- 142044+ 142045 save_old_LDFLAGS=$LDFLAGS 142046 ac_stuff="" 142047- 142048+ 142049 save_ext_shared=$ext_shared 142050 ext_shared=yes 142051- 142052+ 142053 for ac_i in $ac_stuff; do 142054 case $ac_i in 142055 -pthread) 142056 if test "$ext_shared" = "yes"; then 142057 LDFLAGS="$LDFLAGS -pthread" 142058 else 142059- 142060- 142061+ 142062+ 142063 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 142064- 142065+ 142066 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 142067 if test -n "$unique" && test "`eval $cmd`" = "" ; then 142068 eval "EXTRA_LDFLAGS$unique=set" 142069@@ -123169,20 +95629,20 @@ 142070 ;; 142071 -l*) 142072 ac_ii=`echo $ac_i|cut -c 3-` 142073- 142074- 142075+ 142076+ 142077 case $ac_ii in 142078 c|c_r|pthread*) ;; 142079- *) 142080+ *) 142081 if test "$ext_shared" = "yes"; then 142082- LDFLAGS="$LDFLAGS -l$ac_ii" 142083+ LDFLAGS="$LDFLAGS -l$ac_ii" 142084 else 142085- 142086- 142087+ 142088+ 142089 case $ac_ii in 142090 c|c_r|pthread*) ;; 142091- *) 142092- LIBS="$LIBS -l$ac_ii" 142093+ *) 142094+ LIBS="$LIBS -l$ac_ii" 142095 ;; 142096 esac 142097 142098@@ -123195,136 +95655,106 @@ 142099 ;; 142100 -L*) 142101 ac_ii=`echo $ac_i|cut -c 3-` 142102- 142103+ 142104 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 142105- 142106+ 142107 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 142108 ai_p=$ac_ii 142109 else 142110- 142111+ 142112 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 142113- 142114+ 142115 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 142116 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 142117 fi 142118 142119- 142120+ 142121 if test "$ext_shared" = "yes"; then 142122 LDFLAGS="-L$ai_p $LDFLAGS" 142123 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 142124 else 142125- 142126- 142127- 142128+ 142129+ 142130+ 142131 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 142132- 142133+ 142134 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 142135 if test -n "$unique" && test "`eval $cmd`" = "" ; then 142136 eval "LIBPATH$unique=set" 142137- 142138+ 142139 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 142140 LDFLAGS="$LDFLAGS -L$ai_p" 142141 PHP_RPATHS="$PHP_RPATHS $ai_p" 142142- 142143+ 142144 fi 142145 142146 142147 fi 142148- 142149+ 142150 fi 142151 142152 ;; 142153 esac 142154 done 142155 142156- echo "$as_me:$LINENO: checking for tidyOptGetDoc in -ltidy" >&5 142157-echo $ECHO_N "checking for tidyOptGetDoc in -ltidy... $ECHO_C" >&6 142158-if test "${ac_cv_lib_tidy_tidyOptGetDoc+set}" = set; then 142159- echo $ECHO_N "(cached) $ECHO_C" >&6 142160+ echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 142161+echo "configure:95702: checking for tidyOptGetDoc in -ltidy" >&5 142162+ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` 142163+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 142164+ echo $ac_n "(cached) $ac_c" 1>&6 142165 else 142166- ac_check_lib_save_LIBS=$LIBS 142167+ ac_save_LIBS="$LIBS" 142168 LIBS="-ltidy $LIBS" 142169-cat >conftest.$ac_ext <<_ACEOF 142170-/* confdefs.h. */ 142171-_ACEOF 142172-cat confdefs.h >>conftest.$ac_ext 142173-cat >>conftest.$ac_ext <<_ACEOF 142174-/* end confdefs.h. */ 142175- 142176+cat > conftest.$ac_ext <<EOF 142177+#line 95710 "configure" 142178+#include "confdefs.h" 142179 /* Override any gcc2 internal prototype to avoid an error. */ 142180-#ifdef __cplusplus 142181-extern "C" 142182-#endif 142183 /* We use char because int might match the return type of a gcc2 142184- builtin and then its argument prototype would still apply. */ 142185-char tidyOptGetDoc (); 142186-int 142187-main () 142188-{ 142189-tidyOptGetDoc (); 142190- ; 142191- return 0; 142192-} 142193-_ACEOF 142194-rm -f conftest.$ac_objext conftest$ac_exeext 142195-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 142196- (eval $ac_link) 2>conftest.er1 142197- ac_status=$? 142198- grep -v '^ *+' conftest.er1 >conftest.err 142199- rm -f conftest.er1 142200- cat conftest.err >&5 142201- echo "$as_me:$LINENO: \$? = $ac_status" >&5 142202- (exit $ac_status); } && 142203- { ac_try='test -z "$ac_c_werror_flag" 142204- || test ! -s conftest.err' 142205- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 142206- (eval $ac_try) 2>&5 142207- ac_status=$? 142208- echo "$as_me:$LINENO: \$? = $ac_status" >&5 142209- (exit $ac_status); }; } && 142210- { ac_try='test -s conftest$ac_exeext' 142211- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 142212- (eval $ac_try) 2>&5 142213- ac_status=$? 142214- echo "$as_me:$LINENO: \$? = $ac_status" >&5 142215- (exit $ac_status); }; }; then 142216- ac_cv_lib_tidy_tidyOptGetDoc=yes 142217-else 142218- echo "$as_me: failed program was:" >&5 142219-sed 's/^/| /' conftest.$ac_ext >&5 142220- 142221-ac_cv_lib_tidy_tidyOptGetDoc=no 142222-fi 142223-rm -f conftest.err conftest.$ac_objext \ 142224- conftest$ac_exeext conftest.$ac_ext 142225-LIBS=$ac_check_lib_save_LIBS 142226-fi 142227-echo "$as_me:$LINENO: result: $ac_cv_lib_tidy_tidyOptGetDoc" >&5 142228-echo "${ECHO_T}$ac_cv_lib_tidy_tidyOptGetDoc" >&6 142229-if test $ac_cv_lib_tidy_tidyOptGetDoc = yes; then 142230+ builtin and then its argument prototype would still apply. */ 142231+char tidyOptGetDoc(); 142232+ 142233+int main() { 142234+tidyOptGetDoc() 142235+; return 0; } 142236+EOF 142237+if { (eval echo configure:95721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 142238+ rm -rf conftest* 142239+ eval "ac_cv_lib_$ac_lib_var=yes" 142240+else 142241+ echo "configure: failed program was:" >&5 142242+ cat conftest.$ac_ext >&5 142243+ rm -rf conftest* 142244+ eval "ac_cv_lib_$ac_lib_var=no" 142245+fi 142246+rm -f conftest* 142247+LIBS="$ac_save_LIBS" 142248 142249+fi 142250+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 142251+ echo "$ac_t""yes" 1>&6 142252+ 142253 LDFLAGS=$save_old_LDFLAGS 142254 ext_shared=$save_ext_shared 142255- 142256- 142257-cat >>confdefs.h <<\_ACEOF 142258+ 142259+ cat >> confdefs.h <<\EOF 142260 #define HAVE_TIDYOPTGETDOC 1 142261-_ACEOF 142262- 142263- 142264+EOF 142265 142266+ 142267+ 142268 else 142269+ echo "$ac_t""no" 1>&6 142270 142271 LDFLAGS=$save_old_LDFLAGS 142272 ext_shared=$save_ext_shared 142273 unset ac_cv_lib_tidy_tidyOptGetDoc 142274- 142275- 142276+ 142277+ 142278 fi 142279 142280 142281 142282- 142283+ 142284 ext_builddir=ext/tidy 142285 ext_srcdir=$abs_srcdir/ext/tidy 142286 142287@@ -123332,15 +95762,15 @@ 142288 142289 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 142290 PHP_TIDY_SHARED=no 142291- 142292- 142293+ 142294+ 142295 case ext/tidy in 142296 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142297 /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142298 *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142299 esac 142300- 142301- 142302+ 142303+ 142304 142305 b_c_pre=$php_c_pre 142306 b_cxx_pre=$php_cxx_pre 142307@@ -123353,12 +95783,12 @@ 142308 142309 old_IFS=$IFS 142310 for ac_src in tidy.c; do 142311- 142312+ 142313 IFS=. 142314 set $ac_src 142315 ac_obj=$1 142316 IFS=$old_IFS 142317- 142318+ 142319 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142320 142321 case $ac_src in 142322@@ -123382,14 +95812,14 @@ 142323 else 142324 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 142325 PHP_TIDY_SHARED=yes 142326- 142327+ 142328 case ext/tidy in 142329 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142330 /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142331 *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142332 esac 142333- 142334- 142335+ 142336+ 142337 142338 b_c_pre=$shared_c_pre 142339 b_cxx_pre=$shared_cxx_pre 142340@@ -123402,12 +95832,12 @@ 142341 142342 old_IFS=$IFS 142343 for ac_src in tidy.c; do 142344- 142345+ 142346 IFS=. 142347 set $ac_src 142348 ac_obj=$1 142349 IFS=$old_IFS 142350- 142351+ 142352 shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" 142353 142354 case $ac_src in 142355@@ -123425,7 +95855,7 @@ 142356 142357 case $host_alias in 142358 *netware*) 142359- 142360+ 142361 install_modules="install-modules" 142362 142363 case $host_alias in 142364@@ -123435,7 +95865,7 @@ 142365 ;; 142366 *netware*) 142367 suffix=nlm 142368- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(TIDY_SHARED_LIBADD)' 142369+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' 142370 ;; 142371 *) 142372 suffix=la 142373@@ -123448,7 +95878,7 @@ 142374 else 142375 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" 142376 fi 142377- 142378+ 142379 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" 142380 142381 cat >>Makefile.objects<<EOF 142382@@ -123462,7 +95892,7 @@ 142383 142384 ;; 142385 *) 142386- 142387+ 142388 install_modules="install-modules" 142389 142390 case $host_alias in 142391@@ -123472,7 +95902,7 @@ 142392 ;; 142393 *netware*) 142394 suffix=nlm 142395- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(Y_SHARED_LIBADD)' 142396+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)' 142397 ;; 142398 *) 142399 suffix=la 142400@@ -123485,7 +95915,7 @@ 142401 else 142402 PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix" 142403 fi 142404- 142405+ 142406 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" 142407 142408 cat >>Makefile.objects<<EOF 142409@@ -123499,10 +95929,9 @@ 142410 142411 ;; 142412 esac 142413- 142414-cat >>confdefs.h <<_ACEOF 142415+ cat >> confdefs.h <<EOF 142416 #define COMPILE_DL_TIDY 1 142417-_ACEOF 142418+EOF 142419 142420 fi 142421 fi 142422@@ -123511,15 +95940,15 @@ 142423 PHP_TIDY_SHARED=no 142424 case "$PHP_SAPI" in 142425 cgi|embed) 142426- 142427- 142428+ 142429+ 142430 case ext/tidy in 142431 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142432 /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142433 *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142434 esac 142435- 142436- 142437+ 142438+ 142439 142440 b_c_pre=$php_c_pre 142441 b_cxx_pre=$php_cxx_pre 142442@@ -123532,12 +95961,12 @@ 142443 142444 old_IFS=$IFS 142445 for ac_src in tidy.c; do 142446- 142447+ 142448 IFS=. 142449 set $ac_src 142450 ac_obj=$1 142451 IFS=$old_IFS 142452- 142453+ 142454 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142455 142456 case $ac_src in 142457@@ -123557,15 +95986,15 @@ 142458 EXT_STATIC="$EXT_STATIC tidy" 142459 ;; 142460 *) 142461- 142462- 142463+ 142464+ 142465 case ext/tidy in 142466 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142467 /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142468 *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142469 esac 142470- 142471- 142472+ 142473+ 142474 142475 b_c_pre=$php_c_pre 142476 b_cxx_pre=$php_cxx_pre 142477@@ -123578,13 +96007,13 @@ 142478 142479 old_IFS=$IFS 142480 for ac_src in tidy.c; do 142481- 142482+ 142483 IFS=. 142484 set $ac_src 142485 ac_obj=$1 142486 IFS=$old_IFS 142487- 142488- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 142489+ 142490+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142491 142492 case $ac_src in 142493 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 142494@@ -123604,26 +96033,25 @@ 142495 esac 142496 EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" 142497 fi 142498- 142499- 142500+ 142501+ 142502 BUILD_DIR="$BUILD_DIR $ext_builddir" 142503- 142504+ 142505 142506 142507 if test "$ext_builddir" = "."; then 142508 PHP_PECL_EXTENSION=tidy 142509- 142510+ 142511 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 142512 142513 fi 142514 142515- 142516+ 142517 PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" 142518 142519- 142520-cat >>confdefs.h <<\_ACEOF 142521+ cat >> confdefs.h <<\EOF 142522 #define HAVE_TIDY 1 142523-_ACEOF 142524+EOF 142525 142526 fi 142527 142528@@ -123632,18 +96060,19 @@ 142529 142530 php_enable_tokenizer=yes 142531 142532-echo "$as_me:$LINENO: checking whether to enable tokenizer support" >&5 142533-echo $ECHO_N "checking whether to enable tokenizer support... $ECHO_C" >&6 142534+echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 142535+echo "configure:96065: checking whether to enable tokenizer support" >&5 142536 # Check whether --enable-tokenizer or --disable-tokenizer was given. 142537 if test "${enable_tokenizer+set}" = set; then 142538 enableval="$enable_tokenizer" 142539 PHP_TOKENIZER=$enableval 142540 else 142541- 142542+ 142543 PHP_TOKENIZER=yes 142544 test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL 142545 142546-fi; 142547+fi 142548+ 142549 142550 142551 ext_output="yes, shared" 142552@@ -123667,14 +96096,13 @@ 142553 142554 142555 142556-echo "$as_me:$LINENO: result: $ext_output" >&5 142557-echo "${ECHO_T}$ext_output" >&6 142558+echo "$ac_t""$ext_output" 1>&6 142559 142560 142561 142562 142563 if test "$PHP_TOKENIZER" != "no"; then 142564- 142565+ 142566 ext_builddir=ext/tokenizer 142567 ext_srcdir=$abs_srcdir/ext/tokenizer 142568 142569@@ -123682,15 +96110,15 @@ 142570 142571 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 142572 PHP_TOKENIZER_SHARED=no 142573- 142574- 142575+ 142576+ 142577 case ext/tokenizer in 142578 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142579 /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142580 *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142581 esac 142582- 142583- 142584+ 142585+ 142586 142587 b_c_pre=$php_c_pre 142588 b_cxx_pre=$php_cxx_pre 142589@@ -123703,12 +96131,12 @@ 142590 142591 old_IFS=$IFS 142592 for ac_src in tokenizer.c tokenizer_data.c; do 142593- 142594+ 142595 IFS=. 142596 set $ac_src 142597 ac_obj=$1 142598 IFS=$old_IFS 142599- 142600+ 142601 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142602 142603 case $ac_src in 142604@@ -123732,14 +96160,14 @@ 142605 else 142606 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 142607 PHP_TOKENIZER_SHARED=yes 142608- 142609+ 142610 case ext/tokenizer in 142611 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142612 /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142613 *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142614 esac 142615- 142616- 142617+ 142618+ 142619 142620 b_c_pre=$shared_c_pre 142621 b_cxx_pre=$shared_cxx_pre 142622@@ -123752,12 +96180,12 @@ 142623 142624 old_IFS=$IFS 142625 for ac_src in tokenizer.c tokenizer_data.c; do 142626- 142627+ 142628 IFS=. 142629 set $ac_src 142630 ac_obj=$1 142631 IFS=$old_IFS 142632- 142633+ 142634 shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" 142635 142636 case $ac_src in 142637@@ -123775,7 +96203,7 @@ 142638 142639 case $host_alias in 142640 *netware*) 142641- 142642+ 142643 install_modules="install-modules" 142644 142645 case $host_alias in 142646@@ -123785,7 +96213,7 @@ 142647 ;; 142648 *netware*) 142649 suffix=nlm 142650- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(TOKENIZER_SHARED_LIBADD)' 142651+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' 142652 ;; 142653 *) 142654 suffix=la 142655@@ -123798,7 +96226,7 @@ 142656 else 142657 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" 142658 fi 142659- 142660+ 142661 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" 142662 142663 cat >>Makefile.objects<<EOF 142664@@ -123812,7 +96240,7 @@ 142665 142666 ;; 142667 *) 142668- 142669+ 142670 install_modules="install-modules" 142671 142672 case $host_alias in 142673@@ -123822,7 +96250,7 @@ 142674 ;; 142675 *netware*) 142676 suffix=nlm 142677- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(ENIZER_SHARED_LIBADD)' 142678+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 3)_SHARED_LIBADD)' 142679 ;; 142680 *) 142681 suffix=la 142682@@ -123835,7 +96263,7 @@ 142683 else 142684 PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" 142685 fi 142686- 142687+ 142688 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" 142689 142690 cat >>Makefile.objects<<EOF 142691@@ -123849,10 +96277,9 @@ 142692 142693 ;; 142694 esac 142695- 142696-cat >>confdefs.h <<_ACEOF 142697+ cat >> confdefs.h <<EOF 142698 #define COMPILE_DL_TOKENIZER 1 142699-_ACEOF 142700+EOF 142701 142702 fi 142703 fi 142704@@ -123861,15 +96288,15 @@ 142705 PHP_TOKENIZER_SHARED=no 142706 case "$PHP_SAPI" in 142707 cgi|embed) 142708- 142709- 142710+ 142711+ 142712 case ext/tokenizer in 142713 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142714 /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142715 *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142716 esac 142717- 142718- 142719+ 142720+ 142721 142722 b_c_pre=$php_c_pre 142723 b_cxx_pre=$php_cxx_pre 142724@@ -123882,12 +96309,12 @@ 142725 142726 old_IFS=$IFS 142727 for ac_src in tokenizer.c tokenizer_data.c; do 142728- 142729+ 142730 IFS=. 142731 set $ac_src 142732 ac_obj=$1 142733 IFS=$old_IFS 142734- 142735+ 142736 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142737 142738 case $ac_src in 142739@@ -123907,15 +96334,15 @@ 142740 EXT_STATIC="$EXT_STATIC tokenizer" 142741 ;; 142742 *) 142743- 142744- 142745+ 142746+ 142747 case ext/tokenizer in 142748 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 142749 /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 142750 *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 142751 esac 142752- 142753- 142754+ 142755+ 142756 142757 b_c_pre=$php_c_pre 142758 b_cxx_pre=$php_cxx_pre 142759@@ -123928,13 +96355,13 @@ 142760 142761 old_IFS=$IFS 142762 for ac_src in tokenizer.c tokenizer_data.c; do 142763- 142764+ 142765 IFS=. 142766 set $ac_src 142767 ac_obj=$1 142768 IFS=$old_IFS 142769- 142770- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 142771+ 142772+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 142773 142774 case $ac_src in 142775 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 142776@@ -123954,20 +96381,20 @@ 142777 esac 142778 EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" 142779 fi 142780- 142781- 142782+ 142783+ 142784 BUILD_DIR="$BUILD_DIR $ext_builddir" 142785- 142786+ 142787 142788 142789 if test "$ext_builddir" = "."; then 142790 PHP_PECL_EXTENSION=tokenizer 142791- 142792+ 142793 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 142794 142795 fi 142796 142797- 142798+ 142799 src=$ext_srcdir/Makefile.frag 142800 ac_srcdir=$ext_srcdir 142801 ac_builddir=$ext_builddir 142802@@ -123979,18 +96406,19 @@ 142803 142804 php_enable_wddx=no 142805 142806-echo "$as_me:$LINENO: checking whether to enable WDDX support" >&5 142807-echo $ECHO_N "checking whether to enable WDDX support... $ECHO_C" >&6 142808+echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 142809+echo "configure:96411: checking whether to enable WDDX support" >&5 142810 # Check whether --enable-wddx or --disable-wddx was given. 142811 if test "${enable_wddx+set}" = set; then 142812 enableval="$enable_wddx" 142813 PHP_WDDX=$enableval 142814 else 142815- 142816+ 142817 PHP_WDDX=no 142818 test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL 142819 142820-fi; 142821+fi 142822+ 142823 142824 142825 ext_output="yes, shared" 142826@@ -124014,33 +96442,31 @@ 142827 142828 142829 142830-echo "$as_me:$LINENO: result: $ext_output" >&5 142831-echo "${ECHO_T}$ext_output" >&6 142832+echo "$ac_t""$ext_output" 1>&6 142833 142834 142835 142836 142837 if test -z "$PHP_LIBXML_DIR"; then 142838- 142839+ 142840 php_with_libxml_dir=no 142841 142842-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 142843-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 142844- 142845+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 142846+echo "configure:96456: checking libxml2 install dir" >&5 142847 # Check whether --with-libxml-dir or --without-libxml-dir was given. 142848 if test "${with_libxml_dir+set}" = set; then 142849 withval="$with_libxml_dir" 142850 PHP_LIBXML_DIR=$withval 142851 else 142852- 142853+ 142854 PHP_LIBXML_DIR=no 142855+ 142856 142857+fi 142858 142859-fi; 142860 142861 ext_output=$PHP_LIBXML_DIR 142862-echo "$as_me:$LINENO: result: $ext_output" >&5 142863-echo "${ECHO_T}$ext_output" >&6 142864+echo "$ac_t""$ext_output" 1>&6 142865 142866 142867 142868@@ -124049,23 +96475,22 @@ 142869 142870 php_with_libexpat_dir=no 142871 142872-echo "$as_me:$LINENO: checking libexpat dir for WDDX" >&5 142873-echo $ECHO_N "checking libexpat dir for WDDX... $ECHO_C" >&6 142874- 142875+echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 142876+echo "configure:96480: checking libexpat dir for WDDX" >&5 142877 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. 142878 if test "${with_libexpat_dir+set}" = set; then 142879 withval="$with_libexpat_dir" 142880 PHP_LIBEXPAT_DIR=$withval 142881 else 142882- 142883+ 142884 PHP_LIBEXPAT_DIR=no 142885+ 142886 142887+fi 142888 142889-fi; 142890 142891 ext_output=$PHP_LIBEXPAT_DIR 142892-echo "$as_me:$LINENO: result: $ext_output" >&5 142893-echo "${ECHO_T}$ext_output" >&6 142894+echo "$ac_t""$ext_output" 1>&6 142895 142896 142897 142898@@ -124074,18 +96499,16 @@ 142899 142900 if test "$PHP_LIBEXPAT_DIR" = "no"; then 142901 if test "$PHP_LIBXML" = "no"; then 142902- { { echo "$as_me:$LINENO: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&5 142903-echo "$as_me: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&2;} 142904- { (exit 1); exit 1; }; } 142905+ { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 142906 fi 142907 142908- 142909-echo "$as_me:$LINENO: checking for xml2-config path" >&5 142910-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 142911-if test "${ac_cv_php_xml2_config_path+set}" = set; then 142912- echo $ECHO_N "(cached) $ECHO_C" >&6 142913+ 142914+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 142915+echo "configure:96508: checking for xml2-config path" >&5 142916+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 142917+ echo $ac_n "(cached) $ac_c" 1>&6 142918 else 142919- 142920+ 142921 for i in $PHP_LIBXML_DIR /usr/local /usr; do 142922 if test -x "$i/bin/xml2-config"; then 142923 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 142924@@ -124094,8 +96517,8 @@ 142925 done 142926 142927 fi 142928-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 142929-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 142930+ 142931+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 142932 142933 if test -x "$ac_cv_php_xml2_config_path"; then 142934 XML2_CONFIG="$ac_cv_php_xml2_config_path" 142935@@ -124108,17 +96531,17 @@ 142936 if test "$LIBXML_VERSION" -ge "2006011"; then 142937 LIBXML_LIBS=`$XML2_CONFIG --libs` 142938 LIBXML_INCS=`$XML2_CONFIG --cflags` 142939- 142940+ 142941 for ac_i in $LIBXML_LIBS; do 142942 case $ac_i in 142943 -pthread) 142944 if test "$ext_shared" = "yes"; then 142945 WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" 142946 else 142947- 142948- 142949+ 142950+ 142951 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 142952- 142953+ 142954 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 142955 if test -n "$unique" && test "`eval $cmd`" = "" ; then 142956 eval "EXTRA_LDFLAGS$unique=set" 142957@@ -124129,20 +96552,20 @@ 142958 ;; 142959 -l*) 142960 ac_ii=`echo $ac_i|cut -c 3-` 142961- 142962- 142963+ 142964+ 142965 case $ac_ii in 142966 c|c_r|pthread*) ;; 142967- *) 142968+ *) 142969 if test "$ext_shared" = "yes"; then 142970- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" 142971+ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" 142972 else 142973- 142974- 142975+ 142976+ 142977 case $ac_ii in 142978 c|c_r|pthread*) ;; 142979- *) 142980- LIBS="$LIBS -l$ac_ii" 142981+ *) 142982+ LIBS="$LIBS -l$ac_ii" 142983 ;; 142984 esac 142985 142986@@ -124155,80 +96578,80 @@ 142987 ;; 142988 -L*) 142989 ac_ii=`echo $ac_i|cut -c 3-` 142990- 142991+ 142992 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 142993- 142994+ 142995 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 142996 ai_p=$ac_ii 142997 else 142998- 142999+ 143000 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 143001- 143002+ 143003 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143004 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 143005 fi 143006 143007- 143008+ 143009 if test "$ext_shared" = "yes"; then 143010 WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" 143011 test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" 143012 else 143013- 143014- 143015- 143016+ 143017+ 143018+ 143019 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143020- 143021+ 143022 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 143023 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143024 eval "LIBPATH$unique=set" 143025- 143026+ 143027 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 143028 LDFLAGS="$LDFLAGS -L$ai_p" 143029 PHP_RPATHS="$PHP_RPATHS $ai_p" 143030- 143031+ 143032 fi 143033 143034 143035 fi 143036- 143037+ 143038 fi 143039 143040 ;; 143041 esac 143042 done 143043 143044- 143045+ 143046 for ac_i in $LIBXML_INCS; do 143047 case $ac_i in 143048 -I*) 143049 ac_ii=`echo $ac_i|cut -c 3-` 143050- 143051+ 143052 if test "$ac_ii" != "/usr/include"; then 143053- 143054+ 143055 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 143056 ai_p=$ac_ii 143057 else 143058- 143059+ 143060 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 143061- 143062+ 143063 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143064 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 143065 fi 143066 143067- 143068- 143069+ 143070+ 143071 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143072- 143073+ 143074 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 143075 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143076 eval "INCLUDEPATH$unique=set" 143077- 143078+ 143079 if test ""; then 143080 INCLUDES="-I$ai_p $INCLUDES" 143081 else 143082 INCLUDES="$INCLUDES -I$ai_p" 143083 fi 143084- 143085+ 143086 fi 143087 143088 fi 143089@@ -124238,96 +96661,79 @@ 143090 done 143091 143092 143093- echo "$as_me:$LINENO: checking whether libxml build works" >&5 143094-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 143095-if test "${php_cv_libxml_build_works+set}" = set; then 143096- echo $ECHO_N "(cached) $ECHO_C" >&6 143097+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 143098+echo "configure:96666: checking whether libxml build works" >&5 143099+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 143100+ echo $ac_n "(cached) $ac_c" 1>&6 143101 else 143102- 143103- 143104+ 143105+ 143106 old_LIBS=$LIBS 143107 LIBS=" 143108 $WDDX_SHARED_LIBADD 143109 $LIBS" 143110 if test "$cross_compiling" = yes; then 143111- 143112+ 143113 LIBS=$old_LIBS 143114- 143115+ 143116 else 143117- cat >conftest.$ac_ext <<_ACEOF 143118-/* confdefs.h. */ 143119-_ACEOF 143120-cat confdefs.h >>conftest.$ac_ext 143121-cat >>conftest.$ac_ext <<_ACEOF 143122-/* end confdefs.h. */ 143123- 143124+ cat > conftest.$ac_ext <<EOF 143125+#line 96682 "configure" 143126+#include "confdefs.h" 143127 143128+ 143129 char xmlInitParser(); 143130 int main() { 143131 xmlInitParser(); 143132 return 0; 143133 } 143134- 143135-_ACEOF 143136-rm -f conftest$ac_exeext 143137-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 143138- (eval $ac_link) 2>&5 143139- ac_status=$? 143140- echo "$as_me:$LINENO: \$? = $ac_status" >&5 143141- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 143142- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 143143- (eval $ac_try) 2>&5 143144- ac_status=$? 143145- echo "$as_me:$LINENO: \$? = $ac_status" >&5 143146- (exit $ac_status); }; }; then 143147- 143148+ 143149+EOF 143150+if { (eval echo configure:96693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 143151+then 143152+ 143153 LIBS=$old_LIBS 143154- 143155+ 143156 php_cv_libxml_build_works=yes 143157- 143158- 143159+ 143160+ 143161 else 143162- echo "$as_me: program exited with status $ac_status" >&5 143163-echo "$as_me: failed program was:" >&5 143164-sed 's/^/| /' conftest.$ac_ext >&5 143165- 143166-( exit $ac_status ) 143167- 143168+ echo "configure: failed program was:" >&5 143169+ cat conftest.$ac_ext >&5 143170+ rm -fr conftest* 143171+ 143172 LIBS=$old_LIBS 143173- 143174- echo "$as_me:$LINENO: result: no" >&5 143175-echo "${ECHO_T}no" >&6 143176- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 143177-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 143178- { (exit 1); exit 1; }; } 143179- 143180- 143181+ 143182+ echo "$ac_t""no" 1>&6 143183+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 143184+ 143185+ 143186 fi 143187-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 143188+rm -fr conftest* 143189 fi 143190 143191 143192+ 143193 fi 143194-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 143195-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 143196- if test "$php_cv_libxml_build_works" = "yes"; then 143197 143198-cat >>confdefs.h <<\_ACEOF 143199+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 143200+ if test "$php_cv_libxml_build_works" = "yes"; then 143201+ cat >> confdefs.h <<\EOF 143202 #define HAVE_LIBXML 1 143203-_ACEOF 143204+EOF 143205 143206 fi 143207- 143208+ 143209 if test "$PHP_XML" = "no"; then 143210- 143211- 143212+ 143213+ 143214 case ext/xml in 143215 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 143216 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 143217 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 143218 esac 143219- 143220- 143221+ 143222+ 143223 143224 b_c_pre=$php_c_pre 143225 b_cxx_pre=$php_cxx_pre 143226@@ -124340,12 +96746,12 @@ 143227 143228 old_IFS=$IFS 143229 for ac_src in compat.c; do 143230- 143231+ 143232 IFS=. 143233 set $ac_src 143234 ac_obj=$1 143235 IFS=$old_IFS 143236- 143237+ 143238 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 143239 143240 case $ac_src in 143241@@ -124362,23 +96768,19 @@ 143242 done 143243 143244 143245- 143246- 143247+ 143248+ 143249 BUILD_DIR="$BUILD_DIR ext/xml" 143250- 143251+ 143252 143253 fi 143254- 143255+ 143256 else 143257- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 143258-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 143259- { (exit 1); exit 1; }; } 143260+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 143261 fi 143262-else 143263- { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5 143264-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;} 143265- { (exit 1); exit 1; }; } 143266- 143267+else 143268+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; } 143269+ 143270 fi 143271 143272 fi 143273@@ -124392,130 +96794,128 @@ 143274 done 143275 143276 if test -z "$EXPAT_DIR"; then 143277- { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5 143278-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;} 143279- { (exit 1); exit 1; }; } 143280+ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } 143281 fi 143282 143283- 143284+ 143285 if test "$EXPAT_DIR/include" != "/usr/include"; then 143286- 143287+ 143288 if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then 143289 ai_p=$EXPAT_DIR/include 143290 else 143291- 143292+ 143293 ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 143294- 143295+ 143296 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143297 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" 143298 fi 143299 143300- 143301- 143302+ 143303+ 143304 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143305- 143306+ 143307 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 143308 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143309 eval "INCLUDEPATH$unique=set" 143310- 143311+ 143312 if test ""; then 143313 INCLUDES="-I$ai_p $INCLUDES" 143314 else 143315 INCLUDES="$INCLUDES -I$ai_p" 143316 fi 143317- 143318+ 143319 fi 143320 143321 fi 143322 143323- 143324+ 143325 143326 if test "$ext_shared" = "yes"; then 143327 WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" 143328 if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then 143329- 143330+ 143331 if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 143332- 143333+ 143334 if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 143335 ai_p=$EXPAT_DIR/$PHP_LIBDIR 143336 else 143337- 143338+ 143339 ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 143340- 143341+ 143342 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143343 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" 143344 fi 143345 143346- 143347+ 143348 if test "$ext_shared" = "yes"; then 143349 WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" 143350 test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" 143351 else 143352- 143353- 143354- 143355+ 143356+ 143357+ 143358 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143359- 143360+ 143361 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 143362 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143363 eval "LIBPATH$unique=set" 143364- 143365+ 143366 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 143367 LDFLAGS="$LDFLAGS -L$ai_p" 143368 PHP_RPATHS="$PHP_RPATHS $ai_p" 143369- 143370+ 143371 fi 143372 143373 143374 fi 143375- 143376+ 143377 fi 143378 143379 fi 143380 else 143381- 143382+ 143383 143384 if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then 143385- 143386+ 143387 if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 143388- 143389+ 143390 if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 143391 ai_p=$EXPAT_DIR/$PHP_LIBDIR 143392 else 143393- 143394+ 143395 ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 143396- 143397+ 143398 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143399 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" 143400 fi 143401 143402- 143403- 143404- 143405- 143406+ 143407+ 143408+ 143409+ 143410 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143411- 143412+ 143413 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 143414 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143415 eval "LIBPATH$unique=set" 143416- 143417+ 143418 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 143419 LDFLAGS="$LDFLAGS -L$ai_p" 143420 PHP_RPATHS="$PHP_RPATHS $ai_p" 143421- 143422+ 143423 fi 143424 143425 143426- 143427+ 143428 fi 143429 143430 fi 143431- 143432- 143433+ 143434+ 143435 case expat in 143436 c|c_r|pthread*) ;; 143437- *) 143438- LIBS="-lexpat $LIBS" 143439+ *) 143440+ LIBS="-lexpat $LIBS" 143441 ;; 143442 esac 143443 143444@@ -124525,19 +96925,17 @@ 143445 fi 143446 143447 143448- 143449-cat >>confdefs.h <<\_ACEOF 143450+ cat >> confdefs.h <<\EOF 143451 #define HAVE_LIBEXPAT 1 143452-_ACEOF 143453+EOF 143454 143455 fi 143456 143457- 143458-cat >>confdefs.h <<\_ACEOF 143459+ cat >> confdefs.h <<\EOF 143460 #define HAVE_WDDX 1 143461-_ACEOF 143462- 143463+EOF 143464 143465+ 143466 ext_builddir=ext/wddx 143467 ext_srcdir=$abs_srcdir/ext/wddx 143468 143469@@ -124545,15 +96943,15 @@ 143470 143471 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 143472 PHP_WDDX_SHARED=no 143473- 143474- 143475+ 143476+ 143477 case ext/wddx in 143478 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 143479 /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 143480 *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 143481 esac 143482- 143483- 143484+ 143485+ 143486 143487 b_c_pre=$php_c_pre 143488 b_cxx_pre=$php_cxx_pre 143489@@ -124566,12 +96964,12 @@ 143490 143491 old_IFS=$IFS 143492 for ac_src in wddx.c; do 143493- 143494+ 143495 IFS=. 143496 set $ac_src 143497 ac_obj=$1 143498 IFS=$old_IFS 143499- 143500+ 143501 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 143502 143503 case $ac_src in 143504@@ -124595,14 +96993,14 @@ 143505 else 143506 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 143507 PHP_WDDX_SHARED=yes 143508- 143509+ 143510 case ext/wddx in 143511 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 143512 /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 143513 *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 143514 esac 143515- 143516- 143517+ 143518+ 143519 143520 b_c_pre=$shared_c_pre 143521 b_cxx_pre=$shared_cxx_pre 143522@@ -124615,12 +97013,12 @@ 143523 143524 old_IFS=$IFS 143525 for ac_src in wddx.c; do 143526- 143527+ 143528 IFS=. 143529 set $ac_src 143530 ac_obj=$1 143531 IFS=$old_IFS 143532- 143533+ 143534 shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" 143535 143536 case $ac_src in 143537@@ -124638,7 +97036,7 @@ 143538 143539 case $host_alias in 143540 *netware*) 143541- 143542+ 143543 install_modules="install-modules" 143544 143545 case $host_alias in 143546@@ -124648,7 +97046,7 @@ 143547 ;; 143548 *netware*) 143549 suffix=nlm 143550- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(WDDX_SHARED_LIBADD)' 143551+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' 143552 ;; 143553 *) 143554 suffix=la 143555@@ -124661,7 +97059,7 @@ 143556 else 143557 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" 143558 fi 143559- 143560+ 143561 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" 143562 143563 cat >>Makefile.objects<<EOF 143564@@ -124675,7 +97073,7 @@ 143565 143566 ;; 143567 *) 143568- 143569+ 143570 install_modules="install-modules" 143571 143572 case $host_alias in 143573@@ -124685,7 +97083,7 @@ 143574 ;; 143575 *netware*) 143576 suffix=nlm 143577- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(X_SHARED_LIBADD)' 143578+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(WDDX, 3)_SHARED_LIBADD)' 143579 ;; 143580 *) 143581 suffix=la 143582@@ -124698,7 +97096,7 @@ 143583 else 143584 PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix" 143585 fi 143586- 143587+ 143588 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" 143589 143590 cat >>Makefile.objects<<EOF 143591@@ -124712,10 +97110,9 @@ 143592 143593 ;; 143594 esac 143595- 143596-cat >>confdefs.h <<_ACEOF 143597+ cat >> confdefs.h <<EOF 143598 #define COMPILE_DL_WDDX 1 143599-_ACEOF 143600+EOF 143601 143602 fi 143603 fi 143604@@ -124724,15 +97121,15 @@ 143605 PHP_WDDX_SHARED=no 143606 case "$PHP_SAPI" in 143607 cgi|embed) 143608- 143609- 143610+ 143611+ 143612 case ext/wddx in 143613 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 143614 /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 143615 *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 143616 esac 143617- 143618- 143619+ 143620+ 143621 143622 b_c_pre=$php_c_pre 143623 b_cxx_pre=$php_cxx_pre 143624@@ -124745,12 +97142,12 @@ 143625 143626 old_IFS=$IFS 143627 for ac_src in wddx.c; do 143628- 143629+ 143630 IFS=. 143631 set $ac_src 143632 ac_obj=$1 143633 IFS=$old_IFS 143634- 143635+ 143636 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 143637 143638 case $ac_src in 143639@@ -124770,15 +97167,15 @@ 143640 EXT_STATIC="$EXT_STATIC wddx" 143641 ;; 143642 *) 143643- 143644- 143645+ 143646+ 143647 case ext/wddx in 143648 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 143649 /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 143650 *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 143651 esac 143652- 143653- 143654+ 143655+ 143656 143657 b_c_pre=$php_c_pre 143658 b_cxx_pre=$php_cxx_pre 143659@@ -124791,13 +97188,13 @@ 143660 143661 old_IFS=$IFS 143662 for ac_src in wddx.c; do 143663- 143664+ 143665 IFS=. 143666 set $ac_src 143667 ac_obj=$1 143668 IFS=$old_IFS 143669- 143670- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 143671+ 143672+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 143673 143674 case $ac_src in 143675 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 143676@@ -124817,51 +97214,39 @@ 143677 esac 143678 EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" 143679 fi 143680- 143681- 143682+ 143683+ 143684 BUILD_DIR="$BUILD_DIR $ext_builddir" 143685- 143686+ 143687 143688 143689 if test "$ext_builddir" = "."; then 143690 PHP_PECL_EXTENSION=wddx 143691- 143692+ 143693 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 143694 143695 fi 143696 143697- 143698+ 143699 am_i_shared=$PHP_WDDX_SHARED 143700 is_it_shared=$PHP_LIBXML_SHARED 143701 is_it_enabled=$PHP_LIBXML 143702 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 143703- { { echo "$as_me:$LINENO: error: 143704+ { echo "configure: error: 143705 You've configured extension wddx to build statically, but it 143706 depends on extension libxml, which you've configured to build shared. 143707 You either need to build wddx shared or build libxml statically for the 143708 build to be successful. 143709-" >&5 143710-echo "$as_me: error: 143711-You've configured extension wddx to build statically, but it 143712-depends on extension libxml, which you've configured to build shared. 143713-You either need to build wddx shared or build libxml statically for the 143714-build to be successful. 143715-" >&2;} 143716- { (exit 1); exit 1; }; } 143717+" 1>&2; exit 1; } 143718 fi 143719 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 143720- { { echo "$as_me:$LINENO: error: 143721+ { echo "configure: error: 143722 You've configured extension wddx, which depends on extension libxml, 143723 but you've either not enabled libxml, or have disabled it. 143724-" >&5 143725-echo "$as_me: error: 143726-You've configured extension wddx, which depends on extension libxml, 143727-but you've either not enabled libxml, or have disabled it. 143728-" >&2;} 143729- { (exit 1); exit 1; }; } 143730+" 1>&2; exit 1; } 143731 fi 143732- 143733- 143734+ 143735+ 143736 PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" 143737 143738 fi 143739@@ -124870,18 +97255,19 @@ 143740 143741 php_enable_xml=yes 143742 143743-echo "$as_me:$LINENO: checking whether to enable XML support" >&5 143744-echo $ECHO_N "checking whether to enable XML support... $ECHO_C" >&6 143745+echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 143746+echo "configure:97260: checking whether to enable XML support" >&5 143747 # Check whether --enable-xml or --disable-xml was given. 143748 if test "${enable_xml+set}" = set; then 143749 enableval="$enable_xml" 143750 PHP_XML=$enableval 143751 else 143752- 143753+ 143754 PHP_XML=yes 143755 test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL 143756 143757-fi; 143758+fi 143759+ 143760 143761 143762 ext_output="yes, shared" 143763@@ -124905,33 +97291,31 @@ 143764 143765 143766 143767-echo "$as_me:$LINENO: result: $ext_output" >&5 143768-echo "${ECHO_T}$ext_output" >&6 143769+echo "$ac_t""$ext_output" 1>&6 143770 143771 143772 143773 143774 if test -z "$PHP_LIBXML_DIR"; then 143775- 143776+ 143777 php_with_libxml_dir=no 143778 143779-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 143780-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 143781- 143782+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 143783+echo "configure:97305: checking libxml2 install dir" >&5 143784 # Check whether --with-libxml-dir or --without-libxml-dir was given. 143785 if test "${with_libxml_dir+set}" = set; then 143786 withval="$with_libxml_dir" 143787 PHP_LIBXML_DIR=$withval 143788 else 143789- 143790+ 143791 PHP_LIBXML_DIR=no 143792+ 143793 143794+fi 143795 143796-fi; 143797 143798 ext_output=$PHP_LIBXML_DIR 143799-echo "$as_me:$LINENO: result: $ext_output" >&5 143800-echo "${ECHO_T}$ext_output" >&6 143801+echo "$ac_t""$ext_output" 1>&6 143802 143803 143804 143805@@ -124940,23 +97324,22 @@ 143806 143807 php_with_libexpat_dir=no 143808 143809-echo "$as_me:$LINENO: checking libexpat install dir" >&5 143810-echo $ECHO_N "checking libexpat install dir... $ECHO_C" >&6 143811- 143812+echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 143813+echo "configure:97329: checking libexpat install dir" >&5 143814 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. 143815 if test "${with_libexpat_dir+set}" = set; then 143816 withval="$with_libexpat_dir" 143817 PHP_LIBEXPAT_DIR=$withval 143818 else 143819- 143820+ 143821 PHP_LIBEXPAT_DIR=no 143822+ 143823 143824+fi 143825 143826-fi; 143827 143828 ext_output=$PHP_LIBEXPAT_DIR 143829-echo "$as_me:$LINENO: result: $ext_output" >&5 143830-echo "${ECHO_T}$ext_output" >&6 143831+echo "$ac_t""$ext_output" 1>&6 143832 143833 143834 143835@@ -124966,18 +97349,16 @@ 143836 if test "$PHP_LIBEXPAT_DIR" = "no"; then 143837 143838 if test "$PHP_LIBXML" = "no"; then 143839- { { echo "$as_me:$LINENO: error: XML extension requires LIBXML extension, add --enable-libxml" >&5 143840-echo "$as_me: error: XML extension requires LIBXML extension, add --enable-libxml" >&2;} 143841- { (exit 1); exit 1; }; } 143842+ { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 143843 fi 143844 143845- 143846-echo "$as_me:$LINENO: checking for xml2-config path" >&5 143847-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 143848-if test "${ac_cv_php_xml2_config_path+set}" = set; then 143849- echo $ECHO_N "(cached) $ECHO_C" >&6 143850+ 143851+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 143852+echo "configure:97358: checking for xml2-config path" >&5 143853+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 143854+ echo $ac_n "(cached) $ac_c" 1>&6 143855 else 143856- 143857+ 143858 for i in $PHP_LIBXML_DIR /usr/local /usr; do 143859 if test -x "$i/bin/xml2-config"; then 143860 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 143861@@ -124986,8 +97367,8 @@ 143862 done 143863 143864 fi 143865-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 143866-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 143867+ 143868+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 143869 143870 if test -x "$ac_cv_php_xml2_config_path"; then 143871 XML2_CONFIG="$ac_cv_php_xml2_config_path" 143872@@ -125000,17 +97381,17 @@ 143873 if test "$LIBXML_VERSION" -ge "2006011"; then 143874 LIBXML_LIBS=`$XML2_CONFIG --libs` 143875 LIBXML_INCS=`$XML2_CONFIG --cflags` 143876- 143877+ 143878 for ac_i in $LIBXML_LIBS; do 143879 case $ac_i in 143880 -pthread) 143881 if test "$ext_shared" = "yes"; then 143882 XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" 143883 else 143884- 143885- 143886+ 143887+ 143888 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 143889- 143890+ 143891 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 143892 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143893 eval "EXTRA_LDFLAGS$unique=set" 143894@@ -125021,20 +97402,20 @@ 143895 ;; 143896 -l*) 143897 ac_ii=`echo $ac_i|cut -c 3-` 143898- 143899- 143900+ 143901+ 143902 case $ac_ii in 143903 c|c_r|pthread*) ;; 143904- *) 143905+ *) 143906 if test "$ext_shared" = "yes"; then 143907- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" 143908+ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" 143909 else 143910- 143911- 143912+ 143913+ 143914 case $ac_ii in 143915 c|c_r|pthread*) ;; 143916- *) 143917- LIBS="$LIBS -l$ac_ii" 143918+ *) 143919+ LIBS="$LIBS -l$ac_ii" 143920 ;; 143921 esac 143922 143923@@ -125047,80 +97428,80 @@ 143924 ;; 143925 -L*) 143926 ac_ii=`echo $ac_i|cut -c 3-` 143927- 143928+ 143929 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 143930- 143931+ 143932 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 143933 ai_p=$ac_ii 143934 else 143935- 143936+ 143937 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 143938- 143939+ 143940 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 143941 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 143942 fi 143943 143944- 143945+ 143946 if test "$ext_shared" = "yes"; then 143947 XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" 143948 test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" 143949 else 143950- 143951- 143952- 143953+ 143954+ 143955+ 143956 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 143957- 143958+ 143959 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 143960 if test -n "$unique" && test "`eval $cmd`" = "" ; then 143961 eval "LIBPATH$unique=set" 143962- 143963+ 143964 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 143965 LDFLAGS="$LDFLAGS -L$ai_p" 143966 PHP_RPATHS="$PHP_RPATHS $ai_p" 143967- 143968+ 143969 fi 143970 143971 143972 fi 143973- 143974+ 143975 fi 143976 143977 ;; 143978 esac 143979 done 143980 143981- 143982+ 143983 for ac_i in $LIBXML_INCS; do 143984 case $ac_i in 143985 -I*) 143986 ac_ii=`echo $ac_i|cut -c 3-` 143987- 143988+ 143989 if test "$ac_ii" != "/usr/include"; then 143990- 143991+ 143992 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 143993 ai_p=$ac_ii 143994 else 143995- 143996+ 143997 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 143998- 143999+ 144000 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144001 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 144002 fi 144003 144004- 144005- 144006+ 144007+ 144008 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144009- 144010+ 144011 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 144012 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144013 eval "INCLUDEPATH$unique=set" 144014- 144015+ 144016 if test ""; then 144017 INCLUDES="-I$ai_p $INCLUDES" 144018 else 144019 INCLUDES="$INCLUDES -I$ai_p" 144020 fi 144021- 144022+ 144023 fi 144024 144025 fi 144026@@ -125130,133 +97511,100 @@ 144027 done 144028 144029 144030- echo "$as_me:$LINENO: checking whether libxml build works" >&5 144031-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 144032-if test "${php_cv_libxml_build_works+set}" = set; then 144033- echo $ECHO_N "(cached) $ECHO_C" >&6 144034+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 144035+echo "configure:97516: checking whether libxml build works" >&5 144036+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 144037+ echo $ac_n "(cached) $ac_c" 1>&6 144038 else 144039- 144040- 144041+ 144042+ 144043 old_LIBS=$LIBS 144044 LIBS=" 144045 $XML_SHARED_LIBADD 144046 $LIBS" 144047 if test "$cross_compiling" = yes; then 144048- 144049+ 144050 LIBS=$old_LIBS 144051- 144052+ 144053 else 144054- cat >conftest.$ac_ext <<_ACEOF 144055-/* confdefs.h. */ 144056-_ACEOF 144057-cat confdefs.h >>conftest.$ac_ext 144058-cat >>conftest.$ac_ext <<_ACEOF 144059-/* end confdefs.h. */ 144060- 144061+ cat > conftest.$ac_ext <<EOF 144062+#line 97532 "configure" 144063+#include "confdefs.h" 144064 144065+ 144066 char xmlInitParser(); 144067 int main() { 144068 xmlInitParser(); 144069 return 0; 144070 } 144071- 144072-_ACEOF 144073-rm -f conftest$ac_exeext 144074-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 144075- (eval $ac_link) 2>&5 144076- ac_status=$? 144077- echo "$as_me:$LINENO: \$? = $ac_status" >&5 144078- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 144079- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 144080- (eval $ac_try) 2>&5 144081- ac_status=$? 144082- echo "$as_me:$LINENO: \$? = $ac_status" >&5 144083- (exit $ac_status); }; }; then 144084- 144085+ 144086+EOF 144087+if { (eval echo configure:97543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 144088+then 144089+ 144090 LIBS=$old_LIBS 144091- 144092+ 144093 php_cv_libxml_build_works=yes 144094- 144095- 144096+ 144097+ 144098 else 144099- echo "$as_me: program exited with status $ac_status" >&5 144100-echo "$as_me: failed program was:" >&5 144101-sed 's/^/| /' conftest.$ac_ext >&5 144102- 144103-( exit $ac_status ) 144104- 144105+ echo "configure: failed program was:" >&5 144106+ cat conftest.$ac_ext >&5 144107+ rm -fr conftest* 144108+ 144109 LIBS=$old_LIBS 144110- 144111- echo "$as_me:$LINENO: result: no" >&5 144112-echo "${ECHO_T}no" >&6 144113- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 144114-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 144115- { (exit 1); exit 1; }; } 144116- 144117- 144118+ 144119+ echo "$ac_t""no" 1>&6 144120+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 144121+ 144122+ 144123 fi 144124-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 144125+rm -fr conftest* 144126 fi 144127 144128 144129+ 144130 fi 144131-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 144132-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 144133- if test "$php_cv_libxml_build_works" = "yes"; then 144134 144135-cat >>confdefs.h <<\_ACEOF 144136+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 144137+ if test "$php_cv_libxml_build_works" = "yes"; then 144138+ cat >> confdefs.h <<\EOF 144139 #define HAVE_LIBXML 1 144140-_ACEOF 144141+EOF 144142 144143 fi 144144- 144145+ 144146 xml_extra_sources="compat.c" 144147- 144148+ 144149 am_i_shared=$PHP_XML_SHARED 144150 is_it_shared=$PHP_LIBXML_SHARED 144151 is_it_enabled=$PHP_LIBXML 144152 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 144153- { { echo "$as_me:$LINENO: error: 144154-You've configured extension xml to build statically, but it 144155-depends on extension libxml, which you've configured to build shared. 144156-You either need to build xml shared or build libxml statically for the 144157-build to be successful. 144158-" >&5 144159-echo "$as_me: error: 144160+ { echo "configure: error: 144161 You've configured extension xml to build statically, but it 144162 depends on extension libxml, which you've configured to build shared. 144163 You either need to build xml shared or build libxml statically for the 144164 build to be successful. 144165-" >&2;} 144166- { (exit 1); exit 1; }; } 144167+" 1>&2; exit 1; } 144168 fi 144169 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 144170- { { echo "$as_me:$LINENO: error: 144171-You've configured extension xml, which depends on extension libxml, 144172-but you've either not enabled libxml, or have disabled it. 144173-" >&5 144174-echo "$as_me: error: 144175+ { echo "configure: error: 144176 You've configured extension xml, which depends on extension libxml, 144177 but you've either not enabled libxml, or have disabled it. 144178-" >&2;} 144179- { (exit 1); exit 1; }; } 144180+" 1>&2; exit 1; } 144181 fi 144182- 144183- 144184+ 144185+ 144186 else 144187- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 144188-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 144189- { (exit 1); exit 1; }; } 144190+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 144191 fi 144192-else 144193- { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5 144194-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;} 144195- { (exit 1); exit 1; }; } 144196- 144197+else 144198+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; } 144199+ 144200 fi 144201 144202 fi 144203- 144204+ 144205 if test "$PHP_LIBEXPAT_DIR" != "no"; then 144206 for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do 144207 if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then 144208@@ -125266,130 +97614,128 @@ 144209 done 144210 144211 if test -z "$EXPAT_DIR"; then 144212- { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5 144213-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;} 144214- { (exit 1); exit 1; }; } 144215+ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } 144216 fi 144217 144218- 144219+ 144220 if test "$EXPAT_DIR/include" != "/usr/include"; then 144221- 144222+ 144223 if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then 144224 ai_p=$EXPAT_DIR/include 144225 else 144226- 144227+ 144228 ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 144229- 144230+ 144231 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144232 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" 144233 fi 144234 144235- 144236- 144237+ 144238+ 144239 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144240- 144241+ 144242 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 144243 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144244 eval "INCLUDEPATH$unique=set" 144245- 144246+ 144247 if test ""; then 144248 INCLUDES="-I$ai_p $INCLUDES" 144249 else 144250 INCLUDES="$INCLUDES -I$ai_p" 144251 fi 144252- 144253+ 144254 fi 144255 144256 fi 144257 144258- 144259+ 144260 144261 if test "$ext_shared" = "yes"; then 144262 XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" 144263 if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then 144264- 144265+ 144266 if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 144267- 144268+ 144269 if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 144270 ai_p=$EXPAT_DIR/$PHP_LIBDIR 144271 else 144272- 144273+ 144274 ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 144275- 144276+ 144277 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144278 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" 144279 fi 144280 144281- 144282+ 144283 if test "$ext_shared" = "yes"; then 144284 XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" 144285 test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" 144286 else 144287- 144288- 144289- 144290+ 144291+ 144292+ 144293 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144294- 144295+ 144296 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 144297 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144298 eval "LIBPATH$unique=set" 144299- 144300+ 144301 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 144302 LDFLAGS="$LDFLAGS -L$ai_p" 144303 PHP_RPATHS="$PHP_RPATHS $ai_p" 144304- 144305+ 144306 fi 144307 144308 144309 fi 144310- 144311+ 144312 fi 144313 144314 fi 144315 else 144316- 144317+ 144318 144319 if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then 144320- 144321+ 144322 if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then 144323- 144324+ 144325 if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 144326 ai_p=$EXPAT_DIR/$PHP_LIBDIR 144327 else 144328- 144329+ 144330 ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 144331- 144332+ 144333 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144334 ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" 144335 fi 144336 144337- 144338- 144339- 144340- 144341+ 144342+ 144343+ 144344+ 144345 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144346- 144347+ 144348 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 144349 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144350 eval "LIBPATH$unique=set" 144351- 144352+ 144353 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 144354 LDFLAGS="$LDFLAGS -L$ai_p" 144355 PHP_RPATHS="$PHP_RPATHS $ai_p" 144356- 144357+ 144358 fi 144359 144360 144361- 144362+ 144363 fi 144364 144365 fi 144366- 144367- 144368+ 144369+ 144370 case expat in 144371 c|c_r|pthread*) ;; 144372- *) 144373- LIBS="-lexpat $LIBS" 144374+ *) 144375+ LIBS="-lexpat $LIBS" 144376 ;; 144377 esac 144378 144379@@ -125399,14 +97745,13 @@ 144380 fi 144381 144382 144383- 144384-cat >>confdefs.h <<\_ACEOF 144385+ cat >> confdefs.h <<\EOF 144386 #define HAVE_LIBEXPAT 1 144387-_ACEOF 144388+EOF 144389 144390 fi 144391 144392- 144393+ 144394 ext_builddir=ext/xml 144395 ext_srcdir=$abs_srcdir/ext/xml 144396 144397@@ -125414,15 +97759,15 @@ 144398 144399 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 144400 PHP_XML_SHARED=no 144401- 144402- 144403+ 144404+ 144405 case ext/xml in 144406 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 144407 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 144408 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 144409 esac 144410- 144411- 144412+ 144413+ 144414 144415 b_c_pre=$php_c_pre 144416 b_cxx_pre=$php_cxx_pre 144417@@ -125435,12 +97780,12 @@ 144418 144419 old_IFS=$IFS 144420 for ac_src in xml.c $xml_extra_sources; do 144421- 144422+ 144423 IFS=. 144424 set $ac_src 144425 ac_obj=$1 144426 IFS=$old_IFS 144427- 144428+ 144429 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 144430 144431 case $ac_src in 144432@@ -125464,14 +97809,14 @@ 144433 else 144434 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 144435 PHP_XML_SHARED=yes 144436- 144437+ 144438 case ext/xml in 144439 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 144440 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 144441 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 144442 esac 144443- 144444- 144445+ 144446+ 144447 144448 b_c_pre=$shared_c_pre 144449 b_cxx_pre=$shared_cxx_pre 144450@@ -125484,12 +97829,12 @@ 144451 144452 old_IFS=$IFS 144453 for ac_src in xml.c $xml_extra_sources; do 144454- 144455+ 144456 IFS=. 144457 set $ac_src 144458 ac_obj=$1 144459 IFS=$old_IFS 144460- 144461+ 144462 shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" 144463 144464 case $ac_src in 144465@@ -125507,7 +97852,7 @@ 144466 144467 case $host_alias in 144468 *netware*) 144469- 144470+ 144471 install_modules="install-modules" 144472 144473 case $host_alias in 144474@@ -125517,7 +97862,7 @@ 144475 ;; 144476 *netware*) 144477 suffix=nlm 144478- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(XML_SHARED_LIBADD)' 144479+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' 144480 ;; 144481 *) 144482 suffix=la 144483@@ -125530,7 +97875,7 @@ 144484 else 144485 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" 144486 fi 144487- 144488+ 144489 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" 144490 144491 cat >>Makefile.objects<<EOF 144492@@ -125544,7 +97889,7 @@ 144493 144494 ;; 144495 *) 144496- 144497+ 144498 install_modules="install-modules" 144499 144500 case $host_alias in 144501@@ -125554,7 +97899,7 @@ 144502 ;; 144503 *netware*) 144504 suffix=nlm 144505- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 144506+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XML, 3)_SHARED_LIBADD)' 144507 ;; 144508 *) 144509 suffix=la 144510@@ -125567,7 +97912,7 @@ 144511 else 144512 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix" 144513 fi 144514- 144515+ 144516 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" 144517 144518 cat >>Makefile.objects<<EOF 144519@@ -125581,10 +97926,9 @@ 144520 144521 ;; 144522 esac 144523- 144524-cat >>confdefs.h <<_ACEOF 144525+ cat >> confdefs.h <<EOF 144526 #define COMPILE_DL_XML 1 144527-_ACEOF 144528+EOF 144529 144530 fi 144531 fi 144532@@ -125593,15 +97937,15 @@ 144533 PHP_XML_SHARED=no 144534 case "$PHP_SAPI" in 144535 cgi|embed) 144536- 144537- 144538+ 144539+ 144540 case ext/xml in 144541 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 144542 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 144543 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 144544 esac 144545- 144546- 144547+ 144548+ 144549 144550 b_c_pre=$php_c_pre 144551 b_cxx_pre=$php_cxx_pre 144552@@ -125614,12 +97958,12 @@ 144553 144554 old_IFS=$IFS 144555 for ac_src in xml.c $xml_extra_sources; do 144556- 144557+ 144558 IFS=. 144559 set $ac_src 144560 ac_obj=$1 144561 IFS=$old_IFS 144562- 144563+ 144564 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 144565 144566 case $ac_src in 144567@@ -125639,15 +97983,15 @@ 144568 EXT_STATIC="$EXT_STATIC xml" 144569 ;; 144570 *) 144571- 144572- 144573+ 144574+ 144575 case ext/xml in 144576 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 144577 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 144578 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 144579 esac 144580- 144581- 144582+ 144583+ 144584 144585 b_c_pre=$php_c_pre 144586 b_cxx_pre=$php_cxx_pre 144587@@ -125660,13 +98004,13 @@ 144588 144589 old_IFS=$IFS 144590 for ac_src in xml.c $xml_extra_sources; do 144591- 144592+ 144593 IFS=. 144594 set $ac_src 144595 ac_obj=$1 144596 IFS=$old_IFS 144597- 144598- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 144599+ 144600+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 144601 144602 case $ac_src in 144603 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 144604@@ -125686,44 +98030,43 @@ 144605 esac 144606 EXT_CLI_STATIC="$EXT_CLI_STATIC xml" 144607 fi 144608- 144609- 144610+ 144611+ 144612 BUILD_DIR="$BUILD_DIR $ext_builddir" 144613- 144614+ 144615 144616 144617 if test "$ext_builddir" = "."; then 144618 PHP_PECL_EXTENSION=xml 144619- 144620+ 144621 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 144622 144623 fi 144624 144625- 144626+ 144627 PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD" 144628 144629- 144630- 144631+ 144632+ 144633 for header_file in ext/xml/; do 144634- 144635- 144636+ 144637+ 144638 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 144639- 144640+ 144641 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 144642 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144643 eval "INSTALLHEADERS$unique=set" 144644- 144645+ 144646 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 144647- 144648+ 144649 fi 144650 144651- done 144652- 144653- 144654+ done 144655+ 144656 144657-cat >>confdefs.h <<\_ACEOF 144658+ cat >> confdefs.h <<\EOF 144659 #define HAVE_XML 1 144660-_ACEOF 144661+EOF 144662 144663 fi 144664 144665@@ -125731,18 +98074,19 @@ 144666 144667 php_enable_xmlreader=yes 144668 144669-echo "$as_me:$LINENO: checking whether to enable XMLReader support" >&5 144670-echo $ECHO_N "checking whether to enable XMLReader support... $ECHO_C" >&6 144671+echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 144672+echo "configure:98079: checking whether to enable XMLReader support" >&5 144673 # Check whether --enable-xmlreader or --disable-xmlreader was given. 144674 if test "${enable_xmlreader+set}" = set; then 144675 enableval="$enable_xmlreader" 144676 PHP_XMLREADER=$enableval 144677 else 144678- 144679+ 144680 PHP_XMLREADER=yes 144681 test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL 144682 144683-fi; 144684+fi 144685+ 144686 144687 144688 ext_output="yes, shared" 144689@@ -125766,33 +98110,31 @@ 144690 144691 144692 144693-echo "$as_me:$LINENO: result: $ext_output" >&5 144694-echo "${ECHO_T}$ext_output" >&6 144695+echo "$ac_t""$ext_output" 1>&6 144696 144697 144698 144699 144700 if test -z "$PHP_LIBXML_DIR"; then 144701- 144702+ 144703 php_with_libxml_dir=no 144704 144705-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 144706-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 144707- 144708+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 144709+echo "configure:98124: checking libxml2 install dir" >&5 144710 # Check whether --with-libxml-dir or --without-libxml-dir was given. 144711 if test "${with_libxml_dir+set}" = set; then 144712 withval="$with_libxml_dir" 144713 PHP_LIBXML_DIR=$withval 144714 else 144715- 144716+ 144717 PHP_LIBXML_DIR=no 144718+ 144719 144720+fi 144721 144722-fi; 144723 144724 ext_output=$PHP_LIBXML_DIR 144725-echo "$as_me:$LINENO: result: $ext_output" >&5 144726-echo "${ECHO_T}$ext_output" >&6 144727+echo "$ac_t""$ext_output" 1>&6 144728 144729 144730 144731@@ -125801,18 +98143,16 @@ 144732 if test "$PHP_XMLREADER" != "no"; then 144733 144734 if test "$PHP_LIBXML" = "no"; then 144735- { { echo "$as_me:$LINENO: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&5 144736-echo "$as_me: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&2;} 144737- { (exit 1); exit 1; }; } 144738+ { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 144739 fi 144740 144741- 144742-echo "$as_me:$LINENO: checking for xml2-config path" >&5 144743-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 144744-if test "${ac_cv_php_xml2_config_path+set}" = set; then 144745- echo $ECHO_N "(cached) $ECHO_C" >&6 144746+ 144747+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 144748+echo "configure:98152: checking for xml2-config path" >&5 144749+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 144750+ echo $ac_n "(cached) $ac_c" 1>&6 144751 else 144752- 144753+ 144754 for i in $PHP_LIBXML_DIR /usr/local /usr; do 144755 if test -x "$i/bin/xml2-config"; then 144756 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 144757@@ -125821,8 +98161,8 @@ 144758 done 144759 144760 fi 144761-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 144762-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 144763+ 144764+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 144765 144766 if test -x "$ac_cv_php_xml2_config_path"; then 144767 XML2_CONFIG="$ac_cv_php_xml2_config_path" 144768@@ -125835,17 +98175,17 @@ 144769 if test "$LIBXML_VERSION" -ge "2006011"; then 144770 LIBXML_LIBS=`$XML2_CONFIG --libs` 144771 LIBXML_INCS=`$XML2_CONFIG --cflags` 144772- 144773+ 144774 for ac_i in $LIBXML_LIBS; do 144775 case $ac_i in 144776 -pthread) 144777 if test "$ext_shared" = "yes"; then 144778 XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" 144779 else 144780- 144781- 144782+ 144783+ 144784 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 144785- 144786+ 144787 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 144788 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144789 eval "EXTRA_LDFLAGS$unique=set" 144790@@ -125856,20 +98196,20 @@ 144791 ;; 144792 -l*) 144793 ac_ii=`echo $ac_i|cut -c 3-` 144794- 144795- 144796+ 144797+ 144798 case $ac_ii in 144799 c|c_r|pthread*) ;; 144800- *) 144801+ *) 144802 if test "$ext_shared" = "yes"; then 144803- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" 144804+ XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" 144805 else 144806- 144807- 144808+ 144809+ 144810 case $ac_ii in 144811 c|c_r|pthread*) ;; 144812- *) 144813- LIBS="$LIBS -l$ac_ii" 144814+ *) 144815+ LIBS="$LIBS -l$ac_ii" 144816 ;; 144817 esac 144818 144819@@ -125882,80 +98222,80 @@ 144820 ;; 144821 -L*) 144822 ac_ii=`echo $ac_i|cut -c 3-` 144823- 144824+ 144825 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 144826- 144827+ 144828 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 144829 ai_p=$ac_ii 144830 else 144831- 144832+ 144833 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 144834- 144835+ 144836 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144837 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 144838 fi 144839 144840- 144841+ 144842 if test "$ext_shared" = "yes"; then 144843 XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" 144844 test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" 144845 else 144846- 144847- 144848- 144849+ 144850+ 144851+ 144852 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144853- 144854+ 144855 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 144856 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144857 eval "LIBPATH$unique=set" 144858- 144859+ 144860 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 144861 LDFLAGS="$LDFLAGS -L$ai_p" 144862 PHP_RPATHS="$PHP_RPATHS $ai_p" 144863- 144864+ 144865 fi 144866 144867 144868 fi 144869- 144870+ 144871 fi 144872 144873 ;; 144874 esac 144875 done 144876 144877- 144878+ 144879 for ac_i in $LIBXML_INCS; do 144880 case $ac_i in 144881 -I*) 144882 ac_ii=`echo $ac_i|cut -c 3-` 144883- 144884+ 144885 if test "$ac_ii" != "/usr/include"; then 144886- 144887+ 144888 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 144889 ai_p=$ac_ii 144890 else 144891- 144892+ 144893 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 144894- 144895+ 144896 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 144897 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 144898 fi 144899 144900- 144901- 144902+ 144903+ 144904 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 144905- 144906+ 144907 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 144908 if test -n "$unique" && test "`eval $cmd`" = "" ; then 144909 eval "INCLUDEPATH$unique=set" 144910- 144911+ 144912 if test ""; then 144913 INCLUDES="-I$ai_p $INCLUDES" 144914 else 144915 INCLUDES="$INCLUDES -I$ai_p" 144916 fi 144917- 144918+ 144919 fi 144920 144921 fi 144922@@ -125965,92 +98305,74 @@ 144923 done 144924 144925 144926- echo "$as_me:$LINENO: checking whether libxml build works" >&5 144927-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 144928-if test "${php_cv_libxml_build_works+set}" = set; then 144929- echo $ECHO_N "(cached) $ECHO_C" >&6 144930+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 144931+echo "configure:98310: checking whether libxml build works" >&5 144932+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 144933+ echo $ac_n "(cached) $ac_c" 1>&6 144934 else 144935- 144936- 144937+ 144938+ 144939 old_LIBS=$LIBS 144940 LIBS=" 144941 $XMLREADER_SHARED_LIBADD 144942 $LIBS" 144943 if test "$cross_compiling" = yes; then 144944- 144945+ 144946 LIBS=$old_LIBS 144947- 144948+ 144949 else 144950- cat >conftest.$ac_ext <<_ACEOF 144951-/* confdefs.h. */ 144952-_ACEOF 144953-cat confdefs.h >>conftest.$ac_ext 144954-cat >>conftest.$ac_ext <<_ACEOF 144955-/* end confdefs.h. */ 144956- 144957+ cat > conftest.$ac_ext <<EOF 144958+#line 98326 "configure" 144959+#include "confdefs.h" 144960 144961+ 144962 char xmlInitParser(); 144963 int main() { 144964 xmlInitParser(); 144965 return 0; 144966 } 144967- 144968-_ACEOF 144969-rm -f conftest$ac_exeext 144970-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 144971- (eval $ac_link) 2>&5 144972- ac_status=$? 144973- echo "$as_me:$LINENO: \$? = $ac_status" >&5 144974- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 144975- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 144976- (eval $ac_try) 2>&5 144977- ac_status=$? 144978- echo "$as_me:$LINENO: \$? = $ac_status" >&5 144979- (exit $ac_status); }; }; then 144980- 144981+ 144982+EOF 144983+if { (eval echo configure:98337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 144984+then 144985+ 144986 LIBS=$old_LIBS 144987- 144988+ 144989 php_cv_libxml_build_works=yes 144990- 144991- 144992+ 144993+ 144994 else 144995- echo "$as_me: program exited with status $ac_status" >&5 144996-echo "$as_me: failed program was:" >&5 144997-sed 's/^/| /' conftest.$ac_ext >&5 144998- 144999-( exit $ac_status ) 145000- 145001+ echo "configure: failed program was:" >&5 145002+ cat conftest.$ac_ext >&5 145003+ rm -fr conftest* 145004+ 145005 LIBS=$old_LIBS 145006- 145007- echo "$as_me:$LINENO: result: no" >&5 145008-echo "${ECHO_T}no" >&6 145009- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 145010-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 145011- { (exit 1); exit 1; }; } 145012- 145013- 145014+ 145015+ echo "$ac_t""no" 1>&6 145016+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 145017+ 145018+ 145019 fi 145020-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 145021+rm -fr conftest* 145022 fi 145023 145024 145025+ 145026 fi 145027-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 145028-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 145029- if test "$php_cv_libxml_build_works" = "yes"; then 145030 145031-cat >>confdefs.h <<\_ACEOF 145032+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 145033+ if test "$php_cv_libxml_build_works" = "yes"; then 145034+ cat >> confdefs.h <<\EOF 145035 #define HAVE_LIBXML 1 145036-_ACEOF 145037+EOF 145038 145039 fi 145040- 145041- 145042-cat >>confdefs.h <<\_ACEOF 145043+ 145044+ cat >> confdefs.h <<\EOF 145045 #define HAVE_XMLREADER 1 145046-_ACEOF 145047- 145048+EOF 145049 145050+ 145051 ext_builddir=ext/xmlreader 145052 ext_srcdir=$abs_srcdir/ext/xmlreader 145053 145054@@ -126058,15 +98380,15 @@ 145055 145056 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 145057 PHP_XMLREADER_SHARED=no 145058- 145059- 145060+ 145061+ 145062 case ext/xmlreader in 145063 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 145064 /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 145065 *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 145066 esac 145067- 145068- 145069+ 145070+ 145071 145072 b_c_pre=$php_c_pre 145073 b_cxx_pre=$php_cxx_pre 145074@@ -126079,12 +98401,12 @@ 145075 145076 old_IFS=$IFS 145077 for ac_src in php_xmlreader.c; do 145078- 145079+ 145080 IFS=. 145081 set $ac_src 145082 ac_obj=$1 145083 IFS=$old_IFS 145084- 145085+ 145086 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 145087 145088 case $ac_src in 145089@@ -126108,14 +98430,14 @@ 145090 else 145091 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 145092 PHP_XMLREADER_SHARED=yes 145093- 145094+ 145095 case ext/xmlreader in 145096 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 145097 /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 145098 *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 145099 esac 145100- 145101- 145102+ 145103+ 145104 145105 b_c_pre=$shared_c_pre 145106 b_cxx_pre=$shared_cxx_pre 145107@@ -126128,12 +98450,12 @@ 145108 145109 old_IFS=$IFS 145110 for ac_src in php_xmlreader.c; do 145111- 145112+ 145113 IFS=. 145114 set $ac_src 145115 ac_obj=$1 145116 IFS=$old_IFS 145117- 145118+ 145119 shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" 145120 145121 case $ac_src in 145122@@ -126151,7 +98473,7 @@ 145123 145124 case $host_alias in 145125 *netware*) 145126- 145127+ 145128 install_modules="install-modules" 145129 145130 case $host_alias in 145131@@ -126161,7 +98483,7 @@ 145132 ;; 145133 *netware*) 145134 suffix=nlm 145135- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(XMLREADER_SHARED_LIBADD)' 145136+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' 145137 ;; 145138 *) 145139 suffix=la 145140@@ -126174,7 +98496,7 @@ 145141 else 145142 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" 145143 fi 145144- 145145+ 145146 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" 145147 145148 cat >>Makefile.objects<<EOF 145149@@ -126188,7 +98510,7 @@ 145150 145151 ;; 145152 *) 145153- 145154+ 145155 install_modules="install-modules" 145156 145157 case $host_alias in 145158@@ -126198,7 +98520,7 @@ 145159 ;; 145160 *netware*) 145161 suffix=nlm 145162- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(READER_SHARED_LIBADD)' 145163+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)' 145164 ;; 145165 *) 145166 suffix=la 145167@@ -126211,7 +98533,7 @@ 145168 else 145169 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix" 145170 fi 145171- 145172+ 145173 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" 145174 145175 cat >>Makefile.objects<<EOF 145176@@ -126225,10 +98547,9 @@ 145177 145178 ;; 145179 esac 145180- 145181-cat >>confdefs.h <<_ACEOF 145182+ cat >> confdefs.h <<EOF 145183 #define COMPILE_DL_XMLREADER 1 145184-_ACEOF 145185+EOF 145186 145187 fi 145188 fi 145189@@ -126237,15 +98558,15 @@ 145190 PHP_XMLREADER_SHARED=no 145191 case "$PHP_SAPI" in 145192 cgi|embed) 145193- 145194- 145195+ 145196+ 145197 case ext/xmlreader in 145198 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 145199 /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 145200 *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 145201 esac 145202- 145203- 145204+ 145205+ 145206 145207 b_c_pre=$php_c_pre 145208 b_cxx_pre=$php_cxx_pre 145209@@ -126258,12 +98579,12 @@ 145210 145211 old_IFS=$IFS 145212 for ac_src in php_xmlreader.c; do 145213- 145214+ 145215 IFS=. 145216 set $ac_src 145217 ac_obj=$1 145218 IFS=$old_IFS 145219- 145220+ 145221 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 145222 145223 case $ac_src in 145224@@ -126283,15 +98604,15 @@ 145225 EXT_STATIC="$EXT_STATIC xmlreader" 145226 ;; 145227 *) 145228- 145229- 145230+ 145231+ 145232 case ext/xmlreader in 145233 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 145234 /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 145235 *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 145236 esac 145237- 145238- 145239+ 145240+ 145241 145242 b_c_pre=$php_c_pre 145243 b_cxx_pre=$php_cxx_pre 145244@@ -126304,13 +98625,13 @@ 145245 145246 old_IFS=$IFS 145247 for ac_src in php_xmlreader.c; do 145248- 145249+ 145250 IFS=. 145251 set $ac_src 145252 ac_obj=$1 145253 IFS=$old_IFS 145254- 145255- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 145256+ 145257+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 145258 145259 case $ac_src in 145260 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 145261@@ -126330,64 +98651,48 @@ 145262 esac 145263 EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" 145264 fi 145265- 145266- 145267+ 145268+ 145269 BUILD_DIR="$BUILD_DIR $ext_builddir" 145270- 145271+ 145272 145273 145274 if test "$ext_builddir" = "."; then 145275 PHP_PECL_EXTENSION=xmlreader 145276- 145277+ 145278 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 145279 145280 fi 145281 145282- 145283+ 145284 am_i_shared=$PHP_XMLREADER_SHARED 145285 is_it_shared=$PHP_DOM_SHARED 145286 is_it_enabled=$PHP_DOM 145287 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 145288- { { echo "$as_me:$LINENO: error: 145289-You've configured extension xmlreader to build statically, but it 145290-depends on extension dom, which you've configured to build shared. 145291-You either need to build xmlreader shared or build dom statically for the 145292-build to be successful. 145293-" >&5 145294-echo "$as_me: error: 145295+ { echo "configure: error: 145296 You've configured extension xmlreader to build statically, but it 145297 depends on extension dom, which you've configured to build shared. 145298 You either need to build xmlreader shared or build dom statically for the 145299 build to be successful. 145300-" >&2;} 145301- { (exit 1); exit 1; }; } 145302+" 1>&2; exit 1; } 145303 fi 145304 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then 145305- { { echo "$as_me:$LINENO: error: 145306-You've configured extension xmlreader, which depends on extension dom, 145307-but you've either not enabled dom, or have disabled it. 145308-" >&5 145309-echo "$as_me: error: 145310+ { echo "configure: error: 145311 You've configured extension xmlreader, which depends on extension dom, 145312 but you've either not enabled dom, or have disabled it. 145313-" >&2;} 145314- { (exit 1); exit 1; }; } 145315+" 1>&2; exit 1; } 145316 fi 145317- 145318- 145319+ 145320+ 145321 PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" 145322 145323- 145324+ 145325 else 145326- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 145327-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 145328- { (exit 1); exit 1; }; } 145329+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 145330 fi 145331-else 145332- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 145333-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 145334- { (exit 1); exit 1; }; } 145335- 145336+else 145337+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 145338+ 145339 fi 145340 145341 fi 145342@@ -126409,19 +98714,19 @@ 145343 145344 php_with_xmlrpc=no 145345 145346-echo "$as_me:$LINENO: checking for XMLRPC-EPI support" >&5 145347-echo $ECHO_N "checking for XMLRPC-EPI support... $ECHO_C" >&6 145348- 145349+echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 145350+echo "configure:98719: checking for XMLRPC-EPI support" >&5 145351 # Check whether --with-xmlrpc or --without-xmlrpc was given. 145352 if test "${with_xmlrpc+set}" = set; then 145353 withval="$with_xmlrpc" 145354 PHP_XMLRPC=$withval 145355 else 145356- 145357+ 145358 PHP_XMLRPC=no 145359 test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL 145360 145361-fi; 145362+fi 145363+ 145364 145365 145366 ext_output="yes, shared" 145367@@ -126445,33 +98750,31 @@ 145368 145369 145370 145371-echo "$as_me:$LINENO: result: $ext_output" >&5 145372-echo "${ECHO_T}$ext_output" >&6 145373+echo "$ac_t""$ext_output" 1>&6 145374 145375 145376 145377 145378 if test -z "$PHP_LIBXML_DIR"; then 145379- 145380+ 145381 php_with_libxml_dir=no 145382 145383-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 145384-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 145385- 145386+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 145387+echo "configure:98764: checking libxml2 install dir" >&5 145388 # Check whether --with-libxml-dir or --without-libxml-dir was given. 145389 if test "${with_libxml_dir+set}" = set; then 145390 withval="$with_libxml_dir" 145391 PHP_LIBXML_DIR=$withval 145392 else 145393- 145394+ 145395 PHP_LIBXML_DIR=no 145396+ 145397 145398+fi 145399 145400-fi; 145401 145402 ext_output=$PHP_LIBXML_DIR 145403-echo "$as_me:$LINENO: result: $ext_output" >&5 145404-echo "${ECHO_T}$ext_output" >&6 145405+echo "$ac_t""$ext_output" 1>&6 145406 145407 145408 145409@@ -126480,23 +98783,22 @@ 145410 145411 php_with_libexpat_dir=no 145412 145413-echo "$as_me:$LINENO: checking libexpat dir for XMLRPC-EPI" >&5 145414-echo $ECHO_N "checking libexpat dir for XMLRPC-EPI... $ECHO_C" >&6 145415- 145416+echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 145417+echo "configure:98788: checking libexpat dir for XMLRPC-EPI" >&5 145418 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. 145419 if test "${with_libexpat_dir+set}" = set; then 145420 withval="$with_libexpat_dir" 145421 PHP_LIBEXPAT_DIR=$withval 145422 else 145423- 145424+ 145425 PHP_LIBEXPAT_DIR=no 145426+ 145427 145428+fi 145429 145430-fi; 145431 145432 ext_output=$PHP_LIBEXPAT_DIR 145433-echo "$as_me:$LINENO: result: $ext_output" >&5 145434-echo "${ECHO_T}$ext_output" >&6 145435+echo "$ac_t""$ext_output" 1>&6 145436 145437 145438 145439@@ -126504,84 +98806,68 @@ 145440 145441 php_with_iconv_dir=no 145442 145443-echo "$as_me:$LINENO: checking iconv dir for XMLRPC-EPI" >&5 145444-echo $ECHO_N "checking iconv dir for XMLRPC-EPI... $ECHO_C" >&6 145445- 145446+echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 145447+echo "configure:98811: checking iconv dir for XMLRPC-EPI" >&5 145448 # Check whether --with-iconv-dir or --without-iconv-dir was given. 145449 if test "${with_iconv_dir+set}" = set; then 145450 withval="$with_iconv_dir" 145451 PHP_ICONV_DIR=$withval 145452 else 145453- 145454+ 145455 PHP_ICONV_DIR=no 145456+ 145457 145458+fi 145459 145460-fi; 145461 145462 ext_output=$PHP_ICONV_DIR 145463-echo "$as_me:$LINENO: result: $ext_output" >&5 145464-echo "${ECHO_T}$ext_output" >&6 145465+echo "$ac_t""$ext_output" 1>&6 145466 145467 145468 145469 145470 if test "$PHP_XMLRPC" != "no"; then 145471 145472- 145473+ 145474 am_i_shared=$PHP_XMLRPC_SHARED 145475 is_it_shared=$PHP_LIBXML_SHARED 145476 is_it_enabled=$PHP_LIBXML 145477 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 145478- { { echo "$as_me:$LINENO: error: 145479-You've configured extension xmlrpc to build statically, but it 145480-depends on extension libxml, which you've configured to build shared. 145481-You either need to build xmlrpc shared or build libxml statically for the 145482-build to be successful. 145483-" >&5 145484-echo "$as_me: error: 145485+ { echo "configure: error: 145486 You've configured extension xmlrpc to build statically, but it 145487 depends on extension libxml, which you've configured to build shared. 145488 You either need to build xmlrpc shared or build libxml statically for the 145489 build to be successful. 145490-" >&2;} 145491- { (exit 1); exit 1; }; } 145492+" 1>&2; exit 1; } 145493 fi 145494 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 145495- { { echo "$as_me:$LINENO: error: 145496-You've configured extension xmlrpc, which depends on extension libxml, 145497-but you've either not enabled libxml, or have disabled it. 145498-" >&5 145499-echo "$as_me: error: 145500+ { echo "configure: error: 145501 You've configured extension xmlrpc, which depends on extension libxml, 145502 but you've either not enabled libxml, or have disabled it. 145503-" >&2;} 145504- { (exit 1); exit 1; }; } 145505+" 1>&2; exit 1; } 145506 fi 145507- 145508- 145509+ 145510+ 145511 PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" 145512 145513- 145514-cat >>confdefs.h <<\_ACEOF 145515+ cat >> confdefs.h <<\EOF 145516 #define HAVE_XMLRPC 1 145517-_ACEOF 145518+EOF 145519 145520 145521 if test "$PHP_LIBEXPAT_DIR" = "no"; then 145522 145523 if test "$PHP_LIBXML" = "no"; then 145524- { { echo "$as_me:$LINENO: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&5 145525-echo "$as_me: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&2;} 145526- { (exit 1); exit 1; }; } 145527+ { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 145528 fi 145529 145530- 145531-echo "$as_me:$LINENO: checking for xml2-config path" >&5 145532-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 145533-if test "${ac_cv_php_xml2_config_path+set}" = set; then 145534- echo $ECHO_N "(cached) $ECHO_C" >&6 145535+ 145536+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 145537+echo "configure:98867: checking for xml2-config path" >&5 145538+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 145539+ echo $ac_n "(cached) $ac_c" 1>&6 145540 else 145541- 145542+ 145543 for i in $PHP_LIBXML_DIR /usr/local /usr; do 145544 if test -x "$i/bin/xml2-config"; then 145545 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 145546@@ -126590,8 +98876,8 @@ 145547 done 145548 145549 fi 145550-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 145551-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 145552+ 145553+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 145554 145555 if test -x "$ac_cv_php_xml2_config_path"; then 145556 XML2_CONFIG="$ac_cv_php_xml2_config_path" 145557@@ -126604,17 +98890,17 @@ 145558 if test "$LIBXML_VERSION" -ge "2006011"; then 145559 LIBXML_LIBS=`$XML2_CONFIG --libs` 145560 LIBXML_INCS=`$XML2_CONFIG --cflags` 145561- 145562+ 145563 for ac_i in $LIBXML_LIBS; do 145564 case $ac_i in 145565 -pthread) 145566 if test "$ext_shared" = "yes"; then 145567 XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" 145568 else 145569- 145570- 145571+ 145572+ 145573 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 145574- 145575+ 145576 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 145577 if test -n "$unique" && test "`eval $cmd`" = "" ; then 145578 eval "EXTRA_LDFLAGS$unique=set" 145579@@ -126625,20 +98911,20 @@ 145580 ;; 145581 -l*) 145582 ac_ii=`echo $ac_i|cut -c 3-` 145583- 145584- 145585+ 145586+ 145587 case $ac_ii in 145588 c|c_r|pthread*) ;; 145589- *) 145590+ *) 145591 if test "$ext_shared" = "yes"; then 145592- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" 145593+ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" 145594 else 145595- 145596- 145597+ 145598+ 145599 case $ac_ii in 145600 c|c_r|pthread*) ;; 145601- *) 145602- LIBS="$LIBS -l$ac_ii" 145603+ *) 145604+ LIBS="$LIBS -l$ac_ii" 145605 ;; 145606 esac 145607 145608@@ -126651,80 +98937,80 @@ 145609 ;; 145610 -L*) 145611 ac_ii=`echo $ac_i|cut -c 3-` 145612- 145613+ 145614 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 145615- 145616+ 145617 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 145618 ai_p=$ac_ii 145619 else 145620- 145621+ 145622 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 145623- 145624+ 145625 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 145626 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 145627 fi 145628 145629- 145630+ 145631 if test "$ext_shared" = "yes"; then 145632 XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" 145633 test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" 145634 else 145635- 145636- 145637- 145638+ 145639+ 145640+ 145641 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 145642- 145643+ 145644 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 145645 if test -n "$unique" && test "`eval $cmd`" = "" ; then 145646 eval "LIBPATH$unique=set" 145647- 145648+ 145649 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 145650 LDFLAGS="$LDFLAGS -L$ai_p" 145651 PHP_RPATHS="$PHP_RPATHS $ai_p" 145652- 145653+ 145654 fi 145655 145656 145657 fi 145658- 145659+ 145660 fi 145661 145662 ;; 145663 esac 145664 done 145665 145666- 145667+ 145668 for ac_i in $LIBXML_INCS; do 145669 case $ac_i in 145670 -I*) 145671 ac_ii=`echo $ac_i|cut -c 3-` 145672- 145673+ 145674 if test "$ac_ii" != "/usr/include"; then 145675- 145676+ 145677 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 145678 ai_p=$ac_ii 145679 else 145680- 145681+ 145682 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 145683- 145684+ 145685 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 145686 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 145687 fi 145688 145689- 145690- 145691+ 145692+ 145693 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 145694- 145695+ 145696 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 145697 if test -n "$unique" && test "`eval $cmd`" = "" ; then 145698 eval "INCLUDEPATH$unique=set" 145699- 145700+ 145701 if test ""; then 145702 INCLUDES="-I$ai_p $INCLUDES" 145703 else 145704 INCLUDES="$INCLUDES -I$ai_p" 145705 fi 145706- 145707+ 145708 fi 145709 145710 fi 145711@@ -126734,96 +99020,79 @@ 145712 done 145713 145714 145715- echo "$as_me:$LINENO: checking whether libxml build works" >&5 145716-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 145717-if test "${php_cv_libxml_build_works+set}" = set; then 145718- echo $ECHO_N "(cached) $ECHO_C" >&6 145719+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 145720+echo "configure:99025: checking whether libxml build works" >&5 145721+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 145722+ echo $ac_n "(cached) $ac_c" 1>&6 145723 else 145724- 145725- 145726+ 145727+ 145728 old_LIBS=$LIBS 145729 LIBS=" 145730 $XMLRPC_SHARED_LIBADD 145731 $LIBS" 145732 if test "$cross_compiling" = yes; then 145733- 145734+ 145735 LIBS=$old_LIBS 145736- 145737+ 145738 else 145739- cat >conftest.$ac_ext <<_ACEOF 145740-/* confdefs.h. */ 145741-_ACEOF 145742-cat confdefs.h >>conftest.$ac_ext 145743-cat >>conftest.$ac_ext <<_ACEOF 145744-/* end confdefs.h. */ 145745- 145746+ cat > conftest.$ac_ext <<EOF 145747+#line 99041 "configure" 145748+#include "confdefs.h" 145749 145750+ 145751 char xmlInitParser(); 145752 int main() { 145753 xmlInitParser(); 145754 return 0; 145755 } 145756- 145757-_ACEOF 145758-rm -f conftest$ac_exeext 145759-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 145760- (eval $ac_link) 2>&5 145761- ac_status=$? 145762- echo "$as_me:$LINENO: \$? = $ac_status" >&5 145763- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 145764- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 145765- (eval $ac_try) 2>&5 145766- ac_status=$? 145767- echo "$as_me:$LINENO: \$? = $ac_status" >&5 145768- (exit $ac_status); }; }; then 145769- 145770+ 145771+EOF 145772+if { (eval echo configure:99052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 145773+then 145774+ 145775 LIBS=$old_LIBS 145776- 145777+ 145778 php_cv_libxml_build_works=yes 145779- 145780- 145781+ 145782+ 145783 else 145784- echo "$as_me: program exited with status $ac_status" >&5 145785-echo "$as_me: failed program was:" >&5 145786-sed 's/^/| /' conftest.$ac_ext >&5 145787- 145788-( exit $ac_status ) 145789- 145790+ echo "configure: failed program was:" >&5 145791+ cat conftest.$ac_ext >&5 145792+ rm -fr conftest* 145793+ 145794 LIBS=$old_LIBS 145795- 145796- echo "$as_me:$LINENO: result: no" >&5 145797-echo "${ECHO_T}no" >&6 145798- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 145799-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 145800- { (exit 1); exit 1; }; } 145801- 145802- 145803+ 145804+ echo "$ac_t""no" 1>&6 145805+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 145806+ 145807+ 145808 fi 145809-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 145810+rm -fr conftest* 145811 fi 145812 145813 145814+ 145815 fi 145816-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 145817-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 145818- if test "$php_cv_libxml_build_works" = "yes"; then 145819 145820-cat >>confdefs.h <<\_ACEOF 145821+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 145822+ if test "$php_cv_libxml_build_works" = "yes"; then 145823+ cat >> confdefs.h <<\EOF 145824 #define HAVE_LIBXML 1 145825-_ACEOF 145826+EOF 145827 145828 fi 145829- 145830+ 145831 if test "$PHP_XML" = "no"; then 145832- 145833- 145834+ 145835+ 145836 case ext/xml in 145837 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 145838 /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 145839 *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 145840 esac 145841- 145842- 145843+ 145844+ 145845 145846 b_c_pre=$php_c_pre 145847 b_cxx_pre=$php_cxx_pre 145848@@ -126836,12 +99105,12 @@ 145849 145850 old_IFS=$IFS 145851 for ac_src in compat.c; do 145852- 145853+ 145854 IFS=. 145855 set $ac_src 145856 ac_obj=$1 145857 IFS=$old_IFS 145858- 145859+ 145860 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 145861 145862 case $ac_src in 145863@@ -126858,122 +99127,117 @@ 145864 done 145865 145866 145867- 145868- 145869+ 145870+ 145871 BUILD_DIR="$BUILD_DIR ext/xml" 145872- 145873+ 145874 145875 fi 145876- 145877+ 145878 else 145879- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 145880-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 145881- { (exit 1); exit 1; }; } 145882+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 145883 fi 145884-else 145885- { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5 145886-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;} 145887- { (exit 1); exit 1; }; } 145888- 145889+else 145890+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; } 145891+ 145892 fi 145893 145894 else 145895 testval=no 145896 for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do 145897 if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then 145898- 145899-cat >>confdefs.h <<\_ACEOF 145900+ cat >> confdefs.h <<\EOF 145901 #define HAVE_LIBEXPAT 1 145902-_ACEOF 145903- 145904+EOF 145905 145906+ 145907 145908 if test "$ext_shared" = "yes"; then 145909 XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" 145910 if test -n "$i/$PHP_LIBDIR"; then 145911- 145912+ 145913 if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then 145914- 145915+ 145916 if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 145917 ai_p=$i/$PHP_LIBDIR 145918 else 145919- 145920+ 145921 ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 145922- 145923+ 145924 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 145925 ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" 145926 fi 145927 145928- 145929+ 145930 if test "$ext_shared" = "yes"; then 145931 XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" 145932 test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" 145933 else 145934- 145935- 145936- 145937+ 145938+ 145939+ 145940 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 145941- 145942+ 145943 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 145944 if test -n "$unique" && test "`eval $cmd`" = "" ; then 145945 eval "LIBPATH$unique=set" 145946- 145947+ 145948 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 145949 LDFLAGS="$LDFLAGS -L$ai_p" 145950 PHP_RPATHS="$PHP_RPATHS $ai_p" 145951- 145952+ 145953 fi 145954 145955 145956 fi 145957- 145958+ 145959 fi 145960 145961 fi 145962 else 145963- 145964+ 145965 145966 if test -n "$i/$PHP_LIBDIR"; then 145967- 145968+ 145969 if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then 145970- 145971+ 145972 if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 145973 ai_p=$i/$PHP_LIBDIR 145974 else 145975- 145976+ 145977 ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 145978- 145979+ 145980 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 145981 ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" 145982 fi 145983 145984- 145985- 145986- 145987- 145988+ 145989+ 145990+ 145991+ 145992 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 145993- 145994+ 145995 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 145996 if test -n "$unique" && test "`eval $cmd`" = "" ; then 145997 eval "LIBPATH$unique=set" 145998- 145999+ 146000 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 146001 LDFLAGS="$LDFLAGS -L$ai_p" 146002 PHP_RPATHS="$PHP_RPATHS $ai_p" 146003- 146004+ 146005 fi 146006 146007 146008- 146009+ 146010 fi 146011 146012 fi 146013- 146014- 146015+ 146016+ 146017 case expat in 146018 c|c_r|pthread*) ;; 146019- *) 146020- LIBS="-lexpat $LIBS" 146021+ *) 146022+ LIBS="-lexpat $LIBS" 146023 ;; 146024 esac 146025 146026@@ -126983,33 +99247,33 @@ 146027 fi 146028 146029 146030- 146031+ 146032 if test "$i/include" != "/usr/include"; then 146033- 146034+ 146035 if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then 146036 ai_p=$i/include 146037 else 146038- 146039+ 146040 ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" 146041- 146042+ 146043 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 146044 ai_p="$ep_realdir/`basename \"$i/include\"`" 146045 fi 146046 146047- 146048- 146049+ 146050+ 146051 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 146052- 146053+ 146054 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 146055 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146056 eval "INCLUDEPATH$unique=set" 146057- 146058+ 146059 if test ""; then 146060 INCLUDES="-I$ai_p $INCLUDES" 146061 else 146062 INCLUDES="$INCLUDES -I$ai_p" 146063 fi 146064- 146065+ 146066 fi 146067 146068 fi 146069@@ -127020,9 +99284,7 @@ 146070 done 146071 146072 if test "$testval" = "no"; then 146073- { { echo "$as_me:$LINENO: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&5 146074-echo "$as_me: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&2;} 146075- { (exit 1); exit 1; }; } 146076+ { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; } 146077 fi 146078 fi 146079 146080@@ -127031,12 +99293,12 @@ 146081 if test "$PHP_ICONV_DIR" != "no"; then 146082 PHP_ICONV=$PHP_ICONV_DIR 146083 fi 146084- 146085+ 146086 if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then 146087 PHP_ICONV=yes 146088 fi 146089- 146090- 146091+ 146092+ 146093 found_iconv=no 146094 unset ICONV_DIR 146095 146096@@ -127053,211 +99315,117 @@ 146097 echo > ext/iconv/php_php_iconv_h_path.h 146098 echo > ext/iconv/php_iconv_supports_errno.h 146099 146100- 146101+ 146102 if test "$PHP_ICONV" = "yes"; then 146103 LIBS_save="$LIBS" 146104 LIBS= 146105- echo "$as_me:$LINENO: checking for iconv" >&5 146106-echo $ECHO_N "checking for iconv... $ECHO_C" >&6 146107-if test "${ac_cv_func_iconv+set}" = set; then 146108- echo $ECHO_N "(cached) $ECHO_C" >&6 146109-else 146110- cat >conftest.$ac_ext <<_ACEOF 146111-/* confdefs.h. */ 146112-_ACEOF 146113-cat confdefs.h >>conftest.$ac_ext 146114-cat >>conftest.$ac_ext <<_ACEOF 146115-/* end confdefs.h. */ 146116-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv. 146117- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 146118-#define iconv innocuous_iconv 146119- 146120+ echo $ac_n "checking for iconv""... $ac_c" 1>&6 146121+echo "configure:99324: checking for iconv" >&5 146122+if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then 146123+ echo $ac_n "(cached) $ac_c" 1>&6 146124+else 146125+ cat > conftest.$ac_ext <<EOF 146126+#line 99329 "configure" 146127+#include "confdefs.h" 146128 /* System header to define __stub macros and hopefully few prototypes, 146129- which can conflict with char iconv (); below. 146130- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 146131- <limits.h> exists even on freestanding compilers. */ 146132- 146133-#ifdef __STDC__ 146134-# include <limits.h> 146135-#else 146136-# include <assert.h> 146137-#endif 146138- 146139-#undef iconv 146140- 146141+ which can conflict with char iconv(); below. */ 146142+#include <assert.h> 146143 /* Override any gcc2 internal prototype to avoid an error. */ 146144-#ifdef __cplusplus 146145-extern "C" 146146-{ 146147-#endif 146148 /* We use char because int might match the return type of a gcc2 146149- builtin and then its argument prototype would still apply. */ 146150-char iconv (); 146151+ builtin and then its argument prototype would still apply. */ 146152+char iconv(); 146153+ 146154+int main() { 146155+ 146156 /* The GNU C library defines this for functions which it implements 146157 to always fail with ENOSYS. Some functions are actually named 146158 something starting with __ and the normal name is an alias. */ 146159 #if defined (__stub_iconv) || defined (__stub___iconv) 146160 choke me 146161 #else 146162-char (*f) () = iconv; 146163-#endif 146164-#ifdef __cplusplus 146165-} 146166+iconv(); 146167 #endif 146168 146169-int 146170-main () 146171-{ 146172-return f != iconv; 146173- ; 146174- return 0; 146175-} 146176-_ACEOF 146177-rm -f conftest.$ac_objext conftest$ac_exeext 146178-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 146179- (eval $ac_link) 2>conftest.er1 146180- ac_status=$? 146181- grep -v '^ *+' conftest.er1 >conftest.err 146182- rm -f conftest.er1 146183- cat conftest.err >&5 146184- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146185- (exit $ac_status); } && 146186- { ac_try='test -z "$ac_c_werror_flag" 146187- || test ! -s conftest.err' 146188- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146189- (eval $ac_try) 2>&5 146190- ac_status=$? 146191- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146192- (exit $ac_status); }; } && 146193- { ac_try='test -s conftest$ac_exeext' 146194- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146195- (eval $ac_try) 2>&5 146196- ac_status=$? 146197- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146198- (exit $ac_status); }; }; then 146199- ac_cv_func_iconv=yes 146200-else 146201- echo "$as_me: failed program was:" >&5 146202-sed 's/^/| /' conftest.$ac_ext >&5 146203- 146204-ac_cv_func_iconv=no 146205-fi 146206-rm -f conftest.err conftest.$ac_objext \ 146207- conftest$ac_exeext conftest.$ac_ext 146208-fi 146209-echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5 146210-echo "${ECHO_T}$ac_cv_func_iconv" >&6 146211-if test $ac_cv_func_iconv = yes; then 146212+; return 0; } 146213+EOF 146214+if { (eval echo configure:99352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 146215+ rm -rf conftest* 146216+ eval "ac_cv_func_iconv=yes" 146217+else 146218+ echo "configure: failed program was:" >&5 146219+ cat conftest.$ac_ext >&5 146220+ rm -rf conftest* 146221+ eval "ac_cv_func_iconv=no" 146222+fi 146223+rm -f conftest* 146224+fi 146225 146226+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then 146227+ echo "$ac_t""yes" 1>&6 146228+ 146229 found_iconv=yes 146230- 146231+ 146232 else 146233+ echo "$ac_t""no" 1>&6 146234 146235- echo "$as_me:$LINENO: checking for libiconv" >&5 146236-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6 146237-if test "${ac_cv_func_libiconv+set}" = set; then 146238- echo $ECHO_N "(cached) $ECHO_C" >&6 146239-else 146240- cat >conftest.$ac_ext <<_ACEOF 146241-/* confdefs.h. */ 146242-_ACEOF 146243-cat confdefs.h >>conftest.$ac_ext 146244-cat >>conftest.$ac_ext <<_ACEOF 146245-/* end confdefs.h. */ 146246-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv. 146247- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 146248-#define libiconv innocuous_libiconv 146249- 146250+ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 146251+echo "configure:99373: checking for libiconv" >&5 146252+if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then 146253+ echo $ac_n "(cached) $ac_c" 1>&6 146254+else 146255+ cat > conftest.$ac_ext <<EOF 146256+#line 99378 "configure" 146257+#include "confdefs.h" 146258 /* System header to define __stub macros and hopefully few prototypes, 146259- which can conflict with char libiconv (); below. 146260- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 146261- <limits.h> exists even on freestanding compilers. */ 146262- 146263-#ifdef __STDC__ 146264-# include <limits.h> 146265-#else 146266-# include <assert.h> 146267-#endif 146268- 146269-#undef libiconv 146270- 146271+ which can conflict with char libiconv(); below. */ 146272+#include <assert.h> 146273 /* Override any gcc2 internal prototype to avoid an error. */ 146274-#ifdef __cplusplus 146275-extern "C" 146276-{ 146277-#endif 146278 /* We use char because int might match the return type of a gcc2 146279- builtin and then its argument prototype would still apply. */ 146280-char libiconv (); 146281+ builtin and then its argument prototype would still apply. */ 146282+char libiconv(); 146283+ 146284+int main() { 146285+ 146286 /* The GNU C library defines this for functions which it implements 146287 to always fail with ENOSYS. Some functions are actually named 146288 something starting with __ and the normal name is an alias. */ 146289 #if defined (__stub_libiconv) || defined (__stub___libiconv) 146290 choke me 146291 #else 146292-char (*f) () = libiconv; 146293+libiconv(); 146294 #endif 146295-#ifdef __cplusplus 146296-} 146297-#endif 146298- 146299-int 146300-main () 146301-{ 146302-return f != libiconv; 146303- ; 146304- return 0; 146305-} 146306-_ACEOF 146307-rm -f conftest.$ac_objext conftest$ac_exeext 146308-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 146309- (eval $ac_link) 2>conftest.er1 146310- ac_status=$? 146311- grep -v '^ *+' conftest.er1 >conftest.err 146312- rm -f conftest.er1 146313- cat conftest.err >&5 146314- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146315- (exit $ac_status); } && 146316- { ac_try='test -z "$ac_c_werror_flag" 146317- || test ! -s conftest.err' 146318- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146319- (eval $ac_try) 2>&5 146320- ac_status=$? 146321- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146322- (exit $ac_status); }; } && 146323- { ac_try='test -s conftest$ac_exeext' 146324- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146325- (eval $ac_try) 2>&5 146326- ac_status=$? 146327- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146328- (exit $ac_status); }; }; then 146329- ac_cv_func_libiconv=yes 146330-else 146331- echo "$as_me: failed program was:" >&5 146332-sed 's/^/| /' conftest.$ac_ext >&5 146333- 146334-ac_cv_func_libiconv=no 146335-fi 146336-rm -f conftest.err conftest.$ac_objext \ 146337- conftest$ac_exeext conftest.$ac_ext 146338-fi 146339-echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5 146340-echo "${ECHO_T}$ac_cv_func_libiconv" >&6 146341-if test $ac_cv_func_libiconv = yes; then 146342 146343+; return 0; } 146344+EOF 146345+if { (eval echo configure:99401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 146346+ rm -rf conftest* 146347+ eval "ac_cv_func_libiconv=yes" 146348+else 146349+ echo "configure: failed program was:" >&5 146350+ cat conftest.$ac_ext >&5 146351+ rm -rf conftest* 146352+ eval "ac_cv_func_libiconv=no" 146353+fi 146354+rm -f conftest* 146355+fi 146356 146357+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then 146358+ echo "$ac_t""yes" 1>&6 146359+ 146360+ 146361 echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h 146362 146363- 146364-cat >>confdefs.h <<\_ACEOF 146365+ cat >> confdefs.h <<\EOF 146366 #define HAVE_LIBICONV 1 146367-_ACEOF 146368+EOF 146369 146370 found_iconv=yes 146371- 146372+ 146373+else 146374+ echo "$ac_t""no" 1>&6 146375 fi 146376 146377- 146378+ 146379 fi 146380 146381 LIBS="$LIBS_save" 146382@@ -127267,10 +99435,9 @@ 146383 146384 for i in $PHP_ICONV /usr/local /usr; do 146385 if test -r $i/include/giconv.h; then 146386- 146387-cat >>confdefs.h <<\_ACEOF 146388+ cat >> confdefs.h <<\EOF 146389 #define HAVE_GICONV_H 1 146390-_ACEOF 146391+EOF 146392 146393 ICONV_DIR=$i 146394 iconv_lib_name=giconv 146395@@ -127283,33 +99450,31 @@ 146396 done 146397 146398 if test -z "$ICONV_DIR"; then 146399- { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5 146400-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;} 146401- { (exit 1); exit 1; }; } 146402+ { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; } 146403 fi 146404- 146405+ 146406 if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || 146407 test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME 146408 then 146409- 146410+ 146411 save_old_LDFLAGS=$LDFLAGS 146412 ac_stuff=" 146413 -L$ICONV_DIR/$PHP_LIBDIR 146414 " 146415- 146416+ 146417 save_ext_shared=$ext_shared 146418 ext_shared=yes 146419- 146420+ 146421 for ac_i in $ac_stuff; do 146422 case $ac_i in 146423 -pthread) 146424 if test "$ext_shared" = "yes"; then 146425 LDFLAGS="$LDFLAGS -pthread" 146426 else 146427- 146428- 146429+ 146430+ 146431 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 146432- 146433+ 146434 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 146435 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146436 eval "EXTRA_LDFLAGS$unique=set" 146437@@ -127320,20 +99485,20 @@ 146438 ;; 146439 -l*) 146440 ac_ii=`echo $ac_i|cut -c 3-` 146441- 146442- 146443+ 146444+ 146445 case $ac_ii in 146446 c|c_r|pthread*) ;; 146447- *) 146448+ *) 146449 if test "$ext_shared" = "yes"; then 146450- LDFLAGS="$LDFLAGS -l$ac_ii" 146451+ LDFLAGS="$LDFLAGS -l$ac_ii" 146452 else 146453- 146454- 146455+ 146456+ 146457 case $ac_ii in 146458 c|c_r|pthread*) ;; 146459- *) 146460- LIBS="$LIBS -l$ac_ii" 146461+ *) 146462+ LIBS="$LIBS -l$ac_ii" 146463 ;; 146464 esac 146465 146466@@ -127346,162 +99511,130 @@ 146467 ;; 146468 -L*) 146469 ac_ii=`echo $ac_i|cut -c 3-` 146470- 146471+ 146472 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 146473- 146474+ 146475 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 146476 ai_p=$ac_ii 146477 else 146478- 146479+ 146480 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 146481- 146482+ 146483 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 146484 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 146485 fi 146486 146487- 146488+ 146489 if test "$ext_shared" = "yes"; then 146490 LDFLAGS="-L$ai_p $LDFLAGS" 146491 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 146492 else 146493- 146494- 146495- 146496+ 146497+ 146498+ 146499 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 146500- 146501+ 146502 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 146503 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146504 eval "LIBPATH$unique=set" 146505- 146506+ 146507 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 146508 LDFLAGS="$LDFLAGS -L$ai_p" 146509 PHP_RPATHS="$PHP_RPATHS $ai_p" 146510- 146511+ 146512 fi 146513 146514 146515 fi 146516- 146517+ 146518 fi 146519 146520 ;; 146521 esac 146522 done 146523 146524- as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh` 146525-echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5 146526-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6 146527-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 146528- echo $ECHO_N "(cached) $ECHO_C" >&6 146529+ echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 146530+echo "configure:99558: checking for libiconv in -l$iconv_lib_name" >&5 146531+ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` 146532+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 146533+ echo $ac_n "(cached) $ac_c" 1>&6 146534 else 146535- ac_check_lib_save_LIBS=$LIBS 146536+ ac_save_LIBS="$LIBS" 146537 LIBS="-l$iconv_lib_name $LIBS" 146538-cat >conftest.$ac_ext <<_ACEOF 146539-/* confdefs.h. */ 146540-_ACEOF 146541-cat confdefs.h >>conftest.$ac_ext 146542-cat >>conftest.$ac_ext <<_ACEOF 146543-/* end confdefs.h. */ 146544- 146545+cat > conftest.$ac_ext <<EOF 146546+#line 99566 "configure" 146547+#include "confdefs.h" 146548 /* Override any gcc2 internal prototype to avoid an error. */ 146549-#ifdef __cplusplus 146550-extern "C" 146551-#endif 146552 /* We use char because int might match the return type of a gcc2 146553- builtin and then its argument prototype would still apply. */ 146554-char libiconv (); 146555-int 146556-main () 146557-{ 146558-libiconv (); 146559- ; 146560- return 0; 146561-} 146562-_ACEOF 146563-rm -f conftest.$ac_objext conftest$ac_exeext 146564-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 146565- (eval $ac_link) 2>conftest.er1 146566- ac_status=$? 146567- grep -v '^ *+' conftest.er1 >conftest.err 146568- rm -f conftest.er1 146569- cat conftest.err >&5 146570- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146571- (exit $ac_status); } && 146572- { ac_try='test -z "$ac_c_werror_flag" 146573- || test ! -s conftest.err' 146574- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146575- (eval $ac_try) 2>&5 146576- ac_status=$? 146577- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146578- (exit $ac_status); }; } && 146579- { ac_try='test -s conftest$ac_exeext' 146580- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146581- (eval $ac_try) 2>&5 146582- ac_status=$? 146583- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146584- (exit $ac_status); }; }; then 146585- eval "$as_ac_Lib=yes" 146586-else 146587- echo "$as_me: failed program was:" >&5 146588-sed 's/^/| /' conftest.$ac_ext >&5 146589- 146590-eval "$as_ac_Lib=no" 146591-fi 146592-rm -f conftest.err conftest.$ac_objext \ 146593- conftest$ac_exeext conftest.$ac_ext 146594-LIBS=$ac_check_lib_save_LIBS 146595-fi 146596-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 146597-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 146598-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 146599+ builtin and then its argument prototype would still apply. */ 146600+char libiconv(); 146601+ 146602+int main() { 146603+libiconv() 146604+; return 0; } 146605+EOF 146606+if { (eval echo configure:99577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 146607+ rm -rf conftest* 146608+ eval "ac_cv_lib_$ac_lib_var=yes" 146609+else 146610+ echo "configure: failed program was:" >&5 146611+ cat conftest.$ac_ext >&5 146612+ rm -rf conftest* 146613+ eval "ac_cv_lib_$ac_lib_var=no" 146614+fi 146615+rm -f conftest* 146616+LIBS="$ac_save_LIBS" 146617 146618+fi 146619+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 146620+ echo "$ac_t""yes" 1>&6 146621+ 146622 LDFLAGS=$save_old_LDFLAGS 146623 ext_shared=$save_ext_shared 146624- 146625+ 146626 found_iconv=yes 146627- 146628+ 146629 echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h 146630 146631- 146632-cat >>confdefs.h <<\_ACEOF 146633+ cat >> confdefs.h <<\EOF 146634 #define HAVE_LIBICONV 1 146635-_ACEOF 146636- 146637+EOF 146638 146639+ 146640 echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h 146641 146642- 146643-cat >>confdefs.h <<\_ACEOF 146644+ cat >> confdefs.h <<\EOF 146645 #define ICONV_ALIASED_LIBICONV 1 146646-_ACEOF 146647- 146648- 146649+EOF 146650 146651+ 146652+ 146653 else 146654+ echo "$ac_t""no" 1>&6 146655 146656 LDFLAGS=$save_old_LDFLAGS 146657 ext_shared=$save_ext_shared 146658 unset ac_cv_lib_$iconv_lib_name_libiconv 146659- 146660- 146661+ 146662+ 146663 save_old_LDFLAGS=$LDFLAGS 146664 ac_stuff=" 146665 -L$ICONV_DIR/$PHP_LIBDIR 146666 " 146667- 146668+ 146669 save_ext_shared=$ext_shared 146670 ext_shared=yes 146671- 146672+ 146673 for ac_i in $ac_stuff; do 146674 case $ac_i in 146675 -pthread) 146676 if test "$ext_shared" = "yes"; then 146677 LDFLAGS="$LDFLAGS -pthread" 146678 else 146679- 146680- 146681+ 146682+ 146683 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 146684- 146685+ 146686 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 146687 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146688 eval "EXTRA_LDFLAGS$unique=set" 146689@@ -127512,20 +99645,20 @@ 146690 ;; 146691 -l*) 146692 ac_ii=`echo $ac_i|cut -c 3-` 146693- 146694- 146695+ 146696+ 146697 case $ac_ii in 146698 c|c_r|pthread*) ;; 146699- *) 146700+ *) 146701 if test "$ext_shared" = "yes"; then 146702- LDFLAGS="$LDFLAGS -l$ac_ii" 146703+ LDFLAGS="$LDFLAGS -l$ac_ii" 146704 else 146705- 146706- 146707+ 146708+ 146709 case $ac_ii in 146710 c|c_r|pthread*) ;; 146711- *) 146712- LIBS="$LIBS -l$ac_ii" 146713+ *) 146714+ LIBS="$LIBS -l$ac_ii" 146715 ;; 146716 esac 146717 146718@@ -127538,235 +99671,204 @@ 146719 ;; 146720 -L*) 146721 ac_ii=`echo $ac_i|cut -c 3-` 146722- 146723+ 146724 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 146725- 146726+ 146727 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 146728 ai_p=$ac_ii 146729 else 146730- 146731+ 146732 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 146733- 146734+ 146735 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 146736 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 146737 fi 146738 146739- 146740+ 146741 if test "$ext_shared" = "yes"; then 146742 LDFLAGS="-L$ai_p $LDFLAGS" 146743 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 146744 else 146745- 146746- 146747- 146748+ 146749+ 146750+ 146751 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 146752- 146753+ 146754 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 146755 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146756 eval "LIBPATH$unique=set" 146757- 146758+ 146759 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 146760 LDFLAGS="$LDFLAGS -L$ai_p" 146761 PHP_RPATHS="$PHP_RPATHS $ai_p" 146762- 146763+ 146764 fi 146765 146766 146767 fi 146768- 146769+ 146770 fi 146771 146772 ;; 146773 esac 146774 done 146775 146776- as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh` 146777-echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5 146778-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6 146779-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 146780- echo $ECHO_N "(cached) $ECHO_C" >&6 146781+ echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 146782+echo "configure:99718: checking for iconv in -l$iconv_lib_name" >&5 146783+ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` 146784+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 146785+ echo $ac_n "(cached) $ac_c" 1>&6 146786 else 146787- ac_check_lib_save_LIBS=$LIBS 146788+ ac_save_LIBS="$LIBS" 146789 LIBS="-l$iconv_lib_name $LIBS" 146790-cat >conftest.$ac_ext <<_ACEOF 146791-/* confdefs.h. */ 146792-_ACEOF 146793-cat confdefs.h >>conftest.$ac_ext 146794-cat >>conftest.$ac_ext <<_ACEOF 146795-/* end confdefs.h. */ 146796- 146797+cat > conftest.$ac_ext <<EOF 146798+#line 99726 "configure" 146799+#include "confdefs.h" 146800 /* Override any gcc2 internal prototype to avoid an error. */ 146801-#ifdef __cplusplus 146802-extern "C" 146803-#endif 146804 /* We use char because int might match the return type of a gcc2 146805- builtin and then its argument prototype would still apply. */ 146806-char iconv (); 146807-int 146808-main () 146809-{ 146810-iconv (); 146811- ; 146812- return 0; 146813-} 146814-_ACEOF 146815-rm -f conftest.$ac_objext conftest$ac_exeext 146816-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 146817- (eval $ac_link) 2>conftest.er1 146818- ac_status=$? 146819- grep -v '^ *+' conftest.er1 >conftest.err 146820- rm -f conftest.er1 146821- cat conftest.err >&5 146822- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146823- (exit $ac_status); } && 146824- { ac_try='test -z "$ac_c_werror_flag" 146825- || test ! -s conftest.err' 146826- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146827- (eval $ac_try) 2>&5 146828- ac_status=$? 146829- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146830- (exit $ac_status); }; } && 146831- { ac_try='test -s conftest$ac_exeext' 146832- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 146833- (eval $ac_try) 2>&5 146834- ac_status=$? 146835- echo "$as_me:$LINENO: \$? = $ac_status" >&5 146836- (exit $ac_status); }; }; then 146837- eval "$as_ac_Lib=yes" 146838-else 146839- echo "$as_me: failed program was:" >&5 146840-sed 's/^/| /' conftest.$ac_ext >&5 146841- 146842-eval "$as_ac_Lib=no" 146843-fi 146844-rm -f conftest.err conftest.$ac_objext \ 146845- conftest$ac_exeext conftest.$ac_ext 146846-LIBS=$ac_check_lib_save_LIBS 146847-fi 146848-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 146849-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 146850-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 146851+ builtin and then its argument prototype would still apply. */ 146852+char iconv(); 146853+ 146854+int main() { 146855+iconv() 146856+; return 0; } 146857+EOF 146858+if { (eval echo configure:99737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 146859+ rm -rf conftest* 146860+ eval "ac_cv_lib_$ac_lib_var=yes" 146861+else 146862+ echo "configure: failed program was:" >&5 146863+ cat conftest.$ac_ext >&5 146864+ rm -rf conftest* 146865+ eval "ac_cv_lib_$ac_lib_var=no" 146866+fi 146867+rm -f conftest* 146868+LIBS="$ac_save_LIBS" 146869 146870+fi 146871+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 146872+ echo "$ac_t""yes" 1>&6 146873+ 146874 LDFLAGS=$save_old_LDFLAGS 146875 ext_shared=$save_ext_shared 146876- 146877+ 146878 found_iconv=yes 146879- 146880- 146881+ 146882+ 146883 else 146884+ echo "$ac_t""no" 1>&6 146885 146886 LDFLAGS=$save_old_LDFLAGS 146887 ext_shared=$save_ext_shared 146888 unset ac_cv_lib_$iconv_lib_name_iconv 146889- 146890- 146891+ 146892+ 146893 fi 146894 146895- 146896- 146897+ 146898+ 146899 fi 146900 146901 fi 146902 fi 146903 146904 if test "$found_iconv" = "yes"; then 146905- 146906+ 146907 echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h 146908 146909- 146910-cat >>confdefs.h <<\_ACEOF 146911+ cat >> confdefs.h <<\EOF 146912 #define HAVE_ICONV 1 146913-_ACEOF 146914+EOF 146915 146916 if test -n "$ICONV_DIR"; then 146917- 146918+ 146919 146920 if test "$ext_shared" = "yes"; then 146921 XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" 146922 if test -n "$ICONV_DIR/$PHP_LIBDIR"; then 146923- 146924+ 146925 if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then 146926- 146927+ 146928 if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 146929 ai_p=$ICONV_DIR/$PHP_LIBDIR 146930 else 146931- 146932+ 146933 ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 146934- 146935+ 146936 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 146937 ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" 146938 fi 146939 146940- 146941+ 146942 if test "$ext_shared" = "yes"; then 146943 XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" 146944 test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" 146945 else 146946- 146947- 146948- 146949+ 146950+ 146951+ 146952 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 146953- 146954+ 146955 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 146956 if test -n "$unique" && test "`eval $cmd`" = "" ; then 146957 eval "LIBPATH$unique=set" 146958- 146959+ 146960 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 146961 LDFLAGS="$LDFLAGS -L$ai_p" 146962 PHP_RPATHS="$PHP_RPATHS $ai_p" 146963- 146964+ 146965 fi 146966 146967 146968 fi 146969- 146970+ 146971 fi 146972 146973 fi 146974 else 146975- 146976+ 146977 146978 if test -n "$ICONV_DIR/$PHP_LIBDIR"; then 146979- 146980+ 146981 if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then 146982- 146983+ 146984 if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 146985 ai_p=$ICONV_DIR/$PHP_LIBDIR 146986 else 146987- 146988+ 146989 ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 146990- 146991+ 146992 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 146993 ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" 146994 fi 146995 146996- 146997- 146998- 146999- 147000+ 147001+ 147002+ 147003+ 147004 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 147005- 147006+ 147007 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 147008 if test -n "$unique" && test "`eval $cmd`" = "" ; then 147009 eval "LIBPATH$unique=set" 147010- 147011+ 147012 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 147013 LDFLAGS="$LDFLAGS -L$ai_p" 147014 PHP_RPATHS="$PHP_RPATHS $ai_p" 147015- 147016+ 147017 fi 147018 147019 147020- 147021+ 147022 fi 147023 147024 fi 147025- 147026- 147027+ 147028+ 147029 case $iconv_lib_name in 147030 c|c_r|pthread*) ;; 147031- *) 147032- LIBS="-l$iconv_lib_name $LIBS" 147033+ *) 147034+ LIBS="-l$iconv_lib_name $LIBS" 147035 ;; 147036 esac 147037 147038@@ -127776,284 +99878,170 @@ 147039 fi 147040 147041 147042- 147043+ 147044 if test "$ICONV_DIR/include" != "/usr/include"; then 147045- 147046+ 147047 if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then 147048 ai_p=$ICONV_DIR/include 147049 else 147050- 147051+ 147052 ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 147053- 147054+ 147055 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 147056 ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" 147057 fi 147058 147059- 147060- 147061+ 147062+ 147063 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 147064- 147065+ 147066 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 147067 if test -n "$unique" && test "`eval $cmd`" = "" ; then 147068 eval "INCLUDEPATH$unique=set" 147069- 147070+ 147071 if test ""; then 147072 INCLUDES="-I$ai_p $INCLUDES" 147073 else 147074 INCLUDES="$INCLUDES -I$ai_p" 147075 fi 147076- 147077+ 147078 fi 147079 147080 fi 147081 147082 fi 147083- 147084-else 147085- { { echo "$as_me:$LINENO: error: iconv not found, in order to build xmlrpc you need the iconv library" >&5 147086-echo "$as_me: error: iconv not found, in order to build xmlrpc you need the iconv library" >&2;} 147087- { (exit 1); exit 1; }; } 147088- 147089+ 147090+else 147091+ { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } 147092+ 147093 fi 147094 147095 fi 147096 fi 147097 147098 if test "$PHP_XMLRPC" = "yes"; then 147099- if test -n "$ac_tool_prefix"; then 147100- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 147101-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 147102-echo "$as_me:$LINENO: checking for $ac_word" >&5 147103-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 147104-if test "${ac_cv_prog_RANLIB+set}" = set; then 147105- echo $ECHO_N "(cached) $ECHO_C" >&6 147106+ # Extract the first word of "ranlib", so it can be a program name with args. 147107+set dummy ranlib; ac_word=$2 147108+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 147109+echo "configure:99927: checking for $ac_word" >&5 147110+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 147111+ echo $ac_n "(cached) $ac_c" 1>&6 147112 else 147113 if test -n "$RANLIB"; then 147114 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. 147115 else 147116-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 147117-for as_dir in $PATH 147118-do 147119- IFS=$as_save_IFS 147120- test -z "$as_dir" && as_dir=. 147121- for ac_exec_ext in '' $ac_executable_extensions; do 147122- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 147123- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 147124- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 147125- break 2 147126- fi 147127-done 147128-done 147129- 147130+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 147131+ ac_dummy="$PATH" 147132+ for ac_dir in $ac_dummy; do 147133+ test -z "$ac_dir" && ac_dir=. 147134+ if test -f $ac_dir/$ac_word; then 147135+ ac_cv_prog_RANLIB="ranlib" 147136+ break 147137+ fi 147138+ done 147139+ IFS="$ac_save_ifs" 147140+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" 147141 fi 147142 fi 147143-RANLIB=$ac_cv_prog_RANLIB 147144+RANLIB="$ac_cv_prog_RANLIB" 147145 if test -n "$RANLIB"; then 147146- echo "$as_me:$LINENO: result: $RANLIB" >&5 147147-echo "${ECHO_T}$RANLIB" >&6 147148-else 147149- echo "$as_me:$LINENO: result: no" >&5 147150-echo "${ECHO_T}no" >&6 147151-fi 147152- 147153-fi 147154-if test -z "$ac_cv_prog_RANLIB"; then 147155- ac_ct_RANLIB=$RANLIB 147156- # Extract the first word of "ranlib", so it can be a program name with args. 147157-set dummy ranlib; ac_word=$2 147158-echo "$as_me:$LINENO: checking for $ac_word" >&5 147159-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 147160-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 147161- echo $ECHO_N "(cached) $ECHO_C" >&6 147162-else 147163- if test -n "$ac_ct_RANLIB"; then 147164- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. 147165-else 147166-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 147167-for as_dir in $PATH 147168-do 147169- IFS=$as_save_IFS 147170- test -z "$as_dir" && as_dir=. 147171- for ac_exec_ext in '' $ac_executable_extensions; do 147172- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 147173- ac_cv_prog_ac_ct_RANLIB="ranlib" 147174- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 147175- break 2 147176- fi 147177-done 147178-done 147179- 147180- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" 147181-fi 147182-fi 147183-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 147184-if test -n "$ac_ct_RANLIB"; then 147185- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 147186-echo "${ECHO_T}$ac_ct_RANLIB" >&6 147187+ echo "$ac_t""$RANLIB" 1>&6 147188 else 147189- echo "$as_me:$LINENO: result: no" >&5 147190-echo "${ECHO_T}no" >&6 147191+ echo "$ac_t""no" 1>&6 147192 fi 147193 147194- RANLIB=$ac_ct_RANLIB 147195-else 147196- RANLIB="$ac_cv_prog_RANLIB" 147197-fi 147198- 147199-echo "$as_me:$LINENO: checking for inline" >&5 147200-echo $ECHO_N "checking for inline... $ECHO_C" >&6 147201-if test "${ac_cv_c_inline+set}" = set; then 147202- echo $ECHO_N "(cached) $ECHO_C" >&6 147203+echo $ac_n "checking for inline""... $ac_c" 1>&6 147204+echo "configure:99955: checking for inline" >&5 147205+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then 147206+ echo $ac_n "(cached) $ac_c" 1>&6 147207 else 147208 ac_cv_c_inline=no 147209 for ac_kw in inline __inline__ __inline; do 147210- cat >conftest.$ac_ext <<_ACEOF 147211-/* confdefs.h. */ 147212-_ACEOF 147213-cat confdefs.h >>conftest.$ac_ext 147214-cat >>conftest.$ac_ext <<_ACEOF 147215-/* end confdefs.h. */ 147216-#ifndef __cplusplus 147217-typedef int foo_t; 147218-static $ac_kw foo_t static_foo () {return 0; } 147219-$ac_kw foo_t foo () {return 0; } 147220-#endif 147221- 147222-_ACEOF 147223-rm -f conftest.$ac_objext 147224-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147225- (eval $ac_compile) 2>conftest.er1 147226- ac_status=$? 147227- grep -v '^ *+' conftest.er1 >conftest.err 147228- rm -f conftest.er1 147229- cat conftest.err >&5 147230- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147231- (exit $ac_status); } && 147232- { ac_try='test -z "$ac_c_werror_flag" 147233- || test ! -s conftest.err' 147234- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147235- (eval $ac_try) 2>&5 147236- ac_status=$? 147237- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147238- (exit $ac_status); }; } && 147239- { ac_try='test -s conftest.$ac_objext' 147240- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147241- (eval $ac_try) 2>&5 147242- ac_status=$? 147243- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147244- (exit $ac_status); }; }; then 147245+ cat > conftest.$ac_ext <<EOF 147246+#line 99962 "configure" 147247+#include "confdefs.h" 147248+ 147249+int main() { 147250+} $ac_kw foo() { 147251+; return 0; } 147252+EOF 147253+if { (eval echo configure:99969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 147254+ rm -rf conftest* 147255 ac_cv_c_inline=$ac_kw; break 147256 else 147257- echo "$as_me: failed program was:" >&5 147258-sed 's/^/| /' conftest.$ac_ext >&5 147259- 147260+ echo "configure: failed program was:" >&5 147261+ cat conftest.$ac_ext >&5 147262 fi 147263-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147264+rm -f conftest* 147265 done 147266 147267 fi 147268-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 147269-echo "${ECHO_T}$ac_cv_c_inline" >&6 147270- 147271 147272-case $ac_cv_c_inline in 147273+echo "$ac_t""$ac_cv_c_inline" 1>&6 147274+case "$ac_cv_c_inline" in 147275 inline | yes) ;; 147276- *) 147277- case $ac_cv_c_inline in 147278- no) ac_val=;; 147279- *) ac_val=$ac_cv_c_inline;; 147280- esac 147281- cat >>confdefs.h <<_ACEOF 147282-#ifndef __cplusplus 147283-#define inline $ac_val 147284-#endif 147285-_ACEOF 147286- ;; 147287+ no) cat >> confdefs.h <<\EOF 147288+#define inline 147289+EOF 147290+ ;; 147291+ *) cat >> confdefs.h <<EOF 147292+#define inline $ac_cv_c_inline 147293+EOF 147294+ ;; 147295 esac 147296 147297+ 147298 147299 147300 147301 147302 147303- 147304- 147305-cat >>confdefs.h <<\_ACEOF 147306-#define UNDEF_THREADS_HACK 147307-_ACEOF 147308+cat >> confdefs.h <<\EOF 147309+#define UNDEF_THREADS_HACK 147310+EOF 147311 147312 147313 147314-echo "$as_me:$LINENO: checking for ANSI C header files" >&5 147315-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 147316-if test "${ac_cv_header_stdc+set}" = set; then 147317- echo $ECHO_N "(cached) $ECHO_C" >&6 147318-else 147319- cat >conftest.$ac_ext <<_ACEOF 147320-/* confdefs.h. */ 147321-_ACEOF 147322-cat confdefs.h >>conftest.$ac_ext 147323-cat >>conftest.$ac_ext <<_ACEOF 147324-/* end confdefs.h. */ 147325+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 147326+echo "configure:100007: checking for ANSI C header files" >&5 147327+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 147328+ echo $ac_n "(cached) $ac_c" 1>&6 147329+else 147330+ cat > conftest.$ac_ext <<EOF 147331+#line 100012 "configure" 147332+#include "confdefs.h" 147333 #include <stdlib.h> 147334 #include <stdarg.h> 147335 #include <string.h> 147336 #include <float.h> 147337- 147338-int 147339-main () 147340-{ 147341- 147342- ; 147343- return 0; 147344-} 147345-_ACEOF 147346-rm -f conftest.$ac_objext 147347-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147348- (eval $ac_compile) 2>conftest.er1 147349- ac_status=$? 147350- grep -v '^ *+' conftest.er1 >conftest.err 147351- rm -f conftest.er1 147352- cat conftest.err >&5 147353- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147354- (exit $ac_status); } && 147355- { ac_try='test -z "$ac_c_werror_flag" 147356- || test ! -s conftest.err' 147357- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147358- (eval $ac_try) 2>&5 147359- ac_status=$? 147360- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147361- (exit $ac_status); }; } && 147362- { ac_try='test -s conftest.$ac_objext' 147363- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147364- (eval $ac_try) 2>&5 147365- ac_status=$? 147366- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147367- (exit $ac_status); }; }; then 147368+EOF 147369+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 147370+{ (eval echo configure:100020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 147371+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 147372+if test -z "$ac_err"; then 147373+ rm -rf conftest* 147374 ac_cv_header_stdc=yes 147375 else 147376- echo "$as_me: failed program was:" >&5 147377-sed 's/^/| /' conftest.$ac_ext >&5 147378- 147379-ac_cv_header_stdc=no 147380+ echo "$ac_err" >&5 147381+ echo "configure: failed program was:" >&5 147382+ cat conftest.$ac_ext >&5 147383+ rm -rf conftest* 147384+ ac_cv_header_stdc=no 147385 fi 147386-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147387+rm -f conftest* 147388 147389 if test $ac_cv_header_stdc = yes; then 147390 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 147391- cat >conftest.$ac_ext <<_ACEOF 147392-/* confdefs.h. */ 147393-_ACEOF 147394-cat confdefs.h >>conftest.$ac_ext 147395-cat >>conftest.$ac_ext <<_ACEOF 147396-/* end confdefs.h. */ 147397+cat > conftest.$ac_ext <<EOF 147398+#line 100037 "configure" 147399+#include "confdefs.h" 147400 #include <string.h> 147401- 147402-_ACEOF 147403+EOF 147404 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 147405- $EGREP "memchr" >/dev/null 2>&1; then 147406+ egrep "memchr" >/dev/null 2>&1; then 147407 : 147408 else 147409+ rm -rf conftest* 147410 ac_cv_header_stdc=no 147411 fi 147412 rm -f conftest* 147413@@ -128062,19 +100050,16 @@ 147414 147415 if test $ac_cv_header_stdc = yes; then 147416 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 147417- cat >conftest.$ac_ext <<_ACEOF 147418-/* confdefs.h. */ 147419-_ACEOF 147420-cat confdefs.h >>conftest.$ac_ext 147421-cat >>conftest.$ac_ext <<_ACEOF 147422-/* end confdefs.h. */ 147423+cat > conftest.$ac_ext <<EOF 147424+#line 100055 "configure" 147425+#include "confdefs.h" 147426 #include <stdlib.h> 147427- 147428-_ACEOF 147429+EOF 147430 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 147431- $EGREP "free" >/dev/null 2>&1; then 147432+ egrep "free" >/dev/null 2>&1; then 147433 : 147434 else 147435+ rm -rf conftest* 147436 ac_cv_header_stdc=no 147437 fi 147438 rm -f conftest* 147439@@ -128083,225 +100068,82 @@ 147440 147441 if test $ac_cv_header_stdc = yes; then 147442 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 147443- if test "$cross_compiling" = yes; then 147444+if test "$cross_compiling" = yes; then 147445 : 147446 else 147447- cat >conftest.$ac_ext <<_ACEOF 147448-/* confdefs.h. */ 147449-_ACEOF 147450-cat confdefs.h >>conftest.$ac_ext 147451-cat >>conftest.$ac_ext <<_ACEOF 147452-/* end confdefs.h. */ 147453+ cat > conftest.$ac_ext <<EOF 147454+#line 100076 "configure" 147455+#include "confdefs.h" 147456 #include <ctype.h> 147457-#if ((' ' & 0x0FF) == 0x020) 147458-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 147459-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 147460-#else 147461-# define ISLOWER(c) \ 147462- (('a' <= (c) && (c) <= 'i') \ 147463- || ('j' <= (c) && (c) <= 'r') \ 147464- || ('s' <= (c) && (c) <= 'z')) 147465-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) 147466-#endif 147467- 147468+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 147469+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 147470 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 147471-int 147472-main () 147473-{ 147474- int i; 147475- for (i = 0; i < 256; i++) 147476- if (XOR (islower (i), ISLOWER (i)) 147477- || toupper (i) != TOUPPER (i)) 147478- exit(2); 147479- exit (0); 147480-} 147481-_ACEOF 147482-rm -f conftest$ac_exeext 147483-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 147484- (eval $ac_link) 2>&5 147485- ac_status=$? 147486- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147487- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 147488- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147489- (eval $ac_try) 2>&5 147490- ac_status=$? 147491- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147492- (exit $ac_status); }; }; then 147493+int main () { int i; for (i = 0; i < 256; i++) 147494+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 147495+exit (0); } 147496+ 147497+EOF 147498+if { (eval echo configure:100087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 147499+then 147500 : 147501 else 147502- echo "$as_me: program exited with status $ac_status" >&5 147503-echo "$as_me: failed program was:" >&5 147504-sed 's/^/| /' conftest.$ac_ext >&5 147505- 147506-( exit $ac_status ) 147507-ac_cv_header_stdc=no 147508+ echo "configure: failed program was:" >&5 147509+ cat conftest.$ac_ext >&5 147510+ rm -fr conftest* 147511+ ac_cv_header_stdc=no 147512 fi 147513-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 147514+rm -fr conftest* 147515 fi 147516+ 147517 fi 147518 fi 147519-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 147520-echo "${ECHO_T}$ac_cv_header_stdc" >&6 147521-if test $ac_cv_header_stdc = yes; then 147522 147523-cat >>confdefs.h <<\_ACEOF 147524+echo "$ac_t""$ac_cv_header_stdc" 1>&6 147525+if test $ac_cv_header_stdc = yes; then 147526+ cat >> confdefs.h <<\EOF 147527 #define STDC_HEADERS 1 147528-_ACEOF 147529+EOF 147530 147531 fi 147532 147533- 147534- 147535- 147536- 147537- 147538-for ac_header in xmlparse.h xmltok.h stdlib.h strings.h string.h 147539+for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h 147540 do 147541-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 147542-if eval "test \"\${$as_ac_Header+set}\" = set"; then 147543- echo "$as_me:$LINENO: checking for $ac_header" >&5 147544-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 147545-if eval "test \"\${$as_ac_Header+set}\" = set"; then 147546- echo $ECHO_N "(cached) $ECHO_C" >&6 147547-fi 147548-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 147549-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 147550-else 147551- # Is the header compilable? 147552-echo "$as_me:$LINENO: checking $ac_header usability" >&5 147553-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 147554-cat >conftest.$ac_ext <<_ACEOF 147555-/* confdefs.h. */ 147556-_ACEOF 147557-cat confdefs.h >>conftest.$ac_ext 147558-cat >>conftest.$ac_ext <<_ACEOF 147559-/* end confdefs.h. */ 147560-$ac_includes_default 147561-#include <$ac_header> 147562-_ACEOF 147563-rm -f conftest.$ac_objext 147564-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147565- (eval $ac_compile) 2>conftest.er1 147566- ac_status=$? 147567- grep -v '^ *+' conftest.er1 >conftest.err 147568- rm -f conftest.er1 147569- cat conftest.err >&5 147570- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147571- (exit $ac_status); } && 147572- { ac_try='test -z "$ac_c_werror_flag" 147573- || test ! -s conftest.err' 147574- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147575- (eval $ac_try) 2>&5 147576- ac_status=$? 147577- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147578- (exit $ac_status); }; } && 147579- { ac_try='test -s conftest.$ac_objext' 147580- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147581- (eval $ac_try) 2>&5 147582- ac_status=$? 147583- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147584- (exit $ac_status); }; }; then 147585- ac_header_compiler=yes 147586-else 147587- echo "$as_me: failed program was:" >&5 147588-sed 's/^/| /' conftest.$ac_ext >&5 147589- 147590-ac_header_compiler=no 147591-fi 147592-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147593-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 147594-echo "${ECHO_T}$ac_header_compiler" >&6 147595- 147596-# Is the header present? 147597-echo "$as_me:$LINENO: checking $ac_header presence" >&5 147598-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 147599-cat >conftest.$ac_ext <<_ACEOF 147600-/* confdefs.h. */ 147601-_ACEOF 147602-cat confdefs.h >>conftest.$ac_ext 147603-cat >>conftest.$ac_ext <<_ACEOF 147604-/* end confdefs.h. */ 147605-#include <$ac_header> 147606-_ACEOF 147607-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 147608- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 147609- ac_status=$? 147610- grep -v '^ *+' conftest.er1 >conftest.err 147611- rm -f conftest.er1 147612- cat conftest.err >&5 147613- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147614- (exit $ac_status); } >/dev/null; then 147615- if test -s conftest.err; then 147616- ac_cpp_err=$ac_c_preproc_warn_flag 147617- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 147618- else 147619- ac_cpp_err= 147620- fi 147621-else 147622- ac_cpp_err=yes 147623-fi 147624-if test -z "$ac_cpp_err"; then 147625- ac_header_preproc=yes 147626-else 147627- echo "$as_me: failed program was:" >&5 147628-sed 's/^/| /' conftest.$ac_ext >&5 147629- 147630- ac_header_preproc=no 147631-fi 147632-rm -f conftest.err conftest.$ac_ext 147633-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 147634-echo "${ECHO_T}$ac_header_preproc" >&6 147635- 147636-# So? What about this header? 147637-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 147638- yes:no: ) 147639- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 147640-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 147641- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 147642-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 147643- ac_header_preproc=yes 147644- ;; 147645- no:yes:* ) 147646- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 147647-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 147648- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 147649-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 147650- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 147651-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 147652- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 147653-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 147654- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 147655-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 147656- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 147657-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 147658- ( 147659- cat <<\_ASBOX 147660-## ------------------------------------------ ## 147661-## Report this to the AC_PACKAGE_NAME lists. ## 147662-## ------------------------------------------ ## 147663-_ASBOX 147664- ) | 147665- sed "s/^/$as_me: WARNING: /" >&2 147666- ;; 147667-esac 147668-echo "$as_me:$LINENO: checking for $ac_header" >&5 147669-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 147670-if eval "test \"\${$as_ac_Header+set}\" = set"; then 147671- echo $ECHO_N "(cached) $ECHO_C" >&6 147672+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 147673+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 147674+echo "configure:100114: checking for $ac_hdr" >&5 147675+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 147676+ echo $ac_n "(cached) $ac_c" 1>&6 147677+else 147678+ cat > conftest.$ac_ext <<EOF 147679+#line 100119 "configure" 147680+#include "confdefs.h" 147681+#include <$ac_hdr> 147682+EOF 147683+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 147684+{ (eval echo configure:100124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 147685+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 147686+if test -z "$ac_err"; then 147687+ rm -rf conftest* 147688+ eval "ac_cv_header_$ac_safe=yes" 147689 else 147690- eval "$as_ac_Header=\$ac_header_preproc" 147691+ echo "$ac_err" >&5 147692+ echo "configure: failed program was:" >&5 147693+ cat conftest.$ac_ext >&5 147694+ rm -rf conftest* 147695+ eval "ac_cv_header_$ac_safe=no" 147696 fi 147697-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 147698-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 147699- 147700+rm -f conftest* 147701 fi 147702-if test `eval echo '${'$as_ac_Header'}'` = yes; then 147703- cat >>confdefs.h <<_ACEOF 147704-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 147705-_ACEOF 147706- 147707+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 147708+ echo "$ac_t""yes" 1>&6 147709+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 147710+ cat >> confdefs.h <<EOF 147711+#define $ac_tr_hdr 1 147712+EOF 147713+ 147714+else 147715+ echo "$ac_t""no" 1>&6 147716 fi 147717- 147718 done 147719 147720 147721@@ -128309,1829 +100151,262 @@ 147722 147723 147724 147725-echo "$as_me:$LINENO: checking for char" >&5 147726-echo $ECHO_N "checking for char... $ECHO_C" >&6 147727-if test "${ac_cv_type_char+set}" = set; then 147728- echo $ECHO_N "(cached) $ECHO_C" >&6 147729-else 147730- cat >conftest.$ac_ext <<_ACEOF 147731-/* confdefs.h. */ 147732-_ACEOF 147733-cat confdefs.h >>conftest.$ac_ext 147734-cat >>conftest.$ac_ext <<_ACEOF 147735-/* end confdefs.h. */ 147736-$ac_includes_default 147737-int 147738-main () 147739-{ 147740-if ((char *) 0) 147741- return 0; 147742-if (sizeof (char)) 147743- return 0; 147744- ; 147745- return 0; 147746-} 147747-_ACEOF 147748-rm -f conftest.$ac_objext 147749-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147750- (eval $ac_compile) 2>conftest.er1 147751- ac_status=$? 147752- grep -v '^ *+' conftest.er1 >conftest.err 147753- rm -f conftest.er1 147754- cat conftest.err >&5 147755- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147756- (exit $ac_status); } && 147757- { ac_try='test -z "$ac_c_werror_flag" 147758- || test ! -s conftest.err' 147759- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147760- (eval $ac_try) 2>&5 147761- ac_status=$? 147762- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147763- (exit $ac_status); }; } && 147764- { ac_try='test -s conftest.$ac_objext' 147765- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147766- (eval $ac_try) 2>&5 147767- ac_status=$? 147768- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147769- (exit $ac_status); }; }; then 147770- ac_cv_type_char=yes 147771-else 147772- echo "$as_me: failed program was:" >&5 147773-sed 's/^/| /' conftest.$ac_ext >&5 147774- 147775-ac_cv_type_char=no 147776-fi 147777-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147778-fi 147779-echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 147780-echo "${ECHO_T}$ac_cv_type_char" >&6 147781- 147782-echo "$as_me:$LINENO: checking size of char" >&5 147783-echo $ECHO_N "checking size of char... $ECHO_C" >&6 147784-if test "${ac_cv_sizeof_char+set}" = set; then 147785- echo $ECHO_N "(cached) $ECHO_C" >&6 147786-else 147787- if test "$ac_cv_type_char" = yes; then 147788- # The cast to unsigned long works around a bug in the HP C Compiler 147789- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 147790- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 147791- # This bug is HP SR number 8606223364. 147792- if test "$cross_compiling" = yes; then 147793- # Depending upon the size, compute the lo and hi bounds. 147794-cat >conftest.$ac_ext <<_ACEOF 147795-/* confdefs.h. */ 147796-_ACEOF 147797-cat confdefs.h >>conftest.$ac_ext 147798-cat >>conftest.$ac_ext <<_ACEOF 147799-/* end confdefs.h. */ 147800-$ac_includes_default 147801-int 147802-main () 147803-{ 147804-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; 147805-test_array [0] = 0 147806- 147807- ; 147808- return 0; 147809-} 147810-_ACEOF 147811-rm -f conftest.$ac_objext 147812-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147813- (eval $ac_compile) 2>conftest.er1 147814- ac_status=$? 147815- grep -v '^ *+' conftest.er1 >conftest.err 147816- rm -f conftest.er1 147817- cat conftest.err >&5 147818- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147819- (exit $ac_status); } && 147820- { ac_try='test -z "$ac_c_werror_flag" 147821- || test ! -s conftest.err' 147822- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147823- (eval $ac_try) 2>&5 147824- ac_status=$? 147825- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147826- (exit $ac_status); }; } && 147827- { ac_try='test -s conftest.$ac_objext' 147828- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147829- (eval $ac_try) 2>&5 147830- ac_status=$? 147831- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147832- (exit $ac_status); }; }; then 147833- ac_lo=0 ac_mid=0 147834- while :; do 147835- cat >conftest.$ac_ext <<_ACEOF 147836-/* confdefs.h. */ 147837-_ACEOF 147838-cat confdefs.h >>conftest.$ac_ext 147839-cat >>conftest.$ac_ext <<_ACEOF 147840-/* end confdefs.h. */ 147841-$ac_includes_default 147842-int 147843-main () 147844-{ 147845-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; 147846-test_array [0] = 0 147847- 147848- ; 147849- return 0; 147850-} 147851-_ACEOF 147852-rm -f conftest.$ac_objext 147853-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147854- (eval $ac_compile) 2>conftest.er1 147855- ac_status=$? 147856- grep -v '^ *+' conftest.er1 >conftest.err 147857- rm -f conftest.er1 147858- cat conftest.err >&5 147859- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147860- (exit $ac_status); } && 147861- { ac_try='test -z "$ac_c_werror_flag" 147862- || test ! -s conftest.err' 147863- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147864- (eval $ac_try) 2>&5 147865- ac_status=$? 147866- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147867- (exit $ac_status); }; } && 147868- { ac_try='test -s conftest.$ac_objext' 147869- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147870- (eval $ac_try) 2>&5 147871- ac_status=$? 147872- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147873- (exit $ac_status); }; }; then 147874- ac_hi=$ac_mid; break 147875-else 147876- echo "$as_me: failed program was:" >&5 147877-sed 's/^/| /' conftest.$ac_ext >&5 147878- 147879-ac_lo=`expr $ac_mid + 1` 147880- if test $ac_lo -le $ac_mid; then 147881- ac_lo= ac_hi= 147882- break 147883- fi 147884- ac_mid=`expr 2 '*' $ac_mid + 1` 147885-fi 147886-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147887- done 147888-else 147889- echo "$as_me: failed program was:" >&5 147890-sed 's/^/| /' conftest.$ac_ext >&5 147891- 147892-cat >conftest.$ac_ext <<_ACEOF 147893-/* confdefs.h. */ 147894-_ACEOF 147895-cat confdefs.h >>conftest.$ac_ext 147896-cat >>conftest.$ac_ext <<_ACEOF 147897-/* end confdefs.h. */ 147898-$ac_includes_default 147899-int 147900-main () 147901-{ 147902-static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; 147903-test_array [0] = 0 147904- 147905- ; 147906- return 0; 147907-} 147908-_ACEOF 147909-rm -f conftest.$ac_objext 147910-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147911- (eval $ac_compile) 2>conftest.er1 147912- ac_status=$? 147913- grep -v '^ *+' conftest.er1 >conftest.err 147914- rm -f conftest.er1 147915- cat conftest.err >&5 147916- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147917- (exit $ac_status); } && 147918- { ac_try='test -z "$ac_c_werror_flag" 147919- || test ! -s conftest.err' 147920- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147921- (eval $ac_try) 2>&5 147922- ac_status=$? 147923- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147924- (exit $ac_status); }; } && 147925- { ac_try='test -s conftest.$ac_objext' 147926- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147927- (eval $ac_try) 2>&5 147928- ac_status=$? 147929- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147930- (exit $ac_status); }; }; then 147931- ac_hi=-1 ac_mid=-1 147932- while :; do 147933- cat >conftest.$ac_ext <<_ACEOF 147934-/* confdefs.h. */ 147935-_ACEOF 147936-cat confdefs.h >>conftest.$ac_ext 147937-cat >>conftest.$ac_ext <<_ACEOF 147938-/* end confdefs.h. */ 147939-$ac_includes_default 147940-int 147941-main () 147942-{ 147943-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; 147944-test_array [0] = 0 147945- 147946- ; 147947- return 0; 147948-} 147949-_ACEOF 147950-rm -f conftest.$ac_objext 147951-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 147952- (eval $ac_compile) 2>conftest.er1 147953- ac_status=$? 147954- grep -v '^ *+' conftest.er1 >conftest.err 147955- rm -f conftest.er1 147956- cat conftest.err >&5 147957- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147958- (exit $ac_status); } && 147959- { ac_try='test -z "$ac_c_werror_flag" 147960- || test ! -s conftest.err' 147961- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147962- (eval $ac_try) 2>&5 147963- ac_status=$? 147964- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147965- (exit $ac_status); }; } && 147966- { ac_try='test -s conftest.$ac_objext' 147967- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 147968- (eval $ac_try) 2>&5 147969- ac_status=$? 147970- echo "$as_me:$LINENO: \$? = $ac_status" >&5 147971- (exit $ac_status); }; }; then 147972- ac_lo=$ac_mid; break 147973-else 147974- echo "$as_me: failed program was:" >&5 147975-sed 's/^/| /' conftest.$ac_ext >&5 147976- 147977-ac_hi=`expr '(' $ac_mid ')' - 1` 147978- if test $ac_mid -le $ac_hi; then 147979- ac_lo= ac_hi= 147980- break 147981- fi 147982- ac_mid=`expr 2 '*' $ac_mid` 147983-fi 147984-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147985- done 147986-else 147987- echo "$as_me: failed program was:" >&5 147988-sed 's/^/| /' conftest.$ac_ext >&5 147989- 147990-ac_lo= ac_hi= 147991-fi 147992-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147993-fi 147994-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 147995-# Binary search between lo and hi bounds. 147996-while test "x$ac_lo" != "x$ac_hi"; do 147997- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 147998- cat >conftest.$ac_ext <<_ACEOF 147999-/* confdefs.h. */ 148000-_ACEOF 148001-cat confdefs.h >>conftest.$ac_ext 148002-cat >>conftest.$ac_ext <<_ACEOF 148003-/* end confdefs.h. */ 148004-$ac_includes_default 148005-int 148006-main () 148007-{ 148008-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; 148009-test_array [0] = 0 148010- 148011- ; 148012- return 0; 148013-} 148014-_ACEOF 148015-rm -f conftest.$ac_objext 148016-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148017- (eval $ac_compile) 2>conftest.er1 148018- ac_status=$? 148019- grep -v '^ *+' conftest.er1 >conftest.err 148020- rm -f conftest.er1 148021- cat conftest.err >&5 148022- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148023- (exit $ac_status); } && 148024- { ac_try='test -z "$ac_c_werror_flag" 148025- || test ! -s conftest.err' 148026- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148027- (eval $ac_try) 2>&5 148028- ac_status=$? 148029- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148030- (exit $ac_status); }; } && 148031- { ac_try='test -s conftest.$ac_objext' 148032- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148033- (eval $ac_try) 2>&5 148034- ac_status=$? 148035- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148036- (exit $ac_status); }; }; then 148037- ac_hi=$ac_mid 148038-else 148039- echo "$as_me: failed program was:" >&5 148040-sed 's/^/| /' conftest.$ac_ext >&5 148041- 148042-ac_lo=`expr '(' $ac_mid ')' + 1` 148043-fi 148044-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148045-done 148046-case $ac_lo in 148047-?*) ac_cv_sizeof_char=$ac_lo;; 148048-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 148049-See \`config.log' for more details." >&5 148050-echo "$as_me: error: cannot compute sizeof (char), 77 148051-See \`config.log' for more details." >&2;} 148052- { (exit 1); exit 1; }; } ;; 148053-esac 148054+echo $ac_n "checking size of char""... $ac_c" 1>&6 148055+echo "configure:100156: checking size of char" >&5 148056+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then 148057+ echo $ac_n "(cached) $ac_c" 1>&6 148058 else 148059 if test "$cross_compiling" = yes; then 148060- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 148061-See \`config.log' for more details." >&5 148062-echo "$as_me: error: cannot run test program while cross compiling 148063-See \`config.log' for more details." >&2;} 148064- { (exit 1); exit 1; }; } 148065-else 148066- cat >conftest.$ac_ext <<_ACEOF 148067-/* confdefs.h. */ 148068-_ACEOF 148069-cat confdefs.h >>conftest.$ac_ext 148070-cat >>conftest.$ac_ext <<_ACEOF 148071-/* end confdefs.h. */ 148072-$ac_includes_default 148073-long longval () { return (long) (sizeof (char)); } 148074-unsigned long ulongval () { return (long) (sizeof (char)); } 148075+ ac_cv_sizeof_char=1 148076+else 148077+ cat > conftest.$ac_ext <<EOF 148078+#line 100164 "configure" 148079+#include "confdefs.h" 148080 #include <stdio.h> 148081-#include <stdlib.h> 148082-int 148083-main () 148084+main() 148085 { 148086- 148087- FILE *f = fopen ("conftest.val", "w"); 148088- if (! f) 148089- exit (1); 148090- if (((long) (sizeof (char))) < 0) 148091- { 148092- long i = longval (); 148093- if (i != ((long) (sizeof (char)))) 148094- exit (1); 148095- fprintf (f, "%ld\n", i); 148096- } 148097- else 148098- { 148099- unsigned long i = ulongval (); 148100- if (i != ((long) (sizeof (char)))) 148101- exit (1); 148102- fprintf (f, "%lu\n", i); 148103- } 148104- exit (ferror (f) || fclose (f) != 0); 148105- 148106- ; 148107- return 0; 148108+ FILE *f=fopen("conftestval", "w"); 148109+ if (!f) exit(1); 148110+ fprintf(f, "%d\n", sizeof(char)); 148111+ exit(0); 148112 } 148113-_ACEOF 148114-rm -f conftest$ac_exeext 148115-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 148116- (eval $ac_link) 2>&5 148117- ac_status=$? 148118- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148119- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 148120- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148121- (eval $ac_try) 2>&5 148122- ac_status=$? 148123- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148124- (exit $ac_status); }; }; then 148125- ac_cv_sizeof_char=`cat conftest.val` 148126-else 148127- echo "$as_me: program exited with status $ac_status" >&5 148128-echo "$as_me: failed program was:" >&5 148129-sed 's/^/| /' conftest.$ac_ext >&5 148130- 148131-( exit $ac_status ) 148132-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 148133-See \`config.log' for more details." >&5 148134-echo "$as_me: error: cannot compute sizeof (char), 77 148135-See \`config.log' for more details." >&2;} 148136- { (exit 1); exit 1; }; } 148137-fi 148138-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 148139-fi 148140-fi 148141-rm -f conftest.val 148142+EOF 148143+if { (eval echo configure:100175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 148144+then 148145+ ac_cv_sizeof_char=`cat conftestval` 148146 else 148147+ echo "configure: failed program was:" >&5 148148+ cat conftest.$ac_ext >&5 148149+ rm -fr conftest* 148150 ac_cv_sizeof_char=0 148151 fi 148152+rm -fr conftest* 148153+fi 148154+ 148155 fi 148156-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 148157-echo "${ECHO_T}$ac_cv_sizeof_char" >&6 148158-cat >>confdefs.h <<_ACEOF 148159+echo "$ac_t""$ac_cv_sizeof_char" 1>&6 148160+cat >> confdefs.h <<EOF 148161 #define SIZEOF_CHAR $ac_cv_sizeof_char 148162-_ACEOF 148163- 148164- 148165- 148166-echo "$as_me:$LINENO: checking for int" >&5 148167-echo $ECHO_N "checking for int... $ECHO_C" >&6 148168-if test "${ac_cv_type_int+set}" = set; then 148169- echo $ECHO_N "(cached) $ECHO_C" >&6 148170-else 148171- cat >conftest.$ac_ext <<_ACEOF 148172-/* confdefs.h. */ 148173-_ACEOF 148174-cat confdefs.h >>conftest.$ac_ext 148175-cat >>conftest.$ac_ext <<_ACEOF 148176-/* end confdefs.h. */ 148177-$ac_includes_default 148178-int 148179-main () 148180-{ 148181-if ((int *) 0) 148182- return 0; 148183-if (sizeof (int)) 148184- return 0; 148185- ; 148186- return 0; 148187-} 148188-_ACEOF 148189-rm -f conftest.$ac_objext 148190-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148191- (eval $ac_compile) 2>conftest.er1 148192- ac_status=$? 148193- grep -v '^ *+' conftest.er1 >conftest.err 148194- rm -f conftest.er1 148195- cat conftest.err >&5 148196- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148197- (exit $ac_status); } && 148198- { ac_try='test -z "$ac_c_werror_flag" 148199- || test ! -s conftest.err' 148200- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148201- (eval $ac_try) 2>&5 148202- ac_status=$? 148203- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148204- (exit $ac_status); }; } && 148205- { ac_try='test -s conftest.$ac_objext' 148206- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148207- (eval $ac_try) 2>&5 148208- ac_status=$? 148209- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148210- (exit $ac_status); }; }; then 148211- ac_cv_type_int=yes 148212-else 148213- echo "$as_me: failed program was:" >&5 148214-sed 's/^/| /' conftest.$ac_ext >&5 148215- 148216-ac_cv_type_int=no 148217-fi 148218-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148219-fi 148220-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 148221-echo "${ECHO_T}$ac_cv_type_int" >&6 148222- 148223-echo "$as_me:$LINENO: checking size of int" >&5 148224-echo $ECHO_N "checking size of int... $ECHO_C" >&6 148225-if test "${ac_cv_sizeof_int+set}" = set; then 148226- echo $ECHO_N "(cached) $ECHO_C" >&6 148227-else 148228- if test "$ac_cv_type_int" = yes; then 148229- # The cast to unsigned long works around a bug in the HP C Compiler 148230- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 148231- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 148232- # This bug is HP SR number 8606223364. 148233- if test "$cross_compiling" = yes; then 148234- # Depending upon the size, compute the lo and hi bounds. 148235-cat >conftest.$ac_ext <<_ACEOF 148236-/* confdefs.h. */ 148237-_ACEOF 148238-cat confdefs.h >>conftest.$ac_ext 148239-cat >>conftest.$ac_ext <<_ACEOF 148240-/* end confdefs.h. */ 148241-$ac_includes_default 148242-int 148243-main () 148244-{ 148245-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; 148246-test_array [0] = 0 148247- 148248- ; 148249- return 0; 148250-} 148251-_ACEOF 148252-rm -f conftest.$ac_objext 148253-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148254- (eval $ac_compile) 2>conftest.er1 148255- ac_status=$? 148256- grep -v '^ *+' conftest.er1 >conftest.err 148257- rm -f conftest.er1 148258- cat conftest.err >&5 148259- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148260- (exit $ac_status); } && 148261- { ac_try='test -z "$ac_c_werror_flag" 148262- || test ! -s conftest.err' 148263- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148264- (eval $ac_try) 2>&5 148265- ac_status=$? 148266- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148267- (exit $ac_status); }; } && 148268- { ac_try='test -s conftest.$ac_objext' 148269- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148270- (eval $ac_try) 2>&5 148271- ac_status=$? 148272- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148273- (exit $ac_status); }; }; then 148274- ac_lo=0 ac_mid=0 148275- while :; do 148276- cat >conftest.$ac_ext <<_ACEOF 148277-/* confdefs.h. */ 148278-_ACEOF 148279-cat confdefs.h >>conftest.$ac_ext 148280-cat >>conftest.$ac_ext <<_ACEOF 148281-/* end confdefs.h. */ 148282-$ac_includes_default 148283-int 148284-main () 148285-{ 148286-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 148287-test_array [0] = 0 148288- 148289- ; 148290- return 0; 148291-} 148292-_ACEOF 148293-rm -f conftest.$ac_objext 148294-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148295- (eval $ac_compile) 2>conftest.er1 148296- ac_status=$? 148297- grep -v '^ *+' conftest.er1 >conftest.err 148298- rm -f conftest.er1 148299- cat conftest.err >&5 148300- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148301- (exit $ac_status); } && 148302- { ac_try='test -z "$ac_c_werror_flag" 148303- || test ! -s conftest.err' 148304- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148305- (eval $ac_try) 2>&5 148306- ac_status=$? 148307- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148308- (exit $ac_status); }; } && 148309- { ac_try='test -s conftest.$ac_objext' 148310- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148311- (eval $ac_try) 2>&5 148312- ac_status=$? 148313- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148314- (exit $ac_status); }; }; then 148315- ac_hi=$ac_mid; break 148316-else 148317- echo "$as_me: failed program was:" >&5 148318-sed 's/^/| /' conftest.$ac_ext >&5 148319- 148320-ac_lo=`expr $ac_mid + 1` 148321- if test $ac_lo -le $ac_mid; then 148322- ac_lo= ac_hi= 148323- break 148324- fi 148325- ac_mid=`expr 2 '*' $ac_mid + 1` 148326-fi 148327-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148328- done 148329-else 148330- echo "$as_me: failed program was:" >&5 148331-sed 's/^/| /' conftest.$ac_ext >&5 148332- 148333-cat >conftest.$ac_ext <<_ACEOF 148334-/* confdefs.h. */ 148335-_ACEOF 148336-cat confdefs.h >>conftest.$ac_ext 148337-cat >>conftest.$ac_ext <<_ACEOF 148338-/* end confdefs.h. */ 148339-$ac_includes_default 148340-int 148341-main () 148342-{ 148343-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; 148344-test_array [0] = 0 148345- 148346- ; 148347- return 0; 148348-} 148349-_ACEOF 148350-rm -f conftest.$ac_objext 148351-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148352- (eval $ac_compile) 2>conftest.er1 148353- ac_status=$? 148354- grep -v '^ *+' conftest.er1 >conftest.err 148355- rm -f conftest.er1 148356- cat conftest.err >&5 148357- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148358- (exit $ac_status); } && 148359- { ac_try='test -z "$ac_c_werror_flag" 148360- || test ! -s conftest.err' 148361- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148362- (eval $ac_try) 2>&5 148363- ac_status=$? 148364- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148365- (exit $ac_status); }; } && 148366- { ac_try='test -s conftest.$ac_objext' 148367- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148368- (eval $ac_try) 2>&5 148369- ac_status=$? 148370- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148371- (exit $ac_status); }; }; then 148372- ac_hi=-1 ac_mid=-1 148373- while :; do 148374- cat >conftest.$ac_ext <<_ACEOF 148375-/* confdefs.h. */ 148376-_ACEOF 148377-cat confdefs.h >>conftest.$ac_ext 148378-cat >>conftest.$ac_ext <<_ACEOF 148379-/* end confdefs.h. */ 148380-$ac_includes_default 148381-int 148382-main () 148383-{ 148384-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; 148385-test_array [0] = 0 148386+EOF 148387 148388- ; 148389- return 0; 148390-} 148391-_ACEOF 148392-rm -f conftest.$ac_objext 148393-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148394- (eval $ac_compile) 2>conftest.er1 148395- ac_status=$? 148396- grep -v '^ *+' conftest.er1 >conftest.err 148397- rm -f conftest.er1 148398- cat conftest.err >&5 148399- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148400- (exit $ac_status); } && 148401- { ac_try='test -z "$ac_c_werror_flag" 148402- || test ! -s conftest.err' 148403- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148404- (eval $ac_try) 2>&5 148405- ac_status=$? 148406- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148407- (exit $ac_status); }; } && 148408- { ac_try='test -s conftest.$ac_objext' 148409- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148410- (eval $ac_try) 2>&5 148411- ac_status=$? 148412- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148413- (exit $ac_status); }; }; then 148414- ac_lo=$ac_mid; break 148415-else 148416- echo "$as_me: failed program was:" >&5 148417-sed 's/^/| /' conftest.$ac_ext >&5 148418- 148419-ac_hi=`expr '(' $ac_mid ')' - 1` 148420- if test $ac_mid -le $ac_hi; then 148421- ac_lo= ac_hi= 148422- break 148423- fi 148424- ac_mid=`expr 2 '*' $ac_mid` 148425-fi 148426-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148427- done 148428-else 148429- echo "$as_me: failed program was:" >&5 148430-sed 's/^/| /' conftest.$ac_ext >&5 148431- 148432-ac_lo= ac_hi= 148433-fi 148434-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148435-fi 148436-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148437-# Binary search between lo and hi bounds. 148438-while test "x$ac_lo" != "x$ac_hi"; do 148439- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 148440- cat >conftest.$ac_ext <<_ACEOF 148441-/* confdefs.h. */ 148442-_ACEOF 148443-cat confdefs.h >>conftest.$ac_ext 148444-cat >>conftest.$ac_ext <<_ACEOF 148445-/* end confdefs.h. */ 148446-$ac_includes_default 148447-int 148448-main () 148449-{ 148450-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; 148451-test_array [0] = 0 148452 148453- ; 148454- return 0; 148455-} 148456-_ACEOF 148457-rm -f conftest.$ac_objext 148458-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148459- (eval $ac_compile) 2>conftest.er1 148460- ac_status=$? 148461- grep -v '^ *+' conftest.er1 >conftest.err 148462- rm -f conftest.er1 148463- cat conftest.err >&5 148464- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148465- (exit $ac_status); } && 148466- { ac_try='test -z "$ac_c_werror_flag" 148467- || test ! -s conftest.err' 148468- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148469- (eval $ac_try) 2>&5 148470- ac_status=$? 148471- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148472- (exit $ac_status); }; } && 148473- { ac_try='test -s conftest.$ac_objext' 148474- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148475- (eval $ac_try) 2>&5 148476- ac_status=$? 148477- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148478- (exit $ac_status); }; }; then 148479- ac_hi=$ac_mid 148480-else 148481- echo "$as_me: failed program was:" >&5 148482-sed 's/^/| /' conftest.$ac_ext >&5 148483 148484-ac_lo=`expr '(' $ac_mid ')' + 1` 148485-fi 148486-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148487-done 148488-case $ac_lo in 148489-?*) ac_cv_sizeof_int=$ac_lo;; 148490-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 148491-See \`config.log' for more details." >&5 148492-echo "$as_me: error: cannot compute sizeof (int), 77 148493-See \`config.log' for more details." >&2;} 148494- { (exit 1); exit 1; }; } ;; 148495-esac 148496+echo $ac_n "checking size of int""... $ac_c" 1>&6 148497+echo "configure:100196: checking size of int" >&5 148498+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 148499+ echo $ac_n "(cached) $ac_c" 1>&6 148500 else 148501 if test "$cross_compiling" = yes; then 148502- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 148503-See \`config.log' for more details." >&5 148504-echo "$as_me: error: cannot run test program while cross compiling 148505-See \`config.log' for more details." >&2;} 148506- { (exit 1); exit 1; }; } 148507-else 148508- cat >conftest.$ac_ext <<_ACEOF 148509-/* confdefs.h. */ 148510-_ACEOF 148511-cat confdefs.h >>conftest.$ac_ext 148512-cat >>conftest.$ac_ext <<_ACEOF 148513-/* end confdefs.h. */ 148514-$ac_includes_default 148515-long longval () { return (long) (sizeof (int)); } 148516-unsigned long ulongval () { return (long) (sizeof (int)); } 148517+ ac_cv_sizeof_int=4 148518+else 148519+ cat > conftest.$ac_ext <<EOF 148520+#line 100204 "configure" 148521+#include "confdefs.h" 148522 #include <stdio.h> 148523-#include <stdlib.h> 148524-int 148525-main () 148526+main() 148527 { 148528- 148529- FILE *f = fopen ("conftest.val", "w"); 148530- if (! f) 148531- exit (1); 148532- if (((long) (sizeof (int))) < 0) 148533- { 148534- long i = longval (); 148535- if (i != ((long) (sizeof (int)))) 148536- exit (1); 148537- fprintf (f, "%ld\n", i); 148538- } 148539- else 148540- { 148541- unsigned long i = ulongval (); 148542- if (i != ((long) (sizeof (int)))) 148543- exit (1); 148544- fprintf (f, "%lu\n", i); 148545- } 148546- exit (ferror (f) || fclose (f) != 0); 148547- 148548- ; 148549- return 0; 148550+ FILE *f=fopen("conftestval", "w"); 148551+ if (!f) exit(1); 148552+ fprintf(f, "%d\n", sizeof(int)); 148553+ exit(0); 148554 } 148555-_ACEOF 148556-rm -f conftest$ac_exeext 148557-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 148558- (eval $ac_link) 2>&5 148559- ac_status=$? 148560- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148561- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 148562- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148563- (eval $ac_try) 2>&5 148564- ac_status=$? 148565- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148566- (exit $ac_status); }; }; then 148567- ac_cv_sizeof_int=`cat conftest.val` 148568-else 148569- echo "$as_me: program exited with status $ac_status" >&5 148570-echo "$as_me: failed program was:" >&5 148571-sed 's/^/| /' conftest.$ac_ext >&5 148572- 148573-( exit $ac_status ) 148574-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 148575-See \`config.log' for more details." >&5 148576-echo "$as_me: error: cannot compute sizeof (int), 77 148577-See \`config.log' for more details." >&2;} 148578- { (exit 1); exit 1; }; } 148579-fi 148580-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 148581-fi 148582-fi 148583-rm -f conftest.val 148584+EOF 148585+if { (eval echo configure:100215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 148586+then 148587+ ac_cv_sizeof_int=`cat conftestval` 148588 else 148589+ echo "configure: failed program was:" >&5 148590+ cat conftest.$ac_ext >&5 148591+ rm -fr conftest* 148592 ac_cv_sizeof_int=0 148593 fi 148594+rm -fr conftest* 148595 fi 148596-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 148597-echo "${ECHO_T}$ac_cv_sizeof_int" >&6 148598-cat >>confdefs.h <<_ACEOF 148599-#define SIZEOF_INT $ac_cv_sizeof_int 148600-_ACEOF 148601- 148602 148603-echo "$as_me:$LINENO: checking for long" >&5 148604-echo $ECHO_N "checking for long... $ECHO_C" >&6 148605-if test "${ac_cv_type_long+set}" = set; then 148606- echo $ECHO_N "(cached) $ECHO_C" >&6 148607-else 148608- cat >conftest.$ac_ext <<_ACEOF 148609-/* confdefs.h. */ 148610-_ACEOF 148611-cat confdefs.h >>conftest.$ac_ext 148612-cat >>conftest.$ac_ext <<_ACEOF 148613-/* end confdefs.h. */ 148614-$ac_includes_default 148615-int 148616-main () 148617-{ 148618-if ((long *) 0) 148619- return 0; 148620-if (sizeof (long)) 148621- return 0; 148622- ; 148623- return 0; 148624-} 148625-_ACEOF 148626-rm -f conftest.$ac_objext 148627-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148628- (eval $ac_compile) 2>conftest.er1 148629- ac_status=$? 148630- grep -v '^ *+' conftest.er1 >conftest.err 148631- rm -f conftest.er1 148632- cat conftest.err >&5 148633- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148634- (exit $ac_status); } && 148635- { ac_try='test -z "$ac_c_werror_flag" 148636- || test ! -s conftest.err' 148637- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148638- (eval $ac_try) 2>&5 148639- ac_status=$? 148640- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148641- (exit $ac_status); }; } && 148642- { ac_try='test -s conftest.$ac_objext' 148643- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148644- (eval $ac_try) 2>&5 148645- ac_status=$? 148646- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148647- (exit $ac_status); }; }; then 148648- ac_cv_type_long=yes 148649-else 148650- echo "$as_me: failed program was:" >&5 148651-sed 's/^/| /' conftest.$ac_ext >&5 148652- 148653-ac_cv_type_long=no 148654-fi 148655-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148656-fi 148657-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 148658-echo "${ECHO_T}$ac_cv_type_long" >&6 148659- 148660-echo "$as_me:$LINENO: checking size of long" >&5 148661-echo $ECHO_N "checking size of long... $ECHO_C" >&6 148662-if test "${ac_cv_sizeof_long+set}" = set; then 148663- echo $ECHO_N "(cached) $ECHO_C" >&6 148664-else 148665- if test "$ac_cv_type_long" = yes; then 148666- # The cast to unsigned long works around a bug in the HP C Compiler 148667- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 148668- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 148669- # This bug is HP SR number 8606223364. 148670- if test "$cross_compiling" = yes; then 148671- # Depending upon the size, compute the lo and hi bounds. 148672-cat >conftest.$ac_ext <<_ACEOF 148673-/* confdefs.h. */ 148674-_ACEOF 148675-cat confdefs.h >>conftest.$ac_ext 148676-cat >>conftest.$ac_ext <<_ACEOF 148677-/* end confdefs.h. */ 148678-$ac_includes_default 148679-int 148680-main () 148681-{ 148682-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; 148683-test_array [0] = 0 148684- 148685- ; 148686- return 0; 148687-} 148688-_ACEOF 148689-rm -f conftest.$ac_objext 148690-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148691- (eval $ac_compile) 2>conftest.er1 148692- ac_status=$? 148693- grep -v '^ *+' conftest.er1 >conftest.err 148694- rm -f conftest.er1 148695- cat conftest.err >&5 148696- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148697- (exit $ac_status); } && 148698- { ac_try='test -z "$ac_c_werror_flag" 148699- || test ! -s conftest.err' 148700- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148701- (eval $ac_try) 2>&5 148702- ac_status=$? 148703- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148704- (exit $ac_status); }; } && 148705- { ac_try='test -s conftest.$ac_objext' 148706- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148707- (eval $ac_try) 2>&5 148708- ac_status=$? 148709- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148710- (exit $ac_status); }; }; then 148711- ac_lo=0 ac_mid=0 148712- while :; do 148713- cat >conftest.$ac_ext <<_ACEOF 148714-/* confdefs.h. */ 148715-_ACEOF 148716-cat confdefs.h >>conftest.$ac_ext 148717-cat >>conftest.$ac_ext <<_ACEOF 148718-/* end confdefs.h. */ 148719-$ac_includes_default 148720-int 148721-main () 148722-{ 148723-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 148724-test_array [0] = 0 148725- 148726- ; 148727- return 0; 148728-} 148729-_ACEOF 148730-rm -f conftest.$ac_objext 148731-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148732- (eval $ac_compile) 2>conftest.er1 148733- ac_status=$? 148734- grep -v '^ *+' conftest.er1 >conftest.err 148735- rm -f conftest.er1 148736- cat conftest.err >&5 148737- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148738- (exit $ac_status); } && 148739- { ac_try='test -z "$ac_c_werror_flag" 148740- || test ! -s conftest.err' 148741- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148742- (eval $ac_try) 2>&5 148743- ac_status=$? 148744- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148745- (exit $ac_status); }; } && 148746- { ac_try='test -s conftest.$ac_objext' 148747- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148748- (eval $ac_try) 2>&5 148749- ac_status=$? 148750- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148751- (exit $ac_status); }; }; then 148752- ac_hi=$ac_mid; break 148753-else 148754- echo "$as_me: failed program was:" >&5 148755-sed 's/^/| /' conftest.$ac_ext >&5 148756- 148757-ac_lo=`expr $ac_mid + 1` 148758- if test $ac_lo -le $ac_mid; then 148759- ac_lo= ac_hi= 148760- break 148761- fi 148762- ac_mid=`expr 2 '*' $ac_mid + 1` 148763-fi 148764-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148765- done 148766-else 148767- echo "$as_me: failed program was:" >&5 148768-sed 's/^/| /' conftest.$ac_ext >&5 148769- 148770-cat >conftest.$ac_ext <<_ACEOF 148771-/* confdefs.h. */ 148772-_ACEOF 148773-cat confdefs.h >>conftest.$ac_ext 148774-cat >>conftest.$ac_ext <<_ACEOF 148775-/* end confdefs.h. */ 148776-$ac_includes_default 148777-int 148778-main () 148779-{ 148780-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; 148781-test_array [0] = 0 148782- 148783- ; 148784- return 0; 148785-} 148786-_ACEOF 148787-rm -f conftest.$ac_objext 148788-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148789- (eval $ac_compile) 2>conftest.er1 148790- ac_status=$? 148791- grep -v '^ *+' conftest.er1 >conftest.err 148792- rm -f conftest.er1 148793- cat conftest.err >&5 148794- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148795- (exit $ac_status); } && 148796- { ac_try='test -z "$ac_c_werror_flag" 148797- || test ! -s conftest.err' 148798- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148799- (eval $ac_try) 2>&5 148800- ac_status=$? 148801- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148802- (exit $ac_status); }; } && 148803- { ac_try='test -s conftest.$ac_objext' 148804- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148805- (eval $ac_try) 2>&5 148806- ac_status=$? 148807- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148808- (exit $ac_status); }; }; then 148809- ac_hi=-1 ac_mid=-1 148810- while :; do 148811- cat >conftest.$ac_ext <<_ACEOF 148812-/* confdefs.h. */ 148813-_ACEOF 148814-cat confdefs.h >>conftest.$ac_ext 148815-cat >>conftest.$ac_ext <<_ACEOF 148816-/* end confdefs.h. */ 148817-$ac_includes_default 148818-int 148819-main () 148820-{ 148821-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; 148822-test_array [0] = 0 148823- 148824- ; 148825- return 0; 148826-} 148827-_ACEOF 148828-rm -f conftest.$ac_objext 148829-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148830- (eval $ac_compile) 2>conftest.er1 148831- ac_status=$? 148832- grep -v '^ *+' conftest.er1 >conftest.err 148833- rm -f conftest.er1 148834- cat conftest.err >&5 148835- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148836- (exit $ac_status); } && 148837- { ac_try='test -z "$ac_c_werror_flag" 148838- || test ! -s conftest.err' 148839- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148840- (eval $ac_try) 2>&5 148841- ac_status=$? 148842- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148843- (exit $ac_status); }; } && 148844- { ac_try='test -s conftest.$ac_objext' 148845- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148846- (eval $ac_try) 2>&5 148847- ac_status=$? 148848- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148849- (exit $ac_status); }; }; then 148850- ac_lo=$ac_mid; break 148851-else 148852- echo "$as_me: failed program was:" >&5 148853-sed 's/^/| /' conftest.$ac_ext >&5 148854- 148855-ac_hi=`expr '(' $ac_mid ')' - 1` 148856- if test $ac_mid -le $ac_hi; then 148857- ac_lo= ac_hi= 148858- break 148859- fi 148860- ac_mid=`expr 2 '*' $ac_mid` 148861-fi 148862-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148863- done 148864-else 148865- echo "$as_me: failed program was:" >&5 148866-sed 's/^/| /' conftest.$ac_ext >&5 148867- 148868-ac_lo= ac_hi= 148869-fi 148870-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148871-fi 148872-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148873-# Binary search between lo and hi bounds. 148874-while test "x$ac_lo" != "x$ac_hi"; do 148875- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 148876- cat >conftest.$ac_ext <<_ACEOF 148877-/* confdefs.h. */ 148878-_ACEOF 148879-cat confdefs.h >>conftest.$ac_ext 148880-cat >>conftest.$ac_ext <<_ACEOF 148881-/* end confdefs.h. */ 148882-$ac_includes_default 148883-int 148884-main () 148885-{ 148886-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; 148887-test_array [0] = 0 148888+fi 148889+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 148890+cat >> confdefs.h <<EOF 148891+#define SIZEOF_INT $ac_cv_sizeof_int 148892+EOF 148893 148894- ; 148895- return 0; 148896-} 148897-_ACEOF 148898-rm -f conftest.$ac_objext 148899-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 148900- (eval $ac_compile) 2>conftest.er1 148901- ac_status=$? 148902- grep -v '^ *+' conftest.er1 >conftest.err 148903- rm -f conftest.er1 148904- cat conftest.err >&5 148905- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148906- (exit $ac_status); } && 148907- { ac_try='test -z "$ac_c_werror_flag" 148908- || test ! -s conftest.err' 148909- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148910- (eval $ac_try) 2>&5 148911- ac_status=$? 148912- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148913- (exit $ac_status); }; } && 148914- { ac_try='test -s conftest.$ac_objext' 148915- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 148916- (eval $ac_try) 2>&5 148917- ac_status=$? 148918- echo "$as_me:$LINENO: \$? = $ac_status" >&5 148919- (exit $ac_status); }; }; then 148920- ac_hi=$ac_mid 148921-else 148922- echo "$as_me: failed program was:" >&5 148923-sed 's/^/| /' conftest.$ac_ext >&5 148924 148925-ac_lo=`expr '(' $ac_mid ')' + 1` 148926-fi 148927-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 148928-done 148929-case $ac_lo in 148930-?*) ac_cv_sizeof_long=$ac_lo;; 148931-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 148932-See \`config.log' for more details." >&5 148933-echo "$as_me: error: cannot compute sizeof (long), 77 148934-See \`config.log' for more details." >&2;} 148935- { (exit 1); exit 1; }; } ;; 148936-esac 148937+echo $ac_n "checking size of long""... $ac_c" 1>&6 148938+echo "configure:100235: checking size of long" >&5 148939+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 148940+ echo $ac_n "(cached) $ac_c" 1>&6 148941 else 148942 if test "$cross_compiling" = yes; then 148943- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 148944-See \`config.log' for more details." >&5 148945-echo "$as_me: error: cannot run test program while cross compiling 148946-See \`config.log' for more details." >&2;} 148947- { (exit 1); exit 1; }; } 148948-else 148949- cat >conftest.$ac_ext <<_ACEOF 148950-/* confdefs.h. */ 148951-_ACEOF 148952-cat confdefs.h >>conftest.$ac_ext 148953-cat >>conftest.$ac_ext <<_ACEOF 148954-/* end confdefs.h. */ 148955-$ac_includes_default 148956-long longval () { return (long) (sizeof (long)); } 148957-unsigned long ulongval () { return (long) (sizeof (long)); } 148958+ ac_cv_sizeof_long=4 148959+else 148960+ cat > conftest.$ac_ext <<EOF 148961+#line 100243 "configure" 148962+#include "confdefs.h" 148963 #include <stdio.h> 148964-#include <stdlib.h> 148965-int 148966-main () 148967+main() 148968 { 148969- 148970- FILE *f = fopen ("conftest.val", "w"); 148971- if (! f) 148972- exit (1); 148973- if (((long) (sizeof (long))) < 0) 148974- { 148975- long i = longval (); 148976- if (i != ((long) (sizeof (long)))) 148977- exit (1); 148978- fprintf (f, "%ld\n", i); 148979- } 148980- else 148981- { 148982- unsigned long i = ulongval (); 148983- if (i != ((long) (sizeof (long)))) 148984- exit (1); 148985- fprintf (f, "%lu\n", i); 148986- } 148987- exit (ferror (f) || fclose (f) != 0); 148988- 148989- ; 148990- return 0; 148991+ FILE *f=fopen("conftestval", "w"); 148992+ if (!f) exit(1); 148993+ fprintf(f, "%d\n", sizeof(long)); 148994+ exit(0); 148995 } 148996-_ACEOF 148997-rm -f conftest$ac_exeext 148998-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 148999- (eval $ac_link) 2>&5 149000- ac_status=$? 149001- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149002- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 149003- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149004- (eval $ac_try) 2>&5 149005- ac_status=$? 149006- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149007- (exit $ac_status); }; }; then 149008- ac_cv_sizeof_long=`cat conftest.val` 149009-else 149010- echo "$as_me: program exited with status $ac_status" >&5 149011-echo "$as_me: failed program was:" >&5 149012-sed 's/^/| /' conftest.$ac_ext >&5 149013- 149014-( exit $ac_status ) 149015-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 149016-See \`config.log' for more details." >&5 149017-echo "$as_me: error: cannot compute sizeof (long), 77 149018-See \`config.log' for more details." >&2;} 149019- { (exit 1); exit 1; }; } 149020-fi 149021-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 149022-fi 149023-fi 149024-rm -f conftest.val 149025+EOF 149026+if { (eval echo configure:100254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 149027+then 149028+ ac_cv_sizeof_long=`cat conftestval` 149029 else 149030+ echo "configure: failed program was:" >&5 149031+ cat conftest.$ac_ext >&5 149032+ rm -fr conftest* 149033 ac_cv_sizeof_long=0 149034 fi 149035-fi 149036-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 149037-echo "${ECHO_T}$ac_cv_sizeof_long" >&6 149038-cat >>confdefs.h <<_ACEOF 149039-#define SIZEOF_LONG $ac_cv_sizeof_long 149040-_ACEOF 149041- 149042- 149043-echo "$as_me:$LINENO: checking for long long" >&5 149044-echo $ECHO_N "checking for long long... $ECHO_C" >&6 149045-if test "${ac_cv_type_long_long+set}" = set; then 149046- echo $ECHO_N "(cached) $ECHO_C" >&6 149047-else 149048- cat >conftest.$ac_ext <<_ACEOF 149049-/* confdefs.h. */ 149050-_ACEOF 149051-cat confdefs.h >>conftest.$ac_ext 149052-cat >>conftest.$ac_ext <<_ACEOF 149053-/* end confdefs.h. */ 149054-$ac_includes_default 149055-int 149056-main () 149057-{ 149058-if ((long long *) 0) 149059- return 0; 149060-if (sizeof (long long)) 149061- return 0; 149062- ; 149063- return 0; 149064-} 149065-_ACEOF 149066-rm -f conftest.$ac_objext 149067-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149068- (eval $ac_compile) 2>conftest.er1 149069- ac_status=$? 149070- grep -v '^ *+' conftest.er1 >conftest.err 149071- rm -f conftest.er1 149072- cat conftest.err >&5 149073- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149074- (exit $ac_status); } && 149075- { ac_try='test -z "$ac_c_werror_flag" 149076- || test ! -s conftest.err' 149077- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149078- (eval $ac_try) 2>&5 149079- ac_status=$? 149080- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149081- (exit $ac_status); }; } && 149082- { ac_try='test -s conftest.$ac_objext' 149083- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149084- (eval $ac_try) 2>&5 149085- ac_status=$? 149086- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149087- (exit $ac_status); }; }; then 149088- ac_cv_type_long_long=yes 149089-else 149090- echo "$as_me: failed program was:" >&5 149091-sed 's/^/| /' conftest.$ac_ext >&5 149092- 149093-ac_cv_type_long_long=no 149094-fi 149095-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149096-fi 149097-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 149098-echo "${ECHO_T}$ac_cv_type_long_long" >&6 149099- 149100-echo "$as_me:$LINENO: checking size of long long" >&5 149101-echo $ECHO_N "checking size of long long... $ECHO_C" >&6 149102-if test "${ac_cv_sizeof_long_long+set}" = set; then 149103- echo $ECHO_N "(cached) $ECHO_C" >&6 149104-else 149105- if test "$ac_cv_type_long_long" = yes; then 149106- # The cast to unsigned long works around a bug in the HP C Compiler 149107- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects 149108- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. 149109- # This bug is HP SR number 8606223364. 149110- if test "$cross_compiling" = yes; then 149111- # Depending upon the size, compute the lo and hi bounds. 149112-cat >conftest.$ac_ext <<_ACEOF 149113-/* confdefs.h. */ 149114-_ACEOF 149115-cat confdefs.h >>conftest.$ac_ext 149116-cat >>conftest.$ac_ext <<_ACEOF 149117-/* end confdefs.h. */ 149118-$ac_includes_default 149119-int 149120-main () 149121-{ 149122-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; 149123-test_array [0] = 0 149124- 149125- ; 149126- return 0; 149127-} 149128-_ACEOF 149129-rm -f conftest.$ac_objext 149130-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149131- (eval $ac_compile) 2>conftest.er1 149132- ac_status=$? 149133- grep -v '^ *+' conftest.er1 >conftest.err 149134- rm -f conftest.er1 149135- cat conftest.err >&5 149136- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149137- (exit $ac_status); } && 149138- { ac_try='test -z "$ac_c_werror_flag" 149139- || test ! -s conftest.err' 149140- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149141- (eval $ac_try) 2>&5 149142- ac_status=$? 149143- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149144- (exit $ac_status); }; } && 149145- { ac_try='test -s conftest.$ac_objext' 149146- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149147- (eval $ac_try) 2>&5 149148- ac_status=$? 149149- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149150- (exit $ac_status); }; }; then 149151- ac_lo=0 ac_mid=0 149152- while :; do 149153- cat >conftest.$ac_ext <<_ACEOF 149154-/* confdefs.h. */ 149155-_ACEOF 149156-cat confdefs.h >>conftest.$ac_ext 149157-cat >>conftest.$ac_ext <<_ACEOF 149158-/* end confdefs.h. */ 149159-$ac_includes_default 149160-int 149161-main () 149162-{ 149163-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 149164-test_array [0] = 0 149165- 149166- ; 149167- return 0; 149168-} 149169-_ACEOF 149170-rm -f conftest.$ac_objext 149171-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149172- (eval $ac_compile) 2>conftest.er1 149173- ac_status=$? 149174- grep -v '^ *+' conftest.er1 >conftest.err 149175- rm -f conftest.er1 149176- cat conftest.err >&5 149177- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149178- (exit $ac_status); } && 149179- { ac_try='test -z "$ac_c_werror_flag" 149180- || test ! -s conftest.err' 149181- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149182- (eval $ac_try) 2>&5 149183- ac_status=$? 149184- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149185- (exit $ac_status); }; } && 149186- { ac_try='test -s conftest.$ac_objext' 149187- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149188- (eval $ac_try) 2>&5 149189- ac_status=$? 149190- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149191- (exit $ac_status); }; }; then 149192- ac_hi=$ac_mid; break 149193-else 149194- echo "$as_me: failed program was:" >&5 149195-sed 's/^/| /' conftest.$ac_ext >&5 149196- 149197-ac_lo=`expr $ac_mid + 1` 149198- if test $ac_lo -le $ac_mid; then 149199- ac_lo= ac_hi= 149200- break 149201- fi 149202- ac_mid=`expr 2 '*' $ac_mid + 1` 149203-fi 149204-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149205- done 149206-else 149207- echo "$as_me: failed program was:" >&5 149208-sed 's/^/| /' conftest.$ac_ext >&5 149209- 149210-cat >conftest.$ac_ext <<_ACEOF 149211-/* confdefs.h. */ 149212-_ACEOF 149213-cat confdefs.h >>conftest.$ac_ext 149214-cat >>conftest.$ac_ext <<_ACEOF 149215-/* end confdefs.h. */ 149216-$ac_includes_default 149217-int 149218-main () 149219-{ 149220-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; 149221-test_array [0] = 0 149222- 149223- ; 149224- return 0; 149225-} 149226-_ACEOF 149227-rm -f conftest.$ac_objext 149228-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149229- (eval $ac_compile) 2>conftest.er1 149230- ac_status=$? 149231- grep -v '^ *+' conftest.er1 >conftest.err 149232- rm -f conftest.er1 149233- cat conftest.err >&5 149234- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149235- (exit $ac_status); } && 149236- { ac_try='test -z "$ac_c_werror_flag" 149237- || test ! -s conftest.err' 149238- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149239- (eval $ac_try) 2>&5 149240- ac_status=$? 149241- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149242- (exit $ac_status); }; } && 149243- { ac_try='test -s conftest.$ac_objext' 149244- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149245- (eval $ac_try) 2>&5 149246- ac_status=$? 149247- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149248- (exit $ac_status); }; }; then 149249- ac_hi=-1 ac_mid=-1 149250- while :; do 149251- cat >conftest.$ac_ext <<_ACEOF 149252-/* confdefs.h. */ 149253-_ACEOF 149254-cat confdefs.h >>conftest.$ac_ext 149255-cat >>conftest.$ac_ext <<_ACEOF 149256-/* end confdefs.h. */ 149257-$ac_includes_default 149258-int 149259-main () 149260-{ 149261-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; 149262-test_array [0] = 0 149263- 149264- ; 149265- return 0; 149266-} 149267-_ACEOF 149268-rm -f conftest.$ac_objext 149269-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149270- (eval $ac_compile) 2>conftest.er1 149271- ac_status=$? 149272- grep -v '^ *+' conftest.er1 >conftest.err 149273- rm -f conftest.er1 149274- cat conftest.err >&5 149275- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149276- (exit $ac_status); } && 149277- { ac_try='test -z "$ac_c_werror_flag" 149278- || test ! -s conftest.err' 149279- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149280- (eval $ac_try) 2>&5 149281- ac_status=$? 149282- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149283- (exit $ac_status); }; } && 149284- { ac_try='test -s conftest.$ac_objext' 149285- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149286- (eval $ac_try) 2>&5 149287- ac_status=$? 149288- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149289- (exit $ac_status); }; }; then 149290- ac_lo=$ac_mid; break 149291-else 149292- echo "$as_me: failed program was:" >&5 149293-sed 's/^/| /' conftest.$ac_ext >&5 149294- 149295-ac_hi=`expr '(' $ac_mid ')' - 1` 149296- if test $ac_mid -le $ac_hi; then 149297- ac_lo= ac_hi= 149298- break 149299- fi 149300- ac_mid=`expr 2 '*' $ac_mid` 149301-fi 149302-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149303- done 149304-else 149305- echo "$as_me: failed program was:" >&5 149306-sed 's/^/| /' conftest.$ac_ext >&5 149307- 149308-ac_lo= ac_hi= 149309-fi 149310-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149311-fi 149312-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149313-# Binary search between lo and hi bounds. 149314-while test "x$ac_lo" != "x$ac_hi"; do 149315- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` 149316- cat >conftest.$ac_ext <<_ACEOF 149317-/* confdefs.h. */ 149318-_ACEOF 149319-cat confdefs.h >>conftest.$ac_ext 149320-cat >>conftest.$ac_ext <<_ACEOF 149321-/* end confdefs.h. */ 149322-$ac_includes_default 149323-int 149324-main () 149325-{ 149326-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; 149327-test_array [0] = 0 149328- 149329- ; 149330- return 0; 149331-} 149332-_ACEOF 149333-rm -f conftest.$ac_objext 149334-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149335- (eval $ac_compile) 2>conftest.er1 149336- ac_status=$? 149337- grep -v '^ *+' conftest.er1 >conftest.err 149338- rm -f conftest.er1 149339- cat conftest.err >&5 149340- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149341- (exit $ac_status); } && 149342- { ac_try='test -z "$ac_c_werror_flag" 149343- || test ! -s conftest.err' 149344- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149345- (eval $ac_try) 2>&5 149346- ac_status=$? 149347- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149348- (exit $ac_status); }; } && 149349- { ac_try='test -s conftest.$ac_objext' 149350- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149351- (eval $ac_try) 2>&5 149352- ac_status=$? 149353- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149354- (exit $ac_status); }; }; then 149355- ac_hi=$ac_mid 149356-else 149357- echo "$as_me: failed program was:" >&5 149358-sed 's/^/| /' conftest.$ac_ext >&5 149359+rm -fr conftest* 149360+fi 149361 149362-ac_lo=`expr '(' $ac_mid ')' + 1` 149363 fi 149364-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149365-done 149366-case $ac_lo in 149367-?*) ac_cv_sizeof_long_long=$ac_lo;; 149368-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 149369-See \`config.log' for more details." >&5 149370-echo "$as_me: error: cannot compute sizeof (long long), 77 149371-See \`config.log' for more details." >&2;} 149372- { (exit 1); exit 1; }; } ;; 149373-esac 149374+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 149375+cat >> confdefs.h <<EOF 149376+#define SIZEOF_LONG $ac_cv_sizeof_long 149377+EOF 149378+ 149379+ 149380+echo $ac_n "checking size of long long""... $ac_c" 1>&6 149381+echo "configure:100274: checking size of long long" >&5 149382+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then 149383+ echo $ac_n "(cached) $ac_c" 1>&6 149384 else 149385 if test "$cross_compiling" = yes; then 149386- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling 149387-See \`config.log' for more details." >&5 149388-echo "$as_me: error: cannot run test program while cross compiling 149389-See \`config.log' for more details." >&2;} 149390- { (exit 1); exit 1; }; } 149391-else 149392- cat >conftest.$ac_ext <<_ACEOF 149393-/* confdefs.h. */ 149394-_ACEOF 149395-cat confdefs.h >>conftest.$ac_ext 149396-cat >>conftest.$ac_ext <<_ACEOF 149397-/* end confdefs.h. */ 149398-$ac_includes_default 149399-long longval () { return (long) (sizeof (long long)); } 149400-unsigned long ulongval () { return (long) (sizeof (long long)); } 149401+ ac_cv_sizeof_long_long=8 149402+else 149403+ cat > conftest.$ac_ext <<EOF 149404+#line 100282 "configure" 149405+#include "confdefs.h" 149406 #include <stdio.h> 149407-#include <stdlib.h> 149408-int 149409-main () 149410+main() 149411 { 149412- 149413- FILE *f = fopen ("conftest.val", "w"); 149414- if (! f) 149415- exit (1); 149416- if (((long) (sizeof (long long))) < 0) 149417- { 149418- long i = longval (); 149419- if (i != ((long) (sizeof (long long)))) 149420- exit (1); 149421- fprintf (f, "%ld\n", i); 149422- } 149423- else 149424- { 149425- unsigned long i = ulongval (); 149426- if (i != ((long) (sizeof (long long)))) 149427- exit (1); 149428- fprintf (f, "%lu\n", i); 149429- } 149430- exit (ferror (f) || fclose (f) != 0); 149431- 149432- ; 149433- return 0; 149434+ FILE *f=fopen("conftestval", "w"); 149435+ if (!f) exit(1); 149436+ fprintf(f, "%d\n", sizeof(long long)); 149437+ exit(0); 149438 } 149439-_ACEOF 149440-rm -f conftest$ac_exeext 149441-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 149442- (eval $ac_link) 2>&5 149443- ac_status=$? 149444- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149445- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 149446- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149447- (eval $ac_try) 2>&5 149448- ac_status=$? 149449- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149450- (exit $ac_status); }; }; then 149451- ac_cv_sizeof_long_long=`cat conftest.val` 149452-else 149453- echo "$as_me: program exited with status $ac_status" >&5 149454-echo "$as_me: failed program was:" >&5 149455-sed 's/^/| /' conftest.$ac_ext >&5 149456- 149457-( exit $ac_status ) 149458-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 149459-See \`config.log' for more details." >&5 149460-echo "$as_me: error: cannot compute sizeof (long long), 77 149461-See \`config.log' for more details." >&2;} 149462- { (exit 1); exit 1; }; } 149463-fi 149464-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 149465-fi 149466-fi 149467-rm -f conftest.val 149468+EOF 149469+if { (eval echo configure:100293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 149470+then 149471+ ac_cv_sizeof_long_long=`cat conftestval` 149472 else 149473+ echo "configure: failed program was:" >&5 149474+ cat conftest.$ac_ext >&5 149475+ rm -fr conftest* 149476 ac_cv_sizeof_long_long=0 149477 fi 149478+rm -fr conftest* 149479+fi 149480+ 149481 fi 149482-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 149483-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 149484-cat >>confdefs.h <<_ACEOF 149485+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 149486+cat >> confdefs.h <<EOF 149487 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long 149488-_ACEOF 149489+EOF 149490 149491 149492-echo "$as_me:$LINENO: checking for size_t" >&5 149493-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 149494-if test "${ac_cv_type_size_t+set}" = set; then 149495- echo $ECHO_N "(cached) $ECHO_C" >&6 149496-else 149497- cat >conftest.$ac_ext <<_ACEOF 149498-/* confdefs.h. */ 149499-_ACEOF 149500-cat confdefs.h >>conftest.$ac_ext 149501-cat >>conftest.$ac_ext <<_ACEOF 149502-/* end confdefs.h. */ 149503-$ac_includes_default 149504-int 149505-main () 149506-{ 149507-if ((size_t *) 0) 149508- return 0; 149509-if (sizeof (size_t)) 149510- return 0; 149511- ; 149512- return 0; 149513-} 149514-_ACEOF 149515-rm -f conftest.$ac_objext 149516-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149517- (eval $ac_compile) 2>conftest.er1 149518- ac_status=$? 149519- grep -v '^ *+' conftest.er1 >conftest.err 149520- rm -f conftest.er1 149521- cat conftest.err >&5 149522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149523- (exit $ac_status); } && 149524- { ac_try='test -z "$ac_c_werror_flag" 149525- || test ! -s conftest.err' 149526- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149527- (eval $ac_try) 2>&5 149528- ac_status=$? 149529- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149530- (exit $ac_status); }; } && 149531- { ac_try='test -s conftest.$ac_objext' 149532- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149533- (eval $ac_try) 2>&5 149534- ac_status=$? 149535- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149536- (exit $ac_status); }; }; then 149537+echo $ac_n "checking for size_t""... $ac_c" 1>&6 149538+echo "configure:100313: checking for size_t" >&5 149539+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 149540+ echo $ac_n "(cached) $ac_c" 1>&6 149541+else 149542+ cat > conftest.$ac_ext <<EOF 149543+#line 100318 "configure" 149544+#include "confdefs.h" 149545+#include <sys/types.h> 149546+#if STDC_HEADERS 149547+#include <stdlib.h> 149548+#include <stddef.h> 149549+#endif 149550+EOF 149551+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 149552+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then 149553+ rm -rf conftest* 149554 ac_cv_type_size_t=yes 149555 else 149556- echo "$as_me: failed program was:" >&5 149557-sed 's/^/| /' conftest.$ac_ext >&5 149558- 149559-ac_cv_type_size_t=no 149560-fi 149561-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149562+ rm -rf conftest* 149563+ ac_cv_type_size_t=no 149564 fi 149565-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 149566-echo "${ECHO_T}$ac_cv_type_size_t" >&6 149567-if test $ac_cv_type_size_t = yes; then 149568- : 149569-else 149570+rm -f conftest* 149571 149572-cat >>confdefs.h <<_ACEOF 149573+fi 149574+echo "$ac_t""$ac_cv_type_size_t" 1>&6 149575+if test $ac_cv_type_size_t = no; then 149576+ cat >> confdefs.h <<\EOF 149577 #define size_t unsigned 149578-_ACEOF 149579+EOF 149580 149581 fi 149582 149583-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 149584-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 149585-if test "${ac_cv_header_time+set}" = set; then 149586- echo $ECHO_N "(cached) $ECHO_C" >&6 149587+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 149588+echo "configure:100346: checking whether time.h and sys/time.h may both be included" >&5 149589+if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 149590+ echo $ac_n "(cached) $ac_c" 1>&6 149591 else 149592- cat >conftest.$ac_ext <<_ACEOF 149593-/* confdefs.h. */ 149594-_ACEOF 149595-cat confdefs.h >>conftest.$ac_ext 149596-cat >>conftest.$ac_ext <<_ACEOF 149597-/* end confdefs.h. */ 149598+ cat > conftest.$ac_ext <<EOF 149599+#line 100351 "configure" 149600+#include "confdefs.h" 149601 #include <sys/types.h> 149602 #include <sys/time.h> 149603 #include <time.h> 149604- 149605-int 149606-main () 149607-{ 149608-if ((struct tm *) 0) 149609-return 0; 149610- ; 149611- return 0; 149612-} 149613-_ACEOF 149614-rm -f conftest.$ac_objext 149615-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 149616- (eval $ac_compile) 2>conftest.er1 149617- ac_status=$? 149618- grep -v '^ *+' conftest.er1 >conftest.err 149619- rm -f conftest.er1 149620- cat conftest.err >&5 149621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149622- (exit $ac_status); } && 149623- { ac_try='test -z "$ac_c_werror_flag" 149624- || test ! -s conftest.err' 149625- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149626- (eval $ac_try) 2>&5 149627- ac_status=$? 149628- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149629- (exit $ac_status); }; } && 149630- { ac_try='test -s conftest.$ac_objext' 149631- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149632- (eval $ac_try) 2>&5 149633- ac_status=$? 149634- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149635- (exit $ac_status); }; }; then 149636+int main() { 149637+struct tm *tp; 149638+; return 0; } 149639+EOF 149640+if { (eval echo configure:100360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 149641+ rm -rf conftest* 149642 ac_cv_header_time=yes 149643 else 149644- echo "$as_me: failed program was:" >&5 149645-sed 's/^/| /' conftest.$ac_ext >&5 149646- 149647-ac_cv_header_time=no 149648+ echo "configure: failed program was:" >&5 149649+ cat conftest.$ac_ext >&5 149650+ rm -rf conftest* 149651+ ac_cv_header_time=no 149652 fi 149653-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 149654+rm -f conftest* 149655 fi 149656-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 149657-echo "${ECHO_T}$ac_cv_header_time" >&6 149658-if test $ac_cv_header_time = yes; then 149659 149660-cat >>confdefs.h <<\_ACEOF 149661+echo "$ac_t""$ac_cv_header_time" 1>&6 149662+if test $ac_cv_header_time = yes; then 149663+ cat >> confdefs.h <<\EOF 149664 #define TIME_WITH_SYS_TIME 1 149665-_ACEOF 149666+EOF 149667 149668 fi 149669 149670-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 149671-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 149672-if test "${ac_cv_type_uid_t+set}" = set; then 149673- echo $ECHO_N "(cached) $ECHO_C" >&6 149674+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 149675+echo "configure:100381: checking for uid_t in sys/types.h" >&5 149676+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then 149677+ echo $ac_n "(cached) $ac_c" 1>&6 149678 else 149679- cat >conftest.$ac_ext <<_ACEOF 149680-/* confdefs.h. */ 149681-_ACEOF 149682-cat confdefs.h >>conftest.$ac_ext 149683-cat >>conftest.$ac_ext <<_ACEOF 149684-/* end confdefs.h. */ 149685+ cat > conftest.$ac_ext <<EOF 149686+#line 100386 "configure" 149687+#include "confdefs.h" 149688 #include <sys/types.h> 149689- 149690-_ACEOF 149691+EOF 149692 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 149693- $EGREP "uid_t" >/dev/null 2>&1; then 149694+ egrep "uid_t" >/dev/null 2>&1; then 149695+ rm -rf conftest* 149696 ac_cv_type_uid_t=yes 149697 else 149698+ rm -rf conftest* 149699 ac_cv_type_uid_t=no 149700 fi 149701 rm -f conftest* 149702 149703 fi 149704-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 149705-echo "${ECHO_T}$ac_cv_type_uid_t" >&6 149706-if test $ac_cv_type_uid_t = no; then 149707 149708-cat >>confdefs.h <<\_ACEOF 149709+echo "$ac_t""$ac_cv_type_uid_t" 1>&6 149710+if test $ac_cv_type_uid_t = no; then 149711+ cat >> confdefs.h <<\EOF 149712 #define uid_t int 149713-_ACEOF 149714- 149715+EOF 149716 149717-cat >>confdefs.h <<\_ACEOF 149718+ cat >> confdefs.h <<\EOF 149719 #define gid_t int 149720-_ACEOF 149721+EOF 149722 149723 fi 149724 149725@@ -130141,122 +100416,68 @@ 149726 149727 149728 # Standard XMLRPC list 149729- 149730- 149731- 149732- 149733- 149734- 149735- 149736- 149737 for ac_func in \ 149738 strtoul strtoull snprintf \ 149739 strstr strpbrk strerror\ 149740 memcpy memmove 149741 do 149742-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 149743-echo "$as_me:$LINENO: checking for $ac_func" >&5 149744-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 149745-if eval "test \"\${$as_ac_var+set}\" = set"; then 149746- echo $ECHO_N "(cached) $ECHO_C" >&6 149747-else 149748- cat >conftest.$ac_ext <<_ACEOF 149749-/* confdefs.h. */ 149750-_ACEOF 149751-cat confdefs.h >>conftest.$ac_ext 149752-cat >>conftest.$ac_ext <<_ACEOF 149753-/* end confdefs.h. */ 149754-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 149755- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 149756-#define $ac_func innocuous_$ac_func 149757- 149758+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 149759+echo "configure:100426: checking for $ac_func" >&5 149760+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 149761+ echo $ac_n "(cached) $ac_c" 1>&6 149762+else 149763+ cat > conftest.$ac_ext <<EOF 149764+#line 100431 "configure" 149765+#include "confdefs.h" 149766 /* System header to define __stub macros and hopefully few prototypes, 149767- which can conflict with char $ac_func (); below. 149768- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 149769- <limits.h> exists even on freestanding compilers. */ 149770- 149771-#ifdef __STDC__ 149772-# include <limits.h> 149773-#else 149774-# include <assert.h> 149775-#endif 149776- 149777-#undef $ac_func 149778- 149779+ which can conflict with char $ac_func(); below. */ 149780+#include <assert.h> 149781 /* Override any gcc2 internal prototype to avoid an error. */ 149782-#ifdef __cplusplus 149783-extern "C" 149784-{ 149785-#endif 149786 /* We use char because int might match the return type of a gcc2 149787- builtin and then its argument prototype would still apply. */ 149788-char $ac_func (); 149789+ builtin and then its argument prototype would still apply. */ 149790+char $ac_func(); 149791+ 149792+int main() { 149793+ 149794 /* The GNU C library defines this for functions which it implements 149795 to always fail with ENOSYS. Some functions are actually named 149796 something starting with __ and the normal name is an alias. */ 149797 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 149798 choke me 149799 #else 149800-char (*f) () = $ac_func; 149801-#endif 149802-#ifdef __cplusplus 149803-} 149804+$ac_func(); 149805 #endif 149806 149807-int 149808-main () 149809-{ 149810-return f != $ac_func; 149811- ; 149812- return 0; 149813-} 149814-_ACEOF 149815-rm -f conftest.$ac_objext conftest$ac_exeext 149816-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 149817- (eval $ac_link) 2>conftest.er1 149818- ac_status=$? 149819- grep -v '^ *+' conftest.er1 >conftest.err 149820- rm -f conftest.er1 149821- cat conftest.err >&5 149822- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149823- (exit $ac_status); } && 149824- { ac_try='test -z "$ac_c_werror_flag" 149825- || test ! -s conftest.err' 149826- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149827- (eval $ac_try) 2>&5 149828- ac_status=$? 149829- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149830- (exit $ac_status); }; } && 149831- { ac_try='test -s conftest$ac_exeext' 149832- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 149833- (eval $ac_try) 2>&5 149834- ac_status=$? 149835- echo "$as_me:$LINENO: \$? = $ac_status" >&5 149836- (exit $ac_status); }; }; then 149837- eval "$as_ac_var=yes" 149838-else 149839- echo "$as_me: failed program was:" >&5 149840-sed 's/^/| /' conftest.$ac_ext >&5 149841- 149842-eval "$as_ac_var=no" 149843-fi 149844-rm -f conftest.err conftest.$ac_objext \ 149845- conftest$ac_exeext conftest.$ac_ext 149846-fi 149847-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 149848-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 149849-if test `eval echo '${'$as_ac_var'}'` = yes; then 149850- cat >>confdefs.h <<_ACEOF 149851-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 149852-_ACEOF 149853+; return 0; } 149854+EOF 149855+if { (eval echo configure:100454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 149856+ rm -rf conftest* 149857+ eval "ac_cv_func_$ac_func=yes" 149858+else 149859+ echo "configure: failed program was:" >&5 149860+ cat conftest.$ac_ext >&5 149861+ rm -rf conftest* 149862+ eval "ac_cv_func_$ac_func=no" 149863+fi 149864+rm -f conftest* 149865+fi 149866 149867+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 149868+ echo "$ac_t""yes" 1>&6 149869+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 149870+ cat >> confdefs.h <<EOF 149871+#define $ac_tr_func 1 149872+EOF 149873+ 149874+else 149875+ echo "$ac_t""no" 1>&6 149876 fi 149877 done 149878 149879 149880 149881 149882- 149883+ 149884 ext_builddir=ext/xmlrpc 149885 ext_srcdir=$abs_srcdir/ext/xmlrpc 149886 149887@@ -130264,15 +100485,15 @@ 149888 149889 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 149890 PHP_XMLRPC_SHARED=no 149891- 149892- 149893+ 149894+ 149895 case ext/xmlrpc in 149896 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 149897 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 149898 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 149899 esac 149900- 149901- 149902+ 149903+ 149904 149905 b_c_pre=$php_c_pre 149906 b_cxx_pre=$php_cxx_pre 149907@@ -130290,12 +100511,12 @@ 149908 libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ 149909 libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ 149910 libxmlrpc/xml_to_soap.c; do 149911- 149912+ 149913 IFS=. 149914 set $ac_src 149915 ac_obj=$1 149916 IFS=$old_IFS 149917- 149918+ 149919 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 149920 149921 case $ac_src in 149922@@ -130319,14 +100540,14 @@ 149923 else 149924 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 149925 PHP_XMLRPC_SHARED=yes 149926- 149927+ 149928 case ext/xmlrpc in 149929 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 149930 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 149931 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 149932 esac 149933- 149934- 149935+ 149936+ 149937 149938 b_c_pre=$shared_c_pre 149939 b_cxx_pre=$shared_cxx_pre 149940@@ -130344,12 +100565,12 @@ 149941 libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ 149942 libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ 149943 libxmlrpc/xml_to_soap.c; do 149944- 149945+ 149946 IFS=. 149947 set $ac_src 149948 ac_obj=$1 149949 IFS=$old_IFS 149950- 149951+ 149952 shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" 149953 149954 case $ac_src in 149955@@ -130367,7 +100588,7 @@ 149956 149957 case $host_alias in 149958 *netware*) 149959- 149960+ 149961 install_modules="install-modules" 149962 149963 case $host_alias in 149964@@ -130377,7 +100598,7 @@ 149965 ;; 149966 *netware*) 149967 suffix=nlm 149968- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_SHARED_LIBADD)' 149969+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' 149970 ;; 149971 *) 149972 suffix=la 149973@@ -130390,7 +100611,7 @@ 149974 else 149975 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" 149976 fi 149977- 149978+ 149979 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" 149980 149981 cat >>Makefile.objects<<EOF 149982@@ -130404,7 +100625,7 @@ 149983 149984 ;; 149985 *) 149986- 149987+ 149988 install_modules="install-modules" 149989 149990 case $host_alias in 149991@@ -130414,7 +100635,7 @@ 149992 ;; 149993 *netware*) 149994 suffix=nlm 149995- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(RPC_SHARED_LIBADD)' 149996+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)' 149997 ;; 149998 *) 149999 suffix=la 150000@@ -130427,7 +100648,7 @@ 150001 else 150002 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" 150003 fi 150004- 150005+ 150006 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" 150007 150008 cat >>Makefile.objects<<EOF 150009@@ -130441,10 +100662,9 @@ 150010 150011 ;; 150012 esac 150013- 150014-cat >>confdefs.h <<_ACEOF 150015+ cat >> confdefs.h <<EOF 150016 #define COMPILE_DL_XMLRPC 1 150017-_ACEOF 150018+EOF 150019 150020 fi 150021 fi 150022@@ -130453,15 +100673,15 @@ 150023 PHP_XMLRPC_SHARED=no 150024 case "$PHP_SAPI" in 150025 cgi|embed) 150026- 150027- 150028+ 150029+ 150030 case ext/xmlrpc in 150031 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150032 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150033 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150034 esac 150035- 150036- 150037+ 150038+ 150039 150040 b_c_pre=$php_c_pre 150041 b_cxx_pre=$php_cxx_pre 150042@@ -130479,12 +100699,12 @@ 150043 libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ 150044 libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ 150045 libxmlrpc/xml_to_soap.c; do 150046- 150047+ 150048 IFS=. 150049 set $ac_src 150050 ac_obj=$1 150051 IFS=$old_IFS 150052- 150053+ 150054 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150055 150056 case $ac_src in 150057@@ -130504,15 +100724,15 @@ 150058 EXT_STATIC="$EXT_STATIC xmlrpc" 150059 ;; 150060 *) 150061- 150062- 150063+ 150064+ 150065 case ext/xmlrpc in 150066 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150067 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150068 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150069 esac 150070- 150071- 150072+ 150073+ 150074 150075 b_c_pre=$php_c_pre 150076 b_cxx_pre=$php_cxx_pre 150077@@ -130530,13 +100750,13 @@ 150078 libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ 150079 libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ 150080 libxmlrpc/xml_to_soap.c; do 150081- 150082+ 150083 IFS=. 150084 set $ac_src 150085 ac_obj=$1 150086 IFS=$old_IFS 150087- 150088- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 150089+ 150090+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150091 150092 case $ac_src in 150093 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 150094@@ -130556,23 +100776,23 @@ 150095 esac 150096 EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" 150097 fi 150098- 150099- 150100+ 150101+ 150102 BUILD_DIR="$BUILD_DIR $ext_builddir" 150103- 150104+ 150105 150106 150107 if test "$ext_builddir" = "."; then 150108 PHP_PECL_EXTENSION=xmlrpc 150109- 150110+ 150111 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 150112 150113 fi 150114 150115- 150116- 150117+ 150118+ 150119 BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" 150120- 150121+ 150122 150123 XMLRPC_MODULE_TYPE=builtin 150124 150125@@ -130583,145 +100803,141 @@ 150126 elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then 150127 XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi 150128 else 150129- echo "$as_me:$LINENO: checking for XMLRPC-EPI in default path" >&5 150130-echo $ECHO_N "checking for XMLRPC-EPI in default path... $ECHO_C" >&6 150131+ echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 150132+echo "configure:100808: checking for XMLRPC-EPI in default path" >&5 150133 for i in /usr/local /usr; do 150134 if test -r $i/include/xmlrpc.h; then 150135 XMLRPC_DIR=$i/include 150136- echo "$as_me:$LINENO: result: found in $i" >&5 150137-echo "${ECHO_T}found in $i" >&6 150138+ echo "$ac_t""found in $i" 1>&6 150139 break 150140 fi 150141 done 150142 fi 150143 150144 if test -z "$XMLRPC_DIR"; then 150145- echo "$as_me:$LINENO: result: not found" >&5 150146-echo "${ECHO_T}not found" >&6 150147- { { echo "$as_me:$LINENO: error: Please reinstall the XMLRPC-EPI distribution" >&5 150148-echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;} 150149- { (exit 1); exit 1; }; } 150150+ echo "$ac_t""not found" 1>&6 150151+ { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } 150152 fi 150153 150154- 150155+ 150156 if test "$XMLRPC_DIR" != "/usr/include"; then 150157- 150158+ 150159 if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then 150160 ai_p=$XMLRPC_DIR 150161 else 150162- 150163+ 150164 ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" 150165- 150166+ 150167 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 150168 ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" 150169 fi 150170 150171- 150172- 150173+ 150174+ 150175 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 150176- 150177+ 150178 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 150179 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150180 eval "INCLUDEPATH$unique=set" 150181- 150182+ 150183 if test ""; then 150184 INCLUDES="-I$ai_p $INCLUDES" 150185 else 150186 INCLUDES="$INCLUDES -I$ai_p" 150187 fi 150188- 150189+ 150190 fi 150191 150192 fi 150193 150194- 150195+ 150196 150197 if test "$ext_shared" = "yes"; then 150198 XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" 150199 if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then 150200- 150201+ 150202 if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then 150203- 150204+ 150205 if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 150206 ai_p=$XMLRPC_DIR/$PHP_LIBDIR 150207 else 150208- 150209+ 150210 ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 150211- 150212+ 150213 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 150214 ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" 150215 fi 150216 150217- 150218+ 150219 if test "$ext_shared" = "yes"; then 150220 XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" 150221 test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" 150222 else 150223- 150224- 150225- 150226+ 150227+ 150228+ 150229 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 150230- 150231+ 150232 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 150233 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150234 eval "LIBPATH$unique=set" 150235- 150236+ 150237 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 150238 LDFLAGS="$LDFLAGS -L$ai_p" 150239 PHP_RPATHS="$PHP_RPATHS $ai_p" 150240- 150241+ 150242 fi 150243 150244 150245 fi 150246- 150247+ 150248 fi 150249 150250 fi 150251 else 150252- 150253+ 150254 150255 if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then 150256- 150257+ 150258 if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then 150259- 150260+ 150261 if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 150262 ai_p=$XMLRPC_DIR/$PHP_LIBDIR 150263 else 150264- 150265+ 150266 ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 150267- 150268+ 150269 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 150270 ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" 150271 fi 150272 150273- 150274- 150275- 150276- 150277+ 150278+ 150279+ 150280+ 150281 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 150282- 150283+ 150284 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 150285 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150286 eval "LIBPATH$unique=set" 150287- 150288+ 150289 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 150290 LDFLAGS="$LDFLAGS -L$ai_p" 150291 PHP_RPATHS="$PHP_RPATHS $ai_p" 150292- 150293+ 150294 fi 150295 150296 150297- 150298+ 150299 fi 150300 150301 fi 150302- 150303- 150304+ 150305+ 150306 case xmlrpc in 150307 c|c_r|pthread*) ;; 150308- *) 150309- LIBS="-lxmlrpc $LIBS" 150310+ *) 150311+ LIBS="-lxmlrpc $LIBS" 150312 ;; 150313 esac 150314 150315@@ -130731,7 +100947,7 @@ 150316 fi 150317 150318 150319- 150320+ 150321 ext_builddir=ext/xmlrpc 150322 ext_srcdir=$abs_srcdir/ext/xmlrpc 150323 150324@@ -130739,15 +100955,15 @@ 150325 150326 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 150327 PHP_XMLRPC_SHARED=no 150328- 150329- 150330+ 150331+ 150332 case ext/xmlrpc in 150333 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150334 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150335 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150336 esac 150337- 150338- 150339+ 150340+ 150341 150342 b_c_pre=$php_c_pre 150343 b_cxx_pre=$php_cxx_pre 150344@@ -130760,12 +100976,12 @@ 150345 150346 old_IFS=$IFS 150347 for ac_src in xmlrpc-epi-php.c; do 150348- 150349+ 150350 IFS=. 150351 set $ac_src 150352 ac_obj=$1 150353 IFS=$old_IFS 150354- 150355+ 150356 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150357 150358 case $ac_src in 150359@@ -130789,14 +101005,14 @@ 150360 else 150361 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 150362 PHP_XMLRPC_SHARED=yes 150363- 150364+ 150365 case ext/xmlrpc in 150366 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150367 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150368 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150369 esac 150370- 150371- 150372+ 150373+ 150374 150375 b_c_pre=$shared_c_pre 150376 b_cxx_pre=$shared_cxx_pre 150377@@ -130809,12 +101025,12 @@ 150378 150379 old_IFS=$IFS 150380 for ac_src in xmlrpc-epi-php.c; do 150381- 150382+ 150383 IFS=. 150384 set $ac_src 150385 ac_obj=$1 150386 IFS=$old_IFS 150387- 150388+ 150389 shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" 150390 150391 case $ac_src in 150392@@ -130832,7 +101048,7 @@ 150393 150394 case $host_alias in 150395 *netware*) 150396- 150397+ 150398 install_modules="install-modules" 150399 150400 case $host_alias in 150401@@ -130842,7 +101058,7 @@ 150402 ;; 150403 *netware*) 150404 suffix=nlm 150405- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(XMLRPC_SHARED_LIBADD)' 150406+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' 150407 ;; 150408 *) 150409 suffix=la 150410@@ -130855,7 +101071,7 @@ 150411 else 150412 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" 150413 fi 150414- 150415+ 150416 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" 150417 150418 cat >>Makefile.objects<<EOF 150419@@ -130869,7 +101085,7 @@ 150420 150421 ;; 150422 *) 150423- 150424+ 150425 install_modules="install-modules" 150426 150427 case $host_alias in 150428@@ -130879,7 +101095,7 @@ 150429 ;; 150430 *netware*) 150431 suffix=nlm 150432- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(RPC_SHARED_LIBADD)' 150433+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)' 150434 ;; 150435 *) 150436 suffix=la 150437@@ -130892,7 +101108,7 @@ 150438 else 150439 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" 150440 fi 150441- 150442+ 150443 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" 150444 150445 cat >>Makefile.objects<<EOF 150446@@ -130906,10 +101122,9 @@ 150447 150448 ;; 150449 esac 150450- 150451-cat >>confdefs.h <<_ACEOF 150452+ cat >> confdefs.h <<EOF 150453 #define COMPILE_DL_XMLRPC 1 150454-_ACEOF 150455+EOF 150456 150457 fi 150458 fi 150459@@ -130918,15 +101133,15 @@ 150460 PHP_XMLRPC_SHARED=no 150461 case "$PHP_SAPI" in 150462 cgi|embed) 150463- 150464- 150465+ 150466+ 150467 case ext/xmlrpc in 150468 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150469 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150470 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150471 esac 150472- 150473- 150474+ 150475+ 150476 150477 b_c_pre=$php_c_pre 150478 b_cxx_pre=$php_cxx_pre 150479@@ -130939,12 +101154,12 @@ 150480 150481 old_IFS=$IFS 150482 for ac_src in xmlrpc-epi-php.c; do 150483- 150484+ 150485 IFS=. 150486 set $ac_src 150487 ac_obj=$1 150488 IFS=$old_IFS 150489- 150490+ 150491 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150492 150493 case $ac_src in 150494@@ -130964,15 +101179,15 @@ 150495 EXT_STATIC="$EXT_STATIC xmlrpc" 150496 ;; 150497 *) 150498- 150499- 150500+ 150501+ 150502 case ext/xmlrpc in 150503 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150504 /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150505 *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150506 esac 150507- 150508- 150509+ 150510+ 150511 150512 b_c_pre=$php_c_pre 150513 b_cxx_pre=$php_cxx_pre 150514@@ -130985,13 +101200,13 @@ 150515 150516 old_IFS=$IFS 150517 for ac_src in xmlrpc-epi-php.c; do 150518- 150519+ 150520 IFS=. 150521 set $ac_src 150522 ac_obj=$1 150523 IFS=$old_IFS 150524- 150525- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 150526+ 150527+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150528 150529 case $ac_src in 150530 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 150531@@ -131011,15 +101226,15 @@ 150532 esac 150533 EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" 150534 fi 150535- 150536- 150537+ 150538+ 150539 BUILD_DIR="$BUILD_DIR $ext_builddir" 150540- 150541+ 150542 150543 150544 if test "$ext_builddir" = "."; then 150545 PHP_PECL_EXTENSION=xmlrpc 150546- 150547+ 150548 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 150549 150550 fi 150551@@ -131031,18 +101246,19 @@ 150552 150553 php_enable_xmlwriter=yes 150554 150555-echo "$as_me:$LINENO: checking whether to enable XMLWriter support" >&5 150556-echo $ECHO_N "checking whether to enable XMLWriter support... $ECHO_C" >&6 150557+echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 150558+echo "configure:101251: checking whether to enable XMLWriter support" >&5 150559 # Check whether --enable-xmlwriter or --disable-xmlwriter was given. 150560 if test "${enable_xmlwriter+set}" = set; then 150561 enableval="$enable_xmlwriter" 150562 PHP_XMLWRITER=$enableval 150563 else 150564- 150565+ 150566 PHP_XMLWRITER=yes 150567 test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL 150568 150569-fi; 150570+fi 150571+ 150572 150573 150574 ext_output="yes, shared" 150575@@ -131066,33 +101282,31 @@ 150576 150577 150578 150579-echo "$as_me:$LINENO: result: $ext_output" >&5 150580-echo "${ECHO_T}$ext_output" >&6 150581+echo "$ac_t""$ext_output" 1>&6 150582 150583 150584 150585 150586 if test -z "$PHP_LIBXML_DIR"; then 150587- 150588+ 150589 php_with_libxml_dir=no 150590 150591-echo "$as_me:$LINENO: checking libxml2 install dir" >&5 150592-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6 150593- 150594+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 150595+echo "configure:101296: checking libxml2 install dir" >&5 150596 # Check whether --with-libxml-dir or --without-libxml-dir was given. 150597 if test "${with_libxml_dir+set}" = set; then 150598 withval="$with_libxml_dir" 150599 PHP_LIBXML_DIR=$withval 150600 else 150601- 150602+ 150603 PHP_LIBXML_DIR=no 150604+ 150605 150606+fi 150607 150608-fi; 150609 150610 ext_output=$PHP_LIBXML_DIR 150611-echo "$as_me:$LINENO: result: $ext_output" >&5 150612-echo "${ECHO_T}$ext_output" >&6 150613+echo "$ac_t""$ext_output" 1>&6 150614 150615 150616 150617@@ -131101,18 +101315,16 @@ 150618 if test "$PHP_XMLWRITER" != "no"; then 150619 150620 if test "$PHP_LIBXML" = "no"; then 150621- { { echo "$as_me:$LINENO: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&5 150622-echo "$as_me: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&2;} 150623- { (exit 1); exit 1; }; } 150624+ { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 150625 fi 150626 150627- 150628-echo "$as_me:$LINENO: checking for xml2-config path" >&5 150629-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6 150630-if test "${ac_cv_php_xml2_config_path+set}" = set; then 150631- echo $ECHO_N "(cached) $ECHO_C" >&6 150632+ 150633+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 150634+echo "configure:101324: checking for xml2-config path" >&5 150635+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then 150636+ echo $ac_n "(cached) $ac_c" 1>&6 150637 else 150638- 150639+ 150640 for i in $PHP_LIBXML_DIR /usr/local /usr; do 150641 if test -x "$i/bin/xml2-config"; then 150642 ac_cv_php_xml2_config_path="$i/bin/xml2-config" 150643@@ -131121,8 +101333,8 @@ 150644 done 150645 150646 fi 150647-echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5 150648-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6 150649+ 150650+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 150651 150652 if test -x "$ac_cv_php_xml2_config_path"; then 150653 XML2_CONFIG="$ac_cv_php_xml2_config_path" 150654@@ -131135,17 +101347,17 @@ 150655 if test "$LIBXML_VERSION" -ge "2006011"; then 150656 LIBXML_LIBS=`$XML2_CONFIG --libs` 150657 LIBXML_INCS=`$XML2_CONFIG --cflags` 150658- 150659+ 150660 for ac_i in $LIBXML_LIBS; do 150661 case $ac_i in 150662 -pthread) 150663 if test "$ext_shared" = "yes"; then 150664 XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" 150665 else 150666- 150667- 150668+ 150669+ 150670 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 150671- 150672+ 150673 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 150674 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150675 eval "EXTRA_LDFLAGS$unique=set" 150676@@ -131156,20 +101368,20 @@ 150677 ;; 150678 -l*) 150679 ac_ii=`echo $ac_i|cut -c 3-` 150680- 150681- 150682+ 150683+ 150684 case $ac_ii in 150685 c|c_r|pthread*) ;; 150686- *) 150687+ *) 150688 if test "$ext_shared" = "yes"; then 150689- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" 150690+ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" 150691 else 150692- 150693- 150694+ 150695+ 150696 case $ac_ii in 150697 c|c_r|pthread*) ;; 150698- *) 150699- LIBS="$LIBS -l$ac_ii" 150700+ *) 150701+ LIBS="$LIBS -l$ac_ii" 150702 ;; 150703 esac 150704 150705@@ -131182,80 +101394,80 @@ 150706 ;; 150707 -L*) 150708 ac_ii=`echo $ac_i|cut -c 3-` 150709- 150710+ 150711 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 150712- 150713+ 150714 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 150715 ai_p=$ac_ii 150716 else 150717- 150718+ 150719 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 150720- 150721+ 150722 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 150723 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 150724 fi 150725 150726- 150727+ 150728 if test "$ext_shared" = "yes"; then 150729 XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" 150730 test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" 150731 else 150732- 150733- 150734- 150735+ 150736+ 150737+ 150738 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 150739- 150740+ 150741 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 150742 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150743 eval "LIBPATH$unique=set" 150744- 150745+ 150746 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 150747 LDFLAGS="$LDFLAGS -L$ai_p" 150748 PHP_RPATHS="$PHP_RPATHS $ai_p" 150749- 150750+ 150751 fi 150752 150753 150754 fi 150755- 150756+ 150757 fi 150758 150759 ;; 150760 esac 150761 done 150762 150763- 150764+ 150765 for ac_i in $LIBXML_INCS; do 150766 case $ac_i in 150767 -I*) 150768 ac_ii=`echo $ac_i|cut -c 3-` 150769- 150770+ 150771 if test "$ac_ii" != "/usr/include"; then 150772- 150773+ 150774 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 150775 ai_p=$ac_ii 150776 else 150777- 150778+ 150779 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 150780- 150781+ 150782 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 150783 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 150784 fi 150785 150786- 150787- 150788+ 150789+ 150790 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 150791- 150792+ 150793 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 150794 if test -n "$unique" && test "`eval $cmd`" = "" ; then 150795 eval "INCLUDEPATH$unique=set" 150796- 150797+ 150798 if test ""; then 150799 INCLUDES="-I$ai_p $INCLUDES" 150800 else 150801 INCLUDES="$INCLUDES -I$ai_p" 150802 fi 150803- 150804+ 150805 fi 150806 150807 fi 150808@@ -131265,92 +101477,74 @@ 150809 done 150810 150811 150812- echo "$as_me:$LINENO: checking whether libxml build works" >&5 150813-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6 150814-if test "${php_cv_libxml_build_works+set}" = set; then 150815- echo $ECHO_N "(cached) $ECHO_C" >&6 150816+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 150817+echo "configure:101482: checking whether libxml build works" >&5 150818+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then 150819+ echo $ac_n "(cached) $ac_c" 1>&6 150820 else 150821- 150822- 150823+ 150824+ 150825 old_LIBS=$LIBS 150826 LIBS=" 150827 $XMLWRITER_SHARED_LIBADD 150828 $LIBS" 150829 if test "$cross_compiling" = yes; then 150830- 150831+ 150832 LIBS=$old_LIBS 150833- 150834+ 150835 else 150836- cat >conftest.$ac_ext <<_ACEOF 150837-/* confdefs.h. */ 150838-_ACEOF 150839-cat confdefs.h >>conftest.$ac_ext 150840-cat >>conftest.$ac_ext <<_ACEOF 150841-/* end confdefs.h. */ 150842- 150843+ cat > conftest.$ac_ext <<EOF 150844+#line 101498 "configure" 150845+#include "confdefs.h" 150846 150847+ 150848 char xmlInitParser(); 150849 int main() { 150850 xmlInitParser(); 150851 return 0; 150852 } 150853- 150854-_ACEOF 150855-rm -f conftest$ac_exeext 150856-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 150857- (eval $ac_link) 2>&5 150858- ac_status=$? 150859- echo "$as_me:$LINENO: \$? = $ac_status" >&5 150860- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 150861- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 150862- (eval $ac_try) 2>&5 150863- ac_status=$? 150864- echo "$as_me:$LINENO: \$? = $ac_status" >&5 150865- (exit $ac_status); }; }; then 150866- 150867+ 150868+EOF 150869+if { (eval echo configure:101509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 150870+then 150871+ 150872 LIBS=$old_LIBS 150873- 150874+ 150875 php_cv_libxml_build_works=yes 150876- 150877- 150878+ 150879+ 150880 else 150881- echo "$as_me: program exited with status $ac_status" >&5 150882-echo "$as_me: failed program was:" >&5 150883-sed 's/^/| /' conftest.$ac_ext >&5 150884- 150885-( exit $ac_status ) 150886- 150887+ echo "configure: failed program was:" >&5 150888+ cat conftest.$ac_ext >&5 150889+ rm -fr conftest* 150890+ 150891 LIBS=$old_LIBS 150892- 150893- echo "$as_me:$LINENO: result: no" >&5 150894-echo "${ECHO_T}no" >&6 150895- { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5 150896-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;} 150897- { (exit 1); exit 1; }; } 150898- 150899- 150900+ 150901+ echo "$ac_t""no" 1>&6 150902+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } 150903+ 150904+ 150905 fi 150906-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 150907+rm -fr conftest* 150908 fi 150909 150910 150911+ 150912 fi 150913-echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5 150914-echo "${ECHO_T}$php_cv_libxml_build_works" >&6 150915- if test "$php_cv_libxml_build_works" = "yes"; then 150916 150917-cat >>confdefs.h <<\_ACEOF 150918+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 150919+ if test "$php_cv_libxml_build_works" = "yes"; then 150920+ cat >> confdefs.h <<\EOF 150921 #define HAVE_LIBXML 1 150922-_ACEOF 150923+EOF 150924 150925 fi 150926- 150927- 150928-cat >>confdefs.h <<\_ACEOF 150929+ 150930+ cat >> confdefs.h <<\EOF 150931 #define HAVE_XMLWRITER 1 150932-_ACEOF 150933- 150934+EOF 150935 150936+ 150937 ext_builddir=ext/xmlwriter 150938 ext_srcdir=$abs_srcdir/ext/xmlwriter 150939 150940@@ -131358,15 +101552,15 @@ 150941 150942 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 150943 PHP_XMLWRITER_SHARED=no 150944- 150945- 150946+ 150947+ 150948 case ext/xmlwriter in 150949 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150950 /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150951 *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150952 esac 150953- 150954- 150955+ 150956+ 150957 150958 b_c_pre=$php_c_pre 150959 b_cxx_pre=$php_cxx_pre 150960@@ -131379,12 +101573,12 @@ 150961 150962 old_IFS=$IFS 150963 for ac_src in php_xmlwriter.c; do 150964- 150965+ 150966 IFS=. 150967 set $ac_src 150968 ac_obj=$1 150969 IFS=$old_IFS 150970- 150971+ 150972 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 150973 150974 case $ac_src in 150975@@ -131408,14 +101602,14 @@ 150976 else 150977 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 150978 PHP_XMLWRITER_SHARED=yes 150979- 150980+ 150981 case ext/xmlwriter in 150982 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 150983 /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 150984 *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 150985 esac 150986- 150987- 150988+ 150989+ 150990 150991 b_c_pre=$shared_c_pre 150992 b_cxx_pre=$shared_cxx_pre 150993@@ -131428,12 +101622,12 @@ 150994 150995 old_IFS=$IFS 150996 for ac_src in php_xmlwriter.c; do 150997- 150998+ 150999 IFS=. 151000 set $ac_src 151001 ac_obj=$1 151002 IFS=$old_IFS 151003- 151004+ 151005 shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" 151006 151007 case $ac_src in 151008@@ -131451,7 +101645,7 @@ 151009 151010 case $host_alias in 151011 *netware*) 151012- 151013+ 151014 install_modules="install-modules" 151015 151016 case $host_alias in 151017@@ -131461,7 +101655,7 @@ 151018 ;; 151019 *netware*) 151020 suffix=nlm 151021- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(XMLWRITER_SHARED_LIBADD)' 151022+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' 151023 ;; 151024 *) 151025 suffix=la 151026@@ -131474,7 +101668,7 @@ 151027 else 151028 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" 151029 fi 151030- 151031+ 151032 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" 151033 151034 cat >>Makefile.objects<<EOF 151035@@ -131488,7 +101682,7 @@ 151036 151037 ;; 151038 *) 151039- 151040+ 151041 install_modules="install-modules" 151042 151043 case $host_alias in 151044@@ -131498,7 +101692,7 @@ 151045 ;; 151046 *netware*) 151047 suffix=nlm 151048- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(WRITER_SHARED_LIBADD)' 151049+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLWRITER, 3)_SHARED_LIBADD)' 151050 ;; 151051 *) 151052 suffix=la 151053@@ -131511,7 +101705,7 @@ 151054 else 151055 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix" 151056 fi 151057- 151058+ 151059 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" 151060 151061 cat >>Makefile.objects<<EOF 151062@@ -131525,10 +101719,9 @@ 151063 151064 ;; 151065 esac 151066- 151067-cat >>confdefs.h <<_ACEOF 151068+ cat >> confdefs.h <<EOF 151069 #define COMPILE_DL_XMLWRITER 1 151070-_ACEOF 151071+EOF 151072 151073 fi 151074 fi 151075@@ -131537,15 +101730,15 @@ 151076 PHP_XMLWRITER_SHARED=no 151077 case "$PHP_SAPI" in 151078 cgi|embed) 151079- 151080- 151081+ 151082+ 151083 case ext/xmlwriter in 151084 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151085 /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151086 *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151087 esac 151088- 151089- 151090+ 151091+ 151092 151093 b_c_pre=$php_c_pre 151094 b_cxx_pre=$php_cxx_pre 151095@@ -131558,12 +101751,12 @@ 151096 151097 old_IFS=$IFS 151098 for ac_src in php_xmlwriter.c; do 151099- 151100+ 151101 IFS=. 151102 set $ac_src 151103 ac_obj=$1 151104 IFS=$old_IFS 151105- 151106+ 151107 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 151108 151109 case $ac_src in 151110@@ -131583,15 +101776,15 @@ 151111 EXT_STATIC="$EXT_STATIC xmlwriter" 151112 ;; 151113 *) 151114- 151115- 151116+ 151117+ 151118 case ext/xmlwriter in 151119 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151120 /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151121 *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151122 esac 151123- 151124- 151125+ 151126+ 151127 151128 b_c_pre=$php_c_pre 151129 b_cxx_pre=$php_cxx_pre 151130@@ -131604,13 +101797,13 @@ 151131 151132 old_IFS=$IFS 151133 for ac_src in php_xmlwriter.c; do 151134- 151135+ 151136 IFS=. 151137 set $ac_src 151138 ac_obj=$1 151139 IFS=$old_IFS 151140- 151141- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 151142+ 151143+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 151144 151145 case $ac_src in 151146 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 151147@@ -131630,33 +101823,29 @@ 151148 esac 151149 EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" 151150 fi 151151- 151152- 151153+ 151154+ 151155 BUILD_DIR="$BUILD_DIR $ext_builddir" 151156- 151157+ 151158 151159 151160 if test "$ext_builddir" = "."; then 151161 PHP_PECL_EXTENSION=xmlwriter 151162- 151163+ 151164 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 151165 151166 fi 151167 151168- 151169+ 151170 PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD" 151171 151172- 151173+ 151174 else 151175- { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5 151176-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;} 151177- { (exit 1); exit 1; }; } 151178+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } 151179 fi 151180-else 151181- { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5 151182-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;} 151183- { (exit 1); exit 1; }; } 151184- 151185+else 151186+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } 151187+ 151188 fi 151189 151190 fi 151191@@ -131665,19 +101854,19 @@ 151192 151193 php_with_xsl=no 151194 151195-echo "$as_me:$LINENO: checking for XSL support" >&5 151196-echo $ECHO_N "checking for XSL support... $ECHO_C" >&6 151197- 151198+echo $ac_n "checking for XSL support""... $ac_c" 1>&6 151199+echo "configure:101859: checking for XSL support" >&5 151200 # Check whether --with-xsl or --without-xsl was given. 151201 if test "${with_xsl+set}" = set; then 151202 withval="$with_xsl" 151203 PHP_XSL=$withval 151204 else 151205- 151206+ 151207 PHP_XSL=no 151208 test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL 151209 151210-fi; 151211+fi 151212+ 151213 151214 151215 ext_output="yes, shared" 151216@@ -131701,8 +101890,7 @@ 151217 151218 151219 151220-echo "$as_me:$LINENO: result: $ext_output" >&5 151221-echo "${ECHO_T}$ext_output" >&6 151222+echo "$ac_t""$ext_output" 1>&6 151223 151224 151225 151226@@ -131710,15 +101898,11 @@ 151227 if test "$PHP_XSL" != "no"; then 151228 151229 if test "$PHP_LIBXML" = "no"; then 151230- { { echo "$as_me:$LINENO: error: XSL extension requires LIBXML extension, add --enable-libxml" >&5 151231-echo "$as_me: error: XSL extension requires LIBXML extension, add --enable-libxml" >&2;} 151232- { (exit 1); exit 1; }; } 151233+ { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } 151234 fi 151235- 151236+ 151237 if test "$PHP_DOM" = "no"; then 151238- { { echo "$as_me:$LINENO: error: XSL extension requires DOM extension, add --enable-dom" >&5 151239-echo "$as_me: error: XSL extension requires DOM extension, add --enable-dom" >&2;} 151240- { (exit 1); exit 1; }; } 151241+ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } 151242 fi 151243 151244 for i in $PHP_XSL /usr/local /usr; do 151245@@ -131729,9 +101913,7 @@ 151246 done 151247 151248 if test -z "$XSLT_CONFIG"; then 151249- { { echo "$as_me:$LINENO: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&5 151250-echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&2;} 151251- { (exit 1); exit 1; }; } 151252+ { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } 151253 else 151254 libxslt_full_version=`$XSLT_CONFIG --version` 151255 ac_IFS=$IFS 151256@@ -131742,17 +101924,17 @@ 151257 if test "$LIBXSLT_VERSION" -ge "1001000"; then 151258 XSL_LIBS=`$XSLT_CONFIG --libs` 151259 XSL_INCS=`$XSLT_CONFIG --cflags` 151260- 151261+ 151262 for ac_i in $XSL_LIBS; do 151263 case $ac_i in 151264 -pthread) 151265 if test "$ext_shared" = "yes"; then 151266 XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" 151267 else 151268- 151269- 151270+ 151271+ 151272 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 151273- 151274+ 151275 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 151276 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151277 eval "EXTRA_LDFLAGS$unique=set" 151278@@ -131763,20 +101945,20 @@ 151279 ;; 151280 -l*) 151281 ac_ii=`echo $ac_i|cut -c 3-` 151282- 151283- 151284+ 151285+ 151286 case $ac_ii in 151287 c|c_r|pthread*) ;; 151288- *) 151289+ *) 151290 if test "$ext_shared" = "yes"; then 151291- XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" 151292+ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" 151293 else 151294- 151295- 151296+ 151297+ 151298 case $ac_ii in 151299 c|c_r|pthread*) ;; 151300- *) 151301- LIBS="$LIBS -l$ac_ii" 151302+ *) 151303+ LIBS="$LIBS -l$ac_ii" 151304 ;; 151305 esac 151306 151307@@ -131789,80 +101971,80 @@ 151308 ;; 151309 -L*) 151310 ac_ii=`echo $ac_i|cut -c 3-` 151311- 151312+ 151313 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 151314- 151315+ 151316 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 151317 ai_p=$ac_ii 151318 else 151319- 151320+ 151321 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 151322- 151323+ 151324 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 151325 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 151326 fi 151327 151328- 151329+ 151330 if test "$ext_shared" = "yes"; then 151331 XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" 151332 test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" 151333 else 151334- 151335- 151336- 151337+ 151338+ 151339+ 151340 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 151341- 151342+ 151343 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 151344 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151345 eval "LIBPATH$unique=set" 151346- 151347+ 151348 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 151349 LDFLAGS="$LDFLAGS -L$ai_p" 151350 PHP_RPATHS="$PHP_RPATHS $ai_p" 151351- 151352+ 151353 fi 151354 151355 151356 fi 151357- 151358+ 151359 fi 151360 151361 ;; 151362 esac 151363 done 151364 151365- 151366+ 151367 for ac_i in $XSL_INCS; do 151368 case $ac_i in 151369 -I*) 151370 ac_ii=`echo $ac_i|cut -c 3-` 151371- 151372+ 151373 if test "$ac_ii" != "/usr/include"; then 151374- 151375+ 151376 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 151377 ai_p=$ac_ii 151378 else 151379- 151380+ 151381 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 151382- 151383+ 151384 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 151385 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 151386 fi 151387 151388- 151389- 151390+ 151391+ 151392 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 151393- 151394+ 151395 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 151396 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151397 eval "INCLUDEPATH$unique=set" 151398- 151399+ 151400 if test ""; then 151401 INCLUDES="-I$ai_p $INCLUDES" 151402 else 151403 INCLUDES="$INCLUDES -I$ai_p" 151404 fi 151405- 151406+ 151407 fi 151408 151409 fi 151410@@ -131871,9 +102053,9 @@ 151411 esac 151412 done 151413 151414- 151415- echo "$as_me:$LINENO: checking for EXSLT support" >&5 151416-echo $ECHO_N "checking for EXSLT support... $ECHO_C" >&6 151417+ 151418+ echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 151419+echo "configure:102059: checking for EXSLT support" >&5 151420 for i in $PHP_XSL /usr/local /usr; do 151421 if test -r "$i/include/libexslt/exslt.h"; then 151422 PHP_XSL_EXSL_DIR=$i 151423@@ -131881,99 +102063,97 @@ 151424 fi 151425 done 151426 if test -z "$PHP_XSL_EXSL_DIR"; then 151427- echo "$as_me:$LINENO: result: not found" >&5 151428-echo "${ECHO_T}not found" >&6 151429- else 151430- echo "$as_me:$LINENO: result: found" >&5 151431-echo "${ECHO_T}found" >&6 151432- 151433+ echo "$ac_t""not found" 1>&6 151434+ else 151435+ echo "$ac_t""found" 1>&6 151436+ 151437 151438 if test "$ext_shared" = "yes"; then 151439 XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" 151440 if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then 151441- 151442+ 151443 if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then 151444- 151445+ 151446 if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 151447 ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR 151448 else 151449- 151450+ 151451 ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 151452- 151453+ 151454 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 151455 ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" 151456 fi 151457 151458- 151459+ 151460 if test "$ext_shared" = "yes"; then 151461 XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" 151462 test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" 151463 else 151464- 151465- 151466- 151467+ 151468+ 151469+ 151470 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 151471- 151472+ 151473 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 151474 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151475 eval "LIBPATH$unique=set" 151476- 151477+ 151478 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 151479 LDFLAGS="$LDFLAGS -L$ai_p" 151480 PHP_RPATHS="$PHP_RPATHS $ai_p" 151481- 151482+ 151483 fi 151484 151485 151486 fi 151487- 151488+ 151489 fi 151490 151491 fi 151492 else 151493- 151494+ 151495 151496 if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then 151497- 151498+ 151499 if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then 151500- 151501+ 151502 if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 151503 ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR 151504 else 151505- 151506+ 151507 ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 151508- 151509+ 151510 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 151511 ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" 151512 fi 151513 151514- 151515- 151516- 151517- 151518+ 151519+ 151520+ 151521+ 151522 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 151523- 151524+ 151525 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 151526 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151527 eval "LIBPATH$unique=set" 151528- 151529+ 151530 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 151531 LDFLAGS="$LDFLAGS -L$ai_p" 151532 PHP_RPATHS="$PHP_RPATHS $ai_p" 151533- 151534+ 151535 fi 151536 151537 151538- 151539+ 151540 fi 151541 151542 fi 151543- 151544- 151545+ 151546+ 151547 case exslt in 151548 c|c_r|pthread*) ;; 151549- *) 151550- LIBS="-lexslt $LIBS" 151551+ *) 151552+ LIBS="-lexslt $LIBS" 151553 ;; 151554 esac 151555 151556@@ -131983,58 +102163,54 @@ 151557 fi 151558 151559 151560- 151561+ 151562 if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then 151563- 151564+ 151565 if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then 151566 ai_p=$PHP_XSL_EXSL_DIR/include 151567 else 151568- 151569+ 151570 ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" 151571- 151572+ 151573 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 151574 ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" 151575 fi 151576 151577- 151578- 151579+ 151580+ 151581 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 151582- 151583+ 151584 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 151585 if test -n "$unique" && test "`eval $cmd`" = "" ; then 151586 eval "INCLUDEPATH$unique=set" 151587- 151588+ 151589 if test ""; then 151590 INCLUDES="-I$ai_p $INCLUDES" 151591 else 151592 INCLUDES="$INCLUDES -I$ai_p" 151593 fi 151594- 151595+ 151596 fi 151597 151598 fi 151599 151600- 151601-cat >>confdefs.h <<\_ACEOF 151602+ cat >> confdefs.h <<\EOF 151603 #define HAVE_XSL_EXSLT 1 151604-_ACEOF 151605+EOF 151606 151607 fi 151608 else 151609- { { echo "$as_me:$LINENO: error: libxslt version 1.1.0 or greater required." >&5 151610-echo "$as_me: error: libxslt version 1.1.0 or greater required." >&2;} 151611- { (exit 1); exit 1; }; } 151612+ { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } 151613 fi 151614- 151615- 151616+ 151617+ 151618 fi 151619- 151620- 151621-cat >>confdefs.h <<\_ACEOF 151622+ 151623+ cat >> confdefs.h <<\EOF 151624 #define HAVE_XSL 1 151625-_ACEOF 151626- 151627+EOF 151628 151629+ 151630 ext_builddir=ext/xsl 151631 ext_srcdir=$abs_srcdir/ext/xsl 151632 151633@@ -132042,15 +102218,15 @@ 151634 151635 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 151636 PHP_XSL_SHARED=no 151637- 151638- 151639+ 151640+ 151641 case ext/xsl in 151642 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151643 /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151644 *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151645 esac 151646- 151647- 151648+ 151649+ 151650 151651 b_c_pre=$php_c_pre 151652 b_cxx_pre=$php_cxx_pre 151653@@ -132063,12 +102239,12 @@ 151654 151655 old_IFS=$IFS 151656 for ac_src in php_xsl.c xsltprocessor.c; do 151657- 151658+ 151659 IFS=. 151660 set $ac_src 151661 ac_obj=$1 151662 IFS=$old_IFS 151663- 151664+ 151665 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 151666 151667 case $ac_src in 151668@@ -132092,14 +102268,14 @@ 151669 else 151670 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 151671 PHP_XSL_SHARED=yes 151672- 151673+ 151674 case ext/xsl in 151675 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151676 /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151677 *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151678 esac 151679- 151680- 151681+ 151682+ 151683 151684 b_c_pre=$shared_c_pre 151685 b_cxx_pre=$shared_cxx_pre 151686@@ -132112,12 +102288,12 @@ 151687 151688 old_IFS=$IFS 151689 for ac_src in php_xsl.c xsltprocessor.c; do 151690- 151691+ 151692 IFS=. 151693 set $ac_src 151694 ac_obj=$1 151695 IFS=$old_IFS 151696- 151697+ 151698 shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo" 151699 151700 case $ac_src in 151701@@ -132135,7 +102311,7 @@ 151702 151703 case $host_alias in 151704 *netware*) 151705- 151706+ 151707 install_modules="install-modules" 151708 151709 case $host_alias in 151710@@ -132145,7 +102321,7 @@ 151711 ;; 151712 *netware*) 151713 suffix=nlm 151714- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(XSL_SHARED_LIBADD)' 151715+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)' 151716 ;; 151717 *) 151718 suffix=la 151719@@ -132158,7 +102334,7 @@ 151720 else 151721 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix" 151722 fi 151723- 151724+ 151725 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" 151726 151727 cat >>Makefile.objects<<EOF 151728@@ -132172,7 +102348,7 @@ 151729 151730 ;; 151731 *) 151732- 151733+ 151734 install_modules="install-modules" 151735 151736 case $host_alias in 151737@@ -132182,7 +102358,7 @@ 151738 ;; 151739 *netware*) 151740 suffix=nlm 151741- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 151742+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)' 151743 ;; 151744 *) 151745 suffix=la 151746@@ -132195,7 +102371,7 @@ 151747 else 151748 PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix" 151749 fi 151750- 151751+ 151752 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" 151753 151754 cat >>Makefile.objects<<EOF 151755@@ -132209,10 +102385,9 @@ 151756 151757 ;; 151758 esac 151759- 151760-cat >>confdefs.h <<_ACEOF 151761+ cat >> confdefs.h <<EOF 151762 #define COMPILE_DL_XSL 1 151763-_ACEOF 151764+EOF 151765 151766 fi 151767 fi 151768@@ -132221,15 +102396,15 @@ 151769 PHP_XSL_SHARED=no 151770 case "$PHP_SAPI" in 151771 cgi|embed) 151772- 151773- 151774+ 151775+ 151776 case ext/xsl in 151777 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151778 /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151779 *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151780 esac 151781- 151782- 151783+ 151784+ 151785 151786 b_c_pre=$php_c_pre 151787 b_cxx_pre=$php_cxx_pre 151788@@ -132242,12 +102417,12 @@ 151789 151790 old_IFS=$IFS 151791 for ac_src in php_xsl.c xsltprocessor.c; do 151792- 151793+ 151794 IFS=. 151795 set $ac_src 151796 ac_obj=$1 151797 IFS=$old_IFS 151798- 151799+ 151800 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 151801 151802 case $ac_src in 151803@@ -132267,15 +102442,15 @@ 151804 EXT_STATIC="$EXT_STATIC xsl" 151805 ;; 151806 *) 151807- 151808- 151809+ 151810+ 151811 case ext/xsl in 151812 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 151813 /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 151814 *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 151815 esac 151816- 151817- 151818+ 151819+ 151820 151821 b_c_pre=$php_c_pre 151822 b_cxx_pre=$php_cxx_pre 151823@@ -132288,13 +102463,13 @@ 151824 151825 old_IFS=$IFS 151826 for ac_src in php_xsl.c xsltprocessor.c; do 151827- 151828+ 151829 IFS=. 151830 set $ac_src 151831 ac_obj=$1 151832 IFS=$old_IFS 151833- 151834- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 151835+ 151836+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 151837 151838 case $ac_src in 151839 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 151840@@ -132314,71 +102489,60 @@ 151841 esac 151842 EXT_CLI_STATIC="$EXT_CLI_STATIC xsl" 151843 fi 151844- 151845- 151846+ 151847+ 151848 BUILD_DIR="$BUILD_DIR $ext_builddir" 151849- 151850+ 151851 151852 151853 if test "$ext_builddir" = "."; then 151854 PHP_PECL_EXTENSION=xsl 151855- 151856+ 151857 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 151858 151859 fi 151860 151861- 151862+ 151863 PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD" 151864 151865- 151866+ 151867 am_i_shared=$PHP_XSL_SHARED 151868 is_it_shared=$PHP_LIBXML_SHARED 151869 is_it_enabled=$PHP_LIBXML 151870 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then 151871- { { echo "$as_me:$LINENO: error: 151872-You've configured extension xsl to build statically, but it 151873-depends on extension libxml, which you've configured to build shared. 151874-You either need to build xsl shared or build libxml statically for the 151875-build to be successful. 151876-" >&5 151877-echo "$as_me: error: 151878+ { echo "configure: error: 151879 You've configured extension xsl to build statically, but it 151880 depends on extension libxml, which you've configured to build shared. 151881 You either need to build xsl shared or build libxml statically for the 151882 build to be successful. 151883-" >&2;} 151884- { (exit 1); exit 1; }; } 151885+" 1>&2; exit 1; } 151886 fi 151887 if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then 151888- { { echo "$as_me:$LINENO: error: 151889-You've configured extension xsl, which depends on extension libxml, 151890-but you've either not enabled libxml, or have disabled it. 151891-" >&5 151892-echo "$as_me: error: 151893+ { echo "configure: error: 151894 You've configured extension xsl, which depends on extension libxml, 151895 but you've either not enabled libxml, or have disabled it. 151896-" >&2;} 151897- { (exit 1); exit 1; }; } 151898+" 1>&2; exit 1; } 151899 fi 151900- 151901+ 151902 fi 151903 151904 151905 151906 php_enable_zip=no 151907 151908-echo "$as_me:$LINENO: checking for zip archive read/writesupport" >&5 151909-echo $ECHO_N "checking for zip archive read/writesupport... $ECHO_C" >&6 151910+echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 151911+echo "configure:102535: checking for zip archive read/writesupport" >&5 151912 # Check whether --enable-zip or --disable-zip was given. 151913 if test "${enable_zip+set}" = set; then 151914 enableval="$enable_zip" 151915 PHP_ZIP=$enableval 151916 else 151917- 151918+ 151919 PHP_ZIP=no 151920 test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL 151921 151922-fi; 151923+fi 151924+ 151925 151926 151927 ext_output="yes, shared" 151928@@ -132402,33 +102566,31 @@ 151929 151930 151931 151932-echo "$as_me:$LINENO: result: $ext_output" >&5 151933-echo "${ECHO_T}$ext_output" >&6 151934+echo "$ac_t""$ext_output" 1>&6 151935 151936 151937 151938 151939 if test -z "$PHP_ZLIB_DIR"; then 151940- 151941+ 151942 php_with_zlib_dir=no 151943 151944-echo "$as_me:$LINENO: checking for the location of libz" >&5 151945-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6 151946- 151947+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 151948+echo "configure:102580: checking for the location of libz" >&5 151949 # Check whether --with-zlib-dir or --without-zlib-dir was given. 151950 if test "${with_zlib_dir+set}" = set; then 151951 withval="$with_zlib_dir" 151952 PHP_ZLIB_DIR=$withval 151953 else 151954- 151955+ 151956 PHP_ZLIB_DIR=no 151957+ 151958 151959+fi 151960 151961-fi; 151962 151963 ext_output=$PHP_ZLIB_DIR 151964-echo "$as_me:$LINENO: result: $ext_output" >&5 151965-echo "${ECHO_T}$ext_output" >&6 151966+echo "$ac_t""$ext_output" 1>&6 151967 151968 151969 151970@@ -132437,23 +102599,22 @@ 151971 151972 php_with_pcre_dir=no 151973 151974-echo "$as_me:$LINENO: checking pcre install prefix" >&5 151975-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6 151976- 151977+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 151978+echo "configure:102604: checking pcre install prefix" >&5 151979 # Check whether --with-pcre-dir or --without-pcre-dir was given. 151980 if test "${with_pcre_dir+set}" = set; then 151981 withval="$with_pcre_dir" 151982 PHP_PCRE_DIR=$withval 151983 else 151984- 151985+ 151986 PHP_PCRE_DIR=no 151987+ 151988 151989+fi 151990 151991-fi; 151992 151993 ext_output=$PHP_PCRE_DIR 151994-echo "$as_me:$LINENO: result: $ext_output" >&5 151995-echo "${ECHO_T}$ext_output" >&6 151996+echo "$ac_t""$ext_output" 1>&6 151997 151998 151999 152000@@ -132468,9 +102629,7 @@ 152001 PHP_ZLIB_DIR="$PHP_ZLIB_DIR" 152002 PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" 152003 else 152004- { { echo "$as_me:$LINENO: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&5 152005-echo "$as_me: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;} 152006- { (exit 1); exit 1; }; } 152007+ { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } 152008 fi 152009 else 152010 for i in /usr/local /usr; do 152011@@ -132484,103 +102643,100 @@ 152012 done 152013 fi 152014 152015- echo "$as_me:$LINENO: checking for the location of zlib" >&5 152016-echo $ECHO_N "checking for the location of zlib... $ECHO_C" >&6 152017+ echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 152018+echo "configure:102648: checking for the location of zlib" >&5 152019 if test "$PHP_ZLIB_DIR" = "no"; then 152020- { { echo "$as_me:$LINENO: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&5 152021-echo "$as_me: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&2;} 152022- { (exit 1); exit 1; }; } 152023+ { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } 152024 else 152025- echo "$as_me:$LINENO: result: $PHP_ZLIB_DIR" >&5 152026-echo "${ECHO_T}$PHP_ZLIB_DIR" >&6 152027- 152028+ echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 152029+ 152030 152031 if test "$ext_shared" = "yes"; then 152032 ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" 152033 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 152034- 152035+ 152036 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 152037- 152038+ 152039 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 152040 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 152041 else 152042- 152043+ 152044 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 152045- 152046+ 152047 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 152048 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 152049 fi 152050 152051- 152052+ 152053 if test "$ext_shared" = "yes"; then 152054 ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" 152055 test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" 152056 else 152057- 152058- 152059- 152060+ 152061+ 152062+ 152063 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 152064- 152065+ 152066 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 152067 if test -n "$unique" && test "`eval $cmd`" = "" ; then 152068 eval "LIBPATH$unique=set" 152069- 152070+ 152071 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 152072 LDFLAGS="$LDFLAGS -L$ai_p" 152073 PHP_RPATHS="$PHP_RPATHS $ai_p" 152074- 152075+ 152076 fi 152077 152078 152079 fi 152080- 152081+ 152082 fi 152083 152084 fi 152085 else 152086- 152087+ 152088 152089 if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then 152090- 152091+ 152092 if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then 152093- 152094+ 152095 if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then 152096 ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR 152097 else 152098- 152099+ 152100 ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" 152101- 152102+ 152103 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 152104 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" 152105 fi 152106 152107- 152108- 152109- 152110- 152111+ 152112+ 152113+ 152114+ 152115 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 152116- 152117+ 152118 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 152119 if test -n "$unique" && test "`eval $cmd`" = "" ; then 152120 eval "LIBPATH$unique=set" 152121- 152122+ 152123 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 152124 LDFLAGS="$LDFLAGS -L$ai_p" 152125 PHP_RPATHS="$PHP_RPATHS $ai_p" 152126- 152127+ 152128 fi 152129 152130 152131- 152132+ 152133 fi 152134 152135 fi 152136- 152137- 152138+ 152139+ 152140 case z in 152141 c|c_r|pthread*) ;; 152142- *) 152143- LIBS="-lz $LIBS" 152144+ *) 152145+ LIBS="-lz $LIBS" 152146 ;; 152147 esac 152148 152149@@ -132590,33 +102746,33 @@ 152150 fi 152151 152152 152153- 152154+ 152155 if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then 152156- 152157+ 152158 if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then 152159 ai_p=$PHP_ZLIB_INCDIR 152160 else 152161- 152162+ 152163 ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" 152164- 152165+ 152166 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 152167 ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" 152168 fi 152169 152170- 152171- 152172+ 152173+ 152174 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 152175- 152176+ 152177 cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" 152178 if test -n "$unique" && test "`eval $cmd`" = "" ; then 152179 eval "INCLUDEPATH$unique=set" 152180- 152181+ 152182 if test ""; then 152183 INCLUDES="-I$ai_p $INCLUDES" 152184 else 152185 INCLUDES="$INCLUDES -I$ai_p" 152186 fi 152187- 152188+ 152189 fi 152190 152191 fi 152192@@ -132625,52 +102781,50 @@ 152193 152194 old_CPPFLAGS=$CPPFLAGS 152195 CPPFLAGS=$INCLUDES 152196- cat >conftest.$ac_ext <<_ACEOF 152197-/* confdefs.h. */ 152198-_ACEOF 152199-cat confdefs.h >>conftest.$ac_ext 152200-cat >>conftest.$ac_ext <<_ACEOF 152201-/* end confdefs.h. */ 152202+ cat > conftest.$ac_ext <<EOF 152203+#line 102786 "configure" 152204+#include "confdefs.h" 152205 152206 #include <main/php_config.h> 152207 #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) 152208 yes 152209 #endif 152210- 152211-_ACEOF 152212+ 152213+EOF 152214 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 152215- $EGREP "yes" >/dev/null 2>&1; then 152216- 152217+ egrep "yes" >/dev/null 2>&1; then 152218+ rm -rf conftest* 152219+ 152220 PHP_PCRE_REGEX=yes 152221- 152222+ 152223 else 152224- 152225- cat >conftest.$ac_ext <<_ACEOF 152226-/* confdefs.h. */ 152227-_ACEOF 152228-cat confdefs.h >>conftest.$ac_ext 152229-cat >>conftest.$ac_ext <<_ACEOF 152230-/* end confdefs.h. */ 152231+ rm -rf conftest* 152232+ 152233+ cat > conftest.$ac_ext <<EOF 152234+#line 102805 "configure" 152235+#include "confdefs.h" 152236 152237 #include <main/php_config.h> 152238 #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) 152239 yes 152240 #endif 152241- 152242-_ACEOF 152243+ 152244+EOF 152245 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 152246- $EGREP "yes" >/dev/null 2>&1; then 152247- 152248+ egrep "yes" >/dev/null 2>&1; then 152249+ rm -rf conftest* 152250+ 152251 PHP_PCRE_REGEX=pecl 152252- 152253+ 152254 else 152255- 152256+ rm -rf conftest* 152257+ 152258 PHP_PCRE_REGEX=no 152259- 152260+ 152261 fi 152262 rm -f conftest* 152263 152264- 152265+ 152266 fi 152267 rm -f conftest* 152268 152269@@ -132703,12 +102857,11 @@ 152270 lib/zip_source_open.c lib/zip_source_pkware.c lib/zip_source_pop.c \ 152271 lib/zip_source_read.c lib/zip_source_stat.c" 152272 152273- 152274-cat >>confdefs.h <<\_ACEOF 152275+ cat >> confdefs.h <<\EOF 152276 #define HAVE_ZIP 1 152277-_ACEOF 152278- 152279+EOF 152280 152281+ 152282 ext_builddir=ext/zip 152283 ext_srcdir=$abs_srcdir/ext/zip 152284 152285@@ -132716,15 +102869,15 @@ 152286 152287 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 152288 PHP_ZIP_SHARED=no 152289- 152290- 152291+ 152292+ 152293 case ext/zip in 152294 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152295 /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152296 *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152297 esac 152298- 152299- 152300+ 152301+ 152302 152303 b_c_pre=$php_c_pre 152304 b_cxx_pre=$php_cxx_pre 152305@@ -132737,12 +102890,12 @@ 152306 152307 old_IFS=$IFS 152308 for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do 152309- 152310+ 152311 IFS=. 152312 set $ac_src 152313 ac_obj=$1 152314 IFS=$old_IFS 152315- 152316+ 152317 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152318 152319 case $ac_src in 152320@@ -132766,14 +102919,14 @@ 152321 else 152322 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 152323 PHP_ZIP_SHARED=yes 152324- 152325+ 152326 case ext/zip in 152327 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152328 /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152329 *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152330 esac 152331- 152332- 152333+ 152334+ 152335 152336 b_c_pre=$shared_c_pre 152337 b_cxx_pre=$shared_cxx_pre 152338@@ -132786,12 +102939,12 @@ 152339 152340 old_IFS=$IFS 152341 for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do 152342- 152343+ 152344 IFS=. 152345 set $ac_src 152346 ac_obj=$1 152347 IFS=$old_IFS 152348- 152349+ 152350 shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo" 152351 152352 case $ac_src in 152353@@ -132809,7 +102962,7 @@ 152354 152355 case $host_alias in 152356 *netware*) 152357- 152358+ 152359 install_modules="install-modules" 152360 152361 case $host_alias in 152362@@ -132819,7 +102972,7 @@ 152363 ;; 152364 *netware*) 152365 suffix=nlm 152366- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(ZIP_SHARED_LIBADD)' 152367+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)' 152368 ;; 152369 *) 152370 suffix=la 152371@@ -132832,7 +102985,7 @@ 152372 else 152373 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix" 152374 fi 152375- 152376+ 152377 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" 152378 152379 cat >>Makefile.objects<<EOF 152380@@ -132846,7 +102999,7 @@ 152381 152382 ;; 152383 *) 152384- 152385+ 152386 install_modules="install-modules" 152387 152388 case $host_alias in 152389@@ -132856,7 +103009,7 @@ 152390 ;; 152391 *netware*) 152392 suffix=nlm 152393- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(_SHARED_LIBADD)' 152394+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(ZIP, 3)_SHARED_LIBADD)' 152395 ;; 152396 *) 152397 suffix=la 152398@@ -132869,7 +103022,7 @@ 152399 else 152400 PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix" 152401 fi 152402- 152403+ 152404 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" 152405 152406 cat >>Makefile.objects<<EOF 152407@@ -132883,10 +103036,9 @@ 152408 152409 ;; 152410 esac 152411- 152412-cat >>confdefs.h <<_ACEOF 152413+ cat >> confdefs.h <<EOF 152414 #define COMPILE_DL_ZIP 1 152415-_ACEOF 152416+EOF 152417 152418 fi 152419 fi 152420@@ -132895,15 +103047,15 @@ 152421 PHP_ZIP_SHARED=no 152422 case "$PHP_SAPI" in 152423 cgi|embed) 152424- 152425- 152426+ 152427+ 152428 case ext/zip in 152429 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152430 /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152431 *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152432 esac 152433- 152434- 152435+ 152436+ 152437 152438 b_c_pre=$php_c_pre 152439 b_cxx_pre=$php_cxx_pre 152440@@ -132916,12 +103068,12 @@ 152441 152442 old_IFS=$IFS 152443 for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do 152444- 152445+ 152446 IFS=. 152447 set $ac_src 152448 ac_obj=$1 152449 IFS=$old_IFS 152450- 152451+ 152452 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152453 152454 case $ac_src in 152455@@ -132941,15 +103093,15 @@ 152456 EXT_STATIC="$EXT_STATIC zip" 152457 ;; 152458 *) 152459- 152460- 152461+ 152462+ 152463 case ext/zip in 152464 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152465 /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152466 *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152467 esac 152468- 152469- 152470+ 152471+ 152472 152473 b_c_pre=$php_c_pre 152474 b_cxx_pre=$php_cxx_pre 152475@@ -132962,13 +103114,13 @@ 152476 152477 old_IFS=$IFS 152478 for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do 152479- 152480+ 152481 IFS=. 152482 set $ac_src 152483 ac_obj=$1 152484 IFS=$old_IFS 152485- 152486- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 152487+ 152488+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152489 152490 case $ac_src in 152491 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 152492@@ -132988,29 +103140,29 @@ 152493 esac 152494 EXT_CLI_STATIC="$EXT_CLI_STATIC zip" 152495 fi 152496- 152497- 152498+ 152499+ 152500 BUILD_DIR="$BUILD_DIR $ext_builddir" 152501- 152502+ 152503 152504 152505 if test "$ext_builddir" = "."; then 152506 PHP_PECL_EXTENSION=zip 152507- 152508+ 152509 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 152510 152511 fi 152512 152513- 152514- 152515+ 152516+ 152517 $php_shtool mkdir -p $ext_builddir/lib 152518+ 152519 152520- 152521- 152522+ 152523 PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD" 152524 152525 152526- 152527+ 152528 src=$ext_srcdir/Makefile.frag 152529 ac_srcdir=$ext_srcdir 152530 ac_builddir=$ext_builddir 152531@@ -133022,18 +103174,19 @@ 152532 152533 php_enable_mysqlnd=no 152534 152535-echo "$as_me:$LINENO: checking whether to enable mysqlnd" >&5 152536-echo $ECHO_N "checking whether to enable mysqlnd... $ECHO_C" >&6 152537+echo $ac_n "checking whether to enable mysqlnd""... $ac_c" 1>&6 152538+echo "configure:103179: checking whether to enable mysqlnd" >&5 152539 # Check whether --enable-mysqlnd or --disable-mysqlnd was given. 152540 if test "${enable_mysqlnd+set}" = set; then 152541 enableval="$enable_mysqlnd" 152542 PHP_MYSQLND=$enableval 152543 else 152544- 152545+ 152546 PHP_MYSQLND=no 152547 test "$PHP_ENABLE_ALL" && PHP_MYSQLND=$PHP_ENABLE_ALL 152548 152549-fi; 152550+fi 152551+ 152552 152553 152554 ext_output="yes, shared" 152555@@ -133057,8 +103210,7 @@ 152556 152557 152558 152559-echo "$as_me:$LINENO: result: $ext_output" >&5 152560-echo "${ECHO_T}$ext_output" >&6 152561+echo "$ac_t""$ext_output" 1>&6 152562 152563 152564 152565@@ -133066,47 +103218,46 @@ 152566 152567 php_enable_mysqlnd_compression_support=yes 152568 152569-echo "$as_me:$LINENO: checking whether to disable compressed protocol support in mysqlnd" >&5 152570-echo $ECHO_N "checking whether to disable compressed protocol support in mysqlnd... $ECHO_C" >&6 152571+echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6 152572+echo "configure:103223: checking whether to disable compressed protocol support in mysqlnd" >&5 152573 # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given. 152574 if test "${enable_mysqlnd_compression_support+set}" = set; then 152575 enableval="$enable_mysqlnd_compression_support" 152576 PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval 152577 else 152578- 152579+ 152580 PHP_MYSQLND_COMPRESSION_SUPPORT=yes 152581+ 152582 152583+fi 152584 152585-fi; 152586 152587 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT 152588-echo "$as_me:$LINENO: result: $ext_output" >&5 152589-echo "${ECHO_T}$ext_output" >&6 152590+echo "$ac_t""$ext_output" 1>&6 152591 152592 152593 152594 152595 if test -z "$PHP_ZLIB_DIR"; then 152596- 152597+ 152598 php_with_zlib_dir=no 152599 152600-echo "$as_me:$LINENO: checking for the location of libz" >&5 152601-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6 152602- 152603+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 152604+echo "configure:103247: checking for the location of libz" >&5 152605 # Check whether --with-zlib-dir or --without-zlib-dir was given. 152606 if test "${with_zlib_dir+set}" = set; then 152607 withval="$with_zlib_dir" 152608 PHP_ZLIB_DIR=$withval 152609 else 152610- 152611+ 152612 PHP_ZLIB_DIR=no 152613+ 152614 152615+fi 152616 152617-fi; 152618 152619 ext_output=$PHP_ZLIB_DIR 152620-echo "$as_me:$LINENO: result: $ext_output" >&5 152621-echo "${ECHO_T}$ext_output" >&6 152622+echo "$ac_t""$ext_output" 1>&6 152623 152624 152625 152626@@ -133121,20 +103272,18 @@ 152627 152628 152629 if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then 152630- 152631-cat >>confdefs.h <<\_ACEOF 152632+ cat >> confdefs.h <<\EOF 152633 #define MYSQLND_COMPRESSION_WANTED 1 152634-_ACEOF 152635+EOF 152636 152637 fi 152638- 152639-cat >>confdefs.h <<\_ACEOF 152640+ cat >> confdefs.h <<\EOF 152641 #define MYSQLND_SSL_SUPPORTED 1 152642-_ACEOF 152643+EOF 152644 152645 152646 mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources" 152647- 152648+ 152649 ext_builddir=ext/mysqlnd 152650 ext_srcdir=$abs_srcdir/ext/mysqlnd 152651 152652@@ -133142,15 +103291,15 @@ 152653 152654 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then 152655 PHP_MYSQLND_SHARED=no 152656- 152657- 152658+ 152659+ 152660 case ext/mysqlnd in 152661 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152662 /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152663 *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152664 esac 152665- 152666- 152667+ 152668+ 152669 152670 b_c_pre=$php_c_pre 152671 b_cxx_pre=$php_cxx_pre 152672@@ -133163,12 +103312,12 @@ 152673 152674 old_IFS=$IFS 152675 for ac_src in $mysqlnd_sources; do 152676- 152677+ 152678 IFS=. 152679 set $ac_src 152680 ac_obj=$1 152681 IFS=$old_IFS 152682- 152683+ 152684 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152685 152686 case $ac_src in 152687@@ -133192,14 +103341,14 @@ 152688 else 152689 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then 152690 PHP_MYSQLND_SHARED=yes 152691- 152692+ 152693 case ext/mysqlnd in 152694 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152695 /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152696 *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152697 esac 152698- 152699- 152700+ 152701+ 152702 152703 b_c_pre=$shared_c_pre 152704 b_cxx_pre=$shared_cxx_pre 152705@@ -133212,12 +103361,12 @@ 152706 152707 old_IFS=$IFS 152708 for ac_src in $mysqlnd_sources; do 152709- 152710+ 152711 IFS=. 152712 set $ac_src 152713 ac_obj=$1 152714 IFS=$old_IFS 152715- 152716+ 152717 shared_objects_mysqlnd="$shared_objects_mysqlnd $ac_bdir$ac_obj.lo" 152718 152719 case $ac_src in 152720@@ -133235,7 +103384,7 @@ 152721 152722 case $host_alias in 152723 *netware*) 152724- 152725+ 152726 install_modules="install-modules" 152727 152728 case $host_alias in 152729@@ -133245,7 +103394,7 @@ 152730 ;; 152731 *netware*) 152732 suffix=nlm 152733- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(MYSQLND_SHARED_LIBADD)' 152734+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPMYSQLND, 3)_SHARED_LIBADD)' 152735 ;; 152736 *) 152737 suffix=la 152738@@ -133258,7 +103407,7 @@ 152739 else 152740 PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpmysqlnd.$suffix" 152741 fi 152742- 152743+ 152744 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqlnd" 152745 152746 cat >>Makefile.objects<<EOF 152747@@ -133272,7 +103421,7 @@ 152748 152749 ;; 152750 *) 152751- 152752+ 152753 install_modules="install-modules" 152754 152755 case $host_alias in 152756@@ -133282,7 +103431,7 @@ 152757 ;; 152758 *netware*) 152759 suffix=nlm 152760- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(QLND_SHARED_LIBADD)' 152761+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_mysqlnd) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(MYSQLND, 3)_SHARED_LIBADD)' 152762 ;; 152763 *) 152764 suffix=la 152765@@ -133295,7 +103444,7 @@ 152766 else 152767 PHP_MODULES="$PHP_MODULES \$(phplibdir)/mysqlnd.$suffix" 152768 fi 152769- 152770+ 152771 PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mysqlnd" 152772 152773 cat >>Makefile.objects<<EOF 152774@@ -133309,10 +103458,9 @@ 152775 152776 ;; 152777 esac 152778- 152779-cat >>confdefs.h <<_ACEOF 152780+ cat >> confdefs.h <<EOF 152781 #define COMPILE_DL_MYSQLND 1 152782-_ACEOF 152783+EOF 152784 152785 fi 152786 fi 152787@@ -133321,15 +103469,15 @@ 152788 PHP_MYSQLND_SHARED=no 152789 case "$PHP_SAPI" in 152790 cgi|embed) 152791- 152792- 152793+ 152794+ 152795 case ext/mysqlnd in 152796 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152797 /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152798 *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152799 esac 152800- 152801- 152802+ 152803+ 152804 152805 b_c_pre=$php_c_pre 152806 b_cxx_pre=$php_cxx_pre 152807@@ -133342,12 +103490,12 @@ 152808 152809 old_IFS=$IFS 152810 for ac_src in $mysqlnd_sources; do 152811- 152812+ 152813 IFS=. 152814 set $ac_src 152815 ac_obj=$1 152816 IFS=$old_IFS 152817- 152818+ 152819 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152820 152821 case $ac_src in 152822@@ -133367,15 +103515,15 @@ 152823 EXT_STATIC="$EXT_STATIC mysqlnd" 152824 ;; 152825 *) 152826- 152827- 152828+ 152829+ 152830 case ext/mysqlnd in 152831 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 152832 /*) ac_srcdir=`echo "ext/mysqlnd"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 152833 *) ac_srcdir="$abs_srcdir/ext/mysqlnd/"; ac_bdir="ext/mysqlnd/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 152834 esac 152835- 152836- 152837+ 152838+ 152839 152840 b_c_pre=$php_c_pre 152841 b_cxx_pre=$php_cxx_pre 152842@@ -133388,13 +103536,13 @@ 152843 152844 old_IFS=$IFS 152845 for ac_src in $mysqlnd_sources; do 152846- 152847+ 152848 IFS=. 152849 set $ac_src 152850 ac_obj=$1 152851 IFS=$old_IFS 152852- 152853- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 152854+ 152855+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 152856 152857 case $ac_src in 152858 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 152859@@ -133414,76 +103562,73 @@ 152860 esac 152861 EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd" 152862 fi 152863- 152864- 152865+ 152866+ 152867 BUILD_DIR="$BUILD_DIR $ext_builddir" 152868- 152869+ 152870 152871 152872 if test "$ext_builddir" = "."; then 152873 PHP_PECL_EXTENSION=mysqlnd 152874- 152875+ 152876 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" 152877 152878 fi 152879 152880- 152881- 152882+ 152883+ 152884 $php_shtool mkdir -p ext/mysqlnd 152885+ 152886 152887- 152888- 152889- 152890+ 152891+ 152892 for header_file in ext/mysqlnd/; do 152893- 152894- 152895+ 152896+ 152897 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 152898- 152899+ 152900 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 152901 if test -n "$unique" && test "`eval $cmd`" = "" ; then 152902 eval "INSTALLHEADERS$unique=set" 152903- 152904+ 152905 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 152906- 152907+ 152908 fi 152909 152910- done 152911- 152912+ done 152913+ 152914 152915 fi 152916 152917 if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then 152918- 152919- 152920+ 152921+ 152922 $php_shtool mkdir -p ext/mysqlnd 152923+ 152924 152925 152926- 152927- 152928+ 152929 for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do 152930- echo "$as_me:$LINENO: checking whether $php_typename exists" >&5 152931-echo $ECHO_N "checking whether $php_typename exists... $ECHO_C" >&6 152932- 152933+ echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 152934+echo "configure:103614: checking whether $php_typename exists" >&5 152935+ 152936 php_cache_value=php_cv_sizeof_$php_typename 152937- if eval "test \"\${php_cv_sizeof_$php_typename+set}\" = set"; then 152938- echo $ECHO_N "(cached) $ECHO_C" >&6 152939+ if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then 152940+ echo $ac_n "(cached) $ac_c" 1>&6 152941 else 152942- 152943+ 152944 old_LIBS=$LIBS 152945 LIBS= 152946 old_LDFLAGS=$LDFLAGS 152947 LDFLAGS= 152948 if test "$cross_compiling" = yes; then 152949- 152950+ 152951 eval $php_cache_value=0 152952 152953 else 152954- cat >conftest.$ac_ext <<_ACEOF 152955-/* confdefs.h. */ 152956-_ACEOF 152957-cat confdefs.h >>conftest.$ac_ext 152958-cat >>conftest.$ac_ext <<_ACEOF 152959-/* end confdefs.h. */ 152960+ cat > conftest.$ac_ext <<EOF 152961+#line 103631 "configure" 152962+#include "confdefs.h" 152963 #include <stdio.h> 152964 #if STDC_HEADERS 152965 #include <stdlib.h> 152966@@ -133501,7 +103646,7 @@ 152967 #ifdef HAVE_STDINT_H 152968 #include <stdint.h> 152969 #endif 152970- 152971+ 152972 152973 int main() 152974 { 152975@@ -133510,34 +103655,24 @@ 152976 fprintf(fp, "%d\n", sizeof($php_typename)); 152977 return(0); 152978 } 152979- 152980-_ACEOF 152981-rm -f conftest$ac_exeext 152982-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 152983- (eval $ac_link) 2>&5 152984- ac_status=$? 152985- echo "$as_me:$LINENO: \$? = $ac_status" >&5 152986- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 152987- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 152988- (eval $ac_try) 2>&5 152989- ac_status=$? 152990- echo "$as_me:$LINENO: \$? = $ac_status" >&5 152991- (exit $ac_status); }; }; then 152992- 152993+ 152994+EOF 152995+if { (eval echo configure:103661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 152996+then 152997+ 152998 eval $php_cache_value=`cat conftestval` 152999- 153000+ 153001 else 153002- echo "$as_me: program exited with status $ac_status" >&5 153003-echo "$as_me: failed program was:" >&5 153004-sed 's/^/| /' conftest.$ac_ext >&5 153005- 153006-( exit $ac_status ) 153007- 153008+ echo "configure: failed program was:" >&5 153009+ cat conftest.$ac_ext >&5 153010+ rm -fr conftest* 153011+ 153012 eval $php_cache_value=0 153013- 153014+ 153015 fi 153016-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 153017+rm -fr conftest* 153018 fi 153019+ 153020 LDFLAGS=$old_LDFLAGS 153021 LIBS=$old_LIBS 153022 153023@@ -133545,18 +103680,16 @@ 153024 153025 if eval test "\$$php_cache_value" != "0"; then 153026 153027- 153028+ 153029 php_def_have_what=HAVE_`echo $php_typename | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' ` 153030 echo "#define $php_def_have_what 1" >> ext/mysqlnd/php_mysqlnd_config.h 153031+ 153032 153033- 153034- echo "$as_me:$LINENO: result: yes" >&5 153035-echo "${ECHO_T}yes" >&6 153036- 153037-else 153038- echo "$as_me:$LINENO: result: no" >&5 153039-echo "${ECHO_T}no" >&6 153040- 153041+ echo "$ac_t""yes" 1>&6 153042+ 153043+else 153044+ echo "$ac_t""no" 1>&6 153045+ 153046 fi 153047 153048 done 153049@@ -133568,23 +103701,23 @@ 153050 test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap" 153051 153052 if test -n "$MYSQL_LIBNAME"; then 153053- 153054+ 153055 save_old_LDFLAGS=$LDFLAGS 153056 ac_stuff="" 153057- 153058+ 153059 save_ext_shared=$ext_shared 153060 ext_shared=yes 153061- 153062+ 153063 for ac_i in $ac_stuff; do 153064 case $ac_i in 153065 -pthread) 153066 if test "$ext_shared" = "yes"; then 153067 LDFLAGS="$LDFLAGS -pthread" 153068 else 153069- 153070- 153071+ 153072+ 153073 unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` 153074- 153075+ 153076 cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" 153077 if test -n "$unique" && test "`eval $cmd`" = "" ; then 153078 eval "EXTRA_LDFLAGS$unique=set" 153079@@ -133595,20 +103728,20 @@ 153080 ;; 153081 -l*) 153082 ac_ii=`echo $ac_i|cut -c 3-` 153083- 153084- 153085+ 153086+ 153087 case $ac_ii in 153088 c|c_r|pthread*) ;; 153089- *) 153090+ *) 153091 if test "$ext_shared" = "yes"; then 153092- LDFLAGS="$LDFLAGS -l$ac_ii" 153093+ LDFLAGS="$LDFLAGS -l$ac_ii" 153094 else 153095- 153096- 153097+ 153098+ 153099 case $ac_ii in 153100 c|c_r|pthread*) ;; 153101- *) 153102- LIBS="$LIBS -l$ac_ii" 153103+ *) 153104+ LIBS="$LIBS -l$ac_ii" 153105 ;; 153106 esac 153107 153108@@ -133621,136 +103754,104 @@ 153109 ;; 153110 -L*) 153111 ac_ii=`echo $ac_i|cut -c 3-` 153112- 153113+ 153114 if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then 153115- 153116+ 153117 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then 153118 ai_p=$ac_ii 153119 else 153120- 153121+ 153122 ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" 153123- 153124+ 153125 ep_realdir="`(cd \"$ep_dir\" && pwd)`" 153126 ai_p="$ep_realdir/`basename \"$ac_ii\"`" 153127 fi 153128 153129- 153130+ 153131 if test "$ext_shared" = "yes"; then 153132 LDFLAGS="-L$ai_p $LDFLAGS" 153133 test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" 153134 else 153135- 153136- 153137- 153138+ 153139+ 153140+ 153141 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` 153142- 153143+ 153144 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" 153145 if test -n "$unique" && test "`eval $cmd`" = "" ; then 153146 eval "LIBPATH$unique=set" 153147- 153148+ 153149 test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" 153150 LDFLAGS="$LDFLAGS -L$ai_p" 153151 PHP_RPATHS="$PHP_RPATHS $ai_p" 153152- 153153+ 153154 fi 153155 153156 153157 fi 153158- 153159+ 153160 fi 153161 153162 ;; 153163 esac 153164 done 153165 153166- as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_hash_insert" | $as_tr_sh` 153167-echo "$as_me:$LINENO: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 153168-echo $ECHO_N "checking for hash_insert in -l$MYSQL_LIBNAME... $ECHO_C" >&6 153169-if eval "test \"\${$as_ac_Lib+set}\" = set"; then 153170- echo $ECHO_N "(cached) $ECHO_C" >&6 153171+ echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 153172+echo "configure:103801: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 153173+ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` 153174+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 153175+ echo $ac_n "(cached) $ac_c" 1>&6 153176 else 153177- ac_check_lib_save_LIBS=$LIBS 153178+ ac_save_LIBS="$LIBS" 153179 LIBS="-l$MYSQL_LIBNAME $LIBS" 153180-cat >conftest.$ac_ext <<_ACEOF 153181-/* confdefs.h. */ 153182-_ACEOF 153183-cat confdefs.h >>conftest.$ac_ext 153184-cat >>conftest.$ac_ext <<_ACEOF 153185-/* end confdefs.h. */ 153186- 153187+cat > conftest.$ac_ext <<EOF 153188+#line 103809 "configure" 153189+#include "confdefs.h" 153190 /* Override any gcc2 internal prototype to avoid an error. */ 153191-#ifdef __cplusplus 153192-extern "C" 153193-#endif 153194 /* We use char because int might match the return type of a gcc2 153195- builtin and then its argument prototype would still apply. */ 153196-char hash_insert (); 153197-int 153198-main () 153199-{ 153200-hash_insert (); 153201- ; 153202- return 0; 153203-} 153204-_ACEOF 153205-rm -f conftest.$ac_objext conftest$ac_exeext 153206-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 153207- (eval $ac_link) 2>conftest.er1 153208- ac_status=$? 153209- grep -v '^ *+' conftest.er1 >conftest.err 153210- rm -f conftest.er1 153211- cat conftest.err >&5 153212- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153213- (exit $ac_status); } && 153214- { ac_try='test -z "$ac_c_werror_flag" 153215- || test ! -s conftest.err' 153216- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153217- (eval $ac_try) 2>&5 153218- ac_status=$? 153219- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153220- (exit $ac_status); }; } && 153221- { ac_try='test -s conftest$ac_exeext' 153222- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153223- (eval $ac_try) 2>&5 153224- ac_status=$? 153225- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153226- (exit $ac_status); }; }; then 153227- eval "$as_ac_Lib=yes" 153228-else 153229- echo "$as_me: failed program was:" >&5 153230-sed 's/^/| /' conftest.$ac_ext >&5 153231- 153232-eval "$as_ac_Lib=no" 153233-fi 153234-rm -f conftest.err conftest.$ac_objext \ 153235- conftest$ac_exeext conftest.$ac_ext 153236-LIBS=$ac_check_lib_save_LIBS 153237-fi 153238-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 153239-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 153240-if test `eval echo '${'$as_ac_Lib'}'` = yes; then 153241+ builtin and then its argument prototype would still apply. */ 153242+char hash_insert(); 153243+ 153244+int main() { 153245+hash_insert() 153246+; return 0; } 153247+EOF 153248+if { (eval echo configure:103820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 153249+ rm -rf conftest* 153250+ eval "ac_cv_lib_$ac_lib_var=yes" 153251+else 153252+ echo "configure: failed program was:" >&5 153253+ cat conftest.$ac_ext >&5 153254+ rm -rf conftest* 153255+ eval "ac_cv_lib_$ac_lib_var=no" 153256+fi 153257+rm -f conftest* 153258+LIBS="$ac_save_LIBS" 153259 153260+fi 153261+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 153262+ echo "$ac_t""yes" 1>&6 153263+ 153264 LDFLAGS=$save_old_LDFLAGS 153265 ext_shared=$save_ext_shared 153266- 153267+ 153268 recode_conflict="$recode_conflict mysql" 153269- 153270- 153271+ 153272+ 153273 else 153274+ echo "$ac_t""no" 1>&6 153275 153276 LDFLAGS=$save_old_LDFLAGS 153277 ext_shared=$save_ext_shared 153278 unset ac_cv_lib_$MYSQL_LIBNAME_hash_insert 153279- 153280- 153281+ 153282+ 153283 fi 153284 153285 fi 153286 153287 if test -n "$recode_conflict"; then 153288- { { echo "$as_me:$LINENO: error: recode extension can not be configured together with:$recode_conflict" >&5 153289-echo "$as_me: error: recode extension can not be configured together with:$recode_conflict" >&2;} 153290- { (exit 1); exit 1; }; } 153291+ { echo "configure: error: recode extension can not be configured together with:$recode_conflict" 1>&2; exit 1; } 153292 fi 153293 fi 153294 153295@@ -133760,13 +103861,7 @@ 153296 enable_shared=yes 153297 enable_static=yes 153298 153299-case $php_build_target in 153300- program|static) 153301- standard_libtool_flag='-prefer-non-pic -static' 153302- if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then 153303- enable_shared=no 153304- fi 153305- ;; 153306+case $php_sapi_module in 153307 shared) 153308 enable_static=no 153309 case $with_pic in 153310@@ -133779,6 +103874,12 @@ 153311 esac 153312 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" 153313 ;; 153314+ *) 153315+ standard_libtool_flag='-prefer-non-pic -static' 153316+ if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then 153317+ enable_shared=no 153318+ fi 153319+ ;; 153320 esac 153321 153322 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" 153323@@ -133794,14 +103895,13 @@ 153324 # Check whether --enable- or --disable- was given. 153325 if test "${enable_+set}" = set; then 153326 enableval="$enable_" 153327+ : 153328+fi 153329 153330-fi; 153331 153332 153333- echo "$as_me:$LINENO: result: " >&5 153334-echo "${ECHO_T}" >&6 153335- echo "$as_me:$LINENO: result: ${T_MD}Configuring PEAR${T_ME}" >&5 153336-echo "${ECHO_T}${T_MD}Configuring PEAR${T_ME}" >&6 153337+ echo "$ac_t""" 1>&6 153338+ echo "$ac_t""${T_MD}Configuring PEAR${T_ME}" 1>&6 153339 153340 153341 # compatibility 153342@@ -133817,19 +103917,19 @@ 153343 153344 php_with_pear=DEFAULT 153345 153346-echo "$as_me:$LINENO: checking whether to install PEAR" >&5 153347-echo $ECHO_N "checking whether to install PEAR... $ECHO_C" >&6 153348- 153349+echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 153350+echo "configure:103922: checking whether to install PEAR" >&5 153351 # Check whether --with-pear or --without-pear was given. 153352 if test "${with_pear+set}" = set; then 153353 withval="$with_pear" 153354 PHP_PEAR=$withval 153355 else 153356- 153357+ 153358 PHP_PEAR=DEFAULT 153359 test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL 153360 153361-fi; 153362+fi 153363+ 153364 153365 153366 ext_output="yes, shared" 153367@@ -133853,8 +103953,7 @@ 153368 153369 153370 153371-echo "$as_me:$LINENO: result: $ext_output" >&5 153372-echo "${ECHO_T}$ext_output" >&6 153373+echo "$ac_t""$ext_output" 1>&6 153374 153375 153376 153377@@ -133862,15 +103961,13 @@ 153378 if test "$PHP_PEAR" != "no"; then 153379 153380 if test "$PHP_XML" = "no"; then 153381- pear_error_msg="$pear_error_msg 153382+ pear_error_msg="$pear_error_msg 153383 PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)" 153384 fi 153385 153386 153387 if test "$pear_error_msg"; then 153388- { { echo "$as_me:$LINENO: error: $pear_error_msg" >&5 153389-echo "$as_me: error: $pear_error_msg" >&2;} 153390- { (exit 1); exit 1; }; } 153391+ { echo "configure: error: $pear_error_msg" 1>&2; exit 1; } 153392 fi 153393 153394 install_pear="install-pear" 153395@@ -133883,7 +103980,7 @@ 153396 esac 153397 fi 153398 153399- 153400+ 153401 src=$abs_srcdir/pear/Makefile.frag 153402 ac_srcdir=$abs_srcdir/pear 153403 ac_builddir=pear 153404@@ -133897,14 +103994,13 @@ 153405 # Check whether --enable- or --disable- was given. 153406 if test "${enable_+set}" = set; then 153407 enableval="$enable_" 153408+ : 153409+fi 153410 153411-fi; 153412 153413 153414- echo "$as_me:$LINENO: result: " >&5 153415-echo "${ECHO_T}" >&6 153416- echo "$as_me:$LINENO: result: ${T_MD}Configuring Zend${T_ME}" >&5 153417-echo "${ECHO_T}${T_MD}Configuring Zend${T_ME}" >&6 153418+ echo "$ac_t""" 1>&6 153419+ echo "$ac_t""${T_MD}Configuring Zend${T_ME}" 1>&6 153420 153421 153422 153423@@ -133923,12 +104019,12 @@ 153424 153425 bison_version=none 153426 if test "$YACC"; then 153427- echo "$as_me:$LINENO: checking for bison version" >&5 153428-echo $ECHO_N "checking for bison version... $ECHO_C" >&6 153429-if test "${php_cv_bison_version+set}" = set; then 153430- echo $ECHO_N "(cached) $ECHO_C" >&6 153431+ echo $ac_n "checking for bison version""... $ac_c" 1>&6 153432+echo "configure:104024: checking for bison version" >&5 153433+if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then 153434+ echo $ac_n "(cached) $ac_c" 1>&6 153435 else 153436- 153437+ 153438 bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z` 153439 php_cv_bison_version=invalid 153440 if test -n "$bison_version_vars"; then 153441@@ -133941,16 +104037,15 @@ 153442 fi 153443 done 153444 fi 153445- 153446+ 153447 fi 153448-echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5 153449-echo "${ECHO_T}$php_cv_bison_version" >&6 153450+ 153451+echo "$ac_t""$php_cv_bison_version" 1>&6 153452 fi 153453 case $php_cv_bison_version in 153454 ""|invalid) 153455 bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)." 153456- { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5 153457-echo "$as_me: WARNING: $bison_msg" >&2;} 153458+ echo "configure: warning: $bison_msg" 1>&2 153459 YACC="exit 0;" 153460 ;; 153461 esac 153462@@ -133961,24 +104056,11 @@ 153463 CFLAGS=`echo $CFLAGS | sed -e 's/-g//'` 153464 fi 153465 153466-if test "$ac_cv_c_compiler_gnu" = "yes" -a "`uname -s`" = "Rhapsody"; then 153467+if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then 153468 CPPFLAGS="$CPPFLAGS -traditional-cpp" 153469 fi 153470 153471- 153472- 153473- 153474- 153475- 153476- 153477- 153478- 153479- 153480- 153481- 153482- 153483- 153484-for ac_header in inttypes.h \ 153485+for ac_hdr in inttypes.h \ 153486 stdint.h \ 153487 limits.h \ 153488 malloc.h \ 153489@@ -133992,235 +104074,90 @@ 153490 stdlib.h \ 153491 dlfcn.h 153492 do 153493-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 153494-if eval "test \"\${$as_ac_Header+set}\" = set"; then 153495- echo "$as_me:$LINENO: checking for $ac_header" >&5 153496-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 153497-if eval "test \"\${$as_ac_Header+set}\" = set"; then 153498- echo $ECHO_N "(cached) $ECHO_C" >&6 153499-fi 153500-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 153501-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 153502-else 153503- # Is the header compilable? 153504-echo "$as_me:$LINENO: checking $ac_header usability" >&5 153505-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 153506-cat >conftest.$ac_ext <<_ACEOF 153507-/* confdefs.h. */ 153508-_ACEOF 153509-cat confdefs.h >>conftest.$ac_ext 153510-cat >>conftest.$ac_ext <<_ACEOF 153511-/* end confdefs.h. */ 153512-$ac_includes_default 153513-#include <$ac_header> 153514-_ACEOF 153515-rm -f conftest.$ac_objext 153516-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 153517- (eval $ac_compile) 2>conftest.er1 153518- ac_status=$? 153519- grep -v '^ *+' conftest.er1 >conftest.err 153520- rm -f conftest.er1 153521- cat conftest.err >&5 153522- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153523- (exit $ac_status); } && 153524- { ac_try='test -z "$ac_c_werror_flag" 153525- || test ! -s conftest.err' 153526- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153527- (eval $ac_try) 2>&5 153528- ac_status=$? 153529- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153530- (exit $ac_status); }; } && 153531- { ac_try='test -s conftest.$ac_objext' 153532- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153533- (eval $ac_try) 2>&5 153534- ac_status=$? 153535- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153536- (exit $ac_status); }; }; then 153537- ac_header_compiler=yes 153538-else 153539- echo "$as_me: failed program was:" >&5 153540-sed 's/^/| /' conftest.$ac_ext >&5 153541- 153542-ac_header_compiler=no 153543-fi 153544-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 153545-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 153546-echo "${ECHO_T}$ac_header_compiler" >&6 153547- 153548-# Is the header present? 153549-echo "$as_me:$LINENO: checking $ac_header presence" >&5 153550-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 153551-cat >conftest.$ac_ext <<_ACEOF 153552-/* confdefs.h. */ 153553-_ACEOF 153554-cat confdefs.h >>conftest.$ac_ext 153555-cat >>conftest.$ac_ext <<_ACEOF 153556-/* end confdefs.h. */ 153557-#include <$ac_header> 153558-_ACEOF 153559-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 153560- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 153561- ac_status=$? 153562- grep -v '^ *+' conftest.er1 >conftest.err 153563- rm -f conftest.er1 153564- cat conftest.err >&5 153565- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153566- (exit $ac_status); } >/dev/null; then 153567- if test -s conftest.err; then 153568- ac_cpp_err=$ac_c_preproc_warn_flag 153569- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 153570- else 153571- ac_cpp_err= 153572- fi 153573-else 153574- ac_cpp_err=yes 153575-fi 153576-if test -z "$ac_cpp_err"; then 153577- ac_header_preproc=yes 153578-else 153579- echo "$as_me: failed program was:" >&5 153580-sed 's/^/| /' conftest.$ac_ext >&5 153581- 153582- ac_header_preproc=no 153583-fi 153584-rm -f conftest.err conftest.$ac_ext 153585-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 153586-echo "${ECHO_T}$ac_header_preproc" >&6 153587- 153588-# So? What about this header? 153589-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 153590- yes:no: ) 153591- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 153592-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 153593- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 153594-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 153595- ac_header_preproc=yes 153596- ;; 153597- no:yes:* ) 153598- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 153599-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 153600- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 153601-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 153602- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 153603-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 153604- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 153605-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 153606- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 153607-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 153608- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 153609-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 153610- ( 153611- cat <<\_ASBOX 153612-## ------------------------------------------ ## 153613-## Report this to the AC_PACKAGE_NAME lists. ## 153614-## ------------------------------------------ ## 153615-_ASBOX 153616- ) | 153617- sed "s/^/$as_me: WARNING: /" >&2 153618- ;; 153619-esac 153620-echo "$as_me:$LINENO: checking for $ac_header" >&5 153621-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 153622-if eval "test \"\${$as_ac_Header+set}\" = set"; then 153623- echo $ECHO_N "(cached) $ECHO_C" >&6 153624+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 153625+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 153626+echo "configure:104080: checking for $ac_hdr" >&5 153627+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 153628+ echo $ac_n "(cached) $ac_c" 1>&6 153629+else 153630+ cat > conftest.$ac_ext <<EOF 153631+#line 104085 "configure" 153632+#include "confdefs.h" 153633+#include <$ac_hdr> 153634+EOF 153635+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 153636+{ (eval echo configure:104090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 153637+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 153638+if test -z "$ac_err"; then 153639+ rm -rf conftest* 153640+ eval "ac_cv_header_$ac_safe=yes" 153641 else 153642- eval "$as_ac_Header=\$ac_header_preproc" 153643+ echo "$ac_err" >&5 153644+ echo "configure: failed program was:" >&5 153645+ cat conftest.$ac_ext >&5 153646+ rm -rf conftest* 153647+ eval "ac_cv_header_$ac_safe=no" 153648 fi 153649-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 153650-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 153651- 153652+rm -f conftest* 153653 fi 153654-if test `eval echo '${'$as_ac_Header'}'` = yes; then 153655- cat >>confdefs.h <<_ACEOF 153656-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 153657-_ACEOF 153658- 153659+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 153660+ echo "$ac_t""yes" 1>&6 153661+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 153662+ cat >> confdefs.h <<EOF 153663+#define $ac_tr_hdr 1 153664+EOF 153665+ 153666+else 153667+ echo "$ac_t""no" 1>&6 153668 fi 153669- 153670 done 153671 153672 153673-echo "$as_me:$LINENO: checking for size_t" >&5 153674-echo $ECHO_N "checking for size_t... $ECHO_C" >&6 153675-if test "${ac_cv_type_size_t+set}" = set; then 153676- echo $ECHO_N "(cached) $ECHO_C" >&6 153677-else 153678- cat >conftest.$ac_ext <<_ACEOF 153679-/* confdefs.h. */ 153680-_ACEOF 153681-cat confdefs.h >>conftest.$ac_ext 153682-cat >>conftest.$ac_ext <<_ACEOF 153683-/* end confdefs.h. */ 153684-$ac_includes_default 153685-int 153686-main () 153687-{ 153688-if ((size_t *) 0) 153689- return 0; 153690-if (sizeof (size_t)) 153691- return 0; 153692- ; 153693- return 0; 153694-} 153695-_ACEOF 153696-rm -f conftest.$ac_objext 153697-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 153698- (eval $ac_compile) 2>conftest.er1 153699- ac_status=$? 153700- grep -v '^ *+' conftest.er1 >conftest.err 153701- rm -f conftest.er1 153702- cat conftest.err >&5 153703- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153704- (exit $ac_status); } && 153705- { ac_try='test -z "$ac_c_werror_flag" 153706- || test ! -s conftest.err' 153707- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153708- (eval $ac_try) 2>&5 153709- ac_status=$? 153710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153711- (exit $ac_status); }; } && 153712- { ac_try='test -s conftest.$ac_objext' 153713- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153714- (eval $ac_try) 2>&5 153715- ac_status=$? 153716- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153717- (exit $ac_status); }; }; then 153718+echo $ac_n "checking for size_t""... $ac_c" 1>&6 153719+echo "configure:104118: checking for size_t" >&5 153720+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 153721+ echo $ac_n "(cached) $ac_c" 1>&6 153722+else 153723+ cat > conftest.$ac_ext <<EOF 153724+#line 104123 "configure" 153725+#include "confdefs.h" 153726+#include <sys/types.h> 153727+#if STDC_HEADERS 153728+#include <stdlib.h> 153729+#include <stddef.h> 153730+#endif 153731+EOF 153732+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 153733+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then 153734+ rm -rf conftest* 153735 ac_cv_type_size_t=yes 153736 else 153737- echo "$as_me: failed program was:" >&5 153738-sed 's/^/| /' conftest.$ac_ext >&5 153739- 153740-ac_cv_type_size_t=no 153741-fi 153742-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 153743+ rm -rf conftest* 153744+ ac_cv_type_size_t=no 153745 fi 153746-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 153747-echo "${ECHO_T}$ac_cv_type_size_t" >&6 153748-if test $ac_cv_type_size_t = yes; then 153749- : 153750-else 153751+rm -f conftest* 153752 153753-cat >>confdefs.h <<_ACEOF 153754+fi 153755+echo "$ac_t""$ac_cv_type_size_t" 1>&6 153756+if test $ac_cv_type_size_t = no; then 153757+ cat >> confdefs.h <<\EOF 153758 #define size_t unsigned 153759-_ACEOF 153760+EOF 153761 153762 fi 153763 153764-echo "$as_me:$LINENO: checking return type of signal handlers" >&5 153765-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 153766-if test "${ac_cv_type_signal+set}" = set; then 153767- echo $ECHO_N "(cached) $ECHO_C" >&6 153768+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 153769+echo "configure:104151: checking return type of signal handlers" >&5 153770+if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 153771+ echo $ac_n "(cached) $ac_c" 1>&6 153772 else 153773- cat >conftest.$ac_ext <<_ACEOF 153774-/* confdefs.h. */ 153775-_ACEOF 153776-cat confdefs.h >>conftest.$ac_ext 153777-cat >>conftest.$ac_ext <<_ACEOF 153778-/* end confdefs.h. */ 153779+ cat > conftest.$ac_ext <<EOF 153780+#line 104156 "configure" 153781+#include "confdefs.h" 153782 #include <sys/types.h> 153783 #include <signal.h> 153784 #ifdef signal 153785-# undef signal 153786+#undef signal 153787 #endif 153788 #ifdef __cplusplus 153789 extern "C" void (*signal (int, void (*)(int)))(int); 153790@@ -134228,51 +104165,26 @@ 153791 void (*signal ()) (); 153792 #endif 153793 153794-int 153795-main () 153796-{ 153797+int main() { 153798 int i; 153799- ; 153800- return 0; 153801-} 153802-_ACEOF 153803-rm -f conftest.$ac_objext 153804-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 153805- (eval $ac_compile) 2>conftest.er1 153806- ac_status=$? 153807- grep -v '^ *+' conftest.er1 >conftest.err 153808- rm -f conftest.er1 153809- cat conftest.err >&5 153810- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153811- (exit $ac_status); } && 153812- { ac_try='test -z "$ac_c_werror_flag" 153813- || test ! -s conftest.err' 153814- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153815- (eval $ac_try) 2>&5 153816- ac_status=$? 153817- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153818- (exit $ac_status); }; } && 153819- { ac_try='test -s conftest.$ac_objext' 153820- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153821- (eval $ac_try) 2>&5 153822- ac_status=$? 153823- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153824- (exit $ac_status); }; }; then 153825+; return 0; } 153826+EOF 153827+if { (eval echo configure:104173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 153828+ rm -rf conftest* 153829 ac_cv_type_signal=void 153830 else 153831- echo "$as_me: failed program was:" >&5 153832-sed 's/^/| /' conftest.$ac_ext >&5 153833- 153834-ac_cv_type_signal=int 153835+ echo "configure: failed program was:" >&5 153836+ cat conftest.$ac_ext >&5 153837+ rm -rf conftest* 153838+ ac_cv_type_signal=int 153839 fi 153840-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 153841+rm -f conftest* 153842 fi 153843-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 153844-echo "${ECHO_T}$ac_cv_type_signal" >&6 153845 153846-cat >>confdefs.h <<_ACEOF 153847+echo "$ac_t""$ac_cv_type_signal" 1>&6 153848+cat >> confdefs.h <<EOF 153849 #define RETSIGTYPE $ac_cv_type_signal 153850-_ACEOF 153851+EOF 153852 153853 153854 153855@@ -134280,637 +104192,339 @@ 153856 153857 153858 153859-echo "$as_me:$LINENO: checking for uint" >&5 153860-echo $ECHO_N "checking for uint... $ECHO_C" >&6 153861-if test "${ac_cv_type_uint+set}" = set; then 153862- echo $ECHO_N "(cached) $ECHO_C" >&6 153863+echo $ac_n "checking for uint""... $ac_c" 1>&6 153864+echo "configure:104197: checking for uint" >&5 153865+if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then 153866+ echo $ac_n "(cached) $ac_c" 1>&6 153867 else 153868- cat >conftest.$ac_ext <<_ACEOF 153869-/* confdefs.h. */ 153870-_ACEOF 153871-cat confdefs.h >>conftest.$ac_ext 153872-cat >>conftest.$ac_ext <<_ACEOF 153873-/* end confdefs.h. */ 153874-$ac_includes_default 153875-int 153876-main () 153877-{ 153878-if ((uint *) 0) 153879- return 0; 153880-if (sizeof (uint)) 153881- return 0; 153882- ; 153883- return 0; 153884-} 153885-_ACEOF 153886-rm -f conftest.$ac_objext 153887-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 153888- (eval $ac_compile) 2>conftest.er1 153889- ac_status=$? 153890- grep -v '^ *+' conftest.er1 >conftest.err 153891- rm -f conftest.er1 153892- cat conftest.err >&5 153893- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153894- (exit $ac_status); } && 153895- { ac_try='test -z "$ac_c_werror_flag" 153896- || test ! -s conftest.err' 153897- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153898- (eval $ac_try) 2>&5 153899- ac_status=$? 153900- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153901- (exit $ac_status); }; } && 153902- { ac_try='test -s conftest.$ac_objext' 153903- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153904- (eval $ac_try) 2>&5 153905- ac_status=$? 153906- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153907- (exit $ac_status); }; }; then 153908+ cat > conftest.$ac_ext <<EOF 153909+#line 104202 "configure" 153910+#include "confdefs.h" 153911+#include <sys/types.h> 153912+#if STDC_HEADERS 153913+#include <stdlib.h> 153914+#include <stddef.h> 153915+#endif 153916+EOF 153917+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 153918+ egrep "(^|[^a-zA-Z_0-9])uint[^a-zA-Z_0-9]" >/dev/null 2>&1; then 153919+ rm -rf conftest* 153920 ac_cv_type_uint=yes 153921 else 153922- echo "$as_me: failed program was:" >&5 153923-sed 's/^/| /' conftest.$ac_ext >&5 153924- 153925-ac_cv_type_uint=no 153926-fi 153927-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 153928+ rm -rf conftest* 153929+ ac_cv_type_uint=no 153930 fi 153931-echo "$as_me:$LINENO: result: $ac_cv_type_uint" >&5 153932-echo "${ECHO_T}$ac_cv_type_uint" >&6 153933-if test $ac_cv_type_uint = yes; then 153934- : 153935-else 153936+rm -f conftest* 153937 153938-cat >>confdefs.h <<_ACEOF 153939-#define uint unsigned int 153940-_ACEOF 153941+fi 153942+echo "$ac_t""$ac_cv_type_uint" 1>&6 153943+if test $ac_cv_type_uint = no; then 153944+ cat >> confdefs.h <<\EOF 153945+#define uint unsigned int 153946+EOF 153947 153948 fi 153949 153950-echo "$as_me:$LINENO: checking for ulong" >&5 153951-echo $ECHO_N "checking for ulong... $ECHO_C" >&6 153952-if test "${ac_cv_type_ulong+set}" = set; then 153953- echo $ECHO_N "(cached) $ECHO_C" >&6 153954-else 153955- cat >conftest.$ac_ext <<_ACEOF 153956-/* confdefs.h. */ 153957-_ACEOF 153958-cat confdefs.h >>conftest.$ac_ext 153959-cat >>conftest.$ac_ext <<_ACEOF 153960-/* end confdefs.h. */ 153961-$ac_includes_default 153962-int 153963-main () 153964-{ 153965-if ((ulong *) 0) 153966- return 0; 153967-if (sizeof (ulong)) 153968- return 0; 153969- ; 153970- return 0; 153971-} 153972-_ACEOF 153973-rm -f conftest.$ac_objext 153974-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 153975- (eval $ac_compile) 2>conftest.er1 153976- ac_status=$? 153977- grep -v '^ *+' conftest.er1 >conftest.err 153978- rm -f conftest.er1 153979- cat conftest.err >&5 153980- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153981- (exit $ac_status); } && 153982- { ac_try='test -z "$ac_c_werror_flag" 153983- || test ! -s conftest.err' 153984- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153985- (eval $ac_try) 2>&5 153986- ac_status=$? 153987- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153988- (exit $ac_status); }; } && 153989- { ac_try='test -s conftest.$ac_objext' 153990- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 153991- (eval $ac_try) 2>&5 153992- ac_status=$? 153993- echo "$as_me:$LINENO: \$? = $ac_status" >&5 153994- (exit $ac_status); }; }; then 153995+echo $ac_n "checking for ulong""... $ac_c" 1>&6 153996+echo "configure:104230: checking for ulong" >&5 153997+if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then 153998+ echo $ac_n "(cached) $ac_c" 1>&6 153999+else 154000+ cat > conftest.$ac_ext <<EOF 154001+#line 104235 "configure" 154002+#include "confdefs.h" 154003+#include <sys/types.h> 154004+#if STDC_HEADERS 154005+#include <stdlib.h> 154006+#include <stddef.h> 154007+#endif 154008+EOF 154009+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 154010+ egrep "(^|[^a-zA-Z_0-9])ulong[^a-zA-Z_0-9]" >/dev/null 2>&1; then 154011+ rm -rf conftest* 154012 ac_cv_type_ulong=yes 154013 else 154014- echo "$as_me: failed program was:" >&5 154015-sed 's/^/| /' conftest.$ac_ext >&5 154016- 154017-ac_cv_type_ulong=no 154018-fi 154019-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 154020+ rm -rf conftest* 154021+ ac_cv_type_ulong=no 154022 fi 154023-echo "$as_me:$LINENO: result: $ac_cv_type_ulong" >&5 154024-echo "${ECHO_T}$ac_cv_type_ulong" >&6 154025-if test $ac_cv_type_ulong = yes; then 154026- : 154027-else 154028+rm -f conftest* 154029 154030-cat >>confdefs.h <<_ACEOF 154031-#define ulong unsigned long 154032-_ACEOF 154033+fi 154034+echo "$ac_t""$ac_cv_type_ulong" 1>&6 154035+if test $ac_cv_type_ulong = no; then 154036+ cat >> confdefs.h <<\EOF 154037+#define ulong unsigned long 154038+EOF 154039 154040 fi 154041 154042 154043 154044-echo "$as_me:$LINENO: checking for int32_t" >&5 154045-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6 154046-cat >conftest.$ac_ext <<_ACEOF 154047-/* confdefs.h. */ 154048-_ACEOF 154049-cat confdefs.h >>conftest.$ac_ext 154050-cat >>conftest.$ac_ext <<_ACEOF 154051-/* end confdefs.h. */ 154052+echo $ac_n "checking for int32_t""... $ac_c" 1>&6 154053+echo "configure:104265: checking for int32_t" >&5 154054+cat > conftest.$ac_ext <<EOF 154055+#line 104267 "configure" 154056+#include "confdefs.h" 154057 154058-#if HAVE_SYS_TYPES_H 154059+#if HAVE_SYS_TYPES_H 154060 #include <sys/types.h> 154061 #endif 154062-#if HAVE_INTTYPES_H 154063+#if HAVE_INTTYPES_H 154064 #include <inttypes.h> 154065 #elif HAVE_STDINT_H 154066 #include <stdint.h> 154067 #endif 154068-int 154069-main () 154070-{ 154071+int main() { 154072 if ((int32_t *) 0) 154073 return 0; 154074 if (sizeof (int32_t)) 154075 return 0; 154076 154077- ; 154078- return 0; 154079-} 154080-_ACEOF 154081-rm -f conftest.$ac_objext 154082-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 154083- (eval $ac_compile) 2>conftest.er1 154084- ac_status=$? 154085- grep -v '^ *+' conftest.er1 >conftest.err 154086- rm -f conftest.er1 154087- cat conftest.err >&5 154088- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154089- (exit $ac_status); } && 154090- { ac_try='test -z "$ac_c_werror_flag" 154091- || test ! -s conftest.err' 154092- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154093- (eval $ac_try) 2>&5 154094- ac_status=$? 154095- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154096- (exit $ac_status); }; } && 154097- { ac_try='test -s conftest.$ac_objext' 154098- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154099- (eval $ac_try) 2>&5 154100- ac_status=$? 154101- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154102- (exit $ac_status); }; }; then 154103- 154104- 154105-cat >>confdefs.h <<_ACEOF 154106+; return 0; } 154107+EOF 154108+if { (eval echo configure:104286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 154109+ rm -rf conftest* 154110+ 154111+ cat >> confdefs.h <<EOF 154112 #define HAVE_INT32_T 1 154113-_ACEOF 154114+EOF 154115 154116- echo "$as_me:$LINENO: result: yes" >&5 154117-echo "${ECHO_T}yes" >&6 154118+ echo "$ac_t""yes" 1>&6 154119 154120 else 154121- echo "$as_me: failed program was:" >&5 154122-sed 's/^/| /' conftest.$ac_ext >&5 154123- 154124-echo "$as_me:$LINENO: result: no" >&5 154125-echo "${ECHO_T}no" >&6 154126+ echo "configure: failed program was:" >&5 154127+ cat conftest.$ac_ext >&5 154128+ rm -rf conftest* 154129+ echo "$ac_t""no" 1>&6 154130 154131 fi 154132-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 154133+rm -f conftest* 154134 154135-echo "$as_me:$LINENO: checking for uint32_t" >&5 154136-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6 154137-cat >conftest.$ac_ext <<_ACEOF 154138-/* confdefs.h. */ 154139-_ACEOF 154140-cat confdefs.h >>conftest.$ac_ext 154141-cat >>conftest.$ac_ext <<_ACEOF 154142-/* end confdefs.h. */ 154143+echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 154144+echo "configure:104305: checking for uint32_t" >&5 154145+cat > conftest.$ac_ext <<EOF 154146+#line 104307 "configure" 154147+#include "confdefs.h" 154148 154149-#if HAVE_SYS_TYPES_H 154150+#if HAVE_SYS_TYPES_H 154151 #include <sys/types.h> 154152 #endif 154153-#if HAVE_INTTYPES_H 154154+#if HAVE_INTTYPES_H 154155 #include <inttypes.h> 154156 #elif HAVE_STDINT_H 154157 #include <stdint.h> 154158 #endif 154159-int 154160-main () 154161-{ 154162+int main() { 154163 if ((uint32_t *) 0) 154164 return 0; 154165 if (sizeof (uint32_t)) 154166 return 0; 154167 154168- ; 154169- return 0; 154170-} 154171-_ACEOF 154172-rm -f conftest.$ac_objext 154173-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 154174- (eval $ac_compile) 2>conftest.er1 154175- ac_status=$? 154176- grep -v '^ *+' conftest.er1 >conftest.err 154177- rm -f conftest.er1 154178- cat conftest.err >&5 154179- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154180- (exit $ac_status); } && 154181- { ac_try='test -z "$ac_c_werror_flag" 154182- || test ! -s conftest.err' 154183- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154184- (eval $ac_try) 2>&5 154185- ac_status=$? 154186- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154187- (exit $ac_status); }; } && 154188- { ac_try='test -s conftest.$ac_objext' 154189- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154190- (eval $ac_try) 2>&5 154191- ac_status=$? 154192- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154193- (exit $ac_status); }; }; then 154194- 154195- 154196-cat >>confdefs.h <<_ACEOF 154197+; return 0; } 154198+EOF 154199+if { (eval echo configure:104326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 154200+ rm -rf conftest* 154201+ 154202+ cat >> confdefs.h <<EOF 154203 #define HAVE_UINT32_T 1 154204-_ACEOF 154205+EOF 154206 154207- echo "$as_me:$LINENO: result: yes" >&5 154208-echo "${ECHO_T}yes" >&6 154209+ echo "$ac_t""yes" 1>&6 154210 154211 else 154212- echo "$as_me: failed program was:" >&5 154213-sed 's/^/| /' conftest.$ac_ext >&5 154214- 154215-echo "$as_me:$LINENO: result: no" >&5 154216-echo "${ECHO_T}no" >&6 154217+ echo "configure: failed program was:" >&5 154218+ cat conftest.$ac_ext >&5 154219+ rm -rf conftest* 154220+ echo "$ac_t""no" 1>&6 154221 154222 fi 154223-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 154224- 154225- 154226-for ac_func in vprintf 154227-do 154228-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 154229-echo "$as_me:$LINENO: checking for $ac_func" >&5 154230-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 154231-if eval "test \"\${$as_ac_var+set}\" = set"; then 154232- echo $ECHO_N "(cached) $ECHO_C" >&6 154233-else 154234- cat >conftest.$ac_ext <<_ACEOF 154235-/* confdefs.h. */ 154236-_ACEOF 154237-cat confdefs.h >>conftest.$ac_ext 154238-cat >>conftest.$ac_ext <<_ACEOF 154239-/* end confdefs.h. */ 154240-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 154241- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 154242-#define $ac_func innocuous_$ac_func 154243+rm -f conftest* 154244 154245+echo $ac_n "checking for vprintf""... $ac_c" 1>&6 154246+echo "configure:104345: checking for vprintf" >&5 154247+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then 154248+ echo $ac_n "(cached) $ac_c" 1>&6 154249+else 154250+ cat > conftest.$ac_ext <<EOF 154251+#line 104350 "configure" 154252+#include "confdefs.h" 154253 /* System header to define __stub macros and hopefully few prototypes, 154254- which can conflict with char $ac_func (); below. 154255- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 154256- <limits.h> exists even on freestanding compilers. */ 154257- 154258-#ifdef __STDC__ 154259-# include <limits.h> 154260-#else 154261-# include <assert.h> 154262-#endif 154263- 154264-#undef $ac_func 154265- 154266+ which can conflict with char vprintf(); below. */ 154267+#include <assert.h> 154268 /* Override any gcc2 internal prototype to avoid an error. */ 154269-#ifdef __cplusplus 154270-extern "C" 154271-{ 154272-#endif 154273 /* We use char because int might match the return type of a gcc2 154274- builtin and then its argument prototype would still apply. */ 154275-char $ac_func (); 154276+ builtin and then its argument prototype would still apply. */ 154277+char vprintf(); 154278+ 154279+int main() { 154280+ 154281 /* The GNU C library defines this for functions which it implements 154282 to always fail with ENOSYS. Some functions are actually named 154283 something starting with __ and the normal name is an alias. */ 154284-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) 154285+#if defined (__stub_vprintf) || defined (__stub___vprintf) 154286 choke me 154287 #else 154288-char (*f) () = $ac_func; 154289-#endif 154290-#ifdef __cplusplus 154291-} 154292+vprintf(); 154293 #endif 154294 154295-int 154296-main () 154297-{ 154298-return f != $ac_func; 154299- ; 154300- return 0; 154301-} 154302-_ACEOF 154303-rm -f conftest.$ac_objext conftest$ac_exeext 154304-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154305- (eval $ac_link) 2>conftest.er1 154306- ac_status=$? 154307- grep -v '^ *+' conftest.er1 >conftest.err 154308- rm -f conftest.er1 154309- cat conftest.err >&5 154310- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154311- (exit $ac_status); } && 154312- { ac_try='test -z "$ac_c_werror_flag" 154313- || test ! -s conftest.err' 154314- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154315- (eval $ac_try) 2>&5 154316- ac_status=$? 154317- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154318- (exit $ac_status); }; } && 154319- { ac_try='test -s conftest$ac_exeext' 154320- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154321- (eval $ac_try) 2>&5 154322- ac_status=$? 154323- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154324- (exit $ac_status); }; }; then 154325- eval "$as_ac_var=yes" 154326-else 154327- echo "$as_me: failed program was:" >&5 154328-sed 's/^/| /' conftest.$ac_ext >&5 154329- 154330-eval "$as_ac_var=no" 154331-fi 154332-rm -f conftest.err conftest.$ac_objext \ 154333- conftest$ac_exeext conftest.$ac_ext 154334-fi 154335-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 154336-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 154337-if test `eval echo '${'$as_ac_var'}'` = yes; then 154338- cat >>confdefs.h <<_ACEOF 154339-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 154340-_ACEOF 154341- 154342-echo "$as_me:$LINENO: checking for _doprnt" >&5 154343-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 154344-if test "${ac_cv_func__doprnt+set}" = set; then 154345- echo $ECHO_N "(cached) $ECHO_C" >&6 154346-else 154347- cat >conftest.$ac_ext <<_ACEOF 154348-/* confdefs.h. */ 154349-_ACEOF 154350-cat confdefs.h >>conftest.$ac_ext 154351-cat >>conftest.$ac_ext <<_ACEOF 154352-/* end confdefs.h. */ 154353-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt. 154354- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 154355-#define _doprnt innocuous__doprnt 154356- 154357-/* System header to define __stub macros and hopefully few prototypes, 154358- which can conflict with char _doprnt (); below. 154359- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 154360- <limits.h> exists even on freestanding compilers. */ 154361+; return 0; } 154362+EOF 154363+if { (eval echo configure:104373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 154364+ rm -rf conftest* 154365+ eval "ac_cv_func_vprintf=yes" 154366+else 154367+ echo "configure: failed program was:" >&5 154368+ cat conftest.$ac_ext >&5 154369+ rm -rf conftest* 154370+ eval "ac_cv_func_vprintf=no" 154371+fi 154372+rm -f conftest* 154373+fi 154374 154375-#ifdef __STDC__ 154376-# include <limits.h> 154377-#else 154378-# include <assert.h> 154379-#endif 154380+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then 154381+ echo "$ac_t""yes" 1>&6 154382+ cat >> confdefs.h <<\EOF 154383+#define HAVE_VPRINTF 1 154384+EOF 154385 154386-#undef _doprnt 154387+else 154388+ echo "$ac_t""no" 1>&6 154389+fi 154390 154391+if test "$ac_cv_func_vprintf" != yes; then 154392+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 154393+echo "configure:104397: checking for _doprnt" >&5 154394+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then 154395+ echo $ac_n "(cached) $ac_c" 1>&6 154396+else 154397+ cat > conftest.$ac_ext <<EOF 154398+#line 104402 "configure" 154399+#include "confdefs.h" 154400+/* System header to define __stub macros and hopefully few prototypes, 154401+ which can conflict with char _doprnt(); below. */ 154402+#include <assert.h> 154403 /* Override any gcc2 internal prototype to avoid an error. */ 154404-#ifdef __cplusplus 154405-extern "C" 154406-{ 154407-#endif 154408 /* We use char because int might match the return type of a gcc2 154409- builtin and then its argument prototype would still apply. */ 154410-char _doprnt (); 154411+ builtin and then its argument prototype would still apply. */ 154412+char _doprnt(); 154413+ 154414+int main() { 154415+ 154416 /* The GNU C library defines this for functions which it implements 154417 to always fail with ENOSYS. Some functions are actually named 154418 something starting with __ and the normal name is an alias. */ 154419 #if defined (__stub__doprnt) || defined (__stub____doprnt) 154420 choke me 154421 #else 154422-char (*f) () = _doprnt; 154423-#endif 154424-#ifdef __cplusplus 154425-} 154426+_doprnt(); 154427 #endif 154428 154429-int 154430-main () 154431-{ 154432-return f != _doprnt; 154433- ; 154434- return 0; 154435-} 154436-_ACEOF 154437-rm -f conftest.$ac_objext conftest$ac_exeext 154438-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154439- (eval $ac_link) 2>conftest.er1 154440- ac_status=$? 154441- grep -v '^ *+' conftest.er1 >conftest.err 154442- rm -f conftest.er1 154443- cat conftest.err >&5 154444- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154445- (exit $ac_status); } && 154446- { ac_try='test -z "$ac_c_werror_flag" 154447- || test ! -s conftest.err' 154448- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154449- (eval $ac_try) 2>&5 154450- ac_status=$? 154451- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154452- (exit $ac_status); }; } && 154453- { ac_try='test -s conftest$ac_exeext' 154454- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154455- (eval $ac_try) 2>&5 154456- ac_status=$? 154457- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154458- (exit $ac_status); }; }; then 154459- ac_cv_func__doprnt=yes 154460-else 154461- echo "$as_me: failed program was:" >&5 154462-sed 's/^/| /' conftest.$ac_ext >&5 154463- 154464-ac_cv_func__doprnt=no 154465-fi 154466-rm -f conftest.err conftest.$ac_objext \ 154467- conftest$ac_exeext conftest.$ac_ext 154468-fi 154469-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 154470-echo "${ECHO_T}$ac_cv_func__doprnt" >&6 154471-if test $ac_cv_func__doprnt = yes; then 154472+; return 0; } 154473+EOF 154474+if { (eval echo configure:104425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 154475+ rm -rf conftest* 154476+ eval "ac_cv_func__doprnt=yes" 154477+else 154478+ echo "configure: failed program was:" >&5 154479+ cat conftest.$ac_ext >&5 154480+ rm -rf conftest* 154481+ eval "ac_cv_func__doprnt=no" 154482+fi 154483+rm -f conftest* 154484+fi 154485 154486-cat >>confdefs.h <<\_ACEOF 154487+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then 154488+ echo "$ac_t""yes" 1>&6 154489+ cat >> confdefs.h <<\EOF 154490 #define HAVE_DOPRNT 1 154491-_ACEOF 154492+EOF 154493 154494+else 154495+ echo "$ac_t""no" 1>&6 154496 fi 154497 154498 fi 154499-done 154500- 154501 154502-echo "$as_me:$LINENO: checking for working memcmp" >&5 154503-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 154504-if test "${ac_cv_func_memcmp_working+set}" = set; then 154505- echo $ECHO_N "(cached) $ECHO_C" >&6 154506+echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 154507+echo "configure:104450: checking for 8-bit clean memcmp" >&5 154508+if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then 154509+ echo $ac_n "(cached) $ac_c" 1>&6 154510 else 154511 if test "$cross_compiling" = yes; then 154512- ac_cv_func_memcmp_working=no 154513+ ac_cv_func_memcmp_clean=no 154514 else 154515- cat >conftest.$ac_ext <<_ACEOF 154516-/* confdefs.h. */ 154517-_ACEOF 154518-cat confdefs.h >>conftest.$ac_ext 154519-cat >>conftest.$ac_ext <<_ACEOF 154520-/* end confdefs.h. */ 154521-$ac_includes_default 154522-int 154523-main () 154524-{ 154525+ cat > conftest.$ac_ext <<EOF 154526+#line 104458 "configure" 154527+#include "confdefs.h" 154528 154529- /* Some versions of memcmp are not 8-bit clean. */ 154530+main() 154531+{ 154532 char c0 = 0x40, c1 = 0x80, c2 = 0x81; 154533- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) 154534- exit (1); 154535+ exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); 154536+} 154537 154538- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes 154539- or more and with at least one buffer not starting on a 4-byte boundary. 154540- William Lewis provided this test program. */ 154541- { 154542- char foo[21]; 154543- char bar[21]; 154544- int i; 154545- for (i = 0; i < 4; i++) 154546- { 154547- char *a = foo + i; 154548- char *b = bar + i; 154549- strcpy (a, "--------01111111"); 154550- strcpy (b, "--------10000000"); 154551- if (memcmp (a, b, 16) >= 0) 154552- exit (1); 154553- } 154554- exit (0); 154555- } 154556+EOF 154557+if { (eval echo configure:104468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 154558+then 154559+ ac_cv_func_memcmp_clean=yes 154560+else 154561+ echo "configure: failed program was:" >&5 154562+ cat conftest.$ac_ext >&5 154563+ rm -fr conftest* 154564+ ac_cv_func_memcmp_clean=no 154565+fi 154566+rm -fr conftest* 154567+fi 154568 154569- ; 154570- return 0; 154571-} 154572-_ACEOF 154573-rm -f conftest$ac_exeext 154574-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154575- (eval $ac_link) 2>&5 154576- ac_status=$? 154577- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154578- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 154579- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154580- (eval $ac_try) 2>&5 154581- ac_status=$? 154582- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154583- (exit $ac_status); }; }; then 154584- ac_cv_func_memcmp_working=yes 154585-else 154586- echo "$as_me: program exited with status $ac_status" >&5 154587-echo "$as_me: failed program was:" >&5 154588-sed 's/^/| /' conftest.$ac_ext >&5 154589- 154590-( exit $ac_status ) 154591-ac_cv_func_memcmp_working=no 154592-fi 154593-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 154594-fi 154595-fi 154596-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 154597-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 154598-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in 154599- "memcmp.$ac_objext" | \ 154600- *" memcmp.$ac_objext" | \ 154601- "memcmp.$ac_objext "* | \ 154602- *" memcmp.$ac_objext "* ) ;; 154603- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; 154604-esac 154605+fi 154606 154607+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 154608+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" 154609 154610 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works 154611 # for constant arguments. Useless! 154612-echo "$as_me:$LINENO: checking for working alloca.h" >&5 154613-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 154614-if test "${ac_cv_working_alloca_h+set}" = set; then 154615- echo $ECHO_N "(cached) $ECHO_C" >&6 154616-else 154617- cat >conftest.$ac_ext <<_ACEOF 154618-/* confdefs.h. */ 154619-_ACEOF 154620-cat confdefs.h >>conftest.$ac_ext 154621-cat >>conftest.$ac_ext <<_ACEOF 154622-/* end confdefs.h. */ 154623+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 154624+echo "configure:104488: checking for working alloca.h" >&5 154625+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 154626+ echo $ac_n "(cached) $ac_c" 1>&6 154627+else 154628+ cat > conftest.$ac_ext <<EOF 154629+#line 104493 "configure" 154630+#include "confdefs.h" 154631 #include <alloca.h> 154632-int 154633-main () 154634-{ 154635-char *p = (char *) alloca (2 * sizeof (int)); 154636- ; 154637- return 0; 154638-} 154639-_ACEOF 154640-rm -f conftest.$ac_objext conftest$ac_exeext 154641-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154642- (eval $ac_link) 2>conftest.er1 154643- ac_status=$? 154644- grep -v '^ *+' conftest.er1 >conftest.err 154645- rm -f conftest.er1 154646- cat conftest.err >&5 154647- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154648- (exit $ac_status); } && 154649- { ac_try='test -z "$ac_c_werror_flag" 154650- || test ! -s conftest.err' 154651- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154652- (eval $ac_try) 2>&5 154653- ac_status=$? 154654- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154655- (exit $ac_status); }; } && 154656- { ac_try='test -s conftest$ac_exeext' 154657- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154658- (eval $ac_try) 2>&5 154659- ac_status=$? 154660- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154661- (exit $ac_status); }; }; then 154662- ac_cv_working_alloca_h=yes 154663-else 154664- echo "$as_me: failed program was:" >&5 154665-sed 's/^/| /' conftest.$ac_ext >&5 154666- 154667-ac_cv_working_alloca_h=no 154668-fi 154669-rm -f conftest.err conftest.$ac_objext \ 154670- conftest$ac_exeext conftest.$ac_ext 154671-fi 154672-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 154673-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 154674-if test $ac_cv_working_alloca_h = yes; then 154675+int main() { 154676+char *p = alloca(2 * sizeof(int)); 154677+; return 0; } 154678+EOF 154679+if { (eval echo configure:104500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 154680+ rm -rf conftest* 154681+ ac_cv_header_alloca_h=yes 154682+else 154683+ echo "configure: failed program was:" >&5 154684+ cat conftest.$ac_ext >&5 154685+ rm -rf conftest* 154686+ ac_cv_header_alloca_h=no 154687+fi 154688+rm -f conftest* 154689+fi 154690 154691-cat >>confdefs.h <<\_ACEOF 154692+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 154693+if test $ac_cv_header_alloca_h = yes; then 154694+ cat >> confdefs.h <<\EOF 154695 #define HAVE_ALLOCA_H 1 154696-_ACEOF 154697+EOF 154698 154699 fi 154700 154701-echo "$as_me:$LINENO: checking for alloca" >&5 154702-echo $ECHO_N "checking for alloca... $ECHO_C" >&6 154703-if test "${ac_cv_func_alloca_works+set}" = set; then 154704- echo $ECHO_N "(cached) $ECHO_C" >&6 154705+echo $ac_n "checking for alloca""... $ac_c" 1>&6 154706+echo "configure:104521: checking for alloca" >&5 154707+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 154708+ echo $ac_n "(cached) $ac_c" 1>&6 154709 else 154710- cat >conftest.$ac_ext <<_ACEOF 154711-/* confdefs.h. */ 154712-_ACEOF 154713-cat confdefs.h >>conftest.$ac_ext 154714-cat >>conftest.$ac_ext <<_ACEOF 154715-/* end confdefs.h. */ 154716+ cat > conftest.$ac_ext <<EOF 154717+#line 104526 "configure" 154718+#include "confdefs.h" 154719+ 154720 #ifdef __GNUC__ 154721 # define alloca __builtin_alloca 154722 #else 154723@@ -134932,217 +104546,137 @@ 154724 # endif 154725 #endif 154726 154727-int 154728-main () 154729-{ 154730-char *p = (char *) alloca (1); 154731- ; 154732- return 0; 154733-} 154734-_ACEOF 154735-rm -f conftest.$ac_objext conftest$ac_exeext 154736-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154737- (eval $ac_link) 2>conftest.er1 154738- ac_status=$? 154739- grep -v '^ *+' conftest.er1 >conftest.err 154740- rm -f conftest.er1 154741- cat conftest.err >&5 154742- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154743- (exit $ac_status); } && 154744- { ac_try='test -z "$ac_c_werror_flag" 154745- || test ! -s conftest.err' 154746- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154747- (eval $ac_try) 2>&5 154748- ac_status=$? 154749- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154750- (exit $ac_status); }; } && 154751- { ac_try='test -s conftest$ac_exeext' 154752- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154753- (eval $ac_try) 2>&5 154754- ac_status=$? 154755- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154756- (exit $ac_status); }; }; then 154757+int main() { 154758+char *p = (char *) alloca(1); 154759+; return 0; } 154760+EOF 154761+if { (eval echo configure:104554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 154762+ rm -rf conftest* 154763 ac_cv_func_alloca_works=yes 154764 else 154765- echo "$as_me: failed program was:" >&5 154766-sed 's/^/| /' conftest.$ac_ext >&5 154767- 154768-ac_cv_func_alloca_works=no 154769+ echo "configure: failed program was:" >&5 154770+ cat conftest.$ac_ext >&5 154771+ rm -rf conftest* 154772+ ac_cv_func_alloca_works=no 154773 fi 154774-rm -f conftest.err conftest.$ac_objext \ 154775- conftest$ac_exeext conftest.$ac_ext 154776+rm -f conftest* 154777 fi 154778-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 154779-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 154780 154781+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 154782 if test $ac_cv_func_alloca_works = yes; then 154783- 154784-cat >>confdefs.h <<\_ACEOF 154785+ cat >> confdefs.h <<\EOF 154786 #define HAVE_ALLOCA 1 154787-_ACEOF 154788- 154789-else 154790- # The SVR3 libPW and SVR4 libucb both contain incompatible functions 154791-# that cause trouble. Some versions do not even contain alloca or 154792-# contain a buggy version. If you still want to use their alloca, 154793-# use ar to extract alloca.o from them instead of compiling alloca.c. 154794+EOF 154795 154796-ALLOCA=alloca.$ac_objext 154797+fi 154798 154799-cat >>confdefs.h <<\_ACEOF 154800+if test $ac_cv_func_alloca_works = no; then 154801+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions 154802+ # that cause trouble. Some versions do not even contain alloca or 154803+ # contain a buggy version. If you still want to use their alloca, 154804+ # use ar to extract alloca.o from them instead of compiling alloca.c. 154805+ ALLOCA=alloca.${ac_objext} 154806+ cat >> confdefs.h <<\EOF 154807 #define C_ALLOCA 1 154808-_ACEOF 154809+EOF 154810 154811 154812-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 154813-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 154814-if test "${ac_cv_os_cray+set}" = set; then 154815- echo $ECHO_N "(cached) $ECHO_C" >&6 154816-else 154817- cat >conftest.$ac_ext <<_ACEOF 154818-/* confdefs.h. */ 154819-_ACEOF 154820-cat confdefs.h >>conftest.$ac_ext 154821-cat >>conftest.$ac_ext <<_ACEOF 154822-/* end confdefs.h. */ 154823+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 154824+echo "configure:104586: checking whether alloca needs Cray hooks" >&5 154825+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 154826+ echo $ac_n "(cached) $ac_c" 1>&6 154827+else 154828+ cat > conftest.$ac_ext <<EOF 154829+#line 104591 "configure" 154830+#include "confdefs.h" 154831 #if defined(CRAY) && ! defined(CRAY2) 154832 webecray 154833 #else 154834 wenotbecray 154835 #endif 154836 154837-_ACEOF 154838+EOF 154839 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 154840- $EGREP "webecray" >/dev/null 2>&1; then 154841+ egrep "webecray" >/dev/null 2>&1; then 154842+ rm -rf conftest* 154843 ac_cv_os_cray=yes 154844 else 154845+ rm -rf conftest* 154846 ac_cv_os_cray=no 154847 fi 154848 rm -f conftest* 154849 154850 fi 154851-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 154852-echo "${ECHO_T}$ac_cv_os_cray" >&6 154853-if test $ac_cv_os_cray = yes; then 154854- for ac_func in _getb67 GETB67 getb67; do 154855- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 154856-echo "$as_me:$LINENO: checking for $ac_func" >&5 154857-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 154858-if eval "test \"\${$as_ac_var+set}\" = set"; then 154859- echo $ECHO_N "(cached) $ECHO_C" >&6 154860-else 154861- cat >conftest.$ac_ext <<_ACEOF 154862-/* confdefs.h. */ 154863-_ACEOF 154864-cat confdefs.h >>conftest.$ac_ext 154865-cat >>conftest.$ac_ext <<_ACEOF 154866-/* end confdefs.h. */ 154867-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 154868- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 154869-#define $ac_func innocuous_$ac_func 154870 154871+echo "$ac_t""$ac_cv_os_cray" 1>&6 154872+if test $ac_cv_os_cray = yes; then 154873+for ac_func in _getb67 GETB67 getb67; do 154874+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 154875+echo "configure:104616: checking for $ac_func" >&5 154876+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 154877+ echo $ac_n "(cached) $ac_c" 1>&6 154878+else 154879+ cat > conftest.$ac_ext <<EOF 154880+#line 104621 "configure" 154881+#include "confdefs.h" 154882 /* System header to define __stub macros and hopefully few prototypes, 154883- which can conflict with char $ac_func (); below. 154884- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 154885- <limits.h> exists even on freestanding compilers. */ 154886- 154887-#ifdef __STDC__ 154888-# include <limits.h> 154889-#else 154890-# include <assert.h> 154891-#endif 154892- 154893-#undef $ac_func 154894- 154895+ which can conflict with char $ac_func(); below. */ 154896+#include <assert.h> 154897 /* Override any gcc2 internal prototype to avoid an error. */ 154898-#ifdef __cplusplus 154899-extern "C" 154900-{ 154901-#endif 154902 /* We use char because int might match the return type of a gcc2 154903- builtin and then its argument prototype would still apply. */ 154904-char $ac_func (); 154905+ builtin and then its argument prototype would still apply. */ 154906+char $ac_func(); 154907+ 154908+int main() { 154909+ 154910 /* The GNU C library defines this for functions which it implements 154911 to always fail with ENOSYS. Some functions are actually named 154912 something starting with __ and the normal name is an alias. */ 154913 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 154914 choke me 154915 #else 154916-char (*f) () = $ac_func; 154917-#endif 154918-#ifdef __cplusplus 154919-} 154920+$ac_func(); 154921 #endif 154922 154923-int 154924-main () 154925-{ 154926-return f != $ac_func; 154927- ; 154928- return 0; 154929-} 154930-_ACEOF 154931-rm -f conftest.$ac_objext conftest$ac_exeext 154932-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 154933- (eval $ac_link) 2>conftest.er1 154934- ac_status=$? 154935- grep -v '^ *+' conftest.er1 >conftest.err 154936- rm -f conftest.er1 154937- cat conftest.err >&5 154938- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154939- (exit $ac_status); } && 154940- { ac_try='test -z "$ac_c_werror_flag" 154941- || test ! -s conftest.err' 154942- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154943- (eval $ac_try) 2>&5 154944- ac_status=$? 154945- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154946- (exit $ac_status); }; } && 154947- { ac_try='test -s conftest$ac_exeext' 154948- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 154949- (eval $ac_try) 2>&5 154950- ac_status=$? 154951- echo "$as_me:$LINENO: \$? = $ac_status" >&5 154952- (exit $ac_status); }; }; then 154953- eval "$as_ac_var=yes" 154954-else 154955- echo "$as_me: failed program was:" >&5 154956-sed 's/^/| /' conftest.$ac_ext >&5 154957- 154958-eval "$as_ac_var=no" 154959-fi 154960-rm -f conftest.err conftest.$ac_objext \ 154961- conftest$ac_exeext conftest.$ac_ext 154962-fi 154963-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 154964-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 154965-if test `eval echo '${'$as_ac_var'}'` = yes; then 154966+; return 0; } 154967+EOF 154968+if { (eval echo configure:104644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 154969+ rm -rf conftest* 154970+ eval "ac_cv_func_$ac_func=yes" 154971+else 154972+ echo "configure: failed program was:" >&5 154973+ cat conftest.$ac_ext >&5 154974+ rm -rf conftest* 154975+ eval "ac_cv_func_$ac_func=no" 154976+fi 154977+rm -f conftest* 154978+fi 154979 154980-cat >>confdefs.h <<_ACEOF 154981+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 154982+ echo "$ac_t""yes" 1>&6 154983+ cat >> confdefs.h <<EOF 154984 #define CRAY_STACKSEG_END $ac_func 154985-_ACEOF 154986+EOF 154987 154988- break 154989+ break 154990+else 154991+ echo "$ac_t""no" 1>&6 154992 fi 154993 154994- done 154995+done 154996 fi 154997 154998-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 154999-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 155000-if test "${ac_cv_c_stack_direction+set}" = set; then 155001- echo $ECHO_N "(cached) $ECHO_C" >&6 155002+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 155003+echo "configure:104671: checking stack direction for C alloca" >&5 155004+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 155005+ echo $ac_n "(cached) $ac_c" 1>&6 155006 else 155007 if test "$cross_compiling" = yes; then 155008 ac_cv_c_stack_direction=0 155009 else 155010- cat >conftest.$ac_ext <<_ACEOF 155011-/* confdefs.h. */ 155012-_ACEOF 155013-cat confdefs.h >>conftest.$ac_ext 155014-cat >>conftest.$ac_ext <<_ACEOF 155015-/* end confdefs.h. */ 155016-int 155017+ cat > conftest.$ac_ext <<EOF 155018+#line 104679 "configure" 155019+#include "confdefs.h" 155020 find_stack_direction () 155021 { 155022 static char *addr = 0; 155023@@ -135155,411 +104689,245 @@ 155024 else 155025 return (&dummy > addr) ? 1 : -1; 155026 } 155027- 155028-int 155029 main () 155030 { 155031- exit (find_stack_direction () < 0); 155032+ exit (find_stack_direction() < 0); 155033 } 155034-_ACEOF 155035-rm -f conftest$ac_exeext 155036-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155037- (eval $ac_link) 2>&5 155038- ac_status=$? 155039- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155040- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 155041- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155042- (eval $ac_try) 2>&5 155043- ac_status=$? 155044- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155045- (exit $ac_status); }; }; then 155046+EOF 155047+if { (eval echo configure:104698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 155048+then 155049 ac_cv_c_stack_direction=1 155050 else 155051- echo "$as_me: program exited with status $ac_status" >&5 155052-echo "$as_me: failed program was:" >&5 155053-sed 's/^/| /' conftest.$ac_ext >&5 155054- 155055-( exit $ac_status ) 155056-ac_cv_c_stack_direction=-1 155057+ echo "configure: failed program was:" >&5 155058+ cat conftest.$ac_ext >&5 155059+ rm -fr conftest* 155060+ ac_cv_c_stack_direction=-1 155061 fi 155062-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 155063+rm -fr conftest* 155064 fi 155065+ 155066 fi 155067-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 155068-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 155069 155070-cat >>confdefs.h <<_ACEOF 155071+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 155072+cat >> confdefs.h <<EOF 155073 #define STACK_DIRECTION $ac_cv_c_stack_direction 155074-_ACEOF 155075- 155076+EOF 155077 155078 fi 155079 155080- 155081- 155082- 155083- 155084- 155085- 155086- 155087- 155088- 155089 for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp 155090 do 155091-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 155092-echo "$as_me:$LINENO: checking for $ac_func" >&5 155093-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 155094-if eval "test \"\${$as_ac_var+set}\" = set"; then 155095- echo $ECHO_N "(cached) $ECHO_C" >&6 155096-else 155097- cat >conftest.$ac_ext <<_ACEOF 155098-/* confdefs.h. */ 155099-_ACEOF 155100-cat confdefs.h >>conftest.$ac_ext 155101-cat >>conftest.$ac_ext <<_ACEOF 155102-/* end confdefs.h. */ 155103-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 155104- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 155105-#define $ac_func innocuous_$ac_func 155106- 155107+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 155108+echo "configure:104722: checking for $ac_func" >&5 155109+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 155110+ echo $ac_n "(cached) $ac_c" 1>&6 155111+else 155112+ cat > conftest.$ac_ext <<EOF 155113+#line 104727 "configure" 155114+#include "confdefs.h" 155115 /* System header to define __stub macros and hopefully few prototypes, 155116- which can conflict with char $ac_func (); below. 155117- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 155118- <limits.h> exists even on freestanding compilers. */ 155119- 155120-#ifdef __STDC__ 155121-# include <limits.h> 155122-#else 155123-# include <assert.h> 155124-#endif 155125- 155126-#undef $ac_func 155127- 155128+ which can conflict with char $ac_func(); below. */ 155129+#include <assert.h> 155130 /* Override any gcc2 internal prototype to avoid an error. */ 155131-#ifdef __cplusplus 155132-extern "C" 155133-{ 155134-#endif 155135 /* We use char because int might match the return type of a gcc2 155136- builtin and then its argument prototype would still apply. */ 155137-char $ac_func (); 155138+ builtin and then its argument prototype would still apply. */ 155139+char $ac_func(); 155140+ 155141+int main() { 155142+ 155143 /* The GNU C library defines this for functions which it implements 155144 to always fail with ENOSYS. Some functions are actually named 155145 something starting with __ and the normal name is an alias. */ 155146 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 155147 choke me 155148 #else 155149-char (*f) () = $ac_func; 155150-#endif 155151-#ifdef __cplusplus 155152-} 155153+$ac_func(); 155154 #endif 155155 155156-int 155157-main () 155158-{ 155159-return f != $ac_func; 155160- ; 155161- return 0; 155162-} 155163-_ACEOF 155164-rm -f conftest.$ac_objext conftest$ac_exeext 155165-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155166- (eval $ac_link) 2>conftest.er1 155167- ac_status=$? 155168- grep -v '^ *+' conftest.er1 >conftest.err 155169- rm -f conftest.er1 155170- cat conftest.err >&5 155171- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155172- (exit $ac_status); } && 155173- { ac_try='test -z "$ac_c_werror_flag" 155174- || test ! -s conftest.err' 155175- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155176- (eval $ac_try) 2>&5 155177- ac_status=$? 155178- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155179- (exit $ac_status); }; } && 155180- { ac_try='test -s conftest$ac_exeext' 155181- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155182- (eval $ac_try) 2>&5 155183- ac_status=$? 155184- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155185- (exit $ac_status); }; }; then 155186- eval "$as_ac_var=yes" 155187-else 155188- echo "$as_me: failed program was:" >&5 155189-sed 's/^/| /' conftest.$ac_ext >&5 155190- 155191-eval "$as_ac_var=no" 155192-fi 155193-rm -f conftest.err conftest.$ac_objext \ 155194- conftest$ac_exeext conftest.$ac_ext 155195-fi 155196-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 155197-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 155198-if test `eval echo '${'$as_ac_var'}'` = yes; then 155199- cat >>confdefs.h <<_ACEOF 155200-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 155201-_ACEOF 155202+; return 0; } 155203+EOF 155204+if { (eval echo configure:104750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155205+ rm -rf conftest* 155206+ eval "ac_cv_func_$ac_func=yes" 155207+else 155208+ echo "configure: failed program was:" >&5 155209+ cat conftest.$ac_ext >&5 155210+ rm -rf conftest* 155211+ eval "ac_cv_func_$ac_func=no" 155212+fi 155213+rm -f conftest* 155214+fi 155215 155216+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 155217+ echo "$ac_t""yes" 1>&6 155218+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 155219+ cat >> confdefs.h <<EOF 155220+#define $ac_tr_func 1 155221+EOF 155222+ 155223+else 155224+ echo "$ac_t""no" 1>&6 155225 fi 155226 done 155227 155228 155229- echo "$as_me:$LINENO: checking whether sprintf is broken" >&5 155230-echo $ECHO_N "checking whether sprintf is broken... $ECHO_C" >&6 155231-if test "${ac_cv_broken_sprintf+set}" = set; then 155232- echo $ECHO_N "(cached) $ECHO_C" >&6 155233+ echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 155234+echo "configure:104776: checking whether sprintf is broken" >&5 155235+if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then 155236+ echo $ac_n "(cached) $ac_c" 1>&6 155237 else 155238- 155239+ 155240 if test "$cross_compiling" = yes; then 155241- 155242+ 155243 ac_cv_broken_sprintf=no 155244- 155245+ 155246 else 155247- cat >conftest.$ac_ext <<_ACEOF 155248-/* confdefs.h. */ 155249-_ACEOF 155250-cat confdefs.h >>conftest.$ac_ext 155251-cat >>conftest.$ac_ext <<_ACEOF 155252-/* end confdefs.h. */ 155253+ cat > conftest.$ac_ext <<EOF 155254+#line 104787 "configure" 155255+#include "confdefs.h" 155256 main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); } 155257-_ACEOF 155258-rm -f conftest$ac_exeext 155259-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155260- (eval $ac_link) 2>&5 155261- ac_status=$? 155262- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155263- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 155264- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155265- (eval $ac_try) 2>&5 155266- ac_status=$? 155267- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155268- (exit $ac_status); }; }; then 155269- 155270+EOF 155271+if { (eval echo configure:104791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 155272+then 155273+ 155274 ac_cv_broken_sprintf=no 155275- 155276+ 155277 else 155278- echo "$as_me: program exited with status $ac_status" >&5 155279-echo "$as_me: failed program was:" >&5 155280-sed 's/^/| /' conftest.$ac_ext >&5 155281- 155282-( exit $ac_status ) 155283- 155284+ echo "configure: failed program was:" >&5 155285+ cat conftest.$ac_ext >&5 155286+ rm -fr conftest* 155287+ 155288 ac_cv_broken_sprintf=yes 155289- 155290+ 155291 fi 155292-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 155293+rm -fr conftest* 155294 fi 155295 155296+ 155297 fi 155298-echo "$as_me:$LINENO: result: $ac_cv_broken_sprintf" >&5 155299-echo "${ECHO_T}$ac_cv_broken_sprintf" >&6 155300+ 155301+echo "$ac_t""$ac_cv_broken_sprintf" 1>&6 155302 if test "$ac_cv_broken_sprintf" = "yes"; then 155303 ac_result=1 155304 else 155305 ac_result=0 155306 fi 155307- 155308-cat >>confdefs.h <<_ACEOF 155309+ cat >> confdefs.h <<EOF 155310 #define ZEND_BROKEN_SPRINTF $ac_result 155311-_ACEOF 155312- 155313- 155314- 155315- 155316+EOF 155317 155318 155319 155320 for ac_func in finite isfinite isinf isnan 155321 do 155322-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 155323-echo "$as_me:$LINENO: checking for $ac_func" >&5 155324-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 155325-if eval "test \"\${$as_ac_var+set}\" = set"; then 155326- echo $ECHO_N "(cached) $ECHO_C" >&6 155327-else 155328- cat >conftest.$ac_ext <<_ACEOF 155329-/* confdefs.h. */ 155330-_ACEOF 155331-cat confdefs.h >>conftest.$ac_ext 155332-cat >>conftest.$ac_ext <<_ACEOF 155333-/* end confdefs.h. */ 155334-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 155335- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 155336-#define $ac_func innocuous_$ac_func 155337- 155338+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 155339+echo "configure:104825: checking for $ac_func" >&5 155340+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 155341+ echo $ac_n "(cached) $ac_c" 1>&6 155342+else 155343+ cat > conftest.$ac_ext <<EOF 155344+#line 104830 "configure" 155345+#include "confdefs.h" 155346 /* System header to define __stub macros and hopefully few prototypes, 155347- which can conflict with char $ac_func (); below. 155348- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 155349- <limits.h> exists even on freestanding compilers. */ 155350- 155351-#ifdef __STDC__ 155352-# include <limits.h> 155353-#else 155354-# include <assert.h> 155355-#endif 155356- 155357-#undef $ac_func 155358- 155359+ which can conflict with char $ac_func(); below. */ 155360+#include <assert.h> 155361 /* Override any gcc2 internal prototype to avoid an error. */ 155362-#ifdef __cplusplus 155363-extern "C" 155364-{ 155365-#endif 155366 /* We use char because int might match the return type of a gcc2 155367- builtin and then its argument prototype would still apply. */ 155368-char $ac_func (); 155369+ builtin and then its argument prototype would still apply. */ 155370+char $ac_func(); 155371+ 155372+int main() { 155373+ 155374 /* The GNU C library defines this for functions which it implements 155375 to always fail with ENOSYS. Some functions are actually named 155376 something starting with __ and the normal name is an alias. */ 155377 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 155378 choke me 155379 #else 155380-char (*f) () = $ac_func; 155381-#endif 155382-#ifdef __cplusplus 155383-} 155384+$ac_func(); 155385 #endif 155386 155387-int 155388-main () 155389-{ 155390-return f != $ac_func; 155391- ; 155392- return 0; 155393-} 155394-_ACEOF 155395-rm -f conftest.$ac_objext conftest$ac_exeext 155396-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155397- (eval $ac_link) 2>conftest.er1 155398- ac_status=$? 155399- grep -v '^ *+' conftest.er1 >conftest.err 155400- rm -f conftest.er1 155401- cat conftest.err >&5 155402- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155403- (exit $ac_status); } && 155404- { ac_try='test -z "$ac_c_werror_flag" 155405- || test ! -s conftest.err' 155406- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155407- (eval $ac_try) 2>&5 155408- ac_status=$? 155409- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155410- (exit $ac_status); }; } && 155411- { ac_try='test -s conftest$ac_exeext' 155412- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155413- (eval $ac_try) 2>&5 155414- ac_status=$? 155415- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155416- (exit $ac_status); }; }; then 155417- eval "$as_ac_var=yes" 155418-else 155419- echo "$as_me: failed program was:" >&5 155420-sed 's/^/| /' conftest.$ac_ext >&5 155421- 155422-eval "$as_ac_var=no" 155423-fi 155424-rm -f conftest.err conftest.$ac_objext \ 155425- conftest$ac_exeext conftest.$ac_ext 155426-fi 155427-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 155428-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 155429-if test `eval echo '${'$as_ac_var'}'` = yes; then 155430- cat >>confdefs.h <<_ACEOF 155431-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 155432-_ACEOF 155433+; return 0; } 155434+EOF 155435+if { (eval echo configure:104853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155436+ rm -rf conftest* 155437+ eval "ac_cv_func_$ac_func=yes" 155438+else 155439+ echo "configure: failed program was:" >&5 155440+ cat conftest.$ac_ext >&5 155441+ rm -rf conftest* 155442+ eval "ac_cv_func_$ac_func=no" 155443+fi 155444+rm -f conftest* 155445+fi 155446 155447+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 155448+ echo "$ac_t""yes" 1>&6 155449+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 155450+ cat >> confdefs.h <<EOF 155451+#define $ac_tr_func 1 155452+EOF 155453+ 155454+else 155455+ echo "$ac_t""no" 1>&6 155456 fi 155457 done 155458 155459 155460 155461- echo "$as_me:$LINENO: checking whether fp_except is defined" >&5 155462-echo $ECHO_N "checking whether fp_except is defined... $ECHO_C" >&6 155463-if test "${ac_cv_type_fp_except+set}" = set; then 155464- echo $ECHO_N "(cached) $ECHO_C" >&6 155465+ echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 155466+echo "configure:104880: checking whether fp_except is defined" >&5 155467+if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then 155468+ echo $ac_n "(cached) $ac_c" 1>&6 155469 else 155470- 155471- cat >conftest.$ac_ext <<_ACEOF 155472-/* confdefs.h. */ 155473-_ACEOF 155474-cat confdefs.h >>conftest.$ac_ext 155475-cat >>conftest.$ac_ext <<_ACEOF 155476-/* end confdefs.h. */ 155477+ 155478+ cat > conftest.$ac_ext <<EOF 155479+#line 104886 "configure" 155480+#include "confdefs.h" 155481 155482 #include <floatingpoint.h> 155483 155484-int 155485-main () 155486-{ 155487+int main() { 155488 155489 fp_except x = (fp_except) 0; 155490 155491- ; 155492- return 0; 155493-} 155494-_ACEOF 155495-rm -f conftest.$ac_objext 155496-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 155497- (eval $ac_compile) 2>conftest.er1 155498- ac_status=$? 155499- grep -v '^ *+' conftest.er1 >conftest.err 155500- rm -f conftest.er1 155501- cat conftest.err >&5 155502- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155503- (exit $ac_status); } && 155504- { ac_try='test -z "$ac_c_werror_flag" 155505- || test ! -s conftest.err' 155506- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155507- (eval $ac_try) 2>&5 155508- ac_status=$? 155509- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155510- (exit $ac_status); }; } && 155511- { ac_try='test -s conftest.$ac_objext' 155512- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155513- (eval $ac_try) 2>&5 155514- ac_status=$? 155515- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155516- (exit $ac_status); }; }; then 155517- 155518+; return 0; } 155519+EOF 155520+if { (eval echo configure:104897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 155521+ rm -rf conftest* 155522+ 155523 ac_cv_type_fp_except=yes 155524 155525 else 155526- echo "$as_me: failed program was:" >&5 155527-sed 's/^/| /' conftest.$ac_ext >&5 155528- 155529- 155530+ echo "configure: failed program was:" >&5 155531+ cat conftest.$ac_ext >&5 155532+ rm -rf conftest* 155533+ 155534 ac_cv_type_fp_except=no 155535 155536 fi 155537-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 155538+rm -f conftest* 155539 fi 155540-echo "$as_me:$LINENO: result: $ac_cv_type_fp_except" >&5 155541-echo "${ECHO_T}$ac_cv_type_fp_except" >&6 155542- if test "$ac_cv_type_fp_except" = "yes"; then 155543 155544-cat >>confdefs.h <<\_ACEOF 155545+echo "$ac_t""$ac_cv_type_fp_except" 1>&6 155546+ if test "$ac_cv_type_fp_except" = "yes"; then 155547+ cat >> confdefs.h <<\EOF 155548 #define HAVE_FP_EXCEPT 1 155549-_ACEOF 155550+EOF 155551 155552 fi 155553 155554 155555 155556- echo "$as_me:$LINENO: checking for usable _FPU_SETCW" >&5 155557-echo $ECHO_N "checking for usable _FPU_SETCW... $ECHO_C" >&6 155558- cat >conftest.$ac_ext <<_ACEOF 155559-/* confdefs.h. */ 155560-_ACEOF 155561-cat confdefs.h >>conftest.$ac_ext 155562-cat >>conftest.$ac_ext <<_ACEOF 155563-/* end confdefs.h. */ 155564+ echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 155565+echo "configure:104924: checking for usable _FPU_SETCW" >&5 155566+ cat > conftest.$ac_ext <<EOF 155567+#line 104926 "configure" 155568+#include "confdefs.h" 155569 155570 #include <fpu_control.h> 155571- 155572-int 155573-main () 155574-{ 155575+ 155576+int main() { 155577 155578 fpu_control_t fpu_oldcw, fpu_cw; 155579 volatile double result; 155580@@ -135571,69 +104939,38 @@ 155581 _FPU_SETCW(fpu_cw); 155582 result = a / b; 155583 _FPU_SETCW(fpu_oldcw); 155584- 155585- ; 155586- return 0; 155587-} 155588-_ACEOF 155589-rm -f conftest.$ac_objext conftest$ac_exeext 155590-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155591- (eval $ac_link) 2>conftest.er1 155592- ac_status=$? 155593- grep -v '^ *+' conftest.er1 >conftest.err 155594- rm -f conftest.er1 155595- cat conftest.err >&5 155596- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155597- (exit $ac_status); } && 155598- { ac_try='test -z "$ac_c_werror_flag" 155599- || test ! -s conftest.err' 155600- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155601- (eval $ac_try) 2>&5 155602- ac_status=$? 155603- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155604- (exit $ac_status); }; } && 155605- { ac_try='test -s conftest$ac_exeext' 155606- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155607- (eval $ac_try) 2>&5 155608- ac_status=$? 155609- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155610- (exit $ac_status); }; }; then 155611+ 155612+; return 0; } 155613+EOF 155614+if { (eval echo configure:104946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155615+ rm -rf conftest* 155616 ac_cfp_have__fpu_setcw=yes 155617 else 155618- echo "$as_me: failed program was:" >&5 155619-sed 's/^/| /' conftest.$ac_ext >&5 155620- 155621-ac_cfp_have__fpu_setcw=no 155622+ echo "configure: failed program was:" >&5 155623+ cat conftest.$ac_ext >&5 155624+ rm -rf conftest* 155625+ ac_cfp_have__fpu_setcw=no 155626 fi 155627-rm -f conftest.err conftest.$ac_objext \ 155628- conftest$ac_exeext conftest.$ac_ext 155629+rm -f conftest* 155630 if test "$ac_cfp_have__fpu_setcw" = "yes" ; then 155631- 155632-cat >>confdefs.h <<\_ACEOF 155633+ cat >> confdefs.h <<\EOF 155634 #define HAVE__FPU_SETCW 1 155635-_ACEOF 155636+EOF 155637 155638- echo "$as_me:$LINENO: result: yes" >&5 155639-echo "${ECHO_T}yes" >&6 155640+ echo "$ac_t""yes" 1>&6 155641 else 155642- echo "$as_me:$LINENO: result: no" >&5 155643-echo "${ECHO_T}no" >&6 155644+ echo "$ac_t""no" 1>&6 155645 fi 155646- 155647- echo "$as_me:$LINENO: checking for usable fpsetprec" >&5 155648-echo $ECHO_N "checking for usable fpsetprec... $ECHO_C" >&6 155649- cat >conftest.$ac_ext <<_ACEOF 155650-/* confdefs.h. */ 155651-_ACEOF 155652-cat confdefs.h >>conftest.$ac_ext 155653-cat >>conftest.$ac_ext <<_ACEOF 155654-/* end confdefs.h. */ 155655+ 155656+ echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 155657+echo "configure:104967: checking for usable fpsetprec" >&5 155658+ cat > conftest.$ac_ext <<EOF 155659+#line 104969 "configure" 155660+#include "confdefs.h" 155661 155662 #include <machine/ieeefp.h> 155663- 155664-int 155665-main () 155666-{ 155667+ 155668+int main() { 155669 155670 fp_prec_t fpu_oldprec; 155671 volatile double result; 155672@@ -135644,69 +104981,38 @@ 155673 fpsetprec(FP_PD); 155674 result = a / b; 155675 fpsetprec(fpu_oldprec); 155676- 155677- ; 155678- return 0; 155679-} 155680-_ACEOF 155681-rm -f conftest.$ac_objext conftest$ac_exeext 155682-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155683- (eval $ac_link) 2>conftest.er1 155684- ac_status=$? 155685- grep -v '^ *+' conftest.er1 >conftest.err 155686- rm -f conftest.er1 155687- cat conftest.err >&5 155688- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155689- (exit $ac_status); } && 155690- { ac_try='test -z "$ac_c_werror_flag" 155691- || test ! -s conftest.err' 155692- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155693- (eval $ac_try) 2>&5 155694- ac_status=$? 155695- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155696- (exit $ac_status); }; } && 155697- { ac_try='test -s conftest$ac_exeext' 155698- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155699- (eval $ac_try) 2>&5 155700- ac_status=$? 155701- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155702- (exit $ac_status); }; }; then 155703+ 155704+; return 0; } 155705+EOF 155706+if { (eval echo configure:104988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155707+ rm -rf conftest* 155708 ac_cfp_have_fpsetprec=yes 155709 else 155710- echo "$as_me: failed program was:" >&5 155711-sed 's/^/| /' conftest.$ac_ext >&5 155712- 155713-ac_cfp_have_fpsetprec=no 155714+ echo "configure: failed program was:" >&5 155715+ cat conftest.$ac_ext >&5 155716+ rm -rf conftest* 155717+ ac_cfp_have_fpsetprec=no 155718 fi 155719-rm -f conftest.err conftest.$ac_objext \ 155720- conftest$ac_exeext conftest.$ac_ext 155721+rm -f conftest* 155722 if test "$ac_cfp_have_fpsetprec" = "yes" ; then 155723- 155724-cat >>confdefs.h <<\_ACEOF 155725+ cat >> confdefs.h <<\EOF 155726 #define HAVE_FPSETPREC 1 155727-_ACEOF 155728+EOF 155729 155730- echo "$as_me:$LINENO: result: yes" >&5 155731-echo "${ECHO_T}yes" >&6 155732+ echo "$ac_t""yes" 1>&6 155733 else 155734- echo "$as_me:$LINENO: result: no" >&5 155735-echo "${ECHO_T}no" >&6 155736+ echo "$ac_t""no" 1>&6 155737 fi 155738 155739- echo "$as_me:$LINENO: checking for usable _controlfp" >&5 155740-echo $ECHO_N "checking for usable _controlfp... $ECHO_C" >&6 155741- cat >conftest.$ac_ext <<_ACEOF 155742-/* confdefs.h. */ 155743-_ACEOF 155744-cat confdefs.h >>conftest.$ac_ext 155745-cat >>conftest.$ac_ext <<_ACEOF 155746-/* end confdefs.h. */ 155747+ echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 155748+echo "configure:105009: checking for usable _controlfp" >&5 155749+ cat > conftest.$ac_ext <<EOF 155750+#line 105011 "configure" 155751+#include "confdefs.h" 155752 155753 #include <float.h> 155754- 155755-int 155756-main () 155757-{ 155758+ 155759+int main() { 155760 155761 unsigned int fpu_oldcw; 155762 volatile double result; 155763@@ -135717,69 +105023,38 @@ 155764 _controlfp(_PC_53, _MCW_PC); 155765 result = a / b; 155766 _controlfp(fpu_oldcw, _MCW_PC); 155767- 155768- ; 155769- return 0; 155770-} 155771-_ACEOF 155772-rm -f conftest.$ac_objext conftest$ac_exeext 155773-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155774- (eval $ac_link) 2>conftest.er1 155775- ac_status=$? 155776- grep -v '^ *+' conftest.er1 >conftest.err 155777- rm -f conftest.er1 155778- cat conftest.err >&5 155779- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155780- (exit $ac_status); } && 155781- { ac_try='test -z "$ac_c_werror_flag" 155782- || test ! -s conftest.err' 155783- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155784- (eval $ac_try) 2>&5 155785- ac_status=$? 155786- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155787- (exit $ac_status); }; } && 155788- { ac_try='test -s conftest$ac_exeext' 155789- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155790- (eval $ac_try) 2>&5 155791- ac_status=$? 155792- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155793- (exit $ac_status); }; }; then 155794+ 155795+; return 0; } 155796+EOF 155797+if { (eval echo configure:105030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155798+ rm -rf conftest* 155799 ac_cfp_have__controlfp=yes 155800 else 155801- echo "$as_me: failed program was:" >&5 155802-sed 's/^/| /' conftest.$ac_ext >&5 155803- 155804-ac_cfp_have__controlfp=no 155805+ echo "configure: failed program was:" >&5 155806+ cat conftest.$ac_ext >&5 155807+ rm -rf conftest* 155808+ ac_cfp_have__controlfp=no 155809 fi 155810-rm -f conftest.err conftest.$ac_objext \ 155811- conftest$ac_exeext conftest.$ac_ext 155812+rm -f conftest* 155813 if test "$ac_cfp_have__controlfp" = "yes" ; then 155814- 155815-cat >>confdefs.h <<\_ACEOF 155816+ cat >> confdefs.h <<\EOF 155817 #define HAVE__CONTROLFP 1 155818-_ACEOF 155819+EOF 155820 155821- echo "$as_me:$LINENO: result: yes" >&5 155822-echo "${ECHO_T}yes" >&6 155823+ echo "$ac_t""yes" 1>&6 155824 else 155825- echo "$as_me:$LINENO: result: no" >&5 155826-echo "${ECHO_T}no" >&6 155827+ echo "$ac_t""no" 1>&6 155828 fi 155829 155830- echo "$as_me:$LINENO: checking for usable _controlfp_s" >&5 155831-echo $ECHO_N "checking for usable _controlfp_s... $ECHO_C" >&6 155832- cat >conftest.$ac_ext <<_ACEOF 155833-/* confdefs.h. */ 155834-_ACEOF 155835-cat confdefs.h >>conftest.$ac_ext 155836-cat >>conftest.$ac_ext <<_ACEOF 155837-/* end confdefs.h. */ 155838+ echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 155839+echo "configure:105051: checking for usable _controlfp_s" >&5 155840+ cat > conftest.$ac_ext <<EOF 155841+#line 105053 "configure" 155842+#include "confdefs.h" 155843 155844 #include <float.h> 155845- 155846-int 155847-main () 155848-{ 155849+ 155850+int main() { 155851 155852 unsigned int fpu_oldcw, fpu_cw; 155853 volatile double result; 155854@@ -135791,69 +105066,38 @@ 155855 _controlfp_s(&fpu_cw, _PC_53, _MCW_PC); 155856 result = a / b; 155857 _controlfp_s(&fpu_cw, fpu_oldcw, _MCW_PC); 155858- 155859- ; 155860- return 0; 155861-} 155862-_ACEOF 155863-rm -f conftest.$ac_objext conftest$ac_exeext 155864-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155865- (eval $ac_link) 2>conftest.er1 155866- ac_status=$? 155867- grep -v '^ *+' conftest.er1 >conftest.err 155868- rm -f conftest.er1 155869- cat conftest.err >&5 155870- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155871- (exit $ac_status); } && 155872- { ac_try='test -z "$ac_c_werror_flag" 155873- || test ! -s conftest.err' 155874- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155875- (eval $ac_try) 2>&5 155876- ac_status=$? 155877- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155878- (exit $ac_status); }; } && 155879- { ac_try='test -s conftest$ac_exeext' 155880- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155881- (eval $ac_try) 2>&5 155882- ac_status=$? 155883- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155884- (exit $ac_status); }; }; then 155885+ 155886+; return 0; } 155887+EOF 155888+if { (eval echo configure:105073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155889+ rm -rf conftest* 155890 ac_cfp_have__controlfp_s=yes 155891 else 155892- echo "$as_me: failed program was:" >&5 155893-sed 's/^/| /' conftest.$ac_ext >&5 155894- 155895-ac_cfp_have__controlfp_s=no 155896+ echo "configure: failed program was:" >&5 155897+ cat conftest.$ac_ext >&5 155898+ rm -rf conftest* 155899+ ac_cfp_have__controlfp_s=no 155900 fi 155901-rm -f conftest.err conftest.$ac_objext \ 155902- conftest$ac_exeext conftest.$ac_ext 155903+rm -f conftest* 155904 if test "$ac_cfp_have__controlfp_s" = "yes" ; then 155905- 155906-cat >>confdefs.h <<\_ACEOF 155907+ cat >> confdefs.h <<\EOF 155908 #define HAVE__CONTROLFP_S 1 155909-_ACEOF 155910+EOF 155911 155912- echo "$as_me:$LINENO: result: yes" >&5 155913-echo "${ECHO_T}yes" >&6 155914+ echo "$ac_t""yes" 1>&6 155915 else 155916- echo "$as_me:$LINENO: result: no" >&5 155917-echo "${ECHO_T}no" >&6 155918+ echo "$ac_t""no" 1>&6 155919 fi 155920 155921- echo "$as_me:$LINENO: checking whether FPU control word can be manipulated by inline assembler" >&5 155922-echo $ECHO_N "checking whether FPU control word can be manipulated by inline assembler... $ECHO_C" >&6 155923- cat >conftest.$ac_ext <<_ACEOF 155924-/* confdefs.h. */ 155925-_ACEOF 155926-cat confdefs.h >>conftest.$ac_ext 155927-cat >>conftest.$ac_ext <<_ACEOF 155928-/* end confdefs.h. */ 155929+ echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 155930+echo "configure:105094: checking whether FPU control word can be manipulated by inline assembler" >&5 155931+ cat > conftest.$ac_ext <<EOF 155932+#line 105096 "configure" 155933+#include "confdefs.h" 155934 155935 /* nothing */ 155936- 155937-int 155938-main () 155939-{ 155940+ 155941+int main() { 155942 155943 unsigned int oldcw, cw; 155944 volatile double result; 155945@@ -135867,71 +105111,41 @@ 155946 result = a / b; 155947 155948 __asm__ __volatile__ ("fldcw %0" : : "m" (*&oldcw)); 155949- 155950- ; 155951- return 0; 155952-} 155953-_ACEOF 155954-rm -f conftest.$ac_objext conftest$ac_exeext 155955-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 155956- (eval $ac_link) 2>conftest.er1 155957- ac_status=$? 155958- grep -v '^ *+' conftest.er1 >conftest.err 155959- rm -f conftest.er1 155960- cat conftest.err >&5 155961- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155962- (exit $ac_status); } && 155963- { ac_try='test -z "$ac_c_werror_flag" 155964- || test ! -s conftest.err' 155965- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155966- (eval $ac_try) 2>&5 155967- ac_status=$? 155968- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155969- (exit $ac_status); }; } && 155970- { ac_try='test -s conftest$ac_exeext' 155971- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 155972- (eval $ac_try) 2>&5 155973- ac_status=$? 155974- echo "$as_me:$LINENO: \$? = $ac_status" >&5 155975- (exit $ac_status); }; }; then 155976+ 155977+; return 0; } 155978+EOF 155979+if { (eval echo configure:105118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 155980+ rm -rf conftest* 155981 ac_cfp_have_fpu_inline_asm_x86=yes 155982 else 155983- echo "$as_me: failed program was:" >&5 155984-sed 's/^/| /' conftest.$ac_ext >&5 155985- 155986-ac_cfp_have_fpu_inline_asm_x86=no 155987+ echo "configure: failed program was:" >&5 155988+ cat conftest.$ac_ext >&5 155989+ rm -rf conftest* 155990+ ac_cfp_have_fpu_inline_asm_x86=no 155991 fi 155992-rm -f conftest.err conftest.$ac_objext \ 155993- conftest$ac_exeext conftest.$ac_ext 155994+rm -f conftest* 155995 if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then 155996- 155997-cat >>confdefs.h <<\_ACEOF 155998+ cat >> confdefs.h <<\EOF 155999 #define HAVE_FPU_INLINE_ASM_X86 1 156000-_ACEOF 156001+EOF 156002 156003- echo "$as_me:$LINENO: result: yes" >&5 156004-echo "${ECHO_T}yes" >&6 156005+ echo "$ac_t""yes" 1>&6 156006 else 156007- echo "$as_me:$LINENO: result: no" >&5 156008-echo "${ECHO_T}no" >&6 156009+ echo "$ac_t""no" 1>&6 156010 fi 156011 156012 156013-echo "$as_me:$LINENO: checking whether double cast to long preserves least significant bits" >&5 156014-echo $ECHO_N "checking whether double cast to long preserves least significant bits... $ECHO_C" >&6 156015+echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 156016+echo "configure:105140: checking whether double cast to long preserves least significant bits" >&5 156017 156018 if test "$cross_compiling" = yes; then 156019- 156020- echo "$as_me:$LINENO: result: no" >&5 156021-echo "${ECHO_T}no" >&6 156022+ 156023+ echo "$ac_t""no" 1>&6 156024 156025 else 156026- cat >conftest.$ac_ext <<_ACEOF 156027-/* confdefs.h. */ 156028-_ACEOF 156029-cat confdefs.h >>conftest.$ac_ext 156030-cat >>conftest.$ac_ext <<_ACEOF 156031-/* end confdefs.h. */ 156032+ cat > conftest.$ac_ext <<EOF 156033+#line 105148 "configure" 156034+#include "confdefs.h" 156035 156036 #include <limits.h> 156037 156038@@ -135953,202 +105167,79 @@ 156039 exit(1); 156040 } 156041 156042-_ACEOF 156043-rm -f conftest$ac_exeext 156044-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156045- (eval $ac_link) 2>&5 156046- ac_status=$? 156047- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156048- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 156049- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156050- (eval $ac_try) 2>&5 156051- ac_status=$? 156052- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156053- (exit $ac_status); }; }; then 156054- 156055- 156056-cat >>confdefs.h <<\_ACEOF 156057+EOF 156058+if { (eval echo configure:105172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 156059+then 156060+ 156061+ cat >> confdefs.h <<\EOF 156062 #define ZEND_DVAL_TO_LVAL_CAST_OK 1 156063-_ACEOF 156064+EOF 156065 156066- echo "$as_me:$LINENO: result: yes" >&5 156067-echo "${ECHO_T}yes" >&6 156068+ echo "$ac_t""yes" 1>&6 156069 156070 else 156071- echo "$as_me: program exited with status $ac_status" >&5 156072-echo "$as_me: failed program was:" >&5 156073-sed 's/^/| /' conftest.$ac_ext >&5 156074- 156075-( exit $ac_status ) 156076- 156077- echo "$as_me:$LINENO: result: no" >&5 156078-echo "${ECHO_T}no" >&6 156079+ echo "configure: failed program was:" >&5 156080+ cat conftest.$ac_ext >&5 156081+ rm -fr conftest* 156082+ 156083+ echo "$ac_t""no" 1>&6 156084 156085 fi 156086-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 156087+rm -fr conftest* 156088 fi 156089 156090+ 156091 156092- 156093-for ac_header in dlfcn.h 156094+for ac_hdr in dlfcn.h 156095 do 156096-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 156097-if eval "test \"\${$as_ac_Header+set}\" = set"; then 156098- echo "$as_me:$LINENO: checking for $ac_header" >&5 156099-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 156100-if eval "test \"\${$as_ac_Header+set}\" = set"; then 156101- echo $ECHO_N "(cached) $ECHO_C" >&6 156102-fi 156103-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 156104-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 156105-else 156106- # Is the header compilable? 156107-echo "$as_me:$LINENO: checking $ac_header usability" >&5 156108-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 156109-cat >conftest.$ac_ext <<_ACEOF 156110-/* confdefs.h. */ 156111-_ACEOF 156112-cat confdefs.h >>conftest.$ac_ext 156113-cat >>conftest.$ac_ext <<_ACEOF 156114-/* end confdefs.h. */ 156115-$ac_includes_default 156116-#include <$ac_header> 156117-_ACEOF 156118-rm -f conftest.$ac_objext 156119-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 156120- (eval $ac_compile) 2>conftest.er1 156121- ac_status=$? 156122- grep -v '^ *+' conftest.er1 >conftest.err 156123- rm -f conftest.er1 156124- cat conftest.err >&5 156125- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156126- (exit $ac_status); } && 156127- { ac_try='test -z "$ac_c_werror_flag" 156128- || test ! -s conftest.err' 156129- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156130- (eval $ac_try) 2>&5 156131- ac_status=$? 156132- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156133- (exit $ac_status); }; } && 156134- { ac_try='test -s conftest.$ac_objext' 156135- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156136- (eval $ac_try) 2>&5 156137- ac_status=$? 156138- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156139- (exit $ac_status); }; }; then 156140- ac_header_compiler=yes 156141-else 156142- echo "$as_me: failed program was:" >&5 156143-sed 's/^/| /' conftest.$ac_ext >&5 156144- 156145-ac_header_compiler=no 156146-fi 156147-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 156148-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 156149-echo "${ECHO_T}$ac_header_compiler" >&6 156150- 156151-# Is the header present? 156152-echo "$as_me:$LINENO: checking $ac_header presence" >&5 156153-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 156154-cat >conftest.$ac_ext <<_ACEOF 156155-/* confdefs.h. */ 156156-_ACEOF 156157-cat confdefs.h >>conftest.$ac_ext 156158-cat >>conftest.$ac_ext <<_ACEOF 156159-/* end confdefs.h. */ 156160-#include <$ac_header> 156161-_ACEOF 156162-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 156163- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 156164- ac_status=$? 156165- grep -v '^ *+' conftest.er1 >conftest.err 156166- rm -f conftest.er1 156167- cat conftest.err >&5 156168- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156169- (exit $ac_status); } >/dev/null; then 156170- if test -s conftest.err; then 156171- ac_cpp_err=$ac_c_preproc_warn_flag 156172- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 156173- else 156174- ac_cpp_err= 156175- fi 156176-else 156177- ac_cpp_err=yes 156178-fi 156179-if test -z "$ac_cpp_err"; then 156180- ac_header_preproc=yes 156181-else 156182- echo "$as_me: failed program was:" >&5 156183-sed 's/^/| /' conftest.$ac_ext >&5 156184- 156185- ac_header_preproc=no 156186-fi 156187-rm -f conftest.err conftest.$ac_ext 156188-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 156189-echo "${ECHO_T}$ac_header_preproc" >&6 156190- 156191-# So? What about this header? 156192-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 156193- yes:no: ) 156194- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 156195-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 156196- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 156197-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 156198- ac_header_preproc=yes 156199- ;; 156200- no:yes:* ) 156201- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 156202-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 156203- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 156204-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 156205- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 156206-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 156207- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 156208-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 156209- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 156210-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 156211- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 156212-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 156213- ( 156214- cat <<\_ASBOX 156215-## ------------------------------------------ ## 156216-## Report this to the AC_PACKAGE_NAME lists. ## 156217-## ------------------------------------------ ## 156218-_ASBOX 156219- ) | 156220- sed "s/^/$as_me: WARNING: /" >&2 156221- ;; 156222-esac 156223-echo "$as_me:$LINENO: checking for $ac_header" >&5 156224-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 156225-if eval "test \"\${$as_ac_Header+set}\" = set"; then 156226- echo $ECHO_N "(cached) $ECHO_C" >&6 156227+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 156228+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 156229+echo "configure:105198: checking for $ac_hdr" >&5 156230+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 156231+ echo $ac_n "(cached) $ac_c" 1>&6 156232+else 156233+ cat > conftest.$ac_ext <<EOF 156234+#line 105203 "configure" 156235+#include "confdefs.h" 156236+#include <$ac_hdr> 156237+EOF 156238+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 156239+{ (eval echo configure:105208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 156240+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 156241+if test -z "$ac_err"; then 156242+ rm -rf conftest* 156243+ eval "ac_cv_header_$ac_safe=yes" 156244 else 156245- eval "$as_ac_Header=\$ac_header_preproc" 156246+ echo "$ac_err" >&5 156247+ echo "configure: failed program was:" >&5 156248+ cat conftest.$ac_ext >&5 156249+ rm -rf conftest* 156250+ eval "ac_cv_header_$ac_safe=no" 156251 fi 156252-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 156253-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 156254- 156255+rm -f conftest* 156256 fi 156257-if test `eval echo '${'$as_ac_Header'}'` = yes; then 156258- cat >>confdefs.h <<_ACEOF 156259-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 156260-_ACEOF 156261- 156262+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 156263+ echo "$ac_t""yes" 1>&6 156264+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 156265+ cat >> confdefs.h <<EOF 156266+#define $ac_tr_hdr 1 156267+EOF 156268+ 156269+else 156270+ echo "$ac_t""no" 1>&6 156271 fi 156272- 156273 done 156274 156275 156276-echo "$as_me:$LINENO: checking whether dlsym() requires a leading underscore in symbol names" >&5 156277-echo $ECHO_N "checking whether dlsym() requires a leading underscore in symbol names... $ECHO_C" >&6 156278+echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 156279+echo "configure:105236: checking whether dlsym() requires a leading underscore in symbol names" >&5 156280 if test "$cross_compiling" = yes; then : 156281- 156282+ 156283 else 156284 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 156285 lt_status=$lt_dlunknown 156286 cat > conftest.$ac_ext <<EOF 156287-#line 136148 "configure" 156288+#line 105243 "configure" 156289 #include "confdefs.h" 156290 156291 #if HAVE_DLFCN_H 156292@@ -136211,37 +105302,28 @@ 156293 exit (status); 156294 } 156295 EOF 156296- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156297- (eval $ac_link) 2>&5 156298- ac_status=$? 156299- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156300- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 156301+ if { (eval echo configure:105306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then 156302 (./conftest; exit; ) >&5 2>/dev/null 156303 lt_status=$? 156304 case x$lt_status in 156305- x$lt_dlno_uscore) 156306- echo "$as_me:$LINENO: result: no" >&5 156307-echo "${ECHO_T}no" >&6 156308+ x$lt_dlno_uscore) 156309+ echo "$ac_t""no" 1>&6 156310 ;; 156311- x$lt_dlneed_uscore) 156312- echo "$as_me:$LINENO: result: yes" >&5 156313-echo "${ECHO_T}yes" >&6 156314- 156315-cat >>confdefs.h <<\_ACEOF 156316+ x$lt_dlneed_uscore) 156317+ echo "$ac_t""yes" 1>&6 156318+ cat >> confdefs.h <<\EOF 156319 #define DLSYM_NEEDS_UNDERSCORE 1 156320-_ACEOF 156321+EOF 156322 156323 ;; 156324- x$lt_dlunknown|x*) 156325- echo "$as_me:$LINENO: result: no" >&5 156326-echo "${ECHO_T}no" >&6 156327+ x$lt_dlunknown|x*) 156328+ echo "$ac_t""no" 1>&6 156329 ;; 156330 esac 156331 else : 156332 # compilation failed 156333- 156334- echo "$as_me:$LINENO: result: no" >&5 156335-echo "${ECHO_T}no" >&6 156336+ 156337+ echo "$ac_t""no" 1>&6 156338 156339 fi 156340 fi 156341@@ -136250,110 +105332,104 @@ 156342 156343 156344 156345- 156346 # Check whether --with-zend-vm or --without-zend-vm was given. 156347 if test "${with_zend_vm+set}" = set; then 156348 withval="$with_zend_vm" 156349- 156350+ 156351 PHP_ZEND_VM=$withval 156352 156353 else 156354- 156355+ 156356 PHP_ZEND_VM=CALL 156357 156358-fi; 156359+fi 156360+ 156361 156362 # Check whether --enable-maintainer-zts or --disable-maintainer-zts was given. 156363 if test "${enable_maintainer_zts+set}" = set; then 156364 enableval="$enable_maintainer_zts" 156365- 156366+ 156367 ZEND_MAINTAINER_ZTS=$enableval 156368 156369 else 156370- 156371+ 156372 ZEND_MAINTAINER_ZTS=no 156373 156374-fi; 156375+fi 156376+ 156377 156378 # Check whether --enable-inline-optimization or --disable-inline-optimization was given. 156379 if test "${enable_inline_optimization+set}" = set; then 156380 enableval="$enable_inline_optimization" 156381- 156382+ 156383 ZEND_INLINE_OPTIMIZATION=$enableval 156384 156385 else 156386- 156387+ 156388 ZEND_INLINE_OPTIMIZATION=yes 156389 156390-fi; 156391+fi 156392+ 156393 156394 # Check whether --enable-zend-multibyte or --disable-zend-multibyte was given. 156395 if test "${enable_zend_multibyte+set}" = set; then 156396 enableval="$enable_zend_multibyte" 156397- 156398+ 156399 ZEND_MULTIBYTE=$enableval 156400 156401 else 156402- 156403+ 156404 ZEND_MULTIBYTE=no 156405 156406-fi; 156407+fi 156408+ 156409 156410-echo "$as_me:$LINENO: checking virtual machine dispatch method" >&5 156411-echo $ECHO_N "checking virtual machine dispatch method... $ECHO_C" >&6 156412-echo "$as_me:$LINENO: result: $PHP_ZEND_VM" >&5 156413-echo "${ECHO_T}$PHP_ZEND_VM" >&6 156414- 156415-echo "$as_me:$LINENO: checking whether to enable thread-safety" >&5 156416-echo $ECHO_N "checking whether to enable thread-safety... $ECHO_C" >&6 156417-echo "$as_me:$LINENO: result: $ZEND_MAINTAINER_ZTS" >&5 156418-echo "${ECHO_T}$ZEND_MAINTAINER_ZTS" >&6 156419- 156420-echo "$as_me:$LINENO: checking whether to enable inline optimization for GCC" >&5 156421-echo $ECHO_N "checking whether to enable inline optimization for GCC... $ECHO_C" >&6 156422-echo "$as_me:$LINENO: result: $ZEND_INLINE_OPTIMIZATION" >&5 156423-echo "${ECHO_T}$ZEND_INLINE_OPTIMIZATION" >&6 156424- 156425-echo "$as_me:$LINENO: checking whether to enable Zend debugging" >&5 156426-echo $ECHO_N "checking whether to enable Zend debugging... $ECHO_C" >&6 156427-echo "$as_me:$LINENO: result: $ZEND_DEBUG" >&5 156428-echo "${ECHO_T}$ZEND_DEBUG" >&6 156429- 156430-echo "$as_me:$LINENO: checking whether to enable Zend multibyte" >&5 156431-echo $ECHO_N "checking whether to enable Zend multibyte... $ECHO_C" >&6 156432-echo "$as_me:$LINENO: result: $ZEND_MULTIBYTE" >&5 156433-echo "${ECHO_T}$ZEND_MULTIBYTE" >&6 156434+echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 156435+echo "configure:105389: checking virtual machine dispatch method" >&5 156436+echo "$ac_t""$PHP_ZEND_VM" 1>&6 156437+ 156438+echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 156439+echo "configure:105393: checking whether to enable thread-safety" >&5 156440+echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 156441+ 156442+echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 156443+echo "configure:105397: checking whether to enable inline optimization for GCC" >&5 156444+echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 156445+ 156446+echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 156447+echo "configure:105401: checking whether to enable Zend debugging" >&5 156448+echo "$ac_t""$ZEND_DEBUG" 1>&6 156449+ 156450+echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 156451+echo "configure:105405: checking whether to enable Zend multibyte" >&5 156452+echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 156453 156454 case $PHP_ZEND_VM in 156455 SWITCH) 156456- 156457-cat >>confdefs.h <<\_ACEOF 156458+ cat >> confdefs.h <<\EOF 156459 #define ZEND_VM_KIND ZEND_VM_KIND_SWITCH 156460-_ACEOF 156461+EOF 156462 156463 ;; 156464 GOTO) 156465- 156466-cat >>confdefs.h <<\_ACEOF 156467+ cat >> confdefs.h <<\EOF 156468 #define ZEND_VM_KIND ZEND_VM_KIND_GOTO 156469-_ACEOF 156470+EOF 156471 156472 ;; 156473 *) 156474 PHP_ZEND_VM=CALL 156475- 156476-cat >>confdefs.h <<\_ACEOF 156477+ cat >> confdefs.h <<\EOF 156478 #define ZEND_VM_KIND ZEND_VM_KIND_CALL 156479-_ACEOF 156480+EOF 156481 156482 ;; 156483 esac 156484 156485 if test "$ZEND_DEBUG" = "yes"; then 156486- 156487-cat >>confdefs.h <<\_ACEOF 156488+ cat >> confdefs.h <<\EOF 156489 #define ZEND_DEBUG 1 156490-_ACEOF 156491+EOF 156492 156493 echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g" 156494 if test "$CFLAGS" = "-g -O2"; then 156495@@ -136363,32 +105439,29 @@ 156496 test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \ 156497 DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations" 156498 else 156499- 156500-cat >>confdefs.h <<\_ACEOF 156501+ cat >> confdefs.h <<\EOF 156502 #define ZEND_DEBUG 0 156503-_ACEOF 156504+EOF 156505 156506 fi 156507 156508 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" 156509 156510 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then 156511- 156512-cat >>confdefs.h <<\_ACEOF 156513+ cat >> confdefs.h <<\EOF 156514 #define ZTS 1 156515-_ACEOF 156516+EOF 156517 156518 CFLAGS="$CFLAGS -DZTS" 156519+ 156520 156521 156522- 156523-fi 156524+fi 156525 156526 if test "$ZEND_MULTIBYTE" = "yes"; then 156527- 156528-cat >>confdefs.h <<\_ACEOF 156529+ cat >> confdefs.h <<\EOF 156530 #define ZEND_MULTIBYTE 1 156531-_ACEOF 156532+EOF 156533 156534 fi 156535 156536@@ -136400,109 +105473,72 @@ 156537 fi 156538 156539 156540-echo "$as_me:$LINENO: checking for inline" >&5 156541-echo $ECHO_N "checking for inline... $ECHO_C" >&6 156542-if test "${ac_cv_c_inline+set}" = set; then 156543- echo $ECHO_N "(cached) $ECHO_C" >&6 156544+echo $ac_n "checking for inline""... $ac_c" 1>&6 156545+echo "configure:105478: checking for inline" >&5 156546+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then 156547+ echo $ac_n "(cached) $ac_c" 1>&6 156548 else 156549 ac_cv_c_inline=no 156550 for ac_kw in inline __inline__ __inline; do 156551- cat >conftest.$ac_ext <<_ACEOF 156552-/* confdefs.h. */ 156553-_ACEOF 156554-cat confdefs.h >>conftest.$ac_ext 156555-cat >>conftest.$ac_ext <<_ACEOF 156556-/* end confdefs.h. */ 156557-#ifndef __cplusplus 156558-typedef int foo_t; 156559-static $ac_kw foo_t static_foo () {return 0; } 156560-$ac_kw foo_t foo () {return 0; } 156561-#endif 156562- 156563-_ACEOF 156564-rm -f conftest.$ac_objext 156565-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 156566- (eval $ac_compile) 2>conftest.er1 156567- ac_status=$? 156568- grep -v '^ *+' conftest.er1 >conftest.err 156569- rm -f conftest.er1 156570- cat conftest.err >&5 156571- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156572- (exit $ac_status); } && 156573- { ac_try='test -z "$ac_c_werror_flag" 156574- || test ! -s conftest.err' 156575- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156576- (eval $ac_try) 2>&5 156577- ac_status=$? 156578- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156579- (exit $ac_status); }; } && 156580- { ac_try='test -s conftest.$ac_objext' 156581- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156582- (eval $ac_try) 2>&5 156583- ac_status=$? 156584- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156585- (exit $ac_status); }; }; then 156586+ cat > conftest.$ac_ext <<EOF 156587+#line 105485 "configure" 156588+#include "confdefs.h" 156589+ 156590+int main() { 156591+} $ac_kw foo() { 156592+; return 0; } 156593+EOF 156594+if { (eval echo configure:105492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 156595+ rm -rf conftest* 156596 ac_cv_c_inline=$ac_kw; break 156597 else 156598- echo "$as_me: failed program was:" >&5 156599-sed 's/^/| /' conftest.$ac_ext >&5 156600- 156601+ echo "configure: failed program was:" >&5 156602+ cat conftest.$ac_ext >&5 156603 fi 156604-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 156605+rm -f conftest* 156606 done 156607 156608 fi 156609-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 156610-echo "${ECHO_T}$ac_cv_c_inline" >&6 156611 156612- 156613-case $ac_cv_c_inline in 156614+echo "$ac_t""$ac_cv_c_inline" 1>&6 156615+case "$ac_cv_c_inline" in 156616 inline | yes) ;; 156617- *) 156618- case $ac_cv_c_inline in 156619- no) ac_val=;; 156620- *) ac_val=$ac_cv_c_inline;; 156621- esac 156622- cat >>confdefs.h <<_ACEOF 156623-#ifndef __cplusplus 156624-#define inline $ac_val 156625-#endif 156626-_ACEOF 156627- ;; 156628+ no) cat >> confdefs.h <<\EOF 156629+#define inline 156630+EOF 156631+ ;; 156632+ *) cat >> confdefs.h <<EOF 156633+#define inline $ac_cv_c_inline 156634+EOF 156635+ ;; 156636 esac 156637 156638 156639 156640 156641-echo "$as_me:$LINENO: checking target system is Darwin" >&5 156642-echo $ECHO_N "checking target system is Darwin... $ECHO_C" >&6 156643+echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 156644+echo "configure:105521: checking target system is Darwin" >&5 156645 if echo "$target" | grep "darwin" > /dev/null; then 156646- 156647-cat >>confdefs.h <<\_ACEOF 156648+ cat >> confdefs.h <<\EOF 156649 #define DARWIN 1 156650-_ACEOF 156651+EOF 156652 156653- echo "$as_me:$LINENO: result: yes" >&5 156654-echo "${ECHO_T}yes" >&6 156655+ echo "$ac_t""yes" 1>&6 156656 else 156657- echo "$as_me:$LINENO: result: no" >&5 156658-echo "${ECHO_T}no" >&6 156659+ echo "$ac_t""no" 1>&6 156660 fi 156661 156662-echo "$as_me:$LINENO: checking for MM alignment and log values" >&5 156663-echo $ECHO_N "checking for MM alignment and log values... $ECHO_C" >&6 156664+echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 156665+echo "configure:105533: checking for MM alignment and log values" >&5 156666 156667 if test "$cross_compiling" = yes; then 156668- 156669+ 156670 LIBZEND_MM_ALIGN=8 156671 156672 else 156673- cat >conftest.$ac_ext <<_ACEOF 156674-/* confdefs.h. */ 156675-_ACEOF 156676-cat confdefs.h >>conftest.$ac_ext 156677-cat >>conftest.$ac_ext <<_ACEOF 156678-/* end confdefs.h. */ 156679+ cat > conftest.$ac_ext <<EOF 156680+#line 105541 "configure" 156681+#include "confdefs.h" 156682 156683 #include <stdio.h> 156684 156685@@ -136530,65 +105566,48 @@ 156686 } 156687 156688 fp = fopen("conftest.zend", "w"); 156689- fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); 156690+ fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros); 156691 fclose(fp); 156692 156693 exit(0); 156694 } 156695 156696-_ACEOF 156697-rm -f conftest$ac_exeext 156698-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156699- (eval $ac_link) 2>&5 156700- ac_status=$? 156701- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156702- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 156703- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156704- (eval $ac_try) 2>&5 156705- ac_status=$? 156706- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156707- (exit $ac_status); }; }; then 156708- 156709+EOF 156710+if { (eval echo configure:105577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 156711+then 156712+ 156713 LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` 156714 LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2` 156715- 156716-cat >>confdefs.h <<_ACEOF 156717+ cat >> confdefs.h <<EOF 156718 #define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN 156719-_ACEOF 156720- 156721+EOF 156722 156723-cat >>confdefs.h <<_ACEOF 156724+ cat >> confdefs.h <<EOF 156725 #define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2 156726-_ACEOF 156727- 156728+EOF 156729+ 156730 156731 else 156732- echo "$as_me: program exited with status $ac_status" >&5 156733-echo "$as_me: failed program was:" >&5 156734-sed 's/^/| /' conftest.$ac_ext >&5 156735- 156736+ echo "configure: failed program was:" >&5 156737+ cat conftest.$ac_ext >&5 156738 fi 156739-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 156740+rm -fr conftest* 156741 fi 156742 156743-echo "$as_me:$LINENO: result: done" >&5 156744-echo "${ECHO_T}done" >&6 156745 156746-echo "$as_me:$LINENO: checking for memory allocation using mmap(MAP_ANON)" >&5 156747-echo $ECHO_N "checking for memory allocation using mmap(MAP_ANON)... $ECHO_C" >&6 156748+echo "$ac_t""done" 1>&6 156749 156750-if test "$cross_compiling" = yes; then 156751+echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 156752+echo "configure:105602: checking for memory allocation using mmap(MAP_ANON)" >&5 156753 156754- echo "$as_me:$LINENO: result: no" >&5 156755-echo "${ECHO_T}no" >&6 156756+if test "$cross_compiling" = yes; then 156757+ 156758+ echo "$ac_t""no" 1>&6 156759 156760 else 156761- cat >conftest.$ac_ext <<_ACEOF 156762-/* confdefs.h. */ 156763-_ACEOF 156764-cat confdefs.h >>conftest.$ac_ext 156765-cat >>conftest.$ac_ext <<_ACEOF 156766-/* end confdefs.h. */ 156767+ cat > conftest.$ac_ext <<EOF 156768+#line 105610 "configure" 156769+#include "confdefs.h" 156770 156771 #include <sys/types.h> 156772 #include <sys/stat.h> 156773@@ -136622,56 +105641,39 @@ 156774 return 0; 156775 } 156776 156777-_ACEOF 156778-rm -f conftest$ac_exeext 156779-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156780- (eval $ac_link) 2>&5 156781- ac_status=$? 156782- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156783- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 156784- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156785- (eval $ac_try) 2>&5 156786- ac_status=$? 156787- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156788- (exit $ac_status); }; }; then 156789- 156790- 156791-cat >>confdefs.h <<\_ACEOF 156792+EOF 156793+if { (eval echo configure:105646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 156794+then 156795+ 156796+ cat >> confdefs.h <<\EOF 156797 #define HAVE_MEM_MMAP_ANON 1 156798-_ACEOF 156799+EOF 156800 156801- echo "$as_me:$LINENO: result: yes" >&5 156802-echo "${ECHO_T}yes" >&6 156803+ echo "$ac_t""yes" 1>&6 156804 156805 else 156806- echo "$as_me: program exited with status $ac_status" >&5 156807-echo "$as_me: failed program was:" >&5 156808-sed 's/^/| /' conftest.$ac_ext >&5 156809- 156810-( exit $ac_status ) 156811- 156812- echo "$as_me:$LINENO: result: no" >&5 156813-echo "${ECHO_T}no" >&6 156814+ echo "configure: failed program was:" >&5 156815+ cat conftest.$ac_ext >&5 156816+ rm -fr conftest* 156817+ 156818+ echo "$ac_t""no" 1>&6 156819 156820 fi 156821-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 156822+rm -fr conftest* 156823 fi 156824 156825-echo "$as_me:$LINENO: checking for memory allocation using mmap(\"/dev/zero\")" >&5 156826-echo $ECHO_N "checking for memory allocation using mmap(\"/dev/zero\")... $ECHO_C" >&6 156827 156828-if test "$cross_compiling" = yes; then 156829+echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 156830+echo "configure:105668: checking for memory allocation using mmap("/dev/zero")" >&5 156831 156832- echo "$as_me:$LINENO: result: no" >&5 156833-echo "${ECHO_T}no" >&6 156834+if test "$cross_compiling" = yes; then 156835+ 156836+ echo "$ac_t""no" 1>&6 156837 156838 else 156839- cat >conftest.$ac_ext <<_ACEOF 156840-/* confdefs.h. */ 156841-_ACEOF 156842-cat confdefs.h >>conftest.$ac_ext 156843-cat >>conftest.$ac_ext <<_ACEOF 156844-/* end confdefs.h. */ 156845+ cat > conftest.$ac_ext <<EOF 156846+#line 105676 "configure" 156847+#include "confdefs.h" 156848 156849 #include <sys/types.h> 156850 #include <sys/stat.h> 156851@@ -136715,140 +105717,80 @@ 156852 return 0; 156853 } 156854 156855-_ACEOF 156856-rm -f conftest$ac_exeext 156857-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156858- (eval $ac_link) 2>&5 156859- ac_status=$? 156860- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156861- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 156862- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156863- (eval $ac_try) 2>&5 156864- ac_status=$? 156865- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156866- (exit $ac_status); }; }; then 156867- 156868- 156869-cat >>confdefs.h <<\_ACEOF 156870+EOF 156871+if { (eval echo configure:105722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 156872+then 156873+ 156874+ cat >> confdefs.h <<\EOF 156875 #define HAVE_MEM_MMAP_ZERO 1 156876-_ACEOF 156877+EOF 156878 156879- echo "$as_me:$LINENO: result: yes" >&5 156880-echo "${ECHO_T}yes" >&6 156881+ echo "$ac_t""yes" 1>&6 156882 156883 else 156884- echo "$as_me: program exited with status $ac_status" >&5 156885-echo "$as_me: failed program was:" >&5 156886-sed 's/^/| /' conftest.$ac_ext >&5 156887- 156888-( exit $ac_status ) 156889- 156890- echo "$as_me:$LINENO: result: no" >&5 156891-echo "${ECHO_T}no" >&6 156892+ echo "configure: failed program was:" >&5 156893+ cat conftest.$ac_ext >&5 156894+ rm -fr conftest* 156895+ 156896+ echo "$ac_t""no" 1>&6 156897 156898 fi 156899-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 156900+rm -fr conftest* 156901 fi 156902 156903 156904 for ac_func in mremap 156905 do 156906-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 156907-echo "$as_me:$LINENO: checking for $ac_func" >&5 156908-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 156909-if eval "test \"\${$as_ac_var+set}\" = set"; then 156910- echo $ECHO_N "(cached) $ECHO_C" >&6 156911-else 156912- cat >conftest.$ac_ext <<_ACEOF 156913-/* confdefs.h. */ 156914-_ACEOF 156915-cat confdefs.h >>conftest.$ac_ext 156916-cat >>conftest.$ac_ext <<_ACEOF 156917-/* end confdefs.h. */ 156918-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. 156919- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 156920-#define $ac_func innocuous_$ac_func 156921- 156922+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 156923+echo "configure:105746: checking for $ac_func" >&5 156924+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 156925+ echo $ac_n "(cached) $ac_c" 1>&6 156926+else 156927+ cat > conftest.$ac_ext <<EOF 156928+#line 105751 "configure" 156929+#include "confdefs.h" 156930 /* System header to define __stub macros and hopefully few prototypes, 156931- which can conflict with char $ac_func (); below. 156932- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 156933- <limits.h> exists even on freestanding compilers. */ 156934- 156935-#ifdef __STDC__ 156936-# include <limits.h> 156937-#else 156938-# include <assert.h> 156939-#endif 156940- 156941-#undef $ac_func 156942- 156943+ which can conflict with char $ac_func(); below. */ 156944+#include <assert.h> 156945 /* Override any gcc2 internal prototype to avoid an error. */ 156946-#ifdef __cplusplus 156947-extern "C" 156948-{ 156949-#endif 156950 /* We use char because int might match the return type of a gcc2 156951- builtin and then its argument prototype would still apply. */ 156952-char $ac_func (); 156953+ builtin and then its argument prototype would still apply. */ 156954+char $ac_func(); 156955+ 156956+int main() { 156957+ 156958 /* The GNU C library defines this for functions which it implements 156959 to always fail with ENOSYS. Some functions are actually named 156960 something starting with __ and the normal name is an alias. */ 156961 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) 156962 choke me 156963 #else 156964-char (*f) () = $ac_func; 156965-#endif 156966-#ifdef __cplusplus 156967-} 156968+$ac_func(); 156969 #endif 156970 156971-int 156972-main () 156973-{ 156974-return f != $ac_func; 156975- ; 156976- return 0; 156977-} 156978-_ACEOF 156979-rm -f conftest.$ac_objext conftest$ac_exeext 156980-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 156981- (eval $ac_link) 2>conftest.er1 156982- ac_status=$? 156983- grep -v '^ *+' conftest.er1 >conftest.err 156984- rm -f conftest.er1 156985- cat conftest.err >&5 156986- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156987- (exit $ac_status); } && 156988- { ac_try='test -z "$ac_c_werror_flag" 156989- || test ! -s conftest.err' 156990- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156991- (eval $ac_try) 2>&5 156992- ac_status=$? 156993- echo "$as_me:$LINENO: \$? = $ac_status" >&5 156994- (exit $ac_status); }; } && 156995- { ac_try='test -s conftest$ac_exeext' 156996- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 156997- (eval $ac_try) 2>&5 156998- ac_status=$? 156999- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157000- (exit $ac_status); }; }; then 157001- eval "$as_ac_var=yes" 157002-else 157003- echo "$as_me: failed program was:" >&5 157004-sed 's/^/| /' conftest.$ac_ext >&5 157005- 157006-eval "$as_ac_var=no" 157007-fi 157008-rm -f conftest.err conftest.$ac_objext \ 157009- conftest$ac_exeext conftest.$ac_ext 157010-fi 157011-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 157012-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 157013-if test `eval echo '${'$as_ac_var'}'` = yes; then 157014- cat >>confdefs.h <<_ACEOF 157015-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 157016-_ACEOF 157017+; return 0; } 157018+EOF 157019+if { (eval echo configure:105774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 157020+ rm -rf conftest* 157021+ eval "ac_cv_func_$ac_func=yes" 157022+else 157023+ echo "configure: failed program was:" >&5 157024+ cat conftest.$ac_ext >&5 157025+ rm -rf conftest* 157026+ eval "ac_cv_func_$ac_func=no" 157027+fi 157028+rm -f conftest* 157029+fi 157030 157031+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 157032+ echo "$ac_t""yes" 1>&6 157033+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 157034+ cat >> confdefs.h <<EOF 157035+#define $ac_tr_func 1 157036+EOF 157037+ 157038+else 157039+ echo "$ac_t""no" 1>&6 157040 fi 157041 done 157042 157043@@ -136856,10 +105798,9 @@ 157044 157045 157046 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then 157047- 157048-cat >>confdefs.h <<\_ACEOF 157049+ cat >> confdefs.h <<\EOF 157050 #define ZTS 1 157051-_ACEOF 157052+EOF 157053 157054 PHP_THREAD_SAFETY=yes 157055 else 157056@@ -136881,241 +105822,127 @@ 157057 # Check whether --enable- or --disable- was given. 157058 if test "${enable_+set}" = set; then 157059 enableval="$enable_" 157060- 157061-fi; 157062+ : 157063+fi 157064 157065 157066- echo "$as_me:$LINENO: result: " >&5 157067-echo "${ECHO_T}" >&6 157068- echo "$as_me:$LINENO: result: ${T_MD}Configuring TSRM${T_ME}" >&5 157069-echo "${ECHO_T}${T_MD}Configuring TSRM${T_ME}" >&6 157070 157071+ echo "$ac_t""" 1>&6 157072+ echo "$ac_t""${T_MD}Configuring TSRM${T_ME}" 1>&6 157073 157074 157075 157076 157077-for ac_header in stdarg.h 157078+for ac_hdr in stdarg.h 157079 do 157080-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 157081-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157082- echo "$as_me:$LINENO: checking for $ac_header" >&5 157083-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 157084-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157085- echo $ECHO_N "(cached) $ECHO_C" >&6 157086-fi 157087-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 157088-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 157089-else 157090- # Is the header compilable? 157091-echo "$as_me:$LINENO: checking $ac_header usability" >&5 157092-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 157093-cat >conftest.$ac_ext <<_ACEOF 157094-/* confdefs.h. */ 157095-_ACEOF 157096-cat confdefs.h >>conftest.$ac_ext 157097-cat >>conftest.$ac_ext <<_ACEOF 157098-/* end confdefs.h. */ 157099-$ac_includes_default 157100-#include <$ac_header> 157101-_ACEOF 157102-rm -f conftest.$ac_objext 157103-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 157104- (eval $ac_compile) 2>conftest.er1 157105- ac_status=$? 157106- grep -v '^ *+' conftest.er1 >conftest.err 157107- rm -f conftest.er1 157108- cat conftest.err >&5 157109- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157110- (exit $ac_status); } && 157111- { ac_try='test -z "$ac_c_werror_flag" 157112- || test ! -s conftest.err' 157113- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157114- (eval $ac_try) 2>&5 157115- ac_status=$? 157116- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157117- (exit $ac_status); }; } && 157118- { ac_try='test -s conftest.$ac_objext' 157119- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157120- (eval $ac_try) 2>&5 157121- ac_status=$? 157122- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157123- (exit $ac_status); }; }; then 157124- ac_header_compiler=yes 157125-else 157126- echo "$as_me: failed program was:" >&5 157127-sed 's/^/| /' conftest.$ac_ext >&5 157128- 157129-ac_header_compiler=no 157130-fi 157131-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 157132-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 157133-echo "${ECHO_T}$ac_header_compiler" >&6 157134- 157135-# Is the header present? 157136-echo "$as_me:$LINENO: checking $ac_header presence" >&5 157137-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 157138-cat >conftest.$ac_ext <<_ACEOF 157139-/* confdefs.h. */ 157140-_ACEOF 157141-cat confdefs.h >>conftest.$ac_ext 157142-cat >>conftest.$ac_ext <<_ACEOF 157143-/* end confdefs.h. */ 157144-#include <$ac_header> 157145-_ACEOF 157146-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 157147- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 157148- ac_status=$? 157149- grep -v '^ *+' conftest.er1 >conftest.err 157150- rm -f conftest.er1 157151- cat conftest.err >&5 157152- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157153- (exit $ac_status); } >/dev/null; then 157154- if test -s conftest.err; then 157155- ac_cpp_err=$ac_c_preproc_warn_flag 157156- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 157157- else 157158- ac_cpp_err= 157159- fi 157160-else 157161- ac_cpp_err=yes 157162-fi 157163-if test -z "$ac_cpp_err"; then 157164- ac_header_preproc=yes 157165-else 157166- echo "$as_me: failed program was:" >&5 157167-sed 's/^/| /' conftest.$ac_ext >&5 157168- 157169- ac_header_preproc=no 157170-fi 157171-rm -f conftest.err conftest.$ac_ext 157172-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 157173-echo "${ECHO_T}$ac_header_preproc" >&6 157174- 157175-# So? What about this header? 157176-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 157177- yes:no: ) 157178- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 157179-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 157180- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 157181-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 157182- ac_header_preproc=yes 157183- ;; 157184- no:yes:* ) 157185- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 157186-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 157187- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 157188-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 157189- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 157190-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 157191- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 157192-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 157193- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 157194-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 157195- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 157196-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 157197- ( 157198- cat <<\_ASBOX 157199-## ------------------------------------------ ## 157200-## Report this to the AC_PACKAGE_NAME lists. ## 157201-## ------------------------------------------ ## 157202-_ASBOX 157203- ) | 157204- sed "s/^/$as_me: WARNING: /" >&2 157205- ;; 157206-esac 157207-echo "$as_me:$LINENO: checking for $ac_header" >&5 157208-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 157209-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157210- echo $ECHO_N "(cached) $ECHO_C" >&6 157211+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 157212+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 157213+echo "configure:105841: checking for $ac_hdr" >&5 157214+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 157215+ echo $ac_n "(cached) $ac_c" 1>&6 157216+else 157217+ cat > conftest.$ac_ext <<EOF 157218+#line 105846 "configure" 157219+#include "confdefs.h" 157220+#include <$ac_hdr> 157221+EOF 157222+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 157223+{ (eval echo configure:105851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 157224+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 157225+if test -z "$ac_err"; then 157226+ rm -rf conftest* 157227+ eval "ac_cv_header_$ac_safe=yes" 157228 else 157229- eval "$as_ac_Header=\$ac_header_preproc" 157230+ echo "$ac_err" >&5 157231+ echo "configure: failed program was:" >&5 157232+ cat conftest.$ac_ext >&5 157233+ rm -rf conftest* 157234+ eval "ac_cv_header_$ac_safe=no" 157235 fi 157236-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 157237-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 157238- 157239+rm -f conftest* 157240 fi 157241-if test `eval echo '${'$as_ac_Header'}'` = yes; then 157242- cat >>confdefs.h <<_ACEOF 157243-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 157244-_ACEOF 157245- 157246+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 157247+ echo "$ac_t""yes" 1>&6 157248+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 157249+ cat >> confdefs.h <<EOF 157250+#define $ac_tr_hdr 1 157251+EOF 157252+ 157253+else 157254+ echo "$ac_t""no" 1>&6 157255 fi 157256- 157257 done 157258 157259 157260 157261 if test "$PHP_THREAD_SAFETY" = "yes"; then 157262- 157263- 157264+ 157265 157266 157267 # Check whether --with-tsrm-pth or --without-tsrm-pth was given. 157268 if test "${with_tsrm_pth+set}" = set; then 157269 withval="$with_tsrm_pth" 157270- 157271+ 157272 TSRM_PTH=$withval 157273 157274 else 157275- 157276+ 157277 TSRM_PTH=no 157278 157279-fi; 157280+fi 157281 157282 157283 # Check whether --with-tsrm-st or --without-tsrm-st was given. 157284 if test "${with_tsrm_st+set}" = set; then 157285 withval="$with_tsrm_st" 157286- 157287+ 157288 TSRM_ST=$withval 157289 157290 else 157291- 157292+ 157293 TSRM_ST=no 157294 157295-fi; 157296+fi 157297 157298 157299 # Check whether --with-tsrm-pthreads or --without-tsrm-pthreads was given. 157300 if test "${with_tsrm_pthreads+set}" = set; then 157301 withval="$with_tsrm_pthreads" 157302- 157303+ 157304 TSRM_PTHREADS=$withval 157305 157306 else 157307- 157308+ 157309 TSRM_PTHREADS=yes 157310 157311-fi; 157312+fi 157313+ 157314 157315 test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config 157316 157317 if test "$TSRM_PTH" != "no"; then 157318+ 157319 157320- 157321-echo "$as_me:$LINENO: checking for GNU Pth" >&5 157322-echo $ECHO_N "checking for GNU Pth... $ECHO_C" >&6 157323+echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 157324+echo "configure:105928: checking for GNU Pth" >&5 157325 PTH_PREFIX="`$TSRM_PTH --prefix`" 157326 if test -z "$PTH_PREFIX"; then 157327- echo "$as_me:$LINENO: result: Please check your Pth installation" >&5 157328-echo "${ECHO_T}Please check your Pth installation" >&6 157329+ echo "$ac_t""Please check your Pth installation" 1>&6 157330 fi 157331 157332 CPPFLAGS="$CPPFLAGS `$TSRM_PTH --cflags`" 157333 LDFLAGS="$LDFLAGS `$TSRM_PTH --ldflags`" 157334 LIBS="$LIBS `$TSRM_PTH --libs`" 157335 157336- 157337-cat >>confdefs.h <<\_ACEOF 157338+cat >> confdefs.h <<\EOF 157339 #define GNUPTH 1 157340-_ACEOF 157341+EOF 157342 157343-echo "$as_me:$LINENO: result: yes - installed in $PTH_PREFIX" >&5 157344-echo "${ECHO_T}yes - installed in $PTH_PREFIX" >&6 157345+echo "$ac_t""yes - installed in $PTH_PREFIX" 1>&6 157346 157347 157348 elif test "$TSRM_ST" != "no"; then 157349- 157350+ 157351 if test -r "$TSRM_ST/include/st.h"; then 157352 CPPFLAGS="$CPPFLAGS -I$TSRM_ST/include" 157353 LDFLAGS="$LDFLAGS -L$TSRM_ST/lib" 157354@@ -137123,176 +105950,60 @@ 157355 CPPFLAGS="$CPPFLAGS -I$TSRM_ST" 157356 LDFLAGS="$LDFLAGS -L$TSRM_ST" 157357 fi 157358- 157359-for ac_header in st.h 157360+ for ac_hdr in st.h 157361 do 157362-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` 157363-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157364- echo "$as_me:$LINENO: checking for $ac_header" >&5 157365-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 157366-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157367- echo $ECHO_N "(cached) $ECHO_C" >&6 157368-fi 157369-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 157370-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 157371-else 157372- # Is the header compilable? 157373-echo "$as_me:$LINENO: checking $ac_header usability" >&5 157374-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 157375-cat >conftest.$ac_ext <<_ACEOF 157376-/* confdefs.h. */ 157377-_ACEOF 157378-cat confdefs.h >>conftest.$ac_ext 157379-cat >>conftest.$ac_ext <<_ACEOF 157380-/* end confdefs.h. */ 157381-$ac_includes_default 157382-#include <$ac_header> 157383-_ACEOF 157384-rm -f conftest.$ac_objext 157385-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 157386- (eval $ac_compile) 2>conftest.er1 157387- ac_status=$? 157388- grep -v '^ *+' conftest.er1 >conftest.err 157389- rm -f conftest.er1 157390- cat conftest.err >&5 157391- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157392- (exit $ac_status); } && 157393- { ac_try='test -z "$ac_c_werror_flag" 157394- || test ! -s conftest.err' 157395- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157396- (eval $ac_try) 2>&5 157397- ac_status=$? 157398- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157399- (exit $ac_status); }; } && 157400- { ac_try='test -s conftest.$ac_objext' 157401- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157402- (eval $ac_try) 2>&5 157403- ac_status=$? 157404- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157405- (exit $ac_status); }; }; then 157406- ac_header_compiler=yes 157407-else 157408- echo "$as_me: failed program was:" >&5 157409-sed 's/^/| /' conftest.$ac_ext >&5 157410- 157411-ac_header_compiler=no 157412-fi 157413-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 157414-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 157415-echo "${ECHO_T}$ac_header_compiler" >&6 157416- 157417-# Is the header present? 157418-echo "$as_me:$LINENO: checking $ac_header presence" >&5 157419-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 157420-cat >conftest.$ac_ext <<_ACEOF 157421-/* confdefs.h. */ 157422-_ACEOF 157423-cat confdefs.h >>conftest.$ac_ext 157424-cat >>conftest.$ac_ext <<_ACEOF 157425-/* end confdefs.h. */ 157426-#include <$ac_header> 157427-_ACEOF 157428-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 157429- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 157430- ac_status=$? 157431- grep -v '^ *+' conftest.er1 >conftest.err 157432- rm -f conftest.er1 157433- cat conftest.err >&5 157434- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157435- (exit $ac_status); } >/dev/null; then 157436- if test -s conftest.err; then 157437- ac_cpp_err=$ac_c_preproc_warn_flag 157438- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag 157439- else 157440- ac_cpp_err= 157441- fi 157442-else 157443- ac_cpp_err=yes 157444-fi 157445-if test -z "$ac_cpp_err"; then 157446- ac_header_preproc=yes 157447-else 157448- echo "$as_me: failed program was:" >&5 157449-sed 's/^/| /' conftest.$ac_ext >&5 157450- 157451- ac_header_preproc=no 157452-fi 157453-rm -f conftest.err conftest.$ac_ext 157454-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 157455-echo "${ECHO_T}$ac_header_preproc" >&6 157456- 157457-# So? What about this header? 157458-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in 157459- yes:no: ) 157460- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 157461-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} 157462- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 157463-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} 157464- ac_header_preproc=yes 157465- ;; 157466- no:yes:* ) 157467- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 157468-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} 157469- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 157470-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} 157471- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 157472-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} 157473- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 157474-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} 157475- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 157476-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} 157477- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 157478-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} 157479- ( 157480- cat <<\_ASBOX 157481-## ------------------------------------------ ## 157482-## Report this to the AC_PACKAGE_NAME lists. ## 157483-## ------------------------------------------ ## 157484-_ASBOX 157485- ) | 157486- sed "s/^/$as_me: WARNING: /" >&2 157487- ;; 157488-esac 157489-echo "$as_me:$LINENO: checking for $ac_header" >&5 157490-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 157491-if eval "test \"\${$as_ac_Header+set}\" = set"; then 157492- echo $ECHO_N "(cached) $ECHO_C" >&6 157493+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 157494+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 157495+echo "configure:105958: checking for $ac_hdr" >&5 157496+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 157497+ echo $ac_n "(cached) $ac_c" 1>&6 157498+else 157499+ cat > conftest.$ac_ext <<EOF 157500+#line 105963 "configure" 157501+#include "confdefs.h" 157502+#include <$ac_hdr> 157503+EOF 157504+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 157505+{ (eval echo configure:105968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 157506+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 157507+if test -z "$ac_err"; then 157508+ rm -rf conftest* 157509+ eval "ac_cv_header_$ac_safe=yes" 157510 else 157511- eval "$as_ac_Header=\$ac_header_preproc" 157512+ echo "$ac_err" >&5 157513+ echo "configure: failed program was:" >&5 157514+ cat conftest.$ac_ext >&5 157515+ rm -rf conftest* 157516+ eval "ac_cv_header_$ac_safe=no" 157517 fi 157518-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 157519-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 157520- 157521+rm -f conftest* 157522 fi 157523-if test `eval echo '${'$as_ac_Header'}'` = yes; then 157524- cat >>confdefs.h <<_ACEOF 157525-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 157526-_ACEOF 157527- 157528-else 157529- 157530- { { echo "$as_me:$LINENO: error: Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" >&5 157531-echo "$as_me: error: Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" >&2;} 157532- { (exit 1); exit 1; }; } 157533- 157534+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 157535+ echo "$ac_t""yes" 1>&6 157536+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` 157537+ cat >> confdefs.h <<EOF 157538+#define $ac_tr_hdr 1 157539+EOF 157540+ 157541+else 157542+ echo "$ac_t""no" 1>&6 157543+{ echo "configure: error: Sorry, I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix" 1>&2; exit 1; } 157544+ 157545 fi 157546- 157547 done 157548 157549 LIBS="$LIBS -lst" 157550- echo "$as_me:$LINENO: checking for SGI's State Threads" >&5 157551-echo $ECHO_N "checking for SGI's State Threads... $ECHO_C" >&6 157552- echo "$as_me:$LINENO: result: yes" >&5 157553-echo "${ECHO_T}yes" >&6 157554- 157555-cat >>confdefs.h <<\_ACEOF 157556+ echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 157557+echo "configure:105998: checking for SGI's State Threads" >&5 157558+ echo "$ac_t""yes" 1>&6 157559+ cat >> confdefs.h <<\EOF 157560 #define TSRM_ST 1 157561-_ACEOF 157562- 157563- 157564-elif test "$TSRM_PTHREADS" != "no"; then 157565+EOF 157566 157567 157568+elif test "$TSRM_PTHREADS" != "no"; then 157569+ 157570+ 157571 157572 157573 if test "$beos_threads" = "1"; then 157574@@ -137301,7 +106012,7 @@ 157575 else 157576 save_CFLAGS=$CFLAGS 157577 save_LIBS=$LIBS 157578- 157579+ 157580 if test -n "$ac_cv_pthreads_lib"; then 157581 LIBS="$LIBS -l$ac_cv_pthreads_lib" 157582 fi 157583@@ -137310,9 +106021,9 @@ 157584 CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" 157585 fi 157586 157587- 157588+ 157589 if test "$cross_compiling" = yes; then 157590- 157591+ 157592 pthreads_working=no 157593 case $host_alias in 157594 *netware*) 157595@@ -137321,12 +106032,9 @@ 157596 157597 157598 else 157599- cat >conftest.$ac_ext <<_ACEOF 157600-/* confdefs.h. */ 157601-_ACEOF 157602-cat confdefs.h >>conftest.$ac_ext 157603-cat >>conftest.$ac_ext <<_ACEOF 157604-/* end confdefs.h. */ 157605+ cat > conftest.$ac_ext <<EOF 157606+#line 106037 "configure" 157607+#include "confdefs.h" 157608 157609 #include <pthread.h> 157610 #include <stddef.h> 157611@@ -137341,51 +106049,41 @@ 157612 int data = 1; 157613 pthread_mutexattr_init(&mattr); 157614 return pthread_create(&thd, NULL, thread_routine, &data); 157615-} 157616-_ACEOF 157617-rm -f conftest$ac_exeext 157618-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 157619- (eval $ac_link) 2>&5 157620- ac_status=$? 157621- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157622- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 157623- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157624- (eval $ac_try) 2>&5 157625- ac_status=$? 157626- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157627- (exit $ac_status); }; }; then 157628- 157629+} 157630+EOF 157631+if { (eval echo configure:106055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 157632+then 157633+ 157634 pthreads_working=yes 157635- 157636+ 157637 else 157638- echo "$as_me: program exited with status $ac_status" >&5 157639-echo "$as_me: failed program was:" >&5 157640-sed 's/^/| /' conftest.$ac_ext >&5 157641- 157642-( exit $ac_status ) 157643- 157644+ echo "configure: failed program was:" >&5 157645+ cat conftest.$ac_ext >&5 157646+ rm -fr conftest* 157647+ 157648 pthreads_working=no 157649- 157650+ 157651 fi 157652-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 157653+rm -fr conftest* 157654 fi 157655+ 157656 LIBS=$save_LIBS 157657 CFLAGS=$save_CFLAGS 157658 157659- echo "$as_me:$LINENO: checking for pthreads_cflags" >&5 157660-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6 157661-if test "${ac_cv_pthreads_cflags+set}" = set; then 157662- echo $ECHO_N "(cached) $ECHO_C" >&6 157663+ echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 157664+echo "configure:106075: checking for pthreads_cflags" >&5 157665+if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then 157666+ echo $ac_n "(cached) $ac_c" 1>&6 157667 else 157668- 157669+ 157670 ac_cv_pthreads_cflags= 157671 if test "$pthreads_working" != "yes"; then 157672- for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 157673+ for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 157674 ac_save=$CFLAGS 157675 CFLAGS="$CFLAGS $flag" 157676- 157677+ 157678 if test "$cross_compiling" = yes; then 157679- 157680+ 157681 pthreads_working=no 157682 case $host_alias in 157683 *netware*) 157684@@ -137394,12 +106092,9 @@ 157685 157686 157687 else 157688- cat >conftest.$ac_ext <<_ACEOF 157689-/* confdefs.h. */ 157690-_ACEOF 157691-cat confdefs.h >>conftest.$ac_ext 157692-cat >>conftest.$ac_ext <<_ACEOF 157693-/* end confdefs.h. */ 157694+ cat > conftest.$ac_ext <<EOF 157695+#line 106097 "configure" 157696+#include "confdefs.h" 157697 157698 #include <pthread.h> 157699 #include <stddef.h> 157700@@ -137414,34 +106109,24 @@ 157701 int data = 1; 157702 pthread_mutexattr_init(&mattr); 157703 return pthread_create(&thd, NULL, thread_routine, &data); 157704-} 157705-_ACEOF 157706-rm -f conftest$ac_exeext 157707-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 157708- (eval $ac_link) 2>&5 157709- ac_status=$? 157710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157711- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 157712- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157713- (eval $ac_try) 2>&5 157714- ac_status=$? 157715- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157716- (exit $ac_status); }; }; then 157717- 157718+} 157719+EOF 157720+if { (eval echo configure:106115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 157721+then 157722+ 157723 pthreads_working=yes 157724- 157725+ 157726 else 157727- echo "$as_me: program exited with status $ac_status" >&5 157728-echo "$as_me: failed program was:" >&5 157729-sed 's/^/| /' conftest.$ac_ext >&5 157730- 157731-( exit $ac_status ) 157732- 157733+ echo "configure: failed program was:" >&5 157734+ cat conftest.$ac_ext >&5 157735+ rm -fr conftest* 157736+ 157737 pthreads_working=no 157738- 157739+ 157740 fi 157741-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 157742+rm -fr conftest* 157743 fi 157744+ 157745 CFLAGS=$ac_save 157746 if test "$pthreads_working" = "yes"; then 157747 ac_cv_pthreads_cflags=$flag 157748@@ -137452,23 +106137,23 @@ 157749 fi 157750 157751 fi 157752-echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5 157753-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6 157754 157755-echo "$as_me:$LINENO: checking for pthreads_lib" >&5 157756-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6 157757-if test "${ac_cv_pthreads_lib+set}" = set; then 157758- echo $ECHO_N "(cached) $ECHO_C" >&6 157759-else 157760+echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 157761 157762+echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 157763+echo "configure:106145: checking for pthreads_lib" >&5 157764+if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then 157765+ echo $ac_n "(cached) $ac_c" 1>&6 157766+else 157767+ 157768 ac_cv_pthreads_lib= 157769 if test "$pthreads_working" != "yes"; then 157770 for lib in pthread pthreads c_r; do 157771 ac_save=$LIBS 157772 LIBS="$LIBS -l$lib" 157773- 157774+ 157775 if test "$cross_compiling" = yes; then 157776- 157777+ 157778 pthreads_working=no 157779 case $host_alias in 157780 *netware*) 157781@@ -137477,12 +106162,9 @@ 157782 157783 157784 else 157785- cat >conftest.$ac_ext <<_ACEOF 157786-/* confdefs.h. */ 157787-_ACEOF 157788-cat confdefs.h >>conftest.$ac_ext 157789-cat >>conftest.$ac_ext <<_ACEOF 157790-/* end confdefs.h. */ 157791+ cat > conftest.$ac_ext <<EOF 157792+#line 106167 "configure" 157793+#include "confdefs.h" 157794 157795 #include <pthread.h> 157796 #include <stddef.h> 157797@@ -137497,34 +106179,24 @@ 157798 int data = 1; 157799 pthread_mutexattr_init(&mattr); 157800 return pthread_create(&thd, NULL, thread_routine, &data); 157801-} 157802-_ACEOF 157803-rm -f conftest$ac_exeext 157804-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 157805- (eval $ac_link) 2>&5 157806- ac_status=$? 157807- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157808- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 157809- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 157810- (eval $ac_try) 2>&5 157811- ac_status=$? 157812- echo "$as_me:$LINENO: \$? = $ac_status" >&5 157813- (exit $ac_status); }; }; then 157814- 157815+} 157816+EOF 157817+if { (eval echo configure:106185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 157818+then 157819+ 157820 pthreads_working=yes 157821- 157822+ 157823 else 157824- echo "$as_me: program exited with status $ac_status" >&5 157825-echo "$as_me: failed program was:" >&5 157826-sed 's/^/| /' conftest.$ac_ext >&5 157827- 157828-( exit $ac_status ) 157829- 157830+ echo "configure: failed program was:" >&5 157831+ cat conftest.$ac_ext >&5 157832+ rm -fr conftest* 157833+ 157834 pthreads_working=no 157835- 157836+ 157837 fi 157838-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 157839+rm -fr conftest* 157840 fi 157841+ 157842 LIBS=$ac_save 157843 if test "$pthreads_working" = "yes"; then 157844 ac_cv_pthreads_lib=$lib 157845@@ -137534,8 +106206,8 @@ 157846 fi 157847 157848 fi 157849-echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5 157850-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6 157851+ 157852+echo "$ac_t""$ac_cv_pthreads_lib" 1>&6 157853 157854 if test "$pthreads_working" = "yes"; then 157855 threads_result="POSIX-Threads found" 157856@@ -137544,29 +106216,24 @@ 157857 fi 157858 157859 157860-if test "$beos_threads" = "1"; then 157861- 157862-cat >>confdefs.h <<\_ACEOF 157863+if test "$beos_threads" = "1"; then 157864+ cat >> confdefs.h <<\EOF 157865 #define BETHREADS 1 157866-_ACEOF 157867+EOF 157868 157869-else 157870+else 157871 if test "$pthreads_working" != "yes"; then 157872- { { echo "$as_me:$LINENO: error: Your system seems to lack POSIX threads." >&5 157873-echo "$as_me: error: Your system seems to lack POSIX threads." >&2;} 157874- { (exit 1); exit 1; }; } 157875+ { echo "configure: error: Your system seems to lack POSIX threads." 1>&2; exit 1; } 157876 fi 157877 157878- 157879-cat >>confdefs.h <<\_ACEOF 157880+ cat >> confdefs.h <<\EOF 157881 #define PTHREADS 1 157882-_ACEOF 157883+EOF 157884 157885 157886- echo "$as_me:$LINENO: checking for POSIX threads" >&5 157887-echo $ECHO_N "checking for POSIX threads... $ECHO_C" >&6 157888- echo "$as_me:$LINENO: result: yes" >&5 157889-echo "${ECHO_T}yes" >&6 157890+ echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 157891+echo "configure:106236: checking for POSIX threads" >&5 157892+ echo "$ac_t""yes" 1>&6 157893 fi 157894 157895 fi 157896@@ -137628,7 +106295,7 @@ 157897 if test "$enable_maintainer_zts" = "yes"; then 157898 extbasedir=$extbasedir-zts 157899 fi 157900- 157901+ 157902 if test "$PHP_DEBUG" = "1"; then 157903 extbasedir=$extbasedir-debug 157904 fi 157905@@ -137696,7 +106363,7 @@ 157906 157907 157908 if test -z "$php_ldflags_add_usr_lib"; then 157909- 157910+ 157911 unset ac_new_flags 157912 for i in $PHP_LDFLAGS; do 157913 case $i in 157914@@ -137706,7 +106373,7 @@ 157915 done 157916 PHP_LDFLAGS=$ac_new_flags 157917 157918- 157919+ 157920 unset ac_new_flags 157921 for i in $LDFLAGS; do 157922 case $i in 157923@@ -137722,119 +106389,63 @@ 157924 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" 157925 157926 PHP_BUILD_DATE=`date '+%Y-%m-%d'` 157927- 157928-cat >>confdefs.h <<_ACEOF 157929+cat >> confdefs.h <<EOF 157930 #define PHP_BUILD_DATE "$PHP_BUILD_DATE" 157931-_ACEOF 157932+EOF 157933 157934 157935 case $host_alias in 157936 *netware*) 157937 PHP_OS="NetWare" 157938 PHP_UNAME="NetWare" 157939- 157940-cat >>confdefs.h <<_ACEOF 157941+ cat >> confdefs.h <<EOF 157942 #define PHP_OS "$PHP_OS" 157943-_ACEOF 157944- 157945+EOF 157946 157947-cat >>confdefs.h <<_ACEOF 157948+ cat >> confdefs.h <<EOF 157949 #define PHP_UNAME "$PHP_UNAME" 157950-_ACEOF 157951+EOF 157952 157953 ;; 157954 *) 157955 PHP_UNAME=`uname -a | xargs` 157956- 157957-cat >>confdefs.h <<_ACEOF 157958+ cat >> confdefs.h <<EOF 157959 #define PHP_UNAME "$PHP_UNAME" 157960-_ACEOF 157961+EOF 157962 157963 PHP_OS=`uname | xargs` 157964- 157965-cat >>confdefs.h <<_ACEOF 157966+ cat >> confdefs.h <<EOF 157967 #define PHP_OS "$PHP_OS" 157968-_ACEOF 157969+EOF 157970 157971 ;; 157972 esac 157973 157974-if test "$PHP_CLI" != "no"; then 157975- PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" 157976- PHP_INSTALL_CLI_TARGET="install-cli" 157977- 157978- 157979- case sapi/cli in 157980- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 157981- /*) ac_srcdir=`echo "sapi/cli"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 157982- *) ac_srcdir="$abs_srcdir/sapi/cli/"; ac_bdir="sapi/cli/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 157983- esac 157984- 157985- 157986- 157987- b_c_pre=$php_c_pre 157988- b_cxx_pre=$php_cxx_pre 157989- b_c_meta=$php_c_meta 157990- b_cxx_meta=$php_cxx_meta 157991- b_c_post=$php_c_post 157992- b_cxx_post=$php_cxx_post 157993- b_lo=$php_lo 157994- 157995- 157996- old_IFS=$IFS 157997- for ac_src in php_cli.c php_cli_readline.c; do 157998- 157999- IFS=. 158000- set $ac_src 158001- ac_obj=$1 158002- IFS=$old_IFS 158003- 158004- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 158005- 158006- case $ac_src in 158007- *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 158008- *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 158009- *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 158010- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; 158011- esac 158012- 158013- cat >>Makefile.objects<<EOF 158014-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src 158015- $ac_comp 158016-EOF 158017- done 158018- 158019- 158020- PHP_INSTALLED_SAPIS="cli $PHP_SAPI" 158021- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)" 158022-else 158023- PHP_INSTALLED_SAPIS="$PHP_SAPI" 158024-fi 158025- 158026- 158027 158028+ 158029 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_INSTALLED_SAPIS" 158030 158031- 158032+ 158033 158034 158035 158036 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_EXECUTABLE" 158037 158038 158039- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_TARGET" 158040- 158041 158042 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI_OBJS" 158043 158044 158045- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_CLI_OBJS" 158046+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARY_OBJS" 158047 158048 158049 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_GLOBAL_OBJS" 158050 158051 158052 158053+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BINARIES" 158054+ 158055+ 158056 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_MODULES" 158057 158058 158059@@ -137846,28 +106457,28 @@ 158060 158061 158062 158063- 158064+ 158065 PHP_VAR_SUBST="$PHP_VAR_SUBST abs_builddir" 158066 158067+ 158068 158069 158070- 158071- 158072+ 158073 PHP_VAR_SUBST="$PHP_VAR_SUBST abs_srcdir" 158074 158075+ 158076 158077 158078- 158079- 158080+ 158081 PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_builddir" 158082 158083+ 158084 158085 158086- 158087- 158088+ 158089 PHP_VAR_SUBST="$PHP_VAR_SUBST php_abs_top_srcdir" 158090 158091- 158092+ 158093 158094 158095 158096@@ -137880,16 +106491,16 @@ 158097 PHP_VAR_SUBST="$PHP_VAR_SUBST exec_prefix" 158098 158099 158100- 158101+ 158102 PHP_VAR_SUBST="$PHP_VAR_SUBST program_prefix" 158103 158104+ 158105 158106 158107- 158108- 158109+ 158110 PHP_VAR_SUBST="$PHP_VAR_SUBST program_suffix" 158111 158112- 158113+ 158114 158115 158116 PHP_VAR_SUBST="$PHP_VAR_SUBST includedir" 158117@@ -137950,64 +106561,64 @@ 158118 PHP_VAR_SUBST="$PHP_VAR_SUBST CXXFLAGS_CLEAN" 158119 158120 158121- 158122+ 158123 PHP_VAR_SUBST="$PHP_VAR_SUBST DEBUG_CFLAGS" 158124 158125+ 158126 158127 158128- 158129- 158130+ 158131 PHP_VAR_SUBST="$PHP_VAR_SUBST EXTENSION_DIR" 158132 158133+ 158134 158135 158136- 158137- 158138+ 158139 PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS" 158140 158141+ 158142 158143 158144- 158145- 158146+ 158147 PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LDFLAGS_PROGRAM" 158148 158149+ 158150 158151 158152- 158153- 158154+ 158155 PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_LIBS" 158156 158157+ 158158 158159 158160- 158161- 158162+ 158163 PHP_VAR_SUBST="$PHP_VAR_SUBST ZEND_EXTRA_LIBS" 158164 158165+ 158166 158167 158168- 158169- 158170+ 158171 PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDES" 158172 158173+ 158174 158175 158176- 158177- 158178+ 158179 PHP_VAR_SUBST="$PHP_VAR_SUBST EXTRA_INCLUDES" 158180 158181+ 158182 158183 158184- 158185- 158186+ 158187 PHP_VAR_SUBST="$PHP_VAR_SUBST INCLUDE_PATH" 158188 158189+ 158190 158191 158192- 158193- 158194+ 158195 PHP_VAR_SUBST="$PHP_VAR_SUBST INSTALL_IT" 158196 158197- 158198+ 158199 158200 158201 PHP_VAR_SUBST="$PHP_VAR_SUBST LFLAGS" 158202@@ -138019,31 +106630,31 @@ 158203 PHP_VAR_SUBST="$PHP_VAR_SUBST LN_S" 158204 158205 158206- 158207+ 158208 PHP_VAR_SUBST="$PHP_VAR_SUBST NATIVE_RPATHS" 158209 158210+ 158211 158212 158213- 158214- 158215+ 158216 PHP_VAR_SUBST="$PHP_VAR_SUBST PEAR_INSTALLDIR" 158217 158218- 158219+ 158220 158221 158222 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_BUILD_DATE" 158223 158224 158225- 158226+ 158227 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LDFLAGS" 158228 158229+ 158230 158231 158232- 158233- 158234+ 158235 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_LIBS" 158236 158237- 158238+ 158239 158240 158241 PHP_VAR_SUBST="$PHP_VAR_SUBST OVERALL_TARGET" 158242@@ -138055,16 +106666,16 @@ 158243 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_SAPI" 158244 158245 158246- 158247+ 158248 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION" 158249 158250+ 158251 158252 158253- 158254- 158255+ 158256 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_VERSION_ID" 158257 158258- 158259+ 158260 158261 158262 PHP_VAR_SUBST="$PHP_VAR_SUBST SHELL" 158263@@ -138112,14 +106723,13 @@ 158264 # Check whether --enable- or --disable- was given. 158265 if test "${enable_+set}" = set; then 158266 enableval="$enable_" 158267+ : 158268+fi 158269 158270-fi; 158271 158272 158273- echo "$as_me:$LINENO: result: " >&5 158274-echo "${ECHO_T}" >&6 158275- echo "$as_me:$LINENO: result: ${T_MD}Configuring libtool${T_ME}" >&5 158276-echo "${ECHO_T}${T_MD}Configuring libtool${T_ME}" >&6 158277+ echo "$ac_t""" 1>&6 158278+ echo "$ac_t""${T_MD}Configuring libtool${T_ME}" 1>&6 158279 158280 158281 LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" 158282@@ -138153,7 +106763,8 @@ 158283 esac 158284 else 158285 enable_shared=yes 158286-fi; 158287+fi 158288+ 158289 158290 # Check whether --enable-static or --disable-static was given. 158291 if test "${enable_static+set}" = set; then 158292@@ -138177,7 +106788,8 @@ 158293 esac 158294 else 158295 enable_static=yes 158296-fi; 158297+fi 158298+ 158299 158300 # Check whether --enable-fast-install or --disable-fast-install was given. 158301 if test "${enable_fast_install+set}" = set; then 158302@@ -138201,8 +106813,26 @@ 158303 esac 158304 else 158305 enable_fast_install=yes 158306-fi; 158307+fi 158308+ 158309 158310+echo $ac_n "checking build system type""... $ac_c" 1>&6 158311+echo "configure:106821: checking build system type" >&5 158312+ 158313+build_alias=$build 158314+case "$build_alias" in 158315+NONE) 158316+ case $nonopt in 158317+ NONE) build_alias=$host_alias ;; 158318+ *) build_alias=$nonopt ;; 158319+ esac ;; 158320+esac 158321+ 158322+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` 158323+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 158324+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` 158325+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 158326+echo "$ac_t""$build" 1>&6 158327 158328 # Check whether --with-gnu-ld or --without-gnu-ld was given. 158329 if test "${with_gnu_ld+set}" = set; then 158330@@ -138210,12 +106840,13 @@ 158331 test "$withval" = no || with_gnu_ld=yes 158332 else 158333 with_gnu_ld=no 158334-fi; 158335+fi 158336+ 158337 ac_prog=ld 158338 if test "$GCC" = yes; then 158339 # Check if gcc -print-prog-name=ld gives a path. 158340- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 158341-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 158342+ echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 158343+echo "configure:106850: checking for ld used by $CC" >&5 158344 case $host in 158345 *-*-mingw*) 158346 # gcc leaves a trailing carriage return which upsets mingw 158347@@ -138244,14 +106875,14 @@ 158348 ;; 158349 esac 158350 elif test "$with_gnu_ld" = yes; then 158351- echo "$as_me:$LINENO: checking for GNU ld" >&5 158352-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 158353+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 158354+echo "configure:106880: checking for GNU ld" >&5 158355 else 158356- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 158357-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 158358+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 158359+echo "configure:106883: checking for non-GNU ld" >&5 158360 fi 158361-if test "${lt_cv_path_LD+set}" = set; then 158362- echo $ECHO_N "(cached) $ECHO_C" >&6 158363+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then 158364+ echo $ac_n "(cached) $ac_c" 1>&6 158365 else 158366 if test -z "$LD"; then 158367 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR 158368@@ -138281,19 +106912,15 @@ 158369 158370 LD="$lt_cv_path_LD" 158371 if test -n "$LD"; then 158372- echo "$as_me:$LINENO: result: $LD" >&5 158373-echo "${ECHO_T}$LD" >&6 158374+ echo "$ac_t""$LD" 1>&6 158375 else 158376- echo "$as_me:$LINENO: result: no" >&5 158377-echo "${ECHO_T}no" >&6 158378+ echo "$ac_t""no" 1>&6 158379 fi 158380-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 158381-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} 158382- { (exit 1); exit 1; }; } 158383-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 158384-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 158385-if test "${lt_cv_prog_gnu_ld+set}" = set; then 158386- echo $ECHO_N "(cached) $ECHO_C" >&6 158387+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } 158388+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 158389+echo "configure:106922: checking if the linker ($LD) is GNU ld" >&5 158390+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then 158391+ echo $ac_n "(cached) $ac_c" 1>&6 158392 else 158393 # I'd rather use --version here, but apparently some GNU lds only accept -v. 158394 case `$LD -v 2>&1 </dev/null` in 158395@@ -138305,20 +106932,20 @@ 158396 ;; 158397 esac 158398 fi 158399-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 158400-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 158401+ 158402+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6 158403 with_gnu_ld=$lt_cv_prog_gnu_ld 158404 158405 158406-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 158407-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 158408-if test "${lt_cv_ld_reload_flag+set}" = set; then 158409- echo $ECHO_N "(cached) $ECHO_C" >&6 158410+echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 158411+echo "configure:106942: checking for $LD option to reload object files" >&5 158412+if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then 158413+ echo $ac_n "(cached) $ac_c" 1>&6 158414 else 158415 lt_cv_ld_reload_flag='-r' 158416 fi 158417-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 158418-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 158419+ 158420+echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6 158421 reload_flag=$lt_cv_ld_reload_flag 158422 case $reload_flag in 158423 "" | " "*) ;; 158424@@ -138335,10 +106962,10 @@ 158425 ;; 158426 esac 158427 158428-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 158429-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 158430-if test "${lt_cv_path_NM+set}" = set; then 158431- echo $ECHO_N "(cached) $ECHO_C" >&6 158432+echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 158433+echo "configure:106967: checking for BSD-compatible nm" >&5 158434+if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then 158435+ echo $ac_n "(cached) $ac_c" 1>&6 158436 else 158437 if test -n "$NM"; then 158438 # Let the user override the test. 158439@@ -138384,14 +107011,14 @@ 158440 test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm 158441 fi 158442 fi 158443-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 158444-echo "${ECHO_T}$lt_cv_path_NM" >&6 158445+ 158446+echo "$ac_t""$lt_cv_path_NM" 1>&6 158447 NM="$lt_cv_path_NM" 158448 158449-echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 158450-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6 158451-if test "${lt_cv_deplibs_check_method+set}" = set; then 158452- echo $ECHO_N "(cached) $ECHO_C" >&6 158453+echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 158454+echo "configure:107020: checking how to recognize dependent libraries" >&5 158455+if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then 158456+ echo $ac_n "(cached) $ac_c" 1>&6 158457 else 158458 lt_cv_file_magic_cmd='$MAGIC_CMD' 158459 lt_cv_file_magic_test_file= 158460@@ -138574,13 +107201,68 @@ 158461 esac 158462 158463 fi 158464-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 158465-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 158466+ 158467+echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6 158468 file_magic_cmd=$lt_cv_file_magic_cmd 158469 deplibs_check_method=$lt_cv_deplibs_check_method 158470 test -z "$deplibs_check_method" && deplibs_check_method=unknown 158471 158472+echo $ac_n "checking for object suffix""... $ac_c" 1>&6 158473+echo "configure:107212: checking for object suffix" >&5 158474+if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then 158475+ echo $ac_n "(cached) $ac_c" 1>&6 158476+else 158477+ rm -f conftest* 158478+echo 'int i = 1;' > conftest.$ac_ext 158479+if { (eval echo configure:107218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 158480+ for ac_file in conftest.*; do 158481+ case $ac_file in 158482+ *.c) ;; 158483+ *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; 158484+ esac 158485+ done 158486+else 158487+ { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } 158488+fi 158489+rm -f conftest* 158490+fi 158491+ 158492+echo "$ac_t""$ac_cv_objext" 1>&6 158493+OBJEXT=$ac_cv_objext 158494+ac_objext=$ac_cv_objext 158495+ 158496+ 158497+ 158498+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 158499+echo "configure:107238: checking for executable suffix" >&5 158500+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then 158501+ echo $ac_n "(cached) $ac_c" 1>&6 158502+else 158503+ if test "$CYGWIN" = yes || test "$MINGW32" = yes; then 158504+ ac_cv_exeext=.exe 158505+else 158506+ rm -f conftest* 158507+ echo 'int main () { return 0; }' > conftest.$ac_ext 158508+ ac_cv_exeext= 158509+ if { (eval echo configure:107248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then 158510+ for file in conftest.*; do 158511+ case $file in 158512+ *.c | *.o | *.obj) ;; 158513+ *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; 158514+ esac 158515+ done 158516+ else 158517+ { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } 158518+ fi 158519+ rm -f conftest* 158520+ test x"${ac_cv_exeext}" = x && ac_cv_exeext=no 158521+fi 158522+fi 158523 158524+EXEEXT="" 158525+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} 158526+echo "$ac_t""${ac_cv_exeext}" 1>&6 158527+ac_exeext=$EXEEXT 158528 158529 158530 # If no C compiler was specified, use CC. 158531@@ -138592,6 +107274,12 @@ 158532 # Allow CC to be a program name with arguments. 158533 compiler=$CC 158534 158535+if test $host != $build; then 158536+ ac_tool_prefix=${host_alias}- 158537+else 158538+ ac_tool_prefix= 158539+fi 158540+ 158541 #AC_ARG_ENABLE([libtool-lock], 158542 #[ --disable-libtool-lock avoid locking (might break parallel builds)]) 158543 #test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes 158544@@ -138602,11 +107290,7 @@ 158545 ia64-*-hpux*) 158546 # Find out which ABI we are using. 158547 echo 'int i;' > conftest.$ac_ext 158548- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 158549- (eval $ac_compile) 2>&5 158550- ac_status=$? 158551- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158552- (exit $ac_status); }; then 158553+ if { (eval echo configure:107294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 158554 case `/usr/bin/file conftest.$ac_objext` in 158555 *ELF-32*) 158556 HPUX_IA64_MODE="32" 158557@@ -138620,12 +107304,8 @@ 158558 ;; 158559 *-*-irix6*) 158560 # Find out which ABI we are using. 158561- echo '#line 138620 "configure"' > conftest.$ac_ext 158562- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 158563- (eval $ac_compile) 2>&5 158564- ac_status=$? 158565- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158566- (exit $ac_status); }; then 158567+ echo '#line 107308 "configure"' > conftest.$ac_ext 158568+ if { (eval echo configure:107309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 158569 if test "$lt_cv_prog_gnu_ld" = yes; then 158570 case `/usr/bin/file conftest.$ac_objext` in 158571 *32-bit*) 158572@@ -138659,11 +107339,7 @@ 158573 s390*-*linux*|sparc*-*linux*) 158574 # Find out which ABI we are using. 158575 echo 'int i;' > conftest.$ac_ext 158576- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 158577- (eval $ac_compile) 2>&5 158578- ac_status=$? 158579- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158580- (exit $ac_status); }; then 158581+ if { (eval echo configure:107343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 158582 case `/usr/bin/file conftest.o` in 158583 *32-bit*) 158584 case $host in 158585@@ -138712,74 +107388,47 @@ 158586 # On SCO OpenServer 5, we need -belf to get full-featured binaries. 158587 SAVE_CFLAGS="$CFLAGS" 158588 CFLAGS="$CFLAGS -belf" 158589- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 158590-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 158591-if test "${lt_cv_cc_needs_belf+set}" = set; then 158592- echo $ECHO_N "(cached) $ECHO_C" >&6 158593+ echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 158594+echo "configure:107393: checking whether the C compiler needs -belf" >&5 158595+if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then 158596+ echo $ac_n "(cached) $ac_c" 1>&6 158597 else 158598- 158599- 158600+ 158601 ac_ext=c 158602+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 158603 ac_cpp='$CPP $CPPFLAGS' 158604-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 158605-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 158606-ac_compiler_gnu=$ac_cv_c_compiler_gnu 158607- 158608- cat >conftest.$ac_ext <<_ACEOF 158609-/* confdefs.h. */ 158610-_ACEOF 158611-cat confdefs.h >>conftest.$ac_ext 158612-cat >>conftest.$ac_ext <<_ACEOF 158613-/* end confdefs.h. */ 158614+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 158615+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 158616+cross_compiling=$ac_cv_prog_cc_cross 158617 158618-int 158619-main () 158620-{ 158621+ cat > conftest.$ac_ext <<EOF 158622+#line 107406 "configure" 158623+#include "confdefs.h" 158624 158625- ; 158626- return 0; 158627-} 158628-_ACEOF 158629-rm -f conftest.$ac_objext conftest$ac_exeext 158630-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 158631- (eval $ac_link) 2>conftest.er1 158632- ac_status=$? 158633- grep -v '^ *+' conftest.er1 >conftest.err 158634- rm -f conftest.er1 158635- cat conftest.err >&5 158636- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158637- (exit $ac_status); } && 158638- { ac_try='test -z "$ac_c_werror_flag" 158639- || test ! -s conftest.err' 158640- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 158641- (eval $ac_try) 2>&5 158642- ac_status=$? 158643- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158644- (exit $ac_status); }; } && 158645- { ac_try='test -s conftest$ac_exeext' 158646- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 158647- (eval $ac_try) 2>&5 158648- ac_status=$? 158649- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158650- (exit $ac_status); }; }; then 158651+int main() { 158652+ 158653+; return 0; } 158654+EOF 158655+if { (eval echo configure:107413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 158656+ rm -rf conftest* 158657 lt_cv_cc_needs_belf=yes 158658 else 158659- echo "$as_me: failed program was:" >&5 158660-sed 's/^/| /' conftest.$ac_ext >&5 158661- 158662-lt_cv_cc_needs_belf=no 158663+ echo "configure: failed program was:" >&5 158664+ cat conftest.$ac_ext >&5 158665+ rm -rf conftest* 158666+ lt_cv_cc_needs_belf=no 158667 fi 158668-rm -f conftest.err conftest.$ac_objext \ 158669- conftest$ac_exeext conftest.$ac_ext 158670+rm -f conftest* 158671 ac_ext=c 158672+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 158673 ac_cpp='$CPP $CPPFLAGS' 158674-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 158675-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 158676-ac_compiler_gnu=$ac_cv_c_compiler_gnu 158677+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 158678+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 158679+cross_compiling=$ac_cv_prog_cc_cross 158680 158681 fi 158682-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 158683-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 158684+ 158685+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 158686 if test x"$lt_cv_cc_needs_belf" != x"yes"; then 158687 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf 158688 CFLAGS="$SAVE_CFLAGS" 158689@@ -138788,11 +107437,7 @@ 158690 sparc*-*solaris*) 158691 # Find out which ABI we are using. 158692 echo 'int i;' > conftest.$ac_ext 158693- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 158694- (eval $ac_compile) 2>&5 158695- ac_status=$? 158696- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158697- (exit $ac_status); }; then 158698+ if { (eval echo configure:107441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 158699 case `/usr/bin/file conftest.o` in 158700 *64-bit*) 158701 case $lt_cv_prog_gnu_ld in 158702@@ -138820,245 +107465,58 @@ 158703 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 158704 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 158705 (test "X$CXX" != "Xg++"))) ; then 158706- ac_ext=cc 158707-ac_cpp='$CXXCPP $CPPFLAGS' 158708-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 158709-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 158710-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 158711-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 158712-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 158713+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 158714+echo "configure:107470: checking how to run the C++ preprocessor" >&5 158715 if test -z "$CXXCPP"; then 158716- if test "${ac_cv_prog_CXXCPP+set}" = set; then 158717- echo $ECHO_N "(cached) $ECHO_C" >&6 158718-else 158719- # Double quotes because CXXCPP needs to be expanded 158720- for CXXCPP in "$CXX -E" "/lib/cpp" 158721- do 158722- ac_preproc_ok=false 158723-for ac_cxx_preproc_warn_flag in '' yes 158724-do 158725- # Use a header file that comes with gcc, so configuring glibc 158726- # with a fresh cross-compiler works. 158727- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 158728- # <limits.h> exists even on freestanding compilers. 158729- # On the NeXT, cc -E runs the code through the compiler's parser, 158730- # not just through cpp. "Syntax error" is here to catch this case. 158731- cat >conftest.$ac_ext <<_ACEOF 158732-/* confdefs.h. */ 158733-_ACEOF 158734-cat confdefs.h >>conftest.$ac_ext 158735-cat >>conftest.$ac_ext <<_ACEOF 158736-/* end confdefs.h. */ 158737-#ifdef __STDC__ 158738-# include <limits.h> 158739-#else 158740-# include <assert.h> 158741-#endif 158742- Syntax error 158743-_ACEOF 158744-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 158745- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 158746- ac_status=$? 158747- grep -v '^ *+' conftest.er1 >conftest.err 158748- rm -f conftest.er1 158749- cat conftest.err >&5 158750- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158751- (exit $ac_status); } >/dev/null; then 158752- if test -s conftest.err; then 158753- ac_cpp_err=$ac_cxx_preproc_warn_flag 158754- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 158755- else 158756- ac_cpp_err= 158757- fi 158758-else 158759- ac_cpp_err=yes 158760-fi 158761-if test -z "$ac_cpp_err"; then 158762- : 158763-else 158764- echo "$as_me: failed program was:" >&5 158765-sed 's/^/| /' conftest.$ac_ext >&5 158766- 158767- # Broken: fails on valid input. 158768-continue 158769-fi 158770-rm -f conftest.err conftest.$ac_ext 158771- 158772- # OK, works on sane cases. Now check whether non-existent headers 158773- # can be detected and how. 158774- cat >conftest.$ac_ext <<_ACEOF 158775-/* confdefs.h. */ 158776-_ACEOF 158777-cat confdefs.h >>conftest.$ac_ext 158778-cat >>conftest.$ac_ext <<_ACEOF 158779-/* end confdefs.h. */ 158780-#include <ac_nonexistent.h> 158781-_ACEOF 158782-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 158783- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 158784- ac_status=$? 158785- grep -v '^ *+' conftest.er1 >conftest.err 158786- rm -f conftest.er1 158787- cat conftest.err >&5 158788- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158789- (exit $ac_status); } >/dev/null; then 158790- if test -s conftest.err; then 158791- ac_cpp_err=$ac_cxx_preproc_warn_flag 158792- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 158793- else 158794- ac_cpp_err= 158795- fi 158796-else 158797- ac_cpp_err=yes 158798-fi 158799-if test -z "$ac_cpp_err"; then 158800- # Broken: success on invalid input. 158801-continue 158802-else 158803- echo "$as_me: failed program was:" >&5 158804-sed 's/^/| /' conftest.$ac_ext >&5 158805- 158806- # Passes both tests. 158807-ac_preproc_ok=: 158808-break 158809-fi 158810-rm -f conftest.err conftest.$ac_ext 158811- 158812-done 158813-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 158814-rm -f conftest.err conftest.$ac_ext 158815-if $ac_preproc_ok; then 158816- break 158817-fi 158818- 158819- done 158820- ac_cv_prog_CXXCPP=$CXXCPP 158821- 158822-fi 158823- CXXCPP=$ac_cv_prog_CXXCPP 158824-else 158825- ac_cv_prog_CXXCPP=$CXXCPP 158826-fi 158827-echo "$as_me:$LINENO: result: $CXXCPP" >&5 158828-echo "${ECHO_T}$CXXCPP" >&6 158829-ac_preproc_ok=false 158830-for ac_cxx_preproc_warn_flag in '' yes 158831-do 158832- # Use a header file that comes with gcc, so configuring glibc 158833- # with a fresh cross-compiler works. 158834- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 158835- # <limits.h> exists even on freestanding compilers. 158836- # On the NeXT, cc -E runs the code through the compiler's parser, 158837- # not just through cpp. "Syntax error" is here to catch this case. 158838- cat >conftest.$ac_ext <<_ACEOF 158839-/* confdefs.h. */ 158840-_ACEOF 158841-cat confdefs.h >>conftest.$ac_ext 158842-cat >>conftest.$ac_ext <<_ACEOF 158843-/* end confdefs.h. */ 158844-#ifdef __STDC__ 158845-# include <limits.h> 158846-#else 158847-# include <assert.h> 158848-#endif 158849- Syntax error 158850-_ACEOF 158851-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 158852- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 158853- ac_status=$? 158854- grep -v '^ *+' conftest.er1 >conftest.err 158855- rm -f conftest.er1 158856- cat conftest.err >&5 158857- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158858- (exit $ac_status); } >/dev/null; then 158859- if test -s conftest.err; then 158860- ac_cpp_err=$ac_cxx_preproc_warn_flag 158861- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 158862- else 158863- ac_cpp_err= 158864- fi 158865+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then 158866+ echo $ac_n "(cached) $ac_c" 1>&6 158867 else 158868- ac_cpp_err=yes 158869-fi 158870-if test -z "$ac_cpp_err"; then 158871+ ac_ext=C 158872+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 158873+ac_cpp='$CXXCPP $CPPFLAGS' 158874+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 158875+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 158876+cross_compiling=$ac_cv_prog_cxx_cross 158877+ CXXCPP="${CXX-g++} -E" 158878+ cat > conftest.$ac_ext <<EOF 158879+#line 107483 "configure" 158880+#include "confdefs.h" 158881+#include <stdlib.h> 158882+EOF 158883+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 158884+{ (eval echo configure:107488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 158885+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 158886+if test -z "$ac_err"; then 158887 : 158888 else 158889- echo "$as_me: failed program was:" >&5 158890-sed 's/^/| /' conftest.$ac_ext >&5 158891- 158892- # Broken: fails on valid input. 158893-continue 158894+ echo "$ac_err" >&5 158895+ echo "configure: failed program was:" >&5 158896+ cat conftest.$ac_ext >&5 158897+ rm -rf conftest* 158898+ CXXCPP=/lib/cpp 158899 fi 158900-rm -f conftest.err conftest.$ac_ext 158901- 158902- # OK, works on sane cases. Now check whether non-existent headers 158903- # can be detected and how. 158904- cat >conftest.$ac_ext <<_ACEOF 158905-/* confdefs.h. */ 158906-_ACEOF 158907-cat confdefs.h >>conftest.$ac_ext 158908-cat >>conftest.$ac_ext <<_ACEOF 158909-/* end confdefs.h. */ 158910-#include <ac_nonexistent.h> 158911-_ACEOF 158912-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 158913- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 158914- ac_status=$? 158915- grep -v '^ *+' conftest.er1 >conftest.err 158916- rm -f conftest.er1 158917- cat conftest.err >&5 158918- echo "$as_me:$LINENO: \$? = $ac_status" >&5 158919- (exit $ac_status); } >/dev/null; then 158920- if test -s conftest.err; then 158921- ac_cpp_err=$ac_cxx_preproc_warn_flag 158922- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag 158923- else 158924- ac_cpp_err= 158925- fi 158926-else 158927- ac_cpp_err=yes 158928-fi 158929-if test -z "$ac_cpp_err"; then 158930- # Broken: success on invalid input. 158931-continue 158932-else 158933- echo "$as_me: failed program was:" >&5 158934-sed 's/^/| /' conftest.$ac_ext >&5 158935- 158936- # Passes both tests. 158937-ac_preproc_ok=: 158938-break 158939+rm -f conftest* 158940+ ac_cv_prog_CXXCPP="$CXXCPP" 158941+ac_ext=C 158942+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 158943+ac_cpp='$CXXCPP $CPPFLAGS' 158944+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 158945+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 158946+cross_compiling=$ac_cv_prog_cxx_cross 158947 fi 158948-rm -f conftest.err conftest.$ac_ext 158949- 158950-done 158951-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 158952-rm -f conftest.err conftest.$ac_ext 158953-if $ac_preproc_ok; then 158954- : 158955-else 158956- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check 158957-See \`config.log' for more details." >&5 158958-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check 158959-See \`config.log' for more details." >&2;} 158960- { (exit 1); exit 1; }; } 158961 fi 158962- 158963-ac_ext=cc 158964-ac_cpp='$CXXCPP $CPPFLAGS' 158965-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 158966-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 158967-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 158968+CXXCPP="$ac_cv_prog_CXXCPP" 158969+echo "$ac_t""$CXXCPP" 1>&6 158970 158971 fi 158972 158973 158974 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! 158975 # find the maximum length of command line arguments 158976-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 158977-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 158978-if test "${lt_cv_sys_max_cmd_len+set}" = set; then 158979- echo $ECHO_N "(cached) $ECHO_C" >&6 158980+echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 158981+echo "configure:107518: checking the maximum length of command line arguments" >&5 158982+if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then 158983+ echo $ac_n "(cached) $ac_c" 1>&6 158984 else 158985 i=0 158986 teststring="ABCD" 158987@@ -139167,11 +107625,9 @@ 158988 fi 158989 158990 if test -n $lt_cv_sys_max_cmd_len ; then 158991- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 158992-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 158993+ echo "$ac_t""$lt_cv_sys_max_cmd_len" 1>&6 158994 else 158995- echo "$as_me:$LINENO: result: none" >&5 158996-echo "${ECHO_T}none" >&6 158997+ echo "$ac_t""none" 1>&6 158998 fi 158999 159000 159001@@ -139179,12 +107635,12 @@ 159002 159003 159004 # Check for command to grab the raw symbol name followed by C symbol from nm. 159005-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 159006-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 159007-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then 159008- echo $ECHO_N "(cached) $ECHO_C" >&6 159009+echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 159010+echo "configure:107640: checking command to parse $NM output from $compiler object" >&5 159011+if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then 159012+ echo $ac_n "(cached) $ac_c" 1>&6 159013 else 159014- 159015+ 159016 # These are sane defaults that work on at least a few old systems. 159017 # [They come from Ultrix. What could be older than Ultrix?!! ;)] 159018 159019@@ -139284,18 +107740,10 @@ 159020 int main(){nm_test_var='a';nm_test_func();return(0);} 159021 EOF 159022 159023- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 159024- (eval $ac_compile) 2>&5 159025- ac_status=$? 159026- echo "$as_me:$LINENO: \$? = $ac_status" >&5 159027- (exit $ac_status); }; then 159028+ if { (eval echo configure:107744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 159029 # Now try to grab the symbols. 159030 nlist=conftest.nm 159031- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 159032- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 159033- ac_status=$? 159034- echo "$as_me:$LINENO: \$? = $ac_status" >&5 159035- (exit $ac_status); } && test -s "$nlist"; then 159036+ if { (eval echo configure:107747: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then 159037 # Try sorting and uniquifying the output. 159038 if sort "$nlist" | uniq > "$nlist"T; then 159039 mv -f "$nlist"T "$nlist" 159040@@ -139346,11 +107794,7 @@ 159041 lt_save_CFLAGS="$CFLAGS" 159042 LIBS="conftstm.$ac_objext" 159043 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" 159044- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 159045- (eval $ac_link) 2>&5 159046- ac_status=$? 159047- echo "$as_me:$LINENO: \$? = $ac_status" >&5 159048- (exit $ac_status); } && test -s conftest${ac_exeext}; then 159049+ if { (eval echo configure:107798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 159050 pipe_works=yes 159051 fi 159052 LIBS="$lt_save_LIBS" 159053@@ -139384,17 +107828,15 @@ 159054 lt_cv_sys_global_symbol_to_cdecl= 159055 fi 159056 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then 159057- echo "$as_me:$LINENO: result: failed" >&5 159058-echo "${ECHO_T}failed" >&6 159059+ echo "$ac_t""failed" 1>&6 159060 else 159061- echo "$as_me:$LINENO: result: ok" >&5 159062-echo "${ECHO_T}ok" >&6 159063+ echo "$ac_t""ok" 1>&6 159064 fi 159065 159066-echo "$as_me:$LINENO: checking for objdir" >&5 159067-echo $ECHO_N "checking for objdir... $ECHO_C" >&6 159068-if test "${lt_cv_objdir+set}" = set; then 159069- echo $ECHO_N "(cached) $ECHO_C" >&6 159070+echo $ac_n "checking for objdir""... $ac_c" 1>&6 159071+echo "configure:107838: checking for objdir" >&5 159072+if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then 159073+ echo $ac_n "(cached) $ac_c" 1>&6 159074 else 159075 rm -f .libs 2>/dev/null 159076 mkdir .libs 2>/dev/null 159077@@ -139406,8 +107848,8 @@ 159078 fi 159079 rmdir .libs 2>/dev/null 159080 fi 159081-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 159082-echo "${ECHO_T}$lt_cv_objdir" >&6 159083+ 159084+echo "$ac_t""$lt_cv_objdir" 1>&6 159085 objdir=$lt_cv_objdir 159086 159087 159088@@ -139455,244 +107897,205 @@ 159089 ofile="$default_ofile" 159090 with_gnu_ld="$lt_cv_prog_gnu_ld" 159091 159092-if test -n "$ac_tool_prefix"; then 159093- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 159094+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. 159095 set dummy ${ac_tool_prefix}ar; ac_word=$2 159096-echo "$as_me:$LINENO: checking for $ac_word" >&5 159097-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159098-if test "${ac_cv_prog_AR+set}" = set; then 159099- echo $ECHO_N "(cached) $ECHO_C" >&6 159100+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159101+echo "configure:107904: checking for $ac_word" >&5 159102+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then 159103+ echo $ac_n "(cached) $ac_c" 1>&6 159104 else 159105 if test -n "$AR"; then 159106 ac_cv_prog_AR="$AR" # Let the user override the test. 159107 else 159108-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159109-for as_dir in $PATH 159110-do 159111- IFS=$as_save_IFS 159112- test -z "$as_dir" && as_dir=. 159113- for ac_exec_ext in '' $ac_executable_extensions; do 159114- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159115- ac_cv_prog_AR="${ac_tool_prefix}ar" 159116- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159117- break 2 159118- fi 159119-done 159120-done 159121- 159122+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159123+ ac_dummy="$PATH" 159124+ for ac_dir in $ac_dummy; do 159125+ test -z "$ac_dir" && ac_dir=. 159126+ if test -f $ac_dir/$ac_word; then 159127+ ac_cv_prog_AR="${ac_tool_prefix}ar" 159128+ break 159129+ fi 159130+ done 159131+ IFS="$ac_save_ifs" 159132 fi 159133 fi 159134-AR=$ac_cv_prog_AR 159135+AR="$ac_cv_prog_AR" 159136 if test -n "$AR"; then 159137- echo "$as_me:$LINENO: result: $AR" >&5 159138-echo "${ECHO_T}$AR" >&6 159139+ echo "$ac_t""$AR" 1>&6 159140 else 159141- echo "$as_me:$LINENO: result: no" >&5 159142-echo "${ECHO_T}no" >&6 159143+ echo "$ac_t""no" 1>&6 159144 fi 159145 159146-fi 159147+ 159148 if test -z "$ac_cv_prog_AR"; then 159149- ac_ct_AR=$AR 159150+if test -n "$ac_tool_prefix"; then 159151 # Extract the first word of "ar", so it can be a program name with args. 159152 set dummy ar; ac_word=$2 159153-echo "$as_me:$LINENO: checking for $ac_word" >&5 159154-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159155-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then 159156- echo $ECHO_N "(cached) $ECHO_C" >&6 159157+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159158+echo "configure:107936: checking for $ac_word" >&5 159159+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then 159160+ echo $ac_n "(cached) $ac_c" 1>&6 159161 else 159162- if test -n "$ac_ct_AR"; then 159163- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. 159164+ if test -n "$AR"; then 159165+ ac_cv_prog_AR="$AR" # Let the user override the test. 159166 else 159167-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159168-for as_dir in $PATH 159169-do 159170- IFS=$as_save_IFS 159171- test -z "$as_dir" && as_dir=. 159172- for ac_exec_ext in '' $ac_executable_extensions; do 159173- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159174- ac_cv_prog_ac_ct_AR="ar" 159175- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159176- break 2 159177- fi 159178-done 159179-done 159180- 159181- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" 159182+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159183+ ac_dummy="$PATH" 159184+ for ac_dir in $ac_dummy; do 159185+ test -z "$ac_dir" && ac_dir=. 159186+ if test -f $ac_dir/$ac_word; then 159187+ ac_cv_prog_AR="ar" 159188+ break 159189+ fi 159190+ done 159191+ IFS="$ac_save_ifs" 159192+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="false" 159193 fi 159194 fi 159195-ac_ct_AR=$ac_cv_prog_ac_ct_AR 159196-if test -n "$ac_ct_AR"; then 159197- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 159198-echo "${ECHO_T}$ac_ct_AR" >&6 159199+AR="$ac_cv_prog_AR" 159200+if test -n "$AR"; then 159201+ echo "$ac_t""$AR" 1>&6 159202 else 159203- echo "$as_me:$LINENO: result: no" >&5 159204-echo "${ECHO_T}no" >&6 159205+ echo "$ac_t""no" 1>&6 159206 fi 159207 159208- AR=$ac_ct_AR 159209 else 159210- AR="$ac_cv_prog_AR" 159211+ AR="false" 159212+fi 159213 fi 159214 159215-if test -n "$ac_tool_prefix"; then 159216- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 159217+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 159218 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 159219-echo "$as_me:$LINENO: checking for $ac_word" >&5 159220-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159221-if test "${ac_cv_prog_RANLIB+set}" = set; then 159222- echo $ECHO_N "(cached) $ECHO_C" >&6 159223+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159224+echo "configure:107971: checking for $ac_word" >&5 159225+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 159226+ echo $ac_n "(cached) $ac_c" 1>&6 159227 else 159228 if test -n "$RANLIB"; then 159229 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. 159230 else 159231-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159232-for as_dir in $PATH 159233-do 159234- IFS=$as_save_IFS 159235- test -z "$as_dir" && as_dir=. 159236- for ac_exec_ext in '' $ac_executable_extensions; do 159237- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159238- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 159239- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159240- break 2 159241- fi 159242-done 159243-done 159244- 159245+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159246+ ac_dummy="$PATH" 159247+ for ac_dir in $ac_dummy; do 159248+ test -z "$ac_dir" && ac_dir=. 159249+ if test -f $ac_dir/$ac_word; then 159250+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 159251+ break 159252+ fi 159253+ done 159254+ IFS="$ac_save_ifs" 159255 fi 159256 fi 159257-RANLIB=$ac_cv_prog_RANLIB 159258+RANLIB="$ac_cv_prog_RANLIB" 159259 if test -n "$RANLIB"; then 159260- echo "$as_me:$LINENO: result: $RANLIB" >&5 159261-echo "${ECHO_T}$RANLIB" >&6 159262+ echo "$ac_t""$RANLIB" 1>&6 159263 else 159264- echo "$as_me:$LINENO: result: no" >&5 159265-echo "${ECHO_T}no" >&6 159266+ echo "$ac_t""no" 1>&6 159267 fi 159268 159269-fi 159270+ 159271 if test -z "$ac_cv_prog_RANLIB"; then 159272- ac_ct_RANLIB=$RANLIB 159273+if test -n "$ac_tool_prefix"; then 159274 # Extract the first word of "ranlib", so it can be a program name with args. 159275 set dummy ranlib; ac_word=$2 159276-echo "$as_me:$LINENO: checking for $ac_word" >&5 159277-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159278-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then 159279- echo $ECHO_N "(cached) $ECHO_C" >&6 159280+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159281+echo "configure:108003: checking for $ac_word" >&5 159282+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 159283+ echo $ac_n "(cached) $ac_c" 1>&6 159284 else 159285- if test -n "$ac_ct_RANLIB"; then 159286- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. 159287+ if test -n "$RANLIB"; then 159288+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. 159289 else 159290-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159291-for as_dir in $PATH 159292-do 159293- IFS=$as_save_IFS 159294- test -z "$as_dir" && as_dir=. 159295- for ac_exec_ext in '' $ac_executable_extensions; do 159296- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159297- ac_cv_prog_ac_ct_RANLIB="ranlib" 159298- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159299- break 2 159300- fi 159301-done 159302-done 159303- 159304- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" 159305+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159306+ ac_dummy="$PATH" 159307+ for ac_dir in $ac_dummy; do 159308+ test -z "$ac_dir" && ac_dir=. 159309+ if test -f $ac_dir/$ac_word; then 159310+ ac_cv_prog_RANLIB="ranlib" 159311+ break 159312+ fi 159313+ done 159314+ IFS="$ac_save_ifs" 159315+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" 159316 fi 159317 fi 159318-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB 159319-if test -n "$ac_ct_RANLIB"; then 159320- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 159321-echo "${ECHO_T}$ac_ct_RANLIB" >&6 159322+RANLIB="$ac_cv_prog_RANLIB" 159323+if test -n "$RANLIB"; then 159324+ echo "$ac_t""$RANLIB" 1>&6 159325 else 159326- echo "$as_me:$LINENO: result: no" >&5 159327-echo "${ECHO_T}no" >&6 159328+ echo "$ac_t""no" 1>&6 159329 fi 159330 159331- RANLIB=$ac_ct_RANLIB 159332 else 159333- RANLIB="$ac_cv_prog_RANLIB" 159334+ RANLIB=":" 159335+fi 159336 fi 159337 159338-if test -n "$ac_tool_prefix"; then 159339- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 159340+# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 159341 set dummy ${ac_tool_prefix}strip; ac_word=$2 159342-echo "$as_me:$LINENO: checking for $ac_word" >&5 159343-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159344-if test "${ac_cv_prog_STRIP+set}" = set; then 159345- echo $ECHO_N "(cached) $ECHO_C" >&6 159346+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159347+echo "configure:108038: checking for $ac_word" >&5 159348+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 159349+ echo $ac_n "(cached) $ac_c" 1>&6 159350 else 159351 if test -n "$STRIP"; then 159352 ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 159353 else 159354-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159355-for as_dir in $PATH 159356-do 159357- IFS=$as_save_IFS 159358- test -z "$as_dir" && as_dir=. 159359- for ac_exec_ext in '' $ac_executable_extensions; do 159360- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159361- ac_cv_prog_STRIP="${ac_tool_prefix}strip" 159362- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159363- break 2 159364- fi 159365-done 159366-done 159367- 159368+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159369+ ac_dummy="$PATH" 159370+ for ac_dir in $ac_dummy; do 159371+ test -z "$ac_dir" && ac_dir=. 159372+ if test -f $ac_dir/$ac_word; then 159373+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" 159374+ break 159375+ fi 159376+ done 159377+ IFS="$ac_save_ifs" 159378 fi 159379 fi 159380-STRIP=$ac_cv_prog_STRIP 159381+STRIP="$ac_cv_prog_STRIP" 159382 if test -n "$STRIP"; then 159383- echo "$as_me:$LINENO: result: $STRIP" >&5 159384-echo "${ECHO_T}$STRIP" >&6 159385+ echo "$ac_t""$STRIP" 1>&6 159386 else 159387- echo "$as_me:$LINENO: result: no" >&5 159388-echo "${ECHO_T}no" >&6 159389+ echo "$ac_t""no" 1>&6 159390 fi 159391 159392-fi 159393+ 159394 if test -z "$ac_cv_prog_STRIP"; then 159395- ac_ct_STRIP=$STRIP 159396+if test -n "$ac_tool_prefix"; then 159397 # Extract the first word of "strip", so it can be a program name with args. 159398 set dummy strip; ac_word=$2 159399-echo "$as_me:$LINENO: checking for $ac_word" >&5 159400-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159401-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then 159402- echo $ECHO_N "(cached) $ECHO_C" >&6 159403+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159404+echo "configure:108070: checking for $ac_word" >&5 159405+if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then 159406+ echo $ac_n "(cached) $ac_c" 1>&6 159407 else 159408- if test -n "$ac_ct_STRIP"; then 159409- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. 159410+ if test -n "$STRIP"; then 159411+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. 159412 else 159413-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159414-for as_dir in $PATH 159415-do 159416- IFS=$as_save_IFS 159417- test -z "$as_dir" && as_dir=. 159418- for ac_exec_ext in '' $ac_executable_extensions; do 159419- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159420- ac_cv_prog_ac_ct_STRIP="strip" 159421- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159422- break 2 159423- fi 159424-done 159425-done 159426- 159427- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" 159428+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159429+ ac_dummy="$PATH" 159430+ for ac_dir in $ac_dummy; do 159431+ test -z "$ac_dir" && ac_dir=. 159432+ if test -f $ac_dir/$ac_word; then 159433+ ac_cv_prog_STRIP="strip" 159434+ break 159435+ fi 159436+ done 159437+ IFS="$ac_save_ifs" 159438+ test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" 159439 fi 159440 fi 159441-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP 159442-if test -n "$ac_ct_STRIP"; then 159443- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 159444-echo "${ECHO_T}$ac_ct_STRIP" >&6 159445+STRIP="$ac_cv_prog_STRIP" 159446+if test -n "$STRIP"; then 159447+ echo "$ac_t""$STRIP" 1>&6 159448 else 159449- echo "$as_me:$LINENO: result: no" >&5 159450-echo "${ECHO_T}no" >&6 159451+ echo "$ac_t""no" 1>&6 159452 fi 159453 159454- STRIP=$ac_ct_STRIP 159455 else 159456- STRIP="$ac_cv_prog_STRIP" 159457+ STRIP=":" 159458+fi 159459 fi 159460 159461 159462@@ -139749,10 +108152,10 @@ 159463 case $deplibs_check_method in 159464 file_magic*) 159465 if test "$file_magic_cmd" = '$MAGIC_CMD'; then 159466- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 159467-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 159468-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then 159469- echo $ECHO_N "(cached) $ECHO_C" >&6 159470+ echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 159471+echo "configure:108157: checking for ${ac_tool_prefix}file" >&5 159472+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then 159473+ echo $ac_n "(cached) $ac_c" 1>&6 159474 else 159475 case $MAGIC_CMD in 159476 [\\/*] | ?:[\\/]*) 159477@@ -139802,19 +108205,17 @@ 159478 159479 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 159480 if test -n "$MAGIC_CMD"; then 159481- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 159482-echo "${ECHO_T}$MAGIC_CMD" >&6 159483+ echo "$ac_t""$MAGIC_CMD" 1>&6 159484 else 159485- echo "$as_me:$LINENO: result: no" >&5 159486-echo "${ECHO_T}no" >&6 159487+ echo "$ac_t""no" 1>&6 159488 fi 159489 159490 if test -z "$lt_cv_path_MAGIC_CMD"; then 159491 if test -n "$ac_tool_prefix"; then 159492- echo "$as_me:$LINENO: checking for file" >&5 159493-echo $ECHO_N "checking for file... $ECHO_C" >&6 159494-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then 159495- echo $ECHO_N "(cached) $ECHO_C" >&6 159496+ echo $ac_n "checking for file""... $ac_c" 1>&6 159497+echo "configure:108217: checking for file" >&5 159498+if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then 159499+ echo $ac_n "(cached) $ac_c" 1>&6 159500 else 159501 case $MAGIC_CMD in 159502 [\\/*] | ?:[\\/]*) 159503@@ -139864,11 +108265,9 @@ 159504 159505 MAGIC_CMD="$lt_cv_path_MAGIC_CMD" 159506 if test -n "$MAGIC_CMD"; then 159507- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 159508-echo "${ECHO_T}$MAGIC_CMD" >&6 159509+ echo "$ac_t""$MAGIC_CMD" 1>&6 159510 else 159511- echo "$as_me:$LINENO: result: no" >&5 159512-echo "${ECHO_T}no" >&6 159513+ echo "$ac_t""no" 1>&6 159514 fi 159515 159516 else 159517@@ -139883,171 +108282,145 @@ 159518 159519 case $host_os in 159520 rhapsody* | darwin*) 159521- if test -n "$ac_tool_prefix"; then 159522- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. 159523+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. 159524 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 159525-echo "$as_me:$LINENO: checking for $ac_word" >&5 159526-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159527-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then 159528- echo $ECHO_N "(cached) $ECHO_C" >&6 159529+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159530+echo "configure:108289: checking for $ac_word" >&5 159531+if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then 159532+ echo $ac_n "(cached) $ac_c" 1>&6 159533 else 159534 if test -n "$DSYMUTIL"; then 159535 ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. 159536 else 159537-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159538-for as_dir in $PATH 159539-do 159540- IFS=$as_save_IFS 159541- test -z "$as_dir" && as_dir=. 159542- for ac_exec_ext in '' $ac_executable_extensions; do 159543- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159544- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" 159545- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159546- break 2 159547- fi 159548-done 159549-done 159550- 159551+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159552+ ac_dummy="$PATH" 159553+ for ac_dir in $ac_dummy; do 159554+ test -z "$ac_dir" && ac_dir=. 159555+ if test -f $ac_dir/$ac_word; then 159556+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" 159557+ break 159558+ fi 159559+ done 159560+ IFS="$ac_save_ifs" 159561 fi 159562 fi 159563-DSYMUTIL=$ac_cv_prog_DSYMUTIL 159564+DSYMUTIL="$ac_cv_prog_DSYMUTIL" 159565 if test -n "$DSYMUTIL"; then 159566- echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 159567-echo "${ECHO_T}$DSYMUTIL" >&6 159568+ echo "$ac_t""$DSYMUTIL" 1>&6 159569 else 159570- echo "$as_me:$LINENO: result: no" >&5 159571-echo "${ECHO_T}no" >&6 159572+ echo "$ac_t""no" 1>&6 159573 fi 159574 159575-fi 159576+ 159577 if test -z "$ac_cv_prog_DSYMUTIL"; then 159578- ac_ct_DSYMUTIL=$DSYMUTIL 159579+if test -n "$ac_tool_prefix"; then 159580 # Extract the first word of "dsymutil", so it can be a program name with args. 159581 set dummy dsymutil; ac_word=$2 159582-echo "$as_me:$LINENO: checking for $ac_word" >&5 159583-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159584-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then 159585- echo $ECHO_N "(cached) $ECHO_C" >&6 159586+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159587+echo "configure:108321: checking for $ac_word" >&5 159588+if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then 159589+ echo $ac_n "(cached) $ac_c" 1>&6 159590 else 159591- if test -n "$ac_ct_DSYMUTIL"; then 159592- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. 159593+ if test -n "$DSYMUTIL"; then 159594+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. 159595 else 159596-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159597-for as_dir in $PATH 159598-do 159599- IFS=$as_save_IFS 159600- test -z "$as_dir" && as_dir=. 159601- for ac_exec_ext in '' $ac_executable_extensions; do 159602- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159603- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" 159604- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159605- break 2 159606- fi 159607-done 159608-done 159609- 159610- test -z "$ac_cv_prog_ac_ct_DSYMUTIL" && ac_cv_prog_ac_ct_DSYMUTIL=":" 159611+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159612+ ac_dummy="$PATH" 159613+ for ac_dir in $ac_dummy; do 159614+ test -z "$ac_dir" && ac_dir=. 159615+ if test -f $ac_dir/$ac_word; then 159616+ ac_cv_prog_DSYMUTIL="dsymutil" 159617+ break 159618+ fi 159619+ done 159620+ IFS="$ac_save_ifs" 159621+ test -z "$ac_cv_prog_DSYMUTIL" && ac_cv_prog_DSYMUTIL=":" 159622 fi 159623 fi 159624-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL 159625-if test -n "$ac_ct_DSYMUTIL"; then 159626- echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 159627-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6 159628+DSYMUTIL="$ac_cv_prog_DSYMUTIL" 159629+if test -n "$DSYMUTIL"; then 159630+ echo "$ac_t""$DSYMUTIL" 1>&6 159631 else 159632- echo "$as_me:$LINENO: result: no" >&5 159633-echo "${ECHO_T}no" >&6 159634+ echo "$ac_t""no" 1>&6 159635 fi 159636 159637- DSYMUTIL=$ac_ct_DSYMUTIL 159638 else 159639- DSYMUTIL="$ac_cv_prog_DSYMUTIL" 159640+ DSYMUTIL=":" 159641+fi 159642 fi 159643 159644- if test -n "$ac_tool_prefix"; then 159645- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. 159646+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. 159647 set dummy ${ac_tool_prefix}nmedit; ac_word=$2 159648-echo "$as_me:$LINENO: checking for $ac_word" >&5 159649-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159650-if test "${ac_cv_prog_NMEDIT+set}" = set; then 159651- echo $ECHO_N "(cached) $ECHO_C" >&6 159652+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159653+echo "configure:108356: checking for $ac_word" >&5 159654+if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then 159655+ echo $ac_n "(cached) $ac_c" 1>&6 159656 else 159657 if test -n "$NMEDIT"; then 159658 ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. 159659 else 159660-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159661-for as_dir in $PATH 159662-do 159663- IFS=$as_save_IFS 159664- test -z "$as_dir" && as_dir=. 159665- for ac_exec_ext in '' $ac_executable_extensions; do 159666- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159667- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" 159668- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159669- break 2 159670- fi 159671-done 159672-done 159673- 159674+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159675+ ac_dummy="$PATH" 159676+ for ac_dir in $ac_dummy; do 159677+ test -z "$ac_dir" && ac_dir=. 159678+ if test -f $ac_dir/$ac_word; then 159679+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" 159680+ break 159681+ fi 159682+ done 159683+ IFS="$ac_save_ifs" 159684 fi 159685 fi 159686-NMEDIT=$ac_cv_prog_NMEDIT 159687+NMEDIT="$ac_cv_prog_NMEDIT" 159688 if test -n "$NMEDIT"; then 159689- echo "$as_me:$LINENO: result: $NMEDIT" >&5 159690-echo "${ECHO_T}$NMEDIT" >&6 159691+ echo "$ac_t""$NMEDIT" 1>&6 159692 else 159693- echo "$as_me:$LINENO: result: no" >&5 159694-echo "${ECHO_T}no" >&6 159695+ echo "$ac_t""no" 1>&6 159696 fi 159697 159698-fi 159699+ 159700 if test -z "$ac_cv_prog_NMEDIT"; then 159701- ac_ct_NMEDIT=$NMEDIT 159702+if test -n "$ac_tool_prefix"; then 159703 # Extract the first word of "nmedit", so it can be a program name with args. 159704 set dummy nmedit; ac_word=$2 159705-echo "$as_me:$LINENO: checking for $ac_word" >&5 159706-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 159707-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then 159708- echo $ECHO_N "(cached) $ECHO_C" >&6 159709+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 159710+echo "configure:108388: checking for $ac_word" >&5 159711+if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then 159712+ echo $ac_n "(cached) $ac_c" 1>&6 159713 else 159714- if test -n "$ac_ct_NMEDIT"; then 159715- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. 159716+ if test -n "$NMEDIT"; then 159717+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. 159718 else 159719-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 159720-for as_dir in $PATH 159721-do 159722- IFS=$as_save_IFS 159723- test -z "$as_dir" && as_dir=. 159724- for ac_exec_ext in '' $ac_executable_extensions; do 159725- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 159726- ac_cv_prog_ac_ct_NMEDIT="nmedit" 159727- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 159728- break 2 159729- fi 159730-done 159731-done 159732- 159733- test -z "$ac_cv_prog_ac_ct_NMEDIT" && ac_cv_prog_ac_ct_NMEDIT=":" 159734+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" 159735+ ac_dummy="$PATH" 159736+ for ac_dir in $ac_dummy; do 159737+ test -z "$ac_dir" && ac_dir=. 159738+ if test -f $ac_dir/$ac_word; then 159739+ ac_cv_prog_NMEDIT="nmedit" 159740+ break 159741+ fi 159742+ done 159743+ IFS="$ac_save_ifs" 159744+ test -z "$ac_cv_prog_NMEDIT" && ac_cv_prog_NMEDIT=":" 159745 fi 159746 fi 159747-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT 159748-if test -n "$ac_ct_NMEDIT"; then 159749- echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 159750-echo "${ECHO_T}$ac_ct_NMEDIT" >&6 159751+NMEDIT="$ac_cv_prog_NMEDIT" 159752+if test -n "$NMEDIT"; then 159753+ echo "$ac_t""$NMEDIT" 1>&6 159754 else 159755- echo "$as_me:$LINENO: result: no" >&5 159756-echo "${ECHO_T}no" >&6 159757+ echo "$ac_t""no" 1>&6 159758 fi 159759 159760- NMEDIT=$ac_ct_NMEDIT 159761 else 159762- NMEDIT="$ac_cv_prog_NMEDIT" 159763+ NMEDIT=":" 159764+fi 159765 fi 159766 159767 159768- echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 159769-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6 159770-if test "${lt_cv_apple_cc_single_mod+set}" = set; then 159771- echo $ECHO_N "(cached) $ECHO_C" >&6 159772+ echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 159773+echo "configure:108422: checking for -single_module linker flag" >&5 159774+if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then 159775+ echo $ac_n "(cached) $ac_c" 1>&6 159776 else 159777 lt_cv_apple_cc_single_mod=no 159778 if test -z "${LT_MULTI_MODULE}"; then 159779@@ -140065,29 +108438,25 @@ 159780 rm conftest.c 159781 fi 159782 fi 159783-echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 159784-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6 159785- echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 159786-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6 159787-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then 159788- echo $ECHO_N "(cached) $ECHO_C" >&6 159789+ 159790+echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 159791+ echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 159792+echo "configure:108445: checking for -exported_symbols_list linker flag" >&5 159793+if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then 159794+ echo $ac_n "(cached) $ac_c" 1>&6 159795 else 159796 lt_cv_ld_exported_symbols_list=no 159797 save_LDFLAGS=$LDFLAGS 159798 echo "_main" > conftest.sym 159799 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" 159800- 159801+ 159802 cat > conftest.$ac_ext <<EOF 159803-#line 140078 "configure" 159804+#line 108455 "configure" 159805 #include "confdefs.h" 159806 int main() { 159807 ; return 0; } 159808 EOF 159809-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 159810- (eval $ac_link) 2>&5 159811- ac_status=$? 159812- echo "$as_me:$LINENO: \$? = $ac_status" >&5 159813- (exit $ac_status); } && test -s conftest${ac_exeext}; then 159814+if { (eval echo configure:108460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 159815 lt_cv_ld_exported_symbols_list=yes 159816 rm -rf conftest* 159817 else 159818@@ -140098,10 +108467,10 @@ 159819 fi 159820 rm -f conftest* 159821 LDFLAGS="$save_LDFLAGS" 159822- 159823+ 159824 fi 159825-echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 159826-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6 159827+ 159828+echo "$ac_t""$lt_cv_ld_exported_symbols_list" 1>&6 159829 case $host_os in 159830 rhapsody* | darwin1.[0123]) 159831 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 159832@@ -140144,30 +108513,31 @@ 159833 # Check whether --enable-libtool-lock or --disable-libtool-lock was given. 159834 if test "${enable_libtool_lock+set}" = set; then 159835 enableval="$enable_libtool_lock" 159836+ : 159837+fi 159838 159839-fi; 159840 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes 159841 159842- 159843 # Check whether --with-pic or --without-pic was given. 159844 if test "${with_pic+set}" = set; then 159845 withval="$with_pic" 159846 pic_mode="$withval" 159847 else 159848 pic_mode=default 159849-fi; 159850+fi 159851+ 159852 test -z "$pic_mode" && pic_mode=default 159853 159854 # Use C for the default configuration in the libtool script 159855 tagname= 159856 lt_save_CC="$CC" 159857 159858- 159859 ac_ext=c 159860+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 159861 ac_cpp='$CPP $CPPFLAGS' 159862-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 159863-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 159864-ac_compiler_gnu=$ac_cv_c_compiler_gnu 159865+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 159866+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 159867+cross_compiling=$ac_cv_prog_cc_cross 159868 159869 159870 # Source file extension for C test sources. 159871@@ -140218,11 +108588,11 @@ 159872 if test "$GCC" = yes; then 159873 lt_prog_compiler_no_builtin_flag=' -fno-builtin' 159874 159875- 159876-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 159877-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 159878-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then 159879- echo $ECHO_N "(cached) $ECHO_C" >&6 159880+ 159881+echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 159882+echo "configure:108594: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 159883+if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then 159884+ echo $ac_n "(cached) $ac_c" 1>&6 159885 else 159886 lt_cv_prog_compiler_rtti_exceptions=no 159887 ac_outfile=conftest.$ac_objext 159888@@ -140237,11 +108607,11 @@ 159889 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 159890 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 159891 -e 's:$: $lt_compiler_flag:'` 159892- (eval echo "\"configure:140237: $lt_compile\"" >&5) 159893+ (eval echo "\"configure:108611: $lt_compile\"" >&5) 159894 (eval "$lt_compile" 2>conftest.err) 159895 ac_status=$? 159896 cat conftest.err >&5 159897- echo "configure:140241: \$? = $ac_status" >&5 159898+ echo "configure:108615: \$? = $ac_status" >&5 159899 if (exit $ac_status) && test -s "$ac_outfile"; then 159900 # The compiler can only warn and ignore the option if not recognized 159901 # So say no if there are warnings other than the usual output. 159902@@ -140254,8 +108624,8 @@ 159903 $rm conftest* 159904 159905 fi 159906-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 159907-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 159908+ 159909+echo "$ac_t""$lt_cv_prog_compiler_rtti_exceptions" 1>&6 159910 159911 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then 159912 lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" 159913@@ -140269,9 +108639,9 @@ 159914 lt_prog_compiler_pic= 159915 lt_prog_compiler_static= 159916 159917-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 159918-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 159919- 159920+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 159921+echo "configure:108644: checking for $compiler option to produce PIC" >&5 159922+ 159923 if test "$GCC" = yes; then 159924 lt_prog_compiler_wl='-Wl,' 159925 lt_prog_compiler_static='-static' 159926@@ -140509,18 +108879,17 @@ 159927 esac 159928 fi 159929 159930-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 159931-echo "${ECHO_T}$lt_prog_compiler_pic" >&6 159932+echo "$ac_t""$lt_prog_compiler_pic" 1>&6 159933 159934 # 159935 # Check to make sure the PIC flag actually works. 159936 # 159937 if test -n "$lt_prog_compiler_pic"; then 159938- 159939-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 159940-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 159941-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then 159942- echo $ECHO_N "(cached) $ECHO_C" >&6 159943+ 159944+echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 159945+echo "configure:108891: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 159946+if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then 159947+ echo $ac_n "(cached) $ac_c" 1>&6 159948 else 159949 lt_cv_prog_compiler_pic_works=no 159950 ac_outfile=conftest.$ac_objext 159951@@ -140535,11 +108904,11 @@ 159952 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 159953 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 159954 -e 's:$: $lt_compiler_flag:'` 159955- (eval echo "\"configure:140535: $lt_compile\"" >&5) 159956+ (eval echo "\"configure:108908: $lt_compile\"" >&5) 159957 (eval "$lt_compile" 2>conftest.err) 159958 ac_status=$? 159959 cat conftest.err >&5 159960- echo "configure:140539: \$? = $ac_status" >&5 159961+ echo "configure:108912: \$? = $ac_status" >&5 159962 if (exit $ac_status) && test -s "$ac_outfile"; then 159963 # The compiler can only warn and ignore the option if not recognized 159964 # So say no if there are warnings other than the usual output. 159965@@ -140552,8 +108921,8 @@ 159966 $rm conftest* 159967 159968 fi 159969-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 159970-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6 159971+ 159972+echo "$ac_t""$lt_cv_prog_compiler_pic_works" 1>&6 159973 159974 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then 159975 case $lt_prog_compiler_pic in 159976@@ -140580,10 +108949,10 @@ 159977 # Check to make sure the static flag actually works. 159978 # 159979 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" 159980-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 159981-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 159982-if test "${lt_cv_prog_compiler_static_works+set}" = set; then 159983- echo $ECHO_N "(cached) $ECHO_C" >&6 159984+echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 159985+echo "configure:108954: checking if $compiler static flag $lt_tmp_static_flag works" >&5 159986+if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then 159987+ echo $ac_n "(cached) $ac_c" 1>&6 159988 else 159989 lt_cv_prog_compiler_static_works=no 159990 save_LDFLAGS="$LDFLAGS" 159991@@ -140608,8 +108977,8 @@ 159992 LDFLAGS="$save_LDFLAGS" 159993 159994 fi 159995-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 159996-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6 159997+ 159998+echo "$ac_t""$lt_cv_prog_compiler_static_works" 1>&6 159999 160000 if test x"$lt_cv_prog_compiler_static_works" = xyes; then 160001 : 160002@@ -140618,10 +108987,10 @@ 160003 fi 160004 160005 160006-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 160007-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 160008-if test "${lt_cv_prog_compiler_c_o+set}" = set; then 160009- echo $ECHO_N "(cached) $ECHO_C" >&6 160010+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 160011+echo "configure:108992: checking if $compiler supports -c -o file.$ac_objext" >&5 160012+if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then 160013+ echo $ac_n "(cached) $ac_c" 1>&6 160014 else 160015 lt_cv_prog_compiler_c_o=no 160016 $rm -r conftest 2>/dev/null 160017@@ -140639,11 +109008,11 @@ 160018 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 160019 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 160020 -e 's:$: $lt_compiler_flag:'` 160021- (eval echo "\"configure:140639: $lt_compile\"" >&5) 160022+ (eval echo "\"configure:109012: $lt_compile\"" >&5) 160023 (eval "$lt_compile" 2>out/conftest.err) 160024 ac_status=$? 160025 cat out/conftest.err >&5 160026- echo "configure:140643: \$? = $ac_status" >&5 160027+ echo "configure:109016: \$? = $ac_status" >&5 160028 if (exit $ac_status) && test -s out/conftest2.$ac_objext 160029 then 160030 # The compiler can only warn and ignore the option if not recognized 160031@@ -140665,34 +109034,32 @@ 160032 $rm conftest* 160033 160034 fi 160035-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 160036-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 160037+ 160038+echo "$ac_t""$lt_cv_prog_compiler_c_o" 1>&6 160039 160040 160041 hard_links="nottested" 160042 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then 160043 # do not overwrite the value of need_locks provided by the user 160044- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 160045-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 160046+ echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 160047+echo "configure:109046: checking if we can lock with hard links" >&5 160048 hard_links=yes 160049 $rm conftest* 160050 ln conftest.a conftest.b 2>/dev/null && hard_links=no 160051 touch conftest.a 160052 ln conftest.a conftest.b 2>&5 || hard_links=no 160053 ln conftest.a conftest.b 2>/dev/null && hard_links=no 160054- echo "$as_me:$LINENO: result: $hard_links" >&5 160055-echo "${ECHO_T}$hard_links" >&6 160056+ echo "$ac_t""$hard_links" 1>&6 160057 if test "$hard_links" = no; then 160058- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 160059-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} 160060+ echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 160061 need_locks=warn 160062 fi 160063 else 160064 need_locks=no 160065 fi 160066 160067-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 160068-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 160069+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 160070+echo "configure:109063: checking whether the $compiler linker ($LD) supports shared libraries" >&5 160071 160072 runpath_var= 160073 allow_undefined_flag= 160074@@ -141101,19 +109468,15 @@ 160075 # -berok will link without error, but may produce a broken library. 160076 allow_undefined_flag='-berok' 160077 # Determine the default libpath from the value encoded in an empty executable. 160078- 160079+ 160080 cat > conftest.$ac_ext <<EOF 160081-#line 141103 "configure" 160082+#line 109474 "configure" 160083 #include "confdefs.h" 160084 int main() { 160085 ; return 0; } 160086 EOF 160087-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160088- (eval $ac_link) 2>&5 160089- ac_status=$? 160090- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160091- (exit $ac_status); } && test -s conftest${ac_exeext}; then 160092- 160093+if { (eval echo configure:109479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160094+ 160095 lt_aix_libpath_sed=' 160096 /Import File Strings/,/^$/ { 160097 /^0/ { 160098@@ -141143,19 +109506,15 @@ 160099 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" 160100 else 160101 # Determine the default libpath from the value encoded in an empty executable. 160102- 160103+ 160104 cat > conftest.$ac_ext <<EOF 160105-#line 141145 "configure" 160106+#line 109512 "configure" 160107 #include "confdefs.h" 160108 int main() { 160109 ; return 0; } 160110 EOF 160111-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160112- (eval $ac_link) 2>&5 160113- ac_status=$? 160114- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160115- (exit $ac_status); } && test -s conftest${ac_exeext}; then 160116- 160117+if { (eval echo configure:109517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160118+ 160119 lt_aix_libpath_sed=' 160120 /Import File Strings/,/^$/ { 160121 /^0/ { 160122@@ -141623,8 +109982,7 @@ 160123 esac 160124 fi 160125 160126-echo "$as_me:$LINENO: result: $ld_shlibs" >&5 160127-echo "${ECHO_T}$ld_shlibs" >&6 160128+echo "$ac_t""$ld_shlibs" 1>&6 160129 test "$ld_shlibs" = no && can_build_shared=no 160130 160131 # 160132@@ -141644,16 +110002,12 @@ 160133 # Test whether the compiler implicitly links with -lc since on some 160134 # systems, -lgcc has to come before -lc. If gcc already passes -lc 160135 # to ld, don't add -lc before -lgcc. 160136- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 160137-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 160138+ echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 160139+echo "configure:110007: checking whether -lc should be explicitly linked in" >&5 160140 $rm conftest* 160141 echo "$lt_simple_compile_test_code" > conftest.$ac_ext 160142 160143- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 160144- (eval $ac_compile) 2>&5 160145- ac_status=$? 160146- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160147- (exit $ac_status); } 2>conftest.err; then 160148+ if { (eval echo configure:110011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then 160149 soname=conftest 160150 lib=conftest 160151 libobjs=conftest.$ac_objext 160152@@ -141667,11 +110021,7 @@ 160153 libname=conftest 160154 lt_save_allow_undefined_flag=$allow_undefined_flag 160155 allow_undefined_flag= 160156- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 160157- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 160158- ac_status=$? 160159- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160160- (exit $ac_status); } 160161+ if { (eval echo configure:110025: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } 160162 then 160163 archive_cmds_need_lc=no 160164 else 160165@@ -141682,16 +110032,15 @@ 160166 cat conftest.err 1>&5 160167 fi 160168 $rm conftest* 160169- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 160170-echo "${ECHO_T}$archive_cmds_need_lc" >&6 160171+ echo "$ac_t""$archive_cmds_need_lc" 1>&6 160172 ;; 160173 esac 160174 fi 160175 ;; 160176 esac 160177 160178-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 160179-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 160180+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 160181+echo "configure:110044: checking dynamic linker characteristics" >&5 160182 library_names_spec= 160183 libname_spec='lib$name' 160184 soname_spec= 160185@@ -141913,8 +110262,8 @@ 160186 shlibpath_overrides_runpath=yes 160187 shlibpath_var=DYLD_LIBRARY_PATH 160188 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' 160189- 160190- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" 160191+ 160192+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" 160193 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' 160194 ;; 160195 160196@@ -142292,19 +110641,18 @@ 160197 dynamic_linker=no 160198 ;; 160199 esac 160200-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 160201-echo "${ECHO_T}$dynamic_linker" >&6 160202+echo "$ac_t""$dynamic_linker" 1>&6 160203 test "$dynamic_linker" = no && can_build_shared=no 160204 160205-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 160206- echo $ECHO_N "(cached) $ECHO_C" >&6 160207+if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then 160208+ echo $ac_n "(cached) $ac_c" 1>&6 160209 else 160210 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 160211 fi 160212 160213 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 160214-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 160215- echo $ECHO_N "(cached) $ECHO_C" >&6 160216+if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then 160217+ echo $ac_n "(cached) $ac_c" 1>&6 160218 else 160219 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 160220 fi 160221@@ -142316,8 +110664,8 @@ 160222 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 160223 fi 160224 160225-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 160226-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 160227+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 160228+echo "configure:110669: checking how to hardcode library paths into programs" >&5 160229 hardcode_action= 160230 if test -n "$hardcode_libdir_flag_spec" || \ 160231 test -n "$runpath_var" || \ 160232@@ -142341,8 +110689,7 @@ 160233 # directories. 160234 hardcode_action=unsupported 160235 fi 160236-echo "$as_me:$LINENO: result: $hardcode_action" >&5 160237-echo "${ECHO_T}$hardcode_action" >&6 160238+echo "$ac_t""$hardcode_action" 1>&6 160239 160240 if test "$hardcode_action" = relink; then 160241 # Fast installation is not supported 160242@@ -142355,13 +110702,12 @@ 160243 160244 striplib= 160245 old_striplib= 160246-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 160247-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 160248+echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 160249+echo "configure:110707: checking whether stripping libraries is possible" >&5 160250 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then 160251 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" 160252 test -z "$striplib" && striplib="$STRIP --strip-unneeded" 160253- echo "$as_me:$LINENO: result: yes" >&5 160254-echo "${ECHO_T}yes" >&6 160255+ echo "$ac_t""yes" 1>&6 160256 else 160257 # FIXME - insert some real tests, host_os isn't really good enough 160258 case $host_os in 160259@@ -142369,16 +110715,13 @@ 160260 if test -n "$STRIP" ; then 160261 striplib="$STRIP -x" 160262 old_striplib="$STRIP -S" 160263- echo "$as_me:$LINENO: result: yes" >&5 160264-echo "${ECHO_T}yes" >&6 160265+ echo "$ac_t""yes" 1>&6 160266 else 160267- echo "$as_me:$LINENO: result: no" >&5 160268-echo "${ECHO_T}no" >&6 160269+ echo "$ac_t""no" 1>&6 160270 fi 160271 ;; 160272 *) 160273- echo "$as_me:$LINENO: result: no" >&5 160274-echo "${ECHO_T}no" >&6 160275+ echo "$ac_t""no" 1>&6 160276 ;; 160277 esac 160278 fi 160279@@ -142410,551 +110753,313 @@ 160280 160281 darwin*) 160282 # if libdl is installed we need to link against it 160283- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 160284-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 160285-if test "${ac_cv_lib_dl_dlopen+set}" = set; then 160286- echo $ECHO_N "(cached) $ECHO_C" >&6 160287+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 160288+echo "configure:110758: checking for dlopen in -ldl" >&5 160289+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` 160290+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 160291+ echo $ac_n "(cached) $ac_c" 1>&6 160292 else 160293- ac_check_lib_save_LIBS=$LIBS 160294+ ac_save_LIBS="$LIBS" 160295 LIBS="-ldl $LIBS" 160296-cat >conftest.$ac_ext <<_ACEOF 160297-/* confdefs.h. */ 160298-_ACEOF 160299-cat confdefs.h >>conftest.$ac_ext 160300-cat >>conftest.$ac_ext <<_ACEOF 160301-/* end confdefs.h. */ 160302- 160303+cat > conftest.$ac_ext <<EOF 160304+#line 110766 "configure" 160305+#include "confdefs.h" 160306 /* Override any gcc2 internal prototype to avoid an error. */ 160307-#ifdef __cplusplus 160308-extern "C" 160309-#endif 160310 /* We use char because int might match the return type of a gcc2 160311- builtin and then its argument prototype would still apply. */ 160312-char dlopen (); 160313-int 160314-main () 160315-{ 160316-dlopen (); 160317- ; 160318- return 0; 160319-} 160320-_ACEOF 160321-rm -f conftest.$ac_objext conftest$ac_exeext 160322-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160323- (eval $ac_link) 2>conftest.er1 160324- ac_status=$? 160325- grep -v '^ *+' conftest.er1 >conftest.err 160326- rm -f conftest.er1 160327- cat conftest.err >&5 160328- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160329- (exit $ac_status); } && 160330- { ac_try='test -z "$ac_c_werror_flag" 160331- || test ! -s conftest.err' 160332- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160333- (eval $ac_try) 2>&5 160334- ac_status=$? 160335- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160336- (exit $ac_status); }; } && 160337- { ac_try='test -s conftest$ac_exeext' 160338- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160339- (eval $ac_try) 2>&5 160340- ac_status=$? 160341- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160342- (exit $ac_status); }; }; then 160343- ac_cv_lib_dl_dlopen=yes 160344-else 160345- echo "$as_me: failed program was:" >&5 160346-sed 's/^/| /' conftest.$ac_ext >&5 160347- 160348-ac_cv_lib_dl_dlopen=no 160349-fi 160350-rm -f conftest.err conftest.$ac_objext \ 160351- conftest$ac_exeext conftest.$ac_ext 160352-LIBS=$ac_check_lib_save_LIBS 160353-fi 160354-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 160355-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 160356-if test $ac_cv_lib_dl_dlopen = yes; then 160357+ builtin and then its argument prototype would still apply. */ 160358+char dlopen(); 160359+ 160360+int main() { 160361+dlopen() 160362+; return 0; } 160363+EOF 160364+if { (eval echo configure:110777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160365+ rm -rf conftest* 160366+ eval "ac_cv_lib_$ac_lib_var=yes" 160367+else 160368+ echo "configure: failed program was:" >&5 160369+ cat conftest.$ac_ext >&5 160370+ rm -rf conftest* 160371+ eval "ac_cv_lib_$ac_lib_var=no" 160372+fi 160373+rm -f conftest* 160374+LIBS="$ac_save_LIBS" 160375+ 160376+fi 160377+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 160378+ echo "$ac_t""yes" 1>&6 160379 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" 160380 else 160381+ echo "$ac_t""no" 1>&6 160382 160383 lt_cv_dlopen="dyld" 160384 lt_cv_dlopen_libs= 160385 lt_cv_dlopen_self=yes 160386- 160387+ 160388 fi 160389 160390 ;; 160391 160392 *) 160393- echo "$as_me:$LINENO: checking for shl_load" >&5 160394-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 160395-if test "${ac_cv_func_shl_load+set}" = set; then 160396- echo $ECHO_N "(cached) $ECHO_C" >&6 160397-else 160398- cat >conftest.$ac_ext <<_ACEOF 160399-/* confdefs.h. */ 160400-_ACEOF 160401-cat confdefs.h >>conftest.$ac_ext 160402-cat >>conftest.$ac_ext <<_ACEOF 160403-/* end confdefs.h. */ 160404-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. 160405- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 160406-#define shl_load innocuous_shl_load 160407- 160408+ echo $ac_n "checking for shl_load""... $ac_c" 1>&6 160409+echo "configure:110806: checking for shl_load" >&5 160410+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then 160411+ echo $ac_n "(cached) $ac_c" 1>&6 160412+else 160413+ cat > conftest.$ac_ext <<EOF 160414+#line 110811 "configure" 160415+#include "confdefs.h" 160416 /* System header to define __stub macros and hopefully few prototypes, 160417- which can conflict with char shl_load (); below. 160418- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 160419- <limits.h> exists even on freestanding compilers. */ 160420- 160421-#ifdef __STDC__ 160422-# include <limits.h> 160423-#else 160424-# include <assert.h> 160425-#endif 160426- 160427-#undef shl_load 160428- 160429+ which can conflict with char shl_load(); below. */ 160430+#include <assert.h> 160431 /* Override any gcc2 internal prototype to avoid an error. */ 160432-#ifdef __cplusplus 160433-extern "C" 160434-{ 160435-#endif 160436 /* We use char because int might match the return type of a gcc2 160437- builtin and then its argument prototype would still apply. */ 160438-char shl_load (); 160439+ builtin and then its argument prototype would still apply. */ 160440+char shl_load(); 160441+ 160442+int main() { 160443+ 160444 /* The GNU C library defines this for functions which it implements 160445 to always fail with ENOSYS. Some functions are actually named 160446 something starting with __ and the normal name is an alias. */ 160447 #if defined (__stub_shl_load) || defined (__stub___shl_load) 160448 choke me 160449 #else 160450-char (*f) () = shl_load; 160451-#endif 160452-#ifdef __cplusplus 160453-} 160454+shl_load(); 160455 #endif 160456 160457-int 160458-main () 160459-{ 160460-return f != shl_load; 160461- ; 160462- return 0; 160463-} 160464-_ACEOF 160465-rm -f conftest.$ac_objext conftest$ac_exeext 160466-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160467- (eval $ac_link) 2>conftest.er1 160468- ac_status=$? 160469- grep -v '^ *+' conftest.er1 >conftest.err 160470- rm -f conftest.er1 160471- cat conftest.err >&5 160472- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160473- (exit $ac_status); } && 160474- { ac_try='test -z "$ac_c_werror_flag" 160475- || test ! -s conftest.err' 160476- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160477- (eval $ac_try) 2>&5 160478- ac_status=$? 160479- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160480- (exit $ac_status); }; } && 160481- { ac_try='test -s conftest$ac_exeext' 160482- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160483- (eval $ac_try) 2>&5 160484- ac_status=$? 160485- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160486- (exit $ac_status); }; }; then 160487- ac_cv_func_shl_load=yes 160488-else 160489- echo "$as_me: failed program was:" >&5 160490-sed 's/^/| /' conftest.$ac_ext >&5 160491- 160492-ac_cv_func_shl_load=no 160493-fi 160494-rm -f conftest.err conftest.$ac_objext \ 160495- conftest$ac_exeext conftest.$ac_ext 160496-fi 160497-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 160498-echo "${ECHO_T}$ac_cv_func_shl_load" >&6 160499-if test $ac_cv_func_shl_load = yes; then 160500+; return 0; } 160501+EOF 160502+if { (eval echo configure:110834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160503+ rm -rf conftest* 160504+ eval "ac_cv_func_shl_load=yes" 160505+else 160506+ echo "configure: failed program was:" >&5 160507+ cat conftest.$ac_ext >&5 160508+ rm -rf conftest* 160509+ eval "ac_cv_func_shl_load=no" 160510+fi 160511+rm -f conftest* 160512+fi 160513+ 160514+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then 160515+ echo "$ac_t""yes" 1>&6 160516 lt_cv_dlopen="shl_load" 160517 else 160518- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 160519-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 160520-if test "${ac_cv_lib_dld_shl_load+set}" = set; then 160521- echo $ECHO_N "(cached) $ECHO_C" >&6 160522+ echo "$ac_t""no" 1>&6 160523+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 160524+echo "configure:110852: checking for shl_load in -ldld" >&5 160525+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` 160526+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 160527+ echo $ac_n "(cached) $ac_c" 1>&6 160528 else 160529- ac_check_lib_save_LIBS=$LIBS 160530+ ac_save_LIBS="$LIBS" 160531 LIBS="-ldld $LIBS" 160532-cat >conftest.$ac_ext <<_ACEOF 160533-/* confdefs.h. */ 160534-_ACEOF 160535-cat confdefs.h >>conftest.$ac_ext 160536-cat >>conftest.$ac_ext <<_ACEOF 160537-/* end confdefs.h. */ 160538- 160539+cat > conftest.$ac_ext <<EOF 160540+#line 110860 "configure" 160541+#include "confdefs.h" 160542 /* Override any gcc2 internal prototype to avoid an error. */ 160543-#ifdef __cplusplus 160544-extern "C" 160545-#endif 160546 /* We use char because int might match the return type of a gcc2 160547- builtin and then its argument prototype would still apply. */ 160548-char shl_load (); 160549-int 160550-main () 160551-{ 160552-shl_load (); 160553- ; 160554- return 0; 160555-} 160556-_ACEOF 160557-rm -f conftest.$ac_objext conftest$ac_exeext 160558-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160559- (eval $ac_link) 2>conftest.er1 160560- ac_status=$? 160561- grep -v '^ *+' conftest.er1 >conftest.err 160562- rm -f conftest.er1 160563- cat conftest.err >&5 160564- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160565- (exit $ac_status); } && 160566- { ac_try='test -z "$ac_c_werror_flag" 160567- || test ! -s conftest.err' 160568- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160569- (eval $ac_try) 2>&5 160570- ac_status=$? 160571- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160572- (exit $ac_status); }; } && 160573- { ac_try='test -s conftest$ac_exeext' 160574- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160575- (eval $ac_try) 2>&5 160576- ac_status=$? 160577- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160578- (exit $ac_status); }; }; then 160579- ac_cv_lib_dld_shl_load=yes 160580-else 160581- echo "$as_me: failed program was:" >&5 160582-sed 's/^/| /' conftest.$ac_ext >&5 160583- 160584-ac_cv_lib_dld_shl_load=no 160585-fi 160586-rm -f conftest.err conftest.$ac_objext \ 160587- conftest$ac_exeext conftest.$ac_ext 160588-LIBS=$ac_check_lib_save_LIBS 160589-fi 160590-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 160591-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 160592-if test $ac_cv_lib_dld_shl_load = yes; then 160593- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" 160594+ builtin and then its argument prototype would still apply. */ 160595+char shl_load(); 160596+ 160597+int main() { 160598+shl_load() 160599+; return 0; } 160600+EOF 160601+if { (eval echo configure:110871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160602+ rm -rf conftest* 160603+ eval "ac_cv_lib_$ac_lib_var=yes" 160604 else 160605- echo "$as_me:$LINENO: checking for dlopen" >&5 160606-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 160607-if test "${ac_cv_func_dlopen+set}" = set; then 160608- echo $ECHO_N "(cached) $ECHO_C" >&6 160609-else 160610- cat >conftest.$ac_ext <<_ACEOF 160611-/* confdefs.h. */ 160612-_ACEOF 160613-cat confdefs.h >>conftest.$ac_ext 160614-cat >>conftest.$ac_ext <<_ACEOF 160615-/* end confdefs.h. */ 160616-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. 160617- For example, HP-UX 11i <limits.h> declares gettimeofday. */ 160618-#define dlopen innocuous_dlopen 160619+ echo "configure: failed program was:" >&5 160620+ cat conftest.$ac_ext >&5 160621+ rm -rf conftest* 160622+ eval "ac_cv_lib_$ac_lib_var=no" 160623+fi 160624+rm -f conftest* 160625+LIBS="$ac_save_LIBS" 160626 160627+fi 160628+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 160629+ echo "$ac_t""yes" 1>&6 160630+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" 160631+else 160632+ echo "$ac_t""no" 1>&6 160633+echo $ac_n "checking for dlopen""... $ac_c" 1>&6 160634+echo "configure:110890: checking for dlopen" >&5 160635+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then 160636+ echo $ac_n "(cached) $ac_c" 1>&6 160637+else 160638+ cat > conftest.$ac_ext <<EOF 160639+#line 110895 "configure" 160640+#include "confdefs.h" 160641 /* System header to define __stub macros and hopefully few prototypes, 160642- which can conflict with char dlopen (); below. 160643- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since 160644- <limits.h> exists even on freestanding compilers. */ 160645- 160646-#ifdef __STDC__ 160647-# include <limits.h> 160648-#else 160649-# include <assert.h> 160650-#endif 160651- 160652-#undef dlopen 160653- 160654+ which can conflict with char dlopen(); below. */ 160655+#include <assert.h> 160656 /* Override any gcc2 internal prototype to avoid an error. */ 160657-#ifdef __cplusplus 160658-extern "C" 160659-{ 160660-#endif 160661 /* We use char because int might match the return type of a gcc2 160662- builtin and then its argument prototype would still apply. */ 160663-char dlopen (); 160664+ builtin and then its argument prototype would still apply. */ 160665+char dlopen(); 160666+ 160667+int main() { 160668+ 160669 /* The GNU C library defines this for functions which it implements 160670 to always fail with ENOSYS. Some functions are actually named 160671 something starting with __ and the normal name is an alias. */ 160672 #if defined (__stub_dlopen) || defined (__stub___dlopen) 160673 choke me 160674 #else 160675-char (*f) () = dlopen; 160676-#endif 160677-#ifdef __cplusplus 160678-} 160679+dlopen(); 160680 #endif 160681 160682-int 160683-main () 160684-{ 160685-return f != dlopen; 160686- ; 160687- return 0; 160688-} 160689-_ACEOF 160690-rm -f conftest.$ac_objext conftest$ac_exeext 160691-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160692- (eval $ac_link) 2>conftest.er1 160693- ac_status=$? 160694- grep -v '^ *+' conftest.er1 >conftest.err 160695- rm -f conftest.er1 160696- cat conftest.err >&5 160697- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160698- (exit $ac_status); } && 160699- { ac_try='test -z "$ac_c_werror_flag" 160700- || test ! -s conftest.err' 160701- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160702- (eval $ac_try) 2>&5 160703- ac_status=$? 160704- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160705- (exit $ac_status); }; } && 160706- { ac_try='test -s conftest$ac_exeext' 160707- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160708- (eval $ac_try) 2>&5 160709- ac_status=$? 160710- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160711- (exit $ac_status); }; }; then 160712- ac_cv_func_dlopen=yes 160713-else 160714- echo "$as_me: failed program was:" >&5 160715-sed 's/^/| /' conftest.$ac_ext >&5 160716- 160717-ac_cv_func_dlopen=no 160718-fi 160719-rm -f conftest.err conftest.$ac_objext \ 160720- conftest$ac_exeext conftest.$ac_ext 160721-fi 160722-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 160723-echo "${ECHO_T}$ac_cv_func_dlopen" >&6 160724-if test $ac_cv_func_dlopen = yes; then 160725+; return 0; } 160726+EOF 160727+if { (eval echo configure:110918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160728+ rm -rf conftest* 160729+ eval "ac_cv_func_dlopen=yes" 160730+else 160731+ echo "configure: failed program was:" >&5 160732+ cat conftest.$ac_ext >&5 160733+ rm -rf conftest* 160734+ eval "ac_cv_func_dlopen=no" 160735+fi 160736+rm -f conftest* 160737+fi 160738+ 160739+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then 160740+ echo "$ac_t""yes" 1>&6 160741 lt_cv_dlopen="dlopen" 160742 else 160743- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 160744-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 160745-if test "${ac_cv_lib_dl_dlopen+set}" = set; then 160746- echo $ECHO_N "(cached) $ECHO_C" >&6 160747+ echo "$ac_t""no" 1>&6 160748+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 160749+echo "configure:110936: checking for dlopen in -ldl" >&5 160750+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` 160751+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 160752+ echo $ac_n "(cached) $ac_c" 1>&6 160753 else 160754- ac_check_lib_save_LIBS=$LIBS 160755+ ac_save_LIBS="$LIBS" 160756 LIBS="-ldl $LIBS" 160757-cat >conftest.$ac_ext <<_ACEOF 160758-/* confdefs.h. */ 160759-_ACEOF 160760-cat confdefs.h >>conftest.$ac_ext 160761-cat >>conftest.$ac_ext <<_ACEOF 160762-/* end confdefs.h. */ 160763- 160764+cat > conftest.$ac_ext <<EOF 160765+#line 110944 "configure" 160766+#include "confdefs.h" 160767 /* Override any gcc2 internal prototype to avoid an error. */ 160768-#ifdef __cplusplus 160769-extern "C" 160770-#endif 160771 /* We use char because int might match the return type of a gcc2 160772- builtin and then its argument prototype would still apply. */ 160773-char dlopen (); 160774-int 160775-main () 160776-{ 160777-dlopen (); 160778- ; 160779- return 0; 160780-} 160781-_ACEOF 160782-rm -f conftest.$ac_objext conftest$ac_exeext 160783-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160784- (eval $ac_link) 2>conftest.er1 160785- ac_status=$? 160786- grep -v '^ *+' conftest.er1 >conftest.err 160787- rm -f conftest.er1 160788- cat conftest.err >&5 160789- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160790- (exit $ac_status); } && 160791- { ac_try='test -z "$ac_c_werror_flag" 160792- || test ! -s conftest.err' 160793- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160794- (eval $ac_try) 2>&5 160795- ac_status=$? 160796- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160797- (exit $ac_status); }; } && 160798- { ac_try='test -s conftest$ac_exeext' 160799- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160800- (eval $ac_try) 2>&5 160801- ac_status=$? 160802- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160803- (exit $ac_status); }; }; then 160804- ac_cv_lib_dl_dlopen=yes 160805-else 160806- echo "$as_me: failed program was:" >&5 160807-sed 's/^/| /' conftest.$ac_ext >&5 160808- 160809-ac_cv_lib_dl_dlopen=no 160810-fi 160811-rm -f conftest.err conftest.$ac_objext \ 160812- conftest$ac_exeext conftest.$ac_ext 160813-LIBS=$ac_check_lib_save_LIBS 160814-fi 160815-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 160816-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 160817-if test $ac_cv_lib_dl_dlopen = yes; then 160818+ builtin and then its argument prototype would still apply. */ 160819+char dlopen(); 160820+ 160821+int main() { 160822+dlopen() 160823+; return 0; } 160824+EOF 160825+if { (eval echo configure:110955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160826+ rm -rf conftest* 160827+ eval "ac_cv_lib_$ac_lib_var=yes" 160828+else 160829+ echo "configure: failed program was:" >&5 160830+ cat conftest.$ac_ext >&5 160831+ rm -rf conftest* 160832+ eval "ac_cv_lib_$ac_lib_var=no" 160833+fi 160834+rm -f conftest* 160835+LIBS="$ac_save_LIBS" 160836+ 160837+fi 160838+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 160839+ echo "$ac_t""yes" 1>&6 160840 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" 160841 else 160842- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 160843-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 160844-if test "${ac_cv_lib_svld_dlopen+set}" = set; then 160845- echo $ECHO_N "(cached) $ECHO_C" >&6 160846+ echo "$ac_t""no" 1>&6 160847+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 160848+echo "configure:110974: checking for dlopen in -lsvld" >&5 160849+ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` 160850+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 160851+ echo $ac_n "(cached) $ac_c" 1>&6 160852 else 160853- ac_check_lib_save_LIBS=$LIBS 160854+ ac_save_LIBS="$LIBS" 160855 LIBS="-lsvld $LIBS" 160856-cat >conftest.$ac_ext <<_ACEOF 160857-/* confdefs.h. */ 160858-_ACEOF 160859-cat confdefs.h >>conftest.$ac_ext 160860-cat >>conftest.$ac_ext <<_ACEOF 160861-/* end confdefs.h. */ 160862- 160863+cat > conftest.$ac_ext <<EOF 160864+#line 110982 "configure" 160865+#include "confdefs.h" 160866 /* Override any gcc2 internal prototype to avoid an error. */ 160867-#ifdef __cplusplus 160868-extern "C" 160869-#endif 160870 /* We use char because int might match the return type of a gcc2 160871- builtin and then its argument prototype would still apply. */ 160872-char dlopen (); 160873-int 160874-main () 160875-{ 160876-dlopen (); 160877- ; 160878- return 0; 160879-} 160880-_ACEOF 160881-rm -f conftest.$ac_objext conftest$ac_exeext 160882-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160883- (eval $ac_link) 2>conftest.er1 160884- ac_status=$? 160885- grep -v '^ *+' conftest.er1 >conftest.err 160886- rm -f conftest.er1 160887- cat conftest.err >&5 160888- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160889- (exit $ac_status); } && 160890- { ac_try='test -z "$ac_c_werror_flag" 160891- || test ! -s conftest.err' 160892- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160893- (eval $ac_try) 2>&5 160894- ac_status=$? 160895- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160896- (exit $ac_status); }; } && 160897- { ac_try='test -s conftest$ac_exeext' 160898- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160899- (eval $ac_try) 2>&5 160900- ac_status=$? 160901- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160902- (exit $ac_status); }; }; then 160903- ac_cv_lib_svld_dlopen=yes 160904-else 160905- echo "$as_me: failed program was:" >&5 160906-sed 's/^/| /' conftest.$ac_ext >&5 160907- 160908-ac_cv_lib_svld_dlopen=no 160909-fi 160910-rm -f conftest.err conftest.$ac_objext \ 160911- conftest$ac_exeext conftest.$ac_ext 160912-LIBS=$ac_check_lib_save_LIBS 160913-fi 160914-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 160915-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 160916-if test $ac_cv_lib_svld_dlopen = yes; then 160917+ builtin and then its argument prototype would still apply. */ 160918+char dlopen(); 160919+ 160920+int main() { 160921+dlopen() 160922+; return 0; } 160923+EOF 160924+if { (eval echo configure:110993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 160925+ rm -rf conftest* 160926+ eval "ac_cv_lib_$ac_lib_var=yes" 160927+else 160928+ echo "configure: failed program was:" >&5 160929+ cat conftest.$ac_ext >&5 160930+ rm -rf conftest* 160931+ eval "ac_cv_lib_$ac_lib_var=no" 160932+fi 160933+rm -f conftest* 160934+LIBS="$ac_save_LIBS" 160935+ 160936+fi 160937+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 160938+ echo "$ac_t""yes" 1>&6 160939 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" 160940 else 160941- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 160942-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 160943-if test "${ac_cv_lib_dld_dld_link+set}" = set; then 160944- echo $ECHO_N "(cached) $ECHO_C" >&6 160945+ echo "$ac_t""no" 1>&6 160946+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 160947+echo "configure:111012: checking for dld_link in -ldld" >&5 160948+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` 160949+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 160950+ echo $ac_n "(cached) $ac_c" 1>&6 160951 else 160952- ac_check_lib_save_LIBS=$LIBS 160953+ ac_save_LIBS="$LIBS" 160954 LIBS="-ldld $LIBS" 160955-cat >conftest.$ac_ext <<_ACEOF 160956-/* confdefs.h. */ 160957-_ACEOF 160958-cat confdefs.h >>conftest.$ac_ext 160959-cat >>conftest.$ac_ext <<_ACEOF 160960-/* end confdefs.h. */ 160961- 160962+cat > conftest.$ac_ext <<EOF 160963+#line 111020 "configure" 160964+#include "confdefs.h" 160965 /* Override any gcc2 internal prototype to avoid an error. */ 160966-#ifdef __cplusplus 160967-extern "C" 160968-#endif 160969 /* We use char because int might match the return type of a gcc2 160970- builtin and then its argument prototype would still apply. */ 160971-char dld_link (); 160972-int 160973-main () 160974-{ 160975-dld_link (); 160976- ; 160977- return 0; 160978-} 160979-_ACEOF 160980-rm -f conftest.$ac_objext conftest$ac_exeext 160981-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 160982- (eval $ac_link) 2>conftest.er1 160983- ac_status=$? 160984- grep -v '^ *+' conftest.er1 >conftest.err 160985- rm -f conftest.er1 160986- cat conftest.err >&5 160987- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160988- (exit $ac_status); } && 160989- { ac_try='test -z "$ac_c_werror_flag" 160990- || test ! -s conftest.err' 160991- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160992- (eval $ac_try) 2>&5 160993- ac_status=$? 160994- echo "$as_me:$LINENO: \$? = $ac_status" >&5 160995- (exit $ac_status); }; } && 160996- { ac_try='test -s conftest$ac_exeext' 160997- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 160998- (eval $ac_try) 2>&5 160999- ac_status=$? 161000- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161001- (exit $ac_status); }; }; then 161002- ac_cv_lib_dld_dld_link=yes 161003-else 161004- echo "$as_me: failed program was:" >&5 161005-sed 's/^/| /' conftest.$ac_ext >&5 161006- 161007-ac_cv_lib_dld_dld_link=no 161008-fi 161009-rm -f conftest.err conftest.$ac_objext \ 161010- conftest$ac_exeext conftest.$ac_ext 161011-LIBS=$ac_check_lib_save_LIBS 161012-fi 161013-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 161014-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 161015-if test $ac_cv_lib_dld_dld_link = yes; then 161016- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" 161017-fi 161018- 161019+ builtin and then its argument prototype would still apply. */ 161020+char dld_link(); 161021 161022+int main() { 161023+dld_link() 161024+; return 0; } 161025+EOF 161026+if { (eval echo configure:111031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 161027+ rm -rf conftest* 161028+ eval "ac_cv_lib_$ac_lib_var=yes" 161029+else 161030+ echo "configure: failed program was:" >&5 161031+ cat conftest.$ac_ext >&5 161032+ rm -rf conftest* 161033+ eval "ac_cv_lib_$ac_lib_var=no" 161034 fi 161035- 161036+rm -f conftest* 161037+LIBS="$ac_save_LIBS" 161038 161039 fi 161040+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 161041+ echo "$ac_t""yes" 1>&6 161042+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" 161043+else 161044+ echo "$ac_t""no" 1>&6 161045+fi 161046 161047- 161048+ 161049 fi 161050 161051+ 161052+fi 161053 161054+ 161055 fi 161056 161057+ 161058+fi 161059 161060+ 161061 fi 161062 161063 ;; 161064@@ -142977,10 +111082,10 @@ 161065 save_LIBS="$LIBS" 161066 LIBS="$lt_cv_dlopen_libs $LIBS" 161067 161068- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 161069-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 161070-if test "${lt_cv_dlopen_self+set}" = set; then 161071- echo $ECHO_N "(cached) $ECHO_C" >&6 161072+ echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 161073+echo "configure:111087: checking whether a program can dlopen itself" >&5 161074+if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then 161075+ echo $ac_n "(cached) $ac_c" 1>&6 161076 else 161077 if test "$cross_compiling" = yes; then : 161078 lt_cv_dlopen_self=cross 161079@@ -142988,7 +111093,7 @@ 161080 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 161081 lt_status=$lt_dlunknown 161082 cat > conftest.$ac_ext <<EOF 161083-#line 142988 "configure" 161084+#line 111097 "configure" 161085 #include "confdefs.h" 161086 161087 #if HAVE_DLFCN_H 161088@@ -143051,11 +111156,7 @@ 161089 exit (status); 161090 } 161091 EOF 161092- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 161093- (eval $ac_link) 2>&5 161094- ac_status=$? 161095- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161096- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 161097+ if { (eval echo configure:111160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then 161098 (./conftest; exit; ) >&5 2>/dev/null 161099 lt_status=$? 161100 case x$lt_status in 161101@@ -143070,17 +111171,17 @@ 161102 fi 161103 rm -fr conftest* 161104 161105- 161106+ 161107 fi 161108-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 161109-echo "${ECHO_T}$lt_cv_dlopen_self" >&6 161110+ 161111+echo "$ac_t""$lt_cv_dlopen_self" 1>&6 161112 161113 if test "x$lt_cv_dlopen_self" = xyes; then 161114 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" 161115- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 161116-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 161117-if test "${lt_cv_dlopen_self_static+set}" = set; then 161118- echo $ECHO_N "(cached) $ECHO_C" >&6 161119+ echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 161120+echo "configure:111183: checking whether a statically linked program can dlopen itself" >&5 161121+if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then 161122+ echo $ac_n "(cached) $ac_c" 1>&6 161123 else 161124 if test "$cross_compiling" = yes; then : 161125 lt_cv_dlopen_self_static=cross 161126@@ -143088,7 +111189,7 @@ 161127 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 161128 lt_status=$lt_dlunknown 161129 cat > conftest.$ac_ext <<EOF 161130-#line 143088 "configure" 161131+#line 111193 "configure" 161132 #include "confdefs.h" 161133 161134 #if HAVE_DLFCN_H 161135@@ -143151,11 +111252,7 @@ 161136 exit (status); 161137 } 161138 EOF 161139- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 161140- (eval $ac_link) 2>&5 161141- ac_status=$? 161142- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161143- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then 161144+ if { (eval echo configure:111256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then 161145 (./conftest; exit; ) >&5 2>/dev/null 161146 lt_status=$? 161147 case x$lt_status in 161148@@ -143170,10 +111267,10 @@ 161149 fi 161150 rm -fr conftest* 161151 161152- 161153+ 161154 fi 161155-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 161156-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 161157+ 161158+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6 161159 fi 161160 161161 CPPFLAGS="$save_CPPFLAGS" 161162@@ -143195,13 +111292,12 @@ 161163 161164 161165 # Report which library types will actually be built 161166-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 161167-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 161168-echo "$as_me:$LINENO: result: $can_build_shared" >&5 161169-echo "${ECHO_T}$can_build_shared" >&6 161170+echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 161171+echo "configure:111297: checking if libtool supports shared libraries" >&5 161172+echo "$ac_t""$can_build_shared" 1>&6 161173 161174-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 161175-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 161176+echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 161177+echo "configure:111301: checking whether to build shared libraries" >&5 161178 test "$can_build_shared" = "no" && enable_shared=no 161179 161180 # On AIX, shared libraries and static libraries use the same namespace, and 161181@@ -143221,15 +111317,13 @@ 161182 fi 161183 ;; 161184 esac 161185-echo "$as_me:$LINENO: result: $enable_shared" >&5 161186-echo "${ECHO_T}$enable_shared" >&6 161187+echo "$ac_t""$enable_shared" 1>&6 161188 161189-echo "$as_me:$LINENO: checking whether to build static libraries" >&5 161190-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 161191+echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 161192+echo "configure:111324: checking whether to build static libraries" >&5 161193 # Make sure either enable_shared or enable_static is yes. 161194 test "$enable_shared" = yes || enable_static=yes 161195-echo "$as_me:$LINENO: result: $enable_static" >&5 161196-echo "${ECHO_T}$enable_static" >&6 161197+echo "$ac_t""$enable_static" 1>&6 161198 161199 # The else clause should only fire when bootstrapping the 161200 # libtool distribution, otherwise you forgot to ship ltmain.sh 161201@@ -143322,10 +111416,8 @@ 161202 cfgfile="${ofile}T" 161203 trap "$rm \"$cfgfile\"; exit 1" 1 2 15 161204 $rm -f "$cfgfile" 161205- echo "$as_me:$LINENO: result: 161206-creating $ofile" >&5 161207-echo "${ECHO_T} 161208-creating $ofile" >&6 161209+ echo "$ac_t"" 161210+creating $ofile" 1>&6 161211 161212 cat <<__EOF__ >> "$cfgfile" 161213 #! $SHELL 161214@@ -143721,34 +111813,32 @@ 161215 161216 161217 ac_ext=c 161218+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 161219 ac_cpp='$CPP $CPPFLAGS' 161220-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 161221-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 161222-ac_compiler_gnu=$ac_cv_c_compiler_gnu 161223+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 161224+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 161225+cross_compiling=$ac_cv_prog_cc_cross 161226 161227 CC="$lt_save_CC" 161228 161229- 161230 # Check whether --with-tags or --without-tags was given. 161231 if test "${with_tags+set}" = set; then 161232 withval="$with_tags" 161233 tagnames="$withval" 161234-fi; 161235+fi 161236+ 161237 161238 if test -f "$ltmain" && test -n "$tagnames"; then 161239 if test ! -f "${ofile}"; then 161240- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 161241-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} 161242+ echo "configure: warning: output file \`$ofile' does not exist" 1>&2 161243 fi 161244 161245 if test -z "$LTCC"; then 161246 eval "`$SHELL ${ofile} --config | grep '^LTCC='`" 161247 if test -z "$LTCC"; then 161248- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 161249-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} 161250+ echo "configure: warning: output file \`$ofile' does not look like a libtool script" 1>&2 161251 else 161252- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 161253-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} 161254+ echo "configure: warning: using \`LTCC=$LTCC', extracted from \`$ofile'" 1>&2 161255 fi 161256 fi 161257 if test -z "$LTCFLAGS"; then 161258@@ -143765,17 +111855,13 @@ 161259 # Check whether tagname contains only valid characters 161260 case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in 161261 "") ;; 161262- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 161263-echo "$as_me: error: invalid tag name: $tagname" >&2;} 161264- { (exit 1); exit 1; }; } 161265+ *) { echo "configure: error: invalid tag name: $tagname" 1>&2; exit 1; } 161266 ;; 161267 esac 161268 161269 if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null 161270 then 161271- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 161272-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} 161273- { (exit 1); exit 1; }; } 161274+ { echo "configure: error: tag name \"$tagname\" already exists" 1>&2; exit 1; } 161275 fi 161276 161277 # Update the list of available tags. 161278@@ -143787,13 +111873,13 @@ 161279 if test -n "$CXX" && ( test "X$CXX" != "Xno" && 161280 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 161281 (test "X$CXX" != "Xg++"))) ; then 161282- 161283- 161284-ac_ext=cc 161285+ 161286+ac_ext=C 161287+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 161288 ac_cpp='$CXXCPP $CPPFLAGS' 161289-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 161290-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 161291-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 161292+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 161293+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 161294+cross_compiling=$ac_cv_prog_cxx_cross 161295 161296 161297 161298@@ -143908,19 +111994,19 @@ 161299 if test "$GXX" = yes; then 161300 # Set up default GNU C++ configuration 161301 161302- 161303-# Check whether --with-gnu-ld or --without-gnu-ld was given. 161304+ # Check whether --with-gnu-ld or --without-gnu-ld was given. 161305 if test "${with_gnu_ld+set}" = set; then 161306 withval="$with_gnu_ld" 161307 test "$withval" = no || with_gnu_ld=yes 161308 else 161309 with_gnu_ld=no 161310-fi; 161311+fi 161312+ 161313 ac_prog=ld 161314 if test "$GCC" = yes; then 161315 # Check if gcc -print-prog-name=ld gives a path. 161316- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 161317-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 161318+ echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 161319+echo "configure:112010: checking for ld used by $CC" >&5 161320 case $host in 161321 *-*-mingw*) 161322 # gcc leaves a trailing carriage return which upsets mingw 161323@@ -143949,14 +112035,14 @@ 161324 ;; 161325 esac 161326 elif test "$with_gnu_ld" = yes; then 161327- echo "$as_me:$LINENO: checking for GNU ld" >&5 161328-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 161329+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 161330+echo "configure:112040: checking for GNU ld" >&5 161331 else 161332- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 161333-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 161334+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 161335+echo "configure:112043: checking for non-GNU ld" >&5 161336 fi 161337-if test "${lt_cv_path_LD+set}" = set; then 161338- echo $ECHO_N "(cached) $ECHO_C" >&6 161339+if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then 161340+ echo $ac_n "(cached) $ac_c" 1>&6 161341 else 161342 if test -z "$LD"; then 161343 lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR 161344@@ -143986,19 +112072,15 @@ 161345 161346 LD="$lt_cv_path_LD" 161347 if test -n "$LD"; then 161348- echo "$as_me:$LINENO: result: $LD" >&5 161349-echo "${ECHO_T}$LD" >&6 161350+ echo "$ac_t""$LD" 1>&6 161351 else 161352- echo "$as_me:$LINENO: result: no" >&5 161353-echo "${ECHO_T}no" >&6 161354+ echo "$ac_t""no" 1>&6 161355 fi 161356-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 161357-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} 161358- { (exit 1); exit 1; }; } 161359-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 161360-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 161361-if test "${lt_cv_prog_gnu_ld+set}" = set; then 161362- echo $ECHO_N "(cached) $ECHO_C" >&6 161363+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } 161364+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 161365+echo "configure:112082: checking if the linker ($LD) is GNU ld" >&5 161366+if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then 161367+ echo $ac_n "(cached) $ac_c" 1>&6 161368 else 161369 # I'd rather use --version here, but apparently some GNU lds only accept -v. 161370 case `$LD -v 2>&1 </dev/null` in 161371@@ -144010,8 +112092,8 @@ 161372 ;; 161373 esac 161374 fi 161375-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 161376-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 161377+ 161378+echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6 161379 with_gnu_ld=$lt_cv_prog_gnu_ld 161380 161381 161382@@ -144061,8 +112143,8 @@ 161383 fi 161384 161385 # PORTME: fill in a description of your system's C++ link characteristics 161386-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 161387-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 161388+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 161389+echo "configure:112148: checking whether the $compiler linker ($LD) supports shared libraries" >&5 161390 ld_shlibs_CXX=yes 161391 case $host_os in 161392 aix3*) 161393@@ -144158,19 +112240,15 @@ 161394 # -berok will link without error, but may produce a broken library. 161395 allow_undefined_flag_CXX='-berok' 161396 # Determine the default libpath from the value encoded in an empty executable. 161397- 161398+ 161399 cat > conftest.$ac_ext <<EOF 161400-#line 144160 "configure" 161401+#line 112246 "configure" 161402 #include "confdefs.h" 161403 int main() { 161404 ; return 0; } 161405 EOF 161406-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 161407- (eval $ac_link) 2>&5 161408- ac_status=$? 161409- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161410- (exit $ac_status); } && test -s conftest${ac_exeext}; then 161411- 161412+if { (eval echo configure:112251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 161413+ 161414 lt_aix_libpath_sed=' 161415 /Import File Strings/,/^$/ { 161416 /^0/ { 161417@@ -144201,19 +112279,15 @@ 161418 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" 161419 else 161420 # Determine the default libpath from the value encoded in an empty executable. 161421- 161422+ 161423 cat > conftest.$ac_ext <<EOF 161424-#line 144203 "configure" 161425+#line 112285 "configure" 161426 #include "confdefs.h" 161427 int main() { 161428 ; return 0; } 161429 EOF 161430-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 161431- (eval $ac_link) 2>&5 161432- ac_status=$? 161433- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161434- (exit $ac_status); } && test -s conftest${ac_exeext}; then 161435- 161436+if { (eval echo configure:112290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 161437+ 161438 lt_aix_libpath_sed=' 161439 /Import File Strings/,/^$/ { 161440 /^0/ { 161441@@ -144959,8 +113033,7 @@ 161442 ld_shlibs_CXX=no 161443 ;; 161444 esac 161445-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 161446-echo "${ECHO_T}$ld_shlibs_CXX" >&6 161447+echo "$ac_t""$ld_shlibs_CXX" 1>&6 161448 test "$ld_shlibs_CXX" = no && can_build_shared=no 161449 161450 GCC_CXX="$GXX" 161451@@ -144980,11 +113053,7 @@ 161452 }; 161453 EOF 161454 161455-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 161456- (eval $ac_compile) 2>&5 161457- ac_status=$? 161458- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161459- (exit $ac_status); }; then 161460+if { (eval echo configure:113057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 161461 # Parse the compiler output and extract the necessary 161462 # objects, libraries and library flags. 161463 161464@@ -145139,9 +113208,9 @@ 161465 lt_prog_compiler_pic_CXX= 161466 lt_prog_compiler_static_CXX= 161467 161468-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 161469-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 161470- 161471+echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 161472+echo "configure:113213: checking for $compiler option to produce PIC" >&5 161473+ 161474 # C++ specific cases for pic, static, wl, etc. 161475 if test "$GXX" = yes; then 161476 lt_prog_compiler_wl_CXX='-Wl,' 161477@@ -145429,18 +113498,17 @@ 161478 esac 161479 fi 161480 161481-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 161482-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 161483+echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6 161484 161485 # 161486 # Check to make sure the PIC flag actually works. 161487 # 161488 if test -n "$lt_prog_compiler_pic_CXX"; then 161489- 161490-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 161491-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 161492-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then 161493- echo $ECHO_N "(cached) $ECHO_C" >&6 161494+ 161495+echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 161496+echo "configure:113510: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 161497+if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then 161498+ echo $ac_n "(cached) $ac_c" 1>&6 161499 else 161500 lt_cv_prog_compiler_pic_works_CXX=no 161501 ac_outfile=conftest.$ac_objext 161502@@ -145455,11 +113523,11 @@ 161503 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 161504 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 161505 -e 's:$: $lt_compiler_flag:'` 161506- (eval echo "\"configure:145455: $lt_compile\"" >&5) 161507+ (eval echo "\"configure:113527: $lt_compile\"" >&5) 161508 (eval "$lt_compile" 2>conftest.err) 161509 ac_status=$? 161510 cat conftest.err >&5 161511- echo "configure:145459: \$? = $ac_status" >&5 161512+ echo "configure:113531: \$? = $ac_status" >&5 161513 if (exit $ac_status) && test -s "$ac_outfile"; then 161514 # The compiler can only warn and ignore the option if not recognized 161515 # So say no if there are warnings other than the usual output. 161516@@ -145472,8 +113540,8 @@ 161517 $rm conftest* 161518 161519 fi 161520-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 161521-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6 161522+ 161523+echo "$ac_t""$lt_cv_prog_compiler_pic_works_CXX" 1>&6 161524 161525 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then 161526 case $lt_prog_compiler_pic_CXX in 161527@@ -145500,10 +113568,10 @@ 161528 # Check to make sure the static flag actually works. 161529 # 161530 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" 161531-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 161532-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 161533-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then 161534- echo $ECHO_N "(cached) $ECHO_C" >&6 161535+echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 161536+echo "configure:113573: checking if $compiler static flag $lt_tmp_static_flag works" >&5 161537+if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then 161538+ echo $ac_n "(cached) $ac_c" 1>&6 161539 else 161540 lt_cv_prog_compiler_static_works_CXX=no 161541 save_LDFLAGS="$LDFLAGS" 161542@@ -145528,8 +113596,8 @@ 161543 LDFLAGS="$save_LDFLAGS" 161544 161545 fi 161546-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 161547-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6 161548+ 161549+echo "$ac_t""$lt_cv_prog_compiler_static_works_CXX" 1>&6 161550 161551 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then 161552 : 161553@@ -145538,10 +113606,10 @@ 161554 fi 161555 161556 161557-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 161558-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 161559-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then 161560- echo $ECHO_N "(cached) $ECHO_C" >&6 161561+echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 161562+echo "configure:113611: checking if $compiler supports -c -o file.$ac_objext" >&5 161563+if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then 161564+ echo $ac_n "(cached) $ac_c" 1>&6 161565 else 161566 lt_cv_prog_compiler_c_o_CXX=no 161567 $rm -r conftest 2>/dev/null 161568@@ -145559,11 +113627,11 @@ 161569 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 161570 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 161571 -e 's:$: $lt_compiler_flag:'` 161572- (eval echo "\"configure:145559: $lt_compile\"" >&5) 161573+ (eval echo "\"configure:113631: $lt_compile\"" >&5) 161574 (eval "$lt_compile" 2>out/conftest.err) 161575 ac_status=$? 161576 cat out/conftest.err >&5 161577- echo "configure:145563: \$? = $ac_status" >&5 161578+ echo "configure:113635: \$? = $ac_status" >&5 161579 if (exit $ac_status) && test -s out/conftest2.$ac_objext 161580 then 161581 # The compiler can only warn and ignore the option if not recognized 161582@@ -145585,34 +113653,32 @@ 161583 $rm conftest* 161584 161585 fi 161586-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 161587-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 161588+ 161589+echo "$ac_t""$lt_cv_prog_compiler_c_o_CXX" 1>&6 161590 161591 161592 hard_links="nottested" 161593 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then 161594 # do not overwrite the value of need_locks provided by the user 161595- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 161596-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 161597+ echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 161598+echo "configure:113665: checking if we can lock with hard links" >&5 161599 hard_links=yes 161600 $rm conftest* 161601 ln conftest.a conftest.b 2>/dev/null && hard_links=no 161602 touch conftest.a 161603 ln conftest.a conftest.b 2>&5 || hard_links=no 161604 ln conftest.a conftest.b 2>/dev/null && hard_links=no 161605- echo "$as_me:$LINENO: result: $hard_links" >&5 161606-echo "${ECHO_T}$hard_links" >&6 161607+ echo "$ac_t""$hard_links" 1>&6 161608 if test "$hard_links" = no; then 161609- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 161610-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} 161611+ echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2 161612 need_locks=warn 161613 fi 161614 else 161615 need_locks=no 161616 fi 161617 161618-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 161619-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 161620+echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 161621+echo "configure:113682: checking whether the $compiler linker ($LD) supports shared libraries" >&5 161622 161623 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 161624 case $host_os in 161625@@ -145637,8 +113703,7 @@ 161626 esac 161627 exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 161628 161629-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 161630-echo "${ECHO_T}$ld_shlibs_CXX" >&6 161631+echo "$ac_t""$ld_shlibs_CXX" 1>&6 161632 test "$ld_shlibs_CXX" = no && can_build_shared=no 161633 161634 # 161635@@ -145658,16 +113723,12 @@ 161636 # Test whether the compiler implicitly links with -lc since on some 161637 # systems, -lgcc has to come before -lc. If gcc already passes -lc 161638 # to ld, don't add -lc before -lgcc. 161639- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 161640-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 161641+ echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 161642+echo "configure:113728: checking whether -lc should be explicitly linked in" >&5 161643 $rm conftest* 161644 echo "$lt_simple_compile_test_code" > conftest.$ac_ext 161645 161646- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 161647- (eval $ac_compile) 2>&5 161648- ac_status=$? 161649- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161650- (exit $ac_status); } 2>conftest.err; then 161651+ if { (eval echo configure:113732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then 161652 soname=conftest 161653 lib=conftest 161654 libobjs=conftest.$ac_objext 161655@@ -145681,11 +113742,7 @@ 161656 libname=conftest 161657 lt_save_allow_undefined_flag=$allow_undefined_flag_CXX 161658 allow_undefined_flag_CXX= 161659- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 161660- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 161661- ac_status=$? 161662- echo "$as_me:$LINENO: \$? = $ac_status" >&5 161663- (exit $ac_status); } 161664+ if { (eval echo configure:113746: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } 161665 then 161666 archive_cmds_need_lc_CXX=no 161667 else 161668@@ -145696,16 +113753,15 @@ 161669 cat conftest.err 1>&5 161670 fi 161671 $rm conftest* 161672- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 161673-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 161674+ echo "$ac_t""$archive_cmds_need_lc_CXX" 1>&6 161675 ;; 161676 esac 161677 fi 161678 ;; 161679 esac 161680 161681-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 161682-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 161683+echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 161684+echo "configure:113765: checking dynamic linker characteristics" >&5 161685 library_names_spec= 161686 libname_spec='lib$name' 161687 soname_spec= 161688@@ -145876,7 +113932,7 @@ 161689 shlibpath_overrides_runpath=yes 161690 shlibpath_var=DYLD_LIBRARY_PATH 161691 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' 161692- 161693+ 161694 sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' 161695 ;; 161696 161697@@ -146254,19 +114310,18 @@ 161698 dynamic_linker=no 161699 ;; 161700 esac 161701-echo "$as_me:$LINENO: result: $dynamic_linker" >&5 161702-echo "${ECHO_T}$dynamic_linker" >&6 161703+echo "$ac_t""$dynamic_linker" 1>&6 161704 test "$dynamic_linker" = no && can_build_shared=no 161705 161706-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 161707- echo $ECHO_N "(cached) $ECHO_C" >&6 161708+if eval "test \"`echo '$''{'lt_cv_sys_lib_search_path_spec'+set}'`\" = set"; then 161709+ echo $ac_n "(cached) $ac_c" 1>&6 161710 else 161711 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 161712 fi 161713 161714 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 161715-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 161716- echo $ECHO_N "(cached) $ECHO_C" >&6 161717+if eval "test \"`echo '$''{'lt_cv_sys_lib_dlsearch_path_spec'+set}'`\" = set"; then 161718+ echo $ac_n "(cached) $ac_c" 1>&6 161719 else 161720 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 161721 fi 161722@@ -146278,8 +114333,8 @@ 161723 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 161724 fi 161725 161726-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 161727-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 161728+echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 161729+echo "configure:114338: checking how to hardcode library paths into programs" >&5 161730 hardcode_action_CXX= 161731 if test -n "$hardcode_libdir_flag_spec_CXX" || \ 161732 test -n "$runpath_var_CXX" || \ 161733@@ -146303,8 +114358,7 @@ 161734 # directories. 161735 hardcode_action_CXX=unsupported 161736 fi 161737-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 161738-echo "${ECHO_T}$hardcode_action_CXX" >&6 161739+echo "$ac_t""$hardcode_action_CXX" 1>&6 161740 161741 if test "$hardcode_action_CXX" = relink; then 161742 # Fast installation is not supported 161743@@ -146731,10 +114785,11 @@ 161744 161745 161746 ac_ext=c 161747+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. 161748 ac_cpp='$CPP $CPPFLAGS' 161749-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 161750-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 161751-ac_compiler_gnu=$ac_cv_c_compiler_gnu 161752+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' 161753+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' 161754+cross_compiling=$ac_cv_prog_cc_cross 161755 161756 CC=$lt_save_CC 161757 LDCXX=$LD 161758@@ -146753,9 +114808,7 @@ 161759 ;; 161760 161761 *) 161762- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 161763-echo "$as_me: error: Unsupported tag name: $tagname" >&2;} 161764- { (exit 1); exit 1; }; } 161765+ { echo "configure: error: Unsupported tag name: $tagname" 1>&2; exit 1; } 161766 ;; 161767 esac 161768 161769@@ -146773,9 +114826,7 @@ 161770 chmod +x "$ofile" 161771 else 161772 rm -f "${ofile}T" 161773- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 161774-echo "$as_me: error: unable to update list of available tagged configurations." >&2;} 161775- { (exit 1); exit 1; }; } 161776+ { echo "configure: error: unable to update list of available tagged configurations." 1>&2; exit 1; } 161777 fi 161778 fi 161779 161780@@ -146795,12 +114846,12 @@ 161781 161782 161783 161784- 161785+ 161786 161787 161788 161789 if test "$enable_debug" != "yes"; then 161790- 161791+ 161792 if test -z "$LIBTOOL"; then 161793 LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' 161794 else 161795@@ -146824,10 +114875,8 @@ 161796 CC=$old_CC 161797 161798 161799- echo "$as_me:$LINENO: result: " >&5 161800-echo "${ECHO_T}" >&6 161801- echo "$as_me:$LINENO: result: ${T_MD}Generating files${T_ME}" >&5 161802-echo "${ECHO_T}${T_MD}Generating files${T_ME}" >&6 161803+ echo "$ac_t""" 1>&6 161804+ echo "$ac_t""${T_MD}Generating files${T_ME}" 1>&6 161805 161806 161807 CXXFLAGS_CLEAN=$CXXFLAGS 161808@@ -146844,17 +114893,8 @@ 161809 pharcmd_install= 161810 fi; 161811 161812-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" 161813-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" 161814- 161815-case $PHP_SAPI in 161816- cli) 161817- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" 161818- ;; 161819- *) 161820- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" 161821- ;; 161822-esac 161823+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" 161824+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" 161825 161826 161827 PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets" 161828@@ -146863,34 +114903,37 @@ 161829 PHP_VAR_SUBST="$PHP_VAR_SUBST install_targets" 161830 161831 161832+ PHP_VAR_SUBST="$PHP_VAR_SUBST install_binary_targets" 161833 161834 161835- for header_file in Zend/ TSRM/ include/ main/ main/streams/; do 161836- 161837 161838+ 161839+ for header_file in Zend/ TSRM/ include/ main/ main/streams/; do 161840+ 161841+ 161842 unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` 161843- 161844+ 161845 cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" 161846 if test -n "$unique" && test "`eval $cmd`" = "" ; then 161847 eval "INSTALLHEADERS$unique=set" 161848- 161849+ 161850 INSTALL_HEADERS="$INSTALL_HEADERS $header_file" 161851- 161852+ 161853 fi 161854 161855- done 161856- 161857- 161858+ done 161859+ 161860 161861 161862 161863+ 161864 case TSRM in 161865 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 161866 /*) ac_srcdir=`echo "TSRM"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 161867 *) ac_srcdir="$abs_srcdir/TSRM/"; ac_bdir="TSRM/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 161868 esac 161869- 161870- 161871+ 161872+ 161873 161874 b_c_pre=$php_c_pre 161875 b_cxx_pre=$php_cxx_pre 161876@@ -146903,12 +114946,12 @@ 161877 161878 old_IFS=$IFS 161879 for ac_src in TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c; do 161880- 161881+ 161882 IFS=. 161883 set $ac_src 161884 ac_obj=$1 161885 IFS=$old_IFS 161886- 161887+ 161888 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 161889 161890 case $ac_src in 161891@@ -146927,14 +114970,14 @@ 161892 161893 161894 161895- 161896+ 161897 case main in 161898 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 161899 /*) ac_srcdir=`echo "main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 161900 *) ac_srcdir="$abs_srcdir/main/"; ac_bdir="main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 161901 esac 161902- 161903- 161904+ 161905+ 161906 161907 b_c_pre=$php_c_pre 161908 b_cxx_pre=$php_cxx_pre 161909@@ -146952,12 +114995,12 @@ 161910 strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ 161911 network.c php_open_temporary_file.c php_logos.c \ 161912 output.c getopt.c ; do 161913- 161914+ 161915 IFS=. 161916 set $ac_src 161917 ac_obj=$1 161918 IFS=$old_IFS 161919- 161920+ 161921 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 161922 161923 case $ac_src in 161924@@ -146976,14 +115019,14 @@ 161925 161926 161927 161928- 161929+ 161930 case main/streams in 161931 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 161932 /*) ac_srcdir=`echo "main/streams"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 161933 *) ac_srcdir="$abs_srcdir/main/streams/"; ac_bdir="main/streams/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 161934 esac 161935- 161936- 161937+ 161938+ 161939 161940 b_c_pre=$php_c_pre 161941 b_cxx_pre=$php_cxx_pre 161942@@ -146998,12 +115041,12 @@ 161943 for ac_src in streams.c cast.c memory.c filter.c \ 161944 plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \ 161945 glob_wrapper.c; do 161946- 161947+ 161948 IFS=. 161949 set $ac_src 161950 ac_obj=$1 161951 IFS=$old_IFS 161952- 161953+ 161954 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 161955 161956 case $ac_src in 161957@@ -147022,14 +115065,14 @@ 161958 161959 161960 161961- 161962+ 161963 case /main in 161964 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 161965 /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 161966 *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 161967 esac 161968- 161969- 161970+ 161971+ 161972 161973 b_c_pre=$php_c_pre 161974 b_cxx_pre=$php_cxx_pre 161975@@ -147042,12 +115085,12 @@ 161976 161977 old_IFS=$IFS 161978 for ac_src in internal_functions.c; do 161979- 161980+ 161981 IFS=. 161982 set $ac_src 161983 ac_obj=$1 161984 IFS=$old_IFS 161985- 161986+ 161987 PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo" 161988 161989 case $ac_src in 161990@@ -147067,27 +115110,26 @@ 161991 161992 case $host_alias in 161993 *netware*) 161994- 161995- 161996+ 161997+ 161998 BUILD_DIR="$BUILD_DIR win32" 161999+ 162000 162001- 162002- 162003- 162004+ 162005+ 162006 BUILD_DIR="$BUILD_DIR netware" 162007- 162008+ 162009 162010 ;; 162011 *) 162012- 162013- 162014+ 162015 case /main in 162016 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 162017 /*) ac_srcdir=`echo "/main"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 162018 *) ac_srcdir="$abs_srcdir//main/"; ac_bdir="/main/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 162019 esac 162020- 162021- 162022+ 162023+ 162024 162025 b_c_pre=$php_c_pre 162026 b_cxx_pre=$php_cxx_pre 162027@@ -147100,13 +115142,13 @@ 162028 162029 old_IFS=$IFS 162030 for ac_src in internal_functions_cli.c; do 162031- 162032+ 162033 IFS=. 162034 set $ac_src 162035 ac_obj=$1 162036 IFS=$old_IFS 162037- 162038- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" 162039+ 162040+ PHP_BINARY_OBJS="$PHP_BINARY_OBJS $ac_bdir$ac_obj.lo" 162041 162042 case $ac_src in 162043 *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; 162044@@ -147121,19 +115163,18 @@ 162045 EOF 162046 done 162047 162048- 162049 ;; 162050 esac 162051 162052 162053- 162054+ 162055 case Zend in 162056 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 162057 /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 162058 *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 162059 esac 162060- 162061- 162062+ 162063+ 162064 162065 b_c_pre=$php_c_pre 162066 b_cxx_pre=$php_cxx_pre 162067@@ -147156,12 +115197,12 @@ 162068 zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ 162069 zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ 162070 zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ; do 162071- 162072+ 162073 IFS=. 162074 set $ac_src 162075 ac_obj=$1 162076 IFS=$old_IFS 162077- 162078+ 162079 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 162080 162081 case $ac_src in 162082@@ -147180,15 +115221,15 @@ 162083 162084 162085 if test -r "$abs_srcdir/Zend/zend_objects.c"; then 162086- 162087- 162088+ 162089+ 162090 case Zend in 162091 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; 162092 /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 162093 *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 162094 esac 162095- 162096- 162097+ 162098+ 162099 162100 b_c_pre=$php_c_pre 162101 b_cxx_pre=$php_cxx_pre 162102@@ -147201,12 +115242,12 @@ 162103 162104 old_IFS=$IFS 162105 for ac_src in zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c; do 162106- 162107+ 162108 IFS=. 162109 set $ac_src 162110 ac_obj=$1 162111 IFS=$old_IFS 162112- 162113+ 162114 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 162115 162116 case $ac_src in 162117@@ -147237,8 +115278,8 @@ 162118 /*) ac_srcdir=`echo "Zend"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; 162119 *) ac_srcdir="$abs_srcdir/Zend/"; ac_bdir="Zend/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; 162120 esac 162121- 162122- 162123+ 162124+ 162125 162126 b_c_pre=$php_c_pre 162127 b_cxx_pre=$php_cxx_pre 162128@@ -147251,12 +115292,12 @@ 162129 162130 old_IFS=$IFS 162131 for ac_src in zend_execute.c; do 162132- 162133+ 162134 IFS=. 162135 set $ac_src 162136 ac_obj=$1 162137 IFS=$old_IFS 162138- 162139+ 162140 PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" 162141 162142 case $ac_src in 162143@@ -147274,24 +115315,19 @@ 162144 162145 162146 162147- 162148+ 162149 BUILD_DIR="$BUILD_DIR main main/streams" 162150+ 162151 162152 162153- 162154- 162155- BUILD_DIR="$BUILD_DIR sapi/$PHP_SAPI sapi/cli" 162156- 162157- 162158- 162159- 162160+ 162161 BUILD_DIR="$BUILD_DIR TSRM" 162162+ 162163 162164 162165- 162166- 162167+ 162168 BUILD_DIR="$BUILD_DIR Zend" 162169- 162170+ 162171 162172 162173 162174@@ -147330,10 +115366,9 @@ 162175 cat $abs_srcdir/Makefile.global Makefile.fragments Makefile.objects >> Makefile 162176 162177 162178- 162179-cat >>confdefs.h <<\_ACEOF 162180+cat >> confdefs.h <<\EOF 162181 #define HAVE_BUILD_DEFS_H 1 162182-_ACEOF 162183+EOF 162184 162185 162186 $php_shtool mkdir -p pear/scripts 162187@@ -147384,7 +115419,7 @@ 162188 if test "$PHP_MAJOR_VERSION" -lt "6"; then 162189 case $arg_name in 162190 enable-zend-multibyte) continue;; 162191- esac 162192+ esac 162193 fi 162194 162195 is_arg_set=php_`echo $arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` 162196@@ -147397,531 +115432,445 @@ 162197 done 162198 162199 162200- ac_config_files="$ac_config_files $ALL_OUTPUT_FILES" 162201- ac_config_commands="$ac_config_commands default" 162202-cat >confcache <<\_ACEOF 162203+trap '' 1 2 15 162204+cat > confcache <<\EOF 162205 # This file is a shell script that caches the results of configure 162206 # tests run on this system so they can be shared between configure 162207-# scripts and configure runs, see configure's option --config-cache. 162208-# It is not useful on other systems. If it contains results you don't 162209-# want to keep, you may remove or edit it. 162210+# scripts and configure runs. It is not useful on other systems. 162211+# If it contains results you don't want to keep, you may remove or edit it. 162212 # 162213-# config.status only pays attention to the cache file if you give it 162214-# the --recheck option to rerun configure. 162215+# By default, configure uses ./config.cache as the cache file, 162216+# creating it if it does not exist already. You can give configure 162217+# the --cache-file=FILE option to use a different cache file; that is 162218+# what configure does when it calls configure scripts in 162219+# subdirectories, so they share the cache. 162220+# Giving --cache-file=/dev/null disables caching, for debugging configure. 162221+# config.status only pays attention to the cache file if you give it the 162222+# --recheck option to rerun configure. 162223 # 162224-# `ac_cv_env_foo' variables (set or unset) will be overridden when 162225-# loading this file, other *unset* `ac_cv_foo' will be assigned the 162226-# following values. 162227- 162228-_ACEOF 162229- 162230+EOF 162231 # The following way of writing the cache mishandles newlines in values, 162232 # but we know of no workaround that is simple, portable, and efficient. 162233 # So, don't put newlines in cache variables' values. 162234 # Ultrix sh set writes to stderr and can't be redirected directly, 162235 # and sets the high bit in the cache file unless we assign to the vars. 162236-{ 162237- (set) 2>&1 | 162238- case `(ac_space=' '; set | grep ac_space) 2>&1` in 162239- *ac_space=\ *) 162240- # `set' does not quote correctly, so add quotes (double-quote 162241- # substitution turns \\\\ into \\, and sed turns \\ into \). 162242- sed -n \ 162243- "s/'/'\\\\''/g; 162244- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" 162245- ;; 162246- *) 162247- # `set' quotes correctly as required by POSIX, so do not add quotes. 162248- sed -n \ 162249- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" 162250- ;; 162251- esac; 162252-} | 162253- sed ' 162254- t clear 162255- : clear 162256- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ 162257- t end 162258- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ 162259- : end' >>confcache 162260-if diff $cache_file confcache >/dev/null 2>&1; then :; else 162261+(set) 2>&1 | 162262+ case `(ac_space=' '; set | grep ac_space) 2>&1` in 162263+ *ac_space=\ *) 162264+ # `set' does not quote correctly, so add quotes (double-quote substitution 162265+ # turns \\\\ into \\, and sed turns \\ into \). 162266+ sed -n \ 162267+ -e "s/'/'\\\\''/g" \ 162268+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" 162269+ ;; 162270+ *) 162271+ # `set' quotes correctly as required by POSIX, so do not add quotes. 162272+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' 162273+ ;; 162274+ esac >> confcache 162275+if cmp -s $cache_file confcache; then 162276+ : 162277+else 162278 if test -w $cache_file; then 162279- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" 162280- cat confcache >$cache_file 162281+ echo "updating cache $cache_file" 162282+ cat confcache > $cache_file 162283 else 162284 echo "not updating unwritable cache $cache_file" 162285 fi 162286 fi 162287 rm -f confcache 162288 162289+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 162290+ 162291 test "x$prefix" = xNONE && prefix=$ac_default_prefix 162292 # Let make expand exec_prefix. 162293 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' 162294 162295-# VPATH may cause trouble with some makes, so we remove $(srcdir), 162296-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 162297-# trailing colons and then remove the whole line if VPATH becomes empty 162298-# (actually we leave an empty line to preserve line numbers). 162299+# Any assignment to VPATH causes Sun make to only execute 162300+# the first set of double-colon rules, so remove it if not needed. 162301+# If there is a colon in the path, we need to keep it. 162302 if test "x$srcdir" = x.; then 162303- ac_vpsub='/^[ ]*VPATH[ ]*=/{ 162304-s/:*\$(srcdir):*/:/; 162305-s/:*\${srcdir}:*/:/; 162306-s/:*@srcdir@:*/:/; 162307-s/^\([^=]*=[ ]*\):*/\1/; 162308-s/:*$//; 162309-s/^[^=]*=[ ]*$//; 162310-}' 162311+ ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' 162312 fi 162313 162314-DEFS=-DHAVE_CONFIG_H 162315- 162316-ac_libobjs= 162317-ac_ltlibobjs= 162318-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 162319- # 1. Remove the extension, and $U if already installed. 162320- ac_i=`echo "$ac_i" | 162321- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` 162322- # 2. Add them. 162323- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" 162324- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' 162325-done 162326-LIBOBJS=$ac_libobjs 162327- 162328-LTLIBOBJS=$ac_ltlibobjs 162329- 162330+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 162331 162332+DEFS=-DHAVE_CONFIG_H 162333 162334+# Without the "./", some shells look in PATH for config.status. 162335 : ${CONFIG_STATUS=./config.status} 162336-ac_clean_files_save=$ac_clean_files 162337-ac_clean_files="$ac_clean_files $CONFIG_STATUS" 162338-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 162339-echo "$as_me: creating $CONFIG_STATUS" >&6;} 162340-cat >$CONFIG_STATUS <<_ACEOF 162341-#! $SHELL 162342-# Generated by $as_me. 162343+ 162344+echo creating $CONFIG_STATUS 162345+rm -f $CONFIG_STATUS 162346+cat > $CONFIG_STATUS <<EOF 162347+#! /bin/sh 162348+# Generated automatically by configure. 162349 # Run this file to recreate the current configuration. 162350+# This directory was configured as follows, 162351+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: 162352+# 162353+# $0 $ac_configure_args 162354+# 162355 # Compiler output produced by configure, useful for debugging 162356-# configure, is in config.log if it exists. 162357- 162358-debug=false 162359-ac_cs_recheck=false 162360-ac_cs_silent=false 162361-SHELL=\${CONFIG_SHELL-$SHELL} 162362-_ACEOF 162363- 162364-cat >>$CONFIG_STATUS <<\_ACEOF 162365-## --------------------- ## 162366-## M4sh Initialization. ## 162367-## --------------------- ## 162368- 162369-# Be Bourne compatible 162370-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then 162371- emulate sh 162372- NULLCMD=: 162373- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which 162374- # is contrary to our usage. Disable this feature. 162375- alias -g '${1+"$@"}'='"$@"' 162376-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then 162377- set -o posix 162378-fi 162379-DUALCASE=1; export DUALCASE # for MKS sh 162380- 162381-# Support unset when possible. 162382-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then 162383- as_unset=unset 162384-else 162385- as_unset=false 162386-fi 162387- 162388+# configure, is in ./config.log if it exists. 162389 162390-# Work around bugs in pre-3.0 UWIN ksh. 162391-$as_unset ENV MAIL MAILPATH 162392-PS1='$ ' 162393-PS2='> ' 162394-PS4='+ ' 162395- 162396-# NLS nuisances. 162397-for as_var in \ 162398- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ 162399- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ 162400- LC_TELEPHONE LC_TIME 162401+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" 162402+for ac_option 162403 do 162404- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then 162405- eval $as_var=C; export $as_var 162406- else 162407- $as_unset $as_var 162408- fi 162409+ case "\$ac_option" in 162410+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 162411+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 162412+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; 162413+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v) 162414+ echo "$CONFIG_STATUS generated by autoconf version 2.13" 162415+ exit 0 ;; 162416+ -help | --help | --hel | --he | --h) 162417+ echo "\$ac_cs_usage"; exit 0 ;; 162418+ *) echo "\$ac_cs_usage"; exit 1 ;; 162419+ esac 162420 done 162421 162422-# Required to use basename. 162423-if expr a : '\(a\)' >/dev/null 2>&1; then 162424- as_expr=expr 162425-else 162426- as_expr=false 162427-fi 162428- 162429-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then 162430- as_basename=basename 162431-else 162432- as_basename=false 162433-fi 162434+ac_given_srcdir=$srcdir 162435 162436+trap 'rm -fr `echo "$ALL_OUTPUT_FILES main/php_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 162437+EOF 162438+cat >> $CONFIG_STATUS <<EOF 162439 162440-# Name of the executable. 162441-as_me=`$as_basename "$0" || 162442-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ 162443- X"$0" : 'X\(//\)$' \| \ 162444- X"$0" : 'X\(/\)$' \| \ 162445- . : '\(.\)' 2>/dev/null || 162446-echo X/"$0" | 162447- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } 162448- /^X\/\(\/\/\)$/{ s//\1/; q; } 162449- /^X\/\(\/\).*/{ s//\1/; q; } 162450- s/.*/./; q'` 162451+# Protect against being on the right side of a sed subst in config.status. 162452+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; 162453+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF 162454+$ac_vpsub 162455+$extrasub 162456+s%@SHELL@%$SHELL%g 162457+s%@CFLAGS@%$CFLAGS%g 162458+s%@CPPFLAGS@%$CPPFLAGS%g 162459+s%@CXXFLAGS@%$CXXFLAGS%g 162460+s%@FFLAGS@%$FFLAGS%g 162461+s%@DEFS@%$DEFS%g 162462+s%@LDFLAGS@%$LDFLAGS%g 162463+s%@LIBS@%$LIBS%g 162464+s%@exec_prefix@%$exec_prefix%g 162465+s%@prefix@%$prefix%g 162466+s%@program_transform_name@%$program_transform_name%g 162467+s%@bindir@%$bindir%g 162468+s%@sbindir@%$sbindir%g 162469+s%@libexecdir@%$libexecdir%g 162470+s%@datadir@%$datadir%g 162471+s%@sysconfdir@%$sysconfdir%g 162472+s%@sharedstatedir@%$sharedstatedir%g 162473+s%@localstatedir@%$localstatedir%g 162474+s%@libdir@%$libdir%g 162475+s%@includedir@%$includedir%g 162476+s%@oldincludedir@%$oldincludedir%g 162477+s%@infodir@%$infodir%g 162478+s%@mandir@%$mandir%g 162479+s%@EGREP@%$EGREP%g 162480+s%@SED@%$SED%g 162481+s%@CONFIGURE_COMMAND@%$CONFIGURE_COMMAND%g 162482+s%@CONFIGURE_OPTIONS@%$CONFIGURE_OPTIONS%g 162483+s%@host@%$host%g 162484+s%@host_alias@%$host_alias%g 162485+s%@host_cpu@%$host_cpu%g 162486+s%@host_vendor@%$host_vendor%g 162487+s%@host_os@%$host_os%g 162488+s%@target@%$target%g 162489+s%@target_alias@%$target_alias%g 162490+s%@target_cpu@%$target_cpu%g 162491+s%@target_vendor@%$target_vendor%g 162492+s%@target_os@%$target_os%g 162493+s%@CC@%$CC%g 162494+s%@CPP@%$CPP%g 162495+s%@LN_S@%$LN_S%g 162496+s%@AWK@%$AWK%g 162497+s%@YACC@%$YACC%g 162498+s%@RE2C@%$RE2C%g 162499+s%@SHLIB_SUFFIX_NAME@%$SHLIB_SUFFIX_NAME%g 162500+s%@SHLIB_DL_SUFFIX_NAME@%$SHLIB_DL_SUFFIX_NAME%g 162501+s%@php_fpm_user@%$php_fpm_user%g 162502+s%@php_fpm_group@%$php_fpm_group%g 162503+s%@php_fpm_sysconfdir@%$php_fpm_sysconfdir%g 162504+s%@php_fpm_localstatedir@%$php_fpm_localstatedir%g 162505+s%@php_fpm_prefix@%$php_fpm_prefix%g 162506+s%@PROG_SENDMAIL@%$PROG_SENDMAIL%g 162507+s%@LIBOBJS@%$LIBOBJS%g 162508+s%@ALLOCA@%$ALLOCA%g 162509+s%@LTP@%$LTP%g 162510+s%@LTP_GENHTML@%$LTP_GENHTML%g 162511+s%@KRB5_CONFIG@%$KRB5_CONFIG%g 162512+s%@PKG_CONFIG@%$PKG_CONFIG%g 162513+s%@OPENSSL_INCDIR_OPT@%$OPENSSL_INCDIR_OPT%g 162514+s%@ICU_CONFIG@%$ICU_CONFIG%g 162515+s%@CXX@%$CXX%g 162516+s%@CXXCPP@%$CXXCPP%g 162517+s%@MYSQL_MODULE_TYPE@%$MYSQL_MODULE_TYPE%g 162518+s%@MYSQL_LIBS@%$MYSQL_LIBS%g 162519+s%@MYSQL_INCLUDE@%$MYSQL_INCLUDE%g 162520+s%@OCI8_SHARED_LIBADD@%$OCI8_SHARED_LIBADD%g 162521+s%@OCI8_DIR@%$OCI8_DIR%g 162522+s%@OCI8_ORACLE_VERSION@%$OCI8_ORACLE_VERSION%g 162523+s%@ODBC_INCLUDE@%$ODBC_INCLUDE%g 162524+s%@ODBC_LIBS@%$ODBC_LIBS%g 162525+s%@ODBC_LFLAGS@%$ODBC_LFLAGS%g 162526+s%@ODBC_TYPE@%$ODBC_TYPE%g 162527+s%@PDO_MYSQL_MODULE_TYPE@%$PDO_MYSQL_MODULE_TYPE%g 162528+s%@PDO_OCI_SHARED_LIBADD@%$PDO_OCI_SHARED_LIBADD%g 162529+s%@PDO_OCI_DIR@%$PDO_OCI_DIR%g 162530+s%@PDO_OCI_VERSION@%$PDO_OCI_VERSION%g 162531+s%@SNMP_CONFIG@%$SNMP_CONFIG%g 162532+s%@LEMON@%$LEMON%g 162533+s%@RANLIB@%$RANLIB%g 162534+s%@INLINE_CFLAGS@%$INLINE_CFLAGS%g 162535+s%@INCLUDE_PATH@%$INCLUDE_PATH%g 162536+s%@EXPANDED_PEAR_INSTALLDIR@%$EXPANDED_PEAR_INSTALLDIR%g 162537+s%@EXPANDED_EXTENSION_DIR@%$EXPANDED_EXTENSION_DIR%g 162538+s%@EXPANDED_BINDIR@%$EXPANDED_BINDIR%g 162539+s%@EXPANDED_SBINDIR@%$EXPANDED_SBINDIR%g 162540+s%@EXPANDED_MANDIR@%$EXPANDED_MANDIR%g 162541+s%@EXPANDED_LIBDIR@%$EXPANDED_LIBDIR%g 162542+s%@EXPANDED_DATADIR@%$EXPANDED_DATADIR%g 162543+s%@EXPANDED_SYSCONFDIR@%$EXPANDED_SYSCONFDIR%g 162544+s%@EXPANDED_LOCALSTATEDIR@%$EXPANDED_LOCALSTATEDIR%g 162545+s%@EXPANDED_PHP_CONFIG_FILE_PATH@%$EXPANDED_PHP_CONFIG_FILE_PATH%g 162546+s%@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@%$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR%g 162547+s%@PHP_INSTALLED_SAPIS@%$PHP_INSTALLED_SAPIS%g 162548+s%@abs_builddir@%$abs_builddir%g 162549+s%@abs_srcdir@%$abs_srcdir%g 162550+s%@php_abs_top_builddir@%$php_abs_top_builddir%g 162551+s%@php_abs_top_srcdir@%$php_abs_top_srcdir%g 162552+s%@program_prefix@%$program_prefix%g 162553+s%@program_suffix@%$program_suffix%g 162554+s%@DEBUG_CFLAGS@%$DEBUG_CFLAGS%g 162555+s%@EXTENSION_DIR@%$EXTENSION_DIR%g 162556+s%@EXTRA_LDFLAGS@%$EXTRA_LDFLAGS%g 162557+s%@EXTRA_LDFLAGS_PROGRAM@%$EXTRA_LDFLAGS_PROGRAM%g 162558+s%@EXTRA_LIBS@%$EXTRA_LIBS%g 162559+s%@ZEND_EXTRA_LIBS@%$ZEND_EXTRA_LIBS%g 162560+s%@INCLUDES@%$INCLUDES%g 162561+s%@EXTRA_INCLUDES@%$EXTRA_INCLUDES%g 162562+s%@INSTALL_IT@%$INSTALL_IT%g 162563+s%@NATIVE_RPATHS@%$NATIVE_RPATHS%g 162564+s%@PEAR_INSTALLDIR@%$PEAR_INSTALLDIR%g 162565+s%@PHP_LDFLAGS@%$PHP_LDFLAGS%g 162566+s%@PHP_LIBS@%$PHP_LIBS%g 162567+s%@PHP_VERSION@%$PHP_VERSION%g 162568+s%@PHP_VERSION_ID@%$PHP_VERSION_ID%g 162569+s%@build@%$build%g 162570+s%@build_alias@%$build_alias%g 162571+s%@build_cpu@%$build_cpu%g 162572+s%@build_vendor@%$build_vendor%g 162573+s%@build_os@%$build_os%g 162574+s%@OBJEXT@%$OBJEXT%g 162575+s%@EXEEXT@%$EXEEXT%g 162576+s%@ECHO@%$ECHO%g 162577+s%@AR@%$AR%g 162578+s%@STRIP@%$STRIP%g 162579+s%@DSYMUTIL@%$DSYMUTIL%g 162580+s%@NMEDIT@%$NMEDIT%g 162581+s%@LIBTOOL@%$LIBTOOL%g 162582 162583+CEOF 162584+EOF 162585 162586-# PATH needs CR, and LINENO needs CR and PATH. 162587-# Avoid depending upon Character Ranges. 162588-as_cr_letters='abcdefghijklmnopqrstuvwxyz' 162589-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' 162590-as_cr_Letters=$as_cr_letters$as_cr_LETTERS 162591-as_cr_digits='0123456789' 162592-as_cr_alnum=$as_cr_Letters$as_cr_digits 162593+cat >> $CONFIG_STATUS <<\EOF 162594 162595-# The user is always right. 162596-if test "${PATH_SEPARATOR+set}" != set; then 162597- echo "#! /bin/sh" >conf$$.sh 162598- echo "exit 0" >>conf$$.sh 162599- chmod +x conf$$.sh 162600- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then 162601- PATH_SEPARATOR=';' 162602+# Split the substitutions into bite-sized pieces for seds with 162603+# small command number limits, like on Digital OSF/1 and HP-UX. 162604+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. 162605+ac_file=1 # Number of current file. 162606+ac_beg=1 # First line for current file. 162607+ac_end=$ac_max_sed_cmds # Line after last line for current file. 162608+ac_more_lines=: 162609+ac_sed_cmds="" 162610+while $ac_more_lines; do 162611+ if test $ac_beg -gt 1; then 162612+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file 162613 else 162614- PATH_SEPARATOR=: 162615+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file 162616 fi 162617- rm -f conf$$.sh 162618-fi 162619- 162620- 162621- as_lineno_1=$LINENO 162622- as_lineno_2=$LINENO 162623- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 162624- test "x$as_lineno_1" != "x$as_lineno_2" && 162625- test "x$as_lineno_3" = "x$as_lineno_2" || { 162626- # Find who we are. Look in the path if we contain no path at all 162627- # relative or not. 162628- case $0 in 162629- *[\\/]* ) as_myself=$0 ;; 162630- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 162631-for as_dir in $PATH 162632-do 162633- IFS=$as_save_IFS 162634- test -z "$as_dir" && as_dir=. 162635- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break 162636-done 162637- 162638- ;; 162639- esac 162640- # We did not find ourselves, most probably we were run as `sh COMMAND' 162641- # in which case we are not to be found in the path. 162642- if test "x$as_myself" = x; then 162643- as_myself=$0 162644- fi 162645- if test ! -f "$as_myself"; then 162646- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 162647-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} 162648- { (exit 1); exit 1; }; } 162649- fi 162650- case $CONFIG_SHELL in 162651- '') 162652- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 162653-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH 162654-do 162655- IFS=$as_save_IFS 162656- test -z "$as_dir" && as_dir=. 162657- for as_base in sh bash ksh sh5; do 162658- case $as_dir in 162659- /*) 162660- if ("$as_dir/$as_base" -c ' 162661- as_lineno_1=$LINENO 162662- as_lineno_2=$LINENO 162663- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` 162664- test "x$as_lineno_1" != "x$as_lineno_2" && 162665- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then 162666- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } 162667- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } 162668- CONFIG_SHELL=$as_dir/$as_base 162669- export CONFIG_SHELL 162670- exec "$CONFIG_SHELL" "$0" ${1+"$@"} 162671- fi;; 162672- esac 162673- done 162674-done 162675-;; 162676- esac 162677- 162678- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO 162679- # uniformly replaced by the line number. The first 'sed' inserts a 162680- # line-number line before each line; the second 'sed' does the real 162681- # work. The second script uses 'N' to pair each line-number line 162682- # with the numbered line, and appends trailing '-' during 162683- # substitution so that $LINENO is not a special case at line end. 162684- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the 162685- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) 162686- sed '=' <$as_myself | 162687- sed ' 162688- N 162689- s,$,-, 162690- : loop 162691- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, 162692- t loop 162693- s,-$,, 162694- s,^['$as_cr_digits']*\n,, 162695- ' >$as_me.lineno && 162696- chmod +x $as_me.lineno || 162697- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 162698-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} 162699- { (exit 1); exit 1; }; } 162700- 162701- # Don't try to exec as it changes $[0], causing all sort of problems 162702- # (the dirname of $[0] is not the place where we might find the 162703- # original and so on. Autoconf is especially sensible to this). 162704- . ./$as_me.lineno 162705- # Exit status is that of the last command. 162706- exit 162707-} 162708- 162709- 162710-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in 162711- *c*,-n*) ECHO_N= ECHO_C=' 162712-' ECHO_T=' ' ;; 162713- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; 162714- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; 162715-esac 162716- 162717-if expr a : '\(a\)' >/dev/null 2>&1; then 162718- as_expr=expr 162719-else 162720- as_expr=false 162721-fi 162722- 162723-rm -f conf$$ conf$$.exe conf$$.file 162724-echo >conf$$.file 162725-if ln -s conf$$.file conf$$ 2>/dev/null; then 162726- # We could just check for DJGPP; but this test a) works b) is more generic 162727- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). 162728- if test -f conf$$.exe; then 162729- # Don't use ln at all; we don't have any links 162730- as_ln_s='cp -p' 162731+ if test ! -s conftest.s$ac_file; then 162732+ ac_more_lines=false 162733+ rm -f conftest.s$ac_file 162734 else 162735- as_ln_s='ln -s' 162736+ if test -z "$ac_sed_cmds"; then 162737+ ac_sed_cmds="sed -f conftest.s$ac_file" 162738+ else 162739+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" 162740+ fi 162741+ ac_file=`expr $ac_file + 1` 162742+ ac_beg=$ac_end 162743+ ac_end=`expr $ac_end + $ac_max_sed_cmds` 162744 fi 162745-elif ln conf$$.file conf$$ 2>/dev/null; then 162746- as_ln_s=ln 162747-else 162748- as_ln_s='cp -p' 162749-fi 162750-rm -f conf$$ conf$$.exe conf$$.file 162751- 162752-if mkdir -p . 2>/dev/null; then 162753- as_mkdir_p=: 162754-else 162755- test -d ./-p && rmdir ./-p 162756- as_mkdir_p=false 162757+done 162758+if test -z "$ac_sed_cmds"; then 162759+ ac_sed_cmds=cat 162760 fi 162761+EOF 162762 162763-as_executable_p="test -f" 162764- 162765-# Sed expression to map a string onto a valid CPP name. 162766-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 162767- 162768-# Sed expression to map a string onto a valid variable name. 162769-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" 162770- 162771- 162772-# IFS 162773-# We need space, tab and new line, in precisely that order. 162774-as_nl=' 162775-' 162776-IFS=" $as_nl" 162777- 162778-# CDPATH. 162779-$as_unset CDPATH 162780- 162781-exec 6>&1 162782- 162783-# Open the log real soon, to keep \$[0] and so on meaningful, and to 162784-# report actual input values of CONFIG_FILES etc. instead of their 162785-# values after options handling. Logging --version etc. is OK. 162786-exec 5>>config.log 162787-{ 162788- echo 162789- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX 162790-## Running $as_me. ## 162791-_ASBOX 162792-} >&5 162793-cat >&5 <<_CSEOF 162794- 162795-This file was extended by $as_me, which was 162796-generated by GNU Autoconf 2.59. Invocation command line was 162797- 162798- CONFIG_FILES = $CONFIG_FILES 162799- CONFIG_HEADERS = $CONFIG_HEADERS 162800- CONFIG_LINKS = $CONFIG_LINKS 162801- CONFIG_COMMANDS = $CONFIG_COMMANDS 162802- $ $0 $@ 162803+cat >> $CONFIG_STATUS <<EOF 162804 162805-_CSEOF 162806-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 162807-echo >&5 162808-_ACEOF 162809+CONFIG_FILES=\${CONFIG_FILES-"$ALL_OUTPUT_FILES"} 162810+EOF 162811+cat >> $CONFIG_STATUS <<\EOF 162812+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then 162813+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 162814+ case "$ac_file" in 162815+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` 162816+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; 162817+ *) ac_file_in="${ac_file}.in" ;; 162818+ esac 162819+ 162820+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. 162821+ 162822+ # Remove last slash and all that follows it. Not all systems have dirname. 162823+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` 162824+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then 162825+ # The file is in a subdirectory. 162826+ test ! -d "$ac_dir" && mkdir "$ac_dir" 162827+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" 162828+ # A "../" for each directory in $ac_dir_suffix. 162829+ ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` 162830+ else 162831+ ac_dir_suffix= ac_dots= 162832+ fi 162833+ 162834+ case "$ac_given_srcdir" in 162835+ .) srcdir=. 162836+ if test -z "$ac_dots"; then top_srcdir=. 162837+ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; 162838+ /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; 162839+ *) # Relative path. 162840+ srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" 162841+ top_srcdir="$ac_dots$ac_given_srcdir" ;; 162842+ esac 162843 162844-# Files that config.status was made for. 162845-if test -n "$ac_config_files"; then 162846- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS 162847-fi 162848 162849-if test -n "$ac_config_headers"; then 162850- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS 162851-fi 162852+ echo creating "$ac_file" 162853+ rm -f "$ac_file" 162854+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." 162855+ case "$ac_file" in 162856+ *Makefile*) ac_comsub="1i\\ 162857+# $configure_input" ;; 162858+ *) ac_comsub= ;; 162859+ esac 162860+ 162861+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` 162862+ sed -e "$ac_comsub 162863+s%@configure_input@%$configure_input%g 162864+s%@srcdir@%$srcdir%g 162865+s%@top_srcdir@%$top_srcdir%g 162866+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file 162867+fi; done 162868+rm -f conftest.s* 162869 162870-if test -n "$ac_config_links"; then 162871- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS 162872-fi 162873+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where 162874+# NAME is the cpp macro being defined and VALUE is the value it is being given. 162875+# 162876+# ac_d sets the value in "#define NAME VALUE" lines. 162877+ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' 162878+ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' 162879+ac_dC='\3' 162880+ac_dD='%g' 162881+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". 162882+ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' 162883+ac_uB='\([ ]\)%\1#\2define\3' 162884+ac_uC=' ' 162885+ac_uD='\4%g' 162886+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". 162887+ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' 162888+ac_eB='$%\1#\2define\3' 162889+ac_eC=' ' 162890+ac_eD='%g' 162891 162892-if test -n "$ac_config_commands"; then 162893- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS 162894+if test "${CONFIG_HEADERS+set}" != set; then 162895+EOF 162896+cat >> $CONFIG_STATUS <<EOF 162897+ CONFIG_HEADERS="main/php_config.h" 162898+EOF 162899+cat >> $CONFIG_STATUS <<\EOF 162900 fi 162901+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then 162902+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 162903+ case "$ac_file" in 162904+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` 162905+ ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; 162906+ *) ac_file_in="${ac_file}.in" ;; 162907+ esac 162908+ 162909+ echo creating $ac_file 162910+ 162911+ rm -f conftest.frag conftest.in conftest.out 162912+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` 162913+ cat $ac_file_inputs > conftest.in 162914 162915-cat >>$CONFIG_STATUS <<\_ACEOF 162916- 162917-ac_cs_usage="\ 162918-\`$as_me' instantiates files from templates according to the 162919-current configuration. 162920- 162921-Usage: $0 [OPTIONS] [FILE]... 162922- 162923- -h, --help print this help, then exit 162924- -V, --version print version number, then exit 162925- -q, --quiet do not print progress messages 162926- -d, --debug don't remove temporary files 162927- --recheck update $as_me by reconfiguring in the same conditions 162928- --file=FILE[:TEMPLATE] 162929- instantiate the configuration file FILE 162930- --header=FILE[:TEMPLATE] 162931- instantiate the configuration header FILE 162932- 162933-Configuration files: 162934-$config_files 162935- 162936-Configuration headers: 162937-$config_headers 162938- 162939-Configuration commands: 162940-$config_commands 162941+EOF 162942 162943-Report bugs to <bug-autoconf@gnu.org>." 162944-_ACEOF 162945+# Transform confdefs.h into a sed script conftest.vals that substitutes 162946+# the proper values into config.h.in to produce config.h. And first: 162947+# Protect against being on the right side of a sed subst in config.status. 162948+# Protect against being in an unquoted here document in config.status. 162949+rm -f conftest.vals 162950+cat > conftest.hdr <<\EOF 162951+s/[\\&%]/\\&/g 162952+s%[\\$`]%\\&%g 162953+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp 162954+s%ac_d%ac_u%gp 162955+s%ac_u%ac_e%gp 162956+EOF 162957+sed -n -f conftest.hdr confdefs.h > conftest.vals 162958+rm -f conftest.hdr 162959 162960-cat >>$CONFIG_STATUS <<_ACEOF 162961-ac_cs_version="\\ 162962-config.status 162963-configured by $0, generated by GNU Autoconf 2.59, 162964- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" 162965+# This sed command replaces #undef with comments. This is necessary, for 162966+# example, in the case of _POSIX_SOURCE, which is predefined and required 162967+# on some systems where configure will not decide to define it. 162968+cat >> conftest.vals <<\EOF 162969+s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% 162970+EOF 162971 162972-Copyright (C) 2003 Free Software Foundation, Inc. 162973-This config.status script is free software; the Free Software Foundation 162974-gives unlimited permission to copy, distribute and modify it." 162975-srcdir=$srcdir 162976-_ACEOF 162977+# Break up conftest.vals because some shells have a limit on 162978+# the size of here documents, and old seds have small limits too. 162979 162980-cat >>$CONFIG_STATUS <<\_ACEOF 162981-# If no file are specified by the user, then we need to provide default 162982-# value. By we need to know if files were specified by the user. 162983-ac_need_defaults=: 162984-while test $# != 0 162985+rm -f conftest.tail 162986+while : 162987 do 162988- case $1 in 162989- --*=*) 162990- ac_option=`expr "x$1" : 'x\([^=]*\)='` 162991- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` 162992- ac_shift=: 162993- ;; 162994- -*) 162995- ac_option=$1 162996- ac_optarg=$2 162997- ac_shift=shift 162998- ;; 162999- *) # This is not an option, so the user has probably given explicit 163000- # arguments. 163001- ac_option=$1 163002- ac_need_defaults=false;; 163003- esac 163004- 163005- case $ac_option in 163006- # Handling of the options. 163007-_ACEOF 163008-cat >>$CONFIG_STATUS <<\_ACEOF 163009- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 163010- ac_cs_recheck=: ;; 163011- --version | --vers* | -V ) 163012- echo "$ac_cs_version"; exit 0 ;; 163013- --he | --h) 163014- # Conflict between --help and --header 163015- { { echo "$as_me:$LINENO: error: ambiguous option: $1 163016-Try \`$0 --help' for more information." >&5 163017-echo "$as_me: error: ambiguous option: $1 163018-Try \`$0 --help' for more information." >&2;} 163019- { (exit 1); exit 1; }; };; 163020- --help | --hel | -h ) 163021- echo "$ac_cs_usage"; exit 0 ;; 163022- --debug | --d* | -d ) 163023- debug=: ;; 163024- --file | --fil | --fi | --f ) 163025- $ac_shift 163026- CONFIG_FILES="$CONFIG_FILES $ac_optarg" 163027- ac_need_defaults=false;; 163028- --header | --heade | --head | --hea ) 163029- $ac_shift 163030- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" 163031- ac_need_defaults=false;; 163032- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 163033- | -silent | --silent | --silen | --sile | --sil | --si | --s) 163034- ac_cs_silent=: ;; 163035- 163036- # This is an error. 163037- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 163038-Try \`$0 --help' for more information." >&5 163039-echo "$as_me: error: unrecognized option: $1 163040-Try \`$0 --help' for more information." >&2;} 163041- { (exit 1); exit 1; }; } ;; 163042- 163043- *) ac_config_targets="$ac_config_targets $1" ;; 163044- 163045- esac 163046- shift 163047-done 163048- 163049-ac_configure_extra_args= 163050- 163051-if $ac_cs_silent; then 163052- exec 6>/dev/null 163053- ac_configure_extra_args="$ac_configure_extra_args --silent" 163054-fi 163055- 163056-_ACEOF 163057-cat >>$CONFIG_STATUS <<_ACEOF 163058-if \$ac_cs_recheck; then 163059- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 163060- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 163061-fi 163062- 163063-_ACEOF 163064- 163065-cat >>$CONFIG_STATUS <<_ACEOF 163066-# 163067-# INIT-COMMANDS section. 163068-# 163069+ ac_lines=`grep -c . conftest.vals` 163070+ # grep -c gives empty output for an empty file on some AIX systems. 163071+ if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi 163072+ # Write a limited-size here document to conftest.frag. 163073+ echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS 163074+ sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS 163075+ echo 'CEOF 163076+ sed -f conftest.frag conftest.in > conftest.out 163077+ rm -f conftest.in 163078+ mv conftest.out conftest.in 163079+' >> $CONFIG_STATUS 163080+ sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail 163081+ rm -f conftest.vals 163082+ mv conftest.tail conftest.vals 163083+done 163084+rm -f conftest.vals 163085+ 163086+cat >> $CONFIG_STATUS <<\EOF 163087+ rm -f conftest.frag conftest.h 163088+ echo "/* $ac_file. Generated automatically by configure. */" > conftest.h 163089+ cat conftest.in >> conftest.h 163090+ rm -f conftest.in 163091+ if cmp -s $ac_file conftest.h 2>/dev/null; then 163092+ echo "$ac_file is unchanged" 163093+ rm -f conftest.h 163094+ else 163095+ # Remove last slash and all that follows it. Not all systems have dirname. 163096+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` 163097+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then 163098+ # The file is in a subdirectory. 163099+ test ! -d "$ac_dir" && mkdir "$ac_dir" 163100+ fi 163101+ rm -f $ac_file 163102+ mv conftest.h $ac_file 163103+ fi 163104+fi; done 163105 163106+EOF 163107+cat >> $CONFIG_STATUS <<EOF 163108 163109 163110 if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test "\$CONFIG_FILES" = " $ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then 163111@@ -148061,815 +116010,13 @@ 163112 163113 fi 163114 163115+EOF 163116+cat >> $CONFIG_STATUS <<\EOF 163117 163118-_ACEOF 163119- 163120- 163121- 163122-cat >>$CONFIG_STATUS <<\_ACEOF 163123-for ac_config_target in $ac_config_targets 163124-do 163125- case "$ac_config_target" in 163126- # Handling of arguments. 163127- "$ALL_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;; 163128- "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 163129- "main/php_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS main/php_config.h" ;; 163130- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 163131-echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 163132- { (exit 1); exit 1; }; };; 163133- esac 163134-done 163135- 163136-# If the user did not use the arguments to specify the items to instantiate, 163137-# then the envvar interface is used. Set only those that are not. 163138-# We use the long form for the default assignment because of an extremely 163139-# bizarre bug on SunOS 4.1.3. 163140-if $ac_need_defaults; then 163141- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files 163142- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers 163143- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands 163144-fi 163145- 163146-# Have a temporary directory for convenience. Make it in the build tree 163147-# simply because there is no reason to put it here, and in addition, 163148-# creating and moving files from /tmp can sometimes cause problems. 163149-# Create a temporary directory, and hook for its removal unless debugging. 163150-$debug || 163151-{ 163152- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 163153- trap '{ (exit 1); exit 1; }' 1 2 13 15 163154-} 163155- 163156-# Create a (secure) tmp directory for tmp files. 163157- 163158-{ 163159- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && 163160- test -n "$tmp" && test -d "$tmp" 163161-} || 163162-{ 163163- tmp=./confstat$$-$RANDOM 163164- (umask 077 && mkdir $tmp) 163165-} || 163166-{ 163167- echo "$me: cannot create a temporary directory in ." >&2 163168- { (exit 1); exit 1; } 163169-} 163170- 163171-_ACEOF 163172- 163173-cat >>$CONFIG_STATUS <<_ACEOF 163174- 163175-# 163176-# CONFIG_FILES section. 163177-# 163178- 163179-# No need to generate the scripts if there are no CONFIG_FILES. 163180-# This happens for instance when ./config.status config.h 163181-if test -n "\$CONFIG_FILES"; then 163182- # Protect against being on the right side of a sed subst in config.status. 163183- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; 163184- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF 163185-s,@SHELL@,$SHELL,;t t 163186-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t 163187-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t 163188-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t 163189-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t 163190-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t 163191-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t 163192-s,@exec_prefix@,$exec_prefix,;t t 163193-s,@prefix@,$prefix,;t t 163194-s,@program_transform_name@,$program_transform_name,;t t 163195-s,@bindir@,$bindir,;t t 163196-s,@sbindir@,$sbindir,;t t 163197-s,@libexecdir@,$libexecdir,;t t 163198-s,@datadir@,$datadir,;t t 163199-s,@sysconfdir@,$sysconfdir,;t t 163200-s,@sharedstatedir@,$sharedstatedir,;t t 163201-s,@localstatedir@,$localstatedir,;t t 163202-s,@libdir@,$libdir,;t t 163203-s,@includedir@,$includedir,;t t 163204-s,@oldincludedir@,$oldincludedir,;t t 163205-s,@infodir@,$infodir,;t t 163206-s,@mandir@,$mandir,;t t 163207-s,@build_alias@,$build_alias,;t t 163208-s,@host_alias@,$host_alias,;t t 163209-s,@target_alias@,$target_alias,;t t 163210-s,@DEFS@,$DEFS,;t t 163211-s,@ECHO_C@,$ECHO_C,;t t 163212-s,@ECHO_N@,$ECHO_N,;t t 163213-s,@ECHO_T@,$ECHO_T,;t t 163214-s,@LIBS@,$LIBS,;t t 163215-s,@EGREP@,$EGREP,;t t 163216-s,@SED@,$SED,;t t 163217-s,@CONFIGURE_COMMAND@,$CONFIGURE_COMMAND,;t t 163218-s,@CONFIGURE_OPTIONS@,$CONFIGURE_OPTIONS,;t t 163219-s,@build@,$build,;t t 163220-s,@build_cpu@,$build_cpu,;t t 163221-s,@build_vendor@,$build_vendor,;t t 163222-s,@build_os@,$build_os,;t t 163223-s,@host@,$host,;t t 163224-s,@host_cpu@,$host_cpu,;t t 163225-s,@host_vendor@,$host_vendor,;t t 163226-s,@host_os@,$host_os,;t t 163227-s,@target@,$target,;t t 163228-s,@target_cpu@,$target_cpu,;t t 163229-s,@target_vendor@,$target_vendor,;t t 163230-s,@target_os@,$target_os,;t t 163231-s,@CC@,$CC,;t t 163232-s,@CFLAGS@,$CFLAGS,;t t 163233-s,@LDFLAGS@,$LDFLAGS,;t t 163234-s,@CPPFLAGS@,$CPPFLAGS,;t t 163235-s,@ac_ct_CC@,$ac_ct_CC,;t t 163236-s,@EXEEXT@,$EXEEXT,;t t 163237-s,@OBJEXT@,$OBJEXT,;t t 163238-s,@CPP@,$CPP,;t t 163239-s,@LN_S@,$LN_S,;t t 163240-s,@AWK@,$AWK,;t t 163241-s,@YACC@,$YACC,;t t 163242-s,@RE2C@,$RE2C,;t t 163243-s,@SHLIB_SUFFIX_NAME@,$SHLIB_SUFFIX_NAME,;t t 163244-s,@SHLIB_DL_SUFFIX_NAME@,$SHLIB_DL_SUFFIX_NAME,;t t 163245-s,@php_fpm_user@,$php_fpm_user,;t t 163246-s,@php_fpm_group@,$php_fpm_group,;t t 163247-s,@php_fpm_sysconfdir@,$php_fpm_sysconfdir,;t t 163248-s,@php_fpm_localstatedir@,$php_fpm_localstatedir,;t t 163249-s,@php_fpm_prefix@,$php_fpm_prefix,;t t 163250-s,@PROG_SENDMAIL@,$PROG_SENDMAIL,;t t 163251-s,@LIBOBJS@,$LIBOBJS,;t t 163252-s,@ALLOCA@,$ALLOCA,;t t 163253-s,@LTP@,$LTP,;t t 163254-s,@LTP_GENHTML@,$LTP_GENHTML,;t t 163255-s,@KRB5_CONFIG@,$KRB5_CONFIG,;t t 163256-s,@PKG_CONFIG@,$PKG_CONFIG,;t t 163257-s,@OPENSSL_INCDIR_OPT@,$OPENSSL_INCDIR_OPT,;t t 163258-s,@ICU_CONFIG@,$ICU_CONFIG,;t t 163259-s,@CXX@,$CXX,;t t 163260-s,@CXXFLAGS@,$CXXFLAGS,;t t 163261-s,@ac_ct_CXX@,$ac_ct_CXX,;t t 163262-s,@CXXCPP@,$CXXCPP,;t t 163263-s,@MYSQL_MODULE_TYPE@,$MYSQL_MODULE_TYPE,;t t 163264-s,@MYSQL_LIBS@,$MYSQL_LIBS,;t t 163265-s,@MYSQL_INCLUDE@,$MYSQL_INCLUDE,;t t 163266-s,@OCI8_SHARED_LIBADD@,$OCI8_SHARED_LIBADD,;t t 163267-s,@OCI8_DIR@,$OCI8_DIR,;t t 163268-s,@OCI8_ORACLE_VERSION@,$OCI8_ORACLE_VERSION,;t t 163269-s,@ODBC_INCLUDE@,$ODBC_INCLUDE,;t t 163270-s,@ODBC_LIBS@,$ODBC_LIBS,;t t 163271-s,@ODBC_LFLAGS@,$ODBC_LFLAGS,;t t 163272-s,@ODBC_TYPE@,$ODBC_TYPE,;t t 163273-s,@PDO_MYSQL_MODULE_TYPE@,$PDO_MYSQL_MODULE_TYPE,;t t 163274-s,@PDO_OCI_SHARED_LIBADD@,$PDO_OCI_SHARED_LIBADD,;t t 163275-s,@PDO_OCI_DIR@,$PDO_OCI_DIR,;t t 163276-s,@PDO_OCI_VERSION@,$PDO_OCI_VERSION,;t t 163277-s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t 163278-s,@LEMON@,$LEMON,;t t 163279-s,@RANLIB@,$RANLIB,;t t 163280-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t 163281-s,@INLINE_CFLAGS@,$INLINE_CFLAGS,;t t 163282-s,@INCLUDE_PATH@,$INCLUDE_PATH,;t t 163283-s,@EXPANDED_PEAR_INSTALLDIR@,$EXPANDED_PEAR_INSTALLDIR,;t t 163284-s,@EXPANDED_EXTENSION_DIR@,$EXPANDED_EXTENSION_DIR,;t t 163285-s,@EXPANDED_BINDIR@,$EXPANDED_BINDIR,;t t 163286-s,@EXPANDED_SBINDIR@,$EXPANDED_SBINDIR,;t t 163287-s,@EXPANDED_MANDIR@,$EXPANDED_MANDIR,;t t 163288-s,@EXPANDED_LIBDIR@,$EXPANDED_LIBDIR,;t t 163289-s,@EXPANDED_DATADIR@,$EXPANDED_DATADIR,;t t 163290-s,@EXPANDED_SYSCONFDIR@,$EXPANDED_SYSCONFDIR,;t t 163291-s,@EXPANDED_LOCALSTATEDIR@,$EXPANDED_LOCALSTATEDIR,;t t 163292-s,@EXPANDED_PHP_CONFIG_FILE_PATH@,$EXPANDED_PHP_CONFIG_FILE_PATH,;t t 163293-s,@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@,$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR,;t t 163294-s,@PHP_INSTALLED_SAPIS@,$PHP_INSTALLED_SAPIS,;t t 163295-s,@abs_builddir@,$abs_builddir,;t t 163296-s,@abs_srcdir@,$abs_srcdir,;t t 163297-s,@php_abs_top_builddir@,$php_abs_top_builddir,;t t 163298-s,@php_abs_top_srcdir@,$php_abs_top_srcdir,;t t 163299-s,@program_prefix@,$program_prefix,;t t 163300-s,@program_suffix@,$program_suffix,;t t 163301-s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t 163302-s,@EXTENSION_DIR@,$EXTENSION_DIR,;t t 163303-s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t 163304-s,@EXTRA_LDFLAGS_PROGRAM@,$EXTRA_LDFLAGS_PROGRAM,;t t 163305-s,@EXTRA_LIBS@,$EXTRA_LIBS,;t t 163306-s,@ZEND_EXTRA_LIBS@,$ZEND_EXTRA_LIBS,;t t 163307-s,@INCLUDES@,$INCLUDES,;t t 163308-s,@EXTRA_INCLUDES@,$EXTRA_INCLUDES,;t t 163309-s,@INSTALL_IT@,$INSTALL_IT,;t t 163310-s,@NATIVE_RPATHS@,$NATIVE_RPATHS,;t t 163311-s,@PEAR_INSTALLDIR@,$PEAR_INSTALLDIR,;t t 163312-s,@PHP_LDFLAGS@,$PHP_LDFLAGS,;t t 163313-s,@PHP_LIBS@,$PHP_LIBS,;t t 163314-s,@PHP_VERSION@,$PHP_VERSION,;t t 163315-s,@PHP_VERSION_ID@,$PHP_VERSION_ID,;t t 163316-s,@ECHO@,$ECHO,;t t 163317-s,@AR@,$AR,;t t 163318-s,@ac_ct_AR@,$ac_ct_AR,;t t 163319-s,@STRIP@,$STRIP,;t t 163320-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t 163321-s,@DSYMUTIL@,$DSYMUTIL,;t t 163322-s,@ac_ct_DSYMUTIL@,$ac_ct_DSYMUTIL,;t t 163323-s,@NMEDIT@,$NMEDIT,;t t 163324-s,@ac_ct_NMEDIT@,$ac_ct_NMEDIT,;t t 163325-s,@LIBTOOL@,$LIBTOOL,;t t 163326-s,@LTLIBOBJS@,$LTLIBOBJS,;t t 163327-CEOF 163328- 163329-_ACEOF 163330- 163331- cat >>$CONFIG_STATUS <<\_ACEOF 163332- # Split the substitutions into bite-sized pieces for seds with 163333- # small command number limits, like on Digital OSF/1 and HP-UX. 163334- ac_max_sed_lines=48 163335- ac_sed_frag=1 # Number of current file. 163336- ac_beg=1 # First line for current file. 163337- ac_end=$ac_max_sed_lines # Line after last line for current file. 163338- ac_more_lines=: 163339- ac_sed_cmds= 163340- while $ac_more_lines; do 163341- if test $ac_beg -gt 1; then 163342- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag 163343- else 163344- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag 163345- fi 163346- if test ! -s $tmp/subs.frag; then 163347- ac_more_lines=false 163348- else 163349- # The purpose of the label and of the branching condition is to 163350- # speed up the sed processing (if there are no `@' at all, there 163351- # is no need to browse any of the substitutions). 163352- # These are the two extra sed commands mentioned above. 163353- (echo ':t 163354- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed 163355- if test -z "$ac_sed_cmds"; then 163356- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" 163357- else 163358- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" 163359- fi 163360- ac_sed_frag=`expr $ac_sed_frag + 1` 163361- ac_beg=$ac_end 163362- ac_end=`expr $ac_end + $ac_max_sed_lines` 163363- fi 163364- done 163365- if test -z "$ac_sed_cmds"; then 163366- ac_sed_cmds=cat 163367- fi 163368-fi # test -n "$CONFIG_FILES" 163369- 163370-_ACEOF 163371-cat >>$CONFIG_STATUS <<\_ACEOF 163372-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue 163373- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 163374- case $ac_file in 163375- - | *:- | *:-:* ) # input from stdin 163376- cat >$tmp/stdin 163377- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 163378- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 163379- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 163380- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 163381- * ) ac_file_in=$ac_file.in ;; 163382- esac 163383- 163384- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. 163385- ac_dir=`(dirname "$ac_file") 2>/dev/null || 163386-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163387- X"$ac_file" : 'X\(//\)[^/]' \| \ 163388- X"$ac_file" : 'X\(//\)$' \| \ 163389- X"$ac_file" : 'X\(/\)' \| \ 163390- . : '\(.\)' 2>/dev/null || 163391-echo X"$ac_file" | 163392- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163393- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163394- /^X\(\/\/\)$/{ s//\1/; q; } 163395- /^X\(\/\).*/{ s//\1/; q; } 163396- s/.*/./; q'` 163397- { if $as_mkdir_p; then 163398- mkdir -p "$ac_dir" 163399- else 163400- as_dir="$ac_dir" 163401- as_dirs= 163402- while test ! -d "$as_dir"; do 163403- as_dirs="$as_dir $as_dirs" 163404- as_dir=`(dirname "$as_dir") 2>/dev/null || 163405-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163406- X"$as_dir" : 'X\(//\)[^/]' \| \ 163407- X"$as_dir" : 'X\(//\)$' \| \ 163408- X"$as_dir" : 'X\(/\)' \| \ 163409- . : '\(.\)' 2>/dev/null || 163410-echo X"$as_dir" | 163411- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163412- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163413- /^X\(\/\/\)$/{ s//\1/; q; } 163414- /^X\(\/\).*/{ s//\1/; q; } 163415- s/.*/./; q'` 163416- done 163417- test ! -n "$as_dirs" || mkdir $as_dirs 163418- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 163419-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 163420- { (exit 1); exit 1; }; }; } 163421- 163422- ac_builddir=. 163423- 163424-if test "$ac_dir" != .; then 163425- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` 163426- # A "../" for each directory in $ac_dir_suffix. 163427- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` 163428-else 163429- ac_dir_suffix= ac_top_builddir= 163430-fi 163431- 163432-case $srcdir in 163433- .) # No --srcdir option. We are building in place. 163434- ac_srcdir=. 163435- if test -z "$ac_top_builddir"; then 163436- ac_top_srcdir=. 163437- else 163438- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` 163439- fi ;; 163440- [\\/]* | ?:[\\/]* ) # Absolute path. 163441- ac_srcdir=$srcdir$ac_dir_suffix; 163442- ac_top_srcdir=$srcdir ;; 163443- *) # Relative path. 163444- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix 163445- ac_top_srcdir=$ac_top_builddir$srcdir ;; 163446-esac 163447- 163448-# Do not use `cd foo && pwd` to compute absolute paths, because 163449-# the directories may not exist. 163450-case `pwd` in 163451-.) ac_abs_builddir="$ac_dir";; 163452-*) 163453- case "$ac_dir" in 163454- .) ac_abs_builddir=`pwd`;; 163455- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; 163456- *) ac_abs_builddir=`pwd`/"$ac_dir";; 163457- esac;; 163458-esac 163459-case $ac_abs_builddir in 163460-.) ac_abs_top_builddir=${ac_top_builddir}.;; 163461-*) 163462- case ${ac_top_builddir}. in 163463- .) ac_abs_top_builddir=$ac_abs_builddir;; 163464- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; 163465- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; 163466- esac;; 163467-esac 163468-case $ac_abs_builddir in 163469-.) ac_abs_srcdir=$ac_srcdir;; 163470-*) 163471- case $ac_srcdir in 163472- .) ac_abs_srcdir=$ac_abs_builddir;; 163473- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; 163474- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; 163475- esac;; 163476-esac 163477-case $ac_abs_builddir in 163478-.) ac_abs_top_srcdir=$ac_top_srcdir;; 163479-*) 163480- case $ac_top_srcdir in 163481- .) ac_abs_top_srcdir=$ac_abs_builddir;; 163482- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; 163483- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; 163484- esac;; 163485-esac 163486- 163487- 163488- 163489- if test x"$ac_file" != x-; then 163490- { echo "$as_me:$LINENO: creating $ac_file" >&5 163491-echo "$as_me: creating $ac_file" >&6;} 163492- rm -f "$ac_file" 163493- fi 163494- # Let's still pretend it is `configure' which instantiates (i.e., don't 163495- # use $as_me), people would be surprised to read: 163496- # /* config.h. Generated by config.status. */ 163497- if test x"$ac_file" = x-; then 163498- configure_input= 163499- else 163500- configure_input="$ac_file. " 163501- fi 163502- configure_input=$configure_input"Generated from `echo $ac_file_in | 163503- sed 's,.*/,,'` by configure." 163504- 163505- # First look for the input files in the build tree, otherwise in the 163506- # src tree. 163507- ac_file_inputs=`IFS=: 163508- for f in $ac_file_in; do 163509- case $f in 163510- -) echo $tmp/stdin ;; 163511- [\\/$]*) 163512- # Absolute (can't be DOS-style, as IFS=:) 163513- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 163514-echo "$as_me: error: cannot find input file: $f" >&2;} 163515- { (exit 1); exit 1; }; } 163516- echo "$f";; 163517- *) # Relative 163518- if test -f "$f"; then 163519- # Build tree 163520- echo "$f" 163521- elif test -f "$srcdir/$f"; then 163522- # Source tree 163523- echo "$srcdir/$f" 163524- else 163525- # /dev/null tree 163526- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 163527-echo "$as_me: error: cannot find input file: $f" >&2;} 163528- { (exit 1); exit 1; }; } 163529- fi;; 163530- esac 163531- done` || { (exit 1); exit 1; } 163532-_ACEOF 163533-cat >>$CONFIG_STATUS <<_ACEOF 163534- sed "$ac_vpsub 163535-$extrasub 163536-_ACEOF 163537-cat >>$CONFIG_STATUS <<\_ACEOF 163538-:t 163539-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b 163540-s,@configure_input@,$configure_input,;t t 163541-s,@srcdir@,$ac_srcdir,;t t 163542-s,@abs_srcdir@,$ac_abs_srcdir,;t t 163543-s,@top_srcdir@,$ac_top_srcdir,;t t 163544-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t 163545-s,@builddir@,$ac_builddir,;t t 163546-s,@abs_builddir@,$ac_abs_builddir,;t t 163547-s,@top_builddir@,$ac_top_builddir,;t t 163548-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t 163549-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out 163550- rm -f $tmp/stdin 163551- if test x"$ac_file" != x-; then 163552- mv $tmp/out $ac_file 163553- else 163554- cat $tmp/out 163555- rm -f $tmp/out 163556- fi 163557- 163558-done 163559-_ACEOF 163560-cat >>$CONFIG_STATUS <<\_ACEOF 163561- 163562-# 163563-# CONFIG_HEADER section. 163564-# 163565- 163566-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where 163567-# NAME is the cpp macro being defined and VALUE is the value it is being given. 163568-# 163569-# ac_d sets the value in "#define NAME VALUE" lines. 163570-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' 163571-ac_dB='[ ].*$,\1#\2' 163572-ac_dC=' ' 163573-ac_dD=',;t' 163574-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". 163575-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' 163576-ac_uB='$,\1#\2define\3' 163577-ac_uC=' ' 163578-ac_uD=',;t' 163579- 163580-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue 163581- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 163582- case $ac_file in 163583- - | *:- | *:-:* ) # input from stdin 163584- cat >$tmp/stdin 163585- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 163586- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 163587- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` 163588- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; 163589- * ) ac_file_in=$ac_file.in ;; 163590- esac 163591- 163592- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 163593-echo "$as_me: creating $ac_file" >&6;} 163594- 163595- # First look for the input files in the build tree, otherwise in the 163596- # src tree. 163597- ac_file_inputs=`IFS=: 163598- for f in $ac_file_in; do 163599- case $f in 163600- -) echo $tmp/stdin ;; 163601- [\\/$]*) 163602- # Absolute (can't be DOS-style, as IFS=:) 163603- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 163604-echo "$as_me: error: cannot find input file: $f" >&2;} 163605- { (exit 1); exit 1; }; } 163606- # Do quote $f, to prevent DOS paths from being IFS'd. 163607- echo "$f";; 163608- *) # Relative 163609- if test -f "$f"; then 163610- # Build tree 163611- echo "$f" 163612- elif test -f "$srcdir/$f"; then 163613- # Source tree 163614- echo "$srcdir/$f" 163615- else 163616- # /dev/null tree 163617- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 163618-echo "$as_me: error: cannot find input file: $f" >&2;} 163619- { (exit 1); exit 1; }; } 163620- fi;; 163621- esac 163622- done` || { (exit 1); exit 1; } 163623- # Remove the trailing spaces. 163624- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in 163625- 163626-_ACEOF 163627- 163628-# Transform confdefs.h into two sed scripts, `conftest.defines' and 163629-# `conftest.undefs', that substitutes the proper values into 163630-# config.h.in to produce config.h. The first handles `#define' 163631-# templates, and the second `#undef' templates. 163632-# And first: Protect against being on the right side of a sed subst in 163633-# config.status. Protect against being in an unquoted here document 163634-# in config.status. 163635-rm -f conftest.defines conftest.undefs 163636-# Using a here document instead of a string reduces the quoting nightmare. 163637-# Putting comments in sed scripts is not portable. 163638-# 163639-# `end' is used to avoid that the second main sed command (meant for 163640-# 0-ary CPP macros) applies to n-ary macro definitions. 163641-# See the Autoconf documentation for `clear'. 163642-cat >confdef2sed.sed <<\_ACEOF 163643-s/[\\&,]/\\&/g 163644-s,[\\$`],\\&,g 163645-t clear 163646-: clear 163647-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp 163648-t end 163649-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp 163650-: end 163651-_ACEOF 163652-# If some macros were called several times there might be several times 163653-# the same #defines, which is useless. Nevertheless, we may not want to 163654-# sort them, since we want the *last* AC-DEFINE to be honored. 163655-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines 163656-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs 163657-rm -f confdef2sed.sed 163658- 163659-# This sed command replaces #undef with comments. This is necessary, for 163660-# example, in the case of _POSIX_SOURCE, which is predefined and required 163661-# on some systems where configure will not decide to define it. 163662-cat >>conftest.undefs <<\_ACEOF 163663-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, 163664-_ACEOF 163665- 163666-# Break up conftest.defines because some shells have a limit on the size 163667-# of here documents, and old seds have small limits too (100 cmds). 163668-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS 163669-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS 163670-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS 163671-echo ' :' >>$CONFIG_STATUS 163672-rm -f conftest.tail 163673-while grep . conftest.defines >/dev/null 163674-do 163675- # Write a limited-size here document to $tmp/defines.sed. 163676- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS 163677- # Speed up: don't consider the non `#define' lines. 163678- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS 163679- # Work around the forget-to-reset-the-flag bug. 163680- echo 't clr' >>$CONFIG_STATUS 163681- echo ': clr' >>$CONFIG_STATUS 163682- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS 163683- echo 'CEOF 163684- sed -f $tmp/defines.sed $tmp/in >$tmp/out 163685- rm -f $tmp/in 163686- mv $tmp/out $tmp/in 163687-' >>$CONFIG_STATUS 163688- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail 163689- rm -f conftest.defines 163690- mv conftest.tail conftest.defines 163691-done 163692-rm -f conftest.defines 163693-echo ' fi # grep' >>$CONFIG_STATUS 163694-echo >>$CONFIG_STATUS 163695- 163696-# Break up conftest.undefs because some shells have a limit on the size 163697-# of here documents, and old seds have small limits too (100 cmds). 163698-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS 163699-rm -f conftest.tail 163700-while grep . conftest.undefs >/dev/null 163701-do 163702- # Write a limited-size here document to $tmp/undefs.sed. 163703- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS 163704- # Speed up: don't consider the non `#undef' 163705- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS 163706- # Work around the forget-to-reset-the-flag bug. 163707- echo 't clr' >>$CONFIG_STATUS 163708- echo ': clr' >>$CONFIG_STATUS 163709- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS 163710- echo 'CEOF 163711- sed -f $tmp/undefs.sed $tmp/in >$tmp/out 163712- rm -f $tmp/in 163713- mv $tmp/out $tmp/in 163714-' >>$CONFIG_STATUS 163715- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail 163716- rm -f conftest.undefs 163717- mv conftest.tail conftest.undefs 163718-done 163719-rm -f conftest.undefs 163720- 163721-cat >>$CONFIG_STATUS <<\_ACEOF 163722- # Let's still pretend it is `configure' which instantiates (i.e., don't 163723- # use $as_me), people would be surprised to read: 163724- # /* config.h. Generated by config.status. */ 163725- if test x"$ac_file" = x-; then 163726- echo "/* Generated by configure. */" >$tmp/config.h 163727- else 163728- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h 163729- fi 163730- cat $tmp/in >>$tmp/config.h 163731- rm -f $tmp/in 163732- if test x"$ac_file" != x-; then 163733- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then 163734- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 163735-echo "$as_me: $ac_file is unchanged" >&6;} 163736- else 163737- ac_dir=`(dirname "$ac_file") 2>/dev/null || 163738-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163739- X"$ac_file" : 'X\(//\)[^/]' \| \ 163740- X"$ac_file" : 'X\(//\)$' \| \ 163741- X"$ac_file" : 'X\(/\)' \| \ 163742- . : '\(.\)' 2>/dev/null || 163743-echo X"$ac_file" | 163744- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163745- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163746- /^X\(\/\/\)$/{ s//\1/; q; } 163747- /^X\(\/\).*/{ s//\1/; q; } 163748- s/.*/./; q'` 163749- { if $as_mkdir_p; then 163750- mkdir -p "$ac_dir" 163751- else 163752- as_dir="$ac_dir" 163753- as_dirs= 163754- while test ! -d "$as_dir"; do 163755- as_dirs="$as_dir $as_dirs" 163756- as_dir=`(dirname "$as_dir") 2>/dev/null || 163757-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163758- X"$as_dir" : 'X\(//\)[^/]' \| \ 163759- X"$as_dir" : 'X\(//\)$' \| \ 163760- X"$as_dir" : 'X\(/\)' \| \ 163761- . : '\(.\)' 2>/dev/null || 163762-echo X"$as_dir" | 163763- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163764- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163765- /^X\(\/\/\)$/{ s//\1/; q; } 163766- /^X\(\/\).*/{ s//\1/; q; } 163767- s/.*/./; q'` 163768- done 163769- test ! -n "$as_dirs" || mkdir $as_dirs 163770- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 163771-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 163772- { (exit 1); exit 1; }; }; } 163773- 163774- rm -f $ac_file 163775- mv $tmp/config.h $ac_file 163776- fi 163777- else 163778- cat $tmp/config.h 163779- rm -f $tmp/config.h 163780- fi 163781-done 163782-_ACEOF 163783-cat >>$CONFIG_STATUS <<\_ACEOF 163784- 163785-# 163786-# CONFIG_COMMANDS section. 163787-# 163788-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue 163789- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` 163790- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` 163791- ac_dir=`(dirname "$ac_dest") 2>/dev/null || 163792-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163793- X"$ac_dest" : 'X\(//\)[^/]' \| \ 163794- X"$ac_dest" : 'X\(//\)$' \| \ 163795- X"$ac_dest" : 'X\(/\)' \| \ 163796- . : '\(.\)' 2>/dev/null || 163797-echo X"$ac_dest" | 163798- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163799- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163800- /^X\(\/\/\)$/{ s//\1/; q; } 163801- /^X\(\/\).*/{ s//\1/; q; } 163802- s/.*/./; q'` 163803- { if $as_mkdir_p; then 163804- mkdir -p "$ac_dir" 163805- else 163806- as_dir="$ac_dir" 163807- as_dirs= 163808- while test ! -d "$as_dir"; do 163809- as_dirs="$as_dir $as_dirs" 163810- as_dir=`(dirname "$as_dir") 2>/dev/null || 163811-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 163812- X"$as_dir" : 'X\(//\)[^/]' \| \ 163813- X"$as_dir" : 'X\(//\)$' \| \ 163814- X"$as_dir" : 'X\(/\)' \| \ 163815- . : '\(.\)' 2>/dev/null || 163816-echo X"$as_dir" | 163817- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } 163818- /^X\(\/\/\)[^/].*/{ s//\1/; q; } 163819- /^X\(\/\/\)$/{ s//\1/; q; } 163820- /^X\(\/\).*/{ s//\1/; q; } 163821- s/.*/./; q'` 163822- done 163823- test ! -n "$as_dirs" || mkdir $as_dirs 163824- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 163825-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} 163826- { (exit 1); exit 1; }; }; } 163827- 163828- ac_builddir=. 163829- 163830-if test "$ac_dir" != .; then 163831- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` 163832- # A "../" for each directory in $ac_dir_suffix. 163833- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` 163834-else 163835- ac_dir_suffix= ac_top_builddir= 163836-fi 163837- 163838-case $srcdir in 163839- .) # No --srcdir option. We are building in place. 163840- ac_srcdir=. 163841- if test -z "$ac_top_builddir"; then 163842- ac_top_srcdir=. 163843- else 163844- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` 163845- fi ;; 163846- [\\/]* | ?:[\\/]* ) # Absolute path. 163847- ac_srcdir=$srcdir$ac_dir_suffix; 163848- ac_top_srcdir=$srcdir ;; 163849- *) # Relative path. 163850- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix 163851- ac_top_srcdir=$ac_top_builddir$srcdir ;; 163852-esac 163853- 163854-# Do not use `cd foo && pwd` to compute absolute paths, because 163855-# the directories may not exist. 163856-case `pwd` in 163857-.) ac_abs_builddir="$ac_dir";; 163858-*) 163859- case "$ac_dir" in 163860- .) ac_abs_builddir=`pwd`;; 163861- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; 163862- *) ac_abs_builddir=`pwd`/"$ac_dir";; 163863- esac;; 163864-esac 163865-case $ac_abs_builddir in 163866-.) ac_abs_top_builddir=${ac_top_builddir}.;; 163867-*) 163868- case ${ac_top_builddir}. in 163869- .) ac_abs_top_builddir=$ac_abs_builddir;; 163870- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; 163871- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; 163872- esac;; 163873-esac 163874-case $ac_abs_builddir in 163875-.) ac_abs_srcdir=$ac_srcdir;; 163876-*) 163877- case $ac_srcdir in 163878- .) ac_abs_srcdir=$ac_abs_builddir;; 163879- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; 163880- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; 163881- esac;; 163882-esac 163883-case $ac_abs_builddir in 163884-.) ac_abs_top_srcdir=$ac_top_srcdir;; 163885-*) 163886- case $ac_top_srcdir in 163887- .) ac_abs_top_srcdir=$ac_abs_builddir;; 163888- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; 163889- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; 163890- esac;; 163891-esac 163892- 163893- 163894- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 163895-echo "$as_me: executing $ac_dest commands" >&6;} 163896-done 163897-_ACEOF 163898- 163899-cat >>$CONFIG_STATUS <<\_ACEOF 163900- 163901-{ (exit 0); exit 0; } 163902-_ACEOF 163903+exit 0 163904+EOF 163905 chmod +x $CONFIG_STATUS 163906-ac_clean_files=$ac_clean_files_save 163907- 163908- 163909-# configure is writing to config.log, and then calls config.status. 163910-# config.status does its own redirection, appending to config.log. 163911-# Unfortunately, on DOS this fails, as config.log is still kept open 163912-# by configure, so config.status won't be able to write to it; its 163913-# output is simply discarded. So we exec the FD to /dev/null, 163914-# effectively closing config.log, so it can be properly (re)opened and 163915-# appended to by config.status. When coming back to configure, we 163916-# need to make the FD available again. 163917-if test "$no_create" != yes; then 163918- ac_cs_success=: 163919- ac_config_status_args= 163920- test "$silent" = yes && 163921- ac_config_status_args="$ac_config_status_args --quiet" 163922- exec 5>/dev/null 163923- $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false 163924- exec 5>>config.log 163925- # Use ||, not &&, to avoid exiting from the if with $? = 1, which 163926- # would make configure fail if this is the last instruction. 163927- $ac_cs_success || { (exit 1); exit 1; } 163928-fi 163929+rm -fr confdefs* $ac_clean_files 163930+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 163931 163932 163933diff -Naur php-5.3.23-patch1/configure.in php-5.3.23-patch2/configure.in 163934--- php-5.3.23-patch1/configure.in 2013-04-04 21:27:40.000000000 -0700 163935+++ php-5.3.23-patch2/configure.in 2013-04-04 21:36:54.000000000 -0700 163936@@ -305,8 +305,8 @@ 163937 PTHREADS_CHECK 163938 PHP_HELP_SEPARATOR([SAPI modules:]) 163939 PHP_SHLIB_SUFFIX_NAMES 163940-PHP_SAPI=default 163941 PHP_BUILD_PROGRAM 163942+PHP_SAPI=none 163943 163944 163945 dnl SAPI configuration. 163946@@ -325,6 +325,20 @@ 163947 AC_MSG_CHECKING([for chosen SAPI module]) 163948 AC_MSG_RESULT([$PHP_SAPI]) 163949 163950+dnl Show which binaries were selected 163951+AC_MSG_CHECKING([for executable SAPI binaries]) 163952+if test "$PHP_BINARIES"; then 163953+ AC_MSG_RESULT([$PHP_BINARIES]) 163954+else 163955+ AC_MSG_RESULT([none]) 163956+fi 163957+ 163958+dnl Exit early 163959+if test -z "$PHP_INSTALLED_SAPIS"; then 163960+ AC_MSG_ERROR([Nothing to build.]) 163961+fi 163962+ 163963+dnl force ZTS 163964 if test "$enable_maintainer_zts" = "yes"; then 163965 PTHREADS_ASSIGN_VARS 163966 PTHREADS_FLAGS 163967@@ -966,14 +980,8 @@ 163968 enable_shared=yes 163969 enable_static=yes 163970 163971-case $php_build_target in 163972- program|static) 163973- standard_libtool_flag='-prefer-non-pic -static' 163974- if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then 163975- enable_shared=no 163976- fi 163977- ;; 163978- shared) 163979+case $php_sapi_module in 163980+ shared[)] 163981 enable_static=no 163982 case $with_pic in 163983 yes) 163984@@ -985,6 +993,12 @@ 163985 esac 163986 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" 163987 ;; 163988+ *[)] 163989+ standard_libtool_flag='-prefer-non-pic -static' 163990+ if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then 163991+ enable_shared=no 163992+ fi 163993+ ;; 163994 esac 163995 163996 EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" 163997@@ -1222,24 +1236,15 @@ 163998 ;; 163999 esac 164000 164001-if test "$PHP_CLI" != "no"; then 164002- PHP_CLI_TARGET="\$(SAPI_CLI_PATH)" 164003- PHP_INSTALL_CLI_TARGET="install-cli" 164004- PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli) 164005- PHP_INSTALLED_SAPIS="cli $PHP_SAPI" 164006- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)" 164007-else 164008- PHP_INSTALLED_SAPIS="$PHP_SAPI" 164009-fi 164010- 164011 PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) 164012 164013 PHP_SUBST(PHP_EXECUTABLE) 164014-PHP_SUBST(PHP_CLI_TARGET) 164015+ 164016 PHP_SUBST(PHP_SAPI_OBJS) 164017-PHP_SUBST(PHP_CLI_OBJS) 164018+PHP_SUBST(PHP_BINARY_OBJS) 164019 PHP_SUBST(PHP_GLOBAL_OBJS) 164020 164021+PHP_SUBST(PHP_BINARIES) 164022 PHP_SUBST(PHP_MODULES) 164023 PHP_SUBST(PHP_ZEND_EX) 164024 164025@@ -1383,20 +1388,12 @@ 164026 pharcmd_install= 164027 fi; 164028 164029-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" 164030-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" 164031- 164032-case $PHP_SAPI in 164033- cli) 164034- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" 164035- ;; 164036- *) 164037- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" 164038- ;; 164039-esac 164040+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" 164041+install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" 164042 164043 PHP_SUBST(all_targets) 164044 PHP_SUBST(install_targets) 164045+PHP_SUBST(install_binary_targets) 164046 164047 PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) 164048 164049@@ -1421,7 +1418,7 @@ 164050 PHP_ADD_BUILD_DIR(netware) 164051 ;; 164052 *) 164053- PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli) 164054+ PHP_ADD_SOURCES_X(/main, internal_functions_cli.c,, PHP_BINARY_OBJS) 164055 ;; 164056 esac 164057 164058@@ -1452,7 +1449,6 @@ 164059 PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag) 164060 164061 PHP_ADD_BUILD_DIR(main main/streams) 164062-PHP_ADD_BUILD_DIR(sapi/$PHP_SAPI sapi/cli) 164063 PHP_ADD_BUILD_DIR(TSRM) 164064 PHP_ADD_BUILD_DIR(Zend) 164065 164066diff -Naur php-5.3.23-patch1/generated_lists php-5.3.23-patch2/generated_lists 164067--- php-5.3.23-patch1/generated_lists 2013-04-04 21:27:15.000000000 -0700 164068+++ php-5.3.23-patch2/generated_lists 2013-04-04 21:38:06.000000000 -0700 164069@@ -1,3 +1,3 @@ 164070 makefile_am_files = Zend/Makefile.am TSRM/Makefile.am 164071 config_h_files = Zend/acconfig.h TSRM/acconfig.h 164072-config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pdo/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache_hooks/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 164073+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 164074diff -Naur php-5.3.23-patch1/main/php_config.h.in php-5.3.23-patch2/main/php_config.h.in 164075--- php-5.3.23-patch1/main/php_config.h.in 2013-04-04 21:28:22.000000000 -0700 164076+++ php-5.3.23-patch2/main/php_config.h.in 2013-04-04 21:38:11.000000000 -0700 164077@@ -1,4 +1,4 @@ 164078-/* main/php_config.h.in. Generated from configure.in by autoheader. */ 164079+/* main/php_config.h.in. Generated automatically from configure.in by autoheader. */ 164080 /* Leave this file alone */ 164081 /* 164082 +----------------------------------------------------------------------+ 164083@@ -21,8 +21,6 @@ 164084 164085 /* $Id$ */ 164086 164087-#ifndef ZEND_API 164088- 164089 #if defined(__GNUC__) && __GNUC__ >= 4 164090 # define ZEND_API __attribute__ ((visibility("default"))) 164091 # define ZEND_DLEXPORT __attribute__ ((visibility("default"))) 164092@@ -34,2424 +32,2922 @@ 164093 #define ZEND_DLIMPORT 164094 164095 164096-#undef uint 164097-#undef ulong 164098+/* Define if on AIX 3. 164099+ System headers sometimes define this. 164100+ We just want to avoid a redefinition error message. */ 164101+#ifndef _ALL_SOURCE 164102+#undef _ALL_SOURCE 164103+#endif 164104 164105-/* Define if you want to enable memory limit support */ 164106-#define MEMORY_LIMIT 0 164107+/* Define if using alloca.c. */ 164108+#undef C_ALLOCA 164109 164110+/* Define to empty if the keyword does not work. */ 164111+#undef const 164112 164113-/* */ 164114-#undef AIX 164115+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. 164116+ This function is required for alloca.c support on those systems. */ 164117+#undef CRAY_STACKSEG_END 164118 164119-/* Whether to use native BeOS threads */ 164120-#undef BETHREADS 164121+/* Define to `int' if <sys/types.h> doesn't define. */ 164122+#undef gid_t 164123 164124-/* */ 164125-#undef CDB_INCLUDE_FILE 164126+/* Define if you have alloca, as a function or macro. */ 164127+#undef HAVE_ALLOCA 164128 164129-/* Define if system uses EBCDIC */ 164130-#undef CHARSET_EBCDIC 164131+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */ 164132+#undef HAVE_ALLOCA_H 164133 164134-/* Whether to build bcmath as dynamic module */ 164135-#undef COMPILE_DL_BCMATH 164136+/* Define if you don't have vprintf but do have _doprnt. */ 164137+#undef HAVE_DOPRNT 164138 164139-/* Whether to build bz2 as dynamic module */ 164140-#undef COMPILE_DL_BZ2 164141+/* Define if your system has a working fnmatch function. */ 164142+#undef HAVE_FNMATCH 164143 164144-/* Whether to build calendar as dynamic module */ 164145-#undef COMPILE_DL_CALENDAR 164146+/* Define if your struct stat has st_blksize. */ 164147+#undef HAVE_ST_BLKSIZE 164148 164149-/* Whether to build ctype as dynamic module */ 164150-#undef COMPILE_DL_CTYPE 164151+/* Define if your struct stat has st_blocks. */ 164152+#undef HAVE_ST_BLOCKS 164153 164154-/* Whether to build curl as dynamic module */ 164155-#undef COMPILE_DL_CURL 164156+/* Define if your struct stat has st_rdev. */ 164157+#undef HAVE_ST_RDEV 164158 164159-/* Whether to build date as dynamic module */ 164160-#undef COMPILE_DL_DATE 164161+/* Define if your struct tm has tm_zone. */ 164162+#undef HAVE_TM_ZONE 164163 164164-/* Whether to build dba as dynamic module */ 164165-#undef COMPILE_DL_DBA 164166+/* Define if you don't have tm_zone but do have the external array 164167+ tzname. */ 164168+#undef HAVE_TZNAME 164169 164170-/* Whether to build dom as dynamic module */ 164171-#undef COMPILE_DL_DOM 164172+/* Define if utime(file, NULL) sets file's timestamp to the present. */ 164173+#undef HAVE_UTIME_NULL 164174 164175-/* Whether to build enchant as dynamic module */ 164176-#undef COMPILE_DL_ENCHANT 164177+/* Define if you have the vprintf function. */ 164178+#undef HAVE_VPRINTF 164179 164180-/* Whether to build ereg as dynamic module */ 164181-#undef COMPILE_DL_EREG 164182+/* Define as __inline if that's what the C compiler calls it. */ 164183+#undef inline 164184 164185-/* Whether to build exif as dynamic module */ 164186-#undef COMPILE_DL_EXIF 164187+/* Define if your C compiler doesn't accept -c and -o together. */ 164188+#undef NO_MINUS_C_MINUS_O 164189 164190-/* Whether to build fileinfo as dynamic module */ 164191-#undef COMPILE_DL_FILEINFO 164192+/* Define as the return type of signal handlers (int or void). */ 164193+#undef RETSIGTYPE 164194 164195-/* Whether to build filter as dynamic module */ 164196-#undef COMPILE_DL_FILTER 164197+/* Define to `unsigned' if <sys/types.h> doesn't define. */ 164198+#undef size_t 164199 164200-/* Whether to build ftp as dynamic module */ 164201-#undef COMPILE_DL_FTP 164202+/* If using the C implementation of alloca, define if you know the 164203+ direction of stack growth for your system; otherwise it will be 164204+ automatically deduced at run-time. 164205+ STACK_DIRECTION > 0 => grows toward higher addresses 164206+ STACK_DIRECTION < 0 => grows toward lower addresses 164207+ STACK_DIRECTION = 0 => direction of growth unknown 164208+ */ 164209+#undef STACK_DIRECTION 164210 164211-/* Whether to build gd as dynamic module */ 164212-#undef COMPILE_DL_GD 164213+/* Define if you have the ANSI C header files. */ 164214+#undef STDC_HEADERS 164215 164216-/* Whether to build gettext as dynamic module */ 164217-#undef COMPILE_DL_GETTEXT 164218+/* Define if you can safely include both <sys/time.h> and <time.h>. */ 164219+#undef TIME_WITH_SYS_TIME 164220 164221-/* Whether to build gmp as dynamic module */ 164222-#undef COMPILE_DL_GMP 164223+/* Define if your <sys/time.h> declares struct tm. */ 164224+#undef TM_IN_SYS_TIME 164225 164226-/* Whether to build hash as dynamic module */ 164227-#undef COMPILE_DL_HASH 164228+/* Define to `int' if <sys/types.h> doesn't define. */ 164229+#undef uid_t 164230 164231-/* Whether to build iconv as dynamic module */ 164232-#undef COMPILE_DL_ICONV 164233+#undef uint 164234+#undef ulong 164235 164236-/* Whether to build imap as dynamic module */ 164237-#undef COMPILE_DL_IMAP 164238+/* The number of bytes in a char. */ 164239+#undef SIZEOF_CHAR 164240 164241-/* Whether to build interbase as dynamic module */ 164242-#undef COMPILE_DL_INTERBASE 164243+/* The number of bytes in a char *. */ 164244+#undef SIZEOF_CHAR_P 164245 164246-/* Whether to build intl as dynamic module */ 164247-#undef COMPILE_DL_INTL 164248+/* The number of bytes in a int. */ 164249+#undef SIZEOF_INT 164250 164251-/* Whether to build json as dynamic module */ 164252-#undef COMPILE_DL_JSON 164253+/* The number of bytes in a long. */ 164254+#undef SIZEOF_LONG 164255 164256-/* Whether to build ldap as dynamic module */ 164257-#undef COMPILE_DL_LDAP 164258+/* The number of bytes in a long int. */ 164259+#undef SIZEOF_LONG_INT 164260 164261-/* Whether to build libxml as dynamic module */ 164262-#undef COMPILE_DL_LIBXML 164263+/* The number of bytes in a long long. */ 164264+#undef SIZEOF_LONG_LONG 164265 164266-/* Whether to build mbstring as dynamic module */ 164267-#undef COMPILE_DL_MBSTRING 164268+/* The number of bytes in a long long int. */ 164269+#undef SIZEOF_LONG_LONG_INT 164270 164271-/* Whether to build mcrypt as dynamic module */ 164272-#undef COMPILE_DL_MCRYPT 164273+/* The number of bytes in a short. */ 164274+#undef SIZEOF_SHORT 164275 164276-/* Whether to build mssql as dynamic module */ 164277-#undef COMPILE_DL_MSSQL 164278+/* The number of bytes in a size_t. */ 164279+#undef SIZEOF_SIZE_T 164280 164281-/* Whether to build mysql as dynamic module */ 164282-#undef COMPILE_DL_MYSQL 164283+/* Define if you have the CreateProcess function. */ 164284+#undef HAVE_CREATEPROCESS 164285 164286-/* Whether to build mysqli as dynamic module */ 164287-#undef COMPILE_DL_MYSQLI 164288+/* Define if you have the acosh function. */ 164289+#undef HAVE_ACOSH 164290 164291-/* Whether to build mysqlnd as dynamic module */ 164292-#undef COMPILE_DL_MYSQLND 164293+/* Define if you have the alphasort function. */ 164294+#undef HAVE_ALPHASORT 164295 164296-/* Whether to build oci8 as dynamic module */ 164297-#undef COMPILE_DL_OCI8 164298+/* Define if you have the asctime_r function. */ 164299+#undef HAVE_ASCTIME_R 164300 164301-/* Whether to build odbc as dynamic module */ 164302-#undef COMPILE_DL_ODBC 164303+/* Define if you have the asinh function. */ 164304+#undef HAVE_ASINH 164305 164306-/* Whether to build openssl as dynamic module */ 164307-#undef COMPILE_DL_OPENSSL 164308+/* Define if you have the asprintf function. */ 164309+#undef HAVE_ASPRINTF 164310 164311-/* Whether to build pcntl as dynamic module */ 164312-#undef COMPILE_DL_PCNTL 164313+/* Define if you have the atanh function. */ 164314+#undef HAVE_ATANH 164315 164316-/* Whether to build pcre as dynamic module */ 164317-#undef COMPILE_DL_PCRE 164318+/* Define if you have the atoll function. */ 164319+#undef HAVE_ATOLL 164320 164321-/* Whether to build pdo as dynamic module */ 164322-#undef COMPILE_DL_PDO 164323+/* Define if you have the chroot function. */ 164324+#undef HAVE_CHROOT 164325 164326-/* Whether to build pdo_dblib as dynamic module */ 164327-#undef COMPILE_DL_PDO_DBLIB 164328+/* Define if you have the clearenv function. */ 164329+#undef HAVE_CLEARENV 164330 164331-/* Whether to build pdo_firebird as dynamic module */ 164332-#undef COMPILE_DL_PDO_FIREBIRD 164333+/* Define if you have the crypt function. */ 164334+#undef HAVE_CRYPT 164335 164336-/* Whether to build pdo_mysql as dynamic module */ 164337-#undef COMPILE_DL_PDO_MYSQL 164338+/* Define if you have the crypt_r function. */ 164339+#undef HAVE_CRYPT_R 164340 164341-/* Whether to build pdo_oci as dynamic module */ 164342-#undef COMPILE_DL_PDO_OCI 164343+/* Define if you have the ctermid function. */ 164344+#undef HAVE_CTERMID 164345 164346-/* Whether to build pdo_odbc as dynamic module */ 164347-#undef COMPILE_DL_PDO_ODBC 164348+/* Define if you have the ctime_r function. */ 164349+#undef HAVE_CTIME_R 164350 164351-/* Whether to build pdo_pgsql as dynamic module */ 164352-#undef COMPILE_DL_PDO_PGSQL 164353+/* Define if you have the cuserid function. */ 164354+#undef HAVE_CUSERID 164355 164356-/* Whether to build pdo_sqlite as dynamic module */ 164357-#undef COMPILE_DL_PDO_SQLITE 164358+/* Define if you have the fabsf function. */ 164359+#undef HAVE_FABSF 164360 164361-/* Whether to build pgsql as dynamic module */ 164362-#undef COMPILE_DL_PGSQL 164363+/* Define if you have the finite function. */ 164364+#undef HAVE_FINITE 164365 164366-/* Whether to build phar as dynamic module */ 164367-#undef COMPILE_DL_PHAR 164368+/* Define if you have the flock function. */ 164369+#undef HAVE_FLOCK 164370 164371-/* Whether to build posix as dynamic module */ 164372-#undef COMPILE_DL_POSIX 164373+/* Define if you have the floorf function. */ 164374+#undef HAVE_FLOORF 164375 164376-/* Whether to build pspell as dynamic module */ 164377-#undef COMPILE_DL_PSPELL 164378+/* Define if you have the fork function. */ 164379+#undef HAVE_FORK 164380 164381-/* Whether to build readline as dynamic module */ 164382-#undef COMPILE_DL_READLINE 164383+/* Define if you have the fpclass function. */ 164384+#undef HAVE_FPCLASS 164385 164386-/* Whether to build recode as dynamic module */ 164387-#undef COMPILE_DL_RECODE 164388+/* Define if you have the ftok function. */ 164389+#undef HAVE_FTOK 164390 164391-/* Whether to build reflection as dynamic module */ 164392-#undef COMPILE_DL_REFLECTION 164393+/* Define if you have the funopen function. */ 164394+#undef HAVE_FUNOPEN 164395 164396-/* Whether to build session as dynamic module */ 164397-#undef COMPILE_DL_SESSION 164398+/* Define if you have the gai_strerror function. */ 164399+#undef HAVE_GAI_STRERROR 164400 164401-/* Whether to build shmop as dynamic module */ 164402-#undef COMPILE_DL_SHMOP 164403+/* Define if you have the gcvt function. */ 164404+#undef HAVE_GCVT 164405 164406-/* Whether to build simplexml as dynamic module */ 164407-#undef COMPILE_DL_SIMPLEXML 164408+/* Define if you have the getcwd function. */ 164409+#undef HAVE_GETCWD 164410 164411-/* Whether to build snmp as dynamic module */ 164412-#undef COMPILE_DL_SNMP 164413+/* Define if you have the getgrgid_r function. */ 164414+#undef HAVE_GETGRGID_R 164415 164416-/* Whether to build soap as dynamic module */ 164417-#undef COMPILE_DL_SOAP 164418+/* Define if you have the getgrnam_r function. */ 164419+#undef HAVE_GETGRNAM_R 164420 164421-/* Whether to build sockets as dynamic module */ 164422-#undef COMPILE_DL_SOCKETS 164423+/* Define if you have the getgroups function. */ 164424+#undef HAVE_GETGROUPS 164425 164426-/* Whether to build spl as dynamic module */ 164427-#undef COMPILE_DL_SPL 164428+/* Define if you have the gethostname function. */ 164429+#undef HAVE_GETHOSTNAME 164430 164431-/* Whether to build sqlite as dynamic module */ 164432-#undef COMPILE_DL_SQLITE 164433+/* Define if you have the getloadavg function. */ 164434+#undef HAVE_GETLOADAVG 164435 164436-/* Whether to build sqlite3 as dynamic module */ 164437-#undef COMPILE_DL_SQLITE3 164438+/* Define if you have the getlogin function. */ 164439+#undef HAVE_GETLOGIN 164440 164441-/* Whether to build standard as dynamic module */ 164442-#undef COMPILE_DL_STANDARD 164443+/* Define if you have the getopt function. */ 164444+#undef HAVE_GETOPT 164445 164446-/* Whether to build sybase_ct as dynamic module */ 164447-#undef COMPILE_DL_SYBASE_CT 164448+/* Define if you have the getpgid function. */ 164449+#undef HAVE_GETPGID 164450 164451-/* Whether to build sysvmsg as dynamic module */ 164452-#undef COMPILE_DL_SYSVMSG 164453+/* Define if you have the getpid function. */ 164454+#undef HAVE_GETPID 164455 164456-/* Whether to build sysvsem as dynamic module */ 164457-#undef COMPILE_DL_SYSVSEM 164458+/* Define if you have the getpriority function. */ 164459+#undef HAVE_GETPRIORITY 164460 164461-/* Whether to build sysvshm as dynamic module */ 164462-#undef COMPILE_DL_SYSVSHM 164463+/* Define if you have the getprotobyname function. */ 164464+#undef HAVE_GETPROTOBYNAME 164465 164466-/* Whether to build tidy as dynamic module */ 164467-#undef COMPILE_DL_TIDY 164468+/* Define if you have the getprotobynumber function. */ 164469+#undef HAVE_GETPROTOBYNUMBER 164470 164471-/* Whether to build tokenizer as dynamic module */ 164472-#undef COMPILE_DL_TOKENIZER 164473+/* Define if you have the getpwnam_r function. */ 164474+#undef HAVE_GETPWNAM_R 164475 164476-/* Whether to build wddx as dynamic module */ 164477-#undef COMPILE_DL_WDDX 164478+/* Define if you have the getpwuid_r function. */ 164479+#undef HAVE_GETPWUID_R 164480 164481-/* Whether to build xml as dynamic module */ 164482-#undef COMPILE_DL_XML 164483+/* Define if you have the getrlimit function. */ 164484+#undef HAVE_GETRLIMIT 164485 164486-/* Whether to build xmlreader as dynamic module */ 164487-#undef COMPILE_DL_XMLREADER 164488+/* Define if you have the getrusage function. */ 164489+#undef HAVE_GETRUSAGE 164490 164491-/* Whether to build xmlrpc as dynamic module */ 164492-#undef COMPILE_DL_XMLRPC 164493+/* Define if you have the getservbyname function. */ 164494+#undef HAVE_GETSERVBYNAME 164495 164496-/* Whether to build xmlwriter as dynamic module */ 164497-#undef COMPILE_DL_XMLWRITER 164498+/* Define if you have the getservbyport function. */ 164499+#undef HAVE_GETSERVBYPORT 164500 164501-/* Whether to build xsl as dynamic module */ 164502-#undef COMPILE_DL_XSL 164503+/* Define if you have the getsid function. */ 164504+#undef HAVE_GETSID 164505 164506-/* Whether to build zip as dynamic module */ 164507-#undef COMPILE_DL_ZIP 164508+/* Define if you have the gettimeofday function. */ 164509+#undef HAVE_GETTIMEOFDAY 164510 164511-/* Whether to build zlib as dynamic module */ 164512-#undef COMPILE_DL_ZLIB 164513+/* Define if you have the getwd function. */ 164514+#undef HAVE_GETWD 164515 164516-/* */ 164517-#undef COOKIE_IO_FUNCTIONS_T 164518+/* Define if you have the glob function. */ 164519+#undef HAVE_GLOB 164520 164521-/* */ 164522-#undef COOKIE_SEEKER_USES_OFF64_T 164523+/* Define if you have the gmtime_r function. */ 164524+#undef HAVE_GMTIME_R 164525 164526-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP 164527- systems. This function is required for `alloca.c' support on those systems. 164528- */ 164529-#undef CRAY_STACKSEG_END 164530+/* Define if you have the grantpt function. */ 164531+#undef HAVE_GRANTPT 164532 164533-/* Define if crypt_r has uses CRYPTD */ 164534-#undef CRYPT_R_CRYPTD 164535+/* Define if you have the hstrerror function. */ 164536+#undef HAVE_HSTRERROR 164537 164538-/* Define if struct crypt_data requires _GNU_SOURCE */ 164539-#undef CRYPT_R_GNU_SOURCE 164540+/* Define if you have the hypot function. */ 164541+#undef HAVE_HYPOT 164542 164543-/* Define if crypt_r uses struct crypt_data */ 164544-#undef CRYPT_R_STRUCT_CRYPT_DATA 164545+/* Define if you have the inet_ntoa function. */ 164546+#undef HAVE_INET_NTOA 164547 164548-/* Define to 1 if using `alloca.c'. */ 164549-#undef C_ALLOCA 164550+/* Define if you have the inet_ntop function. */ 164551+#undef HAVE_INET_NTOP 164552 164553-/* Define if the target system is darwin */ 164554-#undef DARWIN 164555+/* Define if you have the inet_pton function. */ 164556+#undef HAVE_INET_PTON 164557 164558-/* */ 164559-#undef DB1_INCLUDE_FILE 164560+/* Define if you have the initgroups function. */ 164561+#undef HAVE_INITGROUPS 164562 164563-/* */ 164564-#undef DB1_VERSION 164565+/* Define if you have the isascii function. */ 164566+#undef HAVE_ISASCII 164567 164568-/* */ 164569-#undef DB2_INCLUDE_FILE 164570+/* Define if you have the isfinite function. */ 164571+#undef HAVE_ISFINITE 164572 164573-/* */ 164574-#undef DB3_INCLUDE_FILE 164575+/* Define if you have the isinf function. */ 164576+#undef HAVE_ISINF 164577 164578-/* */ 164579-#undef DB4_INCLUDE_FILE 164580+/* Define if you have the isnan function. */ 164581+#undef HAVE_ISNAN 164582 164583-/* */ 164584-#undef DBA_CDB 164585+/* Define if you have the kill function. */ 164586+#undef HAVE_KILL 164587 164588-/* */ 164589-#undef DBA_CDB_BUILTIN 164590+/* Define if you have the lchown function. */ 164591+#undef HAVE_LCHOWN 164592 164593-/* */ 164594-#undef DBA_CDB_MAKE 164595+/* Define if you have the ldap_parse_reference function. */ 164596+#undef HAVE_LDAP_PARSE_REFERENCE 164597 164598-/* */ 164599-#undef DBA_DB1 164600+/* Define if you have the ldap_parse_result function. */ 164601+#undef HAVE_LDAP_PARSE_RESULT 164602 164603-/* */ 164604-#undef DBA_DB2 164605+/* Define if you have the ldap_start_tls_s function. */ 164606+#undef HAVE_LDAP_START_TLS_S 164607 164608-/* */ 164609-#undef DBA_DB3 164610+/* Define if you have the link function. */ 164611+#undef HAVE_LINK 164612 164613-/* */ 164614-#undef DBA_DB4 164615+/* Define if you have the localeconv function. */ 164616+#undef HAVE_LOCALECONV 164617 164618-/* */ 164619-#undef DBA_DBM 164620+/* Define if you have the localtime_r function. */ 164621+#undef HAVE_LOCALTIME_R 164622 164623-/* */ 164624-#undef DBA_FLATFILE 164625+/* Define if you have the lockf function. */ 164626+#undef HAVE_LOCKF 164627 164628-/* */ 164629-#undef DBA_GDBM 164630+/* Define if you have the log1p function. */ 164631+#undef HAVE_LOG1P 164632 164633-/* */ 164634-#undef DBA_INIFILE 164635+/* Define if you have the lrand48 function. */ 164636+#undef HAVE_LRAND48 164637 164638-/* */ 164639-#undef DBA_NDBM 164640+/* Define if you have the makedev function. */ 164641+#undef HAVE_MAKEDEV 164642 164643-/* */ 164644-#undef DBA_QDBM 164645+/* Define if you have the mblen function. */ 164646+#undef HAVE_MBLEN 164647 164648-/* */ 164649-#undef DBM_INCLUDE_FILE 164650+/* Define if you have the mbrlen function. */ 164651+#undef HAVE_MBRLEN 164652 164653-/* */ 164654-#undef DBM_VERSION 164655+/* Define if you have the mbsinit function. */ 164656+#undef HAVE_MBSINIT 164657 164658-/* */ 164659-#undef DEFAULT_SHORT_OPEN_TAG 164660+/* Define if you have the memcpy function. */ 164661+#undef HAVE_MEMCPY 164662 164663-/* Define if dlsym() requires a leading underscore in symbol names. */ 164664-#undef DLSYM_NEEDS_UNDERSCORE 164665+/* Define if you have the memmove function. */ 164666+#undef HAVE_MEMMOVE 164667 164668-/* Whether to enable chroot() function */ 164669-#undef ENABLE_CHROOT_FUNC 164670+/* Define if you have the mempcpy function. */ 164671+#undef HAVE_MEMPCPY 164672 164673-/* */ 164674-#undef ENABLE_GD_TTF 164675+/* Define if you have the mkfifo function. */ 164676+#undef HAVE_MKFIFO 164677 164678-/* */ 164679-#undef ENCHANT_VERSION_STRING 164680+/* Define if you have the mknod function. */ 164681+#undef HAVE_MKNOD 164682 164683-/* */ 164684-#undef GDBM_INCLUDE_FILE 164685+/* Define if you have the mkstemp function. */ 164686+#undef HAVE_MKSTEMP 164687 164688-/* Whether you use GNU Pth */ 164689-#undef GNUPTH 164690+/* Define if you have the mmap function. */ 164691+#undef HAVE_MMAP 164692 164693-/* Whether 3 arg set_rebind_proc() */ 164694-#undef HAVE_3ARG_SETREBINDPROC 164695+/* Define if you have the mremap function. */ 164696+#undef HAVE_MREMAP 164697 164698-/* Define to 1 if you have the `acosh' function. */ 164699-#undef HAVE_ACOSH 164700+/* Define if you have the mysql_commit function. */ 164701+#undef HAVE_MYSQL_COMMIT 164702 164703-/* */ 164704-#undef HAVE_ADABAS 164705+/* Define if you have the mysql_next_result function. */ 164706+#undef HAVE_MYSQL_NEXT_RESULT 164707 164708-/* whether the compiler supports __alignof__ */ 164709-#undef HAVE_ALIGNOF 164710+/* Define if you have the mysql_sqlstate function. */ 164711+#undef HAVE_MYSQL_SQLSTATE 164712 164713-/* Define to 1 if you have `alloca', as a function or macro. */ 164714-#undef HAVE_ALLOCA 164715+/* Define if you have the mysql_stmt_prepare function. */ 164716+#undef HAVE_MYSQL_STMT_PREPARE 164717 164718-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). 164719- */ 164720-#undef HAVE_ALLOCA_H 164721+/* Define if you have the nanosleep function. */ 164722+#undef HAVE_NANOSLEEP 164723 164724-/* Define to 1 if you have the `alphasort' function. */ 164725-#undef HAVE_ALPHASORT 164726+/* Define if you have the nice function. */ 164727+#undef HAVE_NICE 164728 164729-/* Suhosin-Patch for PHP */ 164730-#undef SUHOSIN_PATCH 164731+/* Define if you have the nl_langinfo function. */ 164732+#undef HAVE_NL_LANGINFO 164733 164734-/* Whether you have AOLserver */ 164735-#undef HAVE_AOLSERVER 164736+/* Define if you have the perror function. */ 164737+#undef HAVE_PERROR 164738 164739-/* */ 164740-#undef HAVE_APACHE 164741+/* Define if you have the poll function. */ 164742+#undef HAVE_POLL 164743 164744-/* */ 164745-#undef HAVE_APACHE_HOOKS 164746+/* Define if you have the ptsname function. */ 164747+#undef HAVE_PTSNAME 164748 164749-/* Define to 1 if you have the <ApplicationServices/ApplicationServices.h> 164750- header file. */ 164751-#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 164752+/* Define if you have the putenv function. */ 164753+#undef HAVE_PUTENV 164754 164755-/* */ 164756-#undef HAVE_AP_COMPAT_H 164757+/* Define if you have the rand_r function. */ 164758+#undef HAVE_RAND_R 164759 164760-/* */ 164761-#undef HAVE_AP_CONFIG_H 164762+/* Define if you have the random function. */ 164763+#undef HAVE_RANDOM 164764 164765-/* Define to 1 if you have the <arpa/inet.h> header file. */ 164766-#undef HAVE_ARPA_INET_H 164767+/* Define if you have the realpath function. */ 164768+#undef HAVE_REALPATH 164769 164770-/* Define to 1 if you have the <arpa/nameser.h> header file. */ 164771-#undef HAVE_ARPA_NAMESER_H 164772+/* Define if you have the rl_completion_matches function. */ 164773+#undef HAVE_RL_COMPLETION_MATCHES 164774 164775-/* Define to 1 if you have the `asctime_r' function. */ 164776-#undef HAVE_ASCTIME_R 164777+/* Define if you have the scandir function. */ 164778+#undef HAVE_SCANDIR 164779 164780-/* Define to 1 if you have the `asinh' function. */ 164781-#undef HAVE_ASINH 164782+/* Define if you have the setegid function. */ 164783+#undef HAVE_SETEGID 164784 164785-/* Define to 1 if you have the `asprintf' function. */ 164786-#undef HAVE_ASPRINTF 164787+/* Define if you have the setenv function. */ 164788+#undef HAVE_SETENV 164789 164790-/* Define to 1 if you have the <assert.h> header file. */ 164791-#undef HAVE_ASSERT_H 164792+/* Define if you have the seteuid function. */ 164793+#undef HAVE_SETEUID 164794 164795-/* Define to 1 if you have the `atanh' function. */ 164796-#undef HAVE_ATANH 164797+/* Define if you have the setitimer function. */ 164798+#undef HAVE_SETITIMER 164799 164800-/* whether atof() accepts INF */ 164801-#undef HAVE_ATOF_ACCEPTS_INF 164802+/* Define if you have the setlocale function. */ 164803+#undef HAVE_SETLOCALE 164804 164805-/* whether atof() accepts NAN */ 164806-#undef HAVE_ATOF_ACCEPTS_NAN 164807+/* Define if you have the setpgid function. */ 164808+#undef HAVE_SETPGID 164809 164810-/* Define to 1 if you have the `atoll' function. */ 164811-#undef HAVE_ATOLL 164812+/* Define if you have the setpriority function. */ 164813+#undef HAVE_SETPRIORITY 164814 164815-/* Define to 1 if you have the <atomic.h> header file. */ 164816-#undef HAVE_ATOMIC_H 164817+/* Define if you have the setproctitle function. */ 164818+#undef HAVE_SETPROCTITLE 164819 164820-/* whether the compiler supports __attribute__ ((__aligned__)) */ 164821-#undef HAVE_ATTRIBUTE_ALIGNED 164822+/* Define if you have the setsid function. */ 164823+#undef HAVE_SETSID 164824 164825-/* Whether you have bcmath */ 164826-#undef HAVE_BCMATH 164827+/* Define if you have the setsockopt function. */ 164828+#undef HAVE_SETSOCKOPT 164829 164830-/* */ 164831-#undef HAVE_BIND_TEXTDOMAIN_CODESET 164832+/* Define if you have the setvbuf function. */ 164833+#undef HAVE_SETVBUF 164834 164835-/* */ 164836-#undef HAVE_BIRDSTEP 164837+/* Define if you have the shutdown function. */ 164838+#undef HAVE_SHUTDOWN 164839 164840-/* Define if system has broken getcwd */ 164841-#undef HAVE_BROKEN_GETCWD 164842+/* Define if you have the sigaction function. */ 164843+#undef HAVE_SIGACTION 164844 164845-/* Define if your glibc borks on fopen with mode a+ */ 164846-#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND 164847+/* Define if you have the sigprocmask function. */ 164848+#undef HAVE_SIGPROCMASK 164849 164850-/* Whether we have librecode 3.5 */ 164851-#undef HAVE_BROKEN_RECODE 164852+/* Define if you have the sigsetjmp function. */ 164853+#undef HAVE_SIGSETJMP 164854 164855-/* Konstantin Chuguev's iconv implementation */ 164856-#undef HAVE_BSD_ICONV 164857+/* Define if you have the sigtimedwait function. */ 164858+#undef HAVE_SIGTIMEDWAIT 164859 164860-/* */ 164861-#undef HAVE_BUILD_DEFS_H 164862+/* Define if you have the sigwaitinfo function. */ 164863+#undef HAVE_SIGWAITINFO 164864 164865-/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ 164866-#undef HAVE_BUILTIN_ATOMIC 164867+/* Define if you have the sin function. */ 164868+#undef HAVE_SIN 164869 164870-/* */ 164871-#undef HAVE_BUNDLED_PCRE 164872+/* Define if you have the snprintf function. */ 164873+#undef HAVE_SNPRINTF 164874 164875-/* */ 164876-#undef HAVE_BZ2 164877+/* Define if you have the socketpair function. */ 164878+#undef HAVE_SOCKETPAIR 164879 164880-/* */ 164881-#undef HAVE_CALENDAR 164882+/* Define if you have the srand48 function. */ 164883+#undef HAVE_SRAND48 164884 164885-/* Whether to compile with Caudium support */ 164886-#undef HAVE_CAUDIUM 164887+/* Define if you have the srandom function. */ 164888+#undef HAVE_SRANDOM 164889 164890-/* Define to 1 if you have the `chroot' function. */ 164891-#undef HAVE_CHROOT 164892+/* Define if you have the statfs function. */ 164893+#undef HAVE_STATFS 164894 164895-/* Define to 1 if you have the `clearenv' function. */ 164896-#undef HAVE_CLEARENV 164897+/* Define if you have the statvfs function. */ 164898+#undef HAVE_STATVFS 164899 164900-/* */ 164901-#undef HAVE_CLI0CLI_H 164902+/* Define if you have the std_syslog function. */ 164903+#undef HAVE_STD_SYSLOG 164904 164905-/* */ 164906-#undef HAVE_CLI0CORE_H 164907+/* Define if you have the strcasecmp function. */ 164908+#undef HAVE_STRCASECMP 164909 164910-/* */ 164911-#undef HAVE_CLI0DEFS_H 164912+/* Define if you have the strcoll function. */ 164913+#undef HAVE_STRCOLL 164914 164915-/* */ 164916-#undef HAVE_CLI0ENV_H 164917+/* Define if you have the strdup function. */ 164918+#undef HAVE_STRDUP 164919 164920-/* */ 164921-#undef HAVE_CLI0EXT_H 164922+/* Define if you have the strerror function. */ 164923+#undef HAVE_STRERROR 164924 164925-/* do we have clock_gettime? */ 164926-#undef HAVE_CLOCK_GETTIME 164927+/* Define if you have the strfmon function. */ 164928+#undef HAVE_STRFMON 164929 164930-/* do we have clock_get_time? */ 164931-#undef HAVE_CLOCK_GET_TIME 164932+/* Define if you have the strftime function. */ 164933+#undef HAVE_STRFTIME 164934 164935-/* Whether you have struct cmsghdr */ 164936-#undef HAVE_CMSGHDR 164937+/* Define if you have the strlcat function. */ 164938+#undef HAVE_STRLCAT 164939 164940-/* */ 164941-#undef HAVE_CODBC 164942+/* Define if you have the strlcpy function. */ 164943+#undef HAVE_STRLCPY 164944 164945-/* */ 164946-#undef HAVE_COLORCLOSESTHWB 164947+/* Define if you have the strndup function. */ 164948+#undef HAVE_STRNDUP 164949 164950-/* Whether you have a Continuity Server */ 164951-#undef HAVE_CONTINUITY 164952+/* Define if you have the strnlen function. */ 164953+#undef HAVE_STRNLEN 164954 164955-/* Define to 1 if you have the `CreateProcess' function. */ 164956-#undef HAVE_CREATEPROCESS 164957+/* Define if you have the strpbrk function. */ 164958+#undef HAVE_STRPBRK 164959 164960-/* */ 164961-#undef HAVE_CRYPT 164962+/* Define if you have the strpncpy function. */ 164963+#undef HAVE_STRPNCPY 164964 164965-/* Define to 1 if you have the <crypt.h> header file. */ 164966-#undef HAVE_CRYPT_H 164967+/* Define if you have the strptime function. */ 164968+#undef HAVE_STRPTIME 164969 164970-/* Define to 1 if you have the `crypt_r' function. */ 164971-#undef HAVE_CRYPT_R 164972+/* Define if you have the strstr function. */ 164973+#undef HAVE_STRSTR 164974 164975-/* Define to 1 if you have the `ctermid' function. */ 164976-#undef HAVE_CTERMID 164977+/* Define if you have the strtod function. */ 164978+#undef HAVE_STRTOD 164979 164980-/* Define to 1 if you have the `ctime_r' function. */ 164981-#undef HAVE_CTIME_R 164982+/* Define if you have the strtok_r function. */ 164983+#undef HAVE_STRTOK_R 164984 164985-/* */ 164986-#undef HAVE_CTYPE 164987+/* Define if you have the strtol function. */ 164988+#undef HAVE_STRTOL 164989 164990-/* */ 164991-#undef HAVE_CURL 164992+/* Define if you have the strtoll function. */ 164993+#undef HAVE_STRTOLL 164994 164995-/* */ 164996-#undef HAVE_CURL_EASY_STRERROR 164997+/* Define if you have the strtoul function. */ 164998+#undef HAVE_STRTOUL 164999 165000-/* Have cURL with GnuTLS support */ 165001-#undef HAVE_CURL_GNUTLS 165002+/* Define if you have the strtoull function. */ 165003+#undef HAVE_STRTOULL 165004 165005-/* */ 165006-#undef HAVE_CURL_MULTI_STRERROR 165007+/* Define if you have the symlink function. */ 165008+#undef HAVE_SYMLINK 165009 165010-/* Have cURL with OpenSSL support */ 165011-#undef HAVE_CURL_OPENSSL 165012+/* Define if you have the tempnam function. */ 165013+#undef HAVE_TEMPNAM 165014 165015-/* Have cURL with SSL support */ 165016-#undef HAVE_CURL_SSL 165017+/* Define if you have the tzset function. */ 165018+#undef HAVE_TZSET 165019 165020-/* */ 165021-#undef HAVE_CURL_VERSION_INFO 165022+/* Define if you have the unlockpt function. */ 165023+#undef HAVE_UNLOCKPT 165024 165025-/* Define to 1 if you have the `cuserid' function. */ 165026-#undef HAVE_CUSERID 165027+/* Define if you have the unsetenv function. */ 165028+#undef HAVE_UNSETENV 165029 165030-/* */ 165031-#undef HAVE_DBA 165032+/* Define if you have the usleep function. */ 165033+#undef HAVE_USLEEP 165034 165035-/* Whether you want DBMaker */ 165036-#undef HAVE_DBMAKER 165037+/* Define if you have the utime function. */ 165038+#undef HAVE_UTIME 165039 165040-/* */ 165041-#undef HAVE_DCNGETTEXT 165042+/* Define if you have the utimes function. */ 165043+#undef HAVE_UTIMES 165044 165045-/* Whether system headers declare timezone */ 165046-#undef HAVE_DECLARED_TIMEZONE 165047+/* Define if you have the vasprintf function. */ 165048+#undef HAVE_VASPRINTF 165049 165050-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. 165051- */ 165052-#undef HAVE_DECL_TZNAME 165053+/* Define if you have the vsnprintf function. */ 165054+#undef HAVE_VSNPRINTF 165055 165056-/* Define to 1 if you have the <default_store.h> header file. */ 165057-#undef HAVE_DEFAULT_STORE_H 165058+/* Define if you have the wait3 function. */ 165059+#undef HAVE_WAIT3 165060 165061-/* do we have /dev/poll? */ 165062-#undef HAVE_DEVPOLL 165063+/* Define if you have the waitpid function. */ 165064+#undef HAVE_WAITPID 165065 165066-/* Define if the target system has /dev/urandom device */ 165067-#undef HAVE_DEV_URANDOM 165068+/* Define if you have the </nsapi.h> header file. */ 165069+#undef HAVE__NSAPI_H 165070 165071-/* Define to 1 if you have the <dirent.h> header file. */ 165072-#undef HAVE_DIRENT_H 165073+/* Define if you have the <ApplicationServices/ApplicationServices.h> header file. */ 165074+#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H 165075 165076-/* Define to 1 if you have the <dlfcn.h> header file. */ 165077-#undef HAVE_DLFCN_H 165078+/* Define if you have the <alloca.h> header file. */ 165079+#undef HAVE_ALLOCA_H 165080 165081-/* */ 165082-#undef HAVE_DLOPEN 165083+/* Define if you have the <arpa/inet.h> header file. */ 165084+#undef HAVE_ARPA_INET_H 165085 165086-/* Whether you have dmalloc */ 165087-#undef HAVE_DMALLOC 165088+/* Define if you have the <arpa/nameser.h> header file. */ 165089+#undef HAVE_ARPA_NAMESER_H 165090 165091-/* */ 165092-#undef HAVE_DNGETTEXT 165093+/* Define if you have the <assert.h> header file. */ 165094+#undef HAVE_ASSERT_H 165095 165096-/* Define to 1 if you have the <dns.h> header file. */ 165097-#undef HAVE_DNS_H 165098+/* Define if you have the <atomic.h> header file. */ 165099+#undef HAVE_ATOMIC_H 165100 165101-/* */ 165102-#undef HAVE_DNS_SEARCH 165103+/* Define if you have the <crypt.h> header file. */ 165104+#undef HAVE_CRYPT_H 165105 165106-/* */ 165107-#undef HAVE_DN_EXPAND 165108+/* Define if you have the <default_store.h> header file. */ 165109+#undef HAVE_DEFAULT_STORE_H 165110 165111-/* */ 165112-#undef HAVE_DN_SKIPNAME 165113+/* Define if you have the <dirent.h> header file. */ 165114+#undef HAVE_DIRENT_H 165115 165116-/* */ 165117-#undef HAVE_DOM 165118+/* Define if you have the <dlfcn.h> header file. */ 165119+#undef HAVE_DLFCN_H 165120 165121-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ 165122-#undef HAVE_DOPRNT 165123+/* Define if you have the <dns.h> header file. */ 165124+#undef HAVE_DNS_H 165125 165126-/* OpenSSL 0.9.7 or later */ 165127-#undef HAVE_DSA_DEFAULT_METHOD 165128+/* Define if you have the <errno.h> header file. */ 165129+#undef HAVE_ERRNO_H 165130 165131-/* embedded MySQL support enabled */ 165132-#undef HAVE_EMBEDDED_MYSQLI 165133+/* Define if you have the <fcntl.h> header file. */ 165134+#undef HAVE_FCNTL_H 165135 165136-/* */ 165137-#undef HAVE_EMPRESS 165138+/* Define if you have the <grp.h> header file. */ 165139+#undef HAVE_GRP_H 165140 165141-/* */ 165142-#undef HAVE_ENCHANT 165143+/* Define if you have the <ieeefp.h> header file. */ 165144+#undef HAVE_IEEEFP_H 165145 165146-/* */ 165147-#undef HAVE_ENCHANT_BROKER_SET_PARAM 165148+/* Define if you have the <inttypes.h> header file. */ 165149+#undef HAVE_INTTYPES_H 165150 165151-/* do we have epoll? */ 165152-#undef HAVE_EPOLL 165153+/* Define if you have the <langinfo.h> header file. */ 165154+#undef HAVE_LANGINFO_H 165155 165156-/* Define to 1 if you have the <errno.h> header file. */ 165157-#undef HAVE_ERRNO_H 165158+/* Define if you have the <limits.h> header file. */ 165159+#undef HAVE_LIMITS_H 165160 165161-/* */ 165162-#undef HAVE_ESOOB 165163+/* Define if you have the <locale.h> header file. */ 165164+#undef HAVE_LOCALE_H 165165 165166-/* Whether you want EXIF (metadata from images) support */ 165167-#undef HAVE_EXIF 165168+/* Define if you have the <malloc.h> header file. */ 165169+#undef HAVE_MALLOC_H 165170 165171-/* Define to 1 if you have the `fabsf' function. */ 165172-#undef HAVE_FABSF 165173+/* Define if you have the <monetary.h> header file. */ 165174+#undef HAVE_MONETARY_H 165175 165176-/* Define to 1 if you have the <fcntl.h> header file. */ 165177-#undef HAVE_FCNTL_H 165178+/* Define if you have the <ndir.h> header file. */ 165179+#undef HAVE_NDIR_H 165180 165181-/* Define to 1 if you have the `finite' function. */ 165182-#undef HAVE_FINITE 165183+/* Define if you have the <netdb.h> header file. */ 165184+#undef HAVE_NETDB_H 165185 165186-/* Define to 1 if you have the `flock' function. */ 165187-#undef HAVE_FLOCK 165188+/* Define if you have the <netinet/in.h> header file. */ 165189+#undef HAVE_NETINET_IN_H 165190 165191-/* Define to 1 if you have the `floorf' function. */ 165192-#undef HAVE_FLOORF 165193+/* Define if you have the <netinet/tcp.h> header file. */ 165194+#undef HAVE_NETINET_TCP_H 165195 165196-/* Define if flush should be called explicitly after a buffered io. */ 165197-#undef HAVE_FLUSHIO 165198+/* Define if you have the <openssl/crypto.h> header file. */ 165199+#undef HAVE_OPENSSL_CRYPTO_H 165200 165201-/* Define to 1 if your system has a working POSIX `fnmatch' function. */ 165202-#undef HAVE_FNMATCH 165203+/* Define if you have the <pwd.h> header file. */ 165204+#undef HAVE_PWD_H 165205 165206-/* */ 165207-#undef HAVE_FOPENCOOKIE 165208+/* Define if you have the <resolv.h> header file. */ 165209+#undef HAVE_RESOLV_H 165210 165211-/* Define to 1 if you have the `fork' function. */ 165212-#undef HAVE_FORK 165213+/* Define if you have the <signal.h> header file. */ 165214+#undef HAVE_SIGNAL_H 165215 165216-/* Define to 1 if you have the `fpclass' function. */ 165217-#undef HAVE_FPCLASS 165218+/* Define if you have the <st.h> header file. */ 165219+#undef HAVE_ST_H 165220 165221-/* whether fpsetprec is present and usable */ 165222-#undef HAVE_FPSETPREC 165223+/* Define if you have the <stdarg.h> header file. */ 165224+#undef HAVE_STDARG_H 165225 165226-/* whether FPU control word can be manipulated by inline assembler */ 165227-#undef HAVE_FPU_INLINE_ASM_X86 165228+/* Define if you have the <stdbool.h> header file. */ 165229+#undef HAVE_STDBOOL_H 165230 165231-/* whether floatingpoint.h defines fp_except */ 165232-#undef HAVE_FP_EXCEPT 165233+/* Define if you have the <stdint.h> header file. */ 165234+#undef HAVE_STDINT_H 165235 165236-/* */ 165237-#undef HAVE_FREETDS 165238+/* Define if you have the <stdio.h> header file. */ 165239+#undef HAVE_STDIO_H 165240 165241-/* Define to 1 if you have the `ftok' function. */ 165242-#undef HAVE_FTOK 165243+/* Define if you have the <stdlib.h> header file. */ 165244+#undef HAVE_STDLIB_H 165245 165246-/* Whether you want FTP support */ 165247-#undef HAVE_FTP 165248+/* Define if you have the <string.h> header file. */ 165249+#undef HAVE_STRING_H 165250 165251-/* Define to 1 if you have the `funopen' function. */ 165252-#undef HAVE_FUNOPEN 165253+/* Define if you have the <strings.h> header file. */ 165254+#undef HAVE_STRINGS_H 165255 165256-/* Define to 1 if you have the `gai_strerror' function. */ 165257-#undef HAVE_GAI_STRERROR 165258+/* Define if you have the <sys/dir.h> header file. */ 165259+#undef HAVE_SYS_DIR_H 165260 165261-/* Whether you have gcov */ 165262-#undef HAVE_GCOV 165263+/* Define if you have the <sys/file.h> header file. */ 165264+#undef HAVE_SYS_FILE_H 165265 165266-/* Define to 1 if you have the `gcvt' function. */ 165267-#undef HAVE_GCVT 165268+/* Define if you have the <sys/ioctl.h> header file. */ 165269+#undef HAVE_SYS_IOCTL_H 165270 165271-/* */ 165272-#undef HAVE_GDIMAGECOLORRESOLVE 165273+/* Define if you have the <sys/ipc.h> header file. */ 165274+#undef HAVE_SYS_IPC_H 165275 165276-/* */ 165277-#undef HAVE_GD_BUNDLED 165278+/* Define if you have the <sys/loadavg.h> header file. */ 165279+#undef HAVE_SYS_LOADAVG_H 165280 165281-/* */ 165282-#undef HAVE_GD_CACHE_CREATE 165283+/* Define if you have the <sys/mkdev.h> header file. */ 165284+#undef HAVE_SYS_MKDEV_H 165285 165286-/* */ 165287-#undef HAVE_GD_DYNAMIC_CTX_EX 165288+/* Define if you have the <sys/mman.h> header file. */ 165289+#undef HAVE_SYS_MMAN_H 165290 165291-/* */ 165292-#undef HAVE_GD_FONTCACHESHUTDOWN 165293+/* Define if you have the <sys/mount.h> header file. */ 165294+#undef HAVE_SYS_MOUNT_H 165295 165296-/* */ 165297-#undef HAVE_GD_FONTMUTEX 165298+/* Define if you have the <sys/ndir.h> header file. */ 165299+#undef HAVE_SYS_NDIR_H 165300 165301-/* */ 165302-#undef HAVE_GD_FREEFONTCACHE 165303+/* Define if you have the <sys/param.h> header file. */ 165304+#undef HAVE_SYS_PARAM_H 165305 165306-/* */ 165307-#undef HAVE_GD_GD2 165308+/* Define if you have the <sys/poll.h> header file. */ 165309+#undef HAVE_SYS_POLL_H 165310 165311-/* */ 165312-#undef HAVE_GD_GIF_CREATE 165313+/* Define if you have the <sys/resource.h> header file. */ 165314+#undef HAVE_SYS_RESOURCE_H 165315 165316-/* */ 165317-#undef HAVE_GD_GIF_CTX 165318+/* Define if you have the <sys/select.h> header file. */ 165319+#undef HAVE_SYS_SELECT_H 165320 165321-/* */ 165322-#undef HAVE_GD_GIF_READ 165323+/* Define if you have the <sys/socket.h> header file. */ 165324+#undef HAVE_SYS_SOCKET_H 165325 165326-/* */ 165327-#undef HAVE_GD_IMAGEELLIPSE 165328+/* Define if you have the <sys/stat.h> header file. */ 165329+#undef HAVE_SYS_STAT_H 165330 165331-/* */ 165332-#undef HAVE_GD_IMAGESETBRUSH 165333+/* Define if you have the <sys/statfs.h> header file. */ 165334+#undef HAVE_SYS_STATFS_H 165335 165336-/* */ 165337-#undef HAVE_GD_IMAGESETTILE 165338+/* Define if you have the <sys/statvfs.h> header file. */ 165339+#undef HAVE_SYS_STATVFS_H 165340 165341-/* */ 165342-#undef HAVE_GD_JPG 165343+/* Define if you have the <sys/sysexits.h> header file. */ 165344+#undef HAVE_SYS_SYSEXITS_H 165345 165346-/* */ 165347-#undef HAVE_GD_PNG 165348+/* Define if you have the <sys/time.h> header file. */ 165349+#undef HAVE_SYS_TIME_H 165350 165351-/* */ 165352-#undef HAVE_GD_STRINGFT 165353+/* Define if you have the <sys/times.h> header file. */ 165354+#undef HAVE_SYS_TIMES_H 165355 165356-/* */ 165357-#undef HAVE_GD_STRINGFTEX 165358+/* Define if you have the <sys/types.h> header file. */ 165359+#undef HAVE_SYS_TYPES_H 165360 165361-/* */ 165362-#undef HAVE_GD_STRINGTTF 165363+/* Define if you have the <sys/uio.h> header file. */ 165364+#undef HAVE_SYS_UIO_H 165365 165366-/* */ 165367-#undef HAVE_GD_WBMP 165368+/* Define if you have the <sys/un.h> header file. */ 165369+#undef HAVE_SYS_UN_H 165370 165371-/* */ 165372-#undef HAVE_GD_XBM 165373+/* Define if you have the <sys/utsname.h> header file. */ 165374+#undef HAVE_SYS_UTSNAME_H 165375 165376-/* */ 165377-#undef HAVE_GD_XPM 165378+/* Define if you have the <sys/varargs.h> header file. */ 165379+#undef HAVE_SYS_VARARGS_H 165380 165381-/* Define if you have the getaddrinfo function */ 165382-#undef HAVE_GETADDRINFO 165383+/* Define if you have the <sys/vfs.h> header file. */ 165384+#undef HAVE_SYS_VFS_H 165385 165386-/* Define to 1 if you have the `getcwd' function. */ 165387-#undef HAVE_GETCWD 165388+/* Define if you have the <sys/wait.h> header file. */ 165389+#undef HAVE_SYS_WAIT_H 165390 165391-/* Define to 1 if you have the `getgrgid_r' function. */ 165392-#undef HAVE_GETGRGID_R 165393+/* Define if you have the <sysexits.h> header file. */ 165394+#undef HAVE_SYSEXITS_H 165395 165396-/* Define to 1 if you have the `getgrnam_r' function. */ 165397-#undef HAVE_GETGRNAM_R 165398+/* Define if you have the <syslog.h> header file. */ 165399+#undef HAVE_SYSLOG_H 165400 165401-/* Define to 1 if you have the `getgroups' function. */ 165402-#undef HAVE_GETGROUPS 165403+/* Define if you have the <termios.h> header file. */ 165404+#undef HAVE_TERMIOS_H 165405 165406-/* */ 165407-#undef HAVE_GETHOSTBYADDR 165408+/* Define if you have the <time.h> header file. */ 165409+#undef HAVE_TIME_H 165410 165411-/* Define to 1 if you have the `gethostname' function. */ 165412-#undef HAVE_GETHOSTNAME 165413+/* Define if you have the <tuxmodule.h> header file. */ 165414+#undef HAVE_TUXMODULE_H 165415 165416-/* Define to 1 if you have the `getloadavg' function. */ 165417-#undef HAVE_GETLOADAVG 165418+/* Define if you have the <unistd.h> header file. */ 165419+#undef HAVE_UNISTD_H 165420 165421-/* Define to 1 if you have the `getlogin' function. */ 165422-#undef HAVE_GETLOGIN 165423+/* Define if you have the <unix.h> header file. */ 165424+#undef HAVE_UNIX_H 165425 165426-/* Define to 1 if you have the `getopt' function. */ 165427-#undef HAVE_GETOPT 165428+/* Define if you have the <utime.h> header file. */ 165429+#undef HAVE_UTIME_H 165430 165431-/* Define to 1 if you have the `getpgid' function. */ 165432-#undef HAVE_GETPGID 165433+/* Define if you have the <wchar.h> header file. */ 165434+#undef HAVE_WCHAR_H 165435 165436-/* Define to 1 if you have the `getpid' function. */ 165437-#undef HAVE_GETPID 165438+/* Define if you have the <xmlparse.h> header file. */ 165439+#undef HAVE_XMLPARSE_H 165440 165441-/* Define to 1 if you have the `getpriority' function. */ 165442-#undef HAVE_GETPRIORITY 165443+/* Define if you have the <xmltok.h> header file. */ 165444+#undef HAVE_XMLTOK_H 165445 165446-/* Define to 1 if you have the `getprotobyname' function. */ 165447-#undef HAVE_GETPROTOBYNAME 165448+/* Define if you have the m library (-lm). */ 165449+#undef HAVE_LIBM 165450 165451-/* Define to 1 if you have the `getprotobynumber' function. */ 165452-#undef HAVE_GETPROTOBYNUMBER 165453+/* Define if the target system has /dev/urandom device */ 165454+#undef HAVE_DEV_URANDOM 165455 165456-/* Define to 1 if you have the `getpwnam_r' function. */ 165457-#undef HAVE_GETPWNAM_R 165458+/* Suhosin Patch */ 165459+#undef SUHOSIN_PATCH 165460 165461-/* Define to 1 if you have the `getpwuid_r' function. */ 165462-#undef HAVE_GETPWUID_R 165463+/* Whether you have AOLserver */ 165464+#undef HAVE_AOLSERVER 165465 165466-/* Define to 1 if you have the `getrlimit' function. */ 165467-#undef HAVE_GETRLIMIT 165468+/* */ 165469+#undef HAVE_AP_CONFIG_H 165470 165471-/* Define to 1 if you have the `getrusage' function. */ 165472-#undef HAVE_GETRUSAGE 165473+/* */ 165474+#undef HAVE_AP_COMPAT_H 165475 165476-/* Define to 1 if you have the `getservbyname' function. */ 165477-#undef HAVE_GETSERVBYNAME 165478+/* */ 165479+#undef HAVE_APACHE 165480 165481-/* Define to 1 if you have the `getservbyport' function. */ 165482-#undef HAVE_GETSERVBYPORT 165483+/* */ 165484+#undef HAVE_APACHE 165485 165486-/* Define to 1 if you have the `getsid' function. */ 165487-#undef HAVE_GETSID 165488+/* */ 165489+#undef HAVE_AP_CONFIG_H 165490 165491-/* Define to 1 if you have the `gettimeofday' function. */ 165492-#undef HAVE_GETTIMEOFDAY 165493+/* */ 165494+#undef HAVE_AP_CONFIG_H 165495 165496-/* Define to 1 if you have the `getwd' function. */ 165497-#undef HAVE_GETWD 165498+/* */ 165499+#undef HAVE_AP_COMPAT_H 165500 165501-/* */ 165502-#undef HAVE_GICONV_H 165503+/* */ 165504+#undef HAVE_OLD_COMPAT_H 165505 165506-/* glibc's iconv implementation */ 165507-#undef HAVE_GLIBC_ICONV 165508+/* */ 165509+#undef HAVE_AP_CONFIG_H 165510 165511-/* Define to 1 if you have the `glob' function. */ 165512-#undef HAVE_GLOB 165513+/* */ 165514+#undef HAVE_AP_COMPAT_H 165515 165516-/* */ 165517-#undef HAVE_GMP 165518+/* */ 165519+#undef HAVE_OLD_COMPAT_H 165520 165521-/* Define to 1 if you have the `gmtime_r' function. */ 165522-#undef HAVE_GMTIME_R 165523+/* */ 165524+#undef HAVE_AP_CONFIG_H 165525 165526-/* Define to 1 if you have the `grantpt' function. */ 165527-#undef HAVE_GRANTPT 165528+/* */ 165529+#undef HAVE_AP_COMPAT_H 165530 165531-/* Define to 1 if you have the <grp.h> header file. */ 165532-#undef HAVE_GRP_H 165533+/* */ 165534+#undef HAVE_OLD_COMPAT_H 165535 165536-/* Have HASH Extension */ 165537-#undef HAVE_HASH_EXT 165538+/* */ 165539+#undef USE_TRANSFER_TABLES 165540 165541-/* Define to 1 if you have the `hstrerror' function. */ 165542-#undef HAVE_HSTRERROR 165543+/* */ 165544+#undef PHP_APACHE_HAVE_CLIENT_FD 165545 165546-/* */ 165547-#undef HAVE_HTONL 165548+/* */ 165549+#undef HAVE_AP_CONFIG_H 165550 165551-/* whether HUGE_VAL == INF */ 165552-#undef HAVE_HUGE_VAL_INF 165553+/* */ 165554+#undef HAVE_AP_COMPAT_H 165555 165556-/* whether HUGE_VAL + -HUGEVAL == NAN */ 165557-#undef HAVE_HUGE_VAL_NAN 165558+/* */ 165559+#undef HAVE_APACHE_HOOKS 165560 165561-/* Define to 1 if you have the `hypot' function. */ 165562-#undef HAVE_HYPOT 165563+/* */ 165564+#undef HAVE_APACHE 165565 165566-/* */ 165567-#undef HAVE_IBASE 165568+/* */ 165569+#undef HAVE_AP_CONFIG_H 165570 165571-/* */ 165572-#undef HAVE_IBMDB2 165573+/* */ 165574+#undef HAVE_AP_CONFIG_H 165575 165576-/* IBM iconv implementation */ 165577-#undef HAVE_IBM_ICONV 165578+/* */ 165579+#undef HAVE_AP_COMPAT_H 165580 165581-/* */ 165582-#undef HAVE_ICONV 165583+/* */ 165584+#undef HAVE_OLD_COMPAT_H 165585 165586-/* Define to 1 if you have the <ieeefp.h> header file. */ 165587-#undef HAVE_IEEEFP_H 165588+/* */ 165589+#undef HAVE_AP_CONFIG_H 165590 165591-/* */ 165592-#undef HAVE_IMAP 165593+/* */ 165594+#undef HAVE_AP_COMPAT_H 165595 165596-/* */ 165597-#undef HAVE_IMAP2000 165598+/* */ 165599+#undef HAVE_OLD_COMPAT_H 165600 165601-/* */ 165602-#undef HAVE_IMAP2001 165603+/* */ 165604+#undef HAVE_AP_CONFIG_H 165605 165606-/* */ 165607-#undef HAVE_IMAP2004 165608+/* */ 165609+#undef HAVE_AP_COMPAT_H 165610 165611-/* */ 165612-#undef HAVE_IMAP_AUTH_GSS 165613+/* */ 165614+#undef HAVE_OLD_COMPAT_H 165615 165616-/* */ 165617-#undef HAVE_IMAP_KRB 165618+/* */ 165619+#undef USE_TRANSFER_TABLES 165620 165621-/* */ 165622-#undef HAVE_IMAP_MUTF7 165623+/* */ 165624+#undef PHP_APACHE_HAVE_CLIENT_FD 165625 165626-/* */ 165627-#undef HAVE_IMAP_SSL 165628+/* Whether to compile with Caudium support */ 165629+#undef HAVE_CAUDIUM 165630 165631-/* */ 165632-#undef HAVE_INET_ATON 165633+/* Whether you have a Continuity Server */ 165634+#undef HAVE_CONTINUITY 165635 165636-/* Define to 1 if you have the `inet_ntoa' function. */ 165637-#undef HAVE_INET_NTOA 165638+/* do we have prctl? */ 165639+#undef HAVE_PRCTL 165640 165641-/* Define to 1 if you have the `inet_ntop' function. */ 165642-#undef HAVE_INET_NTOP 165643+/* do we have clock_gettime? */ 165644+#undef HAVE_CLOCK_GETTIME 165645 165646-/* Define to 1 if you have the `inet_pton' function. */ 165647-#undef HAVE_INET_PTON 165648+/* do we have clock_get_time? */ 165649+#undef HAVE_CLOCK_GET_TIME 165650 165651-/* Define to 1 if you have the `initgroups' function. */ 165652-#undef HAVE_INITGROUPS 165653+/* do we have ptrace? */ 165654+#undef HAVE_PTRACE 165655 165656-/* Define if int32_t type is present. */ 165657-#undef HAVE_INT32_T 165658+/* do we have mach_vm_read? */ 165659+#undef HAVE_MACH_VM_READ 165660 165661-/* Whether intmax_t is available */ 165662-#undef HAVE_INTMAX_T 165663+/* /proc/pid/mem interface */ 165664+#undef PROC_MEM_FILE 165665 165666-/* Define to 1 if you have the <inttypes.h> header file. */ 165667-#undef HAVE_INTTYPES_H 165668+/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ 165669+#undef HAVE_BUILTIN_ATOMIC 165670 165671-/* */ 165672-#undef HAVE_IODBC 165673+/* do we have TCP_INFO? */ 165674+#undef HAVE_LQ_TCP_INFO 165675 165676-/* */ 165677-#undef HAVE_IODBC_H 165678+/* do we have SO_LISTENQxxx? */ 165679+#undef HAVE_LQ_SO_LISTENQ 165680 165681-/* Whether to enable IPv6 support */ 165682-#undef HAVE_IPV6 165683+/* do we have sysconf? */ 165684+#undef HAVE_SYSCONF 165685 165686-/* Define to 1 if you have the `isascii' function. */ 165687-#undef HAVE_ISASCII 165688+/* do we have times? */ 165689+#undef HAVE_TIMES 165690 165691-/* Define to 1 if you have the `isfinite' function. */ 165692-#undef HAVE_ISFINITE 165693+/* do we have kqueue? */ 165694+#undef HAVE_KQUEUE 165695 165696-/* Define to 1 if you have the `isinf' function. */ 165697-#undef HAVE_ISINF 165698+/* do we have port framework? */ 165699+#undef HAVE_PORT 165700 165701-/* Define to 1 if you have the `isnan' function. */ 165702-#undef HAVE_ISNAN 165703+/* do we have /dev/poll? */ 165704+#undef HAVE_DEVPOLL 165705 165706-/* */ 165707-#undef HAVE_ISQLEXT_H 165708+/* do we have epoll? */ 165709+#undef HAVE_EPOLL 165710 165711-/* */ 165712-#undef HAVE_ISQL_H 165713+/* do we have poll? */ 165714+#undef HAVE_POLL 165715 165716-/* whether to enable JavaScript Object Serialization support */ 165717-#undef HAVE_JSON 165718+/* do we have select? */ 165719+#undef HAVE_SELECT 165720 165721-/* Define to 1 if you have the `kill' function. */ 165722-#undef HAVE_KILL 165723+/* fpm user name */ 165724+#undef PHP_FPM_USER 165725 165726-/* do we have kqueue? */ 165727-#undef HAVE_KQUEUE 165728+/* fpm group name */ 165729+#undef PHP_FPM_GROUP 165730 165731-/* Define to 1 if you have the <langinfo.h> header file. */ 165732-#undef HAVE_LANGINFO_H 165733+/* */ 165734+#undef WITH_ZEUS 165735 165736-/* Define to 1 if you have the `lchown' function. */ 165737-#undef HAVE_LCHOWN 165738+/* Whether you have a Netscape/iPlanet/Sun Webserver */ 165739+#undef HAVE_NSAPI 165740 165741-/* */ 165742-#undef HAVE_LDAP 165743+/* Whether you have phttpd */ 165744+#undef HAVE_PHTTPD 165745 165746-/* Define to 1 if you have the `ldap_parse_reference' function. */ 165747-#undef HAVE_LDAP_PARSE_REFERENCE 165748+/* whether you want Pi3Web support */ 165749+#undef WITH_PI3WEB 165750 165751-/* Define to 1 if you have the `ldap_parse_result' function. */ 165752-#undef HAVE_LDAP_PARSE_RESULT 165753+/* Whether you use Roxen */ 165754+#undef HAVE_ROXEN 165755 165756-/* LDAP SASL support */ 165757-#undef HAVE_LDAP_SASL 165758+/* Whether to use Roxen in ZTS mode */ 165759+#undef ROXEN_USE_ZTS 165760 165761-/* */ 165762-#undef HAVE_LDAP_SASL_H 165763+/* Define if the socklen_t typedef is in sys/socket.h */ 165764+#undef HAVE_SOCKLEN_T 165765 165766-/* */ 165767-#undef HAVE_LDAP_SASL_SASL_H 165768+/* Define if sockaddr_un in sys/un.h contains a sun_len component */ 165769+#undef HAVE_SOCKADDR_UN_SUN_LEN 165770 165771-/* Define to 1 if you have the `ldap_start_tls_s' function. */ 165772-#undef HAVE_LDAP_START_TLS_S 165773+/* Define if cross-process locking is required by accept() */ 165774+#undef USE_LOCKING 165775 165776-/* */ 165777-#undef HAVE_LIBBIND 165778+/* Define if system uses EBCDIC */ 165779+#undef CHARSET_EBCDIC 165780 165781-/* */ 165782-#undef HAVE_LIBCRYPT 165783+/* Define if processor uses big-endian word */ 165784+#undef WORDS_BIGENDIAN 165785 165786-/* */ 165787-#undef HAVE_LIBDL 165788+/* whether write(2) works */ 165789+#undef PHP_WRITE_STDOUT 165790 165791-/* */ 165792-#undef HAVE_LIBDNET_STUB 165793+/* */ 165794+#undef HAVE_SOCKET 165795 165796-/* */ 165797-#undef HAVE_LIBEDIT 165798+/* */ 165799+#undef HAVE_SOCKET 165800 165801-/* */ 165802-#undef HAVE_LIBEXPAT 165803+/* */ 165804+#undef HAVE_LIBSOCKET 165805 165806-/* */ 165807-#undef HAVE_LIBFREETYPE 165808+/* */ 165809+#undef HAVE_SOCKETPAIR 165810 165811-/* */ 165812-#undef HAVE_LIBGD 165813+/* */ 165814+#undef HAVE_SOCKETPAIR 165815 165816-/* */ 165817-#undef HAVE_LIBGD13 165818+/* */ 165819+#undef HAVE_LIBSOCKET 165820 165821-/* */ 165822-#undef HAVE_LIBGD15 165823+/* */ 165824+#undef HAVE_HTONL 165825 165826-/* */ 165827-#undef HAVE_LIBGD20 165828+/* */ 165829+#undef HAVE_HTONL 165830 165831-/* */ 165832-#undef HAVE_LIBGD204 165833+/* */ 165834+#undef HAVE_LIBSOCKET 165835 165836-/* */ 165837-#undef HAVE_LIBICONV 165838+/* */ 165839+#undef HAVE_GETHOSTNAME 165840 165841-/* */ 165842-#undef HAVE_LIBINTL 165843+/* */ 165844+#undef HAVE_GETHOSTNAME 165845 165846-/* Define to 1 if you have the `m' library (-lm). */ 165847-#undef HAVE_LIBM 165848+/* */ 165849+#undef HAVE_LIBNSL 165850 165851-/* */ 165852-#undef HAVE_LIBMCRYPT 165853+/* */ 165854+#undef HAVE_GETHOSTBYADDR 165855 165856-/* Whether you have libmm */ 165857-#undef HAVE_LIBMM 165858+/* */ 165859+#undef HAVE_GETHOSTBYADDR 165860 165861-/* */ 165862+/* */ 165863 #undef HAVE_LIBNSL 165864 165865-/* */ 165866-#undef HAVE_LIBPAM 165867+/* */ 165868+#undef HAVE_YP_GET_DEFAULT_DOMAIN 165869 165870-/* */ 165871-#undef HAVE_LIBRARYMANAGER_H 165872+/* */ 165873+#undef HAVE_YP_GET_DEFAULT_DOMAIN 165874 165875-/* */ 165876-#undef HAVE_LIBREADLINE 165877+/* */ 165878+#undef HAVE_LIBNSL 165879 165880-/* Whether we have librecode 3.5 or higher */ 165881-#undef HAVE_LIBRECODE 165882+/* */ 165883+#undef HAVE_DLOPEN 165884 165885-/* */ 165886-#undef HAVE_LIBRESOLV 165887+/* */ 165888+#undef HAVE_DLOPEN 165889 165890-/* */ 165891-#undef HAVE_LIBRT 165892+/* */ 165893+#undef HAVE_LIBDL 165894 165895-/* */ 165896-#undef HAVE_LIBSOCKET 165897+/* */ 165898+#undef HAVE_LIBDL 165899 165900-/* */ 165901-#undef HAVE_LIBT1 165902+/* */ 165903+#undef HAVE_INET_ATON 165904 165905-/* */ 165906-#undef HAVE_LIBXML 165907+/* */ 165908+#undef HAVE_INET_ATON 165909 165910-/* Define to 1 if you have the <limits.h> header file. */ 165911-#undef HAVE_LIMITS_H 165912+/* */ 165913+#undef HAVE_LIBRESOLV 165914 165915-/* Define to 1 if you have the `link' function. */ 165916-#undef HAVE_LINK 165917+/* */ 165918+#undef HAVE_INET_ATON 165919 165920-/* Define to 1 if you have the `localeconv' function. */ 165921-#undef HAVE_LOCALECONV 165922+/* */ 165923+#undef HAVE_LIBBIND 165924 165925-/* Define to 1 if you have the <locale.h> header file. */ 165926-#undef HAVE_LOCALE_H 165927+/* */ 165928+#undef HAVE_FOPENCOOKIE 165929 165930-/* Define to 1 if you have the `localtime_r' function. */ 165931-#undef HAVE_LOCALTIME_R 165932+/* */ 165933+#undef COOKIE_IO_FUNCTIONS_T 165934 165935-/* Define to 1 if you have the `lockf' function. */ 165936-#undef HAVE_LOCKF 165937+/* */ 165938+#undef COOKIE_SEEKER_USES_OFF64_T 165939 165940-/* Define to 1 if you have the `log1p' function. */ 165941-#undef HAVE_LOG1P 165942+/* Define if system has broken getcwd */ 165943+#undef HAVE_BROKEN_GETCWD 165944 165945-/* do we have SO_LISTENQxxx? */ 165946-#undef HAVE_LQ_SO_LISTENQ 165947+/* Define if your glibc borks on fopen with mode a+ */ 165948+#undef HAVE_BROKEN_GLIBC_FOPEN_APPEND 165949 165950-/* do we have TCP_INFO? */ 165951-#undef HAVE_LQ_TCP_INFO 165952+/* Whether localtime_r is declared */ 165953+#undef MISSING_LOCALTIME_R_DECL 165954 165955-/* Define to 1 if you have the `lrand48' function. */ 165956-#undef HAVE_LRAND48 165957+/* Whether gmtime_r is declared */ 165958+#undef MISSING_GMTIME_R_DECL 165959 165960-/* do we have mach_vm_read? */ 165961-#undef HAVE_MACH_VM_READ 165962+/* Whether asctime_r is declared */ 165963+#undef MISSING_ASCTIME_R_DECL 165964 165965-/* Define to 1 if you have the `makedev' function. */ 165966-#undef HAVE_MAKEDEV 165967+/* Whether ctime_r is declared */ 165968+#undef MISSING_CTIME_R_DECL 165969 165970-/* Define to 1 if you have the <malloc.h> header file. */ 165971-#undef HAVE_MALLOC_H 165972+/* Whether strtok_r is declared */ 165973+#undef MISSING_STRTOK_R_DECL 165974 165975-/* Define to 1 if you have the `mblen' function. */ 165976-#undef HAVE_MBLEN 165977+/* */ 165978+#undef MISSING_FCLOSE_DECL 165979 165980-/* whether to have multibyte regex support */ 165981-#undef HAVE_MBREGEX 165982+/* */ 165983+#undef MISSING_FCLOSE_DECL 165984 165985-/* Define to 1 if you have the `mbrlen' function. */ 165986-#undef HAVE_MBRLEN 165987+/* whether you have tm_gmtoff in struct tm */ 165988+#undef HAVE_TM_GMTOFF 165989 165990-/* Define to 1 if you have the `mbsinit' function. */ 165991-#undef HAVE_MBSINIT 165992+/* whether you have struct flock */ 165993+#undef HAVE_STRUCT_FLOCK 165994 165995-/* Define if your system has mbstate_t in wchar.h */ 165996-#undef HAVE_MBSTATE_T 165997+/* Whether you have socklen_t */ 165998+#undef HAVE_SOCKLEN_T 165999 166000-/* whether to have multibyte string support */ 166001-#undef HAVE_MBSTRING 166002+/* Size of intmax_t */ 166003+#undef SIZEOF_INTMAX_T 166004 166005-/* Define to 1 if you have the `memcpy' function. */ 166006-#undef HAVE_MEMCPY 166007+/* Whether intmax_t is available */ 166008+#undef HAVE_INTMAX_T 166009 166010-/* Define to 1 if you have the `memmove' function. */ 166011-#undef HAVE_MEMMOVE 166012+/* Size of ssize_t */ 166013+#undef SIZEOF_SSIZE_T 166014 166015-/* Define to 1 if you have the <memory.h> header file. */ 166016-#undef HAVE_MEMORY_H 166017+/* Whether ssize_t is available */ 166018+#undef HAVE_SSIZE_T 166019 166020-/* Define to 1 if you have the `mempcpy' function. */ 166021-#undef HAVE_MEMPCPY 166022+/* Size of ptrdiff_t */ 166023+#undef SIZEOF_PTRDIFF_T 166024 166025-/* Define if the target system has support for memory allocation using 166026- mmap(MAP_ANON) */ 166027-#undef HAVE_MEM_MMAP_ANON 166028+/* Whether ptrdiff_t is available */ 166029+#undef HAVE_PTRDIFF_T 166030 166031-/* Define if the target system has support for memory allocation using 166032- mmap("/dev/zero") */ 166033-#undef HAVE_MEM_MMAP_ZERO 166034+/* Whether you have struct sockaddr_storage */ 166035+#undef HAVE_SOCKADDR_STORAGE 166036 166037-/* Define to 1 if you have the `mkfifo' function. */ 166038-#undef HAVE_MKFIFO 166039+/* Whether struct sockaddr has field sa_len */ 166040+#undef HAVE_SOCKADDR_SA_LEN 166041 166042-/* Define to 1 if you have the `mknod' function. */ 166043-#undef HAVE_MKNOD 166044+/* */ 166045+#undef HAVE_NANOSLEEP 166046 166047-/* Define to 1 if you have the `mkstemp' function. */ 166048-#undef HAVE_MKSTEMP 166049+/* */ 166050+#undef HAVE_LIBRT 166051 166052-/* Define to 1 if you have the `mmap' function. */ 166053-#undef HAVE_MMAP 166054+/* Define if you have the getaddrinfo function */ 166055+#undef HAVE_GETADDRINFO 166056 166057-/* Define to 1 if you have the <monetary.h> header file. */ 166058-#undef HAVE_MONETARY_H 166059+/* Define if you have the __sync_fetch_and_add function */ 166060+#undef HAVE_SYNC_FETCH_AND_ADD 166061 166062-/* Define to 1 if you have the `mremap' function. */ 166063-#undef HAVE_MREMAP 166064+/* Whether system headers declare timezone */ 166065+#undef HAVE_DECLARED_TIMEZONE 166066 166067-/* */ 166068-#undef HAVE_MSSQL 166069+/* Whether you have HP-UX 10.x */ 166070+#undef PHP_HPUX_TIME_R 166071 166072-/* Whether you have MySQL */ 166073-#undef HAVE_MYSQL 166074+/* Whether you have IRIX-style functions */ 166075+#undef PHP_IRIX_TIME_R 166076 166077-/* */ 166078-#undef HAVE_MYSQLILIB 166079+/* whether you have POSIX readdir_r */ 166080+#undef HAVE_POSIX_READDIR_R 166081 166082-/* Define to 1 if you have the `mysql_commit' function. */ 166083-#undef HAVE_MYSQL_COMMIT 166084+/* whether you have old-style readdir_r */ 166085+#undef HAVE_OLD_READDIR_R 166086 166087-/* Define to 1 if you have the `mysql_next_result' function. */ 166088-#undef HAVE_MYSQL_NEXT_RESULT 166089+/* */ 166090+#undef in_addr_t 166091 166092-/* Define to 1 if you have the `mysql_sqlstate' function. */ 166093-#undef HAVE_MYSQL_SQLSTATE 166094+/* Define if crypt_r has uses CRYPTD */ 166095+#undef CRYPT_R_CRYPTD 166096 166097-/* Define to 1 if you have the `mysql_stmt_prepare' function. */ 166098-#undef HAVE_MYSQL_STMT_PREPARE 166099+/* Define if crypt_r uses struct crypt_data */ 166100+#undef CRYPT_R_STRUCT_CRYPT_DATA 166101 166102-/* Define to 1 if you have the `nanosleep' function. */ 166103-#undef HAVE_NANOSLEEP 166104+/* Define if struct crypt_data requires _GNU_SOURCE */ 166105+#undef CRYPT_R_GNU_SOURCE 166106 166107-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ 166108-#undef HAVE_NDIR_H 166109+/* Whether you have gcov */ 166110+#undef HAVE_GCOV 166111 166112-/* Define to 1 if you have the <netdb.h> header file. */ 166113-#undef HAVE_NETDB_H 166114+/* */ 166115+#undef PHP_SAFE_MODE 166116 166117-/* Define to 1 if you have the <netinet/in.h> header file. */ 166118-#undef HAVE_NETINET_IN_H 166119+/* */ 166120+#undef PHP_SAFE_MODE 166121 166122-/* Define to 1 if you have the <netinet/tcp.h> header file. */ 166123-#undef HAVE_NETINET_TCP_H 166124+/* */ 166125+#undef PHP_SAFE_MODE_EXEC_DIR 166126 166127-/* */ 166128-#undef HAVE_NET_SNMP 166129+/* */ 166130+#undef PHP_SAFE_MODE_EXEC_DIR 166131 166132-/* Whether utf8_mime2text() has new signature */ 166133-#undef HAVE_NEW_MIME2TEXT 166134+/* */ 166135+#undef PHP_SIGCHILD 166136 166137-/* */ 166138-#undef HAVE_NGETTEXT 166139+/* */ 166140+#undef PHP_SIGCHILD 166141 166142-/* Define to 1 if you have the `nice' function. */ 166143-#undef HAVE_NICE 166144+/* */ 166145+#undef MAGIC_QUOTES 166146 166147-/* Define to 1 if you have the `nl_langinfo' function. */ 166148-#undef HAVE_NL_LANGINFO 166149+/* */ 166150+#undef MAGIC_QUOTES 166151 166152-/* Whether you have a Netscape/iPlanet/Sun Webserver */ 166153-#undef HAVE_NSAPI 166154+/* */ 166155+#undef DEFAULT_SHORT_OPEN_TAG 166156 166157-/* */ 166158-#undef HAVE_NSLDAP 166159+/* */ 166160+#undef DEFAULT_SHORT_OPEN_TAG 166161 166162-/* */ 166163-#undef HAVE_OCI8 166164+/* Whether you have dmalloc */ 166165+#undef HAVE_DMALLOC 166166 166167-/* */ 166168-#undef HAVE_OCICOLLASSIGN 166169+/* Whether to enable IPv6 support */ 166170+#undef HAVE_IPV6 166171 166172-/* */ 166173-#undef HAVE_OCIENVCREATE 166174+/* Define if int32_t type is present. */ 166175+#undef HAVE_INT32_T 166176 166177-/* */ 166178-#undef HAVE_OCIENVNLSCREATE 166179+/* Define if uint32_t type is present. */ 166180+#undef HAVE_UINT32_T 166181 166182-/* */ 166183-#undef HAVE_OCILOBISTEMPORARY 166184+/* Whether to build date as dynamic module */ 166185+#undef COMPILE_DL_DATE 166186 166187-/* */ 166188-#undef HAVE_OCISTMTFETCH2 166189+/* Whether to build ereg as dynamic module */ 166190+#undef COMPILE_DL_EREG 166191 166192-/* */ 166193-#undef HAVE_OCI_INSTANT_CLIENT 166194+/* */ 166195+#undef HAVE_REGEX_T_RE_MAGIC 166196 166197-/* */ 166198-#undef HAVE_OCI_LOB_READ2 166199+/* */ 166200+#undef HSREGEX 166201 166202-/* */ 166203-#undef HAVE_ODBC2 166204+/* */ 166205+#undef REGEX 166206 166207-/* */ 166208-#undef HAVE_ODBCSDK_H 166209+/* */ 166210+#undef REGEX 166211 166212-/* */ 166213-#undef HAVE_ODBC_H 166214+/* 1 */ 166215+#undef HAVE_REGEX_T_RE_MAGIC 166216 166217-/* */ 166218-#undef HAVE_ODBC_ROUTER 166219+/* */ 166220+#undef HAVE_LIBXML 166221+ 166222+/* */ 166223+#undef HAVE_LIBXML 166224+ 166225+/* Whether to build libxml as dynamic module */ 166226+#undef COMPILE_DL_LIBXML 166227+ 166228+/* Whether to build openssl as dynamic module */ 166229+#undef COMPILE_DL_OPENSSL 166230+ 166231+/* OpenSSL 0.9.7 or later */ 166232+#undef HAVE_DSA_DEFAULT_METHOD 166233+ 166234+/* OpenSSL 0.9.7 or later */ 166235+#undef HAVE_DSA_DEFAULT_METHOD 166236+ 166237+/* */ 166238+#undef HAVE_OPENSSL_EXT 166239+ 166240+/* */ 166241+#undef HAVE_PCRE 166242+ 166243+/* Whether to build pcre as dynamic module */ 166244+#undef COMPILE_DL_PCRE 166245+ 166246+/* Whether to build pcre as dynamic module */ 166247+#undef COMPILE_DL_PCRE 166248+ 166249+/* */ 166250+#undef HAVE_BUNDLED_PCRE 166251+ 166252+/* have commercial sqlite3 with crypto support */ 166253+#undef HAVE_SQLITE3_KEY 166254+ 166255+/* have sqlite3 with extension support */ 166256+#undef SQLITE_OMIT_LOAD_EXTENSION 166257+ 166258+/* */ 166259+#undef HAVE_SQLITE3 166260+ 166261+/* Whether to build sqlite3 as dynamic module */ 166262+#undef COMPILE_DL_SQLITE3 166263+ 166264+/* Whether to build zlib as dynamic module */ 166265+#undef COMPILE_DL_ZLIB 166266+ 166267+/* */ 166268+#undef HAVE_ZLIB 166269+ 166270+/* Whether to build bcmath as dynamic module */ 166271+#undef COMPILE_DL_BCMATH 166272+ 166273+/* Whether you have bcmath */ 166274+#undef HAVE_BCMATH 166275+ 166276+/* */ 166277+#undef HAVE_BZ2 166278+ 166279+/* Whether to build bz2 as dynamic module */ 166280+#undef COMPILE_DL_BZ2 166281+ 166282+/* */ 166283+#undef HAVE_CALENDAR 166284+ 166285+/* Whether to build calendar as dynamic module */ 166286+#undef COMPILE_DL_CALENDAR 166287+ 166288+/* */ 166289+#undef HAVE_CTYPE 166290+ 166291+/* Whether to build ctype as dynamic module */ 166292+#undef COMPILE_DL_CTYPE 166293+ 166294+/* Have cURL with SSL support */ 166295+#undef HAVE_CURL_SSL 166296+ 166297+/* Have cURL with OpenSSL support */ 166298+#undef HAVE_CURL_OPENSSL 166299+ 166300+/* Have cURL with GnuTLS support */ 166301+#undef HAVE_CURL_GNUTLS 166302+ 166303+/* */ 166304+#undef HAVE_CURL 166305+ 166306+/* */ 166307+#undef HAVE_CURL_VERSION_INFO 166308+ 166309+/* */ 166310+#undef HAVE_CURL_EASY_STRERROR 166311+ 166312+/* */ 166313+#undef HAVE_CURL_MULTI_STRERROR 166314+ 166315+/* */ 166316+#undef PHP_CURL_URL_WRAPPERS 166317+ 166318+/* Whether to build curl as dynamic module */ 166319+#undef COMPILE_DL_CURL 166320+ 166321+/* */ 166322+#undef QDBM_INCLUDE_FILE 166323+ 166324+/* */ 166325+#undef DBA_QDBM 166326+ 166327+/* */ 166328+#undef GDBM_INCLUDE_FILE 166329+ 166330+/* */ 166331+#undef DBA_GDBM 166332+ 166333+/* */ 166334+#undef NDBM_INCLUDE_FILE 166335+ 166336+/* */ 166337+#undef DBA_NDBM 166338+ 166339+/* */ 166340+#undef DBA_DB4 166341+ 166342+/* */ 166343+#undef DB4_INCLUDE_FILE 166344+ 166345+/* */ 166346+#undef DBA_DB3 166347+ 166348+/* */ 166349+#undef DB3_INCLUDE_FILE 166350+ 166351+/* */ 166352+#undef DBA_DB2 166353+ 166354+/* */ 166355+#undef DB2_INCLUDE_FILE 166356+ 166357+/* */ 166358+#undef DB1_VERSION 166359+ 166360+/* */ 166361+#undef DB1_VERSION 166362+ 166363+/* */ 166364+#undef DB1_INCLUDE_FILE 166365+ 166366+/* */ 166367+#undef DBA_DB1 166368+ 166369+/* */ 166370+#undef DBM_INCLUDE_FILE 166371+ 166372+/* */ 166373+#undef DBM_VERSION 166374+ 166375+/* */ 166376+#undef DBM_VERSION 166377+ 166378+/* */ 166379+#undef DBA_DBM 166380+ 166381+/* */ 166382+#undef DBA_CDB_BUILTIN 166383+ 166384+/* */ 166385+#undef DBA_CDB_MAKE 166386+ 166387+/* */ 166388+#undef DBA_CDB 166389+ 166390+/* */ 166391+#undef CDB_INCLUDE_FILE 166392+ 166393+/* */ 166394+#undef DBA_CDB 166395+ 166396+/* */ 166397+#undef DBA_INIFILE 166398+ 166399+/* */ 166400+#undef DBA_FLATFILE 166401+ 166402+/* */ 166403+#undef HAVE_DBA 166404+ 166405+/* Whether to build dba as dynamic module */ 166406+#undef COMPILE_DL_DBA 166407+ 166408+/* */ 166409+#undef HAVE_LIBXML 166410+ 166411+/* */ 166412+#undef HAVE_DOM 166413+ 166414+/* Whether to build dom as dynamic module */ 166415+#undef COMPILE_DL_DOM 166416+ 166417+/* Whether to build enchant as dynamic module */ 166418+#undef COMPILE_DL_ENCHANT 166419+ 166420+/* */ 166421+#undef HAVE_ENCHANT 166422+ 166423+/* */ 166424+#undef HAVE_ENCHANT_BROKER_SET_PARAM 166425+ 166426+/* */ 166427+#undef ENCHANT_VERSION_STRING 166428+ 166429+/* Whether you want EXIF (metadata from images) support */ 166430+#undef HAVE_EXIF 166431+ 166432+/* Whether to build exif as dynamic module */ 166433+#undef COMPILE_DL_EXIF 166434+ 166435+/* Whether to build fileinfo as dynamic module */ 166436+#undef COMPILE_DL_FILEINFO 166437+ 166438+/* Whether to build filter as dynamic module */ 166439+#undef COMPILE_DL_FILTER 166440+ 166441+/* Whether you want FTP support */ 166442+#undef HAVE_FTP 166443+ 166444+/* Whether to build ftp as dynamic module */ 166445+#undef COMPILE_DL_FTP 166446+ 166447+/* */ 166448+#undef USE_GD_IMGSTRTTF 166449+ 166450+/* */ 166451+#undef USE_GD_IMGSTRTTF 166452+ 166453+/* */ 166454+#undef HAVE_LIBFREETYPE 166455+ 166456+/* */ 166457+#undef ENABLE_GD_TTF 166458+ 166459+/* */ 166460+#undef HAVE_LIBT1 166461+ 166462+/* */ 166463+#undef HAVE_LIBGD 166464+ 166465+/* */ 166466+#undef HAVE_LIBGD13 166467+ 166468+/* */ 166469+#undef HAVE_LIBGD15 166470+ 166471+/* */ 166472+#undef HAVE_LIBGD20 166473+ 166474+/* */ 166475+#undef HAVE_LIBGD204 166476+ 166477+/* */ 166478+#undef HAVE_GD_IMAGESETTILE 166479+ 166480+/* */ 166481+#undef HAVE_GD_IMAGESETBRUSH 166482+ 166483+/* */ 166484+#undef HAVE_GDIMAGECOLORRESOLVE 166485+ 166486+/* */ 166487+#undef HAVE_COLORCLOSESTHWB 166488+ 166489+/* */ 166490+#undef HAVE_GD_WBMP 166491+ 166492+/* */ 166493+#undef HAVE_GD_GD2 166494+ 166495+/* */ 166496+#undef HAVE_GD_PNG 166497+ 166498+/* */ 166499+#undef HAVE_GD_XBM 166500+ 166501+/* */ 166502+#undef HAVE_GD_BUNDLED 166503+ 166504+/* */ 166505+#undef HAVE_GD_GIF_READ 166506+ 166507+/* */ 166508+#undef HAVE_GD_GIF_CREATE 166509+ 166510+/* */ 166511+#undef HAVE_GD_IMAGEELLIPSE 166512+ 166513+/* */ 166514+#undef HAVE_GD_FONTCACHESHUTDOWN 166515+ 166516+/* */ 166517+#undef HAVE_GD_FONTMUTEX 166518+ 166519+/* */ 166520+#undef HAVE_GD_DYNAMIC_CTX_EX 166521+ 166522+/* */ 166523+#undef HAVE_GD_GIF_CTX 166524+ 166525+/* */ 166526+#undef HAVE_GD_JPG 166527+ 166528+/* */ 166529+#undef HAVE_GD_XPM 166530+ 166531+/* */ 166532+#undef HAVE_GD_STRINGFT 166533+ 166534+/* */ 166535+#undef HAVE_GD_STRINGFTEX 166536+ 166537+/* */ 166538+#undef ENABLE_GD_TTF 166539+ 166540+/* */ 166541+#undef USE_GD_JISX0208 166542+ 166543+/* */ 166544+#undef USE_GD_IMGSTRTTF 166545+ 166546+/* */ 166547+#undef USE_GD_IMGSTRTTF 166548+ 166549+/* */ 166550+#undef HAVE_LIBFREETYPE 166551+ 166552+/* */ 166553+#undef ENABLE_GD_TTF 166554+ 166555+/* */ 166556+#undef HAVE_LIBT1 166557+ 166558+/* */ 166559+#undef HAVE_LIBGD 166560+ 166561+/* */ 166562+#undef HAVE_LIBGD13 166563+ 166564+/* */ 166565+#undef HAVE_LIBGD15 166566+ 166567+/* */ 166568+#undef HAVE_GD_PNG 166569+ 166570+/* */ 166571+#undef HAVE_GD_GIF_READ 166572+ 166573+/* */ 166574+#undef HAVE_GD_GIF_CREATE 166575+ 166576+/* */ 166577+#undef HAVE_GD_WBMP 166578+ 166579+/* */ 166580+#undef HAVE_GD_JPG 166581+ 166582+/* */ 166583+#undef HAVE_GD_XPM 166584+ 166585+/* */ 166586+#undef HAVE_GD_GD2 166587+ 166588+/* */ 166589+#undef HAVE_LIBGD20 166590+ 166591+/* */ 166592+#undef HAVE_GD_IMAGESETTILE 166593+ 166594+/* */ 166595+#undef HAVE_GD_IMAGEELLIPSE 166596+ 166597+/* */ 166598+#undef HAVE_GD_IMAGESETBRUSH 166599+ 166600+/* */ 166601+#undef HAVE_GD_STRINGTTF 166602+ 166603+/* */ 166604+#undef HAVE_GD_STRINGFT 166605+ 166606+/* */ 166607+#undef HAVE_GD_STRINGFTEX 166608+ 166609+/* */ 166610+#undef HAVE_COLORCLOSESTHWB 166611+ 166612+/* */ 166613+#undef HAVE_GDIMAGECOLORRESOLVE 166614+ 166615+/* */ 166616+#undef HAVE_GD_GIF_CTX 166617+ 166618+/* */ 166619+#undef HAVE_GD_CACHE_CREATE 166620+ 166621+/* */ 166622+#undef HAVE_GD_FONTCACHESHUTDOWN 166623+ 166624+/* */ 166625+#undef HAVE_GD_FREEFONTCACHE 166626+ 166627+/* */ 166628+#undef HAVE_GD_FONTMUTEX 166629+ 166630+/* */ 166631+#undef HAVE_GD_DYNAMIC_CTX_EX 166632+ 166633+/* */ 166634+#undef HAVE_LIBGD204 166635+ 166636+/* Whether to build gd as dynamic module */ 166637+#undef COMPILE_DL_GD 166638+ 166639+/* */ 166640+#undef HAVE_LIBINTL 166641+ 166642+/* Whether to build gettext as dynamic module */ 166643+#undef COMPILE_DL_GETTEXT 166644+ 166645+/* */ 166646+#undef HAVE_NGETTEXT 166647+ 166648+/* */ 166649+#undef HAVE_DNGETTEXT 166650+ 166651+/* */ 166652+#undef HAVE_DCNGETTEXT 166653+ 166654+/* */ 166655+#undef HAVE_BIND_TEXTDOMAIN_CODESET 166656+ 166657+/* Whether to build gmp as dynamic module */ 166658+#undef COMPILE_DL_GMP 166659+ 166660+/* */ 166661+#undef HAVE_GMP 166662+ 166663+/* */ 166664+#undef PHP_MHASH_BC 166665+ 166666+/* Have HASH Extension */ 166667+#undef HAVE_HASH_EXT 166668+ 166669+/* Define if processor uses big-endian word */ 166670+#undef WORDS_BIGENDIAN 166671+ 166672+/* Whether to build hash as dynamic module */ 166673+#undef COMPILE_DL_HASH 166674+ 166675+/* */ 166676+#undef HAVE_LIBICONV 166677+ 166678+/* */ 166679+#undef HAVE_GICONV_H 166680+ 166681+/* */ 166682+#undef HAVE_LIBICONV 166683+ 166684+/* iconv() is aliased to libiconv() in -liconv */ 166685+#undef ICONV_ALIASED_LIBICONV 166686+ 166687+/* */ 166688+#undef HAVE_ICONV 166689+ 166690+/* Which iconv implementation to use */ 166691+#undef PHP_ICONV_IMPL 166692+ 166693+/* Konstantin Chuguev's iconv implementation */ 166694+#undef HAVE_BSD_ICONV 166695+ 166696+/* Which iconv implementation to use */ 166697+#undef PHP_ICONV_IMPL 166698+ 166699+/* glibc's iconv implementation */ 166700+#undef HAVE_GLIBC_ICONV 166701+ 166702+/* Which iconv implementation to use */ 166703+#undef PHP_ICONV_IMPL 166704+ 166705+/* IBM iconv implementation */ 166706+#undef HAVE_IBM_ICONV 166707+ 166708+/* Which iconv implementation to use */ 166709+#undef PHP_ICONV_IMPL 166710+ 166711+/* Whether iconv supports error no or not */ 166712+#undef ICONV_SUPPORTS_ERRNO 166713+ 166714+/* Whether iconv supports error no or not */ 166715+#undef ICONV_SUPPORTS_ERRNO 166716+ 166717+/* Whether iconv supports error no or not */ 166718+#undef ICONV_SUPPORTS_ERRNO 166719+ 166720+/* Path to iconv.h */ 166721+#undef PHP_ICONV_H_PATH 166722+ 166723+/* Whether to build iconv as dynamic module */ 166724+#undef COMPILE_DL_ICONV 166725+ 166726+/* Whether to build imap as dynamic module */ 166727+#undef COMPILE_DL_IMAP 166728+ 166729+/* */ 166730+#undef HAVE_IMAP 166731+ 166732+/* */ 166733+#undef HAVE_IMAP2000 166734+ 166735+/* */ 166736+#undef HAVE_IMAP2000 166737 166738-/* */ 166739-#undef HAVE_OLD_COMPAT_H 166740+/* */ 166741+#undef HAVE_IMAP2000 166742 166743-/* whether you have old-style readdir_r */ 166744-#undef HAVE_OLD_READDIR_R 166745+/* */ 166746+#undef HAVE_IMAP2000 166747 166748-/* Define to 1 if the oniguruma library is available */ 166749-#undef HAVE_ONIG 166750+/* */ 166751+#undef HAVE_IMAP2000 166752 166753-/* Define to 1 if you have the <openssl/crypto.h> header file. */ 166754-#undef HAVE_OPENSSL_CRYPTO_H 166755+/* */ 166756+#undef HAVE_IMAP2000 166757 166758-/* */ 166759-#undef HAVE_OPENSSL_EXT 166760+/* */ 166761+#undef HAVE_IMAP2004 166762 166763-/* */ 166764-#undef HAVE_ORALDAP 166765+/* Whether utf8_mime2text() has new signature */ 166766+#undef HAVE_NEW_MIME2TEXT 166767 166768-/* */ 166769-#undef HAVE_ORALDAP_10 166770+/* */ 166771+#undef HAVE_IMAP2001 166772 166773-/* Whether struct _zend_object_value is packed */ 166774-#undef HAVE_PACKED_OBJECT_VALUE 166775+/* */ 166776+#undef HAVE_LIBPAM 166777 166778-/* */ 166779-#undef HAVE_PCRE 166780+/* */ 166781+#undef HAVE_LIBCRYPT 166782 166783-/* */ 166784-#undef HAVE_PDO_DBLIB 166785+/* */ 166786+#undef HAVE_IMAP_KRB 166787 166788-/* */ 166789-#undef HAVE_PDO_FIREBIRD 166790+/* */ 166791+#undef HAVE_IMAP_SSL 166792 166793-/* Whether to build PostgreSQL for PDO support or not */ 166794-#undef HAVE_PDO_PGSQL 166795+/* */ 166796+#undef HAVE_IMAP_AUTH_GSS 166797 166798-/* */ 166799-#undef HAVE_PDO_SQLITELIB 166800+/* */ 166801+#undef HAVE_IMAP_MUTF7 166802 166803-/* Define to 1 if you have the `perror' function. */ 166804-#undef HAVE_PERROR 166805+/* */ 166806+#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST 166807 166808-/* Whether to build PostgreSQL support or not */ 166809-#undef HAVE_PGSQL 166810+/* */ 166811+#undef HAVE_IBASE 166812 166813-/* Whether libpq is compiled with --enable-multibyte */ 166814-#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 166815+/* Whether to build interbase as dynamic module */ 166816+#undef COMPILE_DL_INTERBASE 166817 166818-/* PostgreSQL 7.4 or later */ 166819-#undef HAVE_PGTRANSACTIONSTATUS 166820+/* Whether to build intl as dynamic module */ 166821+#undef COMPILE_DL_INTL 166822 166823-/* Whether to have pg_config.h */ 166824-#undef HAVE_PG_CONFIG_H 166825+/* whether to enable JavaScript Object Serialization support */ 166826+#undef HAVE_JSON 166827 166828-/* PostgreSQL 8.1 or later */ 166829-#undef HAVE_PG_LO_CREATE 166830+/* Whether to build json as dynamic module */ 166831+#undef COMPILE_DL_JSON 166832 166833-/* PostgreSQL 8.4 or later */ 166834-#undef HAVE_PG_LO_IMPORT_WITH_OID 166835+/* Whether to build ldap as dynamic module */ 166836+#undef COMPILE_DL_LDAP 166837 166838-/* */ 166839-#undef HAVE_PHP_SESSION 166840+/* */ 166841+#undef HAVE_NSLDAP 166842 166843-/* Whether you have phttpd */ 166844-#undef HAVE_PHTTPD 166845+/* */ 166846+#undef HAVE_NSLDAP 166847 166848-/* Define to 1 if you have the `poll' function. */ 166849-#undef HAVE_POLL 166850+/* */ 166851+#undef HAVE_NSLDAP 166852 166853-/* do we have port framework? */ 166854-#undef HAVE_PORT 166855+/* */ 166856+#undef HAVE_NSLDAP 166857 166858-/* whether to include POSIX-like functions */ 166859-#undef HAVE_POSIX 166860+/* */ 166861+#undef HAVE_ORALDAP 166862 166863-/* whether you have POSIX readdir_r */ 166864-#undef HAVE_POSIX_READDIR_R 166865+/* */ 166866+#undef HAVE_ORALDAP_10 166867 166868-/* PostgreSQL 7.0.x or later */ 166869-#undef HAVE_PQCLIENTENCODING 166870+/* */ 166871+#undef HAVE_LDAP 166872 166873-/* Broken libpq under windows */ 166874-#undef HAVE_PQCMDTUPLES 166875+/* Whether 3 arg set_rebind_proc() */ 166876+#undef HAVE_3ARG_SETREBINDPROC 166877 166878-/* PostgreSQL 7.2.0 or later */ 166879-#undef HAVE_PQESCAPE 166880+/* */ 166881+#undef HAVE_LDAP_SASL_SASL_H 166882 166883-/* PostgreSQL 8.1.4 or later */ 166884-#undef HAVE_PQESCAPE_BYTEA_CONN 166885+/* */ 166886+#undef HAVE_LDAP_SASL_H 166887 166888-/* PostgreSQL 8.1.4 or later */ 166889-#undef HAVE_PQESCAPE_CONN 166890+/* LDAP SASL support */ 166891+#undef HAVE_LDAP_SASL 166892 166893-/* PostgreSQL 7.4 or later */ 166894-#undef HAVE_PQEXECPARAMS 166895+/* whether to have multibyte string support */ 166896+#undef HAVE_MBSTRING 166897 166898-/* PostgreSQL 7.4 or later */ 166899-#undef HAVE_PQEXECPREPARED 166900+/* whether to check multibyte regex backtrack */ 166901+#undef USE_COMBINATION_EXPLOSION_CHECK 166902 166903-/* PostgreSQL 7.4 or later */ 166904-#undef HAVE_PQFREEMEM 166905+/* Define to 1 if you have the <stdarg.h> header file. */ 166906+#undef HAVE_STDARG_PROTOTYPES 166907 166908-/* PostgreSQL 7.4 or later */ 166909-#undef HAVE_PQFTABLE 166910+/* Define to 1 if the bundled oniguruma is used */ 166911+#undef PHP_ONIG_BUNDLED 166912 166913-/* PostgreSQL 7.4 or later */ 166914-#undef HAVE_PQGETCOPYDATA 166915+/* Define to 1 if the oniguruma library is available */ 166916+#undef HAVE_ONIG 166917 166918-/* Older PostgreSQL */ 166919-#undef HAVE_PQOIDVALUE 166920+/* Define to 1 if the oniguruma library is available */ 166921+#undef HAVE_ONIG 166922 166923-/* PostgreSQL 7.4 or later */ 166924-#undef HAVE_PQPARAMETERSTATUS 166925+/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ 166926+#undef PHP_ONIG_BAD_KOI8_ENTRY 166927 166928-/* PostgreSQL 7.4 or later */ 166929-#undef HAVE_PQPREPARE 166930+/* whether to have multibyte regex support */ 166931+#undef HAVE_MBREGEX 166932 166933-/* PostgreSQL 7.4 or later */ 166934-#undef HAVE_PQPROTOCOLVERSION 166935+/* Whether to build mbstring as dynamic module */ 166936+#undef COMPILE_DL_MBSTRING 166937 166938-/* PostgreSQL 7.4 or later */ 166939-#undef HAVE_PQPUTCOPYDATA 166940+/* */ 166941+#undef HAVE_LIBMCRYPT 166942 166943-/* PostgreSQL 7.4 or later */ 166944-#undef HAVE_PQPUTCOPYEND 166945+/* */ 166946+#undef HAVE_LIBMCRYPT 166947 166948-/* PostgreSQL 7.4 or later */ 166949-#undef HAVE_PQRESULTERRORFIELD 166950+/* Whether to build mcrypt as dynamic module */ 166951+#undef COMPILE_DL_MCRYPT 166952 166953-/* PostgreSQL 7.4 or later */ 166954-#undef HAVE_PQSENDPREPARE 166955+/* Whether to build mssql as dynamic module */ 166956+#undef COMPILE_DL_MSSQL 166957 166958-/* PostgreSQL 7.4 or later */ 166959-#undef HAVE_PQSENDQUERYPARAMS 166960+/* */ 166961+#undef HAVE_LIBDNET_STUB 166962 166963-/* PostgreSQL 7.4 or later */ 166964-#undef HAVE_PQSENDQUERYPREPARED 166965+/* */ 166966+#undef HAVE_MSSQL 166967 166968-/* PostgreSQL 7.4 or later */ 166969-#undef HAVE_PQSETERRORVERBOSITY 166970+/* */ 166971+#undef HAVE_FREETDS 166972 166973-/* PostgreSQL 7.0.x or later */ 166974-#undef HAVE_PQSETNONBLOCKING 166975+/* */ 166976+#undef PHP_MYSQL_UNIX_SOCK_ADDR 166977 166978-/* PostgreSQL 7.3.0 or later */ 166979-#undef HAVE_PQUNESCAPEBYTEA 166980+/* */ 166981+#undef PHP_MYSQL_UNIX_SOCK_ADDR 166982 166983-/* do we have prctl? */ 166984-#undef HAVE_PRCTL 166985+/* Whether you have MySQL */ 166986+#undef HAVE_MYSQL 166987 166988-/* */ 166989-#undef HAVE_PREAD 166990+/* Whether to build mysql as dynamic module */ 166991+#undef COMPILE_DL_MYSQL 166992 166993-/* */ 166994-#undef HAVE_PSPELL 166995+/* Whether mysqlnd is enabled */ 166996+#undef MYSQL_USE_MYSQLND 166997 166998-/* do we have ptrace? */ 166999-#undef HAVE_PTRACE 167000+/* embedded MySQL support enabled */ 167001+#undef HAVE_EMBEDDED_MYSQLI 167002 167003-/* Whether ptrdiff_t is available */ 167004-#undef HAVE_PTRDIFF_T 167005+/* */ 167006+#undef HAVE_MYSQLILIB 167007 167008-/* Define to 1 if you have the `ptsname' function. */ 167009-#undef HAVE_PTSNAME 167010+/* */ 167011+#undef HAVE_STMT_NEXT_RESULT 167012 167013-/* Define to 1 if you have the `putenv' function. */ 167014-#undef HAVE_PUTENV 167015+/* Whether to build mysqli as dynamic module */ 167016+#undef COMPILE_DL_MYSQLI 167017 167018-/* Define to 1 if you have the <pwd.h> header file. */ 167019-#undef HAVE_PWD_H 167020+/* Whether mysqlnd is enabled */ 167021+#undef MYSQLI_USE_MYSQLND 167022 167023-/* */ 167024-#undef HAVE_PWRITE 167025+/* */ 167026+#undef HAVE_OCI_LOB_READ2 167027 167028-/* Define to 1 if you have the `random' function. */ 167029-#undef HAVE_RANDOM 167030+/* Whether to build oci8 as dynamic module */ 167031+#undef COMPILE_DL_OCI8 167032 167033-/* Define to 1 if you have the `rand_r' function. */ 167034-#undef HAVE_RAND_R 167035+/* */ 167036+#undef HAVE_OCI8 167037 167038-/* Define to 1 if you have the `realpath' function. */ 167039-#undef HAVE_REALPATH 167040+/* */ 167041+#undef PHP_OCI8_DEF_DIR 167042 167043-/* Whether Reflection is enabled */ 167044-#undef HAVE_REFLECTION 167045+/* */ 167046+#undef PHP_OCI8_DEF_SHARED_LIBADD 167047 167048-/* 1 */ 167049-#undef HAVE_REGEX_T_RE_MAGIC 167050+/* */ 167051+#undef HAVE_OCI_INSTANT_CLIENT 167052 167053-/* Define to 1 if you have the <resolv.h> header file. */ 167054-#undef HAVE_RESOLV_H 167055+/* */ 167056+#undef HAVE_OCI_LOB_READ2 167057 167058-/* */ 167059-#undef HAVE_RES_NSEARCH 167060+/* Whether to build oci8 as dynamic module */ 167061+#undef COMPILE_DL_OCI8 167062 167063-/* */ 167064-#undef HAVE_RES_SEARCH 167065+/* */ 167066+#undef HAVE_OCI8 167067 167068-/* */ 167069-#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST 167070+/* */ 167071+#undef HAVE_ADABAS 167072 167073-/* */ 167074-#undef HAVE_RL_CALLBACK_READ_CHAR 167075+/* */ 167076+#undef HAVE_SAPDB 167077 167078-/* Define to 1 if you have the `rl_completion_matches' function. */ 167079-#undef HAVE_RL_COMPLETION_MATCHES 167080+/* */ 167081+#undef HAVE_SOLID_35 167082 167083-/* Whether you use Roxen */ 167084-#undef HAVE_ROXEN 167085+/* */ 167086+#undef HAVE_SOLID_30 167087 167088-/* */ 167089-#undef HAVE_SAPDB 167090+/* */ 167091+#undef HAVE_SOLID 167092 167093-/* Define to 1 if you have the `scandir' function. */ 167094-#undef HAVE_SCANDIR 167095+/* Needed in sqlunix.h */ 167096+#undef SS_LINUX 167097 167098-/* do we have select? */ 167099-#undef HAVE_SELECT 167100+/* Needed in sqlunix.h */ 167101+#undef SS_LINUX 167102 167103-/* */ 167104-#undef HAVE_SEMUN 167105+/* Needed in sqlunix.h for wchar defs */ 167106+#undef SS_FBX 167107 167108-/* Define to 1 if you have the `setegid' function. */ 167109-#undef HAVE_SETEGID 167110+/* Needed in sqlunix.h for wchar defs */ 167111+#undef SS_FBX 167112 167113-/* Define to 1 if you have the `setenv' function. */ 167114-#undef HAVE_SETENV 167115+/* */ 167116+#undef HAVE_IBMDB2 167117 167118-/* Define to 1 if you have the `seteuid' function. */ 167119-#undef HAVE_SETEUID 167120+/* */ 167121+#undef HAVE_ODBC_ROUTER 167122 167123-/* Define to 1 if you have the `setitimer' function. */ 167124-#undef HAVE_SETITIMER 167125+/* */ 167126+#undef HAVE_EMPRESS 167127 167128-/* Define to 1 if you have the `setlocale' function. */ 167129-#undef HAVE_SETLOCALE 167130+/* */ 167131+#undef HAVE_EMPRESS 167132 167133-/* Define to 1 if you have the `setpgid' function. */ 167134-#undef HAVE_SETPGID 167135+/* */ 167136+#undef AIX 167137 167138-/* Define to 1 if you have the `setpriority' function. */ 167139-#undef HAVE_SETPRIORITY 167140+/* */ 167141+#undef HPUX 167142 167143-/* Define to 1 if you have the `setproctitle' function. */ 167144-#undef HAVE_SETPROCTITLE 167145+/* */ 167146+#undef LINUX 167147 167148-/* Define to 1 if you have the `setsid' function. */ 167149-#undef HAVE_SETSID 167150+/* */ 167151+#undef NEUTRINO 167152 167153-/* Define to 1 if you have the `setsockopt' function. */ 167154-#undef HAVE_SETSOCKOPT 167155+/* */ 167156+#undef ISOLARIS 167157 167158-/* Define to 1 if you have the `setvbuf' function. */ 167159-#undef HAVE_SETVBUF 167160+/* */ 167161+#undef SOLARIS 167162 167163-/* */ 167164-#undef HAVE_SHMOP 167165+/* */ 167166+#undef UNIXWARE 167167 167168-/* Define to 1 if you have the `shutdown' function. */ 167169-#undef HAVE_SHUTDOWN 167170+/* */ 167171+#undef HAVE_BIRDSTEP 167172 167173-/* */ 167174-#undef HAVE_SIGACTION 167175+/* */ 167176+#undef HAVE_CODBC 167177 167178-/* Define to 1 if you have the <signal.h> header file. */ 167179-#undef HAVE_SIGNAL_H 167180+/* */ 167181+#undef HAVE_IODBC 167182 167183-/* Define to 1 if you have the `sigprocmask' function. */ 167184-#undef HAVE_SIGPROCMASK 167185+/* */ 167186+#undef HAVE_ODBC2 167187 167188-/* Define to 1 if you have the `sigsetjmp' function. */ 167189-#undef HAVE_SIGSETJMP 167190+/* */ 167191+#undef HAVE_ESOOB 167192 167193-/* Define to 1 if you have the `sigtimedwait' function. */ 167194-#undef HAVE_SIGTIMEDWAIT 167195+/* */ 167196+#undef HAVE_UNIXODBC 167197 167198-/* Define to 1 if you have the `sigwaitinfo' function. */ 167199-#undef HAVE_SIGWAITINFO 167200+/* Whether you want DBMaker */ 167201+#undef HAVE_DBMAKER 167202 167203-/* */ 167204-#undef HAVE_SIMPLEXML 167205+/* */ 167206+#undef HAVE_SQLDATASOURCES 167207 167208-/* Define to 1 if you have the `sin' function. */ 167209-#undef HAVE_SIN 167210+/* */ 167211+#undef HAVE_UODBC 167212 167213-/* */ 167214-#undef HAVE_SNMP 167215+/* Whether to build odbc as dynamic module */ 167216+#undef COMPILE_DL_ODBC 167217 167218-/* */ 167219-#undef HAVE_SNMP_PARSE_OID 167220+/* */ 167221+#undef HAVE_FORK 167222 167223-/* Define to 1 if you have the `snprintf' function. */ 167224-#undef HAVE_SNPRINTF 167225+/* */ 167226+#undef HAVE_WAITPID 167227 167228-/* */ 167229-#undef HAVE_SOAP 167230+/* */ 167231+#undef HAVE_SIGACTION 167232 167233-/* Whether struct sockaddr has field sa_len */ 167234-#undef HAVE_SOCKADDR_SA_LEN 167235+/* Whether to build pcntl as dynamic module */ 167236+#undef COMPILE_DL_PCNTL 167237 167238-/* Whether you have struct sockaddr_storage */ 167239-#undef HAVE_SOCKADDR_STORAGE 167240+/* Whether to build pdo as dynamic module */ 167241+#undef COMPILE_DL_PDO 167242 167243-/* Define if sockaddr_un in sys/un.h contains a sun_len component */ 167244-#undef HAVE_SOCKADDR_UN_SUN_LEN 167245+/* Whether to build pdo_dblib as dynamic module */ 167246+#undef COMPILE_DL_PDO_DBLIB 167247 167248-/* */ 167249-#undef HAVE_SOCKET 167250+/* */ 167251+#undef HAVE_LIBDNET_STUB 167252 167253-/* Define to 1 if you have the `socketpair' function. */ 167254-#undef HAVE_SOCKETPAIR 167255+/* */ 167256+#undef HAVE_PDO_DBLIB 167257 167258-/* */ 167259-#undef HAVE_SOCKETS 167260+/* */ 167261+#undef HAVE_FREETDS 167262 167263-/* Whether you have socklen_t */ 167264-#undef HAVE_SOCKLEN_T 167265+/* */ 167266+#undef HAVE_PDO_FIREBIRD 167267 167268-/* */ 167269-#undef HAVE_SOLID 167270+/* Whether to build pdo_firebird as dynamic module */ 167271+#undef COMPILE_DL_PDO_FIREBIRD 167272 167273-/* */ 167274-#undef HAVE_SOLID_30 167275+/* Whether pdo_mysql uses mysqlnd */ 167276+#undef PDO_USE_MYSQLND 167277 167278-/* */ 167279-#undef HAVE_SOLID_35 167280+/* Whether you have MySQL */ 167281+#undef HAVE_MYSQL 167282 167283-/* Whether you want SPL (Standard PHP Library) support */ 167284-#undef HAVE_SPL 167285+/* */ 167286+#undef PDO_MYSQL_UNIX_ADDR 167287 167288-/* */ 167289-#undef HAVE_SQLCLI1_H 167290+/* Whether to build pdo_mysql as dynamic module */ 167291+#undef COMPILE_DL_PDO_MYSQL 167292 167293-/* */ 167294-#undef HAVE_SQLDATASOURCES 167295+/* */ 167296+#undef HAVE_OCIENVCREATE 167297 167298-/* */ 167299-#undef HAVE_SQLEXT_H 167300+/* */ 167301+#undef HAVE_OCIENVNLSCREATE 167302 167303-/* */ 167304-#undef HAVE_SQLITE3 167305+/* */ 167306+#undef HAVE_OCILOBISTEMPORARY 167307 167308-/* have commercial sqlite3 with crypto support */ 167309-#undef HAVE_SQLITE3_KEY 167310+/* */ 167311+#undef HAVE_OCILOBISTEMPORARY 167312 167313-/* */ 167314-#undef HAVE_SQLTYPES_H 167315+/* */ 167316+#undef HAVE_OCICOLLASSIGN 167317 167318-/* */ 167319-#undef HAVE_SQLUCODE_H 167320+/* */ 167321+#undef HAVE_OCISTMTFETCH2 167322 167323-/* */ 167324-#undef HAVE_SQLUNIX_H 167325+/* Whether to build pdo_oci as dynamic module */ 167326+#undef COMPILE_DL_PDO_OCI 167327 167328-/* */ 167329-#undef HAVE_SQL_H 167330+/* */ 167331+#undef PHP_PDO_OCI_CLIENT_VERSION 167332 167333-/* Define to 1 if you have the `srand48' function. */ 167334-#undef HAVE_SRAND48 167335+/* */ 167336+#undef HAVE_ODBC_H 167337 167338-/* Define to 1 if you have the `srandom' function. */ 167339-#undef HAVE_SRANDOM 167340+/* */ 167341+#undef HAVE_ODBCSDK_H 167342 167343-/* Whether ssize_t is available */ 167344-#undef HAVE_SSIZE_T 167345+/* */ 167346+#undef HAVE_IODBC_H 167347 167348-/* Define to 1 if you have the `statfs' function. */ 167349-#undef HAVE_STATFS 167350+/* */ 167351+#undef HAVE_SQLUNIX_H 167352 167353-/* Define to 1 if you have the `statvfs' function. */ 167354-#undef HAVE_STATVFS 167355+/* */ 167356+#undef HAVE_SQLTYPES_H 167357 167358-/* Define to 1 if you have the <stdarg.h> header file. */ 167359-#undef HAVE_STDARG_H 167360+/* */ 167361+#undef HAVE_SQLUCODE_H 167362 167363-/* Define to 1 if you have the <stdarg.h> header file. */ 167364-#undef HAVE_STDARG_PROTOTYPES 167365+/* */ 167366+#undef HAVE_SQL_H 167367 167368-/* Define to 1 if you have the <stdbool.h> header file. */ 167369-#undef HAVE_STDBOOL_H 167370+/* */ 167371+#undef HAVE_ISQL_H 167372 167373-/* Define to 1 if you have the <stdint.h> header file. */ 167374-#undef HAVE_STDINT_H 167375+/* */ 167376+#undef HAVE_SQLEXT_H 167377 167378-/* Define to 1 if you have the <stdio.h> header file. */ 167379-#undef HAVE_STDIO_H 167380+/* */ 167381+#undef HAVE_ISQLEXT_H 167382 167383-/* Define to 1 if you have the <stdlib.h> header file. */ 167384-#undef HAVE_STDLIB_H 167385+/* */ 167386+#undef HAVE_UDBCEXT_H 167387 167388-/* Define to 1 if you have the `std_syslog' function. */ 167389-#undef HAVE_STD_SYSLOG 167390+/* */ 167391+#undef HAVE_SQLCLI1_H 167392 167393-/* */ 167394-#undef HAVE_STMT_NEXT_RESULT 167395+/* */ 167396+#undef HAVE_LIBRARYMANAGER_H 167397 167398-/* Define to 1 if you have the `strcasecmp' function. */ 167399-#undef HAVE_STRCASECMP 167400+/* */ 167401+#undef HAVE_CLI0CORE_H 167402 167403-/* Define to 1 if you have the `strcoll' function. */ 167404-#undef HAVE_STRCOLL 167405+/* */ 167406+#undef HAVE_CLI0EXT_H 167407 167408-/* Define to 1 if you have the `strdup' function. */ 167409-#undef HAVE_STRDUP 167410+/* */ 167411+#undef HAVE_CLI0CLI_H 167412 167413-/* Define to 1 if you have the `strerror' function. */ 167414-#undef HAVE_STRERROR 167415+/* */ 167416+#undef HAVE_CLI0DEFS_H 167417 167418-/* Define to 1 if you have the `strfmon' function. */ 167419-#undef HAVE_STRFMON 167420+/* */ 167421+#undef HAVE_CLI0ENV_H 167422 167423-/* Define to 1 if you have the `strftime' function. */ 167424-#undef HAVE_STRFTIME 167425+/* Whether to build pdo_odbc as dynamic module */ 167426+#undef COMPILE_DL_PDO_ODBC 167427 167428-/* Define to 1 if you have the <strings.h> header file. */ 167429-#undef HAVE_STRINGS_H 167430+/* Whether to have pg_config.h */ 167431+#undef HAVE_PG_CONFIG_H 167432 167433-/* Define to 1 if you have the <string.h> header file. */ 167434-#undef HAVE_STRING_H 167435+/* Whether to have pg_config.h */ 167436+#undef HAVE_PG_CONFIG_H 167437 167438-/* Define to 1 if you have the `strlcat' function. */ 167439-#undef HAVE_STRLCAT 167440+/* Whether to build PostgreSQL for PDO support or not */ 167441+#undef HAVE_PDO_PGSQL 167442 167443-/* Define to 1 if you have the `strlcpy' function. */ 167444-#undef HAVE_STRLCPY 167445+/* PostgreSQL 7.4 or later */ 167446+#undef HAVE_PQPARAMETERSTATUS 167447 167448-/* Define to 1 if you have the `strndup' function. */ 167449-#undef HAVE_STRNDUP 167450+/* PostgreSQL 8.0 or later */ 167451+#undef HAVE_PQPREPARE 167452 167453-/* Define to 1 if you have the `strnlen' function. */ 167454-#undef HAVE_STRNLEN 167455+/* PostgreSQL 8.1.4 or later */ 167456+#undef HAVE_PQESCAPE_CONN 167457 167458-/* Define to 1 if you have the `strpbrk' function. */ 167459-#undef HAVE_STRPBRK 167460+/* PostgreSQL 8.1.4 or later */ 167461+#undef HAVE_PQESCAPE_BYTEA_CONN 167462 167463-/* Define to 1 if you have the `strpncpy' function. */ 167464-#undef HAVE_STRPNCPY 167465+/* Whether libpq is compiled with --enable-multibyte */ 167466+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 167467 167468-/* Define to 1 if you have the `strptime' function. */ 167469-#undef HAVE_STRPTIME 167470+/* Whether to build pdo_pgsql as dynamic module */ 167471+#undef COMPILE_DL_PDO_PGSQL 167472 167473-/* whether strptime() declaration fails */ 167474-#undef HAVE_STRPTIME_DECL_FAILS 167475+/* */ 167476+#undef HAVE_PDO_SQLITELIB 167477 167478-/* Define to 1 if you have the `strstr' function. */ 167479-#undef HAVE_STRSTR 167480+/* have commercial sqlite3 with crypto support */ 167481+#undef HAVE_SQLITE3_KEY 167482 167483-/* Define to 1 if you have the `strtod' function. */ 167484-#undef HAVE_STRTOD 167485+/* Whether to build pdo_sqlite as dynamic module */ 167486+#undef COMPILE_DL_PDO_SQLITE 167487 167488-/* Define to 1 if you have the `strtok_r' function. */ 167489-#undef HAVE_STRTOK_R 167490+/* Whether to build pdo_sqlite as dynamic module */ 167491+#undef COMPILE_DL_PDO_SQLITE 167492 167493-/* Define to 1 if you have the `strtol' function. */ 167494-#undef HAVE_STRTOL 167495+/* Whether to have pg_config.h */ 167496+#undef HAVE_PG_CONFIG_H 167497 167498-/* Define to 1 if you have the `strtoll' function. */ 167499-#undef HAVE_STRTOLL 167500+/* Whether to have pg_config.h */ 167501+#undef HAVE_PG_CONFIG_H 167502 167503-/* Define to 1 if you have the `strtoul' function. */ 167504-#undef HAVE_STRTOUL 167505+/* Whether to build PostgreSQL support or not */ 167506+#undef HAVE_PGSQL 167507 167508-/* Define to 1 if you have the `strtoull' function. */ 167509-#undef HAVE_STRTOULL 167510+/* PostgreSQL 7.2.0 or later */ 167511+#undef HAVE_PQESCAPE 167512 167513-/* whether you have struct flock */ 167514-#undef HAVE_STRUCT_FLOCK 167515+/* PostgreSQL 7.3.0 or later */ 167516+#undef HAVE_PQUNESCAPEBYTEA 167517 167518-/* Define to 1 if `st_blksize' is a member of `struct stat'. */ 167519-#undef HAVE_STRUCT_STAT_ST_BLKSIZE 167520+/* PostgreSQL 7.0.x or later */ 167521+#undef HAVE_PQSETNONBLOCKING 167522 167523-/* Define to 1 if `st_blocks' is a member of `struct stat'. */ 167524-#undef HAVE_STRUCT_STAT_ST_BLOCKS 167525+/* Broken libpq under windows */ 167526+#undef HAVE_PQCMDTUPLES 167527 167528-/* Define to 1 if `st_rdev' is a member of `struct stat'. */ 167529-#undef HAVE_STRUCT_STAT_ST_RDEV 167530+/* Older PostgreSQL */ 167531+#undef HAVE_PQOIDVALUE 167532 167533-/* Define to 1 if `tm_zone' is a member of `struct tm'. */ 167534-#undef HAVE_STRUCT_TM_TM_ZONE 167535+/* PostgreSQL 7.0.x or later */ 167536+#undef HAVE_PQCLIENTENCODING 167537 167538-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use 167539- `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ 167540-#undef HAVE_ST_BLKSIZE 167541+/* PostgreSQL 7.4 or later */ 167542+#undef HAVE_PQPARAMETERSTATUS 167543 167544-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use 167545- `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ 167546-#undef HAVE_ST_BLOCKS 167547+/* PostgreSQL 7.4 or later */ 167548+#undef HAVE_PQPROTOCOLVERSION 167549 167550-/* Define to 1 if you have the <st.h> header file. */ 167551-#undef HAVE_ST_H 167552+/* PostgreSQL 7.4 or later */ 167553+#undef HAVE_PGTRANSACTIONSTATUS 167554 167555-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use 167556- `HAVE_STRUCT_STAT_ST_RDEV' instead. */ 167557-#undef HAVE_ST_RDEV 167558+/* PostgreSQL 7.4 or later */ 167559+#undef HAVE_PQEXECPARAMS 167560 167561-/* */ 167562-#undef HAVE_SYBASE_CT 167563+/* PostgreSQL 7.4 or later */ 167564+#undef HAVE_PQPREPARE 167565 167566-/* Define to 1 if you have the `symlink' function. */ 167567-#undef HAVE_SYMLINK 167568+/* PostgreSQL 7.4 or later */ 167569+#undef HAVE_PQEXECPREPARED 167570 167571-/* Define if you have the __sync_fetch_and_add function */ 167572-#undef HAVE_SYNC_FETCH_AND_ADD 167573+/* PostgreSQL 7.4 or later */ 167574+#undef HAVE_PQRESULTERRORFIELD 167575 167576-/* do we have sysconf? */ 167577-#undef HAVE_SYSCONF 167578+/* PostgreSQL 7.4 or later */ 167579+#undef HAVE_PQSENDQUERYPARAMS 167580 167581-/* Define to 1 if you have the <sysexits.h> header file. */ 167582-#undef HAVE_SYSEXITS_H 167583+/* PostgreSQL 7.4 or later */ 167584+#undef HAVE_PQSENDPREPARE 167585 167586-/* Define to 1 if you have the <syslog.h> header file. */ 167587-#undef HAVE_SYSLOG_H 167588+/* PostgreSQL 7.4 or later */ 167589+#undef HAVE_PQSENDQUERYPREPARED 167590 167591-/* */ 167592-#undef HAVE_SYSVMSG 167593+/* PostgreSQL 7.4 or later */ 167594+#undef HAVE_PQPUTCOPYDATA 167595 167596-/* */ 167597-#undef HAVE_SYSVSEM 167598+/* PostgreSQL 7.4 or later */ 167599+#undef HAVE_PQPUTCOPYEND 167600 167601-/* */ 167602-#undef HAVE_SYSVSHM 167603+/* PostgreSQL 7.4 or later */ 167604+#undef HAVE_PQGETCOPYDATA 167605 167606-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. 167607- */ 167608-#undef HAVE_SYS_DIR_H 167609+/* PostgreSQL 7.4 or later */ 167610+#undef HAVE_PQFREEMEM 167611 167612-/* Define to 1 if you have the <sys/file.h> header file. */ 167613-#undef HAVE_SYS_FILE_H 167614+/* PostgreSQL 7.4 or later */ 167615+#undef HAVE_PQSETERRORVERBOSITY 167616 167617-/* Define to 1 if you have the <sys/ioctl.h> header file. */ 167618-#undef HAVE_SYS_IOCTL_H 167619+/* PostgreSQL 7.4 or later */ 167620+#undef HAVE_PQFTABLE 167621 167622-/* Define to 1 if you have the <sys/ipc.h> header file. */ 167623-#undef HAVE_SYS_IPC_H 167624+/* PostgreSQL 8.1.4 or later */ 167625+#undef HAVE_PQESCAPE_CONN 167626 167627-/* Define to 1 if you have the <sys/loadavg.h> header file. */ 167628-#undef HAVE_SYS_LOADAVG_H 167629+/* PostgreSQL 8.1.4 or later */ 167630+#undef HAVE_PQESCAPE_BYTEA_CONN 167631 167632-/* Define to 1 if you have the <sys/mkdev.h> header file. */ 167633-#undef HAVE_SYS_MKDEV_H 167634+/* Whether libpq is compiled with --enable-multibyte */ 167635+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 167636 167637-/* Define to 1 if you have the <sys/mman.h> header file. */ 167638-#undef HAVE_SYS_MMAN_H 167639+/* PostgreSQL 8.1 or later */ 167640+#undef HAVE_PG_LO_CREATE 167641 167642-/* Define to 1 if you have the <sys/mount.h> header file. */ 167643-#undef HAVE_SYS_MOUNT_H 167644+/* PostgreSQL 8.4 or later */ 167645+#undef HAVE_PG_LO_IMPORT_WITH_OID 167646 167647-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. 167648- */ 167649-#undef HAVE_SYS_NDIR_H 167650+/* Whether to build pgsql as dynamic module */ 167651+#undef COMPILE_DL_PGSQL 167652 167653-/* Define to 1 if you have the <sys/param.h> header file. */ 167654-#undef HAVE_SYS_PARAM_H 167655+/* Whether to build phar as dynamic module */ 167656+#undef COMPILE_DL_PHAR 167657 167658-/* Define to 1 if you have the <sys/poll.h> header file. */ 167659-#undef HAVE_SYS_POLL_H 167660+/* */ 167661+#undef PHAR_HASH_OK 167662 167663-/* Define to 1 if you have the <sys/resource.h> header file. */ 167664-#undef HAVE_SYS_RESOURCE_H 167665+/* */ 167666+#undef PHAR_HAVE_OPENSSL 167667 167668-/* Define to 1 if you have the <sys/select.h> header file. */ 167669-#undef HAVE_SYS_SELECT_H 167670+/* whether to include POSIX-like functions */ 167671+#undef HAVE_POSIX 167672 167673-/* Define to 1 if you have the <sys/socket.h> header file. */ 167674-#undef HAVE_SYS_SOCKET_H 167675+/* Whether to build posix as dynamic module */ 167676+#undef COMPILE_DL_POSIX 167677 167678-/* Define to 1 if you have the <sys/statfs.h> header file. */ 167679-#undef HAVE_SYS_STATFS_H 167680+/* Whether you have a working ttyname_r */ 167681+#undef HAVE_TTYNAME_R 167682 167683-/* Define to 1 if you have the <sys/statvfs.h> header file. */ 167684-#undef HAVE_SYS_STATVFS_H 167685+/* Wether struct utsname has domainname */ 167686+#undef HAVE_UTSNAME_DOMAINNAME 167687 167688-/* Define to 1 if you have the <sys/stat.h> header file. */ 167689-#undef HAVE_SYS_STAT_H 167690+/* Whether to build pspell as dynamic module */ 167691+#undef COMPILE_DL_PSPELL 167692 167693-/* Define to 1 if you have the <sys/sysexits.h> header file. */ 167694-#undef HAVE_SYS_SYSEXITS_H 167695+/* */ 167696+#undef HAVE_PSPELL 167697 167698-/* Define to 1 if you have the <sys/times.h> header file. */ 167699-#undef HAVE_SYS_TIMES_H 167700+/* */ 167701+#undef HAVE_RL_CALLBACK_READ_CHAR 167702 167703-/* Define to 1 if you have the <sys/time.h> header file. */ 167704-#undef HAVE_SYS_TIME_H 167705+/* */ 167706+#undef HAVE_LIBREADLINE 167707 167708-/* Define to 1 if you have the <sys/types.h> header file. */ 167709-#undef HAVE_SYS_TYPES_H 167710+/* */ 167711+#undef HAVE_LIBEDIT 167712 167713-/* Define to 1 if you have the <sys/uio.h> header file. */ 167714-#undef HAVE_SYS_UIO_H 167715+/* Whether to build readline as dynamic module */ 167716+#undef COMPILE_DL_READLINE 167717 167718-/* Define to 1 if you have the <sys/un.h> header file. */ 167719-#undef HAVE_SYS_UN_H 167720+/* Whether we have librecode 3.5 */ 167721+#undef HAVE_BROKEN_RECODE 167722 167723-/* Define to 1 if you have the <sys/utsname.h> header file. */ 167724-#undef HAVE_SYS_UTSNAME_H 167725+/* Whether we have librecode 3.5 or higher */ 167726+#undef HAVE_LIBRECODE 167727 167728-/* Define to 1 if you have the <sys/varargs.h> header file. */ 167729-#undef HAVE_SYS_VARARGS_H 167730+/* Whether to build recode as dynamic module */ 167731+#undef COMPILE_DL_RECODE 167732 167733-/* Define to 1 if you have the <sys/vfs.h> header file. */ 167734-#undef HAVE_SYS_VFS_H 167735+/* Whether Reflection is enabled */ 167736+#undef HAVE_REFLECTION 167737 167738-/* Define to 1 if you have the <sys/wait.h> header file. */ 167739-#undef HAVE_SYS_WAIT_H 167740+/* Whether to build reflection as dynamic module */ 167741+#undef COMPILE_DL_REFLECTION 167742 167743-/* Define to 1 if you have the `tempnam' function. */ 167744-#undef HAVE_TEMPNAM 167745+/* */ 167746+#undef HAVE_PWRITE 167747 167748-/* Define to 1 if you have the <termios.h> header file. */ 167749-#undef HAVE_TERMIOS_H 167750+/* whether pwrite64 is default */ 167751+#undef PHP_PWRITE_64 167752 167753-/* */ 167754-#undef HAVE_TIDY 167755+/* */ 167756+#undef HAVE_PREAD 167757 167758-/* */ 167759-#undef HAVE_TIDYOPTGETDOC 167760+/* whether pread64 is default */ 167761+#undef PHP_PREAD_64 167762 167763-/* do we have times? */ 167764-#undef HAVE_TIMES 167765+/* Whether to build session as dynamic module */ 167766+#undef COMPILE_DL_SESSION 167767 167768-/* Define to 1 if you have the <time.h> header file. */ 167769-#undef HAVE_TIME_H 167770+/* */ 167771+#undef HAVE_PHP_SESSION 167772 167773-/* whether you have tm_gmtoff in struct tm */ 167774-#undef HAVE_TM_GMTOFF 167775+/* Whether you have libmm */ 167776+#undef HAVE_LIBMM 167777 167778-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use 167779- `HAVE_STRUCT_TM_TM_ZONE' instead. */ 167780-#undef HAVE_TM_ZONE 167781+/* */ 167782+#undef HAVE_SHMOP 167783 167784-/* Whether you have a working ttyname_r */ 167785-#undef HAVE_TTYNAME_R 167786+/* Whether to build shmop as dynamic module */ 167787+#undef COMPILE_DL_SHMOP 167788 167789-/* Define to 1 if you have the <tuxmodule.h> header file. */ 167790-#undef HAVE_TUXMODULE_H 167791+/* */ 167792+#undef HAVE_LIBXML 167793 167794-/* Define to 1 if you don't have `tm_zone' but do have the external array 167795- `tzname'. */ 167796-#undef HAVE_TZNAME 167797+/* */ 167798+#undef HAVE_SIMPLEXML 167799 167800-/* Define to 1 if you have the `tzset' function. */ 167801-#undef HAVE_TZSET 167802+/* Whether to build simplexml as dynamic module */ 167803+#undef COMPILE_DL_SIMPLEXML 167804 167805-/* */ 167806-#undef HAVE_UDBCEXT_H 167807+/* */ 167808+#undef HAVE_NET_SNMP 167809 167810-/* Define if uint32_t type is present. */ 167811-#undef HAVE_UINT32_T 167812+/* */ 167813+#undef HAVE_SNMP_PARSE_OID 167814 167815-/* Define to 1 if you have the <unistd.h> header file. */ 167816-#undef HAVE_UNISTD_H 167817+/* */ 167818+#undef HAVE_SNMP 167819 167820-/* */ 167821-#undef HAVE_UNIXODBC 167822+/* */ 167823+#undef UCD_SNMP_HACK 167824 167825-/* Define to 1 if you have the <unix.h> header file. */ 167826-#undef HAVE_UNIX_H 167827+/* Whether to build snmp as dynamic module */ 167828+#undef COMPILE_DL_SNMP 167829 167830-/* Define to 1 if you have the `unlockpt' function. */ 167831-#undef HAVE_UNLOCKPT 167832+/* */ 167833+#undef HAVE_LIBXML 167834 167835-/* Define to 1 if you have the `unsetenv' function. */ 167836-#undef HAVE_UNSETENV 167837+/* */ 167838+#undef HAVE_SOAP 167839 167840-/* */ 167841-#undef HAVE_UODBC 167842+/* Whether to build soap as dynamic module */ 167843+#undef COMPILE_DL_SOAP 167844 167845-/* Define to 1 if you have the `usleep' function. */ 167846-#undef HAVE_USLEEP 167847+/* Whether you have struct cmsghdr */ 167848+#undef HAVE_CMSGHDR 167849 167850-/* Define to 1 if you have the `utime' function. */ 167851-#undef HAVE_UTIME 167852+/* */ 167853+#undef MISSING_MSGHDR_MSGFLAGS 167854 167855-/* Define to 1 if you have the `utimes' function. */ 167856-#undef HAVE_UTIMES 167857+/* */ 167858+#undef HAVE_SOCKETS 167859 167860-/* Define to 1 if you have the <utime.h> header file. */ 167861-#undef HAVE_UTIME_H 167862+/* Whether to build sockets as dynamic module */ 167863+#undef COMPILE_DL_SOCKETS 167864 167865-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ 167866-#undef HAVE_UTIME_NULL 167867+/* Whether struct _zend_object_value is packed */ 167868+#undef HAVE_PACKED_OBJECT_VALUE 167869 167870-/* Wether struct utsname has domainname */ 167871-#undef HAVE_UTSNAME_DOMAINNAME 167872+/* Whether you want SPL (Standard PHP Library) support */ 167873+#undef HAVE_SPL 167874 167875-/* Define to 1 if you have the `vasprintf' function. */ 167876-#undef HAVE_VASPRINTF 167877+/* Whether to build spl as dynamic module */ 167878+#undef COMPILE_DL_SPL 167879 167880-/* Define to 1 if you have the `vprintf' function. */ 167881-#undef HAVE_VPRINTF 167882+/* Have PDO */ 167883+#undef PHP_SQLITE2_HAVE_PDO 167884 167885-/* Define to 1 if you have the `vsnprintf' function. */ 167886-#undef HAVE_VSNPRINTF 167887+/* Whether to build sqlite as dynamic module */ 167888+#undef COMPILE_DL_SQLITE 167889 167890-/* Define to 1 if you have the `wait3' function. */ 167891-#undef HAVE_WAIT3 167892+/* Size of a pointer */ 167893+#undef SQLITE_PTR_SZ 167894 167895-/* */ 167896-#undef HAVE_WAITPID 167897+/* */ 167898+#undef SQLITE_UTF8 167899 167900-/* Define to 1 if you have the <wchar.h> header file. */ 167901-#undef HAVE_WCHAR_H 167902+/* Define if flush should be called explicitly after a buffered io. */ 167903+#undef HAVE_FLUSHIO 167904 167905-/* */ 167906-#undef HAVE_WDDX 167907+/* */ 167908+#undef HAVE_CRYPT 167909 167910-/* */ 167911-#undef HAVE_XML 167912+/* whether the compiler supports __alignof__ */ 167913+#undef HAVE_ALIGNOF 167914 167915-/* Define to 1 if you have the <xmlparse.h> header file. */ 167916-#undef HAVE_XMLPARSE_H 167917+/* whether the compiler supports __attribute__ ((__aligned__)) */ 167918+#undef HAVE_ATTRIBUTE_ALIGNED 167919 167920-/* */ 167921-#undef HAVE_XMLREADER 167922+/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */ 167923+#undef PHP_USE_PHP_CRYPT_R 167924 167925-/* */ 167926-#undef HAVE_XMLRPC 167927+/* Whether the system supports standard DES salt */ 167928+#undef PHP_STD_DES_CRYPT 167929 167930-/* Define to 1 if you have the <xmltok.h> header file. */ 167931-#undef HAVE_XMLTOK_H 167932+/* Whether the system supports BlowFish salt */ 167933+#undef PHP_BLOWFISH_CRYPT 167934 167935-/* */ 167936-#undef HAVE_XMLWRITER 167937+/* Whether the system supports extended DES salt */ 167938+#undef PHP_EXT_DES_CRYPT 167939 167940-/* */ 167941-#undef HAVE_XSL 167942+/* Whether the system supports MD5 salt */ 167943+#undef PHP_MD5_CRYPT 167944 167945-/* */ 167946-#undef HAVE_XSL_EXSLT 167947+/* Whether the system supports SHA512 salt */ 167948+#undef PHP_SHA512_CRYPT 167949 167950-/* */ 167951-#undef HAVE_YP_GET_DEFAULT_DOMAIN 167952+/* Whether the system supports SHA256 salt */ 167953+#undef PHP_SHA256_CRYPT 167954 167955-/* */ 167956-#undef HAVE_ZIP 167957+/* Whether the system supports standard DES salt */ 167958+#undef PHP_STD_DES_CRYPT 167959 167960-/* */ 167961-#undef HAVE_ZLIB 167962+/* Whether the system supports BlowFish salt */ 167963+#undef PHP_BLOWFISH_CRYPT 167964 167965-/* whether _controlfp is present usable */ 167966-#undef HAVE__CONTROLFP 167967+/* Whether the system supports extended DES salt */ 167968+#undef PHP_EXT_DES_CRYPT 167969 167970-/* whether _controlfp_s is present and usable */ 167971-#undef HAVE__CONTROLFP_S 167972+/* Whether the system supports MD5 salt */ 167973+#undef PHP_MD5_CRYPT 167974 167975-/* whether _FPU_SETCW is present and usable */ 167976-#undef HAVE__FPU_SETCW 167977+/* Whether the system supports SHA512 salt */ 167978+#undef PHP_SHA512_CRYPT 167979 167980-/* */ 167981-#undef HPUX 167982+/* Whether the system supports SHA256 salt */ 167983+#undef PHP_SHA256_CRYPT 167984 167985-/* */ 167986-#undef HSREGEX 167987+/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ 167988+#undef PHP_USE_PHP_CRYPT_R 167989 167990-/* iconv() is aliased to libiconv() in -liconv */ 167991-#undef ICONV_ALIASED_LIBICONV 167992+/* Define if your system has fork/vfork/CreateProcess */ 167993+#undef PHP_CAN_SUPPORT_PROC_OPEN 167994 167995-/* Whether iconv supports error no or not */ 167996-#undef ICONV_SUPPORTS_ERRNO 167997+/* Whether to enable chroot() function */ 167998+#undef ENABLE_CHROOT_FUNC 167999 168000-/* */ 168001-#undef ISOLARIS 168002+/* */ 168003+#undef HAVE_RES_NSEARCH 168004 168005-/* */ 168006-#undef LINUX 168007+/* */ 168008+#undef HAVE_RES_NSEARCH 168009 168010-/* */ 168011-#undef MAGIC_QUOTES 168012+/* */ 168013+#undef HAVE_LIBRESOLV 168014 168015-/* Whether asctime_r is declared */ 168016-#undef MISSING_ASCTIME_R_DECL 168017+/* */ 168018+#undef HAVE_RES_NSEARCH 168019 168020-/* Whether ctime_r is declared */ 168021-#undef MISSING_CTIME_R_DECL 168022+/* */ 168023+#undef HAVE_LIBBIND 168024 168025-/* */ 168026-#undef MISSING_FCLOSE_DECL 168027+/* */ 168028+#undef HAVE_RES_NSEARCH 168029 168030-/* Whether gmtime_r is declared */ 168031-#undef MISSING_GMTIME_R_DECL 168032+/* */ 168033+#undef HAVE_LIBSOCKET 168034 168035-/* Whether localtime_r is declared */ 168036-#undef MISSING_LOCALTIME_R_DECL 168037+/* */ 168038+#undef HAVE_DNS_SEARCH 168039 168040-/* */ 168041-#undef MISSING_MSGHDR_MSGFLAGS 168042+/* */ 168043+#undef HAVE_DNS_SEARCH 168044 168045-/* Whether strtok_r is declared */ 168046-#undef MISSING_STRTOK_R_DECL 168047+/* */ 168048+#undef HAVE_LIBRESOLV 168049 168050-/* Whether mysqlnd is enabled */ 168051-#undef MYSQLI_USE_MYSQLND 168052+/* */ 168053+#undef HAVE_DNS_SEARCH 168054 168055-/* Enable compressed protocol support */ 168056-#undef MYSQLND_COMPRESSION_WANTED 168057+/* */ 168058+#undef HAVE_LIBBIND 168059 168060-/* Enable SSL support */ 168061-#undef MYSQLND_SSL_SUPPORTED 168062+/* */ 168063+#undef HAVE_DNS_SEARCH 168064 168065-/* Whether mysqlnd is enabled */ 168066-#undef MYSQL_USE_MYSQLND 168067+/* */ 168068+#undef HAVE_LIBSOCKET 168069 168070-/* */ 168071-#undef NDBM_INCLUDE_FILE 168072+/* */ 168073+#undef HAVE_DN_EXPAND 168074 168075-/* */ 168076-#undef NEUTRINO 168077+/* */ 168078+#undef HAVE_DN_EXPAND 168079 168080-/* Define to 1 if your C compiler doesn't accept -c and -o together. */ 168081-#undef NO_MINUS_C_MINUS_O 168082+/* */ 168083+#undef HAVE_LIBRESOLV 168084 168085-/* Define to the address where bug reports for this package should be sent. */ 168086-#undef PACKAGE_BUGREPORT 168087+/* */ 168088+#undef HAVE_DN_EXPAND 168089 168090-/* Define to the full name of this package. */ 168091-#undef PACKAGE_NAME 168092+/* */ 168093+#undef HAVE_LIBBIND 168094 168095-/* Define to the full name and version of this package. */ 168096-#undef PACKAGE_STRING 168097+/* */ 168098+#undef HAVE_DN_EXPAND 168099 168100-/* Define to the one symbol short name of this package. */ 168101-#undef PACKAGE_TARNAME 168102+/* */ 168103+#undef HAVE_LIBSOCKET 168104 168105-/* Define to the home page for this package. */ 168106-#undef PACKAGE_URL 168107+/* */ 168108+#undef HAVE_DN_SKIPNAME 168109 168110-/* Define to the version of this package. */ 168111-#undef PACKAGE_VERSION 168112+/* */ 168113+#undef HAVE_DN_SKIPNAME 168114 168115-/* */ 168116-#undef PDO_MYSQL_UNIX_ADDR 168117+/* */ 168118+#undef HAVE_LIBRESOLV 168119 168120-/* Whether pdo_mysql uses mysqlnd */ 168121-#undef PDO_USE_MYSQLND 168122+/* */ 168123+#undef HAVE_DN_SKIPNAME 168124 168125-/* */ 168126-#undef PHAR_HASH_OK 168127+/* */ 168128+#undef HAVE_LIBBIND 168129 168130-/* */ 168131-#undef PHAR_HAVE_OPENSSL 168132+/* */ 168133+#undef HAVE_DN_SKIPNAME 168134 168135-/* */ 168136-#undef PHP_APACHE_HAVE_CLIENT_FD 168137+/* */ 168138+#undef HAVE_LIBSOCKET 168139 168140-/* Whether the system supports BlowFish salt */ 168141-#undef PHP_BLOWFISH_CRYPT 168142+/* */ 168143+#undef HAVE_RES_SEARCH 168144 168145-/* PHP build date */ 168146-#undef PHP_BUILD_DATE 168147+/* */ 168148+#undef HAVE_RES_SEARCH 168149 168150-/* Define if your system has fork/vfork/CreateProcess */ 168151-#undef PHP_CAN_SUPPORT_PROC_OPEN 168152+/* */ 168153+#undef HAVE_LIBRESOLV 168154 168155-/* */ 168156-#undef PHP_CURL_URL_WRAPPERS 168157+/* */ 168158+#undef HAVE_RES_SEARCH 168159 168160-/* Whether the system supports extended DES salt */ 168161-#undef PHP_EXT_DES_CRYPT 168162+/* */ 168163+#undef HAVE_LIBBIND 168164 168165-/* fpm group name */ 168166-#undef PHP_FPM_GROUP 168167+/* */ 168168+#undef HAVE_RES_SEARCH 168169 168170-/* fpm user name */ 168171-#undef PHP_FPM_USER 168172+/* */ 168173+#undef HAVE_LIBSOCKET 168174 168175-/* Whether you have HP-UX 10.x */ 168176-#undef PHP_HPUX_TIME_R 168177+/* whether atof() accepts NAN */ 168178+#undef HAVE_ATOF_ACCEPTS_NAN 168179 168180-/* Path to iconv.h */ 168181-#undef PHP_ICONV_H_PATH 168182+/* whether atof() accepts INF */ 168183+#undef HAVE_ATOF_ACCEPTS_INF 168184 168185-/* Which iconv implementation to use */ 168186-#undef PHP_ICONV_IMPL 168187+/* whether HUGE_VAL == INF */ 168188+#undef HAVE_HUGE_VAL_INF 168189 168190-/* Whether you have IRIX-style functions */ 168191-#undef PHP_IRIX_TIME_R 168192+/* whether HUGE_VAL + -HUGEVAL == NAN */ 168193+#undef HAVE_HUGE_VAL_NAN 168194 168195-/* Whether the system supports MD5 salt */ 168196-#undef PHP_MD5_CRYPT 168197+/* whether strptime() declaration fails */ 168198+#undef HAVE_STRPTIME_DECL_FAILS 168199 168200-/* */ 168201-#undef PHP_MHASH_BC 168202+/* Define if your system has mbstate_t in wchar.h */ 168203+#undef HAVE_MBSTATE_T 168204 168205-/* */ 168206-#undef PHP_MYSQL_UNIX_SOCK_ADDR 168207+/* Whether to build standard as dynamic module */ 168208+#undef COMPILE_DL_STANDARD 168209 168210-/* */ 168211-#undef PHP_OCI8_DEF_DIR 168212+/* */ 168213+#undef HAVE_SYBASE_CT 168214 168215-/* */ 168216-#undef PHP_OCI8_DEF_SHARED_LIBADD 168217+/* Whether to build sybase_ct as dynamic module */ 168218+#undef COMPILE_DL_SYBASE_CT 168219 168220-/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ 168221-#undef PHP_ONIG_BAD_KOI8_ENTRY 168222+/* */ 168223+#undef HAVE_SYSVMSG 168224 168225-/* Define to 1 if the bundled oniguruma is used */ 168226-#undef PHP_ONIG_BUNDLED 168227+/* Whether to build sysvmsg as dynamic module */ 168228+#undef COMPILE_DL_SYSVMSG 168229 168230-/* uname output */ 168231-#undef PHP_OS 168232+/* Whether to build sysvsem as dynamic module */ 168233+#undef COMPILE_DL_SYSVSEM 168234 168235-/* */ 168236-#undef PHP_PDO_OCI_CLIENT_VERSION 168237+/* */ 168238+#undef HAVE_SYSVSEM 168239 168240-/* whether pread64 is default */ 168241-#undef PHP_PREAD_64 168242+/* */ 168243+#undef HAVE_SEMUN 168244 168245-/* whether pwrite64 is default */ 168246-#undef PHP_PWRITE_64 168247+/* */ 168248+#undef HAVE_SEMUN 168249 168250-/* */ 168251-#undef PHP_SAFE_MODE 168252+/* */ 168253+#undef HAVE_SYSVSHM 168254 168255-/* */ 168256-#undef PHP_SAFE_MODE_EXEC_DIR 168257+/* Whether to build sysvshm as dynamic module */ 168258+#undef COMPILE_DL_SYSVSHM 168259 168260-/* Whether the system supports SHA256 salt */ 168261-#undef PHP_SHA256_CRYPT 168262+/* */ 168263+#undef HAVE_TIDYOPTGETDOC 168264 168265-/* Whether the system supports SHA512 salt */ 168266-#undef PHP_SHA512_CRYPT 168267+/* Whether to build tidy as dynamic module */ 168268+#undef COMPILE_DL_TIDY 168269 168270-/* */ 168271-#undef PHP_SIGCHILD 168272+/* */ 168273+#undef HAVE_TIDY 168274 168275-/* Have PDO */ 168276-#undef PHP_SQLITE2_HAVE_PDO 168277+/* Whether to build tokenizer as dynamic module */ 168278+#undef COMPILE_DL_TOKENIZER 168279 168280-/* Whether the system supports standard DES salt */ 168281-#undef PHP_STD_DES_CRYPT 168282+/* */ 168283+#undef HAVE_LIBXML 168284 168285-/* uname -a output */ 168286-#undef PHP_UNAME 168287+/* */ 168288+#undef HAVE_LIBEXPAT 168289 168290-/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ 168291-#undef PHP_USE_PHP_CRYPT_R 168292+/* */ 168293+#undef HAVE_WDDX 168294 168295-/* whether write(2) works */ 168296-#undef PHP_WRITE_STDOUT 168297+/* Whether to build wddx as dynamic module */ 168298+#undef COMPILE_DL_WDDX 168299 168300-/* /proc/pid/mem interface */ 168301-#undef PROC_MEM_FILE 168302+/* */ 168303+#undef HAVE_LIBXML 168304 168305-/* Whether to use Pthreads */ 168306-#undef PTHREADS 168307+/* */ 168308+#undef HAVE_LIBEXPAT 168309 168310-/* */ 168311-#undef QDBM_INCLUDE_FILE 168312+/* Whether to build xml as dynamic module */ 168313+#undef COMPILE_DL_XML 168314 168315-/* */ 168316-#undef REGEX 168317+/* */ 168318+#undef HAVE_XML 168319 168320-/* Define as the return type of signal handlers (`int' or `void'). */ 168321-#undef RETSIGTYPE 168322+/* */ 168323+#undef HAVE_LIBXML 168324 168325-/* Whether to use Roxen in ZTS mode */ 168326-#undef ROXEN_USE_ZTS 168327+/* */ 168328+#undef HAVE_XMLREADER 168329 168330-/* The size of `char', as computed by sizeof. */ 168331-#undef SIZEOF_CHAR 168332+/* Whether to build xmlreader as dynamic module */ 168333+#undef COMPILE_DL_XMLREADER 168334 168335-/* The size of `char *', as computed by sizeof. */ 168336-#undef SIZEOF_CHAR_P 168337+/* */ 168338+#undef HAVE_XMLRPC 168339 168340-/* The size of `int', as computed by sizeof. */ 168341-#undef SIZEOF_INT 168342+/* */ 168343+#undef HAVE_LIBXML 168344 168345-/* Size of intmax_t */ 168346-#undef SIZEOF_INTMAX_T 168347+/* */ 168348+#undef HAVE_LIBEXPAT 168349 168350-/* The size of `long', as computed by sizeof. */ 168351-#undef SIZEOF_LONG 168352+/* */ 168353+#undef HAVE_LIBICONV 168354 168355-/* The size of `long int', as computed by sizeof. */ 168356-#undef SIZEOF_LONG_INT 168357+/* */ 168358+#undef HAVE_GICONV_H 168359 168360-/* The size of `long long', as computed by sizeof. */ 168361-#undef SIZEOF_LONG_LONG 168362+/* */ 168363+#undef HAVE_LIBICONV 168364 168365-/* The size of `long long int', as computed by sizeof. */ 168366-#undef SIZEOF_LONG_LONG_INT 168367+/* iconv() is aliased to libiconv() in -liconv */ 168368+#undef ICONV_ALIASED_LIBICONV 168369 168370-/* Size of ptrdiff_t */ 168371-#undef SIZEOF_PTRDIFF_T 168372+/* */ 168373+#undef HAVE_ICONV 168374 168375-/* The size of `short', as computed by sizeof. */ 168376-#undef SIZEOF_SHORT 168377+/* */ 168378+#undef UNDEF_THREADS_HACK 168379 168380-/* The size of `size_t', as computed by sizeof. */ 168381-#undef SIZEOF_SIZE_T 168382+/* Whether to build xmlrpc as dynamic module */ 168383+#undef COMPILE_DL_XMLRPC 168384 168385-/* Size of ssize_t */ 168386-#undef SIZEOF_SSIZE_T 168387+/* Whether to build xmlrpc as dynamic module */ 168388+#undef COMPILE_DL_XMLRPC 168389 168390-/* */ 168391-#undef SOLARIS 168392+/* */ 168393+#undef HAVE_LIBXML 168394 168395-/* have sqlite3 with extension support */ 168396-#undef SQLITE_OMIT_LOAD_EXTENSION 168397+/* */ 168398+#undef HAVE_XMLWRITER 168399 168400-/* Size of a pointer */ 168401-#undef SQLITE_PTR_SZ 168402+/* Whether to build xmlwriter as dynamic module */ 168403+#undef COMPILE_DL_XMLWRITER 168404 168405-/* */ 168406-#undef SQLITE_UTF8 168407+/* */ 168408+#undef HAVE_XSL_EXSLT 168409 168410-/* Needed in sqlunix.h for wchar defs */ 168411-#undef SS_FBX 168412+/* */ 168413+#undef HAVE_XSL 168414 168415-/* Needed in sqlunix.h */ 168416-#undef SS_LINUX 168417+/* Whether to build xsl as dynamic module */ 168418+#undef COMPILE_DL_XSL 168419 168420-/* If using the C implementation of alloca, define if you know the 168421- direction of stack growth for your system; otherwise it will be 168422- automatically deduced at runtime. 168423- STACK_DIRECTION > 0 => grows toward higher addresses 168424- STACK_DIRECTION < 0 => grows toward lower addresses 168425- STACK_DIRECTION = 0 => direction of growth unknown */ 168426-#undef STACK_DIRECTION 168427+/* */ 168428+#undef HAVE_ZIP 168429 168430-/* Define to 1 if you have the ANSI C header files. */ 168431-#undef STDC_HEADERS 168432+/* Whether to build zip as dynamic module */ 168433+#undef COMPILE_DL_ZIP 168434 168435-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ 168436-#undef TIME_WITH_SYS_TIME 168437+/* Enable compressed protocol support */ 168438+#undef MYSQLND_COMPRESSION_WANTED 168439 168440-/* Define to 1 if your <sys/time.h> declares `struct tm'. */ 168441-#undef TM_IN_SYS_TIME 168442+/* Enable SSL support */ 168443+#undef MYSQLND_SSL_SUPPORTED 168444 168445-/* */ 168446-#undef TSRM_ST 168447+/* Whether to build mysqlnd as dynamic module */ 168448+#undef COMPILE_DL_MYSQLND 168449 168450-/* */ 168451-#undef UCD_SNMP_HACK 168452+/* Define if int32_t type is present. */ 168453+#undef HAVE_INT32_T 168454 168455-/* */ 168456-#undef UNDEF_THREADS_HACK 168457+/* Define if uint32_t type is present. */ 168458+#undef HAVE_UINT32_T 168459 168460-/* */ 168461-#undef UNIXWARE 168462+/* Whether sprintf is broken */ 168463+#undef ZEND_BROKEN_SPRINTF 168464 168465-/* whether to check multibyte regex backtrack */ 168466-#undef USE_COMBINATION_EXPLOSION_CHECK 168467+/* whether floatingpoint.h defines fp_except */ 168468+#undef HAVE_FP_EXCEPT 168469 168470-/* */ 168471-#undef USE_GD_IMGSTRTTF 168472+/* whether _FPU_SETCW is present and usable */ 168473+#undef HAVE__FPU_SETCW 168474 168475-/* */ 168476-#undef USE_GD_JISX0208 168477+/* whether fpsetprec is present and usable */ 168478+#undef HAVE_FPSETPREC 168479 168480-/* Define if cross-process locking is required by accept() */ 168481-#undef USE_LOCKING 168482+/* whether _controlfp is present usable */ 168483+#undef HAVE__CONTROLFP 168484 168485-/* Enable extensions on AIX 3, Interix. */ 168486-#ifndef _ALL_SOURCE 168487-# undef _ALL_SOURCE 168488-#endif 168489-/* Enable GNU extensions on systems that have them. */ 168490-#ifndef _GNU_SOURCE 168491-# undef _GNU_SOURCE 168492-#endif 168493-/* Enable threading extensions on Solaris. */ 168494-#ifndef _POSIX_PTHREAD_SEMANTICS 168495-# undef _POSIX_PTHREAD_SEMANTICS 168496-#endif 168497-/* Enable extensions on HP NonStop. */ 168498-#ifndef _TANDEM_SOURCE 168499-# undef _TANDEM_SOURCE 168500-#endif 168501-/* Enable general extensions on Solaris. */ 168502-#ifndef __EXTENSIONS__ 168503-# undef __EXTENSIONS__ 168504-#endif 168505+/* whether _controlfp_s is present and usable */ 168506+#undef HAVE__CONTROLFP_S 168507 168508+/* whether FPU control word can be manipulated by inline assembler */ 168509+#undef HAVE_FPU_INLINE_ASM_X86 168510 168511-/* */ 168512-#undef USE_TRANSFER_TABLES 168513+/* Define if double cast to long preserves least significant bits */ 168514+#undef ZEND_DVAL_TO_LVAL_CAST_OK 168515 168516-/* whether you want Pi3Web support */ 168517-#undef WITH_PI3WEB 168518+/* Define if dlsym() requires a leading underscore in symbol names. */ 168519+#undef DLSYM_NEEDS_UNDERSCORE 168520 168521-/* */ 168522-#undef WITH_ZEUS 168523+/* virtual machine dispatch method */ 168524+#undef ZEND_VM_KIND 168525 168526-/* Define if processor uses big-endian word */ 168527-#undef WORDS_BIGENDIAN 168528+/* virtual machine dispatch method */ 168529+#undef ZEND_VM_KIND 168530 168531-/* Whether sprintf is broken */ 168532-#undef ZEND_BROKEN_SPRINTF 168533+/* virtual machine dispatch method */ 168534+#undef ZEND_VM_KIND 168535 168536-/* */ 168537+/* */ 168538 #undef ZEND_DEBUG 168539 168540-/* Define if double cast to long preserves least significant bits */ 168541-#undef ZEND_DVAL_TO_LVAL_CAST_OK 168542+/* */ 168543+#undef ZEND_DEBUG 168544+ 168545+/* */ 168546+#undef ZTS 168547 168548-/* */ 168549+/* */ 168550+#undef ZEND_MULTIBYTE 168551+ 168552+/* Define if the target system is darwin */ 168553+#undef DARWIN 168554+ 168555+/* */ 168556 #undef ZEND_MM_ALIGNMENT 168557 168558-/* */ 168559+/* */ 168560 #undef ZEND_MM_ALIGNMENT_LOG2 168561 168562-/* */ 168563-#undef ZEND_MULTIBYTE 168564+/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */ 168565+#undef HAVE_MEM_MMAP_ANON 168566 168567-/* virtual machine dispatch method */ 168568-#undef ZEND_VM_KIND 168569+/* Define if the target system has support for memory allocation using mmap(/dev/zero) */ 168570+#undef HAVE_MEM_MMAP_ZERO 168571 168572-/* */ 168573+/* */ 168574 #undef ZTS 168575 168576-/* Define to 1 if on MINIX. */ 168577-#undef _MINIX 168578+/* Whether you use GNU Pth */ 168579+#undef GNUPTH 168580 168581-/* Define to 2 if the system does not provide POSIX.1 features except with 168582- this defined. */ 168583-#undef _POSIX_1_SOURCE 168584+/* */ 168585+#undef TSRM_ST 168586 168587-/* Define to 1 if you need to in order for `stat' and other things to work. */ 168588-#undef _POSIX_SOURCE 168589+/* Whether to use native BeOS threads */ 168590+#undef BETHREADS 168591 168592-/* Define to empty if `const' does not conform to ANSI C. */ 168593-#undef const 168594+/* Whether to use Pthreads */ 168595+#undef PTHREADS 168596 168597-/* Define to `int' if <sys/types.h> doesn't define. */ 168598-#undef gid_t 168599+/* PHP build date */ 168600+#undef PHP_BUILD_DATE 168601 168602-/* */ 168603-#undef in_addr_t 168604+/* hardcode for each of the cross compiler host */ 168605+#undef PHP_OS 168606 168607-/* Define to `__inline__' or `__inline' if that's what the C compiler 168608- calls it, or to nothing if 'inline' is not supported under any name. */ 168609-#ifndef __cplusplus 168610-#undef inline 168611-#endif 168612+/* hardcode for each of the cross compiler host */ 168613+#undef PHP_UNAME 168614 168615-/* Define to `unsigned int' if <sys/types.h> does not define. */ 168616-#undef size_t 168617+/* uname -a output */ 168618+#undef PHP_UNAME 168619 168620-/* Define to `int' if <sys/types.h> doesn't define. */ 168621-#undef uid_t 168622+/* uname output */ 168623+#undef PHP_OS 168624 168625-/* Define to `unsigned int ' if <sys/types.h> does not define. */ 168626-#undef uint 168627+/* */ 168628+#undef HAVE_BUILD_DEFS_H 168629 168630-/* Define to `unsigned long ' if <sys/types.h> does not define. */ 168631-#undef ulong 168632 168633 #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS 168634 168635@@ -2533,29 +3029,6 @@ 168636 #endif 168637 168638 /* 168639- * Darwin's GCC can generate multiple architectures in a single pass so the size and 168640- * byte order will only be accurate for the one architecture that happened to invoke 168641- * configure. 168642- */ 168643-#ifdef __DARWIN_BYTE_ORDER 168644-#/* This symbol must be allowed to be cleared. */ undef WORDS_BIGENDIAN 168645-# if (__DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN) 168646-# define WORDS_BIGENDIAN 1 168647-# endif 168648-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_LONG 168649-#/* This symbol must be allowed to be cleared. */ undef SIZEOF_SIZE_T 168650-# ifdef __LP64__ 168651-#/* This symbol should not be modified by configure. */ define SIZEOF_LONG 8 168652-#/* This symbol should not be modified by configure. */ define SIZEOF_SIZE_T 8 168653-# else 168654-#/* This symbol should not be modified by configure. */ define SIZEOF_LONG 4 168655-#/* This symbol should not be modified by configure. */ define SIZEOF_SIZE_T 4 168656-# endif 168657-#endif 168658- 168659-#endif /* ZEND_API */ 168660- 168661-/* 168662 * Local variables: 168663 * tab-width: 4 168664 * c-basic-offset: 4 168665diff -Naur php-5.3.23-patch1/sapi/cgi/Makefile.frag php-5.3.23-patch2/sapi/cgi/Makefile.frag 168666--- php-5.3.23-patch1/sapi/cgi/Makefile.frag 2013-04-04 21:27:16.000000000 -0700 168667+++ php-5.3.23-patch2/sapi/cgi/Makefile.frag 2013-04-04 21:36:54.000000000 -0700 168668@@ -1,2 +1,9 @@ 168669-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 168670+cgi: $(SAPI_CGI_PATH) 168671+ 168672+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS) 168673 $(BUILD_CGI) 168674+ 168675+install-cgi: $(SAPI_CGI_PATH) 168676+ @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" 168677+ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) 168678+ 168679diff -Naur php-5.3.23-patch1/sapi/cgi/config9.m4 php-5.3.23-patch2/sapi/cgi/config9.m4 168680--- php-5.3.23-patch1/sapi/cgi/config9.m4 2013-04-04 21:27:16.000000000 -0700 168681+++ php-5.3.23-patch2/sapi/cgi/config9.m4 2013-04-04 21:36:54.000000000 -0700 168682@@ -8,11 +8,9 @@ 168683 dnl 168684 dnl CGI setup 168685 dnl 168686-if test "$PHP_SAPI" = "default"; then 168687- AC_MSG_CHECKING(whether to build CGI binary) 168688- if test "$PHP_CGI" != "no"; then 168689+AC_MSG_CHECKING(for CGI build) 168690+if test "$PHP_CGI" != "no"; then 168691 AC_MSG_RESULT(yes) 168692- 168693 AC_MSG_CHECKING([for socklen_t in sys/socket.h]) 168694 AC_EGREP_HEADER([socklen_t], [sys/socket.h], 168695 [AC_MSG_RESULT([yes]) 168696@@ -50,31 +48,29 @@ 168697 SAPI_CGI_PATH=sapi/cgi/php-cgi 168698 ;; 168699 esac 168700- PHP_SUBST(SAPI_CGI_PATH) 168701 168702- dnl Set install target and select SAPI 168703- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" 168704+ dnl Select SAPI 168705 PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)') 168706 168707 case $host_alias in 168708 *aix*) 168709- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168710+ if test "$php_sapi_module" = "shared"; then 168711+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168712+ else 168713+ BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168714+ fi 168715 ;; 168716 *darwin*) 168717- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168718+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168719 ;; 168720 *) 168721- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168722+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" 168723 ;; 168724 esac 168725 168726+ dnl Expose to Makefile 168727+ PHP_SUBST(SAPI_CGI_PATH) 168728 PHP_SUBST(BUILD_CGI) 168729- 168730- elif test "$PHP_CLI" != "no"; then 168731- AC_MSG_RESULT(no) 168732- OVERALL_TARGET= 168733- PHP_SAPI=cli 168734- else 168735- AC_MSG_ERROR([No SAPIs selected.]) 168736- fi 168737+else 168738+ AC_MSG_RESULT(yes) 168739 fi 168740diff -Naur php-5.3.23-patch1/sapi/cli/Makefile.frag php-5.3.23-patch2/sapi/cli/Makefile.frag 168741--- php-5.3.23-patch1/sapi/cli/Makefile.frag 2013-04-04 21:27:16.000000000 -0700 168742+++ php-5.3.23-patch2/sapi/cli/Makefile.frag 2013-04-04 21:36:54.000000000 -0700 168743@@ -1,11 +1,12 @@ 168744 cli: $(SAPI_CLI_PATH) 168745 168746-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) 168747+$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS) 168748 $(BUILD_CLI) 168749 168750 install-cli: $(SAPI_CLI_PATH) 168751 @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" 168752- @$(INSTALL_CLI) 168753+ @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) 168754 @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" 168755 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 168756- @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 168757+ @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 168758+ 168759diff -Naur php-5.3.23-patch1/sapi/cli/config.m4 php-5.3.23-patch2/sapi/cli/config.m4 168760--- php-5.3.23-patch1/sapi/cli/config.m4 2013-04-04 21:27:16.000000000 -0700 168761+++ php-5.3.23-patch2/sapi/cli/config.m4 2013-04-04 21:36:54.000000000 -0700 168762@@ -8,32 +8,41 @@ 168763 168764 AC_MSG_CHECKING(for CLI build) 168765 if test "$PHP_CLI" != "no"; then 168766- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag,$abs_srcdir/sapi/cli,sapi/cli) 168767+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cli/Makefile.frag) 168768+ 168769+ dnl Set filename 168770 SAPI_CLI_PATH=sapi/cli/php 168771- PHP_SUBST(SAPI_CLI_PATH) 168772+ 168773+ dnl Select SAPI 168774+ PHP_SELECT_SAPI(cli, program, php_cli.c php_cli_readline.c,, '$(SAPI_CLI_PATH)') 168775 168776 case $host_alias in 168777 *aix*) 168778- if test "$php_build_target" = "shared"; then 168779- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168780+ if test "$php_sapi_module" = "shared"; then 168781+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/.libs\/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168782 else 168783- BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168784+ BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168785 fi 168786 ;; 168787 *darwin*) 168788- BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168789+ BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168790 ;; 168791 *netware*) 168792- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" 168793+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)" 168794 ;; 168795 *) 168796- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168797+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" 168798 ;; 168799 esac 168800- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)" 168801 168802+ dnl Set executable for tests 168803+ PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)" 168804+ PHP_SUBST(PHP_EXECUTABLE) 168805+ 168806+ dnl Expose to Makefile 168807+ PHP_SUBST(SAPI_CLI_PATH) 168808 PHP_SUBST(BUILD_CLI) 168809- PHP_SUBST(INSTALL_CLI) 168810+ 168811 PHP_OUTPUT(sapi/cli/php.1) 168812 fi 168813 AC_MSG_RESULT($PHP_CLI) 168814diff -Naur php-5.3.23-patch1/sapi/fpm/Makefile.frag php-5.3.23-patch2/sapi/fpm/Makefile.frag 168815--- php-5.3.23-patch1/sapi/fpm/Makefile.frag 2013-04-04 21:27:16.000000000 -0700 168816+++ php-5.3.23-patch2/sapi/fpm/Makefile.frag 2013-04-04 21:36:54.000000000 -0700 168817@@ -1,17 +1,9 @@ 168818 fpm: $(SAPI_FPM_PATH) 168819 168820-$(builddir)/fpm: 168821- @mkdir -p $(builddir)/fpm 168822- @mkdir -p $(builddir)/fpm/events 168823- 168824-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) 168825+$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS) 168826 $(BUILD_FPM) 168827 168828-$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h 168829- 168830-install-build: install-fpm 168831- 168832-install-fpm: install-sapi 168833+install-fpm: $(SAPI_FPM_PATH) 168834 @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" 168835 @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) 168836 @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log 168837@@ -20,7 +12,6 @@ 168838 168839 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ 168840 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || : 168841- 168842 @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : 168843 168844 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" 168845diff -Naur php-5.3.23-patch1/sapi/fpm/config.m4 php-5.3.23-patch2/sapi/fpm/config.m4 168846--- php-5.3.23-patch1/sapi/fpm/config.m4 2013-04-04 21:27:16.000000000 -0700 168847+++ php-5.3.23-patch2/sapi/fpm/config.m4 2013-04-04 21:36:54.000000000 -0700 168848@@ -583,11 +583,12 @@ 168849 AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name]) 168850 AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name]) 168851 168852+ PHP_ADD_BUILD_DIR(sapi/fpm/fpm) 168853+ PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events) 168854 PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html) 168855- PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm]) 168856+ PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) 168857 168858 SAPI_FPM_PATH=sapi/fpm/php-fpm 168859- PHP_SUBST(SAPI_FPM_PATH) 168860 168861 if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then 168862 PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c" 168863@@ -595,7 +596,6 @@ 168864 168865 PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" 168866 168867- INSTALL_IT=":" 168868 PHP_FPM_FILES="fpm/fastcgi.c \ 168869 fpm/fpm.c \ 168870 fpm/fpm_children.c \ 168871@@ -631,17 +631,19 @@ 168872 168873 case $host_alias in 168874 *aix*) 168875- BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168876+ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168877 ;; 168878 *darwin*) 168879- BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168880+ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168881 ;; 168882 *) 168883- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168884+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" 168885 ;; 168886 esac 168887 168888+ PHP_SUBST(SAPI_FPM_PATH) 168889 PHP_SUBST(BUILD_FPM) 168890+ 168891 else 168892 AC_MSG_RESULT(no) 168893 fi 168894diff -Naur php-5.3.23-patch1/sapi/litespeed/Makefile.frag php-5.3.23-patch2/sapi/litespeed/Makefile.frag 168895--- php-5.3.23-patch1/sapi/litespeed/Makefile.frag 2013-04-04 21:27:16.000000000 -0700 168896+++ php-5.3.23-patch2/sapi/litespeed/Makefile.frag 2013-04-04 21:36:54.000000000 -0700 168897@@ -1,3 +1,9 @@ 168898-$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 168899+litespeed: $(SAPI_LITESPEED_PATH) 168900+ 168901+$(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OBJS) 168902 $(BUILD_LITESPEED) 168903 168904+install-litespeed: $(SAPI_LITESPEED_PATH) 168905+ @echo "Installing PHP LitSpeed binary: $(INSTALL_ROOT)$(bindir)/" 168906+ @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/lsphp 168907+ 168908diff -Naur php-5.3.23-patch1/sapi/litespeed/config.m4 php-5.3.23-patch2/sapi/litespeed/config.m4 168909--- php-5.3.23-patch1/sapi/litespeed/config.m4 2013-04-04 21:27:16.000000000 -0700 168910+++ php-5.3.23-patch2/sapi/litespeed/config.m4 2013-04-04 21:36:54.000000000 -0700 168911@@ -10,22 +10,22 @@ 168912 if test "$PHP_LITESPEED" != "no"; then 168913 PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed) 168914 SAPI_LITESPEED_PATH=sapi/litespeed/php 168915- PHP_SUBST(SAPI_LITESPEED_PATH) 168916 PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, "", '$(SAPI_LITESPEED_PATH)') 168917 INSTALL_IT="@echo \"Installing PHP LiteSpeed into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) \$(INSTALL_ROOT)\$(bindir)/lsphp" 168918 case $host_alias in 168919 *darwin*) 168920- BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168921+ BUILD_LITESPEED="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_LITESPEED_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168922 ;; 168923 *cygwin*) 168924 SAPI_LITESPEED_PATH=sapi/litespeed/php.exe 168925- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168926+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168927 ;; 168928 *) 168929- BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168930+ BUILD_LITESPEED="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_LITESPEED_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)" 168931 ;; 168932 esac 168933 168934+ PHP_SUBST(SAPI_LITESPEED_PATH) 168935 PHP_SUBST(BUILD_LITESPEED) 168936 fi 168937 168938diff -Naur php-5.3.23-patch1/sapi/milter/Makefile.frag php-5.3.23-patch2/sapi/milter/Makefile.frag 168939--- php-5.3.23-patch1/sapi/milter/Makefile.frag 2013-04-04 21:27:16.000000000 -0700 168940+++ php-5.3.23-patch2/sapi/milter/Makefile.frag 2013-04-04 21:36:54.000000000 -0700 168941@@ -1,2 +1,8 @@ 168942-$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) 168943+milter: $(SAPI_MILTER_PATH) 168944+ 168945+$(SAPI_MILTER_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_SAPI_OBJS) 168946 $(BUILD_MILTER) 168947+ 168948+install-milter: $(SAPI_MILTER_PATH) 168949+ @$(INSTALL) -m 0755 $(SAPI_MILTER_PATH) $(bindir)/php-milter 168950+ 168951diff -Naur php-5.3.23-patch1/sapi/milter/config.m4 php-5.3.23-patch2/sapi/milter/config.m4 168952--- php-5.3.23-patch1/sapi/milter/config.m4 2013-04-04 21:27:16.000000000 -0700 168953+++ php-5.3.23-patch2/sapi/milter/config.m4 2013-04-04 21:36:54.000000000 -0700 168954@@ -25,8 +25,7 @@ 168955 PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/milter/Makefile.frag) 168956 PHP_SELECT_SAPI(milter, program, php_milter.c getopt.c,,'$(SAPI_MILTER_PATH)') 168957 PHP_ADD_LIBRARY_WITH_PATH(milter, $MILTERPATH,) 168958- BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" 168959- INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_MILTER_PATH) \$(bindir)/php-milter" 168960+ BUILD_MILTER="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_MILTER_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_MILTER_PATH)" 168961 PHP_SUBST(SAPI_MILTER_PATH) 168962 PHP_SUBST(BUILD_MILTER) 168963 fi 168964