--- php4-4.0.5.orig/build/buildcheck.sh +++ php4-4.0.5/build/buildcheck.sh @@ -67,14 +67,27 @@ fi lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` IFS=.; set $lt_version; IFS=' ' -if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" && (test "$3" = "c" || test "$3" -ge "3") +if test "$1" -gt "1" || test "$2" -gt "3" || test "$2" = "3" && (test "x$3" != "x") then -echo "buildconf: libtool version $lt_pversion (ok)" + if test "$3" = "c" || test "$3" -ge "3" + then + echo "buildconf: libtool version $lt_pversion (ok)" + else + echo "buildconf: libtool version $lt_pversion found." + echo " You need libtool version 1.3.3 or newer installed" + echo " to build PHP from CVS." + exit 1 + fi else -echo "buildconf: libtool version $lt_pversion found." -echo " You need libtool version 1.3.3 or newer installed" -echo " to build PHP from CVS." -exit 1 + if test "x$3" == "x" && test "$2" -lt "4" + then + echo "buildconf: libtool version $lt_pversion found." + echo " You need libtool version 1.3.3 or newer installed" + echo " to build PHP from CVS." + exit 1 + else + echo "buildconf: libtool version $lt_pversion (ok)" + fi fi am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'` --- php4-4.0.5.orig/configure +++ php4-4.0.5/configure @@ -665,8 +665,7 @@ --with-sybase[=DIR] Include Sybase-DB support. DIR is the Sybase home directory, defaults to /home/sybase." ac_help="$ac_help - --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home - directory, defaults to /home/sybase." +" ac_help="$ac_help --enable-sysvsem Enable System V semaphore support." ac_help="$ac_help @@ -674,11 +673,9 @@ ac_help="$ac_help --with-vpopmail[=DIR] Include vpopmail support." ac_help="$ac_help - --enable-wddx Enable WDDX support" -ac_help="$ac_help -" + --with-wddx=[DIR] Enable WDDX support" ac_help="$ac_help - --disable-xml Disable XML support using bundled expat lib" + --with-xml=[DIR] Disable XML support using bundled expat lib" ac_help="$ac_help --with-yaz[=DIR] Include YAZ support (ANSI/NISO Z39.50). DIR is the YAZ bin install directory" @@ -1306,7 +1303,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1310: checking for a BSD compatible install" >&5 +echo "configure:1307: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1359,7 +1356,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:1363: checking whether build environment is sane" >&5 +echo "configure:1360: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1416,7 +1413,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1420: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1417: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1455,7 +1452,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1459: checking for working aclocal" >&5 +echo "configure:1456: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1468,7 +1465,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1472: checking for working autoconf" >&5 +echo "configure:1469: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1481,7 +1478,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1485: checking for working automake" >&5 +echo "configure:1482: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1494,7 +1491,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1498: checking for working autoheader" >&5 +echo "configure:1495: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1507,7 +1504,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1511: checking for working makeinfo" >&5 +echo "configure:1508: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1537,7 +1534,7 @@ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1541: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1538: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1566,7 +1563,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1570: checking host system type" >&5 +echo "configure:1567: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1594,7 +1591,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1598: checking for $ac_word" >&5 +echo "configure:1595: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1628,7 +1625,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1632: checking for $ac_word" >&5 +echo "configure:1629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1662,7 +1659,7 @@ echo "configure: warning: You will need bison if you want to regenerate the PHP parsers." 1>&2 else echo $ac_n "checking bison version""... $ac_c" 1>&6 -echo "configure:1666: checking bison version" >&5 +echo "configure:1663: checking bison version" >&5 oldIFS=$IFS; IFS=. set `bison -V | sed -e 's/^GNU Bison version //'` IFS=$oldIFS @@ -1675,7 +1672,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1679: checking for $ac_word" >&5 +echo "configure:1676: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1705,7 +1702,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1709: checking for $ac_word" >&5 +echo "configure:1706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1756,7 +1753,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1760: checking for $ac_word" >&5 +echo "configure:1757: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1788,7 +1785,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1792: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1789: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1799,12 +1796,12 @@ cat > conftest.$ac_ext << EOF -#line 1803 "configure" +#line 1800 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1830,12 +1827,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1831: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1839: checking whether we are using GNU C" >&5 +echo "configure:1836: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1844,7 +1841,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1863,7 +1860,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1867: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1864: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1895,7 +1892,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1899: checking how to run the C preprocessor" >&5 +echo "configure:1896: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1910,13 +1907,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1927,13 +1924,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1944,13 +1941,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1975,9 +1972,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1979: checking for AIX" >&5 +echo "configure:1976: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2027: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:2024: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2039,7 +2036,7 @@ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -2076,7 +2073,7 @@ ; return 0; } EOF -if { (eval echo configure:2080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -2103,7 +2100,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2107: checking for $ac_word" >&5 +echo "configure:2104: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2132,10 +2129,10 @@ if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:2136: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2133: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:2139: checking whether cc understands -c and -o together" >&5 +echo "configure:2136: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -2147,16 +2144,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:2159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2183,7 +2180,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2187: checking whether ln -s works" >&5 +echo "configure:2184: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2207,7 +2204,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2211: checking for $ac_word" >&5 +echo "configure:2208: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2241,7 +2238,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2245: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2242: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2249,7 +2246,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2284,7 +2281,7 @@ if test -n "$LEX"; then echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:2288: checking lex output file root" >&5 +echo "configure:2285: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2305,7 +2302,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:2309: checking whether yytext is a pointer" >&5 +echo "configure:2306: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2317,14 +2314,14 @@ ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -2348,12 +2345,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2352: checking for working const" >&5 +echo "configure:2349: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2501,7 +2498,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -2519,7 +2516,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -2539,7 +2536,7 @@ CFLAGS="$save_CFLAGS" echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:2543: checking for pthreads_cflags" >&5 +echo "configure:2540: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2554,7 +2551,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -2572,7 +2569,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -2601,7 +2598,7 @@ echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:2605: checking for pthreads_lib" >&5 +echo "configure:2602: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2616,7 +2613,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -2634,7 +2631,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -2697,7 +2694,7 @@ echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 -echo "configure:2701: checking for AOLserver support" >&5 +echo "configure:2698: checking for AOLserver support" >&5 # Check whether --with-aolserver or --without-aolserver was given. if test "${with_aolserver+set}" = set; then withval="$with_aolserver" @@ -2771,7 +2768,7 @@ echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:2775: checking for Apache module support via DSO through APXS" >&5 +echo "configure:2772: checking for Apache module support via DSO through APXS" >&5 # Check whether --with-apxs or --without-apxs was given. if test "${with_apxs+set}" = set; then withval="$with_apxs" @@ -2876,7 +2873,7 @@ if test "$PHP_SAPI" != "apache"; then echo $ac_n "checking for Apache module support""... $ac_c" 1>&6 -echo "configure:2880: checking for Apache module support" >&5 +echo "configure:2877: checking for Apache module support" >&5 # Check whether --with-apache or --without-apache was given. if test "${with_apache+set}" = set; then withval="$with_apache" @@ -3095,7 +3092,7 @@ echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6 -echo "configure:3099: checking for mod_charset compatibility option" >&5 +echo "configure:3096: checking for mod_charset compatibility option" >&5 # Check whether --with-mod_charset or --without-mod_charset was given. if test "${with_mod_charset+set}" = set; then withval="$with_mod_charset" @@ -3119,7 +3116,7 @@ gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:3123: checking whether $CC supports -rdynamic" >&5 +echo "configure:3120: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3165,7 +3162,7 @@ echo $ac_n "checking for Apache 2.0 module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:3169: checking for Apache 2.0 module support via DSO through APXS" >&5 +echo "configure:3166: checking for Apache 2.0 module support via DSO through APXS" >&5 # Check whether --with-apxs2 or --without-apxs2 was given. if test "${with_apxs2+set}" = set; then withval="$with_apxs2" @@ -3264,7 +3261,7 @@ RESULT=no echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 -echo "configure:3268: checking for Caudium support" >&5 +echo "configure:3265: checking for Caudium support" >&5 # Check whether --with-caudium or --without-caudium was given. if test "${with_caudium+set}" = set; then withval="$with_caudium" @@ -3332,7 +3329,7 @@ PIKE_C_INCLUDE=/usr/local/include/`basename ${PIKE}` fi echo $ac_n "checking for C includes in ${PIKE_C_INCLUDE}""... $ac_c" 1>&6 -echo "configure:3336: checking for C includes in ${PIKE_C_INCLUDE}" >&5 +echo "configure:3333: checking for C includes in ${PIKE_C_INCLUDE}" >&5 if test -f $PIKE_C_INCLUDE/version.h; then PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` ###### VERSION MATCH CHECK ####### @@ -3426,7 +3423,7 @@ echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6 -echo "configure:3430: checking whether to force Apache CGI redirect" >&5 +echo "configure:3427: checking whether to force Apache CGI redirect" >&5 # Check whether --enable-force-cgi-redirect or --disable-force-cgi-redirect was given. if test "${enable_force_cgi_redirect+set}" = set; then enableval="$enable_force_cgi_redirect" @@ -3481,7 +3478,7 @@ echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6 -echo "configure:3485: checking whether to discard path_info + path_translated" >&5 +echo "configure:3482: checking whether to discard path_info + path_translated" >&5 # Check whether --enable-discard-path or --disable-discard-path was given. if test "${enable_discard_path+set}" = set; then enableval="$enable_discard_path" @@ -3540,7 +3537,7 @@ fi echo $ac_n "checking for fhttpd module support""... $ac_c" 1>&6 -echo "configure:3544: checking for fhttpd module support" >&5 +echo "configure:3541: checking for fhttpd module support" >&5 # Check whether --with-fhttpd or --without-fhttpd was given. if test "${with_fhttpd+set}" = set; then withval="$with_fhttpd" @@ -3587,7 +3584,7 @@ echo $ac_n "checking for FastCGI support""... $ac_c" 1>&6 -echo "configure:3591: checking for FastCGI support" >&5 +echo "configure:3588: checking for FastCGI support" >&5 # Check whether --with-fastcgi or --without-fastcgi was given. if test "${with_fastcgi+set}" = set; then withval="$with_fastcgi" @@ -3649,7 +3646,7 @@ RESULT=no echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 -echo "configure:3653: checking for Zeus ISAPI support" >&5 +echo "configure:3650: checking for Zeus ISAPI support" >&5 # Check whether --with-isapi or --without-isapi was given. if test "${with_isapi+set}" = set; then withval="$with_isapi" @@ -3711,7 +3708,7 @@ echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 -echo "configure:3715: checking for NSAPI support" >&5 +echo "configure:3712: checking for NSAPI support" >&5 # Check whether --with-nsapi or --without-nsapi was given. if test "${with_nsapi+set}" = set; then withval="$with_nsapi" @@ -3731,7 +3728,7 @@ { echo "configure: error: Please specify the path to the root of your Netscape server using --with-nsapi=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 -echo "configure:3735: checking for NSAPI include files" >&5 +echo "configure:3732: checking for NSAPI include files" >&5 if test -d $PHP_NSAPI/include ; then NSAPI_INCLUDE=$PHP_NSAPI/include echo "$ac_t""Netscape-Enterprise/3.x style" 1>&6 @@ -3790,7 +3787,7 @@ RESULT=no echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 -echo "configure:3794: checking for PHTTPD support" >&5 +echo "configure:3791: checking for PHTTPD support" >&5 # Check whether --with-phttpd or --without-phttpd was given. if test "${with_phttpd+set}" = set; then withval="$with_phttpd" @@ -3851,7 +3848,7 @@ echo $ac_n "checking for Pi3Web Support""... $ac_c" 1>&6 -echo "configure:3855: checking for Pi3Web Support" >&5 +echo "configure:3852: checking for Pi3Web Support" >&5 # Check whether --with-pi3web or --without-pi3web was given. if test "${with_pi3web+set}" = set; then withval="$with_pi3web" @@ -4029,7 +4026,7 @@ RESULT=no echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 -echo "configure:4033: checking for Roxen/Pike support" >&5 +echo "configure:4030: checking for Roxen/Pike support" >&5 # Check whether --with-roxen or --without-roxen was given. if test "${with_roxen+set}" = set; then withval="$with_roxen" @@ -4103,7 +4100,7 @@ if test "$RESULT" != "no" ; then RESULT=no echo $ac_n "checking if Roxen should use ZTS""... $ac_c" 1>&6 -echo "configure:4107: checking if Roxen should use ZTS" >&5 +echo "configure:4104: checking if Roxen should use ZTS" >&5 # Check whether --enable-roxen-zts or --disable-roxen-zts was given. if test "${enable_roxen_zts+set}" = set; then enableval="$enable_roxen_zts" @@ -4131,7 +4128,7 @@ # config.m4 for servlet sapi echo $ac_n "checking for Servlet support""... $ac_c" 1>&6 -echo "configure:4135: checking for Servlet support" >&5 +echo "configure:4132: checking for Servlet support" >&5 # Check whether --with-servlet or --without-servlet was given. if test "${with_servlet+set}" = set; then withval="$with_servlet" @@ -4257,13 +4254,13 @@ echo $ac_n "checking for thttpd""... $ac_c" 1>&6 -echo "configure:4261: checking for thttpd" >&5 +echo "configure:4258: checking for thttpd" >&5 echo "$ac_t""$PHP_THTTPD" 1>&6 echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 -echo "configure:4267: checking for chosen SAPI module" >&5 +echo "configure:4264: checking for chosen SAPI module" >&5 echo "$ac_t""$PHP_SAPI" 1>&6 if test "$enable_experimental_zts" = "yes"; then @@ -4312,16 +4309,16 @@ echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 -echo "configure:4316: checking for missing declarations of reentrant functions" >&5 +echo "configure:4313: checking for missing declarations of reentrant functions" >&5 cat > conftest.$ac_ext < int main() { struct tm *(*func)() = localtime_r ; return 0; } EOF -if { (eval echo configure:4325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -4339,14 +4336,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { struct tm *(*func)() = gmtime_r ; return 0; } EOF -if { (eval echo configure:4350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -4364,14 +4361,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = asctime_r ; return 0; } EOF -if { (eval echo configure:4375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -4389,14 +4386,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = ctime_r ; return 0; } EOF -if { (eval echo configure:4400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -4414,14 +4411,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = strtok_r ; return 0; } EOF -if { (eval echo configure:4425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -4442,7 +4439,7 @@ echo $ac_n "checking whether compiler supports -R""... $ac_c" 1>&6 -echo "configure:4446: checking whether compiler supports -R" >&5 +echo "configure:4443: checking whether compiler supports -R" >&5 if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4450,14 +4447,14 @@ SAVE_LIBS="${LIBS}" LIBS="-R /usr/lib ${LIBS}" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_dashr=yes else @@ -4475,7 +4472,7 @@ ld_runpath_switch="-R" else echo $ac_n "checking whether compiler supports -Wl,-rpath,""... $ac_c" 1>&6 -echo "configure:4479: checking whether compiler supports -Wl,-rpath," >&5 +echo "configure:4476: checking whether compiler supports -Wl,-rpath," >&5 if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4483,14 +4480,14 @@ SAVE_LIBS="${LIBS}" LIBS="-Wl,-rpath,/usr/lib ${LIBS}" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_rpath=yes else @@ -4515,7 +4512,7 @@ # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4519: checking for $ac_word" >&5 +echo "configure:4516: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4537,6 +4534,7 @@ fi done IFS="$ac_save_ifs" + test -z "$ac_cv_path_PROG_SENDMAIL" && ac_cv_path_PROG_SENDMAIL="/usr/sbin/sendmail" ;; esac fi @@ -4557,7 +4555,7 @@ echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 -echo "configure:4561: checking whether system uses EBCDIC" >&5 +echo "configure:4559: checking whether system uses EBCDIC" >&5 if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4568,7 +4566,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ebcdic="yes" @@ -4612,7 +4610,7 @@ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:4616: checking for socket in -lsocket" >&5 +echo "configure:4614: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4620,7 +4618,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4667,7 +4665,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:4671: checking for htonl in -lsocket" >&5 +echo "configure:4669: checking for htonl in -lsocket" >&5 ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4675,7 +4673,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4725,12 +4723,12 @@ unset ac_cv_func_yp_get_default_domain echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:4729: checking for yp_get_default_domain" >&5 +echo "configure:4727: checking for yp_get_default_domain" >&5 if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_yp_get_default_domain=yes" else @@ -4778,7 +4776,7 @@ if test "$php_no_nsl_checks" != "yes"; then echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:4782: checking for gethostname in -lnsl" >&5 +echo "configure:4780: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4786,7 +4784,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4833,7 +4831,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:4837: checking for gethostbyaddr in -lnsl" >&5 +echo "configure:4835: checking for gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4841,7 +4839,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4895,7 +4893,7 @@ fi echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:4899: checking for crypt in -lcrypt" >&5 +echo "configure:4897: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4903,7 +4901,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4952,7 +4950,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4956: checking for dlopen in -ldl" >&5 +echo "configure:4954: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4960,7 +4958,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5004,7 +5002,7 @@ echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:5008: checking for sin in -lm" >&5 +echo "configure:5006: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5012,7 +5010,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5052,7 +5050,7 @@ echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:5056: checking for inet_aton in -lresolv" >&5 +echo "configure:5054: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5060,7 +5058,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5098,7 +5096,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:5102: checking for inet_aton in -lbind" >&5 +echo "configure:5100: checking for inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5106,7 +5104,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5144,7 +5142,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:5148: checking for __inet_aton in -lbind" >&5 +echo "configure:5146: checking for __inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5152,7 +5150,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5198,7 +5196,7 @@ echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:5202: checking for res_search in -lsocket" >&5 +echo "configure:5200: checking for res_search in -lsocket" >&5 ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5206,7 +5204,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5234,7 +5232,7 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:5238: checking for dn_skipname in -lresolv" >&5 +echo "configure:5236: checking for dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5242,7 +5240,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5281,7 +5279,7 @@ fi echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:5285: checking for __dn_skipname in -lresolv" >&5 +echo "configure:5283: checking for __dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5289,7 +5287,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5336,7 +5334,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:5340: checking for res_search in -lresolv" >&5 +echo "configure:5338: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5344,7 +5342,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5381,7 +5379,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:5385: checking for dn_skipname in -lresolv" >&5 +echo "configure:5383: checking for dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5389,7 +5387,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5428,7 +5426,7 @@ fi echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:5432: checking for __dn_skipname in -lresolv" >&5 +echo "configure:5430: checking for __dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5436,7 +5434,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5482,12 +5480,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5486: checking for ANSI C header files" >&5 +echo "configure:5484: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5495,7 +5493,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5512,7 +5510,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5530,7 +5528,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5551,7 +5549,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5562,7 +5560,7 @@ exit (0); } EOF -if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5592,12 +5590,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:5596: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5594: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -5605,7 +5603,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5630,7 +5628,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:5634: checking for opendir in -ldir" >&5 +echo "configure:5632: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5638,7 +5636,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5671,7 +5669,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5675: checking for opendir in -lx" >&5 +echo "configure:5673: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5679,7 +5677,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5717,17 +5715,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5721: checking for $ac_hdr" >&5 +echo "configure:5719: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5756,16 +5754,16 @@ fi echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 -echo "configure:5760: checking for fclose declaration" >&5 +echo "configure:5758: checking for fclose declaration" >&5 cat > conftest.$ac_ext < int main() { int (*func)() = fclose ; return 0; } EOF -if { (eval echo configure:5769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5825,17 +5823,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5829: checking for $ac_hdr" >&5 +echo "configure:5827: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5863,12 +5861,12 @@ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5867: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5865: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5876,7 +5874,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5897,12 +5895,12 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5901: checking for tm_zone in struct tm" >&5 +echo "configure:5899: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -5910,7 +5908,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5930,12 +5928,12 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5934: checking for tzname" >&5 +echo "configure:5932: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -5945,7 +5943,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5969,12 +5967,12 @@ echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:5973: checking for tm_gmtoff in struct tm" >&5 +echo "configure:5971: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -5982,7 +5980,7 @@ struct tm tm; tm.tm_gmtoff; ; return 0; } EOF -if { (eval echo configure:5986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_gmtoff=yes else @@ -6005,12 +6003,12 @@ echo $ac_n "checking for struct flock""... $ac_c" 1>&6 -echo "configure:6009: checking for struct flock" >&5 +echo "configure:6007: checking for struct flock" >&5 if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6020,7 +6018,7 @@ struct flock x; ; return 0; } EOF -if { (eval echo configure:6024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_flock=yes @@ -6047,12 +6045,12 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:6051: checking for socklen_t" >&5 +echo "configure:6049: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6064,7 +6062,7 @@ ; return 0; } EOF -if { (eval echo configure:6068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_socklen_t=yes @@ -6090,7 +6088,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:6094: checking size of long" >&5 +echo "configure:6092: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6098,7 +6096,7 @@ ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < #include @@ -6110,7 +6108,7 @@ exit(0); } EOF -if { (eval echo configure:6114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -6130,7 +6128,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:6134: checking size of int" >&5 +echo "configure:6132: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6138,7 +6136,7 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < #include @@ -6150,7 +6148,7 @@ exit(0); } EOF -if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -6205,12 +6203,12 @@ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:6209: checking for st_blksize in struct stat" >&5 +echo "configure:6207: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6218,7 +6216,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:6222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -6240,12 +6238,12 @@ if test "`uname -s 2>/dev/null`" != "QNX"; then echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:6244: checking for st_blocks in struct stat" >&5 +echo "configure:6242: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6253,7 +6251,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:6257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -6280,12 +6278,12 @@ WARNING_LEVEL=0 fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:6284: checking for st_rdev in struct stat" >&5 +echo "configure:6282: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6293,7 +6291,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:6297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -6315,12 +6313,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6319: checking for size_t" >&5 +echo "configure:6317: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6348,12 +6346,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6352: checking for uid_t in sys/types.h" >&5 +echo "configure:6350: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6383,12 +6381,12 @@ echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 -echo "configure:6387: checking for IPv6 support" >&5 +echo "configure:6385: checking for IPv6 support" >&5 if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6396,7 +6394,7 @@ struct sockaddr_in6 s; int i=AF_INET6; s ; return 0; } EOF -if { (eval echo configure:6400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ipv6_support=yes else @@ -6417,12 +6415,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:6421: checking for vprintf" >&5 +echo "configure:6419: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -6469,12 +6467,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:6473: checking for _doprnt" >&5 +echo "configure:6471: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -6581,12 +6579,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6585: checking for $ac_func" >&5 +echo "configure:6583: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6635,19 +6633,19 @@ echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:6639: checking for getaddrinfo" >&5 +echo "configure:6637: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g); ; return 0; } EOF -if { (eval echo configure:6651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_getaddrinfo=yes else @@ -6670,12 +6668,12 @@ for ac_func in strlcat strlcpy getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6674: checking for $ac_func" >&5 +echo "configure:6672: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6725,7 +6723,7 @@ echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:6729: checking whether utime accepts a null argument" >&5 +echo "configure:6727: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6735,7 +6733,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -6746,7 +6744,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:6750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -6772,19 +6770,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6776: checking for working alloca.h" >&5 +echo "configure:6774: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6805,12 +6803,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6809: checking for alloca" >&5 +echo "configure:6807: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6870,12 +6868,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6874: checking whether alloca needs Cray hooks" >&5 +echo "configure:6872: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6904: checking for $ac_func" >&5 +echo "configure:6902: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6955,7 +6953,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6959: checking stack direction for C alloca" >&5 +echo "configure:6957: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6963,7 +6961,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -7005,7 +7003,7 @@ echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 -echo "configure:7009: checking whether sprintf is broken" >&5 +echo "configure:7007: checking whether sprintf is broken" >&5 if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7016,11 +7014,11 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_sprintf=no @@ -7054,13 +7052,13 @@ echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 -echo "configure:7058: checking for declared timezone" >&5 +echo "configure:7056: checking for declared timezone" >&5 if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7075,7 +7073,7 @@ ; return 0; } EOF -if { (eval echo configure:7079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_timezone=yes @@ -7101,7 +7099,7 @@ echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 -echo "configure:7105: checking for type of reentrant time-related functions" >&5 +echo "configure:7103: checking for type of reentrant time-related functions" >&5 if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7112,7 +7110,7 @@ else cat > conftest.$ac_ext < @@ -7131,7 +7129,7 @@ } EOF -if { (eval echo configure:7135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_time_r_type=hpux @@ -7160,12 +7158,12 @@ echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 -echo "configure:7164: checking for readdir_r" >&5 +echo "configure:7162: checking for readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_readdir_r=yes" else @@ -7210,7 +7208,7 @@ if test "$ac_cv_func_readdir_r" = "yes"; then echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6 -echo "configure:7214: checking for type of readdir_r" >&5 +echo "configure:7212: checking for type of readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7221,7 +7219,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_what_readdir_r=POSIX @@ -7257,7 +7255,7 @@ rm -fr conftest* cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7312,7 +7310,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7349,7 +7347,7 @@ echo $ac_n "checking whether to use a configuration file""... $ac_c" 1>&6 -echo "configure:7353: checking whether to use a configuration file" >&5 +echo "configure:7351: checking whether to use a configuration file" >&5 # Check whether --with-config-file-path or --without-config-file-path was given. if test "${with_config_file_path+set}" = set; then withval="$with_config_file_path" @@ -7418,7 +7416,7 @@ echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 -echo "configure:7422: checking whether to include debugging symbols" >&5 +echo "configure:7420: checking whether to include debugging symbols" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -7474,7 +7472,7 @@ echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 -echo "configure:7478: checking whether to enable safe mode by default" >&5 +echo "configure:7476: checking whether to enable safe mode by default" >&5 # Check whether --enable-safe-mode or --disable-safe-mode was given. if test "${enable_safe_mode+set}" = set; then enableval="$enable_safe_mode" @@ -7529,7 +7527,7 @@ fi echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 -echo "configure:7533: checking for safe mode exec dir" >&5 +echo "configure:7531: checking for safe mode exec dir" >&5 # Check whether --with-exec-dir or --without-exec-dir was given. if test "${with_exec_dir+set}" = set; then withval="$with_exec_dir" @@ -7570,7 +7568,7 @@ echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 -echo "configure:7574: checking for OpenSSL support" >&5 +echo "configure:7572: checking for OpenSSL support" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" @@ -7635,9 +7633,9 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$OPENSSL_INC" echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:7639: checking for OpenSSL version" >&5 +echo "configure:7637: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < @@ -7697,7 +7695,7 @@ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:7701: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:7699: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7705,7 +7703,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7754,7 +7752,7 @@ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:7758: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:7756: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7762,7 +7760,7 @@ ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7842,7 +7840,7 @@ echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 -echo "configure:7846: checking whether to enable PHP's own SIGCHLD handler" >&5 +echo "configure:7844: checking whether to enable PHP's own SIGCHLD handler" >&5 # Check whether --enable-sigchild or --disable-sigchild was given. if test "${enable_sigchild+set}" = set; then enableval="$enable_sigchild" @@ -7899,7 +7897,7 @@ echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 -echo "configure:7903: checking whether to enable magic quotes by default" >&5 +echo "configure:7901: checking whether to enable magic quotes by default" >&5 # Check whether --enable-magic-quotes or --disable-magic-quotes was given. if test "${enable_magic_quotes+set}" = set; then enableval="$enable_magic_quotes" @@ -7956,7 +7954,7 @@ echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 -echo "configure:7960: checking whether to enable runpaths" >&5 +echo "configure:7958: checking whether to enable runpaths" >&5 # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -8001,7 +7999,7 @@ echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 -echo "configure:8005: checking whether to explicitly link against libgcc" >&5 +echo "configure:8003: checking whether to explicitly link against libgcc" >&5 # Check whether --enable-libgcc or --disable-libgcc was given. if test "${enable_libgcc+set}" = set; then enableval="$enable_libgcc" @@ -8102,7 +8100,7 @@ echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 -echo "configure:8106: checking whether to enable short tags by default" >&5 +echo "configure:8104: checking whether to enable short tags by default" >&5 # Check whether --enable-short-tags or --disable-short-tags was given. if test "${enable_short_tags+set}" = set; then enableval="$enable_short_tags" @@ -8160,7 +8158,7 @@ echo $ac_n "checking whether to enable PIC for shared objects""... $ac_c" 1>&6 -echo "configure:8164: checking whether to enable PIC for shared objects" >&5 +echo "configure:8162: checking whether to enable PIC for shared objects" >&5 # Check whether --enable-pic or --disable-pic was given. if test "${enable_pic+set}" = set; then enableval="$enable_pic" @@ -8206,7 +8204,7 @@ echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 -echo "configure:8210: checking whether to enable dmalloc" >&5 +echo "configure:8208: checking whether to enable dmalloc" >&5 # Check whether --enable-dmalloc or --disable-dmalloc was given. if test "${enable_dmalloc+set}" = set; then enableval="$enable_dmalloc" @@ -8271,7 +8269,7 @@ echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 -echo "configure:8275: checking whether to install PEAR" >&5 +echo "configure:8273: checking whether to install PEAR" >&5 # Check whether --enable-pear or --disable-pear was given. if test "${enable_pear+set}" = set; then enableval="$enable_pear" @@ -8328,7 +8326,7 @@ # reading config stubs echo $ac_n "checking for ASPELL support""... $ac_c" 1>&6 -echo "configure:8332: checking for ASPELL support" >&5 +echo "configure:8330: checking for ASPELL support" >&5 # Check whether --with-aspell or --without-aspell was given. if test "${with_aspell+set}" = set; then withval="$with_aspell" @@ -8577,7 +8575,7 @@ echo $ac_n "checking for bc style precision math functions""... $ac_c" 1>&6 -echo "configure:8581: checking for bc style precision math functions" >&5 +echo "configure:8579: checking for bc style precision math functions" >&5 # Check whether --enable-bcmath or --disable-bcmath was given. if test "${enable_bcmath+set}" = set; then enableval="$enable_bcmath" @@ -8879,7 +8877,7 @@ echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 -echo "configure:8883: checking for BZip2 support" >&5 +echo "configure:8881: checking for BZip2 support" >&5 # Check whether --with-bz2 or --without-bz2 was given. if test "${with_bz2+set}" = set; then withval="$with_bz2" @@ -8926,7 +8924,7 @@ BZIP_DIR=$PHP_BZ2 else echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -echo "configure:8930: checking for BZip2 in default path" >&5 +echo "configure:8928: checking for BZip2 in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/bzlib.h; then BZIP_DIR=$i @@ -9066,7 +9064,7 @@ echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -echo "configure:9070: checking for BZ2_bzerror in -lbz2" >&5 +echo "configure:9068: checking for BZ2_bzerror in -lbz2" >&5 ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9074,7 +9072,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9250,7 +9248,7 @@ echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 -echo "configure:9254: checking whether to enable calendar conversion support" >&5 +echo "configure:9252: checking whether to enable calendar conversion support" >&5 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then enableval="$enable_calendar" @@ -9436,7 +9434,7 @@ echo $ac_n "checking CCVS Support""... $ac_c" 1>&6 -echo "configure:9440: checking CCVS Support" >&5 +echo "configure:9438: checking CCVS Support" >&5 # Check whether --with-ccvs or --without-ccvs was given. if test "${with_ccvs+set}" = set; then withval="$with_ccvs" @@ -9676,7 +9674,7 @@ echo $ac_n "checking whether to include cpdflib support""... $ac_c" 1>&6 -echo "configure:9680: checking whether to include cpdflib support" >&5 +echo "configure:9678: checking whether to include cpdflib support" >&5 # Check whether --with-cpdflib or --without-cpdflib was given. if test "${with_cpdflib+set}" = set; then withval="$with_cpdflib" @@ -9822,7 +9820,7 @@ echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6 -echo "configure:9826: checking for cpdf_open in -lcpdf" >&5 +echo "configure:9824: checking for cpdf_open in -lcpdf" >&5 ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9830,7 +9828,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcpdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10045,7 +10043,7 @@ old_withval=$withval echo $ac_n "checking for libjpeg (needed by cpdflib 2.x)""... $ac_c" 1>&6 -echo "configure:10049: checking for libjpeg (needed by cpdflib 2.x)" >&5 +echo "configure:10047: checking for libjpeg (needed by cpdflib 2.x)" >&5 # Check whether --with-jpeg-dir or --without-jpeg-dir was given. if test "${with_jpeg_dir+set}" = set; then withval="$with_jpeg_dir" @@ -10056,7 +10054,7 @@ fi LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:10060: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:10058: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10064,7 +10062,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10164,7 +10162,7 @@ echo $ac_n "checking for libtiff (needed by cpdflib 2.x)""... $ac_c" 1>&6 -echo "configure:10168: checking for libtiff (needed by cpdflib 2.x)" >&5 +echo "configure:10166: checking for libtiff (needed by cpdflib 2.x)" >&5 # Check whether --with-tiff-dir or --without-tiff-dir was given. if test "${with_tiff_dir+set}" = set; then withval="$with_tiff_dir" @@ -10175,7 +10173,7 @@ fi LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:10179: checking for TIFFOpen in -ltiff" >&5 +echo "configure:10177: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10183,7 +10181,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10285,7 +10283,7 @@ LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for cpdf_open in -lcpdf""... $ac_c" 1>&6 -echo "configure:10289: checking for cpdf_open in -lcpdf" >&5 +echo "configure:10287: checking for cpdf_open in -lcpdf" >&5 ac_lib_var=`echo cpdf'_'cpdf_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10293,7 +10291,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcpdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10423,7 +10421,7 @@ echo $ac_n "checking whether to include crack support""... $ac_c" 1>&6 -echo "configure:10427: checking whether to include crack support" >&5 +echo "configure:10425: checking whether to include crack support" >&5 # Check whether --with-crack or --without-crack was given. if test "${with_crack+set}" = set; then withval="$with_crack" @@ -10713,7 +10711,7 @@ echo $ac_n "checking whether to enable ctype support""... $ac_c" 1>&6 -echo "configure:10717: checking whether to enable ctype support" >&5 +echo "configure:10715: checking whether to enable ctype support" >&5 # Check whether --enable-ctype or --disable-ctype was given. if test "${enable_ctype+set}" = set; then enableval="$enable_ctype" @@ -10901,7 +10899,7 @@ echo $ac_n "checking for CURL support""... $ac_c" 1>&6 -echo "configure:10905: checking for CURL support" >&5 +echo "configure:10903: checking for CURL support" >&5 # Check whether --with-curl or --without-curl was given. if test "${with_curl+set}" = set; then withval="$with_curl" @@ -10948,7 +10946,7 @@ CURL_DIR=$PHP_CURL else echo $ac_n "checking for CURL in default path""... $ac_c" 1>&6 -echo "configure:10952: checking for CURL in default path" >&5 +echo "configure:10950: checking for CURL in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/curl/easy.h; then CURL_DIR=$i @@ -11090,7 +11088,7 @@ echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -echo "configure:11094: checking for curl_easy_perform in -lcurl" >&5 +echo "configure:11092: checking for curl_easy_perform in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11098,7 +11096,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11277,7 +11275,7 @@ echo $ac_n "checking for CyberCash support""... $ac_c" 1>&6 -echo "configure:11281: checking for CyberCash support" >&5 +echo "configure:11279: checking for CyberCash support" >&5 # Check whether --with-cybercash or --without-cybercash was given. if test "${with_cybercash+set}" = set; then withval="$with_cybercash" @@ -11425,7 +11423,7 @@ old_LIBS="$LIBS" LIBS="$LIBS -L$MCK_DIR/lib" echo $ac_n "checking for base64_encode in -lmckcrypto""... $ac_c" 1>&6 -echo "configure:11429: checking for base64_encode in -lmckcrypto" >&5 +echo "configure:11427: checking for base64_encode in -lmckcrypto" >&5 ac_lib_var=`echo mckcrypto'_'base64_encode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11433,7 +11431,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmckcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11564,7 +11562,7 @@ echo $ac_n "checking for cybermut support""... $ac_c" 1>&6 -echo "configure:11568: checking for cybermut support" >&5 +echo "configure:11566: checking for cybermut support" >&5 # Check whether --with-cybermut or --without-cybermut was given. if test "${with_cybermut+set}" = set; then withval="$with_cybermut" @@ -11910,14 +11908,14 @@ # Checks for libraries. -# Prefer gdbm, Berkeley DB and ndbm/dbm, in that order +# Prefer Berkeley DB, gdbm and ndbm/dbm, in that order echo $ac_n "checking whether to include old xDBM support""... $ac_c" 1>&6 -echo "configure:11921: checking whether to include old xDBM support" >&5 +echo "configure:11919: checking whether to include old xDBM support" >&5 # Check whether --with-db or --without-db was given. if test "${with_db+set}" = set; then withval="$with_db" @@ -11962,27 +11960,27 @@ if test "$PHP_DB" != "no"; then - echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:11967: checking for gdbm_open in -lgdbm" >&5 -ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 +echo "configure:11965: checking for dbm_open in -ldb" >&5 +ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lgdbm $LIBS" +LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11998,32 +11996,32 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define GDBM 1 +#define NDBM 1 EOF - DBM_TYPE=gdbm; DBM_LIB=-lgdbm + DBM_TYPE=ndbm; DBM_LIB=-ldb else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:12008: checking for dbm_open in -ldb" >&5 -ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 +echo "configure:12006: checking for gdbm_open in -lgdbm" >&5 +ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ldb $LIBS" +LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12039,13 +12037,13 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define NDBM 1 +#define GDBM 1 EOF - DBM_TYPE=ndbm; DBM_LIB=-ldb + DBM_TYPE=gdbm; DBM_LIB=-lgdbm else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lc""... $ac_c" 1>&6 -echo "configure:12049: checking for dbm_open in -lc" >&5 +echo "configure:12047: checking for dbm_open in -lc" >&5 ac_lib_var=`echo c'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12053,7 +12051,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12086,7 +12084,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:12090: checking for dbm_open in -ldbm" >&5 +echo "configure:12088: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12094,7 +12092,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12136,7 +12134,7 @@ fi echo $ac_n "checking preferred dbm library""... $ac_c" 1>&6 -echo "configure:12140: checking preferred dbm library" >&5 +echo "configure:12138: checking preferred dbm library" >&5 if test "a$DBM_TYPE" = a; then echo "$ac_t""none found" 1>&6 echo "configure: warning: No dbm library found - using built-in flatfile support" 1>&2 @@ -12154,17 +12152,17 @@ if test "$DBM_LIB" = "-lgdbm"; then ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6 -echo "configure:12158: checking for gdbm.h" >&5 +echo "configure:12156: checking for gdbm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12187,17 +12185,17 @@ echo "$ac_t"""Try /usr/local/include/gdbm.h"" 1>&6; ac_safe=`echo "/usr/local/include/gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for /usr/local/include/gdbm.h""... $ac_c" 1>&6 -echo "configure:12191: checking for /usr/local/include/gdbm.h" >&5 +echo "configure:12189: checking for /usr/local/include/gdbm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12220,17 +12218,17 @@ echo "$ac_t"""Try /opt/local/include/gdbm.h"" 1>&6; ac_safe=`echo "/opt/local/include/gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for /opt/local/include/gdbm.h""... $ac_c" 1>&6 -echo "configure:12224: checking for /opt/local/include/gdbm.h" >&5 +echo "configure:12222: checking for /opt/local/include/gdbm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12253,17 +12251,17 @@ echo "$ac_t"""Try /usr/pkg/include/gdbm.h"" 1>&6; ac_safe=`echo "/usr/pkg/include/gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for /usr/pkg/include/gdbm.h""... $ac_c" 1>&6 -echo "configure:12257: checking for /usr/pkg/include/gdbm.h" >&5 +echo "configure:12255: checking for /usr/pkg/include/gdbm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12456,7 +12454,7 @@ echo $ac_n "checking whether to enable DBA""... $ac_c" 1>&6 -echo "configure:12460: checking whether to enable DBA" >&5 +echo "configure:12458: checking whether to enable DBA" >&5 # Check whether --enable-dba or --disable-dba was given. if test "${enable_dba+set}" = set; then enableval="$enable_dba" @@ -12515,7 +12513,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:12519: checking for gdbm_open in -lgdbm" >&5 +echo "configure:12517: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12523,7 +12521,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12709,7 +12707,7 @@ fi echo $ac_n "checking for GDBM support""... $ac_c" 1>&6 -echo "configure:12713: checking for GDBM support" >&5 +echo "configure:12711: checking for GDBM support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -12748,7 +12746,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 -echo "configure:12752: checking for dbm_open in -l$LIB" >&5 +echo "configure:12750: checking for dbm_open in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12756,7 +12754,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12943,7 +12941,7 @@ fi echo $ac_n "checking for NDBM support""... $ac_c" 1>&6 -echo "configure:12947: checking for NDBM support" >&5 +echo "configure:12945: checking for NDBM support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -12996,7 +12994,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for db_appinit in -l$LIB""... $ac_c" 1>&6 -echo "configure:13000: checking for db_appinit in -l$LIB" >&5 +echo "configure:12998: checking for db_appinit in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'db_appinit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13004,7 +13002,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13191,7 +13189,7 @@ fi echo $ac_n "checking for Berkeley DB2 support""... $ac_c" 1>&6 -echo "configure:13195: checking for Berkeley DB2 support" >&5 +echo "configure:13193: checking for Berkeley DB2 support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -13227,7 +13225,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for db_create in -l$LIB""... $ac_c" 1>&6 -echo "configure:13231: checking for db_create in -l$LIB" >&5 +echo "configure:13229: checking for db_create in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'db_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13235,7 +13233,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13422,7 +13420,7 @@ fi echo $ac_n "checking for Berkeley DB3 support""... $ac_c" 1>&6 -echo "configure:13426: checking for Berkeley DB3 support" >&5 +echo "configure:13424: checking for Berkeley DB3 support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -13450,7 +13448,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 -echo "configure:13454: checking for dbminit in -l$LIB" >&5 +echo "configure:13452: checking for dbminit in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13458,7 +13456,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13645,7 +13643,7 @@ fi echo $ac_n "checking for DBM support""... $ac_c" 1>&6 -echo "configure:13649: checking for DBM support" >&5 +echo "configure:13647: checking for DBM support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -13673,7 +13671,7 @@ LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS" echo $ac_n "checking for cdb_bread in -l$LIB""... $ac_c" 1>&6 -echo "configure:13677: checking for cdb_bread in -l$LIB" >&5 +echo "configure:13675: checking for cdb_bread in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'cdb_bread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13681,7 +13679,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13868,7 +13866,7 @@ fi echo $ac_n "checking for CDB support""... $ac_c" 1>&6 -echo "configure:13872: checking for CDB support" >&5 +echo "configure:13870: checking for CDB support" >&5 if test "$THIS_RESULT" = "yes"; then HAVE_DBA=1 @@ -13880,7 +13878,7 @@ echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 -echo "configure:13884: checking whether to enable DBA interface" >&5 +echo "configure:13882: checking whether to enable DBA interface" >&5 if test "$HAVE_DBA" = "1"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -14040,7 +14038,7 @@ echo $ac_n "checking for DOM support""... $ac_c" 1>&6 -echo "configure:14044: checking for DOM support" >&5 +echo "configure:14042: checking for DOM support" >&5 # Check whether --with-dom or --without-dom was given. if test "${with_dom+set}" = set; then withval="$with_dom" @@ -14088,7 +14086,7 @@ DOMXML_DIR=$PHP_DOM else echo $ac_n "checking for DOM in default path""... $ac_c" 1>&6 -echo "configure:14092: checking for DOM in default path" >&5 +echo "configure:14090: checking for DOM in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/libxml/tree.h; then DOMXML_DIR=$i @@ -14106,9 +14104,9 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$DOMXML_DIR/include" echo $ac_n "checking for libxml version""... $ac_c" 1>&6 -echo "configure:14110: checking for libxml version" >&5 +echo "configure:14108: checking for libxml version" >&5 cat > conftest.$ac_ext < @@ -14268,7 +14266,7 @@ if test $HAVE_ZLIB; then echo $ac_n "checking for zlib (needed by DOM support)""... $ac_c" 1>&6 -echo "configure:14272: checking for zlib (needed by DOM support)" >&5 +echo "configure:14270: checking for zlib (needed by DOM support)" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -14279,7 +14277,7 @@ fi LIBS="$LIBS -L$withval/lib -lz" echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:14283: checking for deflate in -lz" >&5 +echo "configure:14281: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14287,7 +14285,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14387,7 +14385,7 @@ else echo "checking for libz needed by libxml ... already zlib support" - LIBS="$LIBS -lz" +# LIBS="$LIBS -lz" fi cat >> confdefs.h <<\EOF @@ -14548,7 +14546,7 @@ echo $ac_n "checking whether to enable exif support""... $ac_c" 1>&6 -echo "configure:14552: checking whether to enable exif support" >&5 +echo "configure:14550: checking whether to enable exif support" >&5 # Check whether --enable-exif or --disable-exif was given. if test "${enable_exif+set}" = set; then enableval="$enable_exif" @@ -14736,7 +14734,7 @@ echo $ac_n "checking for fdftk support""... $ac_c" 1>&6 -echo "configure:14740: checking for fdftk support" >&5 +echo "configure:14738: checking for fdftk support" >&5 # Check whether --with-fdftk or --without-fdftk was given. if test "${with_fdftk+set}" = set; then withval="$with_fdftk" @@ -14783,7 +14781,7 @@ FDFTK_DIR=$PHP_FDFTK else echo $ac_n "checking for fdftk in default path""... $ac_c" 1>&6 -echo "configure:14787: checking for fdftk in default path" >&5 +echo "configure:14785: checking for fdftk in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/FdfTk.h; then FDFTK_DIR=$i @@ -14828,7 +14826,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$FDFTK_DIR/lib -lm" echo $ac_n "checking for FDFOpen in -lFdfTk""... $ac_c" 1>&6 -echo "configure:14832: checking for FDFOpen in -lFdfTk" >&5 +echo "configure:14830: checking for FDFOpen in -lFdfTk" >&5 ac_lib_var=`echo FdfTk'_'FDFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14836,7 +14834,7 @@ ac_save_LIBS="$LIBS" LIBS="-lFdfTk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15120,7 +15118,7 @@ echo $ac_n "checking whether to enable the bundled filePro support""... $ac_c" 1>&6 -echo "configure:15124: checking whether to enable the bundled filePro support" >&5 +echo "configure:15122: checking whether to enable the bundled filePro support" >&5 # Check whether --enable-filepro or --disable-filepro was given. if test "${enable_filepro+set}" = set; then enableval="$enable_filepro" @@ -15310,7 +15308,7 @@ echo $ac_n "checking whether to add fribidi support""... $ac_c" 1>&6 -echo "configure:15314: checking whether to add fribidi support" >&5 +echo "configure:15312: checking whether to add fribidi support" >&5 # Check whether --with-fribidi or --without-fribidi was given. if test "${with_fribidi+set}" = set; then withval="$with_fribidi" @@ -15365,7 +15363,7 @@ echo $ac_n "checking for header files in "$PHP_FRIBIDI/include/fribidi"""... $ac_c" 1>&6 -echo "configure:15369: checking for header files in "$PHP_FRIBIDI/include/fribidi"" >&5 +echo "configure:15367: checking for header files in "$PHP_FRIBIDI/include/fribidi"" >&5 if test -f $PHP_FRIBIDI/include/fribidi/fribidi.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_types.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_char_sets.h; then FRIBIDI_INCDIR="$PHP_FRIBIDI/include/fribidi/" echo "$ac_t""found all" 1>&6 @@ -15377,7 +15375,7 @@ echo $ac_n "checking for libfribidi.so file in "$PHP_FRIBIDI/lib/"""... $ac_c" 1>&6 -echo "configure:15381: checking for libfribidi.so file in "$PHP_FRIBIDI/lib/"" >&5 +echo "configure:15379: checking for libfribidi.so file in "$PHP_FRIBIDI/lib/"" >&5 if test -f "$PHP_FRIBIDI/lib/libfribidi.so" ; then FRIBIDI_LIBDIR="$PHP_FRIBIDI/lib/" echo "$ac_t""found" 1>&6 @@ -15387,7 +15385,7 @@ echo $ac_n "checking for glibconfig.h in "usr/lib/glib/include/"""... $ac_c" 1>&6 -echo "configure:15391: checking for glibconfig.h in "usr/lib/glib/include/"" >&5 +echo "configure:15389: checking for glibconfig.h in "usr/lib/glib/include/"" >&5 if test -f /usr/lib/glib/include/glibconfig.h ; then echo "$ac_t""found" 1>&6 GLIB_INCDIR=/usr/lib/glib/include/ @@ -15397,7 +15395,7 @@ echo $ac_n "checking sanity to build extension""... $ac_c" 1>&6 -echo "configure:15401: checking sanity to build extension" >&5 +echo "configure:15399: checking sanity to build extension" >&5 if test -n "$FRIBIDI_INCDIR" && test -n "$FRIBIDI_LIBDIR" && test -n "$GLIB_INCDIR"; then echo "$ac_t""yes" 1>&6 @@ -15703,7 +15701,7 @@ echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 -echo "configure:15707: checking whether to enable FTP support" >&5 +echo "configure:15705: checking whether to enable FTP support" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then enableval="$enable_ftp" @@ -15897,7 +15895,7 @@ echo $ac_n "checking whether to enable truetype string function in gd""... $ac_c" 1>&6 -echo "configure:15901: checking whether to enable truetype string function in gd" >&5 +echo "configure:15899: checking whether to enable truetype string function in gd" >&5 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given. if test "${enable_gd_native_ttf+set}" = set; then enableval="$enable_gd_native_ttf" @@ -15946,7 +15944,7 @@ old_withval=$withval echo $ac_n "checking for libjpeg (needed by gd-1.8+)""... $ac_c" 1>&6 -echo "configure:15950: checking for libjpeg (needed by gd-1.8+)" >&5 +echo "configure:15948: checking for libjpeg (needed by gd-1.8+)" >&5 # Check whether --with-jpeg-dir or --without-jpeg-dir was given. if test "${with_jpeg_dir+set}" = set; then withval="$with_jpeg_dir" @@ -15958,7 +15956,7 @@ jold_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:15962: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:15960: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15966,7 +15964,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16055,7 +16053,6 @@ fi - LIBS="$LIBS -L$withval/lib -ljpeg" else @@ -16067,7 +16064,7 @@ echo $ac_n "checking for libXpm (needed by gd-1.8+)""... $ac_c" 1>&6 -echo "configure:16071: checking for libXpm (needed by gd-1.8+)" >&5 +echo "configure:16068: checking for libXpm (needed by gd-1.8+)" >&5 # Check whether --with-xpm-dir or --without-xpm-dir was given. if test "${with_xpm_dir+set}" = set; then withval="$with_xpm_dir" @@ -16079,7 +16076,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib -lX11" echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:16083: checking for XpmFreeXpmImage in -lXpm" >&5 +echo "configure:16080: checking for XpmFreeXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16087,7 +16084,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16120,7 +16117,11 @@ fi LIBS=$old_LIBS - + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lXpm -lX11" + GD_LFLAGS="$GD_LFLAGS -L$withval/lib" + else + if test -n "$withval/lib"; then @@ -16171,7 +16172,7 @@ - + if test -n "$withval/lib"; then @@ -16222,7 +16223,7 @@ - LIBS="$LIBS -L$withval/lib -lXpm -L$withval/lib -lX11" + fi else @@ -16235,7 +16236,7 @@ withval=$old_withval echo $ac_n "checking whether to include GD support""... $ac_c" 1>&6 -echo "configure:16239: checking whether to include GD support" >&5 +echo "configure:16240: checking whether to include GD support" >&5 case "$withval" in no) @@ -16270,7 +16271,7 @@ echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 -echo "configure:16274: checking for gdImageString16 in -lgd" >&5 +echo "configure:16275: checking for gdImageString16 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16278,7 +16279,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16313,7 +16314,7 @@ fi echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 -echo "configure:16317: checking for gdImagePaletteCopy in -lgd" >&5 +echo "configure:16318: checking for gdImagePaletteCopy in -lgd" >&5 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16321,7 +16322,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16356,7 +16357,7 @@ fi echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 -echo "configure:16360: checking for gdImageColorClosestHWB in -lgd" >&5 +echo "configure:16361: checking for gdImageColorClosestHWB in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16364,7 +16365,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16399,7 +16400,7 @@ fi echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:16403: checking for compress in -lz" >&5 +echo "configure:16404: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16407,7 +16408,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16439,7 +16440,7 @@ fi echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6 -echo "configure:16443: checking for png_info_init in -lpng" >&5 +echo "configure:16444: checking for png_info_init in -lpng" >&5 ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16447,7 +16448,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16479,7 +16480,7 @@ fi echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 -echo "configure:16483: checking for gdImageColorResolve in -lgd" >&5 +echo "configure:16484: checking for gdImageColorResolve in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16487,7 +16488,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16522,7 +16523,7 @@ fi echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:16526: checking for gdImageCreateFromPng in -lgd" >&5 +echo "configure:16527: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16530,7 +16531,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16565,7 +16566,7 @@ fi echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 -echo "configure:16569: checking for gdImageCreateFromGif in -lgd" >&5 +echo "configure:16570: checking for gdImageCreateFromGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16573,7 +16574,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16608,7 +16609,7 @@ fi echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 -echo "configure:16612: checking for gdImageWBMP in -lgd" >&5 +echo "configure:16613: checking for gdImageWBMP in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16616,7 +16617,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16651,7 +16652,7 @@ fi echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 -echo "configure:16655: checking for gdImageCreateFromJpeg in -lgd" >&5 +echo "configure:16656: checking for gdImageCreateFromJpeg in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16659,7 +16660,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16694,7 +16695,7 @@ fi echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 -echo "configure:16698: checking for gdImageCreateFromXpm in -lgd" >&5 +echo "configure:16699: checking for gdImageCreateFromXpm in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16702,7 +16703,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16741,7 +16742,10 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + else + case "png" in c|c_r|pthread*) ;; *) @@ -16753,7 +16757,7 @@ ;; esac - + case "z" in c|c_r|pthread*) ;; *) @@ -16765,8 +16769,6 @@ ;; esac - if test "$shared" = "yes"; then - GD_LIBS="$GD_LIBS -lpng -lz" fi fi @@ -16864,7 +16866,7 @@ echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 -echo "configure:16868: checking for gdImageString16 in -lgd" >&5 +echo "configure:16870: checking for gdImageString16 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16872,7 +16874,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16907,7 +16909,7 @@ fi echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 -echo "configure:16911: checking for gdImagePaletteCopy in -lgd" >&5 +echo "configure:16913: checking for gdImagePaletteCopy in -lgd" >&5 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16915,7 +16917,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16950,7 +16952,7 @@ fi echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 -echo "configure:16954: checking for gdImageColorClosestHWB in -lgd" >&5 +echo "configure:16956: checking for gdImageColorClosestHWB in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16958,7 +16960,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16993,7 +16995,7 @@ fi echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:16997: checking for compress in -lz" >&5 +echo "configure:16999: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17001,7 +17003,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17033,7 +17035,7 @@ fi echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6 -echo "configure:17037: checking for png_info_init in -lpng" >&5 +echo "configure:17039: checking for png_info_init in -lpng" >&5 ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17041,7 +17043,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17073,7 +17075,7 @@ fi echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 -echo "configure:17077: checking for gdImageColorResolve in -lgd" >&5 +echo "configure:17079: checking for gdImageColorResolve in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17081,7 +17083,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17116,7 +17118,7 @@ fi echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:17120: checking for gdImageCreateFromPng in -lgd" >&5 +echo "configure:17122: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17124,7 +17126,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17159,7 +17161,7 @@ fi echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 -echo "configure:17163: checking for gdImageCreateFromGif in -lgd" >&5 +echo "configure:17165: checking for gdImageCreateFromGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17167,7 +17169,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17202,7 +17204,7 @@ fi echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 -echo "configure:17206: checking for gdImageWBMP in -lgd" >&5 +echo "configure:17208: checking for gdImageWBMP in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17210,7 +17212,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17245,7 +17247,7 @@ fi echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 -echo "configure:17249: checking for gdImageCreateFromJpeg in -lgd" >&5 +echo "configure:17251: checking for gdImageCreateFromJpeg in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17253,7 +17255,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17288,7 +17290,7 @@ fi echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 -echo "configure:17292: checking for gdImageCreateFromXpm in -lgd" >&5 +echo "configure:17294: checking for gdImageCreateFromXpm in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17296,7 +17298,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17335,7 +17337,10 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lpng -lz" + else + case "z" in c|c_r|pthread*) ;; *) @@ -17347,7 +17352,7 @@ ;; esac - + case "png" in c|c_r|pthread*) ;; *) @@ -17359,8 +17364,6 @@ ;; esac - if test "$shared" = "yes"; then - GD_LIBS="$GD_LIBS -lpng -lz" fi fi @@ -17391,7 +17394,7 @@ echo $ac_n "checking whether to include FreeType 1.x support""... $ac_c" 1>&6 -echo "configure:17395: checking whether to include FreeType 1.x support" >&5 +echo "configure:17398: checking whether to include FreeType 1.x support" >&5 if test -n "$CHECK_TTF" ; then for i in /usr /usr/local "$CHECK_TTF" ; do if test -f "$i/include/freetype.h" ; then @@ -17503,7 +17506,7 @@ fi echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 -echo "configure:17507: checking for T1lib support" >&5 +echo "configure:17510: checking for T1lib support" >&5 # Check whether --with-t1lib or --without-t1lib was given. if test "${with_t1lib+set}" = set; then withval="$with_t1lib" @@ -17605,12 +17608,12 @@ fi - LIBS="$LIBS -L$T1_DIR/lib -lt1" +# LIBS="$LIBS -L$T1_DIR/lib -lt1" fi echo "$ac_t""yes" 1>&6 echo $ac_n "checking for T1_GetExtend in -lt1""... $ac_c" 1>&6 -echo "configure:17614: checking for T1_GetExtend in -lt1" >&5 +echo "configure:17617: checking for T1_GetExtend in -lt1" >&5 ac_lib_var=`echo t1'_'T1_GetExtend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17618,7 +17621,7 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17862,7 +17865,7 @@ echo $ac_n "checking whether to include GNU gettext support""... $ac_c" 1>&6 -echo "configure:17866: checking whether to include GNU gettext support" >&5 +echo "configure:17869: checking whether to include GNU gettext support" >&5 # Check whether --with-gettext or --without-gettext was given. if test "${with_gettext+set}" = set; then withval="$with_gettext" @@ -17921,7 +17924,7 @@ O_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:17925: checking for bindtextdomain in -lintl" >&5 +echo "configure:17928: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17929,7 +17932,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17960,7 +17963,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 -echo "configure:17964: checking for bindtextdomain in -lc" >&5 +echo "configure:17967: checking for bindtextdomain in -lc" >&5 ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17968,7 +17971,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18281,7 +18284,7 @@ echo $ac_n "checking for gmp support""... $ac_c" 1>&6 -echo "configure:18285: checking for gmp support" >&5 +echo "configure:18288: checking for gmp support" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -18557,7 +18560,7 @@ echo $ac_n "checking for Hyperwave support""... $ac_c" 1>&6 -echo "configure:18561: checking for Hyperwave support" >&5 +echo "configure:18564: checking for Hyperwave support" >&5 # Check whether --with-hyperwave or --without-hyperwave was given. if test "${with_hyperwave+set}" = set; then withval="$with_hyperwave" @@ -18726,7 +18729,7 @@ echo $ac_n "checking for ICAP support""... $ac_c" 1>&6 -echo "configure:18730: checking for ICAP support" >&5 +echo "configure:18733: checking for ICAP support" >&5 # Check whether --with-icap or --without-icap was given. if test "${with_icap+set}" = set; then withval="$with_icap" @@ -19041,7 +19044,7 @@ echo $ac_n "checking for iconv support""... $ac_c" 1>&6 -echo "configure:19045: checking for iconv support" >&5 +echo "configure:19048: checking for iconv support" >&5 # Check whether --with-iconv or --without-iconv was given. if test "${with_iconv+set}" = set; then withval="$with_iconv" @@ -19089,7 +19092,7 @@ ICONV_DIR=$PHP_ICONV else echo $ac_n "checking for iconv in default path""... $ac_c" 1>&6 -echo "configure:19093: checking for iconv in default path" >&5 +echo "configure:19096: checking for iconv in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/iconv.h; then ICONV_DIR=$i @@ -19137,7 +19140,7 @@ if test -f $ICONV_DIR/lib/libconv.a -o -f $ICONV_DIR/lib/libiconv.so ; then echo $ac_n "checking for iconv_open in -liconv""... $ac_c" 1>&6 -echo "configure:19141: checking for iconv_open in -liconv" >&5 +echo "configure:19144: checking for iconv_open in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19145,7 +19148,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -19275,7 +19278,7 @@ else echo $ac_n "checking for iconv_open in -lc""... $ac_c" 1>&6 -echo "configure:19279: checking for iconv_open in -lc" >&5 +echo "configure:19282: checking for iconv_open in -lc" >&5 ac_lib_var=`echo c'_'iconv_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19283,7 +19286,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -19464,7 +19467,7 @@ echo $ac_n "checking for Kerberos support in IMAP""... $ac_c" 1>&6 -echo "configure:19468: checking for Kerberos support in IMAP" >&5 +echo "configure:19471: checking for Kerberos support in IMAP" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" @@ -19517,7 +19520,7 @@ echo $ac_n "checking for SSL support in IMAP""... $ac_c" 1>&6 -echo "configure:19521: checking for SSL support in IMAP" >&5 +echo "configure:19524: checking for SSL support in IMAP" >&5 # Check whether --with-imap-ssl or --without-imap-ssl was given. if test "${with_imap_ssl+set}" = set; then withval="$with_imap_ssl" @@ -19570,7 +19573,7 @@ echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 -echo "configure:19574: checking for IMAP support" >&5 +echo "configure:19577: checking for IMAP support" >&5 # Check whether --with-imap or --without-imap was given. if test "${with_imap+set}" = set; then withval="$with_imap" @@ -19705,11 +19708,11 @@ { echo "configure: error: Cannot find rfc822.h. Please check your IMAP installation" 1>&2; exit 1; } fi - if test -r "$IMAP_DIR/c-client/c-client.a"; then - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 - elif test -r "$IMAP_DIR/lib/c-client.a"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 - fi +# if test -r "$IMAP_DIR/c-client/c-client.a"; then +# ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +# elif test -r "$IMAP_DIR/lib/c-client.a"; then +# ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 +# fi for lib in imap c-client4 c-client; do IMAP_LIB=$lib @@ -20287,7 +20290,7 @@ echo $ac_n "checking for Informix support""... $ac_c" 1>&6 -echo "configure:20291: checking for Informix support" >&5 +echo "configure:20294: checking for Informix support" >&5 # Check whether --with-informix or --without-informix was given. if test "${with_informix+set}" = set; then withval="$with_informix" @@ -20509,7 +20512,7 @@ EOF echo $ac_n "checking Informix version""... $ac_c" 1>&6 -echo "configure:20513: checking Informix version" >&5 +echo "configure:20516: checking Informix version" >&5 IFX_VERSION=`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'` if test $IFX_VERSION -ge "900"; then cat >> confdefs.h <<\EOF @@ -20786,7 +20789,7 @@ echo $ac_n "checking for Ingres II support""... $ac_c" 1>&6 -echo "configure:20790: checking for Ingres II support" >&5 +echo "configure:20793: checking for Ingres II support" >&5 # Check whether --with-ingres or --without-ingres was given. if test "${with_ingres+set}" = set; then withval="$with_ingres" @@ -21212,7 +21215,7 @@ echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 -echo "configure:21216: checking for InterBase support" >&5 +echo "configure:21219: checking for InterBase support" >&5 # Check whether --with-interbase or --without-interbase was given. if test "${with_interbase+set}" = set; then withval="$with_interbase" @@ -21539,7 +21542,7 @@ echo $ac_n "checking for ircg support""... $ac_c" 1>&6 -echo "configure:21543: checking for ircg support" >&5 +echo "configure:21546: checking for ircg support" >&5 # Check whether --with-ircg or --without-ircg was given. if test "${with_ircg+set}" = set; then withval="$with_ircg" @@ -21909,7 +21912,7 @@ # config.m4 for extension java echo $ac_n "checking for Java support""... $ac_c" 1>&6 -echo "configure:21913: checking for Java support" >&5 +echo "configure:21916: checking for Java support" >&5 # Check whether --with-java or --without-java was given. if test "${with_java+set}" = set; then withval="$with_java" @@ -22416,7 +22419,7 @@ echo $ac_n "checking whether to include LDAP support""... $ac_c" 1>&6 -echo "configure:22420: checking whether to include LDAP support" >&5 +echo "configure:22423: checking whether to include LDAP support" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -23506,7 +23509,7 @@ echo $ac_n "checking for MCAL support""... $ac_c" 1>&6 -echo "configure:23510: checking for MCAL support" >&5 +echo "configure:23513: checking for MCAL support" >&5 # Check whether --with-mcal or --without-mcal was given. if test "${with_mcal+set}" = set; then withval="$with_mcal" @@ -23864,7 +23867,7 @@ echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 -echo "configure:23868: checking for mcrypt support" >&5 +echo "configure:23871: checking for mcrypt support" >&5 # Check whether --with-mcrypt or --without-mcrypt was given. if test "${with_mcrypt+set}" = set; then withval="$with_mcrypt" @@ -23950,7 +23953,7 @@ old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $ld_runpath_switch$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib" echo $ac_n "checking for init_mcrypt in -lmcrypt""... $ac_c" 1>&6 -echo "configure:23954: checking for init_mcrypt in -lmcrypt" >&5 +echo "configure:23957: checking for init_mcrypt in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'init_mcrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -23958,7 +23961,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23999,7 +24002,7 @@ old_LIBS=$LIBS LIBS="$LIBS -lltdl" echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:24003: checking for mcrypt_module_open in -lmcrypt" >&5 +echo "configure:24006: checking for mcrypt_module_open in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -24007,7 +24010,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -24306,7 +24309,7 @@ echo $ac_n "checking for mhash support""... $ac_c" 1>&6 -echo "configure:24310: checking for mhash support" >&5 +echo "configure:24313: checking for mhash support" >&5 # Check whether --with-mhash or --without-mhash was given. if test "${with_mhash+set}" = set; then withval="$with_mhash" @@ -24629,7 +24632,7 @@ echo $ac_n "checking whether to include ming support""... $ac_c" 1>&6 -echo "configure:24633: checking whether to include ming support" >&5 +echo "configure:24636: checking whether to include ming support" >&5 # Check whether --with-ming or --without-ming was given. if test "${with_ming+set}" = set; then withval="$with_ming" @@ -24809,7 +24812,7 @@ echo $ac_n "checking for Ming_setScale in -lming""... $ac_c" 1>&6 -echo "configure:24813: checking for Ming_setScale in -lming" >&5 +echo "configure:24816: checking for Ming_setScale in -lming" >&5 ac_lib_var=`echo ming'_'Ming_setScale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -24817,7 +24820,7 @@ ac_save_LIBS="$LIBS" LIBS="-lming $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -24998,7 +25001,7 @@ echo $ac_n "checking for mnoGoSearch support""... $ac_c" 1>&6 -echo "configure:25002: checking for mnoGoSearch support" >&5 +echo "configure:25005: checking for mnoGoSearch support" >&5 # Check whether --with-mnogosearch or --without-mnogosearch was given. if test "${with_mnogosearch+set}" = set; then withval="$with_mnogosearch" @@ -25053,7 +25056,7 @@ fi echo $ac_n "checking for mnoGoSearch version""... $ac_c" 1>&6 -echo "configure:25057: checking for mnoGoSearch version" >&5 +echo "configure:25060: checking for mnoGoSearch version" >&5 if test -x "$MNOGOSEARCH_BINDIR/udm-config"; then MNOGOSEARCH_VERSION=`$MNOGOSEARCH_BINDIR/udm-config --version` @@ -25327,7 +25330,7 @@ echo $ac_n "checking for mSQL support""... $ac_c" 1>&6 -echo "configure:25331: checking for mSQL support" >&5 +echo "configure:25334: checking for mSQL support" >&5 # Check whether --with-msql or --without-msql was given. if test "${with_msql+set}" = set; then withval="$with_msql" @@ -25642,11 +25645,11 @@ echo $ac_n "checking mSQL version""... $ac_c" 1>&6 -echo "configure:25646: checking mSQL version" >&5 +echo "configure:25649: checking mSQL version" >&5 ac_php_oldcflags=$CFLAGS CFLAGS="$INCLUDES $CFLAGS" cat > conftest.$ac_ext < #include "msql.h" @@ -25654,7 +25657,7 @@ int i = IDX_TYPE ; return 0; } EOF -if { (eval echo configure:25658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -25685,7 +25688,7 @@ echo $ac_n "checking for Muscat support""... $ac_c" 1>&6 -echo "configure:25689: checking for Muscat support" >&5 +echo "configure:25692: checking for Muscat support" >&5 # Check whether --with-muscat or --without-muscat was given. if test "${with_muscat+set}" = set; then withval="$with_muscat" @@ -26062,7 +26065,7 @@ echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 -echo "configure:26066: checking for MySQL support" >&5 +echo "configure:26069: checking for MySQL support" >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" @@ -26249,7 +26252,7 @@ if test "$PHP_MYSQL" = "yes"; then echo $ac_n "checking for MySQL UNIX socket""... $ac_c" 1>&6 -echo "configure:26253: checking for MySQL UNIX socket" >&5 +echo "configure:26256: checking for MySQL UNIX socket" >&5 MYSQL_SOCK=/tmp/mysql.sock for i in \ /var/run/mysqld/mysqld.sock \ @@ -26268,21 +26271,21 @@ echo "$ac_t""$MYSQL_SOCK" 1>&6 echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:26272: checking for inline" >&5 +echo "configure:26275: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -26308,12 +26311,12 @@ esac echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:26312: checking return type of signal handlers" >&5 +echo "configure:26315: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -26330,7 +26333,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:26334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -26361,12 +26364,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:26365: checking for ANSI C header files" >&5 +echo "configure:26368: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -26374,7 +26377,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:26378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:26381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -26391,7 +26394,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -26409,7 +26412,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -26430,7 +26433,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -26441,7 +26444,7 @@ exit (0); } EOF -if { (eval echo configure:26445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -26474,17 +26477,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:26478: checking for $ac_hdr" >&5 +echo "configure:26481: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:26488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:26491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -26516,7 +26519,7 @@ echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:26520: checking size of char" >&5 +echo "configure:26523: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26524,7 +26527,7 @@ ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < #include @@ -26536,7 +26539,7 @@ exit(0); } EOF -if { (eval echo configure:26540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -26557,7 +26560,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:26561: checking size of int" >&5 +echo "configure:26564: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26565,7 +26568,7 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < #include @@ -26577,7 +26580,7 @@ exit(0); } EOF -if { (eval echo configure:26581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -26597,7 +26600,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:26601: checking size of long" >&5 +echo "configure:26604: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26605,7 +26608,7 @@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < #include @@ -26617,7 +26620,7 @@ exit(0); } EOF -if { (eval echo configure:26621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -26637,7 +26640,7 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:26641: checking size of long long" >&5 +echo "configure:26644: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26645,7 +26648,7 @@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < #include @@ -26657,7 +26660,7 @@ exit(0); } EOF -if { (eval echo configure:26661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -26677,12 +26680,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:26681: checking for size_t" >&5 +echo "configure:26684: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -26710,12 +26713,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:26714: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:26717: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -26724,7 +26727,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:26728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -26745,12 +26748,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:26749: checking for uid_t in sys/types.h" >&5 +echo "configure:26752: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -26780,7 +26783,7 @@ echo $ac_n "checking for type ulong""... $ac_c" 1>&6 -echo "configure:26784: checking for type ulong" >&5 +echo "configure:26787: checking for type ulong" >&5 if eval "test \"`echo '$''{'ac_cv_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26788,7 +26791,7 @@ ac_cv_ulong=no else cat > conftest.$ac_ext < #include @@ -26799,7 +26802,7 @@ exit(0); } EOF -if { (eval echo configure:26803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ulong=yes else @@ -26823,7 +26826,7 @@ fi echo $ac_n "checking for type uchar""... $ac_c" 1>&6 -echo "configure:26827: checking for type uchar" >&5 +echo "configure:26830: checking for type uchar" >&5 if eval "test \"`echo '$''{'ac_cv_uchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26831,7 +26834,7 @@ ac_cv_uchar=no else cat > conftest.$ac_ext < #include @@ -26842,7 +26845,7 @@ exit(0); } EOF -if { (eval echo configure:26846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_uchar=yes else @@ -26866,7 +26869,7 @@ fi echo $ac_n "checking for type uint""... $ac_c" 1>&6 -echo "configure:26870: checking for type uint" >&5 +echo "configure:26873: checking for type uint" >&5 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26874,7 +26877,7 @@ ac_cv_uint=no else cat > conftest.$ac_ext < #include @@ -26885,7 +26888,7 @@ exit(0); } EOF -if { (eval echo configure:26889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:26892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_uint=yes else @@ -26911,7 +26914,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" echo $ac_n "checking base type of last arg to accept""... $ac_c" 1>&6 -echo "configure:26915: checking base type of last arg to accept" >&5 +echo "configure:26918: checking base type of last arg to accept" >&5 if eval "test \"`echo '$''{'mysql_cv_btype_last_arg_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -26929,7 +26932,7 @@ fi mysql_cv_btype_last_arg_accept=none cat > conftest.$ac_ext < #include @@ -26939,7 +26942,7 @@ int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); ; return 0; } EOF -if { (eval echo configure:26943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_btype_last_arg_accept=socklen_t else @@ -26949,7 +26952,7 @@ rm -f conftest* if test $mysql_cv_btype_last_arg_accept = none; then cat > conftest.$ac_ext < #include @@ -26959,7 +26962,7 @@ int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); ; return 0; } EOF -if { (eval echo configure:26963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:26966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_btype_last_arg_accept=size_t else @@ -26988,12 +26991,12 @@ CXXFLAGS="$ac_save_CXXFLAGS" echo $ac_n "checking return type of qsort""... $ac_c" 1>&6 -echo "configure:26992: checking return type of qsort" >&5 +echo "configure:26995: checking return type of qsort" >&5 if eval "test \"`echo '$''{'mysql_cv_type_qsort'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef __cplusplus extern "C" @@ -27005,7 +27008,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:27009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:27012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_type_qsort=void else @@ -27054,12 +27057,12 @@ crypt dlopen dlerror fchmod getpass getpassphrase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:27058: checking for $ac_func" >&5 +echo "configure:27061: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -27111,12 +27114,12 @@ for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:27115: checking for $ac_func" >&5 +echo "configure:27118: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -27168,7 +27171,7 @@ # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris) ac_save_CXXFLAGS="$CXXFLAGS" echo $ac_n "checking style of gethostname_r routines""... $ac_c" 1>&6 -echo "configure:27172: checking style of gethostname_r routines" >&5 +echo "configure:27175: checking style of gethostname_r routines" >&5 if eval "test \"`echo '$''{'mysql_cv_gethostname_style'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -27185,7 +27188,7 @@ CXXFLAGS="$CXXFLAGS -Werror" fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:27210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_gethostname_style=glibc2 else @@ -27235,7 +27238,7 @@ # Check 3rd argument of getthostbyname_r ac_save_CXXFLAGS="$CXXFLAGS" echo $ac_n "checking 3 argument to gethostname_r routines""... $ac_c" 1>&6 -echo "configure:27239: checking 3 argument to gethostname_r routines" >&5 +echo "configure:27242: checking 3 argument to gethostname_r routines" >&5 if eval "test \"`echo '$''{'mysql_cv_gethostname_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -27252,7 +27255,7 @@ CXXFLAGS="$CXXFLAGS -Werror" fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:27276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_gethostname_arg=hostent_data else @@ -27302,12 +27305,12 @@ # Check definition of pthread_getspecific echo $ac_n "checking "args to pthread_getspecific"""... $ac_c" 1>&6 -echo "configure:27306: checking "args to pthread_getspecific"" >&5 +echo "configure:27309: checking "args to pthread_getspecific"" >&5 if eval "test \"`echo '$''{'mysql_cv_getspecific_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:27326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_getspecific_args=POSIX else @@ -27343,12 +27346,12 @@ # Check definition of pthread_mutex_init echo $ac_n "checking "args to pthread_mutex_init"""... $ac_c" 1>&6 -echo "configure:27347: checking "args to pthread_mutex_init"" >&5 +echo "configure:27350: checking "args to pthread_mutex_init"" >&5 if eval "test \"`echo '$''{'mysql_cv_mutex_init_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:27369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mysql_cv_mutex_init_args=POSIX else @@ -27386,12 +27389,12 @@ # Check definition of readdir_r echo $ac_n "checking "args to readdir_r"""... $ac_c" 1>&6 -echo "configure:27390: checking "args to readdir_r"" >&5 +echo "configure:27393: checking "args to readdir_r"" >&5 if eval "test \"`echo '$''{'mysql_cv_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mysql_cv_readdir_r=POSIX else @@ -27428,12 +27431,12 @@ # Check definition av posix sigwait() echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6 -echo "configure:27432: checking "style of sigwait"" >&5 +echo "configure:27435: checking "style of sigwait"" >&5 if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mysql_cv_sigwait=POSIX else @@ -27475,12 +27478,12 @@ unset mysql_cv_sigwait # Check definition av posix sigwait() echo $ac_n "checking "style of sigwait"""... $ac_c" 1>&6 -echo "configure:27479: checking "style of sigwait"" >&5 +echo "configure:27482: checking "style of sigwait"" >&5 if eval "test \"`echo '$''{'mysql_cv_sigwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mysql_cv_sigwait=NONPOSIX else @@ -27840,7 +27843,7 @@ echo $ac_n "checking for Oracle-OCI8 support""... $ac_c" 1>&6 -echo "configure:27844: checking for Oracle-OCI8 support" >&5 +echo "configure:27847: checking for Oracle-OCI8 support" >&5 # Check whether --with-oci8 or --without-oci8 was given. if test "${with_oci8+set}" = set; then withval="$with_oci8" @@ -27884,7 +27887,7 @@ if test "$PHP_OCI8" != "no"; then echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 -echo "configure:27888: checking Oracle Install-Dir" >&5 +echo "configure:27891: checking Oracle Install-Dir" >&5 if test "$PHP_OCI8" = "yes"; then OCI8_DIR="$ORACLE_HOME" else @@ -28168,7 +28171,7 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:28172: checking Oracle version" >&5 +echo "configure:28175: checking Oracle version" >&5 if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 @@ -28803,7 +28806,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 -echo "configure:28807: checking for Adabas support" >&5 +echo "configure:28810: checking for Adabas support" >&5 # Check whether --with-adabas or --without-adabas was given. if test "${with_adabas+set}" = set; then withval="$with_adabas" @@ -28990,7 +28993,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 -echo "configure:28994: checking for SAP DB support" >&5 +echo "configure:28997: checking for SAP DB support" >&5 # Check whether --with-sapdb or --without-sapdb was given. if test "${with_sapdb+set}" = set; then withval="$with_sapdb" @@ -29122,7 +29125,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Solid support""... $ac_c" 1>&6 -echo "configure:29126: checking for Solid support" >&5 +echo "configure:29129: checking for Solid support" >&5 # Check whether --with-solid or --without-solid was given. if test "${with_solid+set}" = set; then withval="$with_solid" @@ -29172,7 +29175,7 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking Solid library file""... $ac_c" 1>&6 -echo "configure:29176: checking Solid library file" >&5 +echo "configure:29179: checking Solid library file" >&5 ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in @@ -29256,7 +29259,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 -echo "configure:29260: checking for IBM DB2 support" >&5 +echo "configure:29263: checking for IBM DB2 support" >&5 # Check whether --with-ibm-db2 or --without-ibm-db2 was given. if test "${with_ibm_db2+set}" = set; then withval="$with_ibm_db2" @@ -29311,7 +29314,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Empress support""... $ac_c" 1>&6 -echo "configure:29315: checking for Empress support" >&5 +echo "configure:29318: checking for Empress support" >&5 # Check whether --with-empress or --without-empress was given. if test "${with_empress+set}" = set; then withval="$with_empress" @@ -29351,7 +29354,7 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking Empress library file""... $ac_c" 1>&6 -echo "configure:29355: checking Empress library file" >&5 +echo "configure:29358: checking Empress library file" >&5 ODBC_LIBS=`echo $ODBC_LIBDIR/empodbc.so | cut -d' ' -f1` if test ! -f $ODBC_LIBS; then ODBC_LIBS=`echo $ODBC_LIBDIR/empodbc.a | cut -d' ' -f1` @@ -29372,7 +29375,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Velocis support""... $ac_c" 1>&6 -echo "configure:29376: checking for Velocis support" >&5 +echo "configure:29379: checking for Velocis support" >&5 # Check whether --with-velocis or --without-velocis was given. if test "${with_velocis+set}" = set; then withval="$with_velocis" @@ -29431,7 +29434,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 -echo "configure:29435: checking for a custom ODBC support" >&5 +echo "configure:29438: checking for a custom ODBC support" >&5 # Check whether --with-custom-odbc or --without-custom-odbc was given. if test "${with_custom_odbc+set}" = set; then withval="$with_custom_odbc" @@ -29465,7 +29468,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 -echo "configure:29469: checking for iODBC support" >&5 +echo "configure:29472: checking for iODBC support" >&5 # Check whether --with-iodbc or --without-iodbc was given. if test "${with_iodbc+set}" = set; then withval="$with_iodbc" @@ -29590,7 +29593,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 -echo "configure:29594: checking for Easysoft ODBC-ODBC Bridge support" >&5 +echo "configure:29597: checking for Easysoft ODBC-ODBC Bridge support" >&5 # Check whether --with-esoob or --without-esoob was given. if test "${with_esoob+set}" = set; then withval="$with_esoob" @@ -29642,7 +29645,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 -echo "configure:29646: checking for unixODBC support" >&5 +echo "configure:29649: checking for unixODBC support" >&5 # Check whether --with-unixODBC or --without-unixODBC was given. if test "${with_unixODBC+set}" = set; then withval="$with_unixODBC" @@ -29694,7 +29697,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for OpenLink ODBC support""... $ac_c" 1>&6 -echo "configure:29698: checking for OpenLink ODBC support" >&5 +echo "configure:29701: checking for OpenLink ODBC support" >&5 # Check whether --with-openlink or --without-openlink was given. if test "${with_openlink+set}" = set; then withval="$with_openlink" @@ -29746,7 +29749,7 @@ if test -z "$ODBC_TYPE"; then echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 -echo "configure:29750: checking for DBMaker support" >&5 +echo "configure:29753: checking for DBMaker support" >&5 # Check whether --with-dbmaker or --without-dbmaker was given. if test "${with_dbmaker+set}" = set; then withval="$with_dbmaker" @@ -30226,7 +30229,7 @@ echo $ac_n "checking for Oracle-ORACLE support""... $ac_c" 1>&6 -echo "configure:30230: checking for Oracle-ORACLE support" >&5 +echo "configure:30233: checking for Oracle-ORACLE support" >&5 # Check whether --with-oracle or --without-oracle was given. if test "${with_oracle+set}" = set; then withval="$with_oracle" @@ -30270,7 +30273,7 @@ if test "$PHP_ORACLE" != "no"; then echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 -echo "configure:30274: checking Oracle Install-Dir" >&5 +echo "configure:30277: checking Oracle Install-Dir" >&5 if test "$PHP_ORACLE" = "yes"; then ORACLE_DIR="$ORACLE_HOME" else @@ -30554,7 +30557,7 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:30558: checking Oracle version" >&5 +echo "configure:30561: checking Oracle version" >&5 if test -s "$ORACLE_DIR/orainst/unix.rgs"; then ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 @@ -35073,7 +35076,7 @@ echo $ac_n "checking for Ovrimos SQL Server support""... $ac_c" 1>&6 -echo "configure:35077: checking for Ovrimos SQL Server support" >&5 +echo "configure:35080: checking for Ovrimos SQL Server support" >&5 # Check whether --with-ovrimos or --without-ovrimos was given. if test "${with_ovrimos+set}" = set; then withval="$with_ovrimos" @@ -35158,7 +35161,7 @@ LDFLAGS="$LDFLAGS $ld_runpath_switch$OVRIMOS_DIR/lib -L$OVRIMOS_DIR/lib" echo $ac_n "checking for main in -lsqlcli""... $ac_c" 1>&6 -echo "configure:35162: checking for main in -lsqlcli" >&5 +echo "configure:35165: checking for main in -lsqlcli" >&5 ac_lib_var=`echo sqlcli'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -35166,14 +35169,14 @@ ac_save_LIBS="$LIBS" LIBS="-lsqlcli $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:35180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -35441,7 +35444,7 @@ echo $ac_n "checking whether to include PCRE support""... $ac_c" 1>&6 -echo "configure:35445: checking whether to include PCRE support" >&5 +echo "configure:35448: checking whether to include PCRE support" >&5 # Check whether --with-pcre-regex or --without-pcre-regex was given. if test "${with_pcre_regex+set}" = set; then withval="$with_pcre_regex" @@ -35854,12 +35857,12 @@ echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:35858: checking for memmove" >&5 +echo "configure:35861: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:35889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_memmove=yes" else @@ -35910,7 +35913,7 @@ echo $ac_n "checking whether to include PDFlib support""... $ac_c" 1>&6 -echo "configure:35914: checking whether to include PDFlib support" >&5 +echo "configure:35917: checking whether to include PDFlib support" >&5 # Check whether --with-pdflib or --without-pdflib was given. if test "${with_pdflib+set}" = set; then withval="$with_pdflib" @@ -36093,7 +36096,7 @@ old_LIBS=$LIBS LIBS="$LIBS -ltiff -ljpeg -lpng -lz" echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6 -echo "configure:36097: checking for PDF_show_boxed in -lpdf" >&5 +echo "configure:36100: checking for PDF_show_boxed in -lpdf" >&5 ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36101,7 +36104,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36350,7 +36353,7 @@ if test $HAVE_ZLIB; then echo $ac_n "checking for zlib (needed by pdflib 3.x)""... $ac_c" 1>&6 -echo "configure:36354: checking for zlib (needed by pdflib 3.x)" >&5 +echo "configure:36357: checking for zlib (needed by pdflib 3.x)" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -36361,7 +36364,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:36365: checking for deflate in -lz" >&5 +echo "configure:36368: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36369,7 +36372,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36457,7 +36460,7 @@ else echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:36461: checking for deflate in -lz" >&5 +echo "configure:36464: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36465,7 +36468,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36536,7 +36539,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:36540: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:36543: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36544,7 +36547,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36633,7 +36636,7 @@ else echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:36637: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:36640: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36641,7 +36644,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36707,7 +36710,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6 -echo "configure:36711: checking for png_create_info_struct in -lpng" >&5 +echo "configure:36714: checking for png_create_info_struct in -lpng" >&5 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36715,7 +36718,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36804,7 +36807,7 @@ else echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6 -echo "configure:36808: checking for png_create_info_struct in -lpng" >&5 +echo "configure:36811: checking for png_create_info_struct in -lpng" >&5 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36812,7 +36815,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36878,7 +36881,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:36882: checking for TIFFOpen in -ltiff" >&5 +echo "configure:36885: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36886,7 +36889,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36975,7 +36978,7 @@ else echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:36979: checking for TIFFOpen in -ltiff" >&5 +echo "configure:36982: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36983,7 +36986,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltiff $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37043,7 +37046,7 @@ old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" echo $ac_n "checking for PDF_show_boxed in -lpdf""... $ac_c" 1>&6 -echo "configure:37047: checking for PDF_show_boxed in -lpdf" >&5 +echo "configure:37050: checking for PDF_show_boxed in -lpdf" >&5 ac_lib_var=`echo pdf'_'PDF_show_boxed | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37051,7 +37054,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37223,7 +37226,7 @@ echo $ac_n "checking whether to include Verisign Payflow Pro support""... $ac_c" 1>&6 -echo "configure:37227: checking whether to include Verisign Payflow Pro support" >&5 +echo "configure:37230: checking whether to include Verisign Payflow Pro support" >&5 # Check whether --with-pfpro or --without-pfpro was given. if test "${with_pfpro+set}" = set; then withval="$with_pfpro" @@ -37569,7 +37572,7 @@ echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 -echo "configure:37573: checking for PostgreSQL support" >&5 +echo "configure:37576: checking for PostgreSQL support" >&5 # Check whether --with-pgsql or --without-pgsql was given. if test "${with_pgsql+set}" = set; then withval="$with_pgsql" @@ -37642,7 +37645,7 @@ old_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 -echo "configure:37646: checking for PQcmdTuples in -lpq" >&5 +echo "configure:37649: checking for PQcmdTuples in -lpq" >&5 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37650,7 +37653,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37685,7 +37688,7 @@ fi echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 -echo "configure:37689: checking for PQoidValue in -lpq" >&5 +echo "configure:37692: checking for PQoidValue in -lpq" >&5 ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37693,7 +37696,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37728,7 +37731,7 @@ fi echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 -echo "configure:37732: checking for PQclientEncoding in -lpq" >&5 +echo "configure:37735: checking for PQclientEncoding in -lpq" >&5 ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37736,7 +37739,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37771,7 +37774,7 @@ fi echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:37775: checking for pg_encoding_to_char in -lpq" >&5 +echo "configure:37778: checking for pg_encoding_to_char in -lpq" >&5 ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37779,7 +37782,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38064,7 +38067,7 @@ echo $ac_n "checking whether to include POSIX-like functions""... $ac_c" 1>&6 -echo "configure:38068: checking whether to include POSIX-like functions" >&5 +echo "configure:38071: checking whether to include POSIX-like functions" >&5 # Check whether --enable-posix or --disable-posix was given. if test "${enable_posix+set}" = set; then enableval="$enable_posix" @@ -38250,12 +38253,12 @@ for ac_func in seteuid setegid setsid getsid setpgid ctermid mkfifo getrlimit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:38254: checking for $ac_func" >&5 +echo "configure:38257: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -38308,7 +38311,7 @@ echo $ac_n "checking whether to include pspell support""... $ac_c" 1>&6 -echo "configure:38312: checking whether to include pspell support" >&5 +echo "configure:38315: checking whether to include pspell support" >&5 # Check whether --with-pspell or --without-pspell was given. if test "${with_pspell+set}" = set; then withval="$with_pspell" @@ -38634,7 +38637,7 @@ echo $ac_n "checking whether to include QDOM support""... $ac_c" 1>&6 -echo "configure:38638: checking whether to include QDOM support" >&5 +echo "configure:38641: checking whether to include QDOM support" >&5 # Check whether --with-qtdom or --without-qtdom was given. if test "${with_qtdom+set}" = set; then withval="$with_qtdom" @@ -38868,7 +38871,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:38872: checking for $ac_word" >&5 +echo "configure:38875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -38900,7 +38903,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:38904: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:38907: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -38911,12 +38914,12 @@ cat > conftest.$ac_ext << EOF -#line 38915 "configure" +#line 38918 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:38920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -38942,12 +38945,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:38946: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:38949: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:38951: checking whether we are using GNU C++" >&5 +echo "configure:38954: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -38956,7 +38959,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:38960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:38963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -38975,7 +38978,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:38979: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:38982: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -39007,7 +39010,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:39011: checking how to run the C++ preprocessor" >&5 +echo "configure:39014: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39020,12 +39023,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:39029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:39032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -39066,7 +39069,7 @@ echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -echo "configure:39070: checking for libedit readline replacement" >&5 +echo "configure:39073: checking for libedit readline replacement" >&5 # Check whether --with-libedit or --without-libedit was given. if test "${with_libedit+set}" = set; then withval="$with_libedit" @@ -39111,7 +39114,7 @@ echo $ac_n "checking for readline support""... $ac_c" 1>&6 -echo "configure:39115: checking for readline support" >&5 +echo "configure:39118: checking for readline support" >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" @@ -39192,7 +39195,7 @@ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:39196: checking for tgetent in -lncurses" >&5 +echo "configure:39199: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39200,7 +39203,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39325,7 +39328,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:39329: checking for tgetent in -ltermcap" >&5 +echo "configure:39332: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39333,7 +39336,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39834,7 +39837,7 @@ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:39838: checking for tgetent in -lncurses" >&5 +echo "configure:39841: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39842,7 +39845,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39967,7 +39970,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:39971: checking for tgetent in -ltermcap" >&5 +echo "configure:39974: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39975,7 +39978,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40347,7 +40350,7 @@ echo $ac_n "checking for recode support""... $ac_c" 1>&6 -echo "configure:40351: checking for recode support" >&5 +echo "configure:40354: checking for recode support" >&5 # Check whether --with-recode or --without-recode was given. if test "${with_recode+set}" = set; then withval="$with_recode" @@ -40418,7 +40421,7 @@ LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" LIBS="$LIBS -lrecode" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -40622,17 +40625,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:40626: checking for $ac_hdr" >&5 +echo "configure:40629: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:40636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:40639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -40800,7 +40803,7 @@ echo $ac_n "checking for Sablotron XSL support""... $ac_c" 1>&6 -echo "configure:40804: checking for Sablotron XSL support" >&5 +echo "configure:40807: checking for Sablotron XSL support" >&5 # Check whether --with-expat-dir or --without-expat-dir was given. if test "${with_expat_dir+set}" = set; then withval="$with_expat_dir" @@ -40845,7 +40848,7 @@ echo $ac_n "checking for Sablotron XSL support""... $ac_c" 1>&6 -echo "configure:40849: checking for Sablotron XSL support" >&5 +echo "configure:40852: checking for Sablotron XSL support" >&5 # Check whether --with-sablot or --without-sablot was given. if test "${with_sablot+set}" = set; then withval="$with_sablot" @@ -40892,7 +40895,7 @@ SABLOT_DIR=$PHP_SABLOT else echo $ac_n "checking for Sablotron in default path""... $ac_c" 1>&6 -echo "configure:40896: checking for Sablotron in default path" >&5 +echo "configure:40899: checking for Sablotron in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/sablot.h; then SABLOT_DIR=$i @@ -41045,6 +41048,46 @@ + if test "$ext_shared" = "yes"; then + SABLOT_SHARED_LIBADD="-lexpat $SABLOT_SHARED_LIBADD" + if test -n "$i/lib"; then + + if test "$i/lib" != "/usr/lib"; then + + if test -z "$i/lib" || echo "$i/lib" | grep '^/' >/dev/null ; then + ai_p="$i/lib" + else + + ep_dir="`echo $i/lib|sed 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$i/lib\"`" + fi + + if test "$ext_shared" = "yes" && test -n "SABLOT_SHARED_LIBADD"; then + SABLOT_SHARED_LIBADD="-R$i/lib -L$i/lib $SABLOT_SHARED_LIBADD" + else + + + unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + fi + fi + + fi + else + + if test -n "$i/lib"; then if test "$i/lib" != "/usr/lib"; then @@ -41094,6 +41137,9 @@ + fi + + if test "$i/include" != "/usr/include"; then @@ -41122,7 +41168,7 @@ fi echo $ac_n "checking for SablotSetEncoding in -lsablot""... $ac_c" 1>&6 -echo "configure:41126: checking for SablotSetEncoding in -lsablot" >&5 +echo "configure:41172: checking for SablotSetEncoding in -lsablot" >&5 ac_lib_var=`echo sablot'_'SablotSetEncoding | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41130,7 +41176,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsablot $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41342,7 +41388,7 @@ echo $ac_n "checking whether to enable CORBA support via Satellite""... $ac_c" 1>&6 -echo "configure:41346: checking whether to enable CORBA support via Satellite" >&5 +echo "configure:41392: checking whether to enable CORBA support via Satellite" >&5 # Check whether --enable-satellite or --disable-satellite was given. if test "${enable_satellite+set}" = set; then enableval="$enable_satellite" @@ -41389,7 +41435,7 @@ # Extract the first word of ""orbit-config"", so it can be a program name with args. set dummy "orbit-config"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:41393: checking for $ac_word" >&5 +echo "configure:41439: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_orbit_config'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -41427,7 +41473,7 @@ fi echo $ac_n "checking for giop_skip_atexit in -lIIOP""... $ac_c" 1>&6 -echo "configure:41431: checking for giop_skip_atexit in -lIIOP" >&5 +echo "configure:41477: checking for giop_skip_atexit in -lIIOP" >&5 ac_lib_var=`echo IIOP'_'giop_skip_atexit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41435,7 +41481,7 @@ ac_save_LIBS="$LIBS" LIBS="-lIIOP `$orbit_config --libs client` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41474,7 +41520,7 @@ # Extract the first word of ""libIDL-config"", so it can be a program name with args. set dummy "libIDL-config"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:41478: checking for $ac_word" >&5 +echo "configure:41524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_libidl_config'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -41658,7 +41704,7 @@ echo $ac_n "checking for mm support""... $ac_c" 1>&6 -echo "configure:41662: checking for mm support" >&5 +echo "configure:41708: checking for mm support" >&5 # Check whether --with-mm or --without-mm was given. if test "${with_mm+set}" = set; then withval="$with_mm" @@ -41703,7 +41749,7 @@ echo $ac_n "checking whether to enable transparent session id propagation""... $ac_c" 1>&6 -echo "configure:41707: checking whether to enable transparent session id propagation" >&5 +echo "configure:41753: checking whether to enable transparent session id propagation" >&5 # Check whether --enable-trans-sid or --disable-trans-sid was given. if test "${enable_trans_sid+set}" = set; then enableval="$enable_trans_sid" @@ -41748,7 +41794,7 @@ echo $ac_n "checking whether to enable session support""... $ac_c" 1>&6 -echo "configure:41752: checking whether to enable session support" >&5 +echo "configure:41798: checking whether to enable session support" >&5 # Check whether --enable-session or --disable-session was given. if test "${enable_session+set}" = set; then enableval="$enable_session" @@ -42082,7 +42128,7 @@ echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 -echo "configure:42086: checking whether to enable shmop support" >&5 +echo "configure:42132: checking whether to enable shmop support" >&5 # Check whether --enable-shmop or --disable-shmop was given. if test "${enable_shmop+set}" = set; then enableval="$enable_shmop" @@ -42271,7 +42317,7 @@ echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 -echo "configure:42275: checking for SNMP support" >&5 +echo "configure:42321: checking for SNMP support" >&5 # Check whether --with-snmp or --without-snmp was given. if test "${with_snmp+set}" = set; then withval="$with_snmp" @@ -42463,17 +42509,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:42467: checking for $ac_hdr" >&5 +echo "configure:42513: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:42477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:42523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -42506,14 +42552,14 @@ else cat > conftest.$ac_ext < main() { exit(USE_OPENSSL != 1); } EOF -if { (eval echo configure:42517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:42563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SNMP_SSL=yes @@ -42549,9 +42595,9 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$OPENSSL_INC" echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:42553: checking for OpenSSL version" >&5 +echo "configure:42599: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < @@ -42611,7 +42657,7 @@ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:42615: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:42661: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42619,7 +42665,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42668,7 +42714,7 @@ echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:42672: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:42718: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42676,7 +42722,7 @@ ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42893,7 +42939,7 @@ PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD" echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -echo "configure:42897: checking for kstat_read in -lkstat" >&5 +echo "configure:42943: checking for kstat_read in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42901,7 +42947,7 @@ ac_save_LIBS="$LIBS" LIBS="-lkstat $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42958,7 +43004,7 @@ echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 -echo "configure:42962: checking whether to enable UCD SNMP hack" >&5 +echo "configure:43008: checking whether to enable UCD SNMP hack" >&5 # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. if test "${enable_ucd_snmp_hack+set}" = set; then enableval="$enable_ucd_snmp_hack" @@ -42988,7 +43034,7 @@ echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -echo "configure:42992: checking whether to enable sockets support" >&5 +echo "configure:43038: checking whether to enable sockets support" >&5 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then enableval="$enable_sockets" @@ -43034,12 +43080,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:43038: checking for ANSI C header files" >&5 +echo "configure:43084: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -43047,7 +43093,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:43051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:43097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -43064,7 +43110,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -43082,7 +43128,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -43103,7 +43149,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -43114,7 +43160,7 @@ exit (0); } EOF -if { (eval echo configure:43118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -43141,17 +43187,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:43145: checking for $ac_hdr" >&5 +echo "configure:43191: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:43155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:43201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -43181,17 +43227,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:43185: checking for $ac_hdr" >&5 +echo "configure:43231: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:43195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:43241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -43221,17 +43267,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:43225: checking for $ac_hdr" >&5 +echo "configure:43271: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:43235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:43281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -43405,12 +43451,12 @@ echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:43409: checking for dlopen" >&5 +echo "configure:43455: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:43483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -43457,7 +43503,7 @@ echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:43461: checking for pam_start in -lpam" >&5 +echo "configure:43507: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -43465,7 +43511,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:43526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -43505,12 +43551,12 @@ for ac_func in getcwd getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:43509: checking for $ac_func" >&5 +echo "configure:43555: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:43583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -43561,7 +43607,7 @@ echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -echo "configure:43565: checking for standard DES crypt" >&5 +echo "configure:43611: checking for standard DES crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43572,7 +43618,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_des=yes @@ -43618,7 +43664,7 @@ echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -echo "configure:43622: checking for extended DES crypt" >&5 +echo "configure:43668: checking for extended DES crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43629,7 +43675,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_ext_des=yes @@ -43675,7 +43721,7 @@ echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -echo "configure:43679: checking for MD5 crypt" >&5 +echo "configure:43725: checking for MD5 crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43686,7 +43732,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_md5=yes @@ -43770,7 +43816,7 @@ echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -echo "configure:43774: checking for Blowfish crypt" >&5 +echo "configure:43820: checking for Blowfish crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43781,7 +43827,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_blowfish=yes @@ -43834,7 +43880,7 @@ echo $ac_n "checking whether flush should be called explicitly after a bufferered io""... $ac_c" 1>&6 -echo "configure:43838: checking whether flush should be called explicitly after a bufferered io" >&5 +echo "configure:43884: checking whether flush should be called explicitly after a bufferered io" >&5 if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43845,7 +43891,7 @@ else cat > conftest.$ac_ext < @@ -43883,7 +43929,7 @@ } EOF -if { (eval echo configure:43887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_flush_io="no" @@ -44077,7 +44123,7 @@ echo $ac_n "checking for libswf support""... $ac_c" 1>&6 -echo "configure:44081: checking for libswf support" >&5 +echo "configure:44127: checking for libswf support" >&5 # Check whether --with-swf or --without-swf was given. if test "${with_swf+set}" = set; then withval="$with_swf" @@ -44124,7 +44170,7 @@ SWF_DIR=$PHP_SWF else echo $ac_n "checking for libswf in default path""... $ac_c" 1>&6 -echo "configure:44128: checking for libswf in default path" >&5 +echo "configure:44174: checking for libswf in default path" >&5 for i in /usr/local /usr; do if test -r $i/lib/libswf.a; then SWF_DIR=$i @@ -44411,7 +44457,7 @@ echo $ac_n "checking for Sybase support""... $ac_c" 1>&6 -echo "configure:44415: checking for Sybase support" >&5 +echo "configure:44461: checking for Sybase support" >&5 # Check whether --with-sybase or --without-sybase was given. if test "${with_sybase+set}" = set; then withval="$with_sybase" @@ -44719,7 +44765,7 @@ echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:44723: checking for dnet_addr in -ldnet_stub" >&5 +echo "configure:44769: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -44727,7 +44773,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -44863,16 +44909,55 @@ fi -echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -echo "configure:44868: checking for Sybase-CT support" >&5 + + +echo $ac_n "checking --with-sybase-ct=DIR Include Sybase-CT support. DIR is the Sybase home + directory""... $ac_c" 1>&6 +echo "configure:44917: checking --with-sybase-ct=DIR Include Sybase-CT support. DIR is the Sybase home + directory" >&5 # Check whether --with-sybase-ct or --without-sybase-ct was given. if test "${with_sybase_ct+set}" = set; then withval="$with_sybase_ct" - - if test "$withval" != "no"; then - echo "$ac_t""yes" 1>&6 - if test -z "$SYBASE_LIBS"; then - + PHP_SYBASE_CT=$withval +else + PHP_SYBASE_CT=no +fi + + +case "$PHP_SYBASE_CT" in +shared,*) + ext_output="yes, shared" + ext_shared=yes + PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|sed 's/^shared,//'` + ;; +shared) + ext_output="yes, shared" + ext_shared=yes + PHP_SYBASE_CT=yes + ;; +no) + ext_output="no" + ext_shared=no + ;; +*) + ext_output="yes" + ext_shared=no + ;; +esac + +if test "$php_always_shared" = "yes"; then + ext_output="yes, shared" + ext_shared=yes + test "$PHP_SYBASE_CT" = "no" && PHP_SYBASE_CT=yes +fi + +echo "$ac_t""$ext_output" 1>&6 + + + + +if test "$PHP_SYBASE_CT" != "no"; then + EXT_SUBDIRS="$EXT_SUBDIRS sybase_ct" if test -d "$abs_srcdir/ext/sybase_ct"; then @@ -44883,7 +44968,7 @@ ext_srcdir="$abs_srcdir" fi - if test "" != "shared" && test "" != "yes"; then + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes"; then lib_makefile="$ext_builddir/libs.mk" lib_target="" @@ -45007,19 +45092,18 @@ PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $ext_builddir/Makefile" - fi cat >> confdefs.h <<\EOF #define HAVE_SYBASE_CT 1 EOF - if test "$withval" = "yes"; then + if test "$PHP_SYBASE_CT" = "yes"; then SYBASE_CT_INCDIR=/home/sybase/include SYBASE_CT_LIBDIR=/home/sybase/lib else - SYBASE_CT_INCDIR=$withval/include - SYBASE_CT_LIBDIR=$withval/lib + SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include + SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib fi - + if test "$SYBASE_CT_INCDIR" != "/usr/include"; then if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then @@ -45046,7 +45130,12 @@ fi - + + + if test "$ext_shared" = "yes"; then + SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" + if test -n "$SYBASE_CT_LIBDIR"; then + if test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then @@ -45059,8 +45148,8 @@ ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" fi - if test "$ext_shared" = "yes" && test -n ""; then - ="-R$SYBASE_CT_LIBDIR -L$SYBASE_CT_LIBDIR $" + if test "$ext_shared" = "yes" && test -n "SYBASE_CT_SHARED_LIBADD"; then + SYBASE_CT_SHARED_LIBADD="-R$SYBASE_CT_LIBDIR -L$SYBASE_CT_LIBDIR $SYBASE_CT_SHARED_LIBADD" else @@ -45079,19 +45168,46 @@ fi fi - - case "cs" in - c|c_r|pthread*) ;; - *) + fi + else + - - LIBS="-lcs $LIBS" + if test -n "$SYBASE_CT_LIBDIR"; then + + if test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then + + if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then + ai_p="$SYBASE_CT_LIBDIR" + else + + ep_dir="`echo $SYBASE_CT_LIBDIR|sed 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" + fi + if test "$ext_shared" = "yes" && test -n ""; then + ="-R$SYBASE_CT_LIBDIR -L$SYBASE_CT_LIBDIR $" + else + + + unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi - ;; - esac + fi + fi - + fi + case "ct" in c|c_r|pthread*) ;; *) @@ -45103,215 +45219,21 @@ ;; esac - - case "comn" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lcomn $LIBS" - - - ;; - esac - - - case "intl" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lintl $LIBS" - - - ;; - esac - - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" - old_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" - echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -echo "configure:45135: checking for netg_errstr in -ltcl" >&5 -ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ltcl $SYBASE_CT_LIBS $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - case "tcl" in - c|c_r|pthread*) ;; - *) - - - LIBS="-ltcl $LIBS" - - - ;; - esac - -else - echo "$ac_t""no" 1>&6 - - case "sybtcl" in - c|c_r|pthread*) ;; - *) - - - LIBS="-lsybtcl $LIBS" - - - ;; - esac - -fi - - echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -echo "configure:45198: checking for insck__getVdate in -linsck" >&5 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - case "insck" in - c|c_r|pthread*) ;; - *) - - - LIBS="-linsck $LIBS" - - - ;; - esac - -else - echo "$ac_t""no" 1>&6 -fi - - echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -echo "configure:45249: checking for bsd_tcp in -linsck" >&5 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-linsck $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - case "insck" in - c|c_r|pthread*) ;; - *) - - - LIBS="-linsck $LIBS" - - ;; - esac - -else - echo "$ac_t""no" 1>&6 -fi - LDFLAGS=$old_LDFLAGS - else - echo "$ac_t""no" 1>&6 fi -else - - echo "$ac_t""no" 1>&6 -fi + + PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" +fi echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -echo "configure:45315: checking whether to enable System V semaphore support" >&5 +echo "configure:45237: checking whether to enable System V semaphore support" >&5 # Check whether --enable-sysvsem or --disable-sysvsem was given. if test "${enable_sysvsem+set}" = set; then enableval="$enable_sysvsem" @@ -45494,12 +45416,12 @@ EOF echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:45498: checking for union semun" >&5 +echo "configure:45420: checking for union semun" >&5 if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -45510,7 +45432,7 @@ union semun x; ; return 0; } EOF -if { (eval echo configure:45514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:45436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_semun=yes @@ -45545,7 +45467,7 @@ echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -echo "configure:45549: checking whether to enable System V shared memory support" >&5 +echo "configure:45471: checking whether to enable System V shared memory support" >&5 # Check whether --enable-sysvshm or --disable-sysvshm was given. if test "${enable_sysvshm+set}" = set; then enableval="$enable_sysvshm" @@ -45733,7 +45655,7 @@ echo $ac_n "checking for vpopmail support""... $ac_c" 1>&6 -echo "configure:45737: checking for vpopmail support" >&5 +echo "configure:45659: checking for vpopmail support" >&5 # Check whether --with-vpopmail or --without-vpopmail was given. if test "${with_vpopmail+set}" = set; then withval="$with_vpopmail" @@ -45777,7 +45699,7 @@ if test "$PHP_VPOPMAIL" != "no"; then echo $ac_n "checking for vpopmail install directory""... $ac_c" 1>&6 -echo "configure:45781: checking for vpopmail install directory" >&5 +echo "configure:45703: checking for vpopmail install directory" >&5 for i in ~vpopmail /home/vpopmail /home/popmail /var/qmail/vpopmail /var/qmail/popmail $PHP_VPOPMAIL; do if test -r $i/vpopmail.h; then VPOPMAIL_INC_DIR=$i @@ -46086,11 +46008,11 @@ echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -echo "configure:46090: checking whether to enable WDDX support" >&5 -# Check whether --enable-wddx or --disable-wddx was given. -if test "${enable_wddx+set}" = set; then - enableval="$enable_wddx" - PHP_WDDX=$enableval +echo "configure:46012: checking whether to enable WDDX support" >&5 +# Check whether --with-wddx or --without-wddx was given. +if test "${with_wddx+set}" = set; then + withval="$with_wddx" + PHP_WDDX=$withval else PHP_WDDX=no fi @@ -46128,7 +46050,7 @@ -if test "$PHP_WDDX" = "yes"; then +if test "$PHP_WDDX" != "no"; then if test "$enable_xml" = "no"; then echo "configure: warning: Activating XML" 1>&2 enable_xml=yes @@ -46148,7 +46070,7 @@ ext_srcdir="$abs_srcdir" fi - if test "" != "shared" && test "" != "yes"; then + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes"; then lib_makefile="$ext_builddir/libs.mk" lib_target="" @@ -46277,22 +46199,15 @@ # $Source: /repository/php4/ext/xml/config.m4,v $ # $Id: config.m4,v 1.24 2001/01/10 14:41:01 hirokawa Exp $ -# Check whether --with-xml or --without-xml was given. -if test "${with_xml+set}" = set; then - withval="$with_xml" - enable_xml=$withval -fi - - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:46289: checking whether byte ordering is bigendian" >&5 +echo "configure:46204: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -46303,11 +46218,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:46307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:46222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -46318,7 +46233,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:46322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:46237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -46338,7 +46253,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:46270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -46384,11 +46299,11 @@ echo $ac_n "checking for XML support""... $ac_c" 1>&6 -echo "configure:46388: checking for XML support" >&5 -# Check whether --enable-xml or --disable-xml was given. -if test "${enable_xml+set}" = set; then - enableval="$enable_xml" - PHP_XML=$enableval +echo "configure:46303: checking for XML support" >&5 +# Check whether --with-xml or --without-xml was given. +if test "${with_xml+set}" = set; then + withval="$with_xml" + PHP_XML=$withval else PHP_XML=yes fi @@ -46806,7 +46721,7 @@ else - EXPAT_DIR="$withval" + EXPAT_DIR="$PHP_XML" if test -f $EXPAT_DIR/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then cat >> confdefs.h <<\EOF #define HAVE_LIBEXPAT2 1 @@ -47083,7 +46998,7 @@ echo $ac_n "checking for YAZ support""... $ac_c" 1>&6 -echo "configure:47087: checking for YAZ support" >&5 +echo "configure:47002: checking for YAZ support" >&5 # Check whether --with-yaz or --without-yaz was given. if test "${with_yaz+set}" = set; then withval="$with_yaz" @@ -47132,7 +47047,7 @@ # Extract the first word of "yaz-config", so it can be a program name with args. set dummy yaz-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:47136: checking for $ac_word" >&5 +echo "configure:47051: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_yazconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -47432,7 +47347,7 @@ echo $ac_n "checking whether to include YP support""... $ac_c" 1>&6 -echo "configure:47436: checking whether to include YP support" >&5 +echo "configure:47351: checking whether to include YP support" >&5 # Check whether --enable-yp or --disable-yp was given. if test "${enable_yp+set}" = set; then enableval="$enable_yp" @@ -47629,7 +47544,7 @@ echo $ac_n "checking whether to include zlib support""... $ac_c" 1>&6 -echo "configure:47633: checking whether to include zlib support" >&5 +echo "configure:47548: checking whether to include zlib support" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -47830,7 +47745,7 @@ LDFLAGS="-L$ZLIB_LIBDIR $LDFLAGS" echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 -echo "configure:47834: checking for gzgets in -lz" >&5 +echo "configure:47749: checking for gzgets in -lz" >&5 ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -47838,7 +47753,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:47768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48005,12 +47920,12 @@ echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 -echo "configure:48009: checking for fopencookie" >&5 +echo "configure:47924: checking for fopencookie" >&5 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:47952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fopencookie=yes" else @@ -48055,7 +47970,7 @@ if test "$have_glibc_fopencookie" = "yes" ; then cat > conftest.$ac_ext < @@ -48064,7 +47979,7 @@ cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:48068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:47983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else @@ -48080,7 +47995,7 @@ have_fopen_cookie=yes else cat > conftest.$ac_ext < @@ -48089,7 +48004,7 @@ _IO_cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:48093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:48008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else @@ -48124,7 +48039,7 @@ echo $ac_n "checking whether to include zziplib support""... $ac_c" 1>&6 -echo "configure:48128: checking whether to include zziplib support" >&5 +echo "configure:48043: checking whether to include zziplib support" >&5 # Check whether --with-zziplib or --without-zziplib was given. if test "${with_zziplib+set}" = set; then withval="$with_zziplib" @@ -48324,7 +48239,7 @@ LDFLAGS="-L$ZZIPLIB_LIBDIR $LDFLAGS" echo $ac_n "checking for zzip_open in -lzzip""... $ac_c" 1>&6 -echo "configure:48328: checking for zzip_open in -lzzip" >&5 +echo "configure:48243: checking for zzip_open in -lzzip" >&5 ac_lib_var=`echo zzip'_'zzip_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -48332,7 +48247,7 @@ ac_save_LIBS="$LIBS" LIBS="-lzzip $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48499,12 +48414,12 @@ echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 -echo "configure:48503: checking for fopencookie" >&5 +echo "configure:48418: checking for fopencookie" >&5 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fopencookie=yes" else @@ -48549,7 +48464,7 @@ if test "$have_glibc_fopencookie" = "yes" ; then cat > conftest.$ac_ext < @@ -48558,7 +48473,7 @@ cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:48562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:48477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else @@ -48574,7 +48489,7 @@ have_fopen_cookie=yes else cat > conftest.$ac_ext < @@ -48583,7 +48498,7 @@ _IO_cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:48587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:48502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else @@ -48621,7 +48536,7 @@ echo $ac_n "checking whether to enable versioning""... $ac_c" 1>&6 -echo "configure:48625: checking whether to enable versioning" >&5 +echo "configure:48540: checking whether to enable versioning" >&5 # Check whether --enable-versioning or --disable-versioning was given. if test "${enable_versioning+set}" = set; then enableval="$enable_versioning" @@ -48694,7 +48609,7 @@ fi echo $ac_n "checking which regex library to use""... $ac_c" 1>&6 -echo "configure:48698: checking which regex library to use" >&5 +echo "configure:48613: checking which regex library to use" >&5 echo "$ac_t""$REGEX_TYPE" 1>&6 @@ -48726,7 +48641,7 @@ echo "configure: warning: You will need bison if you want to regenerate the Zend parser." 1>&2 else echo $ac_n "checking bison version""... $ac_c" 1>&6 -echo "configure:48730: checking bison version" >&5 +echo "configure:48645: checking bison version" >&5 set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'` if test "${1}" = "1" -a "${2}" -lt "28"; then echo "configure: warning: You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2})." 1>&2 @@ -48757,17 +48672,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:48761: checking for $ac_hdr" >&5 +echo "configure:48676: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:48771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:48686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -48795,12 +48710,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:48799: checking for size_t" >&5 +echo "configure:48714: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -48828,12 +48743,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:48832: checking return type of signal handlers" >&5 +echo "configure:48747: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -48850,7 +48765,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:48854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:48769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -48870,7 +48785,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:48874: checking for dlopen in -ldl" >&5 +echo "configure:48789: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -48878,7 +48793,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48910,12 +48825,12 @@ fi echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:48914: checking for dlopen" >&5 +echo "configure:48829: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -48962,12 +48877,12 @@ echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:48966: checking for uint" >&5 +echo "configure:48881: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -48995,12 +48910,12 @@ fi echo $ac_n "checking for ulong""... $ac_c" 1>&6 -echo "configure:48999: checking for ulong" >&5 +echo "configure:48914: checking for ulong" >&5 if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -49030,12 +48945,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:49034: checking for vprintf" >&5 +echo "configure:48949: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -49082,12 +48997,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:49086: checking for _doprnt" >&5 +echo "configure:49001: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -49135,7 +49050,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:49139: checking for 8-bit clean memcmp" >&5 +echo "configure:49054: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49143,7 +49058,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:49072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -49173,19 +49088,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:49177: checking for working alloca.h" >&5 +echo "configure:49092: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:49189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -49206,12 +49121,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:49210: checking for alloca" >&5 +echo "configure:49125: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -49271,12 +49186,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:49275: checking whether alloca needs Cray hooks" >&5 +echo "configure:49190: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:49305: checking for $ac_func" >&5 +echo "configure:49220: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -49356,7 +49271,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:49360: checking stack direction for C alloca" >&5 +echo "configure:49275: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49364,7 +49279,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:49302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -49407,12 +49322,12 @@ for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:49411: checking for $ac_func" >&5 +echo "configure:49326: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -49461,7 +49376,7 @@ echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 -echo "configure:49465: checking whether sprintf is broken" >&5 +echo "configure:49380: checking whether sprintf is broken" >&5 if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49472,11 +49387,11 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:49395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_sprintf=no @@ -49510,12 +49425,12 @@ for ac_func in finite isfinite isinf isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:49514: checking for $ac_func" >&5 +echo "configure:49429: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -49565,13 +49480,13 @@ echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 -echo "configure:49569: checking whether fp_except is defined" >&5 +echo "configure:49484: checking whether fp_except is defined" >&5 if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -49582,7 +49497,7 @@ ; return 0; } EOF -if { (eval echo configure:49586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:49501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_fp_except=yes @@ -49652,19 +49567,19 @@ echo $ac_n "checking whether to enable experimental ZTS""... $ac_c" 1>&6 -echo "configure:49656: checking whether to enable experimental ZTS" >&5 +echo "configure:49571: checking whether to enable experimental ZTS" >&5 echo "$ac_t""$ZEND_EXPERIMENTAL_ZTS" 1>&6 echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 -echo "configure:49660: checking whether to enable inline optimization for GCC" >&5 +echo "configure:49575: checking whether to enable inline optimization for GCC" >&5 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 echo $ac_n "checking whether to enable a memory limit""... $ac_c" 1>&6 -echo "configure:49664: checking whether to enable a memory limit" >&5 +echo "configure:49579: checking whether to enable a memory limit" >&5 echo "$ac_t""$ZEND_MEMORY_LIMIT" 1>&6 echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 -echo "configure:49668: checking whether to enable Zend debugging" >&5 +echo "configure:49583: checking whether to enable Zend debugging" >&5 echo "$ac_t""$ZEND_DEBUG" 1>&6 if test "$ZEND_DEBUG" = "yes"; then @@ -49704,7 +49619,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:49708: checking for $ac_word" >&5 +echo "configure:49623: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49736,7 +49651,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:49740: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:49655: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -49747,12 +49662,12 @@ cat > conftest.$ac_ext << EOF -#line 49751 "configure" +#line 49666 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:49756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -49778,12 +49693,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:49782: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:49697: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:49787: checking whether we are using GNU C++" >&5 +echo "configure:49702: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49792,7 +49707,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:49796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:49711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -49811,7 +49726,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:49815: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:49730: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -49843,7 +49758,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:49847: checking how to run the C++ preprocessor" >&5 +echo "configure:49762: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -49856,12 +49771,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:49865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:49780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -49894,17 +49809,17 @@ ac_safe=`echo "stdiostream.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdiostream.h""... $ac_c" 1>&6 -echo "configure:49898: checking for stdiostream.h" >&5 +echo "configure:49813: checking for stdiostream.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:49908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:49823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -49930,7 +49845,7 @@ echo $ac_n "checking for cin in -lC""... $ac_c" 1>&6 -echo "configure:49934: checking for cin in -lC" >&5 +echo "configure:49849: checking for cin in -lC" >&5 ac_lib_var=`echo C'_'cin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -49938,7 +49853,7 @@ ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -49980,7 +49895,7 @@ fi echo $ac_n "checking for cin in -lg++""... $ac_c" 1>&6 -echo "configure:49984: checking for cin in -lg++" >&5 +echo "configure:49899: checking for cin in -lg++" >&5 ac_lib_var=`echo g++'_'cin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -49988,7 +49903,7 @@ ac_save_LIBS="$LIBS" LIBS="-lg++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -50030,7 +49945,7 @@ fi echo $ac_n "checking for cin in -lstdc++""... $ac_c" 1>&6 -echo "configure:50034: checking for cin in -lstdc++" >&5 +echo "configure:49949: checking for cin in -lstdc++" >&5 ac_lib_var=`echo stdc++'_'cin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -50038,7 +49953,7 @@ ac_save_LIBS="$LIBS" LIBS="-lstdc++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:49971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -50080,7 +49995,7 @@ fi echo $ac_n "checking for cin in -lcxx""... $ac_c" 1>&6 -echo "configure:50084: checking for cin in -lcxx" >&5 +echo "configure:49999: checking for cin in -lcxx" >&5 ac_lib_var=`echo cxx'_'cin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -50088,7 +50003,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcxx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:50021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -50130,7 +50045,7 @@ fi echo $ac_n "checking for __array_delete in -lcxxstd""... $ac_c" 1>&6 -echo "configure:50134: checking for __array_delete in -lcxxstd" >&5 +echo "configure:50049: checking for __array_delete in -lcxxstd" >&5 ac_lib_var=`echo cxxstd'_'__array_delete | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -50138,7 +50053,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcxxstd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:50071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -50181,13 +50096,13 @@ echo $ac_n "checking for class istdiostream""... $ac_c" 1>&6 -echo "configure:50185: checking for class istdiostream" >&5 +echo "configure:50100: checking for class istdiostream" >&5 if eval "test \"`echo '$''{'ac_cv_class_istdiostream'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -50201,7 +50116,7 @@ ; return 0; } EOF -if { (eval echo configure:50205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:50120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_class_istdiostream=yes @@ -50261,21 +50176,21 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:50265: checking for inline" >&5 +echo "configure:50180: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:50194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -50339,17 +50254,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:50343: checking for $ac_hdr" >&5 +echo "configure:50258: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:50353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:50268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -50413,7 +50328,7 @@ echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 -echo "configure:50417: checking for GNU Pth" >&5 +echo "configure:50332: checking for GNU Pth" >&5 PTH_PREFIX="`$TSRM_PTH --prefix`" if test -z "$PTH_PREFIX"; then echo "$ac_t""Please check your Pth installation" 1>&6 @@ -50451,7 +50366,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -50469,7 +50384,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:50473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:50388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -50489,7 +50404,7 @@ CFLAGS="$save_CFLAGS" echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:50493: checking for pthreads_cflags" >&5 +echo "configure:50408: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -50504,7 +50419,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -50522,7 +50437,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:50526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:50441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -50551,7 +50466,7 @@ echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:50555: checking for pthreads_lib" >&5 +echo "configure:50470: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -50566,7 +50481,7 @@ pthreads_working="no" else cat > conftest.$ac_ext < @@ -50584,7 +50499,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:50588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:50503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working="yes" @@ -50629,7 +50544,7 @@ echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 -echo "configure:50633: checking for POSIX threads" >&5 +echo "configure:50548: checking for POSIX threads" >&5 echo "$ac_t""yes" 1>&6 fi @@ -50664,9 +50579,9 @@ ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'` -EXTENSION_DIR="$prefix/lib/php/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO" +EXTENSION_DIR="$prefix/lib/php4/extensions/$PART1-$PART2-$ZEND_MODULE_API_NO" -PEAR_INSTALLDIR="$prefix/lib/php" +PEAR_INSTALLDIR="$prefix/lib/php4" INCLUDE_PATH=".:$PEAR_INSTALLDIR" @@ -50985,7 +50900,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:50989: checking build system type" >&5 +echo "configure:50904: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -51014,7 +50929,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:51018: checking for ld used by GCC" >&5 +echo "configure:50933: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -51038,10 +50953,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:51042: checking for GNU ld" >&5 +echo "configure:50957: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:51045: checking for non-GNU ld" >&5 +echo "configure:50960: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -51076,7 +50991,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:51080: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:50995: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -51092,7 +51007,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:51096: checking for BSD-compatible nm" >&5 +echo "configure:51011: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -51156,8 +51071,8 @@ case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 51160 "configure"' > conftest.$ac_ext - if { (eval echo configure:51161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 51075 "configure"' > conftest.$ac_ext + if { (eval echo configure:51076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -51178,19 +51093,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:51182: checking whether the C compiler needs -belf" >&5 +echo "configure:51097: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:51109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -51338,7 +51253,7 @@ echo $ac_n "checking for working mkdir -p""... $ac_c" 1>&6 -echo "configure:51342: checking for working mkdir -p" >&5 +echo "configure:51257: checking for working mkdir -p" >&5 if eval "test \"`echo '$''{'ac_cv_mkdir_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- php4-4.0.5.orig/Makefile.in +++ php4-4.0.5/Makefile.in @@ -1,4 +1,4 @@ - +DESTDIR = ZEND_DIR = $(srcdir)/Zend SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) @@ -32,7 +32,7 @@ install-sapi: @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 - -@$(mkinstalldirs) $(bindir) + -@$(mkinstalldirs) $(DESTDIR)$(bindir) -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ @@ -45,10 +45,10 @@ install-modules: @test -d modules && \ - $(mkinstalldirs) $(moduledir) && \ + $(mkinstalldirs) $(DESTDIR)$(moduledir) && \ echo "installing shared modules into $(moduledir)" && \ rm -f modules/*.la && \ - cp modules/* $(moduledir) >/dev/null 2>&1 || true + cp modules/* $(DESTDIR)$(moduledir) >/dev/null 2>&1 || true install-su: install-modules (cd pear && $(MAKE) install) --- php4-4.0.5.orig/acinclude.m4 +++ php4-4.0.5/acinclude.m4 @@ -387,7 +387,7 @@ ]) AC_DEFUN(PHP_PROG_SENDMAIL,[ -AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib) +AC_PATH_PROG(PROG_SENDMAIL, sendmail,/usr/sbin/sendmail, $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib) if test -n "$PROG_SENDMAIL"; then AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail]) fi --- php4-4.0.5.orig/configure.in +++ php4-4.0.5/configure.in @@ -573,9 +573,9 @@ [ --disable-short-tags Disable the short-form ) @@ -36,9 +35,13 @@ LIBS="$LIBS -L$withval/lib -lX11" AC_CHECK_LIB(Xpm,XpmFreeXpmImage, [LIBS="$LIBS -L$withval/lib -lXpm"],[AC_MSG_RESULT(no)],) LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) - AC_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) - LIBS="$LIBS -L$withval/lib -lXpm -L$withval/lib -lX11" + if test "$shared" = "yes"; then + GD_LIBS="$GD_LIBS -lXpm -lX11" + GD_LFLAGS="$GD_LFLAGS -L$withval/lib" + else + AC_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) + AC_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) + fi ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-xpm-dir=) @@ -112,10 +115,11 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(png) - AC_ADD_LIBRARY(z) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lpng -lz" + else + AC_ADD_LIBRARY(png) + AC_ADD_LIBRARY(z) fi fi @@ -165,10 +169,11 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(z) - AC_ADD_LIBRARY(png) if test "$shared" = "yes"; then GD_LIBS="$GD_LIBS -lpng -lz" + else + AC_ADD_LIBRARY(z) + AC_ADD_LIBRARY(png) fi fi @@ -249,7 +254,7 @@ else AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") fi - LIBS="$LIBS -L$T1_DIR/lib -lt1" +# LIBS="$LIBS -L$T1_DIR/lib -lt1" fi AC_MSG_RESULT(yes) --- php4-4.0.5.orig/ext/imap/config.m4 +++ php4-4.0.5/ext/imap/config.m4 @@ -63,11 +63,11 @@ AC_MSG_ERROR(Cannot find rfc822.h. Please check your IMAP installation) fi - if test -r "$IMAP_DIR/c-client/c-client.a"; then - ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 - elif test -r "$IMAP_DIR/lib/c-client.a"; then - ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 - fi +# if test -r "$IMAP_DIR/c-client/c-client.a"; then +# ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +# elif test -r "$IMAP_DIR/lib/c-client.a"; then +# ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 +# fi for lib in imap c-client4 c-client; do IMAP_LIB=$lib --- php4-4.0.5.orig/ext/pcre/php_pcre.c +++ php4-4.0.5/ext/pcre/php_pcre.c @@ -16,12 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.89 2001/03/13 05:24:03 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.92 2001/04/22 17:20:03 sas Exp $ */ #include "php.h" #include "php_globals.h" #include "php_pcre.h" #include "ext/standard/info.h" +#include "ext/standard/php_smart_str.h" #if HAVE_PCRE || HAVE_BUNDLED_PCRE @@ -59,7 +60,7 @@ pcre_cache_entry *pce = (pcre_cache_entry *) data; pefree(pce->re, 1); #if HAVE_SETLOCALE - pefree((void*)pce->tables, 1); + if ((void*)pce->tables) pefree((void*)pce->tables, 1); #endif } @@ -584,37 +585,36 @@ int *offsets, int count, char **result) { zval retval; /* Return value from evaluation */ - char backref_buf[4], /* Buffer for string version of backref */ - *code, /* PHP code string */ - *new_code, /* Code as result of substitution */ + char *eval_str_end, /* End of eval string */ *match, /* Current match for a backref */ *esc_match, /* Quote-escaped match */ *walk, /* Used to walk the code string */ + *segment, /* Start of segment to append while walking */ walk_last; /* Last walked character */ - int code_len; /* Length of the code string */ - int new_code_len; /* Length of the substituted code string */ int match_len; /* Length of the match */ int esc_match_len; /* Length of the quote-escaped match */ int result_len; /* Length of the result of the evaluation */ int backref; /* Current backref */ char *compiled_string_description; + smart_str code = {0}; CLS_FETCH(); ELS_FETCH(); - /* Save string to be evaluated, since we will be modifying it */ - code = estrndup(eval_str, eval_str_len); - walk = code; - new_code_len = code_len = eval_str_len; + eval_str_end = eval_str + eval_str_len; + walk = segment = eval_str; walk_last = 0; - while (*walk) { + while (walk < eval_str_end) { /* If found a backreference.. */ if ('\\' == *walk || '$' == *walk) { + smart_str_appendl(&code, segment, walk - segment); if (walk_last == '\\') { - memmove(walk-1, walk, code_len - (walk - code) + 1); + code.c[code.len-1] = *walk++; + segment = walk; walk_last = 0; continue; } + segment = walk; if (preg_get_backref(walk+1, &backref)) { if (backref < count) { /* Find the corresponding string match and substitute it @@ -632,30 +632,27 @@ esc_match_len = 0; match_len = 0; } - sprintf(backref_buf, "%c%d", *walk, backref); - new_code = php_str_to_str(code, code_len, - backref_buf, (backref > 9) ? 3 : 2, - esc_match, esc_match_len, &new_code_len); + smart_str_appendl(&code, esc_match, esc_match_len); /* Adjust the walk pointer */ - walk = new_code + (walk - code) + match_len; + walk += (backref > 9 ? 3 : 2); + segment = walk; /* Clean up and reassign */ if (esc_match_len) efree(esc_match); - efree(code); - code = new_code; - code_len = new_code_len; continue; } } walk++; walk_last = walk[-1]; } + smart_str_appendl(&code, segment, walk - segment); + smart_str_0(&code); compiled_string_description = zend_make_compiled_string_description("regexp code"); /* Run the code */ - if (zend_eval_string(code, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) { + if (zend_eval_string(code.c, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failed evaluating code:\n%s\n", code); /* zend_error() does not return in this case */ @@ -669,7 +666,7 @@ /* Clean up */ zval_dtor(&retval); - efree(code); + smart_str_free(&code); return result_len; } @@ -961,7 +958,7 @@ } -static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_replace) +static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callable_replace) { zval **regex, **replace, --- php4-4.0.5.orig/ext/sablot/config.m4 +++ php4-4.0.5/ext/sablot/config.m4 @@ -38,7 +38,7 @@ for i in $PHP_EXPAT_DIR $SABLOT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) - AC_ADD_LIBRARY_WITH_PATH(expat, $i/lib) + AC_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD) AC_ADD_INCLUDE($i/include) AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ])) testval=yes --- php4-4.0.5.orig/ext/sablot/sablot.c +++ php4-4.0.5/ext/sablot/sablot.c @@ -70,7 +70,7 @@ /* Macro's */ /* Free macros */ -#define S_FREE(__var) if (__var) efree(__var); +#define S_FREE(__var) if (__var) { efree(__var); __var = NULL; } #define FUNCH_FREE(__var) if (__var) zval_ptr_dtor(&(__var)); /* ERROR Macros */ @@ -208,9 +208,10 @@ static void php_sablot_init_globals(SABLOTLS_D) { - SABLOTG(processor) = NULL; - SABLOTG(errors) = NULL; - SABLOTG(errorHandler) = NULL; + SABLOTG(processor) = NULL; + SABLOTG(errors) = NULL; + SABLOTG(errorHandler) = NULL; + SABLOTG(output_transform_file) = NULL; } --- php4-4.0.5.orig/ext/sockets/sockets.c +++ php4-4.0.5/ext/sockets/sockets.c @@ -1093,6 +1093,10 @@ } else { buf = strerror(-(Z_LVAL_PP(error))); } + + if(!buf) { + RETURN_FALSE; + } RETURN_STRING((char *)buf, 1); } --- php4-4.0.5.orig/ext/standard/exec.c +++ php4-4.0.5/ext/standard/exec.c @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.52 2001/02/26 06:07:17 andi Exp $ */ +/* $Id: exec.c,v 1.53 2001/04/28 13:16:18 elixer Exp $ */ #include #include "php.h" @@ -194,8 +194,10 @@ /* strip trailing spaces */ l = strlen(buf); t = l; - while (l && isspace((int)buf[--l])); - if (l < t) buf[l + 1] = '\0'; + while (l && isspace((int)buf[l - 1])) { + l--; + } + if (l < t) buf[l] = '\0'; /* Return last line from the shell command */ if (PG(magic_quotes_runtime)) { @@ -204,7 +206,7 @@ tmp = php_addslashes(buf, 0, &len, 0); RETVAL_STRINGL(tmp,len,0); } else { - RETVAL_STRINGL(buf,l?l+1:0,1); + RETVAL_STRINGL(buf,l,1); } } else { int b, i; @@ -233,7 +235,7 @@ return FG(pclose_ret); } -/* {{{ proto int exec(string command [, array output [, int return_value]]) +/* {{{ proto string exec(string command [, array output [, int return_value]]) Execute an external program */ PHP_FUNCTION(exec) { --- php4-4.0.5.orig/ext/standard/output.c +++ php4-4.0.5/ext/standard/output.c @@ -43,10 +43,16 @@ php_output_globals output_globals; #endif +static php_default_output_func(const char *str, uint str_len) +{ + fwrite(str, 1, str_len, stderr); +} + + static void php_output_init_globals(OLS_D) { - OG(php_body_write) = NULL; - OG(php_header_write) = NULL; + OG(php_body_write) = php_default_output_func; + OG(php_header_write) = php_default_output_func; OG(implicit_flush) = 0; OG(output_start_filename) = NULL; OG(output_start_lineno) = 0; --- php4-4.0.5.orig/ext/standard/parsedate.y +++ php4-4.0.5/ext/standard/parsedate.y @@ -180,8 +180,8 @@ %} -/* This grammar has 13 shift/reduce conflicts. */ -%expect 13 +/* This grammar has 14 shift/reduce conflicts. */ +%expect 14 %union { int Number; @@ -319,6 +319,11 @@ yyDay = $1; yyMonth = $2; yyYear = -$3; + } + | tMONTH tUNUMBER tUNUMBER { + yyMonth = $1; + yyDay = $2; + yyYear = $3; } | tMONTH tUNUMBER { yyMonth = $1; --- php4-4.0.5.orig/ext/standard/rand.c +++ php4-4.0.5/ext/standard/rand.c @@ -19,7 +19,7 @@ | Based on code from: Shawn Cokus | +----------------------------------------------------------------------+ */ -/* $Id: rand.c,v 1.25 2001/02/26 06:07:23 andi Exp $ */ +/* $Id: rand.c,v 1.26 2001/03/20 20:48:42 ohrn Exp $ */ #include @@ -235,7 +235,7 @@ convert_to_long_ex(p_max); if ((*p_max)->value.lval-(*p_min)->value.lval < 0) { php_error(E_WARNING,"rand(): Invalid range: %ld..%ld", (*p_min)->value.lval, (*p_max)->value.lval); - }else if ((*p_max)->value.lval-(*p_min)->value.lval > RAND_MAX){ + }else if ((*p_max)->value.lval-(*p_min)->value.lval > PHP_RAND_MAX){ php3_error(E_WARNING,"rand(): Invalid range: %ld..%ld", (*p_min)->value.lval, (*p_max)->value.lval); } break; --- php4-4.0.5.orig/ext/sybase_ct/Makefile.in +++ php4-4.0.5/ext/sybase_ct/Makefile.in @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libsybase_ct.la LTLIBRARY_SOURCES = php_sybase_ct.c +LTLIBRARY_SHARED_NAME = sybase_ct.la +LTLIBRARY_SHARED_LIBADD = $(SYBASE_CT_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk --- php4-4.0.5.orig/ext/sybase_ct/config.m4 +++ php4-4.0.5/ext/sybase_ct/config.m4 @@ -1,44 +1,20 @@ dnl $Id: config.m4,v 1.4 2000/06/24 09:01:51 joey Exp $ -AC_MSG_CHECKING(for Sybase-CT support) -AC_ARG_WITH(sybase-ct, +PHP_ARG_WITH(sybase-ct, [ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home - directory, defaults to /home/sybase.], -[ - if test "$withval" != "no"; then - AC_MSG_RESULT(yes) - if test -z "$SYBASE_LIBS"; then - PHP_EXTENSION(sybase_ct) - fi + directory, defaults to /home/sybase.]) + +if test "$PHP_SYBASE_CT" != "no"; then + PHP_EXTENSION(sybase_ct, $ext_shared) AC_DEFINE(HAVE_SYBASE_CT,1,[ ]) - if test "$withval" = "yes"; then + if test "$PHP_SYBASE_CT" = "yes"; then SYBASE_CT_INCDIR=/home/sybase/include SYBASE_CT_LIBDIR=/home/sybase/lib else - SYBASE_CT_INCDIR=$withval/include - SYBASE_CT_LIBDIR=$withval/lib + SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include + SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib fi - AC_ADD_INCLUDE($SYBASE_CT_INCDIR) - AC_ADD_LIBPATH($SYBASE_CT_LIBDIR) - AC_ADD_LIBRARY(cs) - AC_ADD_LIBRARY(ct) - AC_ADD_LIBRARY(comn) - AC_ADD_LIBRARY(intl) - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" - old_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" - AC_CHECK_LIB(tcl, netg_errstr, - [ AC_ADD_LIBRARY(tcl) ], - [ AC_ADD_LIBRARY(sybtcl) ], - [ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, - [ AC_ADD_LIBRARY(insck) ]) - AC_CHECK_LIB(insck, bsd_tcp, - [ AC_ADD_LIBRARY(insck) ]) - LDFLAGS=$old_LDFLAGS - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) + AC_ADD_INCLUDE($SYBASE_CT_INCDIR) + AC_ADD_LIBRARY_WITH_PATH(ct, $SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) + PHP_SUBST(SYBASE_CT_SHARED_LIBADD) +fi --- php4-4.0.5.orig/ext/sybase_ct/php_sybase_ct.c +++ php4-4.0.5/ext/sybase_ct/php_sybase_ct.c @@ -19,6 +19,7 @@ /* $Id: php_sybase_ct.c,v 1.43 2001/03/11 04:13:53 sniper Exp $ */ +#define IS_EXT_MODULE #include "php.h" #include "php_sybase_ct.h" --- php4-4.0.5.orig/ext/wddx/Makefile.in +++ php4-4.0.5/ext/wddx/Makefile.in @@ -1,5 +1,8 @@ LTLIBRARY_NAME = libwddx.la LTLIBRARY_SOURCES = wddx.c +LTLIBRARY_SHARED_NAME = wddx.la +LTLIBRARY_SHARED_LIBADD = $(WDDX_SHARED_LIBADD) + include $(top_srcdir)/build/dynlib.mk --- php4-4.0.5.orig/ext/wddx/config.m4 +++ php4-4.0.5/ext/wddx/config.m4 @@ -1,14 +1,14 @@ dnl $Id: config.m4,v 1.6 2000/03/27 23:33:38 sas Exp $ dnl config.m4 for extension wddx -PHP_ARG_ENABLE(wddx,whether to enable WDDX support, -[ --enable-wddx Enable WDDX support]) +PHP_ARG_WITH(wddx,whether to enable WDDX support, +[ --with-wddx=[DIR] Enable WDDX support]) -if test "$PHP_WDDX" = "yes"; then +if test "$PHP_WDDX" != "no"; then if test "$enable_xml" = "no"; then AC_MSG_WARN(Activating XML) enable_xml=yes fi AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_EXTENSION(wddx) + PHP_EXTENSION(wddx,$ext_shared) fi --- php4-4.0.5.orig/ext/xml/config.m4 +++ php4-4.0.5/ext/xml/config.m4 @@ -1,9 +1,6 @@ # $Source: /repository/php4/ext/xml/config.m4,v $ # $Id: config.m4,v 1.24 2001/01/10 14:41:01 hirokawa Exp $ -dnl Fallback for --with-xml[=DIR] -AC_ARG_WITH(xml,[],enable_xml=$withval) - AC_C_BIGENDIAN if test "$ac_cv_c_bigendian" = "yes"; then @@ -12,8 +9,8 @@ order=12 fi -PHP_ARG_ENABLE(xml,for XML support, -[ --disable-xml Disable XML support using bundled expat lib], yes) +PHP_ARG_WITH(xml,for XML support, +[ --with-xml=[DIR] Disable XML support using bundled expat lib], yes) if test "$PHP_XML" != "no"; then @@ -36,7 +33,7 @@ else - EXPAT_DIR="$withval" + EXPAT_DIR="$PHP_XML" if test -f $EXPAT_DIR/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) AC_ADD_INCLUDE($EXPAT_DIR/include) --- php4-4.0.5.orig/main/php_config.h.in +++ php4-4.0.5/main/php_config.h.in @@ -1013,11 +1013,11 @@ /* Whether to build cybermut as dynamic module */ #undef COMPILE_DL_CYBERMUT -/* Whether you have GDBM */ -#undef GDBM - /* Whether you have NDBM */ #undef NDBM + +/* Whether you have GDBM */ +#undef GDBM /* */ #undef NDBM --- php4-4.0.5.orig/main/main.c +++ php4-4.0.5/main/main.c @@ -216,7 +216,7 @@ STD_PHP_INI_BOOLEAN("register_argc_argv", "1", PHP_INI_ALL, OnUpdateBool, register_argc_argv, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_globals", "1", PHP_INI_ALL, OnUpdateBool, register_globals, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("short_open_tag", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) + STD_PHP_INI_BOOLEAN("short_open_tag", DEFAULT_SHORT_OPEN_TAG, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool, short_tags, zend_compiler_globals, compiler_globals) STD_PHP_INI_BOOLEAN("sql.safe_mode", "0", PHP_INI_SYSTEM, OnUpdateBool, sql_safe_mode, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("track_errors", "0", PHP_INI_ALL, OnUpdateBool, track_errors, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("y2k_compliance", "0", PHP_INI_ALL, OnUpdateBool, y2k_compliance, php_core_globals, core_globals) --- php4-4.0.5.orig/main/snprintf.c +++ php4-4.0.5/main/snprintf.c @@ -112,7 +112,7 @@ */ if (fi != 0) { p1 = &buf[NDIG]; - while (fi != 0) { + while (p1 > &buf[0] && fi != 0) { fj = modf(fi / 10, &fi); *--p1 = (int) ((fj + .03) * 10) + '0'; r2++; @@ -743,15 +743,23 @@ case 'E': fp_num = va_arg(ap, double); - s = conv_fp(*fmt, fp_num, alternate_form, - (adjust_precision == NO) ? FLOAT_DIGITS : precision, - &is_negative, &num_buf[1], &s_len); - if (is_negative) - prefix_char = '-'; - else if (print_sign) - prefix_char = '+'; - else if (print_blank) - prefix_char = ' '; + if (zend_isnan(fp_num)) { + s = "nan"; + s_len = 3; + } else if (zend_isinf(fp_num)) { + s = "inf"; + s_len = 3; + } else { + s = conv_fp(*fmt, fp_num, alternate_form, + (adjust_precision == NO) ? FLOAT_DIGITS : precision, + &is_negative, &num_buf[1], &s_len); + if (is_negative) + prefix_char = '-'; + else if (print_sign) + prefix_char = '+'; + else if (print_blank) + prefix_char = ' '; + } break; --- php4-4.0.5.orig/pear/Makefile.in +++ php4-4.0.5/pear/Makefile.in @@ -94,24 +94,24 @@ XML/RPC.php install-data-local: PEAR.php - @if $(mkinstalldirs) $(peardir); then \ + @if $(mkinstalldirs) $(DESTDIR)$(peardir); then \ for i in $(PEAR_SUBDIRS); do \ - (set -x;$(mkinstalldirs) $(peardir)/$$i); \ + (set -x;$(mkinstalldirs) $(DESTDIR)$(peardir)/$$i); \ done; \ for i in $(PEAR_FILES); do \ dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \ - (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir); \ + (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(peardir)/$$dir); \ done; \ for i in PEAR.php; do \ - (set -x;$(INSTALL_DATA) $$i $(peardir)); \ + (set -x;$(INSTALL_DATA) $$i $(DESTDIR)$(peardir)); \ done; \ else \ cat $(srcdir)/install-pear.txt; \ exit 5; \ fi -phpincludedir = $(includedir)/php -phpbuilddir = $(prefix)/lib/php/build +phpincludedir = $(includedir)/php4 +phpbuilddir = $(prefix)/lib/php4/build BUILD_FILES = \ pear/pear.m4 \ @@ -131,15 +131,15 @@ bin_SCRIPTS = phpize php-config pear install-build: - $(mkinstalldirs) $(phpbuilddir) $(bindir) && \ - (cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir)) + $(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \ + (cd $(top_srcdir) && cp $(BUILD_FILES) $(DESTDIR)$(phpbuilddir)) install-programs: for prog in $(bin_SCRIPTS); do \ - $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \ + $(INSTALL) -m 755 scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \ done; \ for prog in phpextdist; do \ - $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(bindir)/$$prog; \ + $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \ done HEADER_DIRS = \ @@ -155,13 +155,13 @@ install-headers: -@for i in $(HEADER_DIRS); do \ - paths="$$paths $(phpincludedir)/$$i"; \ + paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \ done; \ $(mkinstalldirs) $$paths && \ echo "creating header file hierarchy" && \ for i in $(HEADER_DIRS); do \ - (cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \ - cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null || true; \ + (cd $(top_srcdir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i; \ + cd $(top_builddir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null || true; \ done Makefile: Makefile.in $(top_builddir)/config.status --- php4-4.0.5.orig/pear/scripts/pear.in +++ php4-4.0.5/pear/scripts/pear.in @@ -1,4 +1,4 @@ -#!@prefix@/bin/php -q +#!@prefix@/bin/php4 -q key, per_dir_entry->key_length+1, per_dir_entry->value, per_dir_entry->value_length+1, per_dir_entry->type, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1, per_dir_entry->value, per_dir_entry->value_length, per_dir_entry->type, PHP_INI_STAGE_ACTIVATE); return 0; } --- php4-4.0.5.orig/sapi/cgi/cgi_main.c +++ php4-4.0.5/sapi/cgi/cgi_main.c @@ -263,6 +263,7 @@ static void init_request_info(SLS_D) { char *content_length = getenv("CONTENT_LENGTH"); + char *content_type = getenv("CONTENT_TYPE"); const char *auth; #if 0 @@ -311,7 +312,7 @@ SG(request_info).request_uri = getenv("SCRIPT_NAME"); } SG(request_info).path_translated = NULL; /* we have to update it later, when we have that information */ - SG(request_info).content_type = getenv("CONTENT_TYPE"); + SG(request_info).content_type = (content_type ? content_type : "" ); SG(request_info).content_length = (content_length?atoi(content_length):0); SG(sapi_headers).http_response_code = 200; --- php4-4.0.5.orig/aclocal.m4 +++ php4-4.0.5/aclocal.m4 @@ -399,7 +399,7 @@ ]) AC_DEFUN(PHP_PROG_SENDMAIL,[ -AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib) +AC_PATH_PROG(PROG_SENDMAIL, sendmail,/usr/sbin/sendmail, $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib) if test -n "$PROG_SENDMAIL"; then AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail]) fi --- php4-4.0.5.orig/debian/php4.docs +++ php4-4.0.5/debian/php4.docs @@ -0,0 +1,3 @@ +CREDITS +EXTENSIONS +FUNCTION_LIST.txt --- php4-4.0.5.orig/debian/php4-domxml.postinst +++ php4-4.0.5/debian/php4-domxml.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" /etc/php4/apache/php.ini; then + echo "You are installing XMLv2 support for php4, but it's not" + echo "enabled in your/etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=domxml.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=domxml.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" /etc/php4/cgi/php.ini; then + echo "You are installing XMLv2 support for php4, but it's not" + echo "enabled in your/etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=domxml.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=domxml.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-domxml.prerm +++ php4-4.0.5/debian/php4-domxml.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" /etc/php4/apache/php.ini; then + echo "You are removing XMLv2 support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=domxml.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[::space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" > /etc/php4/apache/php.ini.xmlremove + mv /etc/php4/apache/php.ini.xmlremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" /etc/php4/cgi/php.ini; then + echo "You are removing XMLv2 support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=domxml.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[::space:]]*extension[[:space:]]*=[[:space:]]*domxml.so" > /etc/php4/cgi/php.ini.xmlremove + mv /etc/php4/cgi/php.ini.xmlremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4.dirs +++ php4-4.0.5/debian/php4.dirs @@ -0,0 +1,3 @@ +/etc/php4/apache +/usr/lib/apache/1.3 +/usr/share/doc/php4/examples --- php4-4.0.5.orig/debian/php4-pgsql.postinst +++ php4-4.0.5/debian/php4-pgsql.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" /etc/php4/apache/php.ini; then + echo "You are installing PostgreSQL support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=pgsql.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=pgsql.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" /etc/php4/cgi/php.ini; then + echo "You are installing PostgreSQL support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=pgsql.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=pgsql.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-ldap.prerm +++ php4-4.0.5/debian/php4-ldap.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" /etc/php4/apache/php.ini; then + echo "You are removing LDAP support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=ldap.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" > /etc/php4/apache/php.ini.ldapremove + mv /etc/php4/apache/php.ini.ldapremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" /etc/php4/cgi/php.ini; then + echo "You are removing LDAP support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=ldap.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" > /etc/php4/cgi/php.ini.ldapremove + mv /etc/php4/cgi/php.ini.ldapremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-pgsql.prerm +++ php4-4.0.5/debian/php4-pgsql.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*pgsql.so" /etc/php4/apache/php.ini; then + echo "You are removing PostgreSQL support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=pgsql.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" > /etc/php4/apache/php.ini.pgsqlremove + mv /etc/php4/apache/php.ini.pgsqlremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*pgsql.so" /etc/php4/cgi/php.ini; then + echo "You are removing PostgreSQL support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=pgsql.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*pgsql.so" > /etc/php4/cgi/php.ini.pgsqlremove + mv /etc/php4/cgi/php.ini.pgsqlremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-curl.prerm +++ php4-4.0.5/debian/php4-curl.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" /etc/php4/apache/php.ini; then + echo "You are removing CURL support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=curl.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" > /etc/php4/apache/php.ini.curlremove + mv /etc/php4/apache/php.ini.curlremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" /etc/php4/cgi/php.ini; then + echo "You are removing CURL support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=curl.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" > /etc/php4/cgi/php.ini.curlremove + mv /etc/php4/cgi/php.ini.curlremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-curl.postinst +++ php4-4.0.5/debian/php4-curl.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" /etc/php4/apache/php.ini; then + echo "You are installing CURL support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=curl.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=curl.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*curl.so" /etc/php4/cgi/php.ini; then + echo "You are installing CURL support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=curl.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=curl.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4.prerm +++ php4-4.0.5/debian/php4.prerm @@ -0,0 +1,71 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi; + +if [ -f /etc/apache/httpd.conf ]; then + if grep -qi "^LoadModule.*libphp4.so" /etc/apache/httpd.conf; then + echo "The apache webserver is configured to load the php module at startup" + echo "If you remove this package now, apache will not start"; + echo "You should remove the following lines from httpd.conf:" + echo + grep "^LoadModule.*libphp4.so" /etc/apache/httpd.conf || true + echo + echo -n "Do you want me to remove these lines for you [Y/n] ?" + read a; + if ! echo $a | grep -iq ^n; then + sed -e 's+^LoadModule.*libphp4.so+\#LoadModule php4_module /usr/lib/apache/1.3/libphp4.so+' /etc/apache/httpd.conf.php4remove + mv /etc/apache/httpd.conf.php4remove /etc/apache/httpd.conf + else + echo -n "Do you want to remove this package anyway [y/N] ?" + read a; + if echo $a | grep -iq ^y; then + echo + echo "Ok, removing package, don't forget to remove the above mentioned" + echo "lines from /etc/apache/httpd.conf" + echo + echo -n "Press RETURN to continue" + read a + else + exit 1 + fi + fi + fi +fi + +if [ -f /etc/apache-ssl/httpd.conf ]; then + if grep -qi "^LoadModule.*libphp4.so" /etc/apache-ssl/httpd.conf; then + echo "The apache webserver is configured to load the php module at startup" + echo "If you remove this package now, apache will not start"; + echo "You should remove the following lines from httpd.conf:" + echo + grep "^LoadModule.*libphp4.so" /etc/apache-ssl/httpd.conf || true + echo + echo -n "Do you want me to remove these lines for you [Y/n] ?" + read a; + if ! echo $a | grep -iq ^n; then + sed -e 's+^LoadModule.*libphp4.so+\#LoadModule php4_module /usr/lib/apache/1.3/libphp4.so+' /etc/apache-ssl/httpd.conf.php4remove + mv /etc/apache-ssl/httpd.conf.php4remove /etc/apache-ssl/httpd.conf + else + echo -n "Do you want to remove this package anyway [y/N] ?" + read a; + if echo $a | grep -iq ^y; then + echo + echo "Ok, removing package, don't forget to remove the above mentioned" + echo "lines from /etc/apache-ssl/httpd.conf" + echo + echo -n "Press RETURN to continue" + read a + else + exit 1 + fi + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4.postinst +++ php4-4.0.5/debian/php4.postinst @@ -0,0 +1,96 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + + +if [ "$1" != "configure" ]; then + exit 0 +fi + +ask() { + while : ; do + echo -n "$1 " + read a + [ "$a" = "" ] && a="$2" + a=`echo $a | tr A-Z a-z` + [ "$a" = "y" -o "$a" = "n" ] && break + echo + echo "Illegal input!" + echo + done +} + +if ! [ -f /etc/php4/apache/php.ini ]; then + mkdir -p /etc/php4/apache + cp /usr/share/doc/php4/examples/php.ini /etc/php4/apache +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension_dir" /etc/php4/apache/php.ini ; then + echo "WARNING! Location of php4 modules has changed. Should I comment out" + echo "the extension_dir setting in /etc/php4/apache/php.ini." + ask "Should I [Y/n]? " "y" + + if [ "$a" = "y" ] ; then + sed -e "s/^[[:space:]]*extension_dir/;extension_dir/" < /etc/php4/apache/php.ini > /etc/php4/apache/php.ini-extdir + mv /etc/php4/apache/php.ini-extdir /etc/php4/apache/php.ini + else + echo "NOT commenting the extension_dir. I hope you know, what you're doing." + fi + fi +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/apache/httpd.conf ]; then + if ! grep -qi "^[[:space:]]*LoadModule.*php4.so" /etc/apache/httpd.conf; then + echo "I see you have apache webserver installed and so far you haven't"; + echo "used the apache module version of php4 in your apache. If you"; + echo "want to use it, you should reconfigure the apache webserver and"; + echo "select to load the php module. I can call the apacheconfig script"; + echo "now for you to do it, or you can insert the following line into"; + echo "/etc/apache/httpd.conf manually:"; + echo + echo "LoadModule php4_module /usr/lib/apache/1.3/libphp4.so"; + echo + ask "Do you want me to run the apacheconfig script now [y/N] ?" "n" + + if [ "$a" = "y" ] ; then + [ -x /usr/sbin/apacheconfig ] && /usr/sbin/apacheconfig --force-modules + else + echo "Ok, not running apacheconfig. Please read the docs in /usr/share/doc/php4" +# echo -n "Press RETURN to continue" +# read a; + fi + fi +fi + +if [ -f /etc/apache-ssl/httpd.conf ]; then + if ! grep -qi "^[[:space:]]*LoadModule.*php4.so" /etc/apache-ssl/httpd.conf; then + echo "I see you have apache-ssl webserver installed and so far you haven't"; + echo e"used the apache module version of php4 in your apache-ssl. If you"; + echo "want to use it, you should reconfigure the apache-ssl webserver and"; + echo "select to load the php module. I can call the apache-sslconfig script"; + echo "now for you to do it, or you can insert the following line into"; + echo "/etc/apache-ssl/httpd.conf manually:"; + echo + echo "LoadModule php4_module /usr/lib/apache/1.3/libphp4.so"; + echo + ask "Do you want me to run the apache-sslconfig script now [y/N] ?" "n" + + if [ "$a" = "y" ] ; then + [ -x /usr/sbin/apache-sslconfig ] && /usr/sbin/apache-sslconfig --force-modules + else + echo "Ok, not running apache-sslconfig. Please read the docs in /usr/share/doc/php4" +# echo -n "Press RETURN to continue" +# read a; + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-mhash.prerm +++ php4-4.0.5/debian/php4-mhash.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" /etc/php4/apache/php.ini; then + echo "You are removing mhash support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mhash.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" > /etc/php4/apache/php.ini.mhashremove + mv /etc/php4/apache/php.ini.mhashremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" /etc/php4/cgi/php.ini; then + echo "You are removing mhash support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mhash.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" > /etc/php4/cgi/php.ini.mhashremove + mv /etc/php4/cgi/php.ini.mhashremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/README.cgi +++ php4-4.0.5/debian/README.cgi @@ -0,0 +1,15 @@ +php4-cgi for DEBIAN +---------------------- + +This package contains both runtime and cgi versions of php4. + +php4-cgi and apache +------------------- + +If you wan't to use php4-cgi in apache +1) activate mod_action +2) add +Action application/x-httpd-php /cgi-bin/php4 + into apache config file + +Petr Cech , Sat, 23 Jan 2001 19:59:26 +0200 --- php4-4.0.5.orig/debian/php4.preinst +++ php4-4.0.5/debian/php4.preinst @@ -0,0 +1,43 @@ +#! /bin/sh +# preinst script for php4 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' + +case "$1" in + install|upgrade) + if [ "$1" = "upgrade" ] ; then + if dpkg --compare-versions "$2" lt 4.0.2-6 ; then + echo "WARNING: Due to changes in glibc 2.1.94 starting with this release" + echo "DB files have an incompatible format. If you use DB module please" + echo "backup existing files and recreate them after upgrade." + echo + echo "Please press to continue..." + read KEYPRESS + fi + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- php4-4.0.5.orig/debian/rules +++ php4-4.0.5/debian/rules @@ -0,0 +1,272 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that builds an +# architecture-dependant package, as well as an architecture-independent +# package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=2 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +CFLAGS = -O2 -Wall +#CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g + DEBUG := --enable-debug +else + DEBUG := --disable-debug +endif + +modules=gd imap ldap mhash mysql snmp +apachever=$(shell dpkg -s apache-dev | grep ^Version | cut -d\ -f2 | cut -d- -f1) +php4ver=$(shell head -1 debian/changelog | cut -d\ -f 2 | sed 's/[()]//g') + +build: build-apache-stamp build-cgi-stamp +build-apache-stamp: configure-apache-stamp + dh_testdir + # Add here commands to compile the package. + cd apache-build && $(MAKE) CFLAGS="$(CFLAGS)" + + touch build-apache-stamp + +build-cgi-stamp: configure-cgi-stamp + dh_testdir + cd cgi-build && $(MAKE) CFLAGS="$(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" && mv php php4.cgi +#HACK to not rebuild CGI twice + cd cgi-build/main && mv php_config.h php_config.h.old && \ + sed -e 's/FORCE_CGI_REDIRECT 1/FORCE_CGI_REDIRECT 0/' \ + -e 's/DISCARD_PATH 0/DISCARD_PATH 1/' < php_config.h.old > php_config.h && \ + touch -r php_config.h.old php_config.h + cd cgi-build/sapi/cgi && make clean + + cd cgi-build && $(MAKE) CFLAGS="$(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + + touch build-cgi-stamp + +configure: configure-apache-stamp +configure-apache-stamp: + dh_testdir + if [ -d apache-build ]; then rm -rf apache-build; fi + -mkdir apache-build + #aclocal + #automake + #autoconf + cd apache-build && \ + ../configure --prefix=/usr --with-apxs=/usr/bin/apxs --with-regex=system \ + --with-config-file-path=/etc/php4/apache --disable-rpath \ + --enable-memory-limit \ + --enable-calendar \ + --enable-sysvsem \ + --enable-sysvshm \ + --enable-track-vars \ + --enable-trans-sid \ + $(DEBUG) --disable-static \ + --with-db2 \ + --with-ndbm \ + --enable-exif \ + --enable-filepro \ + --enable-ftp \ + --with-gettext \ + --with-gd=shared \ + --with-jpeg-dir=/usr --with-xpm-dir=/usr/X11R6 \ + --with-imap=shared \ + --with-ldap=shared,/usr \ + --with-mm \ + --with-mhash=shared \ + --with-mysql=shared,/usr \ + --with-pcre-regex=/usr \ + --without-pgsql \ + --enable-shmop \ + --with-snmp=shared \ + --enable-sockets \ + --with-ttf --with-t1lib \ + --enable-wddx \ + --enable-yp \ + --with-zlib + +#HACK to get c-client staticly link with imap + cp debian/libc-client.la apache-build/ext/imap + echo "IMAP_SHARED_LIBADD = ./libc-client.la" >> apache-build/config_vars.mk + touch configure-apache-stamp + +configure-cgi-stamp: + dh_testdir + if [ -d cgi-build ]; then rm -rf cgi-build; fi + -mkdir cgi-build + #aclocal + #automake + #autoconf + cd cgi-build && \ + ../configure --prefix=/usr --prefix=/usr --with-regex=system --enable-force-cgi-redirect \ + --with-config-file-path=/etc/php4/cgi --disable-rpath --disable-pear \ + --enable-memory-limit \ + --enable-calendar \ + --with-db2 \ + --with-ndbm \ + --enable-exif \ + --enable-filepro \ + --enable-ftp \ + --with-gettext \ + --enable-sysvsem \ + --enable-sysvshm \ + --enable-track-vars \ + --enable-trans-sid \ + $(DEBUG) --disable-static \ + --with-mm \ + --enable-shmop \ + --enable-sockets \ + --enable-wddx \ + --enable-yp \ + --with-zlib \ + --without-mysql + touch configure-cgi-stamp + +clean: + dh_testdir + dh_testroot + rm -f configure-apache-stamp build-apache-stamp + rm -f configure-cgi-stamp build-cgi-stamp + rm -f install-stamp + + # Add here commands to clean up after the build process. + #-$(MAKE) distclean + rm -rf apache-build + rm -rf cgi-build + rm -f debian/copyright + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/php4. + # install apache DSO module + cp apache-build/.libs/libphp4.so debian/php4/`apxs -q LIBEXECDIR` + cp debian/500mod_php4.info debian/php4/`apxs -q LIBEXECDIR` + # sanitize php.ini file + cat php.ini-dist | tr "\t" " " > debian/php4/usr/share/doc/php4/examples/php.ini + cat php.ini-dist | tr "\t" " " > debian/php4-cgi/usr/share/doc/php4-cgi/examples/php.ini + + # install the apache modules' files + cd apache-build && make install-modules DESTDIR=$(CURDIR)/debian/php4 + # install PEAR + cd apache-build/pear && make install DESTDIR=$(CURDIR)/debian/php4-pear + + for i in $(modules); do \ + ext=`./debian/php4-pear/usr/bin/php-config --extension-dir`;\ + j=`case $$i in sybase) echo sybase_ct;; *) echo $$i;; esac`;\ + mkdir -p debian/php4-$$i/$${ext}; \ + install -m 644 -o root -g root \ + debian/php4/$${ext}/$$j.so \ + debian/php4-$$i/$${ext}/$$j.so; \ + rm debian/php4/$${ext}/$$j.so; \ + mkdir -p debian/php4-$$i/usr/share/lintian/overrides; \ + echo "php4-$$i: no-shlibs-control-file usr/lib/php4/extensions/no-debug-non-zts-20001222/$$j.so" > debian/php4-$$i/usr/share/lintian/overrides/php4-$$i; \ + done + + # install CGI + cp cgi-build/php debian/php4-cgi/usr/bin/php4 + cp cgi-build/php4.cgi debian/php4-cgi/usr/lib/cgi-bin/php4 + + # move and install -dev files + dh_movefiles --sourcedir=debian/php4-pear + install -m 755 -o root -g root ext/ext_skel debian/php4-dev/usr/bin/ext_skel + + touch install-stamp + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: DH_OPTIONS=-i +binary-indep: build install + # Need this version of debhelper for DH_OPTIONS to work. + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installexamples +# dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit +# dh_installcron +# dh_installmanpages + dh_installinfo +# dh_undocumented + dh_installchangelogs -i NEWS + dh_link + dh_compress + dh_fixperms +# # You may want to make some executables suid here. +# dh_suidregister + dh_installdeb +# dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +# Pass -a to all debhelper commands in this target to reduce clutter. +#binary-arch: DH_OPTIONS=-a +binary-arch: build install + # Need this version of debhelper for DH_OPTIONS to work. + dh_testdir + dh_testroot + dh_installdebconf + cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright + dh_installdocs -a + + for i in $(modules); do \ + rm -rf debian/php4-$$i/usr/share/doc/php4-$$i; \ + ln -s php4 debian/php4-$$i/usr/share/doc/php4-$$i; \ + done + +# dh_installexamples +# dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit +# dh_installcron +# dh_installmanpages +# dh_installinfo +# dh_undocumented + dh_installchangelogs -pphp4 NEWS + dh_installchangelogs -pphp4-cgi NEWS +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + dh_strip -a +endif + dh_link -a + dh_compress -a -Xphp.ini + dh_fixperms -a +# # You may want to make some executables suid here. +# dh_suidregister + dh_installdeb -a +# dh_makeshlibs +# dh_perl + LD_LIBRARY_PATH=$(CURDIR)/debian/php4/usr/lib/apache/1.3 dh_shlibdeps -a + #HACK +ifeq (1.3.14,$(apachever)) + echo "apache:Depends=apache-common (>= $(apachever)-2), apache-common (<< $(apachever).1)" >> debian/substvars +else + echo "apache:Depends=apache-common (>= $(apachever)), apache-common (<< $(apachever).1)" >>debian/substvars +endif + for i in $(modules); do \ + echo "php4:Depends=php4 (= $(php4ver)) | php4-cgi (= $(php4ver))" >> debian/php4-$$i.substvars; \ + done + + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install configure --- php4-4.0.5.orig/debian/php4-mysql.prerm +++ php4-4.0.5/debian/php4-mysql.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" /etc/php4/apache/php.ini; then + echo "You are removing MySQL support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mysql.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" > /etc/php4/apache/php.ini.mysqlremove + mv /etc/php4/apache/php.ini.mysqlremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" /etc/php4/cgi/php.ini; then + echo "You are removing MySQL support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mysql.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" > /etc/php4/cgi/php.ini.mysqlremove + mv /etc/php4/cgi/php.ini.mysqlremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-pear.dirs +++ php4-4.0.5/debian/php4-pear.dirs @@ -0,0 +1,2 @@ +/usr/bin +/usr/lib/php4 --- php4-4.0.5.orig/debian/php4-sablot.postinst +++ php4-4.0.5/debian/php4-sablot.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sablot.so" /etc/php4/apache/php.ini; then + echo "You are installing XSL support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=sablot.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=sablot.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sablot.so" /etc/php4/cgi/php.ini; then + echo "You are installing XSL support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=sablot.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=sablot.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/TODO +++ php4-4.0.5/debian/TODO @@ -0,0 +1,7 @@ +- debconfize - needed to properly add extensions to the config files + (now apache and cgi). But there will be more. +- more modules +- fix bugs +- debconf ? +- roxen support (oh my) +- anything else --- php4-4.0.5.orig/debian/README.Debian +++ php4-4.0.5/debian/README.Debian @@ -0,0 +1,110 @@ +php4 for DEBIAN +---------------- + +Take a look at the additional php4 modules available as debian packages +(e.g. postgresql, mysql, gd). You can use them in your scripts after a dl() +command, like dl("module.so"), or you can set up your php.ini +(/etc/php4/apache/php.ini) to load some modules when apache is started +(extension=module.so) + +For now there are no separate docs for php4, see the php3-doc package for +reference. + +Gergely Madarasz , Thu, 18 Nov 1999 01:52:04 +0100 + + If you think, that some module should be enabled, please look below and read +the comment. If you disagree with the comment or have some informations about +the `??' ones, please, mail me. + +Problems starting apache with php4 +----------------------------------- + + * There are numerous problems with php4 modules. If it doesn't start, try to + reorder the php4 module loading. If using mhash, put it first. + + * If you have installed php4-imap and php4-ldap and you get something like + + apache: dl-close.c:123: _dl_close: Assertion `new_opencount[0] == 0' failed. + + try exchaning the order of extension= in php.ini (imap should be first and + ldap second). This looks like a glibc bug, but upstream doesn't want to + fix it + + * extension_dir and include_path should be commented out, if you don't need + special settings for them so php will look in compiled in paths. If you set + them, you should also add appropriate php install directories there. + +Petr Cech , Thu, 22 Feb 2001 09:59:26 +0200 + +Extensions: +aspell - disabled. Should I enable it? +bcmath - disabled. not-packaged libs +calendar - enabled (4.0.2-3) +ccvs - Credit cards. proprietary +cpdflib - have to check +curl - enabled (4.0.3pl1-3) +cybecash - non-free / comercial library required - on-line shopping ?? +mod-dav - Removed upstream from 4.0.4 +db - disabled. cannot link with gdbm and ndbm isn't here since glibc 2.1.94 + * this also changes the DB interface. You should now use + dba_* functions instead of dbm_*, with the handler "db2" +db2 - enabled since 2.1.94 +db3 - disabled - it's either db2 or db3 :(( +domxml - enabled (4.0.2-3) +exif - reads the EXIF headers from a JPEG image (4.0.3pl1-6) +fdftk - ?? +filepro - enabled +ftp - enabled +gd - enabled (with jpeg, png, uncompessed GIFs, xpm, ttf and t1) +gettext - enabled +gmp - disabled. GPL +hyperwave - ?? +icap - ?? +kerberos - must have been in non-US? +imap - enabled +informix - disabled. Proprietary libs +ingres - disabled. Proprietary libs +interbase - disabled. If someone would package InterBase, it could be enabled +java - disabled. JDK is non-free. s/o could package this as an addon module +ldap - enabled +mcal - ?? +mcrypt - disabled (for now). Either the US export regulations will allow + distributin this from US, or I'll try to package it in non-US + (don't hold your breath) +mhash - enabled +msql - disabled. Not packaged in Debian. Obsolete +mysql - enabled +oci8 - disabled. Proprietary libs +adabas - disabled. Proprietary libs +solid - disabled. Proprietary libs +ibm-db2 - disabled. Proprietary libs +empress - disabled. Proprietary libs +velocity - disabled. Proprietary libs +custom-odbc - disabled. +iodbc - ?? +esoob - ?? +unixODBC - disabled. Anyone want's this? +openlink - ?? +dbmaker - ?? +oracle - disabled. Proprietary libs +pcre - enabled +pdflib - disabled. binary-only, not-packaged library +zlib - enabled +pfpro - disabled - almost the same as cybercash +pgsql - enabled +pspell - disabled. not packaged ?? +readline - disabled. Why?? +recode - disabled - GPL +mm - enabled +openssl - disabled. Would have gone to non-US. +sablot - XSL parser (4.0.4pl1-4) +snmp - enabled +sockets - enabled (4.0.2-3) +swf - disabled. binary-only, not-packaged library +sybase - disabled. Proprietary libs +sybase-ct - enabled. compiled against freetds (4.0.4.5rc6-3 or better) +wddx - enabled (4.0.4.5rc6-3 or better) +xml - enabled +yaz - ?? +yp - disabled. Why? + --- php4-4.0.5.orig/debian/php4-gd.postinst +++ php4-4.0.5/debian/php4-gd.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" /etc/php4/apache/php.ini; then + echo "You are installing GD support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=gd.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=gd.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" /etc/php4/cgi/php.ini; then + echo "You are installing GD support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=gd.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=gd.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-cgi.dirs +++ php4-4.0.5/debian/php4-cgi.dirs @@ -0,0 +1,4 @@ +/etc/php4/cgi +/usr/bin +/usr/lib/cgi-bin +/usr/share/doc/php4-cgi/examples --- php4-4.0.5.orig/debian/php4-imap.postinst +++ php4-4.0.5/debian/php4-imap.postinst @@ -0,0 +1,52 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" /etc/php4/apache/php.ini; then + echo "You are installing IMAP support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=imap.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=imap.so" >> /etc/php4/apache/php.ini + fi + + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" /etc/php4/cgi/php.ini; then + echo "You are installing IMAP support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=imap.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=imap.so" >> /etc/php4/cgi/php.ini + fi + + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/changelog +++ php4-4.0.5/debian/changelog @@ -0,0 +1,548 @@ +php4 (3:4.0.5-2.1p) unstable; urgency=low + + * Compiled for potato + + -- Hon Fri, 22 Jun 2001 08:25:06 +0800 + +php4 (3:4.0.5-2) unstable; urgency=low + + * Build-Depend on newer libmhash-dev, as it supposedly doesn't + compile on current woody (closes: #96555) + * Build-Depends: s/freetype2/libttf-dev/ + * Stop building php4-pgsql - move to non-US + * Build-Deps on new libsablot0 + + -- Petr Cech Thu, 10 May 2001 10:43:02 +0200 + +php4 (3:4.0.5-1) unstable; urgency=medium + + * New upstream release. + * recompile with new sablot - how I hate this (closes: #95401) + * Merge XML into main php4 + * Reword README.Debian (closes: #89667) + * Enable wddx + * debian/*.postinst: * only ask upon first install, not upgrade (closes: #93452) + * fix typos (closes: #94118) + * Added support for Sybase/MS SQL Server (using FreeTDS) + using patch from: + http://rpms.arvin.dk/php/source/patches/php-sybase_ct.patch + thanks to Bradley Bell for the patch + * ext/pcre : two upstream fixes + * ext/sablot/sablot.c: small upstream fix + * build/buildcheck.sh : fixes to allow compile with libtool 1.4 + * ext/standard/exec.c: upstream fixes + * sapi/apache/mod_php4.c: off by one fix + * sapi/cgi/cgi_main.c: fix POST bug + * main/snprintf.c: upstream fix + + -- Petr Cech Wed, 3 May 2001 22:17:10 +0200 + +php4 (4.0.4.5rc6-2) unstable; urgency=low + + * Build-depends: libcurl-dev will pull libcurl2 (closes: #92994) + * TSRM/TSRM.c: upstream fix + * ext/pgsql: upstream fix + + -- Petr Cech Thu, 5 Apr 2001 17:51:09 +0200 + +php4 (4.0.4.5rc6-1) unstable; urgency=low + + * New upstream test release. + * Don't mention CGI support, as it's not so for a long time. + + -- Petr Cech Wed, 4 Apr 2001 13:47:45 +0200 + +php4 (4.0.4.5rc5-1) unstable; urgency=low + + * New upstream test release. + * ask about /etc/php4/cgi/php.ini also + * It's really recompiled for 1.3.19 (closes: #91901, #91822) + * problems with modules documented (closes: #81141, #82611) + + -- Petr Cech Mon, 2 Apr 2001 09:38:16 +0200 + +php4 (4.0.4.5rc3-1) unstable; urgency=low + + * New upstream RC release + * debian/rules: s/with-yp/enable-yp/ to really enable YP support. Discovered + on broken potato upload. -0potato2 is fixed + * Looks like there was a bug in latest build, this should fix it (closes: #92018) + * remove libmcal0 workaround + + -- Petr Cech Wed, 28 Mar 2001 21:15:36 +0200 + +php4 (4.0.4.5rc2-1) unstable; urgency=low + + * New upstream release test release 4.0.5RC2. + * debian/rules: Add lintian overrides + * debian/control: * add libexpat1-dev to Build-Depends + * add libmcal0 to Build-Depends since libmcal0-dev is + missing this dependancy :(( Bug filled + * ext/socket/socket.c: minor upstream patch + + -- Petr Cech Mon, 26 Mar 2001 20:43:49 +0200 + +php4 (4.0.4pl1-6) unstable; urgency=low + + * NEVER RELEASED + * Build-depends on libcurl1-dev (>= 7.6.1-5), which fixes the libcurl1 or + libcurl1-ssl problem. + * remove dh_testversion and use versioned Build-depends instead + + -- Petr Cech Tue, 13 Mar 2001 23:20:58 +0100 + +php4 (4.0.4pl1-5) unstable; urgency=low + + * Add lintian overrides + * Rebuild with correct libgd-dev installed. Sorry + (closes: #88490, #88255, #88371, #88619, #88635) + * Closed by fixed libjpeg (closes: #85865, #88141) + + -- Petr Cech Tue, 6 Mar 2001 17:26:41 +0100 + +php4 (4.0.4pl1-4) unstable; urgency=low + + * The "Enable what you can" release. + * Enable sablot extension (many files) (closes: #84073) + * Enable mcal extension (finaly closes: #65688, #85925) + * Build-Conflicts: bind-dev - this supposedly causes unresolved symbols. + Why? + * ext/pgsql/pgsql.c: apply tiny patch, which should fix postgres + problems. There is a better patch in CVS, but it needs changes to Zend + * pear/pear.in: binary is php4 no php (closes: #87848) + * ext/domxml/config.m4: link with -lxml2 (closes: #87457) + * debian/README.Debian: add notes about ldap, imap and mhash extensions + * debian/{control,rules}: activate bz2 extension + * php4.ini-dist: comment out include_path so php will use compiled in + path (closes 2nd part of 87848) + + -- Petr Cech Wed, 28 Feb 2001 10:18:11 +0100 + +php4 (4.0.4pl1-3) unstable; urgency=medium + + * Fixed postrm issues. Sorry + + -- Petr Cech Sun, 4 Feb 2001 06:13:00 +0100 + +php4 (4.0.4pl1-2) unstable; urgency=medium + + * debian/control: Build-depends: xlibs-dev (seems it's missing and causes + failed builds for arm, m68k and powerpc) + s/libsnmp4.1/libsnmp4.2/ (closes: #84139) + * debian/php4.*: make LoadModule matching case insensitive (fixes 83641 + for unstable) + + -- Petr Cech Wed, 31 Jan 2001 10:14:29 +0100 + +php4 (4.0.4pl1-1) unstable; urgency=high + + * New upstream version. + * This release fixes some security problems. + * Some patches from previous versions are not here. + * debian/control: Build-depends on newer libcurl1-dev, remove librecode-dev + * debian/control: add libjpeg62-dev to build-depends from powerpc buildlog + (hmm. Where ir Roman?) + * debian/php4{,-cgi}.postinst: don't mark php.ini as conffile and install it + when it doesn't already exist. I should find a way to check, that the default + php.ini changed and user should update it. + * debian/php4{,-cgi}.postrm: cleanup the /etc/php4 dir after purge + * fix xml.so not working with php4-cgi + + -- Petr Cech Thu, 23 Jan 2001 11:12:59 +0100 + +php4 (4.0.4final-6) unstable; urgency=medium + + * OK. Now also fix the prerm issues (closes: #81418) and to ease + that thanks for submiting bugs (closes: #81818, #81819) + * some upstream updates: browsercap, php-config + + -- Petr Cech Wed, 10 Jan 2001 14:04:19 +0100 + +php4 (4.0.4final-5) unstable; urgency=medium + + * OK. Take a deep breath and fix those bloody postinst + bugs - fix it and rewrite from ed -> sed, because ed is not essential :( + closes: #80801. + * apply some upstream fixes. + * disable ctype extension - not yet ready + + -- Petr Cech Tue, 2 Jan 2001 13:40:35 +0100 + +php4 (4.0.4final-4) unstable; urgency=low + + * debian/libc-client.la: add -lpam -ldl -lcrypt + * fix php4-cgi.postinst bugs (closes: #80817, #80805, #80801) + + -- Petr Cech Fri, 29 Dec 2000 11:40:43 +0100 + +php4 (4.0.4final-3) unstable; urgency=low + + * Brown Xmas Sock Release + * Grr. correctly fix the php4 postinst error + (closes: #80303, #80324, #80326, #80359) + NMU by Wichert Akkerman (closes: #80381) + * also fix php4-cgi. NMU by Marcelo E. Magallon + (closes: #80406). + * fix fix for php4-cgi postinst s/apache/cgi/ + * apply some upstream fixes to ext/session/ + * domxml/config.m4: fix my -Lshared,/usr/lib error + * debian/rules: + * add --enable-ctype to both targets + * --diable-pear to CGI target + * generate Depends: php4 (=ver) | php4-cgi (=ver) + + -- Petr Cech Wed, 27 Dec 2000 15:29:56 +0100 + +php4 (4.0.4final-2) unstable; urgency=low + + * Run apacheconfig with --force-modules. + * Fix stupid bug in php4 and php4-cgi postinst. + * ext/sysvshm/sysvshm.c : upstream fix + + -- Petr Cech Thu, 21 Dec 2000 22:58:27 +0100 + +php4 (4.0.4final-1) unstable; urgency=low + + * New upstream version. + * Sorry for the version, but da-katie doesn't allow overwriting of files, notably + .orig.tar.gz. It's my fault I know, but it worked till now. + + -- Petr Cech Wed, 20 Dec 2000 01:32:34 +0100 + +php4 (4.0.4-0RC6.1) unstable; urgency=low + + * OK. Final final RC for 4.0.4. + * Build-depends on libxml2-dev (>= 2.2.7) because php needs this. + * Activate ndbm dba driver. + + -- Petr Cech Sun, 17 Dec 2000 19:43:51 +0100 + +php4 (4.0.4-0RC5.1) unstable; urgency=low + + * UNRELEASED. + * Final RC for 4.0.4. + * Some mods to README.Debian and TODO + + -- Petr Cech Wed, 13 Dec 2000 00:01:08 +0100 + +php4 (4.0.4-0RC4.1) unstable; urgency=low + + * New upstream beta release. Let's stabilize things now and add new + modules after final release of 4.0.4. + + -- Petr Cech Thu, 7 Dec 2000 10:12:11 +0100 + +php4 (4.0.4-0RC3.2) unstable; urgency=low + + * recompile with new libc-client200-dev. + * fix source recompile + * depend on fixed apache 1.3.14-2 + + -- Petr Cech Thu, 7 Dec 2000 00:49:14 +0100 + +php4 (4.0.4-0RC3.1) unstable; urgency=low + + * New upstream beta release. + * Add libxml2-dev to build-depends (closes: #78479). + * implement DEB_BUILD_OPTIONS + * fix apache build wrt. apxs + * fix typo in description of curl modules (closes: #78828) + + -- Petr Cech Tue, 5 Dec 2000 14:22:30 +0100 + +php4 (4.0.3pl1-7) unstable; urgency=low + + * Rebuild with apache 1.3.14-1 + + -- Petr Cech Fri, 1 Dec 2000 01:41:41 +0100 + +php4 (4.0.3pl1-6) unstable; urgency=low + + * add --enable-memory-limit + * add --enable-exif per request from William Ono. + * Add Suggests: phpdoc (yes. it's here). + * ext/standard/crypt.c - fix from CVS. + * ext/ftp/ftp.{c,h} - fix mkdir() and RETR, STOR + * ext/gd/gd.c - add format string + - add XBM to phpinfo() + * ext/imap/php_imap.{c,h} - CVS fixes + * main/main.c - fix CGI crash + - add HTTP_SERVER_VARS in CGI mode + * and many more. Taken from php4.srpm (thanks :)) + * recompile with apache 1.3.12-2.2 + * and hack large files support into DSO module. php4 doesn't use it now :(( + + -- Petr Cech Thu, 30 Nov 2000 00:01:39 +0100 + +php4 (4.0.3pl1-5) unstable; urgency=low + + * Back out changes about --enable-versioning + * ext/domxml/php_domxml.c : fix compilation with recent libxml2 (>=2.2.7) + + -- Petr Cech Tue, 21 Nov 2000 18:03:56 +0100 + +php4 (4.0.3pl1-4) unstable; urgency=low + + * Clarify README.Debian about the DB change a bit (dbm_ -> dba_*) + * Remove aliasing hack - deprecated upstream. (closes: #76558) + * Compile with libgd-dev again (Write 100x always reinstall libgd-dev). + * --enable-versioning and tweak debian/control a bit, let's see, what breaks + + -- Petr Cech Tue, 14 Nov 2000 10:00:54 +0100 + +php4 (4.0.3pl1-3) unstable; urgency=low + + * Activate curl module. + * Really enable shmop module. + * Fix include paths in phpize. Now everyone should be able to easilly build + php4 extension modules (php4-dbase anyone?). + + -- Petr Cech Mon, 6 Nov 2000 23:17:41 +0100 + +php4 (4.0.3pl1-2) unstable; urgency=low + + * Build with libgd-dev installed (NOT libgd-gif). + + -- Petr Cech Tue, 17 Oct 2000 02:08:36 +0200 + +php4 (4.0.3pl1-1) unstable; urgency=medium + + * New upstream bugfix release. + * Depend on libopenldap1 as with the newer ldap module crashes php&apache. + + -- Petr Cech Mon, 16 Oct 2000 15:30:55 +0200 + +php4 (4.0.3-2) unstable; urgency=high + + * Urgency=high because last upload didn't have it ad it fixes some + security holes. + * ext/domxml/config.m4: don't try to build then --without-domxml + + -- Petr Cech Thu, 12 Oct 2000 12:50:17 +0200 + +php4 (4.0.3-1) unstable; urgency=low + + * New upstream release. + - fixes also some string format bugs + * Build with fixed libmysqlclient10-dev. + + -- Petr Cech Thu, 12 Oct 2000 00:00:07 +0200 + +php4 (4.0.2-7) unstable; urgency=low + + * Really, really install libldap2-dev. + * Workaround broken libmysqlclient9-dev. It has broken (again) .so symlink. + + -- Petr Cech Tue, 10 Oct 2000 22:28:48 +0200 + +php4 (4.0.2-6) unstable; urgency=low + + * Again fix description a little bit. + * Correct build-depends. + * Sic. Recompile, because I've busted (libopenldap-dev instead of + libldap2-dev was installed). + * While at it install also new apache glibc NMU and recompile with it. + * Move PEAR from php4-dev to php4 and install ALL of PEAR. + * add --prefix=/usr + * debhelper v2 + * prepare for CURL module + * Updated README.Debian + * updated XML module from php4 CVS to close: #72360 + + -- Petr Cech Mon, 2 Oct 2000 14:36:35 +0200 + +php4 (4.0.2-5) unstable; urgency=low + + * Correct build-depends (libgd1-dev -> libgd-dev). Where is Roman? :) + * Add libdb2-dev (>= 2:2.7.7-2.1) to build-depends for glibc 2.1.94. + * and recompile with glibc 2.1.94 to fix it. + + -- Petr Cech Wed, 27 Sep 2000 09:00:27 +0200 + +php4 (4.0.2-4) unstable; urgency=low + + * Tweak description a little bit more. + + -- Petr Cech Sun, 24 Sep 2000 23:58:15 +0200 + +php4 (4.0.2-3) unstable; urgency=low + + * Add info about what modules and why are enabled/disabled + into README.Debian. + * Install not so many docs (only in -dev now). + * Enable calendar and sockets modules. + * Rearange package descriptions so module-specific comments + go first (closes: # oh great leader). + * Create domxml module aka xmlv2. + * Fix spelling wan't -> want (closes: #70544). + * Add libraries for gd module only when linking this one + and not globaly (closes: #71623). + * Say that we wait for ENTER (closes: #71769). + * Fix logic in prerm script (closes: #71770). + + -- Petr Cech Sun, 24 Sep 2000 17:54:52 +0000 + +php4 (4.0.2-2) unstable; urgency=low + + * Add info about what modules and why are enabled/disabled + into README.Debian. + * Install not so many docs (only in -dev now). + * Enable calendar and sockets modules. + * Rearange package descriptions so module-specific comments + go first (closes: # oh great leader). + * Create domxml module aka xmlv2. + * Fix building (small typo). + * Compile with libmysqlclient9-dev installed. + + -- Petr Cech Mon, 18 Sep 2000 23:46:40 +0200 + +php4 (4.0.2-1) unstable; urgency=low + + * The "Back from vacation" release. + * New upstream fixed (and bugs). + * Correct postm script (only cosmetic) closes: #67350, #68541 + * build with libpcre3, libldap2 + * Use modified patch from -3 (remove #define XML_... php_XML_...) + + -- Petr Cech Thu, 7 Sep 2000 23:17:59 +0200 + +php4 (4.0.1pl2-3) unstable; urgency=low + + * UNRELEASED + * Fixed the XML packages. + + -- Norman Jordan Thu, 10 Aug 2000 21:45:15 +0000 + +php4 (4.0.1pl2-2) unstable; urgency=low + + * Fix source archive. + + -- Petr Cech Tue, 11 Jul 2000 11:04:48 +0000 + +php4 (4.0.1pl2-1) unstable; urgency=low + + * New upstream bug fix release (variation of the patches in -2) + * Build with new libgd1 library (maybe still in Incoming) + * Move PEAR stuff to php4 package (closes: #66897). + + -- Petr Cech Sun, 9 Jul 2000 09:01:06 +0000 + +php4 (4.0.1-2) unstable; urgency=low + + * Apply some CVS diffs in an attempt to fix opendir() problems. + + -- Petr Cech Fri, 30 Jun 2000 09:04:24 +0000 + +php4 (4.0.1-1) unstable; urgency=low + + * New upstream release (taken from CVS tag php_4_0_1). + * --with-regex=system else it plays havoc. Dunno why ... + * remove autoconf,automake,aclocal from configure rules. + * Fix description of XML --help message (no, it's not MySQL). + + -- Petr Cech Wed, 28 Jun 2000 22:55:16 +0200 + +php4 (4.0.0-4) unstable; urgency=low + + * Add -dev package (closes: #65907). + * Add -cgi and -cgi-* packages (closes: #51097, #52855). + * --enable-filepro + * Tweak copyright file a bit. + * Generate mhash module (closes part of 63186). + * Ask to remove libphp4 from httpd.conf upon remove/purge. + * Fixed build-depends, thanks to Roman Hodek (closes: #65938). + (I told you the first time it won't work :)) + * Mark /etc/php4/cgi/php.ini as conffile. + * Every module now ask if it should be enabled on install + (if it's not already) and disabled on remove/purge. + + -- Petr Cech Tue, 20 Jun 2000 14:29:01 +0200 + +php4 (4.0.0-3) unstable; urgency=low + + * Ship correct php.ini (extension_dir=/usr/lib/php4/apache). + * Don't use included libmysqlclient and use system one (fixes + wrong location of mysqld.sock) + * link XML module dynamicly with system xmlparse and xmltok. + + -- Petr Cech Wed, 14 Jun 2000 22:30:07 +0000 + +php4 (4.0.0-2) unstable; urgency=low + + * fix the IS_SLASH bug (closes: #65625 and probably others as well). + * Really change the maintainer field. + + -- Petr Cech Wed, 14 Jun 2000 07:44:05 +0000 + +php4 (4.0.0-1) unstable; urgency=low + + * New maintainer. + * New upstream release. + * Fix dynamic module loading. + * Added Build-Depends (I wonder, if I got them right) + * Standards-Version: 3.1.1 + + -- Petr Cech Tue, 13 Jun 2000 13:40:56 +0000 + +php4 (4.0rc1-2) unstable; urgency=low + + * Compile with latest apache and libraries from woody + (Closes: #62631, #62640) + + -- Gergely Madarasz Wed, 19 Apr 2000 14:39:25 +0200 + +php4 (4.0rc1-1) unstable; urgency=low + + * New upstream version + * Fix db2 support (Closes: #61709) + * Fix gd support (Closes: #61708) + * Remove ucd-snmp-hack from config options + + -- Gergely Madarasz Sun, 16 Apr 2000 17:04:05 +0200 + +php4 (4.0b4pl1-2) unstable; urgency=low + + * Build with --disable-debug so it should work with the zend + optimizer (Closes: #60265) + * Build with --enable-trans-sid (Closes: #60430) + * Write some more about php4/php3 differences in the description + (Closes: #60155) + + -- Gergely Madarasz Fri, 17 Mar 2000 17:35:29 +0100 + +php4 (4.0b4pl1-1) unstable; urgency=low + + * New upstream version + * Upstream reorganized the build system quite a bit, lots of patches + removed + + -- Gergely Madarasz Wed, 23 Feb 2000 17:16:00 +0100 + +php4 (4.0b3-4) unstable; urgency=low + + * Add /etc/php4/apache/php.ini to conffiles (Closes: #54194) + * Add info file for apacheconfig + * Offer to run apacheconfig and/or apache-sslconfig in postinst + * Comment out sendmail_path from php.ini so the default sendmail path + should work (Closes: #51355) + + -- Gergely Madarasz Thu, 6 Jan 2000 14:38:20 +0100 + +php4 (4.0b3-3) unstable; urgency=low + + * Compile with libgd instead of libgd-gif + + -- Gergely Madarasz Tue, 4 Jan 2000 18:07:56 +0100 + +php4 (4.0b3-2) unstable; urgency=low + + * Build imap and ldap modules + * Fix rm -f in rules file (Closes: #51623) + + -- Gergely Madarasz Mon, 3 Jan 2000 16:54:19 +0100 + +php4 (4.0b3-1) unstable; urgency=low + + * Initial Release. + + -- Gergely Madarasz Tue, 16 Nov 1999 19:33:42 +0100 --- php4-4.0.5.orig/debian/control +++ php4-4.0.5/debian/control @@ -0,0 +1,147 @@ +Source: php4 +Section: web +Priority: optional +Maintainer: Petr Cech +Build-Depends: debhelper (>= 2.0.40), bison, flex, apache-dev (>= 1.3.14-2), freetds-dev, libbz2-dev, libc-client2000-dev, libcurl-dev (>= 7.7), libdb2-dev (>=2:2.7.7-2.1), libexpat1-dev, libgd-dev (>= 1.8.3), libjpeg62-dev, libmagick5-dev (>=5.2.0), libmcal0-dev (>= 0.6), libmhash-dev (>= 0.8.8), libmm11-dev, libmysqlclient10-dev, libldap2-dev, libpam0g-dev, libpcre3-dev, libpng2-dev, libsablot0-dev (>= 0.52), libsnmp4.2-dev, libttf-dev, libxmltok1-dev, libxml2-dev (>= 2.3.0), t1lib-dev, xlibs-dev, zlib1g-dev +Build-Conflicts: bind-dev +Standards-Version: 3.1.1 + +Package: php4 +Architecture: any +Depends: ${shlibs:Depends}, mime-support (>= 2.03-1), ${apache:Depends}, fileutils (>= 4.0-5) +Recommends: php4-pear +Conflicts: php3, php4-dev (<< 4.0.4-1), php4-cgi (<< 4.0.4-1), php4-cgi-curl, php4-cgi-domxml, php4-cgi-gd, php4-cgi-imap, php4-cgi-ldap, php4-cgi-mhash, php4-cgi-mysql, php4-cgi-pgsql, php4-cgi-snmp, php4-cgi-xml, php4-xml +Provides: php4-xml +Replaces: php4-dev (<< 4.0.2-6), php4-xml +Suggests: phpdoc +Description: A server-side, HTML-embedded scripting language + This package provides the loadable module for the apache webserver. Compiled in + modules are: calendar, curl, dba, exif, filepro, ftp, mm, sockets, wddx, xml, yp + and zlib. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-gd +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-gd +Description: GD module for php4 + This package provides a module for handling graphics directly from PHP + scripts. It supports the PNG, JPEG, XPM and ttf fonts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-imap +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-imap +Description: IMAP module for php4 + This package provides a module for IMAP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-ldap +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-ldap +Description: LDAP module for php4 + This package provides a module for LDAP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-mhash +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-mhash +Description: MHASH module for php4 + This package provides a module for mhash functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-mysql +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-mysql +Description: MySQL module for php4 + This package provides a module for MySQL database connections directly from + PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-snmp +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-snmp +Description: SNMP module for php4 + This package provides a module for SNMP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-cgi +Architecture: any +Depends: ${shlibs:Depends}, mime-support (>= 2.03-1), fileutils (>= 4.0-5) +Recommends: php4-pear +Conflicts: php3 (<= 3.0.18-1), php4-cgi-curl, php4-cgi-domxml, php4-cgi-gd, php4-cgi-imap, php4-cgi-ldap, php4-cgi-mhash, php4-cgi-mysql, php4-cgi-pgsql, php4-cgi-snmp, php4-cgi-xml +Suggests: phpdoc +Description: A server-side, HTML-embedded scripting language + This package provides the CGI. Compiled in modules are calendar, curl, dba, + exif, filepro, ftp, mm, sockets, wddx, xml, yp and zlib. + Please note, that as of 4.0.4-1 php4-cgi-* are deprecated. Use corresponding + php4-* package instead. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-dev +Architecture: all +Description: Files for PHP4 module development + This package provides the files from the PHP4 source needed for compiling + additional modules. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-pear +Architecture: all +Conflicts: php4 (<< 4.0.4-1) +Description: PEAR - PHP Extension and Application Repository + This package contains PEAR files for php4. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. --- php4-4.0.5.orig/debian/php4-snmp.prerm +++ php4-4.0.5/debian/php4-snmp.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*snmp.so" /etc/php4/apache/php.ini; then + echo "You are removing SNMP support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=snmp.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*snmp.so" > /etc/php4/apache/php.ini.snmpremove + mv /etc/php4/apache/php.ini.snmpremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*snmp.so" /etc/php4/cgi/php.ini; then + echo "You are removing SNMP support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=snmp.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*snmp.so" > /etc/php4/cgi/php.ini.snmpremove + mv /etc/php4/cgi/php.ini.snmpremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/500mod_php4.info +++ php4-4.0.5/debian/500mod_php4.info @@ -0,0 +1,7 @@ +LoadModule: php4_module /usr/lib/apache/1.3/libphp4.so +Directives: + php_value + php_flag + php_admin_value + php_admin_flag +Description: Support for the PHP4 HTML-embedded scripting language --- php4-4.0.5.orig/debian/copyright.header +++ php4-4.0.5/debian/copyright.header @@ -0,0 +1,14 @@ +This package was debianized by Gergely Madarasz on +Tue, 16 Nov 1999 19:33:42 +0100. The current maintainer is +Petr Cech . + +It was downloaded from www.php.net/version4/downloads +Changes: removed ext/dbase dir (non-free) + +Upstream Author(s): The PHP group for PHP4, Andi Gutmans and Zeev Suraski +for libzend + +Two different licences apply to this package, one for PHP4, the other for +libzend. Both licences are shown here below. + + --- php4-4.0.5.orig/debian/php4-dev.files +++ php4-4.0.5/debian/php4-dev.files @@ -0,0 +1,5 @@ +usr/bin/php-config +usr/bin/phpextdist +usr/bin/phpize +usr/include +usr/lib/php4/build --- php4-4.0.5.orig/debian/php4-pear.docs +++ php4-4.0.5/debian/php4-pear.docs @@ -0,0 +1 @@ +pear/README --- php4-4.0.5.orig/debian/php4-ldap.postinst +++ php4-4.0.5/debian/php4-ldap.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" /etc/php4/apache/php.ini; then + echo "You are installing LDAP support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=ldap.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=ldap.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*ldap.so" /etc/php4/cgi/php.ini; then + echo "You are installing LDAP support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=ldap.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=ldap.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-gd.prerm +++ php4-4.0.5/debian/php4-gd.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" /etc/php4/apache/php.ini; then + echo "You are removing GD support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=gd.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" > /etc/php4/apache/php.ini.gdremove + mv /etc/php4/apache/php.ini.gdremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" /etc/php4/cgi/php.ini; then + echo "You are removing GD support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=gd.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*gd.so" > /etc/php4/cgi/php.ini.gdremove + mv /etc/php4/cgi/php.ini.gdremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-snmp.postinst +++ php4-4.0.5/debian/php4-snmp.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*snmp.so" /etc/php4/apache/php.ini; then + echo "You are installing SNMP support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=snmp.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=snmp.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*snmp.so" /etc/php4/cgi/php.ini; then + echo "You are installing SNMP support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=snmp.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=snmp.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-imap.prerm +++ php4-4.0.5/debian/php4-imap.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" /etc/php4/apache/php.ini; then + echo "You are removing IMAP support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=imap.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" > /etc/php4/apache/php.ini.imapremove + mv /etc/php4/apache/php.ini.imapremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" /etc/php4/cgi/php.ini; then + echo "You are removing IMAP support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=imap.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*imap.so" > /etc/php4/cgi/php.ini.imapremove + mv /etc/php4/cgi/php.ini.imapremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-mysql.postinst +++ php4-4.0.5/debian/php4-mysql.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" /etc/php4/apache/php.ini; then + echo "You are installing MySQL support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mysql.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mysql.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mysql.so" /etc/php4/cgi/php.ini; then + echo "You are installing MySQL support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mysql.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mysql.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-mhash.postinst +++ php4-4.0.5/debian/php4-mhash.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" /etc/php4/apache/php.ini; then + echo "You are installing MHASH support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mhash.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mhash.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mhash.so" /etc/php4/cgi/php.ini; then + echo "You are installing MHASH support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mhash.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mhash.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-cgi.docs +++ php4-4.0.5/debian/php4-cgi.docs @@ -0,0 +1,3 @@ +CREDITS +FUNCTION_LIST.txt +debian/README.cgi --- php4-4.0.5.orig/debian/php4-dev.docs +++ php4-4.0.5/debian/php4-dev.docs @@ -0,0 +1,8 @@ +CODING_STANDARDS +README.CVS-RULES +README.EXT_SKEL +README.SELF-CONTAINED-EXTENSIONS +README.Zeus +TODO +apidoc-zend.txt +apidoc.txt --- php4-4.0.5.orig/debian/libc-client.la +++ php4-4.0.5/debian/libc-client.la @@ -0,0 +1,26 @@ +# libcurl.la - a libtool library file +# Generated by ltmain.sh - GNU libtool 1.3.5 (1.385.2.206 2000/05/27 11:12:27) +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='' + +# Names of this library. +library_names='libc-client.so.2000 libc-client.so' + +# The name of the static archive. +old_library='/usr/lib/libc-client.a' + +# Libraries that this one depends upon. +dependency_libs=' -lpam -ldl -lcrypt' + +# Version information for libcurl. +current=0 +age=0 +revision=0 + +# Is this an already installed library? +installed=yes + --- php4-4.0.5.orig/debian/php4-mcal.prerm +++ php4-4.0.5/debian/php4-mcal.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" /etc/php4/apache/php.ini; then + echo "You are removing MCAL support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mcal.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" > /etc/php4/apache/php.ini.mcalremove + mv /etc/php4/apache/php.ini.mcalremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" /etc/php4/cgi/php.ini; then + echo "You are removing MCAL support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=mcal.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini | grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" > /etc/php4/cgi/php.ini.mcalremove + mv /etc/php4/cgi/php.ini.mcalremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-cgi.postinst +++ php4-4.0.5/debian/php4-cgi.postinst @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + + +if [ "$1" != "configure" ]; then + exit 0 +fi + +ask() { + while : ; do + echo -n "$1 " + read a + [ "$a" = "" ] && a="$2" + a=`echo $a | tr A-Z a-z` + [ "$a" = "y" -o "$a" = "n" ] && break + echo + echo "Illegal input!" + echo + done +} + +if ! [ -f /etc/php4/cgi/php.ini ]; then + mkdir -p /etc/php4/cgi + cp /usr/share/doc/php4-cgi/examples/php.ini /etc/php4/cgi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension_dir" /etc/php4/cgi/php.ini ; then + echo "WARNING! Location of php4 modules has changed. Should I comment out" + echo "the extension_dir setting in /etc/php4/cgi/php.ini." + ask "Should I [Y/n]? " "y" + + if [ "$a" = "y" ] ; then + sed -e "s/^[[:space:]]*extension_dir/;extension_dir/" < /etc/php4/cgi/php.ini > /etc/php4/cgi/php.ini-extdir + mv /etc/php4/cgi/php.ini-extdir /etc/php4/cgi/php.ini + else + echo "NOT commenting the extension_dir. I hope you know, what you're doing." + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4.postrm +++ php4-4.0.5/debian/php4.postrm @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + purge) + rm -rf /etc/php4/apache + rmdir -p --ignore-fail-on-non-empty /etc/php4 + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- php4-4.0.5.orig/debian/php4-sablot.prerm +++ php4-4.0.5/debian/php4-sablot.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*sablot.so" /etc/php4/apache/php.ini; then + echo "You are removing XSL support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=sablot.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sablot.so" > /etc/php4/apache/php.ini.sablotremove + mv /etc/php4/apache/php.ini.sablotremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^extension[[:space:]]*=[[:space:]]*sablot.so" /etc/php4/cgi/php.ini; then + echo "You are removing XSL support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=sablot.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sablot.so" > /etc/php4/cgi/php.ini.sablotremove + mv /etc/php4/cgi/php.ini.sablotremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-mcal.postinst +++ php4-4.0.5/debian/php4-mcal.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" /etc/php4/apache/php.ini; then + echo "You are installing MCAL support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mcal.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mcal.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*mcal.so" /etc/php4/cgi/php.ini; then + echo "You are installing MCAL support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=mcal.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=mcal.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-cgi.postrm +++ php4-4.0.5/debian/php4-cgi.postrm @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + purge) + rm -rf /etc/php4/cgi + rmdir -p --ignore-fail-on-non-empty /etc/php4 + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- php4-4.0.5.orig/debian/php4-sybase.postinst +++ php4-4.0.5/debian/php4-sybase.postinst @@ -0,0 +1,50 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "configure" ]; then + exit 0 +fi + +if [ -n "$2" ]; then +# we're upgrading. don't ask again + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" /etc/php4/apache/php.ini; then + echo "You are installing Sybase support for php4, but it's not" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=sybase_ct.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=sybase_ct.so" >> /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if ! grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" /etc/php4/cgi/php.ini; then + echo "You are installing Sybase support for php4, but it's not" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "To enable it you need to add this line:" + echo + echo "extension=sybase_ct.so" + echo + echo -n "Do you want me to add it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + echo "extension=sybase_ct.so" >> /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-sybase.prerm +++ php4-4.0.5/debian/php4-sybase.prerm @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" != "remove" -a "$1" != "purge" ]; then + exit 0 +fi + +if [ -f /etc/php4/apache/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" /etc/php4/apache/php.ini; then + echo "You are removing Sybase support for php4, but it is still" + echo "enabled in your /etc/php4/apache/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=sybase_ct.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/apache/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" > /etc/php4/apache/php.ini.sybaseremove + mv /etc/php4/apache/php.ini.sybaseremove /etc/php4/apache/php.ini + fi + fi +fi + +if [ -f /etc/php4/cgi/php.ini ]; then + if grep -q "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" /etc/php4/cgi/php.ini; then + echo "You are removing Sybase support for php4, but it is still" + echo "enabled in your /etc/php4/cgi/php.ini." + echo + echo "You should remove this line:" + echo + echo "extension=sybase_ct.so" + echo + echo -n "Do you want me to do it now [Y/n] ?" + read a + if ! echo $a | grep -iq ^n; then + cat /etc/php4/cgi/php.ini |grep -v "^[[:space:]]*extension[[:space:]]*=[[:space:]]*sybase_ct.so" > /etc/php4/cgi/php.ini.sybaseremove + mv /etc/php4/cgi/php.ini.sybaseremove /etc/php4/cgi/php.ini + fi + fi +fi + +exit 0 --- php4-4.0.5.orig/debian/php4-pgsql.postinst.debhelper +++ php4-4.0.5/debian/php4-pgsql.postinst.debhelper @@ -0,0 +1,7 @@ +# Automatically added by dh_installdocs +if [ "$1" = "configure" ]; then + if [ -d /usr/doc -a ! -e /usr/doc/php4-pgsql -a -d /usr/share/doc/php4-pgsql ]; then + ln -sf ../share/doc/php4-pgsql /usr/doc/php4-pgsql + fi +fi +# End automatically added section --- php4-4.0.5.orig/debian/php4-pgsql.prerm.debhelper +++ php4-4.0.5/debian/php4-pgsql.prerm.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_installdocs +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/php4-pgsql ]; then + rm -f /usr/doc/php4-pgsql +fi +# End automatically added section --- php4-4.0.5.orig/debian/control.old +++ php4-4.0.5/debian/control.old @@ -0,0 +1,219 @@ +Source: php4 +Section: web +Priority: optional +Maintainer: Petr Cech +Build-Depends: debhelper (>= 2.0.40), bison, flex, apache-dev (>= 1.3.14-2), freetds-dev, libbz2-dev, libc-client2000-dev, libcurl-dev (>= 7.7), libdb2-dev (>=2:2.7.7-2.1), libexpat1-dev, libgd-dev (>= 1.8.3), libjpeg62-dev, libmagick5-dev (>=5.2.0), libmcal0-dev (>= 0.6), libmhash-dev (>= 0.8.8), libmm11-dev, libmysqlclient10-dev, libldap2-dev, libpam0g-dev, libpcre3-dev, libpng2-dev, libsablot0-dev (>= 0.50), libsnmp4.2-dev, libttf-dev, libxmltok1-dev, libxml2-dev (>= 2.3.0), postgresql-dev (>=7.0), t1lib-dev, xlibs-dev, zlib1g-dev +Build-Conflicts: bind-dev +Standards-Version: 3.1.1 + +Package: php4 +Architecture: any +Depends: ${shlibs:Depends}, mime-support (>= 2.03-1), ${apache:Depends}, fileutils (>= 4.0-5) +Recommends: php4-pear +Conflicts: php3, php4-dev (<< 4.0.4-1), php4-cgi (<< 4.0.4-1), php4-cgi-curl, php4-cgi-domxml, php4-cgi-gd, php4-cgi-imap, php4-cgi-ldap, php4-cgi-mhash, php4-cgi-mysql, php4-cgi-pgsql, php4-cgi-snmp, php4-cgi-xml, php4-xml +Provides: php4-xml +Replaces: php4-dev (<< 4.0.2-6), php4-xml +Suggests: phpdoc +Description: A server-side, HTML-embedded scripting language + This package provides the loadable module for the apache webserver. Compiled in + modules are: calendar, curl, dba, exif, filepro, ftp, mm, sockets, wddx, xml, yp + and zlib. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-curl +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-curl +Description: CURL module for php4 + CURL is a library for getting files from FTP, GOPHER, HTTP server. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-domxml +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-domxml +Description: XMLv2 module for php4 + This package provides a module for XML functions in PHP scripts. It's the + new module uses libxml2. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-gd +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-gd +Description: GD module for php4 + This package provides a module for handling graphics directly from PHP + scripts. It supports the PNG, JPEG, XPM and ttf fonts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-imap +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-imap +Description: IMAP module for php4 + This package provides a module for IMAP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-ldap +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-ldap +Description: LDAP module for php4 + This package provides a module for LDAP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-mcal +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Description: MCAL calendar module for php4 + This package provides a module for MCAL calendar functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-mhash +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-mhash +Description: MHASH module for php4 + This package provides a module for mhash functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-mysql +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-mysql +Description: MySQL module for php4 + This package provides a module for MySQL database connections directly from + PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-pgsql +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-pgsql +Description: PostgreSQL module for php4 + This package provides a module for PostgreSQL database connections + directly from PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-sablot +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Description: Sablotron module for php4 + This package provides a module for Sablotron an XSL parser. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-snmp +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Replaces: php4-cgi-snmp +Description: SNMP module for php4 + This package provides a module for SNMP functions in PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-sybase +Architecture: any +Depends: ${shlibs:Depends}, ${php4:Depends} +Description: Sybase / MS SQL Server module for php4 + This package provides a module for Sybase and Microsoft SQL Server database + connections directly from PHP scripts. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + +Package: php4-cgi +Architecture: any +Depends: ${shlibs:Depends}, mime-support (>= 2.03-1), fileutils (>= 4.0-5) +Recommends: php4-pear +Conflicts: php3 (<= 3.0.18-1), php4-cgi-curl, php4-cgi-domxml, php4-cgi-gd, php4-cgi-imap, php4-cgi-ldap, php4-cgi-mhash, php4-cgi-mysql, php4-cgi-pgsql, php4-cgi-snmp, php4-cgi-xml +Suggests: phpdoc +Description: A server-side, HTML-embedded scripting language + This package provides the CGI. Compiled in modules are calendar, curl, dba, + exif, filepro, ftp, mm, sockets, wddx, xml, yp and zlib. + Please note, that as of 4.0.4-1 php4-cgi-* are deprecated. Use corresponding + php4-* package instead. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-dev +Architecture: all +Description: Files for PHP4 module development + This package provides the files from the PHP4 source needed for compiling + additional modules. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. + . + The most significant change between php3 and php4 is the new parser engine + called Zend, which boosts performance quite impressively. + +Package: php4-pear +Architecture: all +Conflicts: php4 (<< 4.0.4-1) +Description: PEAR - PHP Extension and Application Repository + This package contains PEAR files for php4. + . + PHP4 is an HTML-embedded scripting language. Much of its syntax is borrowed + from C, Java and Perl with a couple of unique PHP-specific features thrown + in. The goal of the language is to allow web developers to write + dynamically generated pages quickly. --- php4-4.0.5.orig/debian/php4-pgsql.substvars +++ php4-4.0.5/debian/php4-pgsql.substvars @@ -0,0 +1,2 @@ +shlibs:Depends=libc6 (>= 2.2.2-2) +php4:Depends=php4 (= 3:4.0.5-1) | php4-cgi (= 3:4.0.5-1)